Changes t1lib-5.1.0:

- Check against MultipleMasterFonts somewhat more tolerant, so that
  Type 1 Fonts automatically created from Multiple Master Fonts (e.g.
  using Mmpfb) should now be acceptable.

- The configure-machinery had been somewhat out of date and has been
  updated. The distributed configure script has been generated by
  AutoConf 2.59 and the redistributed libtool parts are taken from
  GNU libtool 1.5.10.

- Top-Level TeX-file in the doc subdirectory adapted to recent TeX
  systems' requirements.

- Added IsoLatin9.enc to distribution.

- Subsetting extended so that it works for SEAC-constructed composites
  even if no AFM composite character information is available

- Somewhat more intelligent defaults for subsetting when composite
  characters are included in the subset.

- Reallocation had been broken by relocation of internal StandardEncoding
  vector. This problem turned out on systems where realloc() actually
  returned a different pointer.

- Fix for outline code on 64bit systems. This involves a redefinition
  of the T1_PATHPOINT struct. This should be uncritical because for 32bit
  systems there is no difference, whereas on 64bit systems, this has never
  worked correctly before.

- DESTDIR support in Makefile.in by Volker Zell

- Support for XLFD font database format (in which the fonts' names appear
  in the first place on a line).

- Further Bug Fixes

8 files changed, 50 insertions, 66 deletions

diff --git a/fonts/t1lib/Makefile b/fonts/t1lib/Makefile
index eddb8b8bc98..53f0822142a 100644
--- a/fonts/t1lib/Makefile
+++ b/fonts/t1lib/Makefile
@@ -1,21 +1,18 @@
-# $NetBSD: Makefile,v 1.22 2005/06/15 04:43:09 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.23 2005/08/04 09:57:17 adam Exp $
 
-DISTNAME=	t1lib-5.0.2
-PKGREVISION=	4
+DISTNAME=	t1lib-5.1.0
 CATEGORIES=	fonts devel graphics
-MASTER_SITES=	${MASTER_SITE_SUNSITE:=libs/graphics/} \
-		ftp://ftp.foolabs.com/pub/xpdf/
+MASTER_SITES=	${MASTER_SITE_SUNSITE:=libs/graphics/}
 
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Library for generating bitmaps from Adobe Type 1 fonts
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_PKGINSTALL=		YES
+USE_LIBTOOL=		yes
+USE_PKGINSTALL=		yes
 USE_TOOLS+=		gmake
-GNU_CONFIGURE=		YES
-USE_LIBTOOL=		YES
+GNU_CONFIGURE=		yes
 
 BUILD_TARGET=	without_doc
 
diff --git a/fonts/t1lib/PLIST b/fonts/t1lib/PLIST
index 483d16967df..bd16d427eb6 100644
--- a/fonts/t1lib/PLIST
+++ b/fonts/t1lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/09/22 08:09:31 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2005/08/04 09:57:17 adam Exp $
 bin/type1afm
 bin/xglyph
 include/t1lib.h
@@ -72,6 +72,7 @@ share/${PKGBASE}/Fonts/afm/dcti10.afm
 share/${PKGBASE}/Fonts/afm/eufm10.afm
 share/${PKGBASE}/Fonts/enc/IsoLatin1.enc
 share/${PKGBASE}/Fonts/enc/IsoLatin2.enc
+share/${PKGBASE}/Fonts/enc/IsoLatin9.enc
 share/${PKGBASE}/Fonts/enc/PSLatin1.enc
 share/${PKGBASE}/Fonts/enc/dc.enc
 share/${PKGBASE}/Fonts/enc/dvips.enc
diff --git a/fonts/t1lib/distinfo b/fonts/t1lib/distinfo
index c77b6798c6e..2cf64e7d3b4 100644
--- a/fonts/t1lib/distinfo
+++ b/fonts/t1lib/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.9 2005/06/15 04:43:09 jlam Exp $
+$NetBSD: distinfo,v 1.10 2005/08/04 09:57:17 adam Exp $
 
-SHA1 (t1lib-5.0.2.tar.gz) = 71a6ec6c84a2e28a21f261be865e0dabe52daeb5
-RMD160 (t1lib-5.0.2.tar.gz) = d6ff7fa3baca4a4ce78960a145bfa69b4cd771fa
-Size (t1lib-5.0.2.tar.gz) = 1697086 bytes
-SHA1 (patch-aa) = 1a09e0f8c3b35987a963bd73b2d18722c0a67fba
-SHA1 (patch-ab) = 4dbcc243c125b27ada972219da25a807f8c5a138
-SHA1 (patch-ac) = aae10307ac7da8f095e7b294273503b5900e52aa
-SHA1 (patch-ad) = ce242734ad7077ddd459c9d1c63fb88025d34de8
-SHA1 (patch-ae) = eaeaf0b4e57c01fdf907f075ae1c2872f237bbef
+SHA1 (t1lib-5.1.0.tar.gz) = 6866561027aa32b0efb1a1aad0aa38cb5e01a299
+RMD160 (t1lib-5.1.0.tar.gz) = f12710159aa8a92e8feb5d934dc45875d198bb58
+Size (t1lib-5.1.0.tar.gz) = 1838635 bytes
+SHA1 (patch-aa) = 068c25f733c3037faa5051b527b1e1637d706a20
+SHA1 (patch-ab) = 10f2c9d8b03fbcd38adb1693bd14ed6cdbe4dcbf
+SHA1 (patch-ac) = 14201794e29a2eeba22a9144726ed3e00322aa1d
+SHA1 (patch-ad) = 29c530f6d363de31777ad45823b55e72208c4ccb
+SHA1 (patch-ae) = 2e9e1e5d1a7f505f509cdcfa03c2e210e6b364dd
 SHA1 (patch-af) = e89df0d94e0748e468c7c3d40ce2fc0ccdb0116c
diff --git a/fonts/t1lib/patches/patch-aa b/fonts/t1lib/patches/patch-aa
index e33b73801f8..cd42fbc5269 100644
--- a/fonts/t1lib/patches/patch-aa
+++ b/fonts/t1lib/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1 2002/09/19 01:26:45 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2005/08/04 09:57:17 adam Exp $
 
---- doc/Makefile.in.orig	Wed Sep 18 18:17:56 2002
+--- doc/Makefile.in.orig	2004-12-13 02:35:16.000000000 +0000
 +++ doc/Makefile.in
 @@ -89,16 +89,6 @@ clean: dummy
  
@@ -8,13 +8,13 @@ $NetBSD: patch-aa,v 1.1 2002/09/19 01:26:45 jlam Exp $
  install: dummy
 -	if (test -f t1lib_doc.ps) \
 -	then \
--	  $(MKINSTALLDIRS) @T1LIB_DATA_DIR@/doc; \
--	  $(INSTALL_DATA) t1lib_doc.ps @T1LIB_DATA_DIR@/doc; \
+-	  $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
+-	  $(INSTALL_DATA) t1lib_doc.ps $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
 -	fi;
 -	if (test -f t1lib_doc.pdf) \
 -	then \
--	  $(MKINSTALLDIRS) @T1LIB_DATA_DIR@/doc; \
--	  $(INSTALL_DATA) t1lib_doc.pdf @T1LIB_DATA_DIR@/doc; \
+-	  $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
+-	  $(INSTALL_DATA) t1lib_doc.pdf $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
 -	fi;
  
  
diff --git a/fonts/t1lib/patches/patch-ab b/fonts/t1lib/patches/patch-ab
index 2b522753ceb..35a6f0a618a 100644
--- a/fonts/t1lib/patches/patch-ab
+++ b/fonts/t1lib/patches/patch-ab
@@ -1,9 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2004/06/19 14:38:56 markd Exp $
+$NetBSD: patch-ab,v 1.3 2005/08/04 09:57:17 adam Exp $
 
-diff -ur t1lib-5.0.2/lib/t1lib/t1base.c t1lib-5.0.1/lib/t1lib/t1base.c
---- t1lib-5.0.2/lib/t1lib/t1base.c	2004-03-06 14:58:04.000000000 +1300
-+++ lib/t1lib/t1base.c	2004-02-02 14:16:16.000000000 +1300
-@@ -281,12 +276,7 @@
+--- lib/t1lib/t1base.c.orig	2005-05-18 03:08:01.000000000 +0000
++++ lib/t1lib/t1base.c
+@@ -286,12 +286,7 @@ void *T1_InitLib( int log)
  		   T1LOG_WARNING);
    }
    
@@ -17,7 +16,7 @@ diff -ur t1lib-5.0.2/lib/t1lib/t1base.c t1lib-5.0.1/lib/t1lib/t1base.c
    /* Set the default encoding to the fonts' internal encoding */
    pFontBase->default_enc=NULL;
    
-@@ -507,12 +497,6 @@
+@@ -655,12 +650,6 @@ int T1_CloseLib( void)
      else
        error=1;
  
diff --git a/fonts/t1lib/patches/patch-ac b/fonts/t1lib/patches/patch-ac
index ca3038854e0..cfc2f13d57b 100644
--- a/fonts/t1lib/patches/patch-ac
+++ b/fonts/t1lib/patches/patch-ac
@@ -1,21 +1,21 @@
-$NetBSD: patch-ac,v 1.2 2004/03/03 11:28:11 adam Exp $
+$NetBSD: patch-ac,v 1.3 2005/08/04 09:57:17 adam Exp $
 
---- lib/Makefile.in.orig	2002-06-25 02:15:30.000000000 +0000
+--- lib/Makefile.in.orig	2005-05-01 22:01:57.000000000 +0000
 +++ lib/Makefile.in
-@@ -162,17 +162,10 @@ clean: dummy
+@@ -161,17 +161,10 @@ clean: dummy
  install: dummy
- 	$(MKINSTALLDIRS) $(libdir)
- 	$(MKINSTALLDIRS) $(includedir)
--	$(MKINSTALLDIRS) @T1LIB_DATA_DIR@
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(includedir)
+-	$(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@
  	$(LIBTOOL) --mode=install \
- 		$(INSTALL_DATA) $(MAIN_TARGET) $(libdir)
+ 		$(INSTALL_DATA) $(MAIN_TARGET) $(DESTDIR)$(libdir)
  	$(LIBTOOL) --mode=install \
- 		$(INSTALL_DATA) $(MAIN_HEADER) $(includedir)
--	if (test -f @T1LIB_DATA_DIR@/t1lib.config) \
+ 		$(INSTALL_DATA) $(MAIN_HEADER) $(DESTDIR)$(includedir)
+-	if (test -f $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config) \
 -	then \
 -	  echo "Alert: Global configuration file exists, installation skipped!"; \
 -	else \
--	  $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config @T1LIB_DATA_DIR@; \
+-	  $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config $(DESTDIR)@T1LIB_DATA_DIR@; \
 -	fi;
  
  
diff --git a/fonts/t1lib/patches/patch-ad b/fonts/t1lib/patches/patch-ad
index 26cb77fc7c0..5ee3aee180a 100644
--- a/fonts/t1lib/patches/patch-ad
+++ b/fonts/t1lib/patches/patch-ad
@@ -1,20 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2004/06/19 14:38:56 markd Exp $
+$NetBSD: patch-ad,v 1.3 2005/08/04 09:57:17 adam Exp $
 
-diff -ur t1lib-5.0.2/lib/type1/scanfont.c t1lib-5.0.1/lib/type1/scanfont.c
---- t1lib-5.0.2/lib/type1/scanfont.c	2004-03-06 14:58:26.000000000 +1300
-+++ lib/type1/scanfont.c	2002-08-18 07:32:50.000000000 +1200
-@@ -248,7 +247,7 @@
-   int i;
-   psobj *encodingArrayP;
-  
--  encodingArrayP = (psobj *)malloc(256*(sizeof(psobj)));
-+  encodingArrayP = (psobj *)vm_alloc(256*(sizeof(psobj)));
-   if (!encodingArrayP)
-       return NULL;
- 
---- lib/type1/scanfont.c.orig	2004-03-05 19:58:26.000000000 -0600
+--- lib/type1/scanfont.c.orig	2005-08-04 11:41:27.000000000 +0000
 +++ lib/type1/scanfont.c
-@@ -1237,7 +1237,7 @@ int scan_font(FontP)
+@@ -1244,7 +1244,7 @@ int scan_font(FontP)
      }
      if ( namelen >= MAXPATHLEN ) {
        /* Hopefully, this will lead to a file open error */
diff --git a/fonts/t1lib/patches/patch-ae b/fonts/t1lib/patches/patch-ae
index c19aa9b563e..ebd0daeca2c 100644
--- a/fonts/t1lib/patches/patch-ae
+++ b/fonts/t1lib/patches/patch-ae
@@ -1,17 +1,16 @@
-$NetBSD: patch-ae,v 1.1 2004/06/19 14:38:56 markd Exp $
+$NetBSD: patch-ae,v 1.2 2005/08/04 09:57:17 adam Exp $
 
-diff -ur t1lib-5.0.2/lib/type1/fontfcn.c t1lib-5.0.1/lib/type1/fontfcn.c
---- t1lib-5.0.2/lib/type1/fontfcn.c	2004-03-06 14:41:40.000000000 +1300
-+++ lib/type1/fontfcn.c	2003-01-03 16:28:26.000000000 +1300
-@@ -57,6 +57,7 @@
- 			 float line_thickness,
- 			 float line_length,
- 			 float strokewidth);
-+extern  boolean Init_BuiltInEncoding( void);
+--- lib/type1/fontfcn.c.orig	2004-12-12 01:18:20.000000000 +0000
++++ lib/type1/fontfcn.c
+@@ -66,6 +66,7 @@ extern int T1int_Type1QuerySEAC( unsigne
+ 				 unsigned char* accent);
  void objFormatName(psobj *objP, int length, char *valueP);
    
++extern boolean Init_BuiltInEncoding(void);
  extern void T1io_reset( void);
-@@ -156,6 +157,7 @@
+ 
+ #define BEZIERTYPE 0x10+0x02
+@@ -163,6 +164,7 @@ boolean initFont()
  {
    if (!(vm_init())) return(FALSE);
    vm_base = vm_next_byte();