4 files changed, 117 insertions, 167 deletions

diff --git a/print/ttf2pt1/Makefile b/print/ttf2pt1/Makefile
index e3246542eb53..0573dd1e6931 100644
--- a/print/ttf2pt1/Makefile
+++ b/print/ttf2pt1/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	ttf2pt1
-PORTVERSION=	3.4.3
+PORTVERSION=	3.4.4
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,12 +16,17 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	True Type Font to Postscript Type 1 Converter
 
-LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
-FREETYPE_CONFIG?=	${LOCALBASE}/bin/freetype-config
-MAKE_ENV=	FREETYPE_CONFIG="${FREETYPE_CONFIG}"
 USE_PERL5=	yes
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} ${CPPFLAGS}" LIBS="${LDFLAGS}" \
+		INSTDIR="${PREFIX}" LIBXDIR="${PREFIX}/bin"
 
-MAN1=	ttf2pt1.1 ttf2pt1_convert.1 ttf2pt1_x2gs.1
+MAN1=		ttf2pt1.1 ttf2pt1_convert.1 ttf2pt1_x2gs.1
+
+CPPFLAGS=	`pkg-config --cflags freetype2` \
+		-I${LOCALBASE}/include -DUSE_FREETYPE 
+LDFLAGS=	`pkg-config --libs freetype2` \
+		-L${LOCALBASE}/lib -lm
 
 .include <bsd.port.mk>
diff --git a/print/ttf2pt1/distinfo b/print/ttf2pt1/distinfo
index 76ed7a2132f3..a7999386e324 100644
--- a/print/ttf2pt1/distinfo
+++ b/print/ttf2pt1/distinfo
@@ -1,2 +1,2 @@
-MD5 (ttf2pt1-3.4.3.tgz) = b255ad96730c54056ea838dd80df97c2
-SIZE (ttf2pt1-3.4.3.tgz) = 228646
+MD5 (ttf2pt1-3.4.4.tgz) = cb143c07cc83167875ca09ea720d4932
+SIZE (ttf2pt1-3.4.4.tgz) = 230547
diff --git a/print/ttf2pt1/files/patch-Makefile b/print/ttf2pt1/files/patch-Makefile
deleted file mode 100644
index f73e47e91733..000000000000
--- a/print/ttf2pt1/files/patch-Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
---- Makefile.orig	Fri Aug  9 09:16:57 2002
-+++ Makefile	Thu Nov  7 15:43:07 2002
-@@ -20,7 +20,7 @@
- #
- # Default
- 
--CFLAGS_SYS= -O
-+#CFLAGS_SYS= -O
- 
- # For GNU C
- #
-@@ -60,12 +60,12 @@
- # (if the include and lib directory do not match your installation,
- # modify them), also uncomment LIBS_FT
- #
--#CFLAGS_FT = -DUSE_FREETYPE -I/usr/local/include/freetype2 -I/usr/local/include
-+CFLAGS_FT = -DUSE_FREETYPE `${FREETYPE_CONFIG} --cflags` -I/usr/local/include
- 
- # 
- # The FreeType-2 library flags (disabled by default)
- 
--LIBS_FT=
-+LIBS_FT= `${FREETYPE_CONFIG} --libs`
- 
- # To enable use of the FreeType-2 library
- # (if the include and lib directory do not match your installation,
-@@ -114,17 +114,17 @@
- CFLAGS_EXTT1ASM=
- #CFLAGS_EXTT1ASM= -DEXTERNAL_T1ASM
- 
--CFLAGS= $(CFLAGS_SYS) $(CFLAGS_FT) $(CFLAGS_AT) $(CFLAGS_PREF)
-+CFLAGS+= $(CFLAGS_SYS) $(CFLAGS_FT) $(CFLAGS_AT) $(CFLAGS_PREF)
- LIBS= $(LIBS_SYS) $(LIBS_FT) $(LIBS_AT)
- 
- # 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
-@@ -142,7 +142,7 @@
- 	@echo >&2
- 
- DOCS=CHANGES README FONTS FONTS.hpux encodings/README other/README \
--	app/X11/README app/netscape/README app/TeX/README
-+	app/X11/README app/netscape/README
- 
- SUBDIRS = app encodings maps scripts other
- TXTFILES = README* FONTS* CHANGES* COPYRIGHT
diff --git a/print/ttf2pt1/pkg-plist b/print/ttf2pt1/pkg-plist
index 183b655a4031..2da83ae968b1 100644
--- a/print/ttf2pt1/pkg-plist
+++ b/print/ttf2pt1/pkg-plist
@@ -2,107 +2,108 @@ bin/t1asm
 bin/ttf2pt1
 bin/ttf2pt1_convert
 bin/ttf2pt1_x2gs
