Build ttf2pt1 with freetype2 to support additional file types.

From PR pkg/15976 by Rui-Xiang Guo with minor cleanup from me.
Bump PKGREVISION and make explicit dependency on t1utils.

4 files changed, 75 insertions, 60 deletions

diff --git a/converters/ttf2pt1/Makefile b/converters/ttf2pt1/Makefile
index aa66818bf9a..9e8dd05216d 100644
--- a/converters/ttf2pt1/Makefile
+++ b/converters/ttf2pt1/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2002/01/02 20:30:16 reinoud Exp $
+# $NetBSD: Makefile,v 1.2 2002/06/05 12:07:22 markd Exp $
 #
 
 DISTNAME=	ttf2pt1-3.4.0
+PKGREVISION=	1
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ttf2pt1/}
 EXTRACT_SUFX=	.tgz
@@ -10,4 +11,9 @@ 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
index 3712ab956b8..191f8ad8433 100644
--- a/converters/ttf2pt1/PLIST
+++ b/converters/ttf2pt1/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/05 22:39:01 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/06/05 12:07:22 markd Exp $
 bin/ttf2pt1
 bin/ttf2pt1_convert
 bin/ttf2pt1_x2gs
@@ -13,7 +13,6 @@ share/ttf2pt1/FONTS.hpux
 share/ttf2pt1/FONTS.hpux.html
 share/ttf2pt1/FONTS.html
 share/ttf2pt1/README
-share/ttf2pt1/README.FIRST
 share/ttf2pt1/README.html
 share/ttf2pt1/app/RPM/ttf2pt1.spec.src
 share/ttf2pt1/app/X11/README
@@ -101,5 +100,3 @@ share/ttf2pt1/scripts/x2gs
 @dirrm share/ttf2pt1/app/RPM
 @dirrm share/ttf2pt1/app
 @dirrm share/ttf2pt1
-@exec ${MKDIR} -p %D/libexec/ttf2pt1
-@dirrm libexec/ttf2pt1
diff --git a/converters/ttf2pt1/distinfo b/converters/ttf2pt1/distinfo
index d27e68f0731..a78d0b1255d 100644
--- a/converters/ttf2pt1/distinfo
+++ b/converters/ttf2pt1/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2002/01/02 20:30:17 reinoud Exp $
+$NetBSD: distinfo,v 1.2 2002/06/05 12:07:23 markd Exp $
 
 SHA1 (ttf2pt1-3.4.0.tgz) = 1e11478ab5f6dae26ea743dc1149603d652746bb
 Size (ttf2pt1-3.4.0.tgz) = 204811 bytes
-SHA1 (patch-aa) = a74ad2bcaa3d4fd12973f229f53e0d5e42215368
+SHA1 (patch-aa) = 38977dc201e8a66bd1b26e9f7a813d4f34330a6f
diff --git a/converters/ttf2pt1/patches/patch-aa b/converters/ttf2pt1/patches/patch-aa
index 2757b076544..82c10c06047 100644
--- a/converters/ttf2pt1/patches/patch-aa
+++ b/converters/ttf2pt1/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2002/01/02 20:30:18 reinoud Exp $
+$NetBSD: patch-aa,v 1.2 2002/06/05 12:07:23 markd Exp $
 
---- Makefile.orig	Mon Oct 15 04:32:29 2001
-+++ Makefile
-@@ -20,11 +20,11 @@
+--- Makefile.orig	Mon Oct 15 15:32:29 2001
++++ Makefile	Tue Jun  4 23:56:00 2002
+@@ -20,7 +20,7 @@
  #
  # Default
  
@@ -11,12 +11,32 @@ $NetBSD: patch-aa,v 1.1 2002/01/02 20:30:18 reinoud Exp $
  
  # For GNU C
  #
--#CFLAGS_SYS= -O2
-+CFLAGS_SYS= -O2
- #
- # For GNU C with long options support library (Linux etc.)
- #
-@@ -93,7 +93,7 @@
+@@ -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,
+@@ -87,17 +87,17 @@
+ 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
@@ -25,41 +45,27 @@ $NetBSD: patch-aa,v 1.1 2002/01/02 20:30:18 reinoud Exp $
  # for binaries
  BINDIR = $(INSTDIR)/bin
  # for binaries of little general interest
-@@ -123,7 +123,7 @@
+-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:	t1asm ttf2pt1 docs mans
++all:	ttf2pt1 docs mans
  
  docs: $(DOCS)
  
-@@ -136,7 +136,7 @@
- veryclean: clean
- 	rm -f $(DOCS) $(MANS)
- 
--rpm: app/RPM/Makefile app/RPM/ttf2pt1.spec
-+#rpm: app/RPM/Makefile app/RPM/ttf2pt1.spec
- 
- ttf2pt1.1: README.html
- 	scripts/html2man . . <README.html
-@@ -144,11 +144,11 @@
- ttf2pt1_convert.1 ttf2pt1_x2gs.1: FONTS.html
- 	scripts/html2man . . <FONTS.html
- 
--app/RPM/Makefile: Makefile
--	sed 's/^CFLAGS_SYS.*=.*$$/CFLAGS_SYS= -O2 -D_GNU_SOURCE/;/warning:/,/^$$/s/^/#/' <Makefile >app/RPM/Makefile
-+#app/RPM/Makefile: Makefile
-+#	sed 's/^CFLAGS_SYS.*=.*$$/CFLAGS_SYS= -O2 -D_GNU_SOURCE/;/warning:/,/^$$/s/^/#/' <Makefile >app/RPM/Makefile
- 
--app/RPM/ttf2pt1.spec: app/RPM/ttf2pt1.spec.src version.h
--	sed 's/^Version:.*/Version: '`grep TTF2PT1_VERSION version.h| cut -d\" -f2`'/' <app/RPM/ttf2pt1.spec.src  >$@
-+#app/RPM/ttf2pt1.spec: app/RPM/ttf2pt1.spec.src version.h
-+#	sed 's/^Version:.*/Version: '`grep TTF2PT1_VERSION version.h| cut -d\" -f2`'/' <app/RPM/ttf2pt1.spec.src  >$@
- 
- t1asm: t1asm.c
- 	$(CC) $(CFLAGS) -o t1asm -DSTANDALONE t1asm.c $(LIBS)
-@@ -202,24 +202,24 @@
+@@ -202,31 +202,21 @@
  	scripts/unhtml <FONTS.hpux.html >FONTS.hpux
  
  install: all
@@ -68,29 +74,35 @@ $NetBSD: patch-aa,v 1.1 2002/01/02 20:30:18 reinoud Exp $
 -	scripts/inst_dir $(SHAREDIR)
 -	scripts/inst_dir $(MANDIR)/man1
 -	scripts/inst_dir $(MANDIR)/man5
-+	install -d $(BINDIR)
-+	install -d $(LIBXDIR)
-+	install -d $(SHAREDIR)
-+	install -d $(MANDIR)/man1
-+	install -d $(MANDIR)/man5
- 	cp -R $(TXTFILES) $(SUBDIRS) $(SHAREDIR)
- 	chown -R $(OWNER) $(SHAREDIR)
- 	chgrp -R $(GROUP) $(SHAREDIR)
- 	chmod -R go-w $(SHAREDIR)
+-	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
-+	install -c -o $(OWNER) -g $(GROUP) -m 0755 ttf2pt1 $(BINDIR)
-+	[ -f $(BINDIR)/t1asm ] || install -c -o $(OWNER) -g $(GROUP) -m 0755 t1asm $(LIBXDIR)/t1asm
++	$(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
-+	install -c -o $(OWNER) -g $(GROUP) -m 0755 cvt.tmp $(BINDIR)/ttf2pt1_convert
-+	install -c -o $(OWNER) -g $(GROUP) -m 0755 cvt.tmp $(SHAREDIR)/scripts/convert
- 	rm cvt.tmp
+-	rm cvt.tmp
 -	scripts/inst_file scripts/x2gs $(BINDIR)/ttf2pt1_x2gs $(OWNER) $(GROUP) 0755
-+	install -c -o $(OWNER) -g $(GROUP) -m 0755 scripts/x2gs $(BINDIR)/ttf2pt1_x2gs 
++	$(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
+