CVS commit: pkgsrc/fonts/fontconfig

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Sep 18 13:18:20 UTC 2016

Modified Files:
        pkgsrc/fonts/fontconfig: Makefile

Log Message:
Fix build with native X.org.

The installed version of this library was found and used instead of the
one build by the package, leading to problems when the pkgsrc one had
symbols the native one doesn't have. Add libtool path to compiler
search path to fix this.

>From spz.


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 pkgsrc/fonts/fontconfig/Makefile

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

Modified files:

Index: pkgsrc/fonts/fontconfig/Makefile
diff -u pkgsrc/fonts/fontconfig/Makefile:1.96 pkgsrc/fonts/fontconfig/Makefile:1.97
--- pkgsrc/fonts/fontconfig/Makefile:1.96       Fri Aug 19 12:52:30 2016
+++ pkgsrc/fonts/fontconfig/Makefile    Sun Sep 18 13:18:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2016/08/19 12:52:30 wiz Exp $
+# $NetBSD: Makefile,v 1.97 2016/09/18 13:18:20 wiz Exp $
 
 DISTNAME=      fontconfig-2.12.1
 CATEGORIES=    fonts
@@ -86,6 +86,10 @@ TEST_TARGET= check
 CONFIGURE_ENV+=        CC_FOR_BUILD=${NATIVE_CC:Q}
 .endif
 
+.if ${X11_TYPE} != "modular" && exists(${X11BASE}/lib/libfontconfig.so)
+LDFLAGS+=      -L../src/.libs
+.endif
+
 post-install:
        ${INSTALL_DATA} ${FILESDIR}/30-pkgsrc-aliases.conf ${DESTDIR}${TMPLDIR}