-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.FIRST
-share/ttf2pt1/README.html
-share/ttf2pt1/app/RPM/Makefile
-share/ttf2pt1/app/RPM/ttf2pt1.spec
-share/ttf2pt1/app/RPM/ttf2pt1.spec.src
-share/ttf2pt1/app/TeX/README.html
-share/ttf2pt1/app/TeX/cjk-latex-config
-share/ttf2pt1/app/TeX/cjk-latex-t1mapgen
-share/ttf2pt1/app/TeX/sfd2map
-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/T2A_compact.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/app/RPM
-@dirrm share/ttf2pt1/app/TeX
-@dirrm share/ttf2pt1/app/X11
-@dirrm share/ttf2pt1/app/netscape
-@dirrm share/ttf2pt1/app
-@dirrm share/ttf2pt1/encodings/adobestd
-@dirrm share/ttf2pt1/encodings/bulgarian
-@dirrm share/ttf2pt1/encodings/cyrillic
-@dirrm share/ttf2pt1/encodings/latin1
-@dirrm share/ttf2pt1/encodings/latin2
-@dirrm share/ttf2pt1/encodings/latin4
-@dirrm share/ttf2pt1/encodings/latin5
-@dirrm share/ttf2pt1/encodings/russian
-@dirrm share/ttf2pt1/encodings
-@dirrm share/ttf2pt1/maps
-@dirrm share/ttf2pt1/other
-@dirrm share/ttf2pt1/scripts
-@dirrm share/ttf2pt1
+%%DATADIR%%/CHANGES
+%%DATADIR%%/CHANGES.html
+%%DATADIR%%/COPYRIGHT
+%%DATADIR%%/FONTS
+%%DATADIR%%/FONTS.hpux
+%%DATADIR%%/FONTS.hpux.html
+%%DATADIR%%/FONTS.html
+%%DATADIR%%/README
+%%DATADIR%%/README.FIRST
+%%DATADIR%%/README.html
+%%DATADIR%%/app/RPM/Makefile
+%%DATADIR%%/app/RPM/ttf2pt1.spec
+%%DATADIR%%/app/RPM/ttf2pt1.spec.src
+%%DATADIR%%/app/TeX/README
+%%DATADIR%%/app/TeX/README.html
+%%DATADIR%%/app/TeX/cjk-latex-config
+%%DATADIR%%/app/TeX/cjk-latex-t1mapgen
+%%DATADIR%%/app/TeX/sfd2map
+%%DATADIR%%/app/X11/README
+%%DATADIR%%/app/X11/README.html
+%%DATADIR%%/app/X11/t1-xf86.334.patch
+%%DATADIR%%/app/X11/t1-xf86.39.patch
+%%DATADIR%%/app/netscape/Makefile
+%%DATADIR%%/app/netscape/README
+%%DATADIR%%/app/netscape/README.html
+%%DATADIR%%/app/netscape/fontsz.cf
+%%DATADIR%%/app/netscape/notscape
+%%DATADIR%%/app/netscape/nsfilter
+%%DATADIR%%/app/netscape/nsfix.c
+%%DATADIR%%/app/netscape/nspr
+%%DATADIR%%/app/netscape/nsprint
+%%DATADIR%%/app/netscape/psfonts.cf
+%%DATADIR%%/encodings/README
+%%DATADIR%%/encodings/README.html
+%%DATADIR%%/encodings/adobestd/adobe-std.tbl
+%%DATADIR%%/encodings/bulgarian/README
+%%DATADIR%%/encodings/bulgarian/encodings.alias
+%%DATADIR%%/encodings/bulgarian/ibm-1251.tbl
+%%DATADIR%%/encodings/bulgarian/ibm-866.tbl
+%%DATADIR%%/encodings/bulgarian/iso8859-5.tbl
+%%DATADIR%%/encodings/bulgarian/koi8-r.tbl
+%%DATADIR%%/encodings/cyrillic/encodings.alias
+%%DATADIR%%/encodings/cyrillic/ibm-1251.tbl
+%%DATADIR%%/encodings/cyrillic/ibm-866.tbl
+%%DATADIR%%/encodings/cyrillic/iso8859-5.tbl
+%%DATADIR%%/encodings/cyrillic/koi8-r.tbl
+%%DATADIR%%/encodings/latin1/iso8859-1.tbl
+%%DATADIR%%/encodings/latin2/iso8859-2.tbl
+%%DATADIR%%/encodings/latin4/iso8859-4
+%%DATADIR%%/encodings/latin4/iso8859-4.tbl
+%%DATADIR%%/encodings/latin5/iso8859-9
+%%DATADIR%%/encodings/russian/README
+%%DATADIR%%/encodings/russian/encodings.alias
+%%DATADIR%%/encodings/russian/ibm-1251.tbl
+%%DATADIR%%/encodings/russian/ibm-866.tbl
+%%DATADIR%%/encodings/russian/iso8859-5.tbl
+%%DATADIR%%/encodings/russian/koi8-r.tbl
+%%DATADIR%%/maps/CP1250.map
+%%DATADIR%%/maps/CP1251.map
+%%DATADIR%%/maps/T2A_compact.map
+%%DATADIR%%/maps/adobe-standard-encoding.map
+%%DATADIR%%/maps/unicode-sample.map
+%%DATADIR%%/other/Makefile
+%%DATADIR%%/other/README
+%%DATADIR%%/other/README.html
+%%DATADIR%%/other/bmpfont.h
+%%DATADIR%%/other/bz.c
+%%DATADIR%%/other/bzscreen.c
+%%DATADIR%%/other/bzscreen.h
+%%DATADIR%%/other/cmpf.c
+%%DATADIR%%/other/cntstems.pl
+%%DATADIR%%/other/dmpf.c
+%%DATADIR%%/other/lst.pl
+%%DATADIR%%/other/showdf
+%%DATADIR%%/other/showg
+%%DATADIR%%/scripts/convert
+%%DATADIR%%/scripts/convert.cfg.sample
+%%DATADIR%%/scripts/forceiso
+%%DATADIR%%/scripts/frommap
+%%DATADIR%%/scripts/html2man
+%%DATADIR%%/scripts/inst_dir
+%%DATADIR%%/scripts/inst_file
+%%DATADIR%%/scripts/mkrel
+%%DATADIR%%/scripts/t1fdir
+%%DATADIR%%/scripts/trans
+%%DATADIR%%/scripts/unhtml
+%%DATADIR%%/scripts/x2gs
+@dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/other
+@dirrm %%DATADIR%%/maps
+@dirrm %%DATADIR%%/encodings/russian
+@dirrm %%DATADIR%%/encodings/latin5
+@dirrm %%DATADIR%%/encodings/latin4
+@dirrm %%DATADIR%%/encodings/latin2
+@dirrm %%DATADIR%%/encodings/latin1
+@dirrm %%DATADIR%%/encodings/cyrillic
+@dirrm %%DATADIR%%/encodings/bulgarian
+@dirrm %%DATADIR%%/encodings/adobestd
+@dirrm %%DATADIR%%/encodings
+@dirrm %%DATADIR%%/app/netscape
+@dirrm %%DATADIR%%/app/X11
+@dirrm %%DATADIR%%/app/TeX
+@dirrm %%DATADIR%%/app/RPM
+@dirrm %%DATADIR%%/app
+@dirrm %%DATADIR%%