wine64: Unlink fontconfig & freetype libs from compat80-x11

[Naveen Narayanan <zerous@nocebo.space>]

Module Name:	pkgsrc-wip
Committed By:	Naveen Narayanan <zerous@nocebo.space>
Pushed By:	zerous
Date:		Mon Jul 22 01:35:09 2019 +0200
Changeset:	b3f599b5ccd9c0f3cec92c00ee512897283f3dbc

Modified Files:
	wine64/Makefile

Log Message:
wine64: Unlink fontconfig & freetype libs from compat80-x11

* Unlink fontconfig & freetype libs that come with compat80-x11
  package from ${PREFIX}/emul/netbsd/lib to avoid pkgsrc from picking
  and linking against them instead of the respective libs from
  fontconfig-32 and freetype-32 packages.

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

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

diffstat:
 wine64/Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diffs:
diff --git a/wine64/Makefile b/wine64/Makefile
index 322e3bdfc5..f7e54ed939 100644
--- a/wine64/Makefile
+++ b/wine64/Makefile
@@ -15,7 +15,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-tests
 WINE32_ARGS+=		--x-libraries=${PREFIX}/emul/netbsd32/lib
 WINE32_ARGS+=		--with-wine64=${BUILD64}
-WINE32_ARGS+=		--libdir=${PREFIX}/lib/32
+WINE32_ARGS+=		--libdir=${PREFIX}/emul/netbsd32/lib/wine
 WINE64_ARGS+=		--enable-win64
 WINE64_ARGS+=		--libdir=${PREFIX}/lib
 WINE32_ENV+=		CFLAGS+=-m32
@@ -27,16 +27,19 @@ 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
+NOT_PAX_MPROTECT_SAFE+=	bin/wine64
 
 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}
 	${MKDIR} ${BUILD64}
 
 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
 	cd ${WRKSRC} && autoconf
 
 do-configure:
@@ -56,6 +59,7 @@ do-install:
 .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"