Add arphic-ttf to Makefile, and remove arphicttf and now unused mkttfdir.

Closes pkg/16813 by rxg.

9 files changed, 2 insertions, 112 deletions

diff --git a/fonts/Makefile b/fonts/Makefile
index 1eadf02a87c..ca7554e4899 100644
--- a/fonts/Makefile
+++ b/fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2002/05/22 13:10:29 zuntum Exp $
+# $NetBSD: Makefile,v 1.23 2002/05/25 19:22:10 wiz Exp $
 #
 
 COMMENT=	Fonts
@@ -9,7 +9,7 @@ SUBDIR+=	acroread-chtfont
 SUBDIR+=	acroread-font-share
 SUBDIR+=	acroread-jpnfont
 SUBDIR+=	acroread-korfont
-SUBDIR+=	arphicttf
+SUBDIR+=	arphic-ttf
 SUBDIR+=	bakoma-fonts
 SUBDIR+=	dbz-ttf
 SUBDIR+=	freefonts
@@ -27,7 +27,6 @@ SUBDIR+=	ko-x11fonts
 SUBDIR+=	mglfonts
 SUBDIR+=	mkfontalias
 SUBDIR+=	mkfontscale
-SUBDIR+=	mkttfdir
 SUBDIR+=	monafonts
 SUBDIR+=	mozilla-fonts
 SUBDIR+=	ms-ttf
