4 files changed, 7 insertions, 97 deletions

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