Move fontpath from /usr/local/lib/X11/fonts to /usr/local/share/fonts to match

XDG_DATA_DIR (where Desktop tools will look for by default).

discussed with sthen@ and matthieu@
ok sthen@
This commit is contained in:
ajacoutot
2015-03-31 09:44:48 +00:00
parent ef90cabab4
commit 0bad5217f7
25 changed files with 103 additions and 120 deletions
+2 -2
View File
@@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.28 2015/01/21 06:13:46 bentley Exp $
# $OpenBSD: Makefile,v 1.29 2015/03/31 09:44:48 ajacoutot Exp $
COMMENT= big5/gb enhanced truetype font manager
DISTNAME= ttfm-0.9.5
PKGNAME= zh-${DISTNAME}
REVISION= 2
REVISION= 3
CATEGORIES= chinese
# BSD/X11
+7 -11
View File
@@ -1,19 +1,15 @@
$OpenBSD: patch-modules_xttfm_ttfm,v 1.3 2013/03/11 20:59:05 sthen Exp $
--- modules/xttfm.ttfm.orig Mon Nov 3 23:08:32 2003
+++ modules/xttfm.ttfm Mon Mar 11 20:42:44 2013
@@ -28,9 +28,9 @@ export VERSION; VERSION=0.9.3
$OpenBSD: patch-modules_xttfm_ttfm,v 1.4 2015/03/31 09:44:48 ajacoutot Exp $
--- modules/xttfm.ttfm.orig Tue Nov 4 00:08:32 2003
+++ modules/xttfm.ttfm Mon Mar 30 16:36:08 2015
@@ -28,7 +28,7 @@ export VERSION; VERSION=0.9.3
export PREFIX; PREFIX=/usr/local
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 TEMPFILE; TEMPFILE="`mktemp /tmp/ttfm.tmpXXXXXXXXXX`"
+export DefaultFontPath; DefaultFontPath=$PREFIX/lib/X11/fonts/TrueType
+export XTTFFONTPATH; XTTFFONTPATH="${PREFIX}/lib/X11/fonts/TrueType"
+export TEMPFILE; TEMPFILE="`mktemp /tmp/ttfm.tmp.XXXXXXXXXX`"
export DefaultFontPath; DefaultFontPath=$PREFIX/share/fonts/TrueType
export XTTFFONTPATH; XTTFFONTPATH="${X11BASE}/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"
@@ -108,11 +108,6 @@ remove_fonts()
sed -e "/$ALIASPATTERN/d" $XTTFFONTPATH/fonts.alias > $TEMPFILE
mv -f $TEMPFILE $XTTFFONTPATH/fonts.alias
-12
View File
@@ -1,12 +0,0 @@
$OpenBSD: patch-ttfm_sh,v 1.1 2011/07/08 09:41:46 jasper Exp $
--- ttfm.sh.orig Wed Jan 31 10:34:46 2001
+++ ttfm.sh Fri Jul 8 11:36:15 2011
@@ -40,7 +40,7 @@ VERSION=0.9.3
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.