[pkgsrc/trunk]: pkgsrc/emulators/suse100_fontconfig Use X11BASE instead of X1...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f1b78be97815
branches:  trunk
changeset: 550518:f1b78be97815
user:      jmcneill <jmcneill%pkgsrc.org@localhost>
date:      Sun Nov 23 17:24:55 2008 +0000

description:
Use X11BASE instead of X11PREFIX to generate font search paths.

diffstat:

 emulators/suse100_fontconfig/Makefile           |   6 +++---
 emulators/suse100_fontconfig/files/generate.awk |  12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diffs (60 lines):

diff -r 7e92a26899f8 -r f1b78be97815 emulators/suse100_fontconfig/Makefile
--- a/emulators/suse100_fontconfig/Makefile     Sun Nov 23 16:22:50 2008 +0000
+++ b/emulators/suse100_fontconfig/Makefile     Sun Nov 23 17:24:55 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2007/08/24 09:57:42 tron Exp $
+# $NetBSD: Makefile,v 1.9 2008/11/23 17:24:55 jmcneill Exp $
 
 DISTNAME=      suse_fontconfig-${SUSE_VERSION}
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    emulators
 DISTFILES=     fontconfig-2.3.2.20050721-10.2.${SUSE_ARCH}.rpm
 
@@ -15,7 +15,7 @@
 PLIST_SRC=     ${PKGDIR}/PLIST ${RPM2PKG_PLIST}
 
 do-build:
-       ${SETENV} LOCALBASE=${LOCALBASE:Q} X11PREFIX=${X11PREFIX:Q}     \
+       ${SETENV} LOCALBASE=${LOCALBASE:Q} X11BASE=${X11BASE:Q} \
        ${AWK} -f ${FILESDIR}/generate.awk ${FILESDIR}/local.conf.in    \
                > ${WRKSRC}/local.conf
 
diff -r 7e92a26899f8 -r f1b78be97815 emulators/suse100_fontconfig/files/generate.awk
--- a/emulators/suse100_fontconfig/files/generate.awk   Sun Nov 23 16:22:50 2008 +0000
+++ b/emulators/suse100_fontconfig/files/generate.awk   Sun Nov 23 17:24:55 2008 +0000
@@ -1,13 +1,13 @@
-# $NetBSD: generate.awk,v 1.1 2007/08/23 20:42:32 jlam Exp $
+# $NetBSD: generate.awk,v 1.2 2008/11/23 17:24:56 jmcneill Exp $
 #
 # AWK script to replace @FONTDIR_ENTRIES@ with a list of <dir></dir>
 # entries taken from the "entries" array.  We do variable replacement
-# for ${LOCALBASE} and ${X11PREFIX} using the values of LOCALBASE and
-# X11PREFIX that are passed to the script.
+# for ${LOCALBASE} and ${X11BASE} using the values of LOCALBASE and
+# X11BASE that are passed to the script.
 #
 
 BEGIN {
-       entries[0]  = "${X11PREFIX}/lib/X11/fonts"
+       entries[0]  = "${X11BASE}/lib/X11/fonts"
        entries[1]  = "${LOCALBASE}/OpenOffice.org1.1.5/share/fonts"
        entries[2]  = "${LOCALBASE}/openoffice.org2.2/share/fonts"
        entries[3]  = "${LOCALBASE}/java/blackdown-1.3.1/lib/fonts"
@@ -22,14 +22,14 @@
        num_entries = 12
 
        LOCALBASE = ENVIRON["LOCALBASE"] ? ENVIRON["LOCALBASE"] : "/usr/pkg"
-       X11PREFIX = ENVIRON["X11PREFIX"] ? ENVIRON["X11PREFIX"] : "/usr/X11R6"
+       X11BASE = ENVIRON["X11BASE"] ? ENVIRON["X11BASE"] : "/usr/X11R6"
 }
 
 /^@FONTDIR_ENTRIES@/ {
        for (i = 0; i < num_entries; i++) {
                entry = entries[i]
                sub("[$]{LOCALBASE}", LOCALBASE, entry)
-               sub("[$]{X11PREFIX}", X11PREFIX, entry)
+               sub("[$]{X11BASE}", X11BASE, entry)
                print " <dir>" entry "</dir>"
        }
        next