wine32: Enable tests and use CONFIGURE_ENV

[Naveen Narayanan <zerous@nocebo.space>]

Module Name:	pkgsrc-wip
Committed By:	Naveen Narayanan <zerous@nocebo.space>
Pushed By:	zerous
Date:		Mon Aug 19 06:31:38 2019 +0200
Changeset:	5c48bb70b07ac84a51500d45ecd8c51a5c912b7c

Modified Files:
	wine32/Makefile
	wine32/distinfo
Added Files:
	wine32/patches/patch-include_bcrypt.h

Log Message:
wine32: Enable tests and use CONFIGURE_ENV

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

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

diffstat:
 wine32/Makefile                       |  5 ++---
 wine32/distinfo                       |  1 +
 wine32/patches/patch-include_bcrypt.h | 16 ++++++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diffs:
diff --git a/wine32/Makefile b/wine32/Makefile
index 39e97c8268..cedf954352 100644
--- a/wine32/Makefile
+++ b/wine32/Makefile
@@ -12,17 +12,16 @@ LICENSE=		gnu-lgpl-v2.1
 
 ONLY_FOR_PLATFORM+=	*-*-i386
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--disable-tests
 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
 
 # XXX: Fix warning due to _FORTIFY_SOURCE being redefined
-WINE_ENV+=		ac_cv_c_fortify_enabled=no
+CONFIGURE_ENV+=		ac_cv_c_fortify_enabled=no
 
 # XXX: Stop Wine from using gethostbyname_r like in linux
-WINE_ENV+=		wine_cv_linux_gethostbyname_r_6=no
+CONFIGURE_ENV+=		wine_cv_linux_gethostbyname_r_6=no
 
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/giflib/buildlink3.mk"
diff --git a/wine32/distinfo b/wine32/distinfo
index e5d42e8dad..63eeb41d66 100644
--- a/wine32/distinfo
+++ b/wine32/distinfo
@@ -6,5 +6,6 @@ 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-include_bcrypt.h) = 77ea288bac8ab9dccb23e831c083b0229bbb669d
 SHA1 (patch-programs_wineconsole_Makefile.in) = 83aa7c1450b11d5b2eb5ca79885ca599f3900a15
 SHA1 (patch-programs_wineconsole_curses.c) = 61714dc710432b4092ccaf6ffe1e82ba06d623f2
diff --git a/wine32/patches/patch-include_bcrypt.h b/wine32/patches/patch-include_bcrypt.h
new file mode 100644
index 0000000000..beeec29765
--- /dev/null
+++ b/wine32/patches/patch-include_bcrypt.h
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Use parantheses around expression to prevent gcc from complaining
+when using -D_FORTIFY_SOURCE=2 flag
+
+--- include/bcrypt.h.orig	2019-08-14 15:05:32.929387224 +0000
++++ include/bcrypt.h
+@@ -91,7 +91,7 @@ typedef LONG NTSTATUS;
+ #define BCRYPT_CHAIN_MODE_ECB       (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','E','C','B',0}
+ #define BCRYPT_CHAIN_MODE_CFB       (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','C','F','B',0}
+ #define BCRYPT_CHAIN_MODE_CCM       (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','C','C','M',0}
+-#define BCRYPT_CHAIN_MODE_GCM       (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','G','C','M',0}
++#define BCRYPT_CHAIN_MODE_GCM       ((const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','G','C','M',0})
+ 
+ #define BCRYPT_ECDSA_PUBLIC_P256_MAGIC  0x31534345
+ #define BCRYPT_ECDSA_PRIVATE_P256_MAGIC 0x32534345