wine64-dev: link -lossaudio against wineoss.drv only & -li386 against ntdll and libwine only

[Naveen Narayanan <zerous@nocebo.space>]

Module Name:	pkgsrc-wip
Committed By:	Naveen Narayanan <zerous@nocebo.space>
Pushed By:	zerous
Date:		Fri Aug 9 18:08:15 2019 +0200
Changeset:	e07d67afc8771ced74f3fb63867d862af0496f18

Modified Files:
	wine64-dev/distinfo
	wine64-dev/patches/patch-configure.ac
Added Files:
	wine64-dev/patches/patch-dlls_ntdll_Makefile.in
	wine64-dev/patches/patch-libs_wine_Makefile.in

Log Message:
wine64-dev: link -lossaudio against wineoss.drv only & -li386 against ntdll and libwine only

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

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

diffstat:
 wine64-dev/distinfo                             |  5 ++++-
 wine64-dev/patches/patch-configure.ac           |  9 ++++++---
 wine64-dev/patches/patch-dlls_ntdll_Makefile.in | 13 +++++++++++++
 wine64-dev/patches/patch-libs_wine_Makefile.in  | 10 ++++++++++
 4 files changed, 33 insertions(+), 4 deletions(-)

diffs:
diff --git a/wine64-dev/distinfo b/wine64-dev/distinfo
index 1e07340463..3e6194d142 100644
--- a/wine64-dev/distinfo
+++ b/wine64-dev/distinfo
@@ -4,9 +4,12 @@ SHA1 (wine-4.13.tar.xz) = 1321a22e4e3f4627c3cc3b12391a454407fd224c
 RMD160 (wine-4.13.tar.xz) = 7136c2aeb267fc2fdc1b35f33e1e7754702bc43c
 SHA512 (wine-4.13.tar.xz) = b359db3c99d10b489f7f72172b624e7b2e2b826c206e842a524d781ab5947e2b03623a115c2345fc71df22eb508936c2f7667d4c420a2fb6cdc34e3d2ba5e75b
 Size (wine-4.13.tar.xz) = 22137820 bytes
-SHA1 (patch-configure.ac) = c07fa558d87f77343798233643dbeda9f28b80f3
+SHA1 (patch-configure.ac) = 82db374939849a4735d13dcdbde4017e4cd46f33
+SHA1 (patch-dlls_ntdll_Makefile.in) = c156e8b03e94d1fb5349433a9b730cd8a74fdb64
 SHA1 (patch-dlls_ntdll_thread.c) = 8a13e956e6622cc215fbe6e9943a704b3a926168
+SHA1 (patch-dlls_wineoss.drv_Makefile.in) = a203260e5d8d92114197958d87ba644c87b90b01
 SHA1 (patch-dlls_wininet_http.c) = 9e539ed70a5bf010e50c7beb1c3b3c877ed5e5d8
+SHA1 (patch-libs_wine_Makefile.in) = e3144efb4162c92a6a10a615f6f7c1e5dce9ea57
 SHA1 (patch-loader_Makefile.in) = 2719bec1f5ee3f3a89cc1013af0eb9d0a8176e72
 SHA1 (patch-programs_wineconsole_Makefile.in) = 83aa7c1450b11d5b2eb5ca79885ca599f3900a15
 SHA1 (patch-programs_wineconsole_curses.c) = 61714dc710432b4092ccaf6ffe1e82ba06d623f2
diff --git a/wine64-dev/patches/patch-configure.ac b/wine64-dev/patches/patch-configure.ac
index 2270c87068..51e909880c 100644
--- a/wine64-dev/patches/patch-configure.ac
+++ b/wine64-dev/patches/patch-configure.ac
@@ -2,12 +2,15 @@ $NetBSD$
 
 --- configure.ac.orig	2019-08-02 19:24:39.000000000 +0000
 +++ configure.ac
-@@ -407,8 +407,6 @@ dnl **** Check for some libraries ****
+@@ -406,9 +406,9 @@ WINE_WARNING_WITH(gettext,[test "$MSGFMT
+ dnl **** Check for some libraries ****
  
  dnl Check for -li386 for NetBSD and OpenBSD
- AC_CHECK_LIB(i386,i386_set_ldt)
--dnl Check for -lossaudio for NetBSD
+-AC_CHECK_LIB(i386,i386_set_ldt)
++AC_CHECK_LIB(i386,i386_set_ldt,[AC_SUBST(i386_LIBS, "-li386")])
+ dnl Check for -lossaudio for NetBSD
 -AC_CHECK_LIB(ossaudio,_oss_ioctl)
++AC_CHECK_LIB(ossaudio,_oss_ioctl,[AC_SUBST(OSS4_LIBS,"-lossaudio")])
  
  AC_SUBST(OPENGL_LIBS,"")
  
diff --git a/wine64-dev/patches/patch-dlls_ntdll_Makefile.in b/wine64-dev/patches/patch-dlls_ntdll_Makefile.in
new file mode 100644
index 0000000000..e48d52fe8a
--- /dev/null
+++ b/wine64-dev/patches/patch-dlls_ntdll_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- dlls/ntdll/Makefile.in.orig	2019-08-02 19:24:39.000000000 +0000
++++ dlls/ntdll/Makefile.in
+@@ -2,7 +2,7 @@ EXTRADEFS = -D_NTSYSTEM_
+ MODULE    = ntdll.dll
+ IMPORTLIB = ntdll
+ IMPORTS   = winecrt0
+-EXTRALIBS = $(IOKIT_LIBS) $(RT_LIBS) $(PTHREAD_LIBS)
++EXTRALIBS = $(IOKIT_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(i386_LIBS)
+ EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x7bc00000
+ 
+ C_SRCS = \
diff --git a/wine64-dev/patches/patch-libs_wine_Makefile.in b/wine64-dev/patches/patch-libs_wine_Makefile.in
new file mode 100644
index 0000000000..8b07108533
--- /dev/null
+++ b/wine64-dev/patches/patch-libs_wine_Makefile.in
@@ -0,0 +1,10 @@
+$NetBSD$
+
+--- libs/wine/Makefile.in.orig	2019-08-02 19:24:39.000000000 +0000
++++ libs/wine/Makefile.in
+@@ -1,4 +1,4 @@
+-EXTRALIBS = $(DL_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS)
++EXTRALIBS = $(DL_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(i386_LIBS)
+ 
+ C_SRCS = \
+ 	config.c \