wine32: Use curses from base instead of ncurses

[Naveen Narayanan <zerous@nocebo.space>]

Module Name:	pkgsrc-wip
Committed By:	Naveen Narayanan <zerous@nocebo.space>
Pushed By:	zerous
Date:		Wed Jun 26 14:59:37 2019 +0200
Changeset:	344caa834c2ee7cb11e4613a9374c110a113be9c

Modified Files:
	wine32/Makefile
	wine32/distinfo
Added Files:
	wine32/patches/patch-programs_wineconsole_Makefile.in
	wine32/patches/patch-programs_wineconsole_curses.c

Log Message:
wine32: Use curses from base instead of ncurses

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=344caa834c2ee7cb11e4613a9374c110a113be9c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 wine32/Makefile                                    |  4 +++-
 wine32/distinfo                                    |  2 ++
 .../patches/patch-programs_wineconsole_Makefile.in | 16 +++++++++++++++
 wine32/patches/patch-programs_wineconsole_curses.c | 24 ++++++++++++++++++++++
 4 files changed, 45 insertions(+), 1 deletion(-)

diffs:
diff --git a/wine32/Makefile b/wine32/Makefile
index 2cccf65421..9d5fc19510 100644
--- a/wine32/Makefile
+++ b/wine32/Makefile
@@ -17,8 +17,8 @@ USE_LANGUAGES=		c c++
 USE_TOOLS+=		bison flex gmake mktemp msgfmt autoconf perl
 REPLACE_PERL+=		tools/winemaker/winemaker tools/winedump/function_grep.pl
 NOT_PAX_MPROTECT_SAFE+=	bin/wine
+PREFER_NATIVE=		curses
 
-.include "../../devel/ncurses/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
@@ -29,6 +29,8 @@ NOT_PAX_MPROTECT_SAFE+=	bin/wine
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wine32/distinfo b/wine32/distinfo
index a423138c59..e5d42e8dad 100644
--- a/wine32/distinfo
+++ b/wine32/distinfo
@@ -6,3 +6,5 @@ SHA512 (wine-4.4.tar.xz) = 6678c9b0e086bdc9fab9f9fd2517226352b49f846bbae7be6000b
 Size (wine-4.4.tar.xz) = 21805668 bytes
 SHA1 (patch-dlls_ntdll_thread.c) = 8a13e956e6622cc215fbe6e9943a704b3a926168
 SHA1 (patch-dlls_wininet_http.c) = 9e539ed70a5bf010e50c7beb1c3b3c877ed5e5d8
+SHA1 (patch-programs_wineconsole_Makefile.in) = 83aa7c1450b11d5b2eb5ca79885ca599f3900a15
+SHA1 (patch-programs_wineconsole_curses.c) = 61714dc710432b4092ccaf6ffe1e82ba06d623f2
diff --git a/wine32/patches/patch-programs_wineconsole_Makefile.in b/wine32/patches/patch-programs_wineconsole_Makefile.in
new file mode 100644
index 0000000000..7d0898a4f7
--- /dev/null
+++ b/wine32/patches/patch-programs_wineconsole_Makefile.in
@@ -0,0 +1,16 @@
+$NetBSD$
+
+kludge: link against curses as build fails owing to _acs_char(curses)
+being extern.
+	
+--- programs/wineconsole/Makefile.in.orig	2019-03-15 20:18:31.000000000 +0000
++++ programs/wineconsole/Makefile.in
+@@ -1,7 +1,7 @@
+ MODULE    = wineconsole.exe
+ APPMODE   = -mwindows
+ IMPORTS   = advapi32
+-DELAYIMPORTS = comctl32 user32 gdi32
++DELAYIMPORTS = comctl32 user32 gdi32 curses
+ 
+ C_SRCS = \
+ 	curses.c \
diff --git a/wine32/patches/patch-programs_wineconsole_curses.c b/wine32/patches/patch-programs_wineconsole_curses.c
new file mode 100644
index 0000000000..0687f1d206
--- /dev/null
+++ b/wine32/patches/patch-programs_wineconsole_curses.c
@@ -0,0 +1,24 @@
+$NetBSD$
+
+_acs_map in curses (base) is the equivalent of acs_map in ncurses.
+
+--- programs/wineconsole/curses.c.orig	2019-03-15 20:18:31.000000000 +0000
++++ programs/wineconsole/curses.c
+@@ -125,7 +125,7 @@ MAKE_FUNCPTR(getmouse)
+ MAKE_FUNCPTR(mouseinterval)
+ MAKE_FUNCPTR(mousemask)
+ #endif
+-MAKE_FUNCPTR(acs_map)
++MAKE_FUNCPTR(_acs_map)
+ 
+ #undef MAKE_FUNCPTR
+ 
+@@ -189,7 +189,7 @@ static BOOL WCCURSES_bind_libcurses(void
+     LOAD_FUNCPTR(mouseinterval)
+     LOAD_FUNCPTR(mousemask)
+ #endif
+-    LOAD_FUNCPTR(acs_map)
++    LOAD_FUNCPTR(_acs_map)
+ 
+ #undef LOAD_FUNCPTR
+