- add chinese/Makefile.ttf to control install/deinstall process of all

  TrueType fonts in chinese/*ttf
- update related Makefile(s) and remove pkg-{install,pkg-deinstall,pkg-plist}
- relocate non-font files to DATADIR or DOCSDIR
- fix "unable to reomve fonts from gscjk" problem in ttfm.sh and gscjk.ttfm
- update chinese/zh-fireflyttf to 1.2.6 [1]

PR:		[1] 77438
Submitted by:	leeym
Approved by:	statue at freebsd.sinica.edu.tw

35 files changed, 261 insertions, 823 deletions

diff --git a/chinese/CJKUnifonts/Makefile b/chinese/CJKUnifonts/Makefile
index f335dbe372ad..a89673a132bd 100644
--- a/chinese/CJKUnifonts/Makefile
+++ b/chinese/CJKUnifonts/Makefile
@@ -16,27 +16,16 @@ DISTFILES=	ttf-arphic-uming_0.0.20041031-1.tar.gz \
 MAINTAINER=	statue@freebsd.netlab.cse.yzu.edu.tw
 COMMENT=	Arne TrueType Font is combine of arphic ming and kai fonts
 
-BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig \
-		ttfm.sh:${PORTSDIR}/chinese/ttfm
-RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig \
-		ttfm.sh:${PORTSDIR}/chinese/ttfm
-
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-USE_XLIB=	yes
-FONTDIR=	${PREFIX}/share/fonts/TrueType
-XFONTDIR=	${X11BASE}/lib/X11/fonts/TrueType
 
-.include <bsd.port.pre.mk>
+TTF=		ukai.ttf uming.ttf
 
 do-install:
-	@${MKDIR} ${FONTDIR}
-	@${INSTALL_DATA} ${WRKSRC}/ttf-arphic-ukai-0.0.20041031/ukai.ttf ${FONTDIR}
-	@${INSTALL_DATA} ${WRKSRC}/ttf-arphic-uming-0.0.20041031/uming.ttf ${FONTDIR}
-	@${ECHO_MSG} "===> Running ttfm.sh"
-	-@${PREFIX}/bin/ttfm.sh --add xttfm ukai.ttf
-	-@${PREFIX}/bin/ttfm.sh --add xttfm uming.ttf
-	@${ECHO_MSG} "===> Running fc-cache"
-	-@${X11BASE}/bin/fc-cache -f -v ${XFONTDIR}
+	@${MKDIR} ${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/ttf-arphic-ukai-0.0.20041031/ukai.ttf ${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/ttf-arphic-uming-0.0.20041031/uming.ttf ${FONTSDIR}
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf"
 .include <bsd.port.post.mk>
diff --git a/chinese/CJKUnifonts/pkg-plist b/chinese/CJKUnifonts/pkg-plist
deleted file mode 100644
index 15929592deb1..000000000000
--- a/chinese/CJKUnifonts/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-@unexec %D/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/ukai.ttf || true
-@unexec %D/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/uming.ttf || true
-share/fonts/TrueType/ukai.ttf
-share/fonts/TrueType/uming.ttf
-@exec %D/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/ukai.ttf || true
-@exec %D/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/uming.ttf || true
-@unexec %%X11BASE%%/bin/fc-cache -f -v %%X11BASE%%/lib/X11/fonts/TrueType || true
-@exec %%X11BASE%%/bin/fc-cache -f -v %%X11BASE%%/lib/X11/fonts/TrueType || true
-@unexec rmdir %D/share/fonts/TrueType 2>/dev/null || true
-@unexec rmdir %D/share/fonts 2>/dev/null || true
diff --git a/chinese/arnettf/Makefile b/chinese/arnettf/Makefile
index f335dbe372ad..a89673a132bd 100644
--- a/chinese/arnettf/Makefile
+++ b/chinese/arnettf/Makefile
@@ -16,27 +16,16 @@ DISTFILES=	ttf-arphic-uming_0.0.20041031-1.tar.gz \
 MAINTAINER=	statue@freebsd.netlab.cse.yzu.edu.tw
 COMMENT=	Arne TrueType Font is combine of arphic ming and kai fonts
 
-BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig \
-		ttfm.sh:${PORTSDIR}/chinese/ttfm
-RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig \
-		ttfm.sh:${PORTSDIR}/chinese/ttfm
-
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-USE_XLIB=	yes
-FONTDIR=	${PREFIX}/share/fonts/TrueType
-XFONTDIR=	${X11BASE}/lib/X11/fonts/TrueType
 
-.include <bsd.port.pre.mk>
+TTF=		ukai.ttf uming.ttf
 
 do-install:
-	@${MKDIR} ${FONTDIR}
-	@${INSTALL_DATA} ${WRKSRC}/ttf-arphic-ukai-0.0.20041031/ukai.ttf ${FONTDIR}
-	@${INSTALL_DATA} ${WRKSRC}/ttf-arphic-uming-0.0.20041031/uming.ttf ${FONTDIR}
-	@${ECHO_MSG} "===> Running ttfm.sh"
-	-@${PREFIX}/bin/ttfm.sh --add xttfm ukai.ttf
-	-@${PREFIX}/bin/ttfm.sh --add xttfm uming.ttf
-	@${ECHO_MSG} "===> Running fc-cache"
-	-@${X11BASE}/bin/fc-cache -f -v ${XFONTDIR}
+	@${MKDIR} ${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/ttf-arphic-ukai-0.0.20041031/ukai.ttf ${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/ttf-arphic-uming-0.0.20041031/uming.ttf ${FONTSDIR}
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf"
 .include <bsd.port.post.mk>
diff --git a/chinese/arnettf/pkg-plist b/chinese/arnettf/pkg-plist
deleted file mode 100644
index 15929592deb1..000000000000
--- a/chinese/arnettf/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-@unexec %D/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/ukai.ttf || true
-@unexec %D/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/uming.ttf || true
-share/fonts/TrueType/ukai.ttf
-share/fonts/TrueType/uming.ttf
-@exec %D/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/ukai.ttf || true
-@exec %D/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/uming.ttf || true
-@unexec %%X11BASE%%/bin/fc-cache -f -v %%X11BASE%%/lib/X11/fonts/TrueType || true
-@exec %%X11BASE%%/bin/fc-cache -f -v %%X11BASE%%/lib/X11/fonts/TrueType || true
-@unexec rmdir %D/share/fonts/TrueType 2>/dev/null || true
-@unexec rmdir %D/share/fonts 2>/dev/null || true
diff --git a/chinese/arphicttf/Makefile b/chinese/arphicttf/Makefile
index 5264ae7122b2..02b93c71fab0 100644
--- a/chinese/arphicttf/Makefile
+++ b/chinese/arphicttf/Makefile
@@ -15,47 +15,20 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 MAINTAINER=	statue@freebsd.netlab.cse.yzu.edu.tw
 COMMENT=	Four Chinese Big5/GB TrueType fonts made by Arphic Technology
 
-RUN_DEPENDS=	ttfm.sh:${PORTSDIR}/chinese/ttfm
-
 NO_BUILD=	yes
-SHAREMODE=	644
 WRKSRC=		${WRKDIR}/arphic
-USE_XLIB=	yes
-FONTDIR=	${PREFIX}/share/fonts/TrueType
-XFONTDIR=	${X11BASE}/lib/X11/fonts/TrueType
-INSTALL_ENV=	PKG_PREFIX=${PREFIX} WANT_GS=${WANT_GS} WITHOUT_X=${WITHOUT_X}
-
-.include <bsd.port.pre.mk>
 
-.if defined(WANT_GS)
-RUN_DEPENDS+=	${LOCALBASE}/share/ghostscript/Resource/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps
-.endif
-
-pre-fetch:
-.if defined(WANT_GS)
-	@${ECHO} "Ghostscript support will be added."
-.endif
-.if defined(WITHOUT_X)
-	@${ECHO} "X Window support will NOT be added."
-.endif
-.if !defined(WANT_GS) && !defined(WITHOUT_X)
-	@${ECHO} --
-	@${ECHO} "Type \"make WANT_GS=yes\" if you want Ghostscript support."
-	@${ECHO} "Type \"make WITHOUT_X=yes\" if you DONT want X Window support."
-	@${ECHO} "You can use them in combinations."
-	@${ECHO} --
-.endif
+TTF=		bkai00mp.ttf bsmi00lp.ttf gbsn00lp.ttf gkai00mp.ttf
 
 do-install:
-	@${MKDIR} ${FONTDIR}
-	@${INSTALL_DATA} ${WRKSRC}/font/bkai00mp.ttf ${FONTDIR}
-	@${INSTALL_DATA} ${WRKSRC}/font/bsmi00lp.ttf ${FONTDIR}
-	@${INSTALL_DATA} ${WRKSRC}/font/gbsn00lp.ttf ${FONTDIR}
-	@${INSTALL_DATA} ${WRKSRC}/font/gkai00mp.ttf ${FONTDIR}
-	@${RM} -fr ${FONTDIR}/arphic
-	@${MKDIR} ${FONTDIR}/arphic
-	@${CP} -fr ${WRKSRC}/license ${FONTDIR}/arphic
-	@${CP} -f ${WRKSRC}/logo.gif ${WRKSRC}/release.txt ${FONTDIR}/arphic
-	@${SETENV} ${INSTALL_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${MKDIR} ${FONTSDIR}
+.for ttf in ${TTF}
+	${INSTALL_DATA} ${WRKSRC}/font/${ttf} ${FONTSDIR}
+.endfor
+	@${MKDIR} ${DATADIR}
+	${CP} -fr ${WRKSRC}/license ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/logo.gif ${WRKSRC}/release.txt ${DATADIR}
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf"
 .include <bsd.port.post.mk>
diff --git a/chinese/arphicttf/pkg-deinstall b/chinese/arphicttf/pkg-deinstall
deleted file mode 100644
index b98eafcd7d31..000000000000
--- a/chinese/arphicttf/pkg-deinstall
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != "DEINSTALL" ]; then
-  exit 0
-fi
-
-PKGNAME=$1
-PREFIX=${PKG_PREFIX}
-TTFM=${PKG_PREFIX}/bin/ttfm.sh
-
-FONTDIR=${PREFIX}/share/fonts/TrueType
-FONTS="bkai00mp.ttf bsmi00lp.ttf gbsn00lp.ttf gkai00mp.ttf"
-
-if [ -r $FONTDIR/$PKGNAME ]; then
-    for i in `cat $FONTDIR/$PKGNAME`; do
-        for f in $FONTS; do
-            $TTFM --remove $i $f
-        done
-    done
-fi
-
-rm -f $FONTDIR/$PKGNAME
-
-exit 0
diff --git a/chinese/arphicttf/pkg-install b/chinese/arphicttf/pkg-install
deleted file mode 100644
index 1707030bd6d9..000000000000
--- a/chinese/arphicttf/pkg-install
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-if [ "$2" = "PRE-INSTALL" ]; then
-  exit 0
-fi
-
-PKGNAME=$1
-PREFIX=${PKG_PREFIX}
-TTFM=${PREFIX}/bin/ttfm.sh
-
-FONTDIR=${PREFIX}/share/fonts/TrueType
-FONTS="bkai00mp.ttf bsmi00lp.ttf gbsn00lp.ttf gkai00mp.ttf"
-
-if [ ! -x $TTFM ]; then
-    echo "$TTFM not found!"
-    exit 1
-fi
-
-rm -f $FONTDIR/$PKGNAME
-
-if [ "X$WANT_GS" != "X" ]; then
-    for f in $FONTS; do
-        $TTFM --add gscjk $FONTDIR/$f
-    done
-    echo "gscjk" >> $FONTDIR/$PKGNAME
-fi
-
-if [ "X$WITHOUT_X" = "X" ]; then
-    for f in $FONTS; do
-        $TTFM --add xttfm $FONTDIR/$f
-    done
-    echo "xttfm" >> $FONTDIR/$PKGNAME
-fi
-
-exit 0
diff --git a/chinese/arphicttf/pkg-plist b/chinese/arphicttf/pkg-plist
index 299cca314c5a..5d9cc4d04af6 100644
--- a/chinese/arphicttf/pkg-plist
+++ b/chinese/arphicttf/pkg-plist
@@ -1,19 +1,13 @@
-share/fonts/TrueType/bkai00mp.ttf
-share/fonts/TrueType/bsmi00lp.ttf
-share/fonts/TrueType/gbsn00lp.ttf
-share/fonts/TrueType/gkai00mp.ttf
-share/fonts/TrueType/arphic/license/BIG5/ARPHICPL.DOC
-share/fonts/TrueType/arphic/license/BIG5/ARPHICPL.TXT
-share/fonts/TrueType/arphic/license/ENGLISH/ARPHICPL.DOC
-share/fonts/TrueType/arphic/license/ENGLISH/ARPHICPL.TXT
-share/fonts/TrueType/arphic/license/GB/ARPHICPL.DOC
-share/fonts/TrueType/arphic/license/GB/ARPHICPL.TXT
-share/fonts/TrueType/arphic/logo.gif
-share/fonts/TrueType/arphic/release.txt
-@dirrm share/fonts/TrueType/arphic/license/BIG5
-@dirrm share/fonts/TrueType/arphic/license/ENGLISH
-@dirrm share/fonts/TrueType/arphic/license/GB
-@dirrm share/fonts/TrueType/arphic/license
-@dirrm share/fonts/TrueType/arphic
-@unexec rmdir %D/share/fonts/TrueType 2>/dev/null || true
-@unexec rmdir %D/share/fonts 2>/dev/null || true
+%%DATADIR%%/license/BIG5/ARPHICPL.DOC
+%%DATADIR%%/license/BIG5/ARPHICPL.TXT
+%%DATADIR%%/license/ENGLISH/ARPHICPL.DOC
+%%DATADIR%%/license/ENGLISH/ARPHICPL.TXT
+%%DATADIR%%/license/GB/ARPHICPL.DOC
+%%DATADIR%%/license/GB/ARPHICPL.TXT
+%%DATADIR%%/logo.gif
+%%DATADIR%%/release.txt
+@dirrm %%DATADIR%%/license/BIG5
+@dirrm %%DATADIR%%/license/ENGLISH
+@dirrm %%DATADIR%%/license/GB
+@dirrm %%DATADIR%%/license
+@dirrm %%DATADIR%%
diff --git a/chinese/cwtexttf/Makefile b/chinese/cwtexttf/Makefile
index 962b16c5dc5c..ad825342965f 100644
--- a/chinese/cwtexttf/Makefile
+++ b/chinese/cwtexttf/Makefile
@@ -15,42 +15,18 @@ DISTNAME=	cwtex-ttf
 MAINTAINER=	statue@freebsd.netlab.cse.yzu.edu.tw
 COMMENT=	Five Chinese Big5 TrueType fonts made by cwTeX
 
-RUN_DEPENDS=	ttfm.sh:${PORTSDIR}/chinese/ttfm
-
-USE_ZIP=	YES
+USE_ZIP=	yes
 NO_BUILD=	yes
-SHAREMODE=	644
 WRKSRC=		${WRKDIR}/texmf/fonts/truetype/cwTeX
-USE_XLIB=	yes
-FONTDIR=	${PREFIX}/share/fonts/TrueType
-XFONTDIR=	${X11BASE}/lib/X11/fonts/TrueType
-INSTALL_ENV=	PKG_PREFIX=${PREFIX} \
-		WANT_GS=${WANT_GS} WITHOUT_X=${WITHOUT_X}
-
-.include <bsd.port.pre.mk>
 
-pre-fetch:
-.if defined(WANT_GS)
-	@${ECHO} "Ghostscript support will be added."
-.endif
-.if defined(WITHOUT_X)
-	@${ECHO} "X Window support will NOT be added."
-.endif
-.if !defined(WANT_GS) && !defined(WITHOUT_X)
-	@${ECHO} --
-	@${ECHO} "Type \"make WANT_GS=yes\" if you want Ghostscript support."
-	@${ECHO} "Type \"make WITHOUT_X=yes\" if you DONT want X Window support."
-	@${ECHO} "You can use them in combinations."
-	@${ECHO} --
-.endif
+TTF=		bbttf.ttf fttf.ttf kttf.ttf mttf.ttf rttf.ttf
 
 do-install:
-.if !exists(${FONTDIR})
-	@${MKDIR} ${FONTDIR}
-.endif
-.for i in bbttf.ttf fttf.ttf kttf.ttf mttf.ttf rttf.ttf
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${FONTDIR}
+	@${MKDIR} ${FONTSDIR}
+.for i in ${TTF}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${FONTSDIR}
 .endfor
-	@${SETENV} ${INSTALL_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf"
 .include <bsd.port.post.mk>
diff --git a/chinese/cwtexttf/pkg-deinstall b/chinese/cwtexttf/pkg-deinstall
deleted file mode 100644
index eeeb1b42bbfa..000000000000
--- a/chinese/cwtexttf/pkg-deinstall
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != "DEINSTALL" ]; then
-  exit 0
-fi
-
-PKGNAME=$1
-PREFIX=${PKG_PREFIX}
-TTFM=${PKG_PREFIX}/bin/ttfm.sh
-
-FONTDIR=${PREFIX}/share/fonts/TrueType
-FONTS="bbttf.ttf fttf.ttf kttf.ttf mttf.ttf rttf.ttf"
-
-if [ -r $FONTDIR/$PKGNAME ]; then
-    for i in `cat $FONTDIR/$PKGNAME`; do
-        for f in $FONTS; do
-            $TTFM --remove $i $f
-        done
-    done
-fi
-
-rm -f $FONTDIR/$PKGNAME
-
-exit 0
diff --git a/chinese/cwtexttf/pkg-install b/chinese/cwtexttf/pkg-install
deleted file mode 100644
index 74462935ee80..000000000000
--- a/chinese/cwtexttf/pkg-install
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-if [ "$2" = "PRE-INSTALL" ]; then
-  exit 0
-fi
-
-PKGNAME=$1
-PREFIX=${PKG_PREFIX}
-TTFM=${PREFIX}/bin/ttfm.sh
-
-FONTDIR=${PREFIX}/share/fonts/TrueType
-FONTS="bbttf.ttf fttf.ttf kttf.ttf mttf.ttf rttf.ttf"
-
-if [ ! -x $TTFM ]; then
-    echo "$TTFM not found!"
-    exit 1
-fi
-
-rm -f $FONTDIR/$PKGNAME
-
-if [ "X$WANT_GS" != "X" ]; then
-    for f in $FONTS; do
-        $TTFM --add gscjk $FONTDIR/$f
-    done
-    echo "gscjk" >> $FONTDIR/$PKGNAME
-fi
-
-if [ "X$WITHOUT_X" = "X" ]; then
-    for f in $FONTS; do
-        $TTFM --add xttfm $FONTDIR/$f
-    done
-    echo "xttfm" >> $FONTDIR/$PKGNAME
-fi
-
-exit 0
diff --git a/chinese/cwtexttf/pkg-plist b/chinese/cwtexttf/pkg-plist
deleted file mode 100644
index 366b2bfdca4f..000000000000
--- a/chinese/cwtexttf/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-share/fonts/TrueType/bbttf.ttf
-share/fonts/TrueType/fttf.ttf
-share/fonts/TrueType/kttf.ttf
-share/fonts/TrueType/mttf.ttf
-share/fonts/TrueType/rttf.ttf
-@unexec rmdir %D/share/fonts/TrueType 2>/dev/null || true
-@unexec rmdir %D/share/fonts 2>/dev/null || true
diff --git a/chinese/fireflyttf/Makefile b/chinese/fireflyttf/Makefile
index ee7a4eee8332..4a27ba8012de 100644
--- a/chinese/fireflyttf/Makefile
+++ b/chinese/fireflyttf/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	fireflyttf
-PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTVERSION=	1.2.6
+PORTREVISION=	0
 CATEGORIES=	chinese x11-fonts
 MASTER_SITES=	http://www.study-area.org/apt/firefly-font/
 DISTNAME=	fireflysung.ttf
@@ -16,28 +16,26 @@ EXTRACT_SUFX=	.gz
 MAINTAINER=	statue@freebsd.sinica.edu.tw
 COMMENT=	Firefly TrueType Font is combine of two arphic sung fonts
 
-BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig \
-		ttfm.sh:${PORTSDIR}/chinese/ttfm
-RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig \
-		ttfm.sh:${PORTSDIR}/chinese/ttfm
-
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}
-USE_XLIB=	yes
-FONTDIR=	${PREFIX}/share/fonts/TrueType
-XFONTDIR=	${X11BASE}/lib/X11/fonts/TrueType
 EXTRACT_AFTER_ARGS=	> ${DISTNAME}
 
-.include <bsd.port.pre.mk>
+TTF=		${DISTNAME}
+
+.if !defined(WITHOUT_X11)
+PLIST_SUB+=	X11=""
+.else
+PLIST_SUB+=	X11="@comment "
+.endif
 
 do-install:
-	@${MKDIR} ${FONTDIR}
-	@${INSTALL_DATA} ${WRKSRC}/${DISTNAME} ${FONTDIR}
-	@${ECHO_MSG} "===> Running ttfm.sh"
-	-@${PREFIX}/bin/ttfm.sh --add xttfm ${DISTNAME}
-	@${ECHO_MSG} "===> Running fc-cache"
-	-@${X11BASE}/bin/fc-cache -f -v ${XFONTDIR}
-	${INSTALL_DATA} ${FILESDIR}/local.conf-sung ${FONTDIR}
+	${MKDIR} ${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${TTF} ${FONTSDIR}
+	${INSTALL_DATA} ${FILESDIR}/local.conf-sung ${FONTSDIR}
+.if !defined(WITHOUT_X11)
 	${INSTALL_DATA} ${FILESDIR}/local.conf-sung ${X11BASE}/etc/fonts/local.conf
+.endif
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf"
 .include <bsd.port.post.mk>
diff --git a/chinese/fireflyttf/pkg-plist b/chinese/fireflyttf/pkg-plist
index 87aa373d2879..51ad1ebac38c 100644
--- a/chinese/fireflyttf/pkg-plist
+++ b/chinese/fireflyttf/pkg-plist
@@ -1,10 +1,3 @@
-@unexec if cmp -s %%X11BASE%%/etc/fonts/local.conf %D/share/fonts/TrueType/local.conf-sung; then rm -f %%X11BASE%%/etc/fonts/local.conf; fi
-share/fonts/TrueType/local.conf-sung
-@exec cp %D/share/fonts/TrueType/local.conf-sung %%X11BASE%%/etc/fonts/local.conf
-@unexec %D/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/fireflysung.ttf || true
-share/fonts/TrueType/fireflysung.ttf
-@exec %D/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/fireflysung.ttf || true
-@unexec %%X11BASE%%/bin/fc-cache -f -v %%X11BASE%%/lib/X11/fonts/TrueType || true
-@exec %%X11BASE%%/bin/fc-cache -f -v %%X11BASE%%/lib/X11/fonts/TrueType || true
-@unexec rmdir %D/share/fonts/TrueType 2>/dev/null || true
-@unexec rmdir %D/share/fonts 2>/dev/null || true
+%%X11%%@unexec if cmp -s %%X11BASE%%/etc/fonts/local.conf %D/%%FONTSDIR%%/local.conf-sung; then rm -f %%X11BASE%%/etc/fonts/local.conf; fi
+%%FONTSDIR%%/local.conf-sung
+%%X11%%@exec cp %D/%%FONTSDIR%%/local.conf-sung %%X11BASE%%/etc/fonts/local.conf
diff --git a/chinese/mingunittf/Makefile b/chinese/mingunittf/Makefile
index bc3f563a9838..eaf912b57fa4 100644
--- a/chinese/mingunittf/Makefile
+++ b/chinese/mingunittf/Makefile
@@ -15,30 +15,18 @@ EXTRACT_SUFX=	.gz
 MAINTAINER=	statue@freebsd.netlab.cse.yzu.edu.tw
 COMMENT=	Chinese Big5HKSCS TrueType fonts
 
-BUILD_DEPENDS=	ttfm.sh:${PORTSDIR}/chinese/ttfm \
-		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS=	ttfm.sh:${PORTSDIR}/chinese/ttfm \
-		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
 EXTRACT_CMD=	${GZIP_CMD}
 EXTRACT_BEFORE_ARGS=	-dc
-EXTRACT_AFTER_ARGS=	> ${WRKSRC}/minguni.ttf
+EXTRACT_AFTER_ARGS=	> ${WRKSRC}/${TTF}
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-SHAREMODE=	644
-USE_XLIB=	yes
-FONTDIR=	${PREFIX}/share/fonts/TrueType
-XFONTDIR=	${X11BASE}/lib/X11/fonts/TrueType
-INSTALL_ENV=	PKG_PREFIX=${PREFIX}
 
-.include <bsd.port.pre.mk>
+TTF=		minguni.ttf
 
 do-install:
-	@${MKDIR} ${FONTDIR}
-	@${INSTALL_DATA} ${WRKSRC}/minguni.ttf ${FONTDIR}
-	@${ECHO_MSG} "===> Running ttfm.sh"
-	-@${PREFIX}/bin/ttfm.sh --add xttfm minguni.ttf
-	@${ECHO_MSG} "===> Running fc-cache"
-	-@${X11BASE}/bin/fc-cache -f -v ${XFONTDIR}
+	@${MKDIR} ${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${TTF} ${FONTSDIR}
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf"
 .include <bsd.port.post.mk>
diff --git a/chinese/mingunittf/pkg-plist b/chinese/mingunittf/pkg-plist
deleted file mode 100644
index d8abce05d9e4..000000000000
--- a/chinese/mingunittf/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-@unexec %D/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/minguni.ttf || true
-share/fonts/TrueType/minguni.ttf
-@exec %D/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/minguni.ttf || true
-@unexec %%X11BASE%%/bin/fc-cache -f -v %%X11BASE%%/lib/X11/fonts/TrueType || true
-@exec %%X11BASE%%/bin/fc-cache -f -v %%X11BASE%%/lib/X11/fonts/TrueType || true
-@unexec rmdir %D/share/fonts/TrueType 2>/dev/null || true
-@unexec rmdir %D/share/fonts 2>/dev/null || true
diff --git a/chinese/moettf/Makefile b/chinese/moettf/Makefile
index 5c97cff313ed..20de850d419c 100644
--- a/chinese/moettf/Makefile
+++ b/chinese/moettf/Makefile
@@ -21,55 +21,44 @@ MAINTAINER=	statue@freebsd.netlab.cse.yzu.edu.tw
 COMMENT=	Three Chinese BIG5 TrueType fonts: Kai LiShu Sung SungExt
 
 EXTRACT_DEPENDS=unrar:${PORTSDIR}/archivers/unrar
-RUN_DEPENDS=	ttfm.sh:${PORTSDIR}/chinese/ttfm
 
-USE_XLIB=	yes
 DIST_SUBDIR=	zh-moettf
 
 NO_CDROM=	"Contact Taiwan's Ministry of Education for commercial use."
 NO_BUILD=	yes
-SHAREMODE=	644
-FONTDIR=	${PREFIX}/share/fonts/TrueType
-XFONTDIR=	${X11BASE}/lib/X11/fonts/TrueType
+NO_WRKSUBDIR=	yes
 
-OPTIONS=	CJK "CJK support" off \
-		GS "Ghostscript support" off \
-		X "X Window support" on \
-		DEFAULT "set MOETTF the default font" off
-
-.include <bsd.port.pre.mk>
-
-INSTALL_ENV=	PKG_PREFIX=${PREFIX} \
-		DEFAULT=${WITH_DEFAULT} WANT_CJK=${WITH_CJK} \
-		WANT_GS=${WITH_GS} WITHOUT_X=${WITHOUT_X}
-
-.if defined(WITH_CJK)
-RUN_DEPENDS+=	bg5latex:${PORTSDIR}/chinese/CJK
-.endif
-.if defined(WITH_GS)
-RUN_DEPENDS+=	${LOCALBASE}/share/ghostscript/Resource/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps
-.endif
+TTF_DEFAULT=	moe_sung.ttf
+TTF_DEFAULTKAI=	moe_kai.ttf
+TTF=		moe_lishu.ttf moe_kai.ttf moe_sung.ttf moe_sungext.ttf moe_sungsym.ttf
 
 do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR}
-	@unrar x ${DISTDIR}/${DIST_SUBDIR}/edustd-15.exe ${WRKDIR}
-	@${MV} ${WRKDIR}/Edustd-15.TTF ${WRKDIR}/moe_lishu.ttf
-	@unrar x ${DISTDIR}/${DIST_SUBDIR}/edustds1.exe ${WRKDIR}
-	@${MV} ${WRKDIR}/edustds1.ttf ${WRKDIR}/moe_sungext.ttf
-	@unrar x ${DISTDIR}/${DIST_SUBDIR}/edustds2.exe ${WRKDIR}
-	@${MV} ${WRKDIR}/edustds2.ttf ${WRKDIR}/moe_sungsym.ttf
+	@${MKDIR} ${WRKSRC}
+	@unrar x ${DISTDIR}/${DIST_SUBDIR}/edustd-15.exe ${WRKSRC}
+	@${MV} ${WRKSRC}/Edustd-15.TTF ${WRKSRC}/moe_lishu.ttf
+	@unrar x ${DISTDIR}/${DIST_SUBDIR}/edustds1.exe ${WRKSRC}
+	@${MV} ${WRKSRC}/edustds1.ttf ${WRKSRC}/moe_sungext.ttf
+	@unrar x ${DISTDIR}/${DIST_SUBDIR}/edustds2.exe ${WRKSRC}
+	@${MV} ${WRKSRC}/edustds2.ttf ${WRKSRC}/moe_sungsym.ttf
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/moe_kai.ttf ${WRKSRC}
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/moe_sung.ttf ${WRKSRC}
 
 do-install:
-.if !exists(${FONTDIR})
-	@${MKDIR} ${FONTDIR}
+	@${MKDIR} ${FONTSDIR}
+.for ttf in ${TTF}
+	${INSTALL_DATA} ${WRKSRC}/${ttf} ${FONTSDIR}
+.endfor
+
+post-install:
+.if !defined(WITHOUT_X11)
+.for f in fonts.dir fonts.alias
+	${SED} -e "s/ t w m o e _ k a i/twmoe_kai/g" \
+		-e "s/ ° ê ¦ r ¼ Ð · Ç § º Å é/twmoe_sung/g" \
+		${XFONTSDIR}/${f} > ${XFONTSDIR}/${f}.$$ && \
+		${MV} ${XFONTSDIR}/${f}.$$ ${XFONTSDIR}/${f}
+.endfor
 .endif
-	@${INSTALL_DATA} ${WRKDIR}/moe_lishu.ttf ${FONTDIR}
-	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/moe_kai.ttf ${FONTDIR}
-	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/kai-pc.ttf ${FONTDIR}/moe_kai_pc.ttf
-	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/moe_sung.ttf ${FONTDIR}
-	@${INSTALL_DATA} ${WRKDIR}/moe_sungext.ttf ${FONTDIR}
-	@${INSTALL_DATA} ${WRKDIR}/moe_sungsym.ttf ${FONTDIR}
-	@${SETENV} ${INSTALL_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf"
 .include <bsd.port.post.mk>
diff --git a/chinese/moettf/pkg-deinstall b/chinese/moettf/pkg-deinstall
deleted file mode 100644
index 055b67745316..000000000000
--- a/chinese/moettf/pkg-deinstall
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != "DEINSTALL" ]; then
-  exit 0
-fi
-
-PKGNAME=$1
-PREFIX=${PKG_PREFIX}
-TTFM=${PKG_PREFIX}/bin/ttfm.sh
-
-FONTDIR=${PREFIX}/share/fonts/TrueType
-FONTS="moe_lishu.ttf moe_kai.ttf moe_sung.ttf moe_sungext.ttf moe_sungsym.ttf moe_kai_pc.ttf"
-
-if [ -r $FONTDIR/$PKGNAME ]; then
-    for i in `cat $FONTDIR/$PKGNAME`; do
-        for f in $FONTS $DEFAULTMING $DEFAULTKAI; do
-            $TTFM --remove $i $f
-        done
-    done
-fi
-
-rm -f $FONTDIR/$PKGNAME
-
-exit 0
diff --git a/chinese/moettf/pkg-install b/chinese/moettf/pkg-install
deleted file mode 100644
index cc556eaeddf1..000000000000
--- a/chinese/moettf/pkg-install
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-
-if [ "$2" = "PRE-INSTALL" ]; then
-  exit 0
-fi
-
-PKGNAME=$1
-PREFIX=${PKG_PREFIX}
-TTFM=${PREFIX}/bin/ttfm.sh
-
-FONTDIR=${PREFIX}/share/fonts/TrueType
-FONTS="moe_lishu.ttf moe_kai.ttf moe_sung.ttf moe_sungext.ttf moe_sungsym.ttf moe_kai_pc.ttf"
-if [ "X$DEFAULT" != "X" ]; then
-    DEFAULTMING="moe_sung.ttf"
-    DEFAULTKAI="moe_kai.ttf"
-fi
-
-TEMPFILE=`mktemp -q /tmp/moettf.XXXX`
-XFONTDIR=${X11BASE}/lib/X11/fonts/TrueType
-
-if [ ! -x $TTFM ]; then
-    echo "$TTFM not found!"
-    exit 1
-fi
-
-rm -f $FONTDIR/$PKGNAME
-
-if [ "X$WANT_CJK" != "X" ]; then
-    # There's no CJK module now.
-fi
-
-if [ "X$WANT_GS" != "X" ]; then
-    for f in $FONTS; do
-        $TTFM --add gscjk $FONTDIR/$f
-    done
-    for f in $DEFAULTMING; do
-        $TTFM --setdefault gscjk $FONTDIR/$f
-    done
-    for f in $DEFAULTKAI; do
-        $TTFM --setdefault_kai gscjk $FONTDIR/$f
-    done
-    echo "gscjk" >> $FONTDIR/$PKGNAME
-fi
-
-if [ "X$WITHOUT_X" = "X" ]; then
-    for f in $FONTS; do
-        $TTFM --add xttfm $FONTDIR/$f
-    done
-    for f in $DEFAULTMING; do
-        $TTFM --setdefault xttfm $FONTDIR/$f
-    done
-    for f in $DEFAULTKAI; do
-        $TTFM --setdefault_kai xttfm $FONTDIR/$f
-    done
-    sed -e "s/ ° ê ¦ r ¼ Ð · Ç § º Å é/twmoe_sung/g" -e "s/ t w m o e _ k a i/twmoe_kai/g" $XFONTDIR/fonts.dir > $TEMPFILE
-    mv $TEMPFILE $XFONTDIR/fonts.dir
-    sed -e "s/ ° ê ¦ r ¼ Ð · Ç § º Å é/twmoe_sung/g" -e "s/ t w m o e _ k a i/twmoe_kai/g" $XFONTDIR/fonts.alias > $TEMPFILE
-    mv $TEMPFILE $XFONTDIR/fonts.alias
-    echo "xttfm" >> $FONTDIR/$PKGNAME
-fi
-
-rm -f $TEMPFILE
-
-exit 0
diff --git a/chinese/moettf/pkg-plist b/chinese/moettf/pkg-plist
index b1e9f70144c2..08da29a46261 100644
--- a/chinese/moettf/pkg-plist
+++ b/chinese/moettf/pkg-plist
@@ -1,8 +1,2 @@
-share/fonts/TrueType/moe_kai.ttf
-share/fonts/TrueType/moe_kai_pc.ttf
-share/fonts/TrueType/moe_lishu.ttf
-share/fonts/TrueType/moe_sung.ttf
-share/fonts/TrueType/moe_sungext.ttf
-share/fonts/TrueType/moe_sungsym.ttf
-@unexec rmdir %D/share/fonts/TrueType 2>/dev/null || true
-@unexec rmdir %D/share/fonts 2>/dev/null || true
+@exec sed -e "s/ ° ê ¦ r ¼ Ð · Ç § º Å é/twmoe_sung/g" -e "s/ t w m o e _ k a i/twmoe_kai/g" %%X11BASE%%/%%XFONTSDIR%%/fonts.dir > %%X11BASE%%/%%XFONTSDIR%%/fonts.dir.tmp && mv %%X11BASE%%/%%XFONTSDIR%%/fonts.dir.tmp %%X11BASE%%/%%XFONTSDIR%%/fonts.dir
+@exec sed -e "s/ ° ê ¦ r ¼ Ð · Ç § º Å é/twmoe_sung/g" -e "s/ t w m o e _ k a i/twmoe_kai/g" %%X11BASE%%/%%XFONTSDIR%%/fonts.alias > %%X11BASE%%/%%XFONTSDIR%%/fonts.alias.tmp && mv %%X11BASE%%/%%XFONTSDIR%%/fonts.alias.tmp %%X11BASE%%/%%XFONTSDIR%%/fonts.alias
diff --git a/chinese/ntuttf/Makefile b/chinese/ntuttf/Makefile
index e2833b968af3..b803cd28448a 100644
--- a/chinese/ntuttf/Makefile
+++ b/chinese/ntuttf/Makefile
@@ -17,52 +17,16 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	statue@freebsd.netlab.cse.yzu.edu.tw
 COMMENT=	Seven Chinese Big5 TrueType fonts made by NTU
 
-RUN_DEPENDS=	ttfm.sh:${PORTSDIR}/chinese/ttfm
-
 NO_BUILD=	yes
-SHAREMODE=	644
-USE_XLIB=	yes
-FONTDIR=	${PREFIX}/share/fonts/TrueType
-XFONTDIR=	${X11BASE}/lib/X11/fonts/TrueType
-INSTALL_ENV=	PKG_PREFIX=${PREFIX} \
-		WANT_CJK=${WANT_CJK} WANT_GS=${WANT_GS} \
-		WITHOUT_X=${WITHOUT_X}
-
-.include <bsd.port.pre.mk>
 
-.if defined(WANT_CJK)
-RUN_DEPENDS+=	bg5latex:${PORTSDIR}/chinese/CJK
-.endif
-.if defined(WANT_GS)
-RUN_DEPENDS+=	${LOCALBASE}/share/ghostscript/Resource/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps
-.endif
-
-pre-fetch:
-.if defined(WANT_CJK)
-	@${ECHO} "CJK support will be added."
-.endif
-.if defined(WANT_GS)
-	@${ECHO} "Ghostscript support will be added."
-.endif
-.if defined(WITHOUT_X)
-	@${ECHO} "X Window support will NOT be added."
-.endif
-.if !defined(WANT_CJK) && !defined(WANT_GS) && !defined(WITHOUT_X)
-	@${ECHO} --
-	@${ECHO} "Type \"make WANT_CJK=yes\" if you want CJK support."
-	@${ECHO} "Type \"make WANT_GS=yes\" if you want Ghostscript support."
-	@${ECHO} "Type \"make WITHOUT_X=yes\" if you DONT want X Window support."
-	@${ECHO} "You can use them in combinations."
-	@${ECHO} --
-.endif
+TTF=		${DISTFILES}
 
 do-install:
-.if !exists(${FONTDIR})
-	@${MKDIR} ${FONTDIR}
-.endif
-.for i in ${DISTFILES}
-	@${INSTALL_DATA} ${DISTDIR}/${i} ${FONTDIR}
+	@${MKDIR} ${FONTSDIR}
+.for i in ${TTF}
+	@${INSTALL_DATA} ${DISTDIR}/${i} ${FONTSDIR}
 .endfor
-	@${SETENV} ${INSTALL_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf"
 .include <bsd.port.post.mk>
diff --git a/chinese/ntuttf/pkg-deinstall b/chinese/ntuttf/pkg-deinstall
deleted file mode 100644
index a4fed9c5274a..000000000000
--- a/chinese/ntuttf/pkg-deinstall
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != "DEINSTALL" ]; then
-  exit 0
-fi
-
-PKGNAME=$1
-PREFIX=${PKG_PREFIX}
-TTFM=${PKG_PREFIX}/bin/ttfm.sh
-
-FONTDIR=${PREFIX}/share/fonts/TrueType
-FONTS="NTU_FS_M.TTF NTU_KAI.TTF NTU_LI_M.TTF NTU_MB.TTF NTU_MM.TTF NTU_MR.TTF NTU_TW.TTF"
-
-if [ -r $FONTDIR/$PKGNAME ]; then
-    for i in `cat $FONTDIR/$PKGNAME`; do
-        for f in $FONTS; do
-            $TTFM --remove $i $f
-        done
-    done
-fi
-
-rm -f $FONTDIR/$PKGNAME
-
-exit 0
diff --git a/chinese/ntuttf/pkg-install b/chinese/ntuttf/pkg-install
deleted file mode 100644
index e6caa640b670..000000000000
--- a/chinese/ntuttf/pkg-install
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-if [ "$2" = "PRE-INSTALL" ]; then
-  exit 0
-fi
-
-PKGNAME=$1
-PREFIX=${PKG_PREFIX}
-TTFM=${PREFIX}/bin/ttfm.sh
-
-FONTDIR=${PREFIX}/share/fonts/TrueType
-FONTS="NTU_FS_M.TTF NTU_KAI.TTF NTU_LI_M.TTF NTU_MB.TTF NTU_MM.TTF NTU_MR.TTF NTU_TW.TTF"
-
-if [ ! -x $TTFM ]; then
-    echo "$TTFM not found!"
-    exit 1
-fi
-
-rm -f $FONTDIR/$PKGNAME
-
-if [ "X$WANT_CJK" != "X" ]; then
-    # There's no CJK module now.
-fi
-
-if [ "X$WANT_GS" != "X" ]; then
-    for f in $FONTS; do
-        $TTFM --add gscjk $FONTDIR/$f
-    done
-    echo "gscjk" >> $FONTDIR/$PKGNAME
-fi
-
-if [ "X$WITHOUT_X" = "X" ]; then
-    for f in $FONTS; do
-        $TTFM --add xttfm $FONTDIR/$f
-    done
-    echo "xttfm" >> $FONTDIR/$PKGNAME
-fi
-
-exit 0
diff --git a/chinese/ntuttf/pkg-plist b/chinese/ntuttf/pkg-plist
deleted file mode 100644
index cc28593dd5c3..000000000000
--- a/chinese/ntuttf/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-share/fonts/TrueType/NTU_FS_M.TTF
-share/fonts/TrueType/NTU_KAI.TTF
-share/fonts/TrueType/NTU_LI_M.TTF
-share/fonts/TrueType/NTU_MB.TTF
-share/fonts/TrueType/NTU_MM.TTF
-share/fonts/TrueType/NTU_MR.TTF
-share/fonts/TrueType/NTU_TW.TTF
-@unexec rmdir %D/share/fonts/TrueType 2>/dev/null || true
-@unexec rmdir %D/share/fonts 2>/dev/null || true
diff --git a/chinese/opendesktop-fonts/Makefile b/chinese/opendesktop-fonts/Makefile
index ee7a4eee8332..4a27ba8012de 100644
--- a/chinese/opendesktop-fonts/Makefile
+++ b/chinese/opendesktop-fonts/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	fireflyttf
-PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTVERSION=	1.2.6
+PORTREVISION=	0
 CATEGORIES=	chinese x11-fonts
 MASTER_SITES=	http://www.study-area.org/apt/firefly-font/
 DISTNAME=	fireflysung.ttf
@@ -16,28 +16,26 @@ EXTRACT_SUFX=	.gz
 MAINTAINER=	statue@freebsd.sinica.edu.tw
 COMMENT=	Firefly TrueType Font is combine of two arphic sung fonts
 
-BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig \
-		ttfm.sh:${PORTSDIR}/chinese/ttfm
-RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig \
-		ttfm.sh:${PORTSDIR}/chinese/ttfm
-
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}
-USE_XLIB=	yes
-FONTDIR=	${PREFIX}/share/fonts/TrueType
-XFONTDIR=	${X11BASE}/lib/X11/fonts/TrueType
 EXTRACT_AFTER_ARGS=	> ${DISTNAME}
 
-.include <bsd.port.pre.mk>
+TTF=		${DISTNAME}
+
+.if !defined(WITHOUT_X11)
+PLIST_SUB+=	X11=""
+.else
+PLIST_SUB+=	X11="@comment "
+.endif
 
 do-install:
-	@${MKDIR} ${FONTDIR}
-	@${INSTALL_DATA} ${WRKSRC}/${DISTNAME} ${FONTDIR}
-	@${ECHO_MSG} "===> Running ttfm.sh"
-	-@${PREFIX}/bin/ttfm.sh --add xttfm ${DISTNAME}
-	@${ECHO_MSG} "===> Running fc-cache"
-	-@${X11BASE}/bin/fc-cache -f -v ${XFONTDIR}
-	${INSTALL_DATA} ${FILESDIR}/local.conf-sung ${FONTDIR}
+	${MKDIR} ${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${TTF} ${FONTSDIR}
+	${INSTALL_DATA} ${FILESDIR}/local.conf-sung ${FONTSDIR}
+.if !defined(WITHOUT_X11)
 	${INSTALL_DATA} ${FILESDIR}/local.conf-sung ${X11BASE}/etc/fonts/local.conf
+.endif
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf"
 .include <bsd.port.post.mk>
diff --git a/chinese/opendesktop-fonts/pkg-plist b/chinese/opendesktop-fonts/pkg-plist
index 87aa373d2879..51ad1ebac38c 100644
--- a/chinese/opendesktop-fonts/pkg-plist
+++ b/chinese/opendesktop-fonts/pkg-plist
@@ -1,10 +1,3 @@
-@unexec if cmp -s %%X11BASE%%/etc/fonts/local.conf %D/share/fonts/TrueType/local.conf-sung; then rm -f %%X11BASE%%/etc/fonts/local.conf; fi
-share/fonts/TrueType/local.conf-sung
-@exec cp %D/share/fonts/TrueType/local.conf-sung %%X11BASE%%/etc/fonts/local.conf
-@unexec %D/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/fireflysung.ttf || true
-share/fonts/TrueType/fireflysung.ttf
-@exec %D/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/fireflysung.ttf || true
-@unexec %%X11BASE%%/bin/fc-cache -f -v %%X11BASE%%/lib/X11/fonts/TrueType || true
-@exec %%X11BASE%%/bin/fc-cache -f -v %%X11BASE%%/lib/X11/fonts/TrueType || true
-@unexec rmdir %D/share/fonts/TrueType 2>/dev/null || true
-@unexec rmdir %D/share/fonts 2>/dev/null || true
+%%X11%%@unexec if cmp -s %%X11BASE%%/etc/fonts/local.conf %D/%%FONTSDIR%%/local.conf-sung; then rm -f %%X11BASE%%/etc/fonts/local.conf; fi
+%%FONTSDIR%%/local.conf-sung
+%%X11%%@exec cp %D/%%FONTSDIR%%/local.conf-sung %%X11BASE%%/etc/fonts/local.conf
diff --git a/chinese/ttfm/Makefile b/chinese/ttfm/Makefile
index 4664bb34bd78..e76a77955e8b 100644
--- a/chinese/ttfm/Makefile
+++ b/chinese/ttfm/Makefile
@@ -16,14 +16,15 @@ COMMENT=	A Big5/GB enhanced TrueType Font Manager
 RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
-FONTSDIR=	${PREFIX}/share/fonts/TrueType/
+PORTDOCS=	README USAGE
+MAN1=		ttfm.sh.1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ttfinfo ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/ttfm.sh ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for doc in README USAGE
+.for doc in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
 .endfor
 .endif
@@ -32,8 +33,5 @@ do-install:
 .for module in gscjk.ttfm xttfm.ttfm
 	${INSTALL_SCRIPT} ${WRKSRC}/modules/${module} ${DATADIR}
 .endfor
-	@${MKDIR} ${FONTSDIR}
-
-MAN1=	ttfm.sh.1
 
 .include <bsd.port.mk>
diff --git a/chinese/ttfm/Makefile.ttf b/chinese/ttfm/Makefile.ttf
new file mode 100644
index 000000000000..00eda812348e
--- /dev/null
+++ b/chinese/ttfm/Makefile.ttf
@@ -0,0 +1,91 @@
+# makefile for use of:	chinese/*ttf
+# Date created:		17 Feb 2005
+# Whom:			leeym
+#
+# $FreeBSD$
+#
+# The variable(s) for installing TrueType fonts.
+# TTF		- Name(s) of font file(s) installed in FONTSDIR. Mandatory.
+#
+# The variable(s) to change the behavior of installing TrueType fonts.
+# WITH_GS	- Add Ghostscript support
+# WITHOUT_X11	- Remove X Window support
+#
+
+FONTSDIR?=	${PREFIX}/share/fonts/TrueType
+FONTSDIR_REL=	${FONTSDIR:S,^${PREFIX}/,,}
+PLIST_SUB+=	FONTSDIR=${FONTSDIR_REL}
+
+XFONTSDIR?=	${X11BASE}/lib/X11/fonts/TrueType
+XFONTSDIR_REL=	${XFONTSDIR:S,${X11BASE}/,,}
+PLIST_SUB+=	XFONTSDIR=${XFONTSDIR_REL}
+
+.if !defined(WITHOUT_X11)
+RUN_DEPENDS+=	${X11BASE}/bin/fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+_TTF_MODULES=	xttfm
+.endif
+
+.if defined(WITH_GS)
+RUN_DEPENDS+=	${LOCALBASE}/share/ghostscript/Resource/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps
+_TTF_MODULES+=	gscjk
+.endif
+
+.if defined(_TTF_MODULES)
+RUN_DEPENDS+=	${PREFIX}/bin/ttfm.sh:${PORTSDIR}/chinese/ttfm
+.endif
+
+check-makefile: check-makefile-ttf
+check-makefile-ttf:
+.if !defined(_TTF_MODULES)
+	@${ECHO_CMD} "Makefile warning: You choose neither X11 nor GS. Only font files themselves are installed"
+.else
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} "You may use the following options:"
+	@${ECHO_CMD} "	WITH_GS		- if you want Ghostscript support"
+	@${ECHO_CMD} "	WITHOUT_X11	- if you DON'T want X Window support"
+	@${ECHO_CMD} ""
+.endif
+.if !defined(TTF)
+	@${ECHO_CMD} "Makefile error: You need to define TTF for installing TrueType fonts"
+	@${FALSE}
+.endif
+
+post-install: do-install-ttf
+do-install-ttf:
+.if defined(_TTF_MODULES)
+	@${ECHO_MSG} "===>  Running ttfm.sh"
+.endif
+.for module in ${_TTF_MODULES}
+.	for ttf in ${TTF}
+		${PREFIX}/bin/ttfm.sh --add ${module} ${FONTSDIR}/${ttf}
+.	endfor
+.endfor
+.if !defined(WITHOUT_X11)
+	@${ECHO_MSG} "===>  Running fc-cache"
+	-@${X11BASE}/bin/fc-cache -f -v ${XFONTSDIR}
+.endif
+
+add-plist-post: add-plist-ttf
+add-plist-ttf:
+.for module in ${_TTF_MODULES}
+.	for ttf in ${TTF}
+		@${ECHO_CMD} "@unexec %D/bin/ttfm.sh --remove ${module} ${FONTSDIR}/${ttf} || true" >> ${TMPPLIST}
+.	endfor
+.endfor
+.for ttf in ${TTF}
+	@${ECHO_CMD} "${FONTSDIR_REL}/${ttf}" >> ${TMPPLIST}
+.endfor
+.for module in ${_TTF_MODULES}
+.	for ttf in ${TTF}
+		@${ECHO_CMD} "@exec %D/bin/ttfm.sh --add ${module} ${FONTSDIR}/${ttf} || true" >> ${TMPPLIST}
+.	endfor
+.endfor
+.if !defined(WITHOUT_X11)
+	@${ECHO_CMD} "@unexec ${X11BASE}/bin/fc-cache -f -v ${XFONTSDIR} || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@exec ${X11BASE}/bin/fc-cache -f -v ${XFONTSDIR} || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec find ${XFONTSDIR} -size -3c -delete || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir ${XFONTSDIR} 2>/dev/null || true" >> ${TMPPLIST}
+.endif
+	@${ECHO_CMD} "@unexec rmdir ${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/share/fonts 2>/dev/null || true" >> ${TMPPLIST}
+
diff --git a/chinese/ttfm/files/patch-modules::gscjk.ttfm b/chinese/ttfm/files/patch-modules::gscjk.ttfm
new file mode 100644
index 000000000000..3f326593323a
--- /dev/null
+++ b/chinese/ttfm/files/patch-modules::gscjk.ttfm
@@ -0,0 +1,23 @@
+--- modules/gscjk.ttfm.orig	Wed Sep 24 17:51:46 2003
++++ modules/gscjk.ttfm	Sat Feb 19 09:14:28 2005
+@@ -148,9 +148,8 @@
+ remove_fonts()
+ {
+     for f in "$@"; do
+-        targetname=`basename $f`
+-
+-        rm -f ${CJKCIDPath}/${targetname} ${CJKFontPath}/${targetname}*
++        guess_ttf_info "$f"
++        rm -f ${CJKCIDPath}/${TTF_ALIAS}* ${CJKFontPath}/${TTF_ALIAS}*
+     done
+ }
+ 
+@@ -236,7 +235,7 @@
+ #    else
+ #        TTF_ALIAS=${TTFINFO_FOUNDRY_NAME}"`echo $TTFINFO_FONT_NAME |sed -e "s/ //g"`"
+ #    fi
+-    TTF_ALIAS=$TTFINFO_FONT_PSNAME
++    TTF_ALIAS=`echo $TTFINFO_FONT_PSNAME | sed -e "s/ //g"`
+ 
+ #    case "$fontweight" in
+ #    'bold')
diff --git a/chinese/ttfm/files/patch-ttfm.sh b/chinese/ttfm/files/patch-ttfm.sh
new file mode 100644
index 000000000000..cf6e19780eab
--- /dev/null
+++ b/chinese/ttfm/files/patch-ttfm.sh
@@ -0,0 +1,11 @@
+--- ttfm.sh.orig	Wed Jan 31 17:34:46 2001
++++ ttfm.sh	Sat Feb 19 09:14:56 2005
+@@ -258,7 +258,7 @@
+ 	# Call script with --remove
+ 	for i in "$INSTALLSCRIPT"; do
+ 	    if [ -x "$i" ] ; then
+-		$i --remove "$FONTFILENAME" || {
++		$i --remove "${DefaultFontPath}/$FONTFILENAME" || {
+ 		    echo "Error in running $i to remove $DefaultFontPath/$FONTFILENAME." > /dev/stderr
+ 		}
+ 	    else
diff --git a/chinese/ttfm/pkg-plist b/chinese/ttfm/pkg-plist
index f5aae51f4f2d..af5050040277 100644
--- a/chinese/ttfm/pkg-plist
+++ b/chinese/ttfm/pkg-plist
@@ -1,10 +1,5 @@
 bin/ttfinfo
 bin/ttfm.sh
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/USAGE
 %%DATADIR%%/gscjk.ttfm
 %%DATADIR%%/xttfm.ttfm
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/fonts/TrueType 2>/dev/null || true
-@unexec rmdir %D/share/fonts 2>/dev/null || true
diff --git a/chinese/wangttf/Makefile b/chinese/wangttf/Makefile
index b9fc809d9257..343e0c4eb05b 100644
--- a/chinese/wangttf/Makefile
+++ b/chinese/wangttf/Makefile
@@ -24,30 +24,22 @@ EXTRACT_ONLY=
 MAINTAINER=	statue@freebsd.netlab.cse.yzu.edu.tw
 COMMENT=	Many Chinese Big5 TrueType fonts, made by Dr. Hann-Tzong Wang
 
-BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig \
-		ttfm.sh:${PORTSDIR}/chinese/ttfm
-RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig \
-		ttfm.sh:${PORTSDIR}/chinese/ttfm
-
 DIST_SUBDIR=	zh-wangttf
-USE_BZIP2=	yes
-USE_XLIB=	yes
 NO_BUILD=	yes
-SHAREMODE=	644
-FONTDIR=	${PREFIX}/share/fonts/TrueType
-XFONTDIR=	${X11BASE}/lib/X11/fonts/TrueType
 
-.include <bsd.port.pre.mk>
+TTF=		${DISTFILES}
+PORTDOCS=	wangttf.txt
 
 do-install:
-	@${MKDIR} ${FONTDIR}
-	@${ECHO_MSG} "===> Running ttfm.sh"
-.for i in ${DISTFILES}
-	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${i} ${FONTDIR}
-	-@${LOCALBASE}/bin/ttfm.sh --add xttfm ${i}
+	@${MKDIR} ${FONTSDIR}
+.for i in ${TTF}
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${i} ${FONTSDIR}
 .endfor
-	@${ECHO_MSG} "===> Running fc-cache"
-	-@${X11BASE}/bin/fc-cache -f -v ${XFONTDIR}
-	@${INSTALL_DATA} ${FILESDIR}/wangttf.txt ${FONTDIR}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${FILESDIR}/${PORTDOCS} ${DOCSDIR}
+.endif
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf"
 .include <bsd.port.post.mk>
diff --git a/chinese/wangttf/pkg-deinstall b/chinese/wangttf/pkg-deinstall
deleted file mode 100644
index 84f316d04652..000000000000
--- a/chinese/wangttf/pkg-deinstall
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != "DEINSTALL" ]; then
-  exit 0
-fi
-
-PKGNAME=$1
-PREFIX=${PKG_PREFIX}
-TTFM=${PKG_PREFIX}/bin/ttfm.sh
-
-# No default kai & ming for wangttf.
-FONTDIR=${PREFIX}/share/fonts/TrueType
-FONTS="wcl-01.ttf wcl-02.ttf wcl-03.ttf wcl-04.ttf wcl-05.ttf \
-       wcl-06.ttf wcl-07.ttf wcl-08.ttf wcl-09.ttf wcl-10.ttf"
-
-if [ -r $FONTDIR/$PKGNAME ]; then
-    for i in `cat $FONTDIR/$PKGNAME`; do
-        for f in $FONTS; do
-            $TTFM --remove $i $f
-        done
-    done
-fi
-
-rm -f $FONTDIR/$PKGNAME
-
-exit 0
diff --git a/chinese/wangttf/pkg-install b/chinese/wangttf/pkg-install
deleted file mode 100644
index a3c68a54d8ae..000000000000
--- a/chinese/wangttf/pkg-install
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-if [ "$2" = "PRE-INSTALL" ]; then
-  exit 0
-fi
-
-PKGNAME=$1
-PREFIX=${PKG_PREFIX}
-TTFM=${PREFIX}/bin/ttfm.sh
-
-# No default kai & ming for wangttf.
-FONTDIR=${PREFIX}/share/fonts/TrueType
-FONTS="wcl-01.ttf wcl-02.ttf wcl-03.ttf wcl-04.ttf wcl-05.ttf \
-       wcl-06.ttf wcl-07.ttf wcl-08.ttf wcl-09.ttf wcl-10.ttf"
-
-if [ ! -x $TTFM ]; then
-    echo "$TTFM not found!"
-    exit 1
-fi
-
-rm -f $FONTDIR/$PKGNAME
-
-if [ "X$WANT_CJK" != "X" ]; then
-    # There's no CJK module now.
-fi
-
-if [ "X$WANT_GS" != "X" ]; then
-    for f in $FONTS; do
-        $TTFM --add gscjk $FONTDIR/$f
-    done
-    echo "gscjk" >> $FONTDIR/$PKGNAME
-fi
-
-if [ "X$WITHOUT_X" = "X" ]; then
-    for f in $FONTS; do
-        $TTFM --add xttfm $FONTDIR/$f
-    done
-    echo "xttfm" >> $FONTDIR/$PKGNAME
-fi
-
-exit 0
diff --git a/chinese/wangttf/pkg-plist b/chinese/wangttf/pkg-plist
deleted file mode 100644
index 3e33c8e258bd..000000000000
--- a/chinese/wangttf/pkg-plist
+++ /dev/null
@@ -1,131 +0,0 @@
-share/fonts/TrueType/wangttf.txt
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/WCL-01.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/WCL-02.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/WCL-03.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/WCL-04.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/WCL-05.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/WCL-06.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/WCL-07.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/WCL-08.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/WCL-09.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/WCL-10.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wp010-05.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wp010-08.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wp110-05.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wp110-08.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wp210-05.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wp210-08.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wp310-05.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wp310-08.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wt001.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wt002.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wt003.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wt004.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wt005.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wt006.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wt009.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wt011.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wt014.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wt021.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wt024.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wt028.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wt034.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wt040.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wt064.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wt071.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wtcc02.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wtcc15.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wtg-06cut1x.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wthc06.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wts11.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wts43.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wts47.ttf || true
-@unexec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/wts55.ttf || true
-share/fonts/TrueType/WCL-01.ttf
-share/fonts/TrueType/WCL-02.ttf
-share/fonts/TrueType/WCL-03.ttf
-share/fonts/TrueType/WCL-04.ttf
-share/fonts/TrueType/WCL-05.ttf
-share/fonts/TrueType/WCL-06.ttf
-share/fonts/TrueType/WCL-07.ttf
-share/fonts/TrueType/WCL-08.ttf
-share/fonts/TrueType/WCL-09.ttf
-share/fonts/TrueType/WCL-10.ttf
-share/fonts/TrueType/wp010-05.ttf
-share/fonts/TrueType/wp010-08.ttf
-share/fonts/TrueType/wp110-05.ttf
-share/fonts/TrueType/wp110-08.ttf
-share/fonts/TrueType/wp210-05.ttf
-share/fonts/TrueType/wp210-08.ttf
-share/fonts/TrueType/wp310-05.ttf
-share/fonts/TrueType/wp310-08.ttf
-share/fonts/TrueType/wt001.ttf
-share/fonts/TrueType/wt002.ttf
-share/fonts/TrueType/wt003.ttf
-share/fonts/TrueType/wt004.ttf
-share/fonts/TrueType/wt005.ttf
-share/fonts/TrueType/wt006.ttf
-share/fonts/TrueType/wt009.ttf
-share/fonts/TrueType/wt011.ttf
-share/fonts/TrueType/wt014.ttf
-share/fonts/TrueType/wt021.ttf
-share/fonts/TrueType/wt024.ttf
-share/fonts/TrueType/wt028.ttf
-share/fonts/TrueType/wt034.ttf
-share/fonts/TrueType/wt040.ttf
-share/fonts/TrueType/wt064.ttf
-share/fonts/TrueType/wt071.ttf
-share/fonts/TrueType/wtcc02.ttf
-share/fonts/TrueType/wtcc15.ttf
-share/fonts/TrueType/wtg-06cut1x.ttf
-share/fonts/TrueType/wthc06.ttf
-share/fonts/TrueType/wts11.ttf
-share/fonts/TrueType/wts43.ttf
-share/fonts/TrueType/wts47.ttf
-share/fonts/TrueType/wts55.ttf
-@exec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/WCL-01.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/WCL-02.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/WCL-03.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/WCL-04.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/WCL-05.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/WCL-06.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/WCL-07.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/WCL-08.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/WCL-09.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --remove xttfm %D/share/fonts/TrueType/WCL-10.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wp010-05.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wp010-08.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wp110-05.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wp110-08.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wp210-05.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wp210-08.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wp310-05.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wp310-08.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wt001.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wt002.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wt003.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wt004.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wt005.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wt006.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wt009.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wt011.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wt014.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wt021.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wt024.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wt028.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wt034.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wt040.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wt064.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wt071.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wtcc02.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wtcc15.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wtg-06cut1x.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wthc06.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wts11.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wts43.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wts47.ttf || true
-@exec %%LOCALBASE%%/bin/ttfm.sh --add xttfm %D/share/fonts/TrueType/wts55.ttf || true
-@exec %%X11BASE%%/bin/fc-cache -f -v %%X11BASE%%/lib/X11/fonts/TrueType || true
-@unexec %%X11BASE%%/bin/fc-cache -f -v %%X11BASE%%/lib/X11/fonts/TrueType || true
-@unexec rmdir %D/share/fonts/TrueType 2>/dev/null || true
-@unexec rmdir %D/share/fonts 2>/dev/null || true