diff options
| author | rafan <rafan@FreeBSD.org> | 2006-11-27 02:12:11 +0800 |
|---|---|---|
| committer | rafan <rafan@FreeBSD.org> | 2006-11-27 02:12:11 +0800 |
| commit | 1cd24608e1a4311beded4c3ea4c29440b353bd10 (patch) | |
| tree | ad71f8f60f30a28c1bfca7d8a7c0154e22d7f6c9 | |
| parent | bf877cc046a1f2d659a659bca71ecee7cba487c4 (diff) | |
| download | freebsd-ports-gnome-1cd24608e1a4311beded4c3ea4c29440b353bd10.tar.gz freebsd-ports-gnome-1cd24608e1a4311beded4c3ea4c29440b353bd10.tar.zst freebsd-ports-gnome-1cd24608e1a4311beded4c3ea4c29440b353bd10.zip | |
- Repsect X11BASE. This should fix chinese/*ttf build failure with
non-standard X11BASE.
Reported by: pointyhat
| -rw-r--r-- | chinese/ttfm/Makefile | 6 | ||||
| -rw-r--r-- | chinese/ttfm/files/patch-modules::gscjk.ttfm | 13 | ||||
| -rw-r--r-- | chinese/ttfm/files/patch-modules_xttfm.ttfm | 15 | ||||
| -rw-r--r-- | chinese/ttfm/files/patch-ttfm.sh | 4 |
4 files changed, 32 insertions, 6 deletions
diff --git a/chinese/ttfm/Makefile b/chinese/ttfm/Makefile index 4ac4917c8d10..3b04ae29ca65 100644 --- a/chinese/ttfm/Makefile +++ b/chinese/ttfm/Makefile @@ -20,6 +20,12 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 PORTDOCS= README USAGE MAN1= ttfm.sh.1 +post-patch: + @${REINPLACE_CMD} -e 's,%%X11BASE%%,${X11BASE},' \ + -e 's,%%PREFIX%%,${PREFIX},' \ + ${WRKSRC}/modules/gscjk.ttfm \ + ${WRKSRC}/modules/xttfm.ttfm + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ttfinfo ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/ttfm.sh ${PREFIX}/bin diff --git a/chinese/ttfm/files/patch-modules::gscjk.ttfm b/chinese/ttfm/files/patch-modules::gscjk.ttfm index 3f326593323a..c7771a38c695 100644 --- a/chinese/ttfm/files/patch-modules::gscjk.ttfm +++ b/chinese/ttfm/files/patch-modules::gscjk.ttfm @@ -1,5 +1,14 @@ ---- modules/gscjk.ttfm.orig Wed Sep 24 17:51:46 2003 -+++ modules/gscjk.ttfm Sat Feb 19 09:14:28 2005 +--- ./modules/gscjk.ttfm.orig Wed Sep 24 17:51:46 2003 ++++ ./modules/gscjk.ttfm Mon Nov 27 02:06:36 2006 +@@ -18,7 +18,7 @@ + + # Global constants + +-export PREFIX; PREFIX=/usr/local ++export PREFIX; PREFIX=%%PREFIX%% + export TTFINFOPath; TTFINFOPath="${PREFIX}/bin/ttfinfo" + export GS6Path; GS6Path="${PREFIX}/share/ghostscript" + export GS6CJKPath; GS6CJKPath="${GS6Path}/Resource" @@ -148,9 +148,8 @@ remove_fonts() { diff --git a/chinese/ttfm/files/patch-modules_xttfm.ttfm b/chinese/ttfm/files/patch-modules_xttfm.ttfm index 8648991f6037..e045e9caac97 100644 --- a/chinese/ttfm/files/patch-modules_xttfm.ttfm +++ b/chinese/ttfm/files/patch-modules_xttfm.ttfm @@ -1,5 +1,16 @@ ---- modules/xttfm.ttfm.orig Tue Nov 4 07:08:32 2003 -+++ modules/xttfm.ttfm Sun Aug 28 18:03:43 2005 +--- ./modules/xttfm.ttfm.orig Tue Nov 4 07:08:32 2003 ++++ ./modules/xttfm.ttfm Mon Nov 27 02:06:25 2006 +@@ -25,8 +25,8 @@ + + # Global constants + +-export PREFIX; PREFIX=/usr/local +-export X11BASE; X11BASE=/usr/X11R6 ++export PREFIX; PREFIX=%%PREFIX%% ++export X11BASE; X11BASE=%%X11BASE%% + export PATH; PATH=/bin:/sbin:/usr/bin:/usr/sbin:$PREFIX/bin:$PREFIX/sbin:$X11BASE/bin + export TEMPFILE; TEMPFILE="`mktemp /tmp/ttfm.tmpXXX`" + export DefaultFontPath; DefaultFontPath=$PREFIX/share/fonts/TrueType @@ -87,15 +87,11 @@ targetname=`basename $f` diff --git a/chinese/ttfm/files/patch-ttfm.sh b/chinese/ttfm/files/patch-ttfm.sh index cf6e19780eab..3a741299074d 100644 --- a/chinese/ttfm/files/patch-ttfm.sh +++ b/chinese/ttfm/files/patch-ttfm.sh @@ -1,5 +1,5 @@ ---- ttfm.sh.orig Wed Jan 31 17:34:46 2001 -+++ ttfm.sh Sat Feb 19 09:14:56 2005 +--- ./ttfm.sh.orig Wed Jan 31 17:34:46 2001 ++++ ./ttfm.sh Mon Nov 27 02:03:54 2006 @@ -258,7 +258,7 @@ # Call script with --remove for i in "$INSTALLSCRIPT"; do |