compat32_fontconfig: Set _PKG_CONFIG_LIBDIR & unlink *freetype* files from /usr/pkg/lib

[Naveen Narayanan <zerous@nocebo.space>]

Module Name:	pkgsrc-wip
Committed By:	Naveen Narayanan <zerous@nocebo.space>
Pushed By:	zerous
Date:		Wed Aug 21 11:32:45 2019 +0200
Changeset:	76a7cb04b078505f520425deadc8797f0b357caf

Modified Files:
	compat32_fontconfig/Makefile

Log Message:
compat32_fontconfig: Set _PKG_CONFIG_LIBDIR & unlink *freetype* files from /usr/pkg/lib

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

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

diffstat:
 compat32_fontconfig/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diffs:
diff --git a/compat32_fontconfig/Makefile b/compat32_fontconfig/Makefile
index a6c27ca410..2d00070819 100644
--- a/compat32_fontconfig/Makefile
+++ b/compat32_fontconfig/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+=	--x-libraries=${PREFIX}/emul/netbsd32/lib
 CONFIGURE_ENV+=		HASDOCBOOK=no
 
 PKGCONFIG_OVERRIDE=	fontconfig.pc.in
-_PKG_CONFIG_LIBDIR=	${BUILDLINK_DIR}/emul/netbsd32/lib/pkgconfig:${BUILDLINK_DIR}/lib/pkgconfig:${BUILDLINK_DIR}/share/pkgconfig
+_PKG_CONFIG_LIBDIR=	${BUILDLINK_DIR}/emul/netbsd32/lib/pkgconfig:${BUILDLINK_DIR}/emul/netbsd32/lib/freetype2/pkgconfig:${BUILDLINK_DIR}/lib/pkgconfig:${BUILDLINK_DIR}/share/pkgconfig
 
 PKG_SYSCONFSUBDIR=	fontconfig
 
@@ -100,6 +100,7 @@ CONFIGURE_ENV+=	CC_FOR_BUILD=${NATIVE_CC:Q}
 pre-configure:
 	cd ${BUILDLINK_X11_DIR} && ${FIND} . -path "*fontconfig*" -type l -delete
 	cd ${BUILDLINK_X11_DIR}/emul/netbsd32/lib && find . -name "*freetype*" -maxdepth 1 -type l -delete && find ./pkgconfig/ -name "*freetype2.pc*" -type l -delete
+	cd ${BUILDLINK_X11_DIR}/lib && find . -name "*freetype*" -type l -delete && find ./pkgconfig/ -name "*freetype2.pc*" -type l -delete
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/30-pkgsrc-aliases.conf ${DESTDIR}${TMPLDIR}