From d3c447aad7cbe386ab51d5ca9783e55c78fcea21 Mon Sep 17 00:00:00 2001 From: kevlo Date: Sun, 21 Jan 2001 15:04:38 +0000 Subject: [PATCH] - Add LIB_DEPENDS - Fix fonts location --- chinese/ttfm/Makefile | 4 ++- chinese/ttfm/patches/patch-modules_xttfm_ttfm | 25 +++++++++++++++++++ chinese/ttfm/patches/patch-ttfm.sh | 11 ++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 chinese/ttfm/patches/patch-modules_xttfm_ttfm create mode 100644 chinese/ttfm/patches/patch-ttfm.sh diff --git a/chinese/ttfm/Makefile b/chinese/ttfm/Makefile index 1e4d5f94c1e..63d06b97e16 100644 --- a/chinese/ttfm/Makefile +++ b/chinese/ttfm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2001/01/19 02:55:18 kevlo Exp $ +# $OpenBSD: Makefile,v 1.2 2001/01/21 15:04:38 kevlo Exp $ DISTNAME= ttfm-0.9.2 PKGNAME= zh-${DISTNAME} @@ -14,6 +14,8 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ftp://freebsd.sinica.edu.tw/pub/keith/ttfm/ +LIB_DEPENDS= tiff.35::graphics/tiff + DOCS= README USAGE post-install: diff --git a/chinese/ttfm/patches/patch-modules_xttfm_ttfm b/chinese/ttfm/patches/patch-modules_xttfm_ttfm new file mode 100644 index 00000000000..cbd3602081d --- /dev/null +++ b/chinese/ttfm/patches/patch-modules_xttfm_ttfm @@ -0,0 +1,25 @@ +--- modules/xttfm.ttfm.orig Mon Dec 4 09:57:57 2000 ++++ modules/xttfm.ttfm Sun Jan 21 18:06:01 2001 +@@ -29,8 +29,8 @@ + export X11BASE; X11BASE=/usr/X11R6 + 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 +-export XTTFFONTPATH; XTTFFONTPATH="${X11BASE}/lib/X11/fonts/TrueType" ++export DefaultFontPath; DefaultFontPath=$PREFIX/lib/X11/fonts/TrueType ++export XTTFFONTPATH; XTTFFONTPATH="${PREFIX}/lib/X11/fonts/TrueType" + export TTFINFOPATH; TTFINFOPATH="${PREFIX}/bin/ttfinfo" + export AlIASPATTERN; ALIASPATTERN="\"added by ttfm - \$targetname - \$fontencoding\"" + export DEFAULTMING_NAME; DEFAULTMING_NAME="default_ming" +@@ -107,11 +107,6 @@ + sed -e "/$ALIASPATTERN/d" $XTTFFONTPATH/fonts.alias > $TEMPFILE + mv -f $TEMPFILE $XTTFFONTPATH/fonts.alias + +- # Remove font files. +- # We only remove those fonts in $DefaultFontPath which are symbolic. +- filetype=`file "$DefaultFontPath/$targetname" |grep -e "^$DefaultFontPath/$targetname: symbolic link to"` +- [ ! "X$filetype" = "X" ] && rm -f "$DefaultFontPath/$targetname" +- rm -f "$XTTFFONTPATH/$targetname" + done + } + diff --git a/chinese/ttfm/patches/patch-ttfm.sh b/chinese/ttfm/patches/patch-ttfm.sh new file mode 100644 index 00000000000..a8072f4b661 --- /dev/null +++ b/chinese/ttfm/patches/patch-ttfm.sh @@ -0,0 +1,11 @@ +--- ttfm.sh.orig Fri Jan 19 13:09:34 2001 ++++ ttfm.sh Fri Jan 19 13:14:56 2001 +@@ -40,7 +40,7 @@ + + export PREFIX; PREFIX=/usr/local + export PATH; PATH=/bin:/sbin:/usr/bin:/usr/sbin:$PREFIX/bin:$PREFIX/sbin +-export DefaultFontPath; DefaultFontPath=$PREFIX/share/fonts/TrueType ++export DefaultFontPath; DefaultFontPath=$PREFIX/lib/X11/fonts/TrueType + export ScriptDir; ScriptDir=$PREFIX/share/ttfm + export ScriptSubfix; ScriptSubfix="ttfm" + #KEEP_FONT="yes" # FreeBSD's port/package system will handle this.