summaryrefslogtreecommitdiff
path: root/fonts
diff options
context:
space:
mode:
authordmcmahill <dmcmahill>2003-12-04 23:28:10 +0000
committerdmcmahill <dmcmahill>2003-12-04 23:28:10 +0000
commite5ebd6dd0ff0dc9be5c1d55787e2426ddc9089f4 (patch)
tree5c76f3401f6e2ea976114e1959e3216cee631a3a /fonts
parenta8273e8a8092f699b020dcd5af83e264b954726e (diff)
downloadpkgsrc-e5ebd6dd0ff0dc9be5c1d55787e2426ddc9089f4.tar.gz
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 (limited to 'fonts')
-rw-r--r--fonts/fontconfig/Makefile9
1 files changed, 7 insertions, 2 deletions
diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile
index 81d5aeb1d45..cc042ce4f02 100644
--- a/fonts/fontconfig/Makefile
+++ b/fonts/fontconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/10/29 05:45:15 reed Exp $
+# $NetBSD: Makefile,v 1.19 2003/12/04 23:28:10 dmcmahill Exp $
#
DISTNAME= fontconfig-2.2.1
@@ -32,7 +32,12 @@ CONFIGURE_ARGS+= --with-expat-includes=${BUILDLINK_PREFIX.expat}/include
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