Changes 3.4.4:

* Improved auto-vectoring (-OV) algorithm
* Allow use of any encoding table of format 4 in the ttf parser
* Take the first available format 4 encoding table if no know table is found
* The ttf parser lists the available encondings if no supported encoding table
  is found
* Bug fixes

5 files changed, 46 insertions, 27 deletions

diff --git a/fonts/ttf2pt1/Makefile b/fonts/ttf2pt1/Makefile
index 40a9593ee42..efba5b7a72e 100644
--- a/fonts/ttf2pt1/Makefile
+++ b/fonts/ttf2pt1/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2004/04/25 08:56:19 snj Exp $
+# $NetBSD: Makefile,v 1.8 2004/04/27 15:18:08 adam Exp $
 #
 
-DISTNAME=	ttf2pt1-3.4.0
-PKGREVISION=	3
+DISTNAME=	ttf2pt1-3.4.4
 CATEGORIES=	fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ttf2pt1/}
 EXTRACT_SUFX=	.tgz
@@ -13,7 +12,7 @@ COMMENT=	TrueType font converter to Postscript type 1
 
 DEPENDS+=	t1utils-[0-9]*:../../fonts/t1utils
 
-USE_BUILDLINK3=	yes
+USE_BUILDLINK3=		yes
 
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/ttf2pt1/PLIST b/fonts/ttf2pt1/PLIST
index 655c29b4a84..4277e6baa8b 100644
--- a/fonts/ttf2pt1/PLIST
+++ b/fonts/ttf2pt1/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/16 15:26:01 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/04/27 15:18:08 adam Exp $
 bin/ttf2pt1
 bin/ttf2pt1_convert
 bin/ttf2pt1_x2gs
@@ -15,6 +15,11 @@ share/ttf2pt1/FONTS.html
 share/ttf2pt1/README
 share/ttf2pt1/README.html
 share/ttf2pt1/app/RPM/ttf2pt1.spec.src
+share/ttf2pt1/app/TeX/README
+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
@@ -56,6 +61,7 @@ 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
@@ -97,6 +103,7 @@ share/ttf2pt1/scripts/x2gs
 @dirrm share/ttf2pt1/encodings
 @dirrm share/ttf2pt1/app/netscape
 @dirrm share/ttf2pt1/app/X11
+@dirrm share/ttf2pt1/app/TeX
 @dirrm share/ttf2pt1/app/RPM
 @dirrm share/ttf2pt1/app
 @dirrm share/ttf2pt1
diff --git a/fonts/ttf2pt1/distinfo b/fonts/ttf2pt1/distinfo
index 4c22842f91a..56b770e2962 100644
--- a/fonts/ttf2pt1/distinfo
+++ b/fonts/ttf2pt1/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2002/10/08 09:58:20 jlam Exp $
+$NetBSD: distinfo,v 1.3 2004/04/27 15:18:08 adam Exp $
 
-SHA1 (ttf2pt1-3.4.0.tgz) = 1e11478ab5f6dae26ea743dc1149603d652746bb
-Size (ttf2pt1-3.4.0.tgz) = 204811 bytes
-SHA1 (patch-aa) = 6b009c2bee1d552b347023a3e79ab3fc91dd3c30
+SHA1 (ttf2pt1-3.4.4.tgz) = 936771b11a740c16a8e0adb737b54b22cca18cb2
+Size (ttf2pt1-3.4.4.tgz) = 230547 bytes
+SHA1 (patch-aa) = e8344ed0026c94015771d08102ea4e1858061403
+SHA1 (patch-ab) = 4133a4ded43eec3da256eeea31ff35b9b8167351
diff --git a/fonts/ttf2pt1/patches/patch-aa b/fonts/ttf2pt1/patches/patch-aa
index 2b105d3ed65..d58e5c65438 100644
--- a/fonts/ttf2pt1/patches/patch-aa
+++ b/fonts/ttf2pt1/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2002/10/08 09:58:21 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2004/04/27 15:18:08 adam Exp $
 
---- Makefile.orig	Sun Oct 14 19:32:29 2001
+--- Makefile.orig	2002-08-30 18:03:07.000000000 +0000
 +++ Makefile
 @@ -20,7 +20,7 @@
  #
@@ -12,8 +12,8 @@ $NetBSD: patch-aa,v 1.2 2002/10/08 09:58:21 jlam Exp $
  # For GNU C
  #
 @@ -54,7 +54,7 @@ LIBS_SYS= -lm
