[pkgsrc/pkgsrc-2003Q4]: pkgsrc/fonts/fontconfig Pullup correct operation fix ...

[agc <agc%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/937abd96f64b
branches:  pkgsrc-2003Q4
changeset: 463716:937abd96f64b
user:      agc <agc%pkgsrc.org@localhost>
date:      Sat Dec 20 19:49:01 2003 +0000

description:
Pullup correct operation fix to the pkgsrc-2003Q4 branch, requested by
Ingolf Steinbach.

        revision 1.19
        date: 2003/12/04 23:28:10;  author: dmcmahill;  state: Exp;  lines: +7 -2
        If X11PREFIX and X11BASE are not the same, which happens with xpkgwedge,
        then add both to the font path instead of just X11PREFIX.  Makes this pkg
        work with xpkgwedge.

diffstat:

 fonts/fontconfig/Makefile |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (23 lines):

diff -r fa2d76108660 -r 937abd96f64b fonts/fontconfig/Makefile
--- a/fonts/fontconfig/Makefile Sat Dec 20 19:40:53 2003 +0000
+++ b/fonts/fontconfig/Makefile Sat Dec 20 19:49:01 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/10/29 05:45:15 reed Exp $
+# $NetBSD: Makefile,v 1.18.2.1 2003/12/20 19:49:01 agc Exp $
 #
 
 DISTNAME=      fontconfig-2.2.1
@@ -32,7 +32,12 @@
 CONFIGURE_ARGS+=       --with-expat-lib=${BUILDLINK_PREFIX.expat}/lib
 CONFIGURE_ARGS+=       --with-confdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --with-x
-CONFIGURE_ARGS+=       --with-add-fonts=${X11PREFIX}/lib/X11/fonts/TTF,${X11PREFIX}/lib/X11/fonts/Type1
+FONT_PATH=             ${X11PREFIX}/lib/X11/fonts/TTF,${X11PREFIX}/lib/X11/fonts/Type1
+.include "../../mk/bsd.prefs.mk"
+.if ${X11BASE} != ${X11PREFIX}
+FONT_PATH2=            ,${X11BASE}/lib/X11/fonts,${X11BASE}/lib/X11/fonts/TTF,${X11BASE}/lib/X11/fonts/Type1
+.endif
+CONFIGURE_ARGS+=       --with-add-fonts=${FONT_PATH}${FONT_PATH2}
 
 EGDIR=         ${PREFIX}/share/examples/fontconfig
 CONF_FILES=    ${EGDIR}/fonts.conf ${PKG_SYSCONFDIR}/fonts.conf