Re-import of converters/ttf2pt1, print/p5-Font-AFM, and print/ttftot42

into fonts. Changes: CATEGORY fixed, minimal cleanup.
Proposed by Rui-Xiang Guo.

5 files changed, 244 insertions, 0 deletions

diff --git a/fonts/ttf2pt1/DESCR b/fonts/ttf2pt1/DESCR
new file mode 100644
index 00000000000..ad3c8d723da
--- /dev/null
+++ b/fonts/ttf2pt1/DESCR
@@ -0,0 +1,5 @@
+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/fonts/ttf2pt1/Makefile b/fonts/ttf2pt1/Makefile
new file mode 100644
index 00000000000..3dfce61494f
--- /dev/null
+++ b/fonts/ttf2pt1/Makefile
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1.1.1 2002/07/16 15:26:01 wiz Exp $
+#
+
+DISTNAME=	ttf2pt1-3.4.0
+PKGREVISION=	2
+CATEGORIES=	fonts
+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/fonts/ttf2pt1/PLIST b/fonts/ttf2pt1/PLIST
new file mode 100644
index 00000000000..655c29b4a84
--- /dev/null
+++ b/fonts/ttf2pt1/PLIST
@@ -0,0 +1,102 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/16 15:26:01 wiz 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/fonts/ttf2pt1/distinfo b/fonts/ttf2pt1/distinfo
new file mode 100644
index 00000000000..653cb2dd948
--- /dev/null
+++ b/fonts/ttf2pt1/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1.1.1 2002/07/16 15:26:01 wiz Exp $
+
+SHA1 (ttf2pt1-3.4.0.tgz) = 1e11478ab5f6dae26ea743dc1149603d652746bb
+Size (ttf2pt1-3.4.0.tgz) = 204811 bytes
+SHA1 (patch-aa) = 798855010e4c1615ac25050e21771103c92f2fff
diff --git a/fonts/ttf2pt1/patches/patch-aa b/fonts/ttf2pt1/patches/patch-aa
new file mode 100644
index 00000000000..ee1a9ddd5a6
--- /dev/null
+++ b/fonts/ttf2pt1/patches/patch-aa
@@ -0,0 +1,113 @@
+$NetBSD: patch-aa,v 1.1.1.1 2002/07/16 15:26:01 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
+