From 264446b6be5305fb714361d1c94df0473762d8d3 Mon Sep 17 00:00:00 2001 From: Rong-En Fan Date: Wed, 19 Jun 2013 16:03:12 +0000 Subject: - Fix ttfm's xttfm module to really update fonts.{dir,scale} to reflect the fonts installed - Bump PORTREVISION for all ports using chinese/ttfm/Makefile.ttf PR: ports/179608 Reported by: Antoine Brodin (antoine@) Tested by: Antoine Brodin (antoine@) --- chinese/CJKUnifonts/Makefile | 1 + chinese/CNS11643-font/Makefile | 2 +- chinese/arphicttf/Makefile | 2 +- chinese/cwtexttf/Makefile | 2 +- chinese/fireflyttf/Makefile | 2 +- chinese/moettf/Makefile | 2 +- chinese/opendesktop-fonts/Makefile | 2 +- chinese/ttfm/Makefile | 2 +- chinese/ttfm/files/patch-modules_xttfm.ttfm | 26 +++++++++++++++++++++++--- vietnamese/urwvn/Makefile | 2 +- vietnamese/vietunicode-hannom/Makefile | 2 +- vietnamese/vietunicode-trichlor/Makefile | 2 +- vietnamese/vietunicode-web1/Makefile | 2 +- 13 files changed, 35 insertions(+), 14 deletions(-) diff --git a/chinese/CJKUnifonts/Makefile b/chinese/CJKUnifonts/Makefile index daf6efd125fd..32d31d2eddf6 100644 --- a/chinese/CJKUnifonts/Makefile +++ b/chinese/CJKUnifonts/Makefile @@ -7,6 +7,7 @@ PORTNAME= CJKUnifonts PORTVERSION= 0.2.20080216.1 +PORTREVISION= 1 CATEGORIES= chinese x11-fonts MASTER_SITES= LOCAL/chinsan/fonts/:uming \ http://ftp.debian.org/debian/pool/main/t/ttf-arphic-uming/:uming \ diff --git a/chinese/CNS11643-font/Makefile b/chinese/CNS11643-font/Makefile index 1962b36f1b00..3ccf85ae38fa 100644 --- a/chinese/CNS11643-font/Makefile +++ b/chinese/CNS11643-font/Makefile @@ -3,7 +3,7 @@ PORTNAME= CNS11643-font PORTVERSION= 98.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= chinese x11-fonts MASTER_SITES= http://www.cns11643.gov.tw/AIDB/file.do?path=download/%E5%AD%97%E5%9E%8B%E4%B8%8B%E8%BC%89%601q%60%E5%85%A8%E5%AD%97%E5%BA%AB%E6%AD%A3%E6%A5%B7%E9%AB%94/name/:kai \ http://www.cns11643.gov.tw/AIDB/file.do?path=download/%E5%AD%97%E5%9E%8B%E4%B8%8B%E8%BC%89%601q%60%E5%85%A8%E5%AD%97%E5%BA%AB%E6%AD%A3%E5%AE%8B%E9%AB%94/name/:sung diff --git a/chinese/arphicttf/Makefile b/chinese/arphicttf/Makefile index 937e9908f2bf..8f128933dba6 100644 --- a/chinese/arphicttf/Makefile +++ b/chinese/arphicttf/Makefile @@ -7,7 +7,7 @@ PORTNAME= arphicttf PORTVERSION= 2.11 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= chinese x11-fonts MASTER_SITES= LOCAL/rafan/chinese/ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION} diff --git a/chinese/cwtexttf/Makefile b/chinese/cwtexttf/Makefile index 6eedbe0b4cf4..1d5e31668216 100644 --- a/chinese/cwtexttf/Makefile +++ b/chinese/cwtexttf/Makefile @@ -7,7 +7,7 @@ PORTNAME= cwtexttf PORTVERSION= 1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= chinese x11-fonts MASTER_SITES= http://ftp.wustl.edu/pub/FreeBSD/distfiles/ \ http://ftp.jaist.ac.jp/pub/FreeBSD/distfiles/ diff --git a/chinese/fireflyttf/Makefile b/chinese/fireflyttf/Makefile index 7a06e6ddc46f..8529ae2515be 100644 --- a/chinese/fireflyttf/Makefile +++ b/chinese/fireflyttf/Makefile @@ -3,7 +3,7 @@ PORTNAME= fireflyttf PORTVERSION= 1.3.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= chinese x11-fonts MASTER_SITES?= http://firefly.idv.tw/apt/firefly-font/ \ http://www.study-area.org/apt/firefly-font/ diff --git a/chinese/moettf/Makefile b/chinese/moettf/Makefile index ab202141cc5e..ea8f46c056aa 100644 --- a/chinese/moettf/Makefile +++ b/chinese/moettf/Makefile @@ -7,7 +7,7 @@ PORTNAME= moettf PORTVERSION= 2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= chinese x11-fonts MASTER_SITES= http://ftp.riken.go.jp/pub/FreeBSD/distfiles/zh-moettf/ \ http://ftp.math.uni-bielefeld.de/pub/unix/FreeBSD/distfiles/zh-moettf/ diff --git a/chinese/opendesktop-fonts/Makefile b/chinese/opendesktop-fonts/Makefile index dbc9062ff361..789fb29a9c4a 100644 --- a/chinese/opendesktop-fonts/Makefile +++ b/chinese/opendesktop-fonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= opendesktop-fonts PORTVERSION= 1.4.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= chinese x11-fonts MASTER_SITES?= ftp://ftp.opendesktop.org.tw/odp/ODOFonts/OpenFonts/ \ LOCAL/chinsan/fonts diff --git a/chinese/ttfm/Makefile b/chinese/ttfm/Makefile index 57825b1116ec..b47d50af8fc1 100644 --- a/chinese/ttfm/Makefile +++ b/chinese/ttfm/Makefile @@ -7,7 +7,7 @@ PORTNAME= ttfm PORTVERSION= 0.9.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= chinese print MASTER_SITES= LOCAL/rafan/chinese diff --git a/chinese/ttfm/files/patch-modules_xttfm.ttfm b/chinese/ttfm/files/patch-modules_xttfm.ttfm index a786db8441fa..9bea10cfa422 100644 --- a/chinese/ttfm/files/patch-modules_xttfm.ttfm +++ b/chinese/ttfm/files/patch-modules_xttfm.ttfm @@ -1,5 +1,5 @@ ---- ./modules/xttfm.ttfm.orig Tue Nov 4 07:08:32 2003 -+++ ./modules/xttfm.ttfm Mon Nov 27 02:06:25 2006 +--- modules/xttfm.ttfm.orig 2003-11-04 07:08:32.000000000 +0800 ++++ modules/xttfm.ttfm 2013-06-18 01:32:45.000000000 +0800 @@ -25,8 +25,8 @@ # Global constants @@ -11,9 +11,16 @@ 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 @@ +@@ -86,16 +86,18 @@ + for f in "$@"; do targetname=`basename $f` ++ # 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" ++ # Update fonts.scale - rm -f $TEMPFILE - if [ ! -r $XTTFFONTPATH/fonts.scale ]; then @@ -30,6 +37,19 @@ if [ -r $XTTFFONTPATH/../encodings/large/encodings.dir ]; then mkfontdir -e $XTTFFONTPATH/../encodings/large $XTTFFONTPATH else +@@ -107,12 +109,6 @@ + ALIASPATTERN=`eval echo $ALIASPATTERN` + 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 + } + @@ -133,29 +129,11 @@ fontencoding=${10} diff --git a/vietnamese/urwvn/Makefile b/vietnamese/urwvn/Makefile index 9c2910a794ed..1df656f5393c 100644 --- a/vietnamese/urwvn/Makefile +++ b/vietnamese/urwvn/Makefile @@ -7,7 +7,7 @@ PORTNAME= urwvn PORTVERSION= 3.04 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= vietnamese x11-fonts MASTER_SITES= http://vntex.org/urwvn/download/ LOCAL/chinsan DISTNAME= urwvn-${PORTVERSION}-ttf diff --git a/vietnamese/vietunicode-hannom/Makefile b/vietnamese/vietunicode-hannom/Makefile index b83334e6ecec..86f903509426 100644 --- a/vietnamese/vietunicode-hannom/Makefile +++ b/vietnamese/vietunicode-hannom/Makefile @@ -7,7 +7,7 @@ PORTNAME= vietunicode-hannom PORTVERSION= 2005.02.06 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= vietnamese x11-fonts MASTER_SITES= SF/vietunicode/hannom/hannom%20v2005 DISTNAME= hannom diff --git a/vietnamese/vietunicode-trichlor/Makefile b/vietnamese/vietunicode-trichlor/Makefile index 4378f7cd5e21..2fba6895dfc1 100644 --- a/vietnamese/vietunicode-trichlor/Makefile +++ b/vietnamese/vietunicode-trichlor/Makefile @@ -7,7 +7,7 @@ PORTNAME= vietunicode-trichlor PORTVERSION= 2004.04.30 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= vietnamese x11-fonts MASTER_SITES= SF/vietunicode/VietFonts-TriChlor/TrichlorSet%20v2004 DISTNAME= VietFonts_TriChlor_ttf diff --git a/vietnamese/vietunicode-web1/Makefile b/vietnamese/vietunicode-web1/Makefile index 3b0aab981abd..3009dd33f269 100644 --- a/vietnamese/vietunicode-web1/Makefile +++ b/vietnamese/vietunicode-web1/Makefile @@ -7,7 +7,7 @@ PORTNAME= vietunicode-web1 PORTVERSION= 2004.04.30 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= vietnamese x11-fonts MASTER_SITES= SF/vietunicode/VietFonts-Web1/Web1%20Package%20v2004 DISTNAME= VietFontsWeb1_ttf -- cgit v1.2.3