4 files changed, 6 insertions, 114 deletions

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