- # This WON'T BUILD with FT2-beta8, use the FreeType release 2.0.
- # http://download.sourceforge.net/freetype/freetype-2.0.tar.gz
+ # This WON'T BUILD with FT2-beta8, use the FreeType release 2.0.4
+ # http://download.sourceforge.net/freetype/freetype-2.0.4.tar.gz
  
 -CFLAGS_FT= 
 +CFLAGS_FT= -DUSE_FREETYPE `freetype-config --cflags`
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.2 2002/10/08 09:58:21 jlam Exp $
  
  # 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=
+@@ -111,20 +111,20 @@ CFLAGS_PREF=
  #CFLAGS_PREF= -DPREFER_FREETYPE
  
  # Uncomment the second line to not compile t1asm into ttf2pt1
@@ -38,9 +38,9 @@ $NetBSD: patch-aa,v 1.2 2002/10/08 09:58:21 jlam Exp $
 +#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)
+-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
  # 
@@ -55,8 +55,8 @@ $NetBSD: patch-aa,v 1.2 2002/10/08 09:58:21 jlam Exp $
  # for scripts, maps/encodings etc.
  SHAREDIR = $(INSTDIR)/share/ttf2pt1
  MANDIR = $(INSTDIR)/man
-@@ -118,12 +118,12 @@ DOCS=CHANGES README FONTS FONTS.hpux enc
- 	app/X11/README app/netscape/README
+@@ -145,12 +145,12 @@ DOCS=CHANGES README FONTS FONTS.hpux enc
+ 	app/X11/README app/netscape/README app/TeX/README
  
  SUBDIRS = app encodings maps scripts other
 -TXTFILES = README* FONTS* CHANGES* COPYRIGHT
@@ -70,7 +70,7 @@ $NetBSD: patch-aa,v 1.2 2002/10/08 09:58:21 jlam Exp $
  
  docs: $(DOCS)
  
-@@ -175,7 +175,7 @@ runt1asm.o: runt1asm.c global.h
+@@ -203,7 +203,7 @@ runt1asm.o: runt1asm.c global.h
  	$(CC) $(CFLAGS) $(CFLAGS_EXTT1ASM) -c runt1asm.c
  
  ttf2pt1:	ttf2pt1.o pt1.o runt1asm.o ttf.o ft.o bdf.o bitmap.o
@@ -79,15 +79,15 @@ $NetBSD: patch-aa,v 1.2 2002/10/08 09:58:21 jlam Exp $
  
  CHANGES: CHANGES.html
  	scripts/unhtml <CHANGES.html >CHANGES
-@@ -202,31 +202,21 @@ FONTS.hpux: FONTS.hpux.html
+@@ -233,31 +233,21 @@ FONTS.hpux: FONTS.hpux.html
  	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
+-	scripts/inst_dir $(BINDIR) $(OWNER) $(GROUP) 0755
+-	scripts/inst_dir $(LIBXDIR) $(OWNER) $(GROUP) 0755
+-	scripts/inst_dir $(SHAREDIR) $(OWNER) $(GROUP) 0755
+-	scripts/inst_dir $(MANDIR)/man1 $(OWNER) $(GROUP) 0755
+-	scripts/inst_dir $(MANDIR)/man5 $(OWNER) $(GROUP) 0755
 -	cp -R $(TXTFILES) $(SUBDIRS) $(SHAREDIR)
 -	chown -R $(OWNER) $(SHAREDIR)
 -	chgrp -R $(GROUP) $(SHAREDIR)
@@ -106,7 +106,7 @@ $NetBSD: patch-aa,v 1.2 2002/10/08 09:58:21 jlam Exp $
 -	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 
++	$(BSD_INSTALL_SCRIPT) scripts/x2gs $(BINDIR)/ttf2pt1_x2gs
  	for i in $(MANS1); do { \
  		sed 's|TTF2PT1_BINDIR|$(BINDIR)|;\
  			s|TTF2PT1_LIBXDIR|$(LIBXDIR)|;\
diff --git a/fonts/ttf2pt1/patches/patch-ab b/fonts/ttf2pt1/patches/patch-ab
new file mode 100644
index 00000000000..b4df3af182c
--- /dev/null
+++ b/fonts/ttf2pt1/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2004/04/27 15:18:08 adam Exp $
+
+--- ft.c.orig	2004-04-27 10:58:11.000000000 +0000
++++ ft.c
+@@ -12,6 +12,7 @@
+ #include <stdlib.h>
+ #include <ctype.h>
+ #include <sys/types.h>
++#include <ft2build.h>
+ #include <freetype/freetype.h>
+ #include <freetype/ftglyph.h>
+ #include <freetype/ftsnames.h>