- 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

4 files changed, 11 insertions, 217 deletions

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