[pkgsrc/trunk]: pkgsrc/fonts/fontconfig Clean up additional font path. OK'd ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/57224af30c60
branches:  trunk
changeset: 498929:57224af30c60
user:      hira <hira%pkgsrc.org@localhost>
date:      Mon Sep 05 15:18:42 2005 +0000

description:
Clean up additional font path.  OK'd by reed@.

If you installed fontconfig-2.3.2, please remove <dir></dir> entry
from ${LOCALBASE}/etc/fontconfig/fonts.conf.

diffstat:

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

diffs (25 lines):

diff -r 1c13190d7fec -r 57224af30c60 fonts/fontconfig/Makefile
--- a/fonts/fontconfig/Makefile Mon Sep 05 15:11:39 2005 +0000
+++ b/fonts/fontconfig/Makefile Mon Sep 05 15:18:42 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2005/07/28 16:40:03 reed Exp $
+# $NetBSD: Makefile,v 1.45 2005/09/05 15:18:42 hira Exp $
 #
 
 DISTNAME=      fontconfig-2.3.2
@@ -35,13 +35,9 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined($X11PREFIX) && (${LOCALBASE} != {$X11PREFIX})
-FONT_PATH=     ${X11PREFIX}/lib/X11/fonts
+.if (${X11BASE} != ${LOCALBASE})
+CONFIGURE_ARGS+=       --with-add-fonts=${X11BASE}/lib/X11/fonts
 .endif
-.if (${X11PREFIX} != ${X11BASE})
-FONT_PATH2=    ,${X11BASE}/lib/X11/fonts
-.endif
-CONFIGURE_ARGS+=       --with-add-fonts=${FONT_PATH}${FONT_PATH2}
 
 EGDIR=         ${PREFIX}/share/examples/fontconfig
 CONF_FILES=    ${EGDIR}/fonts.conf ${PKG_SYSCONFDIR}/fonts.conf