From 816fcd690a0e3a1eea8a7e7b7378ba156b07ee06 Mon Sep 17 00:00:00 2001
From: William McBrine <wmcbrine@gmail.com>
Date: Thu, 28 Dec 2017 16:07:28 -0500
Subject: [PATCH] Update ncurses_tests for 5.9, and new config.h location.

---
 x11/Makefile.in   |  2 +-
 x11/ncurses_cfg.h | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/x11/Makefile.in b/x11/Makefile.in
index fdd41123..d69df66b 100644
--- a/x11/Makefile.in
+++ b/x11/Makefile.in
@@ -539,7 +539,7 @@ xmas.o: $(demodir)/xmas.c
 # This section provides for compiling and linking the
 # ncurses test programs.
 
-ncurses_testdir	= $(HOME)/ncurses-5.6/test
+ncurses_testdir	= $(HOME)/ncurses-5.9/test
 
 NCURSES_TESTS	= bs gdc hanoi knight tclock ncurses
 
diff --git a/x11/ncurses_cfg.h b/x11/ncurses_cfg.h
index 8b28ff71..2f635409 100644
--- a/x11/ncurses_cfg.h
+++ b/x11/ncurses_cfg.h
@@ -1,8 +1,8 @@
 /* This file is only used with the ncurses test programs.
  *
- * Have ncurses-5.6 unpacked in your $(HOME) (you don't need to build 
- * it), or edit ncurses_testdir appropriately in the Makefile. Configure 
- * and build PDCurses for X11. (Sorry, other ports won't work yet.) 
+ * Have ncurses-5.9 unpacked in your $(HOME) (you don't need to build
+ * it), or edit ncurses_testdir appropriately in the Makefile. Configure
+ * and build PDCurses for X11. (Sorry, other ports won't work yet.)
  * Change to this directory, and:
  *
  * "make ncurses_tests" to start.
@@ -12,8 +12,10 @@
  */
 
 #define NCURSES_MOUSE_VERSION 2
+#define NCURSES_CONST
+#define NCURSES_EXPORT(foo) foo
 
-#include "../config.h"
+#include "config.h"
 #include <curses.h>
 
 #define ExitProgram exit
@@ -27,6 +29,7 @@
 #define HAVE_GETWIN 1
 #define HAVE_LIBPANEL 1
 #define HAVE_LOCALE_H 1
+#define HAVE_MATH_H 1
 #define HAVE_NAPMS 1
 #define HAVE_PANEL_H 1
 #define HAVE_PUTWIN 1
@@ -36,9 +39,13 @@
 
 #ifdef PDC_WIDE
 # define USE_WIDEC_SUPPORT 1
+# define HAVE_WCSRTOMBS 1
+# define HAVE_MBSRTOWCS 1
+# define HAVE_MBRTOWC 1
+# define HAVE_MBRLEN 1
 #endif
 
-/* Fool ncurses.c so it gives us all the tests, and doesn't redefine 
+/* Fool ncurses.c so it gives us all the tests, and doesn't redefine
    ACS_ chars
 */