wine64: Remove redundant env vars for wine 32-bit build

[Naveen Narayanan <zerous@nocebo.space>]

Module Name:	pkgsrc-wip
Committed By:	Naveen Narayanan <zerous@nocebo.space>
Pushed By:	zerous
Date:		Wed Jul 24 00:49:15 2019 +0200
Changeset:	993db32540644df340c167361c8b25ca44c70246

Modified Files:
	wine64/Makefile

Log Message:
wine64: Remove redundant env vars for wine 32-bit build

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

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

diffstat:
 wine64/Makefile | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diffs:
diff --git a/wine64/Makefile b/wine64/Makefile
index f7e54ed939..0e49c9263f 100644
--- a/wine64/Makefile
+++ b/wine64/Makefile
@@ -13,15 +13,16 @@ 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+=		--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+=		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
 
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		bison flex gmake mktemp msgfmt autoconf perl
@@ -37,6 +38,7 @@ post-extract:
 	${MKDIR} ${BUILD32}
 	${MKDIR} ${BUILD64}
 
+# XXX: Unlink libs and *.pc files of fontconfig and freetype that comes with compat80-x11
 pre-configure:
 	cd ${BUILDLINK_X11_DIR:Q}/emul/netbsd32/lib && find . -name "*fontconfig*" -maxdepth 1 -type l -delete && find ./pkgconfig/ -name "*fontconfig.pc*" -type l -delete
 	cd ${BUILDLINK_X11_DIR:Q}/emul/netbsd32/lib && find . -name "*freetype*" -maxdepth 1 -type l -delete && find ./pkgconfig/ -name "*freetype2.pc*" -type l -delete
@@ -54,19 +56,19 @@ do-install:
 	cd ${BUILD32} && ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ${MAKE} ${INSTALL_MAKE_FLAGS} install
 	cd ${BUILD64} && ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ${MAKE} ${INSTALL_MAKE_FLAGS} install
 
-.include "../../wip/freetype2-32/buildlink3.mk"
-.include "../../wip/giflib-32/buildlink3.mk"
-.include "../../wip/lcms2-32/buildlink3.mk"
-.include "../../wip/png-32/buildlink3.mk"
-.include "../../wip/tiff-32/buildlink3.mk"
-.include "../../wip/fontconfig-32/buildlink3.mk"
-#.include "../../security/gnutls/buildlink3.mk"
-.include "../../wip/mit-krb5-32/buildlink3.mk"
-#.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../wip/libxml2-32/buildlink3.mk"
-.include "../../wip/libxslt-32/buildlink3.mk"
+.include "../../wip/compat32_freetype2/buildlink3.mk"
+.include "../../wip/compat32_giflib/buildlink3.mk"
+.include "../../wip/compat32_lcms2/buildlink3.mk"
+.include "../../wip/compat32_png/buildlink3.mk"
+.include "../../wip/compat32_tiff/buildlink3.mk"
+.include "../../wip/compat32_fontconfig/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
+.include "../../wip/compat32_mit-krb5/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../wip/compat32_libxml2/buildlink3.mk"
+.include "../../wip/compat32_libxslt/buildlink3.mk"
 .include "../../wip/compat80-x11/buildlink3.mk"
-.include "../../wip/jpeg-32/buildlink3.mk"
+.include "../../wip/compat32_jpeg/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"