diff options
| author | jmcneill <jmcneill@pkgsrc.org> | 2008-11-23 17:24:55 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill@pkgsrc.org> | 2008-11-23 17:24:55 +0000 |
| commit | 05384bd49f4a6bb448e3be5244bd545115809194 (patch) | |
| tree | e87fb48b3c688f2fc896c210af8747c3995123bf /emulators/suse100_fontconfig | |
| parent | 0fd155e258f3341f44569cc77e4d8594140ac876 (diff) | |
| download | pkgsrc-05384bd49f4a6bb448e3be5244bd545115809194.tar.gz | |
Use X11BASE instead of X11PREFIX to generate font search paths.
Diffstat (limited to 'emulators/suse100_fontconfig')
| -rw-r--r-- | emulators/suse100_fontconfig/Makefile | 6 | ||||
| -rw-r--r-- | emulators/suse100_fontconfig/files/generate.awk | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/emulators/suse100_fontconfig/Makefile b/emulators/suse100_fontconfig/Makefile index aac370826d5..6d2e0b19c46 100644 --- a/emulators/suse100_fontconfig/Makefile +++ b/emulators/suse100_fontconfig/Makefile @@ -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 @@ EMUL_MODULES.linux= expat freetype2 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 --git a/emulators/suse100_fontconfig/files/generate.awk b/emulators/suse100_fontconfig/files/generate.awk index 2560cb1b323..a937856a5d8 100644 --- a/emulators/suse100_fontconfig/files/generate.awk +++ b/emulators/suse100_fontconfig/files/generate.awk @@ -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 @@ BEGIN { 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 |