wine64: Set configure args to use specific fontconfig and freetype libs

[Naveen Narayanan <zerous@nocebo.space>]

Module Name:	pkgsrc-wip
Committed By:	Naveen Narayanan <zerous@nocebo.space>
Pushed By:	zerous
Date:		Thu Aug 1 01:14:53 2019 +0200
Changeset:	c63fa4ffb6881e6ae8146bff795e22415716bfa2

Modified Files:
	wine64/Makefile

Log Message:
wine64: Set configure args to use specific fontconfig and freetype libs

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

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

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

diffs:
diff --git a/wine64/Makefile b/wine64/Makefile
index bf8038184f..441030eb88 100644
--- a/wine64/Makefile
+++ b/wine64/Makefile
@@ -14,9 +14,12 @@ ONLY_FOR_PLATFORM+=	*-*-x86_64
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-tests
 WINE32_ARGS+=		--with-wine64=${BUILD64}
+WINE32_ARGS+=		--with-freetype=${PREFIX}/emul/netbsd32/lib/freetype2
+WINE32_ARGS+=		--with-fontconfig=${PREFIX}/emul/netbsd32/lib/fontconfig
 WINE32_ARGS+=		--libdir=${PREFIX}/emul/netbsd32/lib/wine
 WINE64_ARGS+=		--enable-win64
 WINE64_ARGS+=		--libdir=${PREFIX}/lib
+
 WINE32_ENV+=		CFLAGS+=-m32
 
 # XXX: Fix warning due to _FORTIFY_SOURCE being redefined
@@ -39,12 +42,6 @@ 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
-	cd ${BUILDLINK_X11_DIR:Q}/emul/netbsd32/lib && find . -name "*freetype*" -maxdepth 1 -type l -delete
-	cd ${WRKSRC} && autoconf
-
 do-configure:
 	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}