diff --git a/fonts/arphicttf/DESCR b/fonts/arphicttf/DESCR
deleted file mode 100644
index d361884989d..00000000000
--- a/fonts/arphicttf/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-This package installs four Chinese Big5/GB TrueType fonts, includes
-Kaiti/Mingti(Big5) and Kaiti/Sungti(GB). It then can be used along
-with X Window System or typesetting software like CJK. Thanks to
-Arphic Technology, you may freely distribute these high-quality
-fonts under a GPL-based license. See LICENSE for details.
diff --git a/fonts/arphicttf/Makefile b/fonts/arphicttf/Makefile
deleted file mode 100644
index ba7b1efe7b8..00000000000
--- a/fonts/arphicttf/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2002/02/18 11:23:54 rxg Exp $
-#
-
-DISTNAME=	arphicttf-2.11
-CATEGORIES=	chinese fonts
-MASTER_SITES=	ftp://linux.cis.nctu.edu.tw/chinese/fonts/arphic/font/ \
-		ftp://linux.cis.nctu.edu.tw/chinese/fonts/arphic/license/ENGLISH/ \
-		ftp://linux.cis.nctu.edu.tw/chinese/fonts/arphic/
-DISTFILES=	${FONT_SETS} ${MISC_FILES}
-
-MAINTAINER=	rxg@ms25.url.com.tw
-COMMENT=	Chinese Big5/GB TrueType fonts made by Arphic Technology
-
-DEPENDS+=	mkttfdir>=1.2:../../fonts/mkttfdir
-
-FONT_SETS=	bkai00mp.ttf.gz \
-		bsmi00lp.ttf.gz \
-		gbsn00lp.ttf.gz \
-		gkai00mp.ttf.gz
-
-MISC_FILES=	ARPHICPL.TXT logo.gif release.txt
-
-DIST_SUBDIR=	${PKGNAME}
-
-EXTRACT_ONLY=	# empty
-WRKSRC=		${WRKDIR}
-NO_PATCH=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-
-USE_X11BASE=	yes
-FONTDIR=	${PREFIX}/lib/X11/fonts/TrueType
-
-.include "../../mk/bsd.prefs.mk"
-
-do-install:
-	${INSTALL_DATA_DIR} ${FONTDIR}
-	for f in ${FONT_SETS}; do \
-		${INSTALL_DATA} ${_DISTDIR}/$$f ${FONTDIR}; \
-		${GUNZIP_CMD} ${FONTDIR}/$$f; \
-	done
-
-post-install:
-.if defined(TTF_TYPE) && (${TTF_TYPE} == "freetype")
-	${SH} ${LOCALBASE}/bin/mkttfdir --freetype ${FONTDIR}
-.else
-	${SH} ${LOCALBASE}/bin/mkttfdir ${FONTDIR}
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/arphicttf/PLIST b/fonts/arphicttf/PLIST
deleted file mode 100644
index 79ec2112f81..00000000000
--- a/fonts/arphicttf/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:38 skrll Exp $
-lib/X11/fonts/TrueType/bkai00mp.ttf
-lib/X11/fonts/TrueType/bsmi00lp.ttf
-lib/X11/fonts/TrueType/gbsn00lp.ttf
-lib/X11/fonts/TrueType/gkai00mp.ttf
-@exec mkttfdir %D/lib/X11/fonts/TrueType
-@unexec mkttfdir %D/lib/X11/fonts/TrueType
-@unexec ${RMDIR} %D/lib/X11/fonts/TrueType
diff --git a/fonts/arphicttf/distinfo b/fonts/arphicttf/distinfo
deleted file mode 100644
index b3a51ba4cfd..00000000000
--- a/fonts/arphicttf/distinfo
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/06/29 18:17:19 wiz Exp $
-
-SHA1 (arphicttf-2.11/bkai00mp.ttf.gz) = 5f11d05dc56f0ee39fe664b65916d2c7dcdf422d
-Size (arphicttf-2.11/bkai00mp.ttf.gz) = 6013768 bytes
-SHA1 (arphicttf-2.11/bsmi00lp.ttf.gz) = e4b47551a270f2f5bdf5164d49b3365b620f79ea
-Size (arphicttf-2.11/bsmi00lp.ttf.gz) = 5653466 bytes
-SHA1 (arphicttf-2.11/gbsn00lp.ttf.gz) = 404e4e056126b12664764085798b85437dacaa16
-Size (arphicttf-2.11/gbsn00lp.ttf.gz) = 2345803 bytes
-SHA1 (arphicttf-2.11/gkai00mp.ttf.gz) = a225ecb56ffc6239c3b91540b0047c1f07ccbe41
-Size (arphicttf-2.11/gkai00mp.ttf.gz) = 2698942 bytes
-SHA1 (arphicttf-2.11/ARPHICPL.TXT) = 5792ecf0a79455f74e59ba6409e8b5b54db6b097
-Size (arphicttf-2.11/ARPHICPL.TXT) = 6959 bytes
-SHA1 (arphicttf-2.11/logo.gif) = 5b746dca261030c1fa889741cd5a3b22f082302a
-Size (arphicttf-2.11/logo.gif) = 2606 bytes
-SHA1 (arphicttf-2.11/release.txt) = d9ea255c625c7537b179e1fdc243debb930e878d
-Size (arphicttf-2.11/release.txt) = 749 bytes
diff --git a/fonts/mkttfdir/DESCR b/fonts/mkttfdir/DESCR
deleted file mode 100644
index 70071f62e87..00000000000
--- a/fonts/mkttfdir/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-mkttfdir is a script to create an index of X TrueType fonts files 
-in a directory. It would call the program 'ttfinfo' to read TrueType
-Fonts information, then use them to fill up each field of XLFD
-(X Logical Font Descriptor) in fonts.scale. Just to use it simply
-like 'mkfontdir'.
diff --git a/fonts/mkttfdir/Makefile b/fonts/mkttfdir/Makefile
deleted file mode 100644
index ff0f70abe6e..00000000000
--- a/fonts/mkttfdir/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2002/03/16 05:25:16 rxg Exp $
-#
-
-DISTNAME=	mkttfdir-1.2.1
-CATEGORIES=	fonts
-MASTER_SITES=	http://residence.educities.edu.tw/rxghome/
-
-MAINTAINER=	rxg@ms25.url.com.tw
-COMMENT=	create an index of X TrueType fonts files in a directory
-
-MAKE_FLAGS+=	prefix=${PREFIX} FREETYPE_BASE=${LOCALBASE}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ttfinfo ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/mkttfdir ${PREFIX}/bin
-
-.include "../../graphics/freetype-lib/buildlink.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/mkttfdir/PLIST b/fonts/mkttfdir/PLIST
deleted file mode 100644
index b1dd4acf545..00000000000
--- a/fonts/mkttfdir/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:49:11 zuntum Exp $
-bin/mkttfdir
-bin/ttfinfo
diff --git a/fonts/mkttfdir/distinfo b/fonts/mkttfdir/distinfo
deleted file mode 100644
index 805880a4ccf..00000000000
--- a/fonts/mkttfdir/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.6 2002/03/16 05:25:16 rxg Exp $
-
-SHA1 (mkttfdir-1.2.1.tar.gz) = 2ba0aa7cee8f6dfc14c408ad26add6d40dc2ca03
-Size (mkttfdir-1.2.1.tar.gz) = 17741 bytes