wine64: Fix missing library error and remove unnecessary comments

[Naveen Narayanan <zerous@nocebo.space>]

Module Name:	pkgsrc-wip
Committed By:	Naveen Narayanan <zerous@nocebo.space>
Pushed By:	zerous
Date:		Thu Jul 25 19:35:16 2019 +0200
Changeset:	df6a0721a6499ad1069a53f812f7e5a2841d1050

Modified Files:
	wine64/Makefile

Log Message:
wine64: Fix missing library error and remove unnecessary comments

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

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

diffstat:
 wine64/Makefile | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diffs:
diff --git a/wine64/Makefile b/wine64/Makefile
index 076bff543e..066a862f72 100644
--- a/wine64/Makefile
+++ b/wine64/Makefile
@@ -13,28 +13,27 @@ LICENSE=		gnu-lgpl-v2.1
 ONLY_FOR_PLATFORM+=	*-*-x86_64
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-tests
-#WINE32_ARGS+=		--x-libraries=${PREFIX}/emul/netbsd32/lib
 WINE32_ARGS+=		--with-wine64=${BUILD64}
 WINE32_ARGS+=		--libdir=${PREFIX}/emul/netbsd32/lib/wine
 WINE64_ARGS+=		--enable-win64
 WINE64_ARGS+=		--libdir=${PREFIX}/lib
 WINE32_ENV+=		CFLAGS+=-m32
-# WINE32_ENV+=		X11_LDFLAGS+=${COMPILER_RPATH_FLAG}${PREFIX}/emul/netbsd32/lib
-# WINE32_ENV+=		X11_LDFLAGS+=-L${PREFIX}/emul/netbsd32/lib
-# WINE32_ENV+=		X11_LDFLAGS+=-lX11
-# WINE32_ENV+=		PKG_CONFIG_PATH=${PREFIX}/emul/netbsd32/lib:${PREFIX}/lib
+
+# XXX: Fix warning due to _FORTIFY_SOURCE being redefined
+WINE_ENV+=		ac_cv_c_fortify_enabled=no
 
 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
 NOT_PAX_MPROTECT_SAFE+=	bin/wine64
-# XXX: pkgsrc complains that libwine.so.1 is missing prior installation
-CHECK_SHLIBS_SKIP=	bin/wine*
+
+# XXX: pkgsrc complains that i386.so.2 is missing
+CHECK_SHLIBS_SKIP+=	emul/netbsd32/lib/wine*
+CHECK_SHLIBS_SKIP+=	bin/wine
 
 BUILD32=		${WRKSRC}/wine32
 BUILD64=		${WRKSRC}/wine64
-#_PKG_CONFIG_LIBDIR=	${BUILDLINK_DIR}/emul/netbsd32/lib/pkgconfig:${BUILDLINK_DIR}/lib/pkgconfig:${BUILDLINK_DIR}/share/pkgconfig
 
 post-extract:
 	${MKDIR} ${BUILD32}
@@ -47,12 +46,12 @@ pre-configure:
 	cd ${WRKSRC} && autoconf
 
 do-configure:
-	cd ${BUILD64} && ${SETENV} ${MAKE_ENV} ${WRKSRC}/configure ${CONFIGURE_ARGS} ${WINE64_ARGS}
-	cd ${BUILD32} && ${SETENV} ${WINE32_ENV} ${MAKE_ENV} ${WRKSRC}/configure ${CONFIGURE_ARGS} ${WINE32_ARGS}
+	cd ${BUILD64} && ${SETENV} ${WINE_ENV} ${MAKE_ENV} ${WRKSRC}/configure ${CONFIGURE_ARGS} ${WINE64_ARGS}
+	cd ${BUILD32} && ${SETENV} ${WINE_ENV} ${WINE32_ENV} ${MAKE_ENV} ${WRKSRC}/configure ${CONFIGURE_ARGS} ${WINE32_ARGS}
 
 do-build:
-	cd ${BUILD64} && ${SETENV} ${MAKE_ENV} ${MAKE} -j${MAKE_JOBS}
-	cd ${BUILD32} && ${SETENV} ${WINE32_ENV} ${MAKE_ENV} ${MAKE} -j${MAKE_JOBS}
+	cd ${BUILD64} && ${SETENV} ${MAKE_ENV} ${MAKE} -j${MAKE_JOBS:U1}
+	cd ${BUILD32} && ${SETENV} ${WINE32_ENV} ${MAKE_ENV} ${MAKE} -j${MAKE_JOBS:U1}
 
 do-install:
 	cd ${BUILD32} && ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ${MAKE} ${INSTALL_MAKE_FLAGS} install
@@ -64,7 +63,6 @@ do-install:
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
 .include "../../security/mit-krb5/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"