- 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, 23 insertions, 115 deletions

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%%