Finish move of converters/ttf2pt1, print/p5-Font-AFM, and print/ttftot42

to fonts category.

17 files changed, 8 insertions, 314 deletions

diff --git a/converters/Makefile b/converters/Makefile
index 06c20d3f6ea..2f500b8cbb9 100644
--- a/converters/Makefile
+++ b/converters/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2002/07/12 21:02:31 agc Exp $
+# $NetBSD: Makefile,v 1.50 2002/07/16 15:29:22 wiz Exp $
 #
 
 COMMENT=	document format and character code converters
@@ -39,7 +39,6 @@ SUBDIR+=	ruby-iconv
 SUBDIR+=	ruby-romkan
 SUBDIR+=	ruby-uconv
 SUBDIR+=	tex2rtf
-SUBDIR+=	ttf2pt1
 SUBDIR+=	txt2html
 SUBDIR+=	txt2man
 SUBDIR+=	unix2dos
diff --git a/converters/ttf2pt1/DESCR b/converters/ttf2pt1/DESCR
deleted file mode 100644
index ad3c8d723da..00000000000
--- a/converters/ttf2pt1/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-TTF2PT1 is a modification of Andrew Weeks TTF2PFA True Type to Postscript 
-Type 3 converter. Which will convert Most True Type Fonts to and Adobe 
-Type 1 .pfa file. The files produced are in human readable form, which 
-further needs to be encrypted with the t1utilities, to work with most 
-software requiring type 1 fonts.  
diff --git a/converters/ttf2pt1/Makefile b/converters/ttf2pt1/Makefile
deleted file mode 100644
index d5ae7688893..00000000000
--- a/converters/ttf2pt1/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2002/06/12 14:04:59 wiz Exp $
-#
-
-DISTNAME=	ttf2pt1-3.4.0
-PKGREVISION=	2
-CATEGORIES=	converters
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ttf2pt1/}
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	reinoud@netbsd.org
-HOMEPAGE=	http://ttf2pt1.sourceforge.net
-COMMENT=	TrueType font converter to Postscript type 1
-
-DEPENDS+=	t1utils-[0-9]*:../../textproc/t1utils
-
-USE_CONFIG_WRAPPER=	yes
-
-.include "../../graphics/freetype2/buildlink.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/converters/ttf2pt1/PLIST b/converters/ttf2pt1/PLIST
deleted file mode 100644
index 191f8ad8433..00000000000
--- a/converters/ttf2pt1/PLIST
+++ /dev/null
@@ -1,102 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2002/06/05 12:07:22 markd Exp $
-bin/ttf2pt1
-bin/ttf2pt1_convert
-bin/ttf2pt1_x2gs
-man/man1/ttf2pt1.1
-man/man1/ttf2pt1_convert.1
-man/man1/ttf2pt1_x2gs.1
-share/ttf2pt1/CHANGES
-share/ttf2pt1/CHANGES.html
-share/ttf2pt1/COPYRIGHT
-share/ttf2pt1/FONTS
-share/ttf2pt1/FONTS.hpux
-share/ttf2pt1/FONTS.hpux.html
-share/ttf2pt1/FONTS.html
-share/ttf2pt1/README
-share/ttf2pt1/README.html
-share/ttf2pt1/app/RPM/ttf2pt1.spec.src
-share/ttf2pt1/app/X11/README
-share/ttf2pt1/app/X11/README.html
-share/ttf2pt1/app/X11/t1-xf86.334.patch
-share/ttf2pt1/app/X11/t1-xf86.39.patch
-share/ttf2pt1/app/netscape/Makefile
-share/ttf2pt1/app/netscape/README
-share/ttf2pt1/app/netscape/README.html
-share/ttf2pt1/app/netscape/fontsz.cf
-share/ttf2pt1/app/netscape/notscape
-share/ttf2pt1/app/netscape/nsfilter
-share/ttf2pt1/app/netscape/nsfix.c
-share/ttf2pt1/app/netscape/nspr
-share/ttf2pt1/app/netscape/nsprint
-share/ttf2pt1/app/netscape/psfonts.cf
-share/ttf2pt1/encodings/README
-share/ttf2pt1/encodings/README.html
-share/ttf2pt1/encodings/adobestd/adobe-std.tbl
-share/ttf2pt1/encodings/bulgarian/README
-share/ttf2pt1/encodings/bulgarian/encodings.alias
-share/ttf2pt1/encodings/bulgarian/ibm-1251.tbl
-share/ttf2pt1/encodings/bulgarian/ibm-866.tbl
-share/ttf2pt1/encodings/bulgarian/iso8859-5.tbl
-share/ttf2pt1/encodings/bulgarian/koi8-r.tbl
-share/ttf2pt1/encodings/cyrillic/encodings.alias
-share/ttf2pt1/encodings/cyrillic/ibm-1251.tbl
-share/ttf2pt1/encodings/cyrillic/ibm-866.tbl
-share/ttf2pt1/encodings/cyrillic/iso8859-5.tbl
-share/ttf2pt1/encodings/cyrillic/koi8-r.tbl
-share/ttf2pt1/encodings/latin1/iso8859-1.tbl
-share/ttf2pt1/encodings/latin2/iso8859-2.tbl
-share/ttf2pt1/encodings/latin4/iso8859-4
-share/ttf2pt1/encodings/latin4/iso8859-4.tbl
-share/ttf2pt1/encodings/latin5/iso8859-9
-share/ttf2pt1/encodings/russian/README
-share/ttf2pt1/encodings/russian/encodings.alias
-share/ttf2pt1/encodings/russian/ibm-1251.tbl
-share/ttf2pt1/encodings/russian/ibm-866.tbl
-share/ttf2pt1/encodings/russian/iso8859-5.tbl
-share/ttf2pt1/encodings/russian/koi8-r.tbl
-share/ttf2pt1/maps/CP1250.map
-share/ttf2pt1/maps/CP1251.map
-share/ttf2pt1/maps/adobe-standard-encoding.map
-share/ttf2pt1/maps/unicode-sample.map
-share/ttf2pt1/other/Makefile
-share/ttf2pt1/other/README
-share/ttf2pt1/other/README.html
-share/ttf2pt1/other/bmpfont.h
-share/ttf2pt1/other/bz.c
-share/ttf2pt1/other/bzscreen.c
-share/ttf2pt1/other/bzscreen.h
-share/ttf2pt1/other/cmpf.c
-share/ttf2pt1/other/cntstems.pl
-share/ttf2pt1/other/dmpf.c
-share/ttf2pt1/other/lst.pl
-share/ttf2pt1/other/showdf
-share/ttf2pt1/other/showg
-share/ttf2pt1/scripts/convert
-share/ttf2pt1/scripts/convert.cfg.sample
-share/ttf2pt1/scripts/forceiso
-share/ttf2pt1/scripts/frommap
-share/ttf2pt1/scripts/html2man
-share/ttf2pt1/scripts/inst_dir
-share/ttf2pt1/scripts/inst_file
-share/ttf2pt1/scripts/mkrel
-share/ttf2pt1/scripts/t1fdir
-share/ttf2pt1/scripts/trans
-share/ttf2pt1/scripts/unhtml
-share/ttf2pt1/scripts/x2gs
-@dirrm share/ttf2pt1/scripts
-@dirrm share/ttf2pt1/other
-@dirrm share/ttf2pt1/maps
-@dirrm share/ttf2pt1/encodings/russian
-@dirrm share/ttf2pt1/encodings/latin5
-@dirrm share/ttf2pt1/encodings/latin4
-@dirrm share/ttf2pt1/encodings/latin2
-@dirrm share/ttf2pt1/encodings/latin1
-@dirrm share/ttf2pt1/encodings/cyrillic
-@dirrm share/ttf2pt1/encodings/bulgarian
-@dirrm share/ttf2pt1/encodings/adobestd
-@dirrm share/ttf2pt1/encodings
-@dirrm share/ttf2pt1/app/netscape
-@dirrm share/ttf2pt1/app/X11
-@dirrm share/ttf2pt1/app/RPM
-@dirrm share/ttf2pt1/app
-@dirrm share/ttf2pt1
diff --git a/converters/ttf2pt1/distinfo b/converters/ttf2pt1/distinfo
deleted file mode 100644
index 3ce74799535..00000000000
--- a/converters/ttf2pt1/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2002/06/12 14:04:59 wiz Exp $
-
-SHA1 (ttf2pt1-3.4.0.tgz) = 1e11478ab5f6dae26ea743dc1149603d652746bb
-Size (ttf2pt1-3.4.0.tgz) = 204811 bytes
-SHA1 (patch-aa) = 798855010e4c1615ac25050e21771103c92f2fff
diff --git a/converters/ttf2pt1/patches/patch-aa b/converters/ttf2pt1/patches/patch-aa
deleted file mode 100644
index 8a0a65314e9..00000000000
--- a/converters/ttf2pt1/patches/patch-aa
+++ /dev/null
@@ -1,113 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2002/06/12 14:05:00 wiz Exp $
-
---- Makefile.orig	Mon Oct 15 04:32:29 2001
-+++ Makefile
-@@ -20,7 +20,7 @@
- #
- # Default
- 
--CFLAGS_SYS= -O
-+#CFLAGS_SYS= -O
- 
- # For GNU C
- #
-@@ -54,7 +54,7 @@
- # This WON'T BUILD with FT2-beta8, use the FreeType release 2.0.
- # http://download.sourceforge.net/freetype/freetype-2.0.tar.gz
- 
--CFLAGS_FT= 
-+CFLAGS_FT= -DUSE_FREETYPE `${FREETYPE_CONFIG} --cflags`
- 
- # To enable use of the FreeType-2 library
- # (if the include and lib directory do not match your installation,
-@@ -65,7 +65,7 @@
- # 
- # The FreeType-2 library flags (disabled by default)
- 
--LIBS_FT=
-+LIBS_FT= `${FREETYPE_CONFIG} --libs` -Wl,-R`${FREETYPE_CONFIG} --prefix`/lib
- 
- # To enable use of the FreeType-2 library
- # (if the include and lib directory do not match your installation,
-@@ -84,20 +84,20 @@
- #CFLAGS_PREF= -DPREFER_FREETYPE
- 
- # Uncomment the second line to not compile t1asm into ttf2pt1
--CFLAGS_EXTT1ASM=
--#CFLAGS_EXTT1ASM= -DEXTERNAL_T1ASM
-+#CFLAGS_EXTT1ASM=
-+CFLAGS_EXTT1ASM= -DEXTERNAL_T1ASM
- 
--CFLAGS= $(CFLAGS_SYS) $(CFLAGS_FT) $(CFLAGS_PREF)
-+CFLAGS+= $(CFLAGS_SYS) $(CFLAGS_FT) $(CFLAGS_PREF)
- LIBS= $(LIBS_SYS) $(LIBS_FT)
- 
- # Installation-related stuff
- # 
- # The base dir for installation and subdirs in it
--INSTDIR = /usr/local
-+INSTDIR = ${PREFIX}
- # for binaries
- BINDIR = $(INSTDIR)/bin
- # for binaries of little general interest
--LIBXDIR = $(INSTDIR)/libexec/ttf2pt1
-+LIBXDIR = $(INSTDIR)/bin
- # for scripts, maps/encodings etc.
- SHAREDIR = $(INSTDIR)/share/ttf2pt1
- MANDIR = $(INSTDIR)/man
-@@ -118,12 +118,12 @@
- 	app/X11/README app/netscape/README
- 
- SUBDIRS = app encodings maps scripts other
--TXTFILES = README* FONTS* CHANGES* COPYRIGHT
-+TXTFILES = README README.html FONTS* CHANGES* COPYRIGHT
- 
- MANS1=ttf2pt1.1 ttf2pt1_convert.1 ttf2pt1_x2gs.1
- MANS=$(MANS1) $(MANS5)
- 
--all:	t1asm ttf2pt1 docs mans rpm
-+all:	ttf2pt1 docs mans
- 
- docs: $(DOCS)
- 
-@@ -202,31 +202,21 @@
- 	scripts/unhtml <FONTS.hpux.html >FONTS.hpux
- 
- install: all
--	scripts/inst_dir $(BINDIR)
--	scripts/inst_dir $(LIBXDIR)
--	scripts/inst_dir $(SHAREDIR)
--	scripts/inst_dir $(MANDIR)/man1
--	scripts/inst_dir $(MANDIR)/man5
--	cp -R $(TXTFILES) $(SUBDIRS) $(SHAREDIR)
--	chown -R $(OWNER) $(SHAREDIR)
--	chgrp -R $(GROUP) $(SHAREDIR)
--	chmod -R go-w $(SHAREDIR)
--	scripts/inst_file ttf2pt1 $(BINDIR)/ttf2pt1 $(OWNER) $(GROUP) 0755
--	[ -f $(BINDIR)/t1asm ] || scripts/inst_file t1asm $(LIBXDIR)/t1asm $(OWNER) $(GROUP) 0755
-+	$(BSD_INSTALL_DATA_DIR) $(SHAREDIR)
-+	cp -Rf $(TXTFILES) $(SUBDIRS) $(SHAREDIR)
-+	$(BSD_INSTALL_PROGRAM) ttf2pt1 $(BINDIR)
- 	sed 's|^TTF2PT1_BINDIR=$$|TTF2PT1_BINDIR=$(BINDIR)|;\
- 		s|^TTF2PT1_LIBXDIR=$$|TTF2PT1_LIBXDIR=$(LIBXDIR)|;\
- 		s|^TTF2PT1_SHAREDIR=$$|TTF2PT1_SHAREDIR=$(SHAREDIR)|;' <scripts/convert >cvt.tmp
--	scripts/inst_file cvt.tmp $(BINDIR)/ttf2pt1_convert $(OWNER) $(GROUP) 0755
--	scripts/inst_file cvt.tmp $(SHAREDIR)/scripts/convert $(OWNER) $(GROUP) 0755
--	rm cvt.tmp
--	scripts/inst_file scripts/x2gs $(BINDIR)/ttf2pt1_x2gs $(OWNER) $(GROUP) 0755
-+	$(BSD_INSTALL_SCRIPT) cvt.tmp $(BINDIR)/ttf2pt1_convert
-+	rm -f cvt.tmp
-+	$(BSD_INSTALL_SCRIPT) scripts/x2gs $(BINDIR)/ttf2pt1_x2gs 
- 	for i in $(MANS1); do { \
- 		sed 's|TTF2PT1_BINDIR|$(BINDIR)|;\
- 			s|TTF2PT1_LIBXDIR|$(LIBXDIR)|;\
--			s|TTF2PT1_SHAREDIR|$(SHAREDIR)|;' <$$i >$(MANDIR)/man1/$$i \
--		&& chown $(OWNER) $(MANDIR)/man1/$$i \
--		&& chgrp $(GROUP) $(MANDIR)/man1/$$i \
--		&& chmod 0644 $(MANDIR)/man1/$$i \
-+			s|TTF2PT1_SHAREDIR|$(SHAREDIR)|;' <$$i >$$i.tmp \
-+		&& $(BSD_INSTALL_MAN) $$i.tmp $(MANDIR)/man1/$$i \
-+		&& rm -f $$i.tmp \
- 		|| exit 1; \
- 	} done
- 
diff --git a/fonts/Makefile b/fonts/Makefile
index 131ddb20ced..b44e06b9e19 100644
--- a/fonts/Makefile
+++ b/fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2002/07/16 15:17:17 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2002/07/16 15:29:21 wiz Exp $
 #
 
 COMMENT=	Fonts
@@ -46,7 +46,10 @@ SUBDIR+=	mkfontscale
 SUBDIR+=	monafonts
 SUBDIR+=	mozilla-fonts
 SUBDIR+=	ms-ttf
+SUBDIR+=	p5-Font-AFM
 SUBDIR+=	p5-Font-TTF
+SUBDIR+=	ttf2pt1
+SUBDIR+=	ttftot42
 SUBDIR+=	ttmkfdir
 SUBDIR+=	watanabe_vfont
 
diff --git a/print/Makefile b/print/Makefile
index 55573a3410a..43126d07ad0 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2002/07/12 20:15:16 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2002/07/16 15:29:22 wiz Exp $
 #
 
 COMMENT=	Desktop publishing
@@ -45,7 +45,6 @@ SUBDIR+=	magicfilter
 SUBDIR+=	mgv
 SUBDIR+=	mp
 SUBDIR+=	mpage
-SUBDIR+=	p5-Font-AFM
 SUBDIR+=	p5-PostScript-MailLabels
 SUBDIR+=	papersize
 SUBDIR+=	pcps
@@ -71,7 +70,6 @@ SUBDIR+=	tex-jadetex
 SUBDIR+=	texfamily
 SUBDIR+=	texfamily-share
 SUBDIR+=	transfig
-SUBDIR+=	ttftot42
 SUBDIR+=	xpdf
 SUBDIR+=	xpp
 SUBDIR+=	yup
diff --git a/print/p5-Font-AFM/DESCR b/print/p5-Font-AFM/DESCR
deleted file mode 100644
index bc4fe22b2a5..00000000000
--- a/print/p5-Font-AFM/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This module implements the Font::AFM class.  Objects of this class are
-initialised from an AFM-file and allow you to obtain information about the
-font and the metrics of the various glyphs in the font.
diff --git a/print/p5-Font-AFM/Makefile b/print/p5-Font-AFM/Makefile
deleted file mode 100644
index fec0885ceb0..00000000000
--- a/print/p5-Font-AFM/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2001/11/26 06:50:13 jlam Exp $
-
-DISTNAME=		Font-AFM-1.18
-PKGNAME=		p5-${DISTNAME}
-SVR4_PKGNAME=		p5fon
-CATEGORIES=		print perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Font/}
-
-MAINTAINER=		packages@netbsd.org
-COMMENT=		perl5 modules for parsing PostScript font metrics files
-
-USE_BUILDLINK_ONLY=	YES
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Font/AFM/.packlist
-
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/print/p5-Font-AFM/PLIST b/print/p5-Font-AFM/PLIST
deleted file mode 100644
index aecb9b99ee0..00000000000
--- a/print/p5-Font-AFM/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:27:53 zuntum Exp $
diff --git a/print/p5-Font-AFM/distinfo b/print/p5-Font-AFM/distinfo
deleted file mode 100644
index 46c1bf2d4a8..00000000000
--- a/print/p5-Font-AFM/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 12:41:52 agc Exp $
-
-SHA1 (Font-AFM-1.18.tar.gz) = 92b82f57f18b72462ba9d0d56953c8d3011eb421
-Size (Font-AFM-1.18.tar.gz) = 8815 bytes
diff --git a/print/ttftot42/DESCR b/print/ttftot42/DESCR
deleted file mode 100644
index 904ba2e558b..00000000000
--- a/print/ttftot42/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-  TrueType fonts cannot be converted to Type 1 fonts without loss of
-quality, since conversion introduces rounding errors and loses hinting
-information.  Therefore, newer PostScript interpreters (Adobe
-PostScript since version 2013, ghostscript since 5.03) include a
-TrueType rasterizers.  To use a TrueType font with them, it has to be
-embedded in a PostScript font dictionary; this format is called Type 42.
-
-  This program generates such Type 42 fonts from TrueType fonts.  It
-can also generate Adobe Font Metrics files (AFM files), including
-kerning information.
-
-  Not yet supported are TrueType Collections and the creation of CID
-keyed fonts from large TrueType fonts (East Asian or Unicode fonts).
diff --git a/print/ttftot42/Makefile b/print/ttftot42/Makefile
deleted file mode 100644
index 859e95a77ae..00000000000
--- a/print/ttftot42/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/04/02 11:51:25 uebayasi Exp $
-# FreeBSD Id: ports/print/ttftot42/Makefile,v 1.2 2001/07/25 17:36:26 steve Exp
-
-DISTNAME=	ttftot42-0.3.1
-CATEGORIES=	print fonts
-MASTER_SITES=	http://www.giga.or.at/pub/nih/ttftot42/
-
-MAINTAINER=	rxg@ms25.url.com.tw
-HOMEPAGE=	http://ftp.giga.or.at/pub/nih/ttftot42/
-COMMENT=	TrueType font to Type 42 converter
-
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${BUILDLINK_DIR}/include/freetype
-
-.include "../../graphics/freetype-lib/buildlink.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/print/ttftot42/PLIST b/print/ttftot42/PLIST
deleted file mode 100644
index 6d53cd43937..00000000000
--- a/print/ttftot42/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/04/02 11:51:25 uebayasi Exp $
-bin/ttftot42
diff --git a/print/ttftot42/distinfo b/print/ttftot42/distinfo
deleted file mode 100644
index d9be928d321..00000000000
--- a/print/ttftot42/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/04/02 11:51:25 uebayasi Exp $
-
-SHA1 (ttftot42-0.3.1.tar.gz) = 2790e5df866c487ad3dbeca99c8f88698f6dee57
-Size (ttftot42-0.3.1.tar.gz) = 54489 bytes
diff --git a/www/p5-HTML-Format/Makefile b/www/p5-HTML-Format/Makefile
index 4634ff74ea6..078813111f5 100644
--- a/www/p5-HTML-Format/Makefile
+++ b/www/p5-HTML-Format/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/26 06:50:34 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/07/16 15:29:33 wiz Exp $
 
 DISTNAME=		HTML-Format-1.23
 PKGNAME=		p5-${DISTNAME}
@@ -9,7 +9,7 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=HTML/}
 MAINTAINER=		packages@netbsd.org
 COMMENT=		perl5 modules for converting HTML to other text formats
 
-DEPENDS+=		p5-Font-AFM>=1.18:../../print/p5-Font-AFM
+DEPENDS+=		p5-Font-AFM>=1.18:../../fonts/p5-Font-AFM
 DEPENDS+=		p5-HTML-Tree>=3.04:../../www/p5-HTML-Tree
 
 USE_BUILDLINK_ONLY=	YES