Update t1lib to 1.1.1. The shared library bumped its major, so update

dependents of t1lib to >=1.1.1 by changing appropriate line in the
buildlink.mk file.  Changes from version 1.0.1 include:

- Bug Fixes.

- Functions T1_GetFontFilePath() and T1_GetAfmFilePath() which return the
  complete path of the files used by t1lib.

- General support for font subsetting.

- T1_GetFontBBox() also accepts specification consisting of floating point
  numbers (as suggested by Derek B. Noonburg (derekn@foolabs.com)).

6 files changed, 48 insertions, 55 deletions

diff --git a/textproc/t1lib/Makefile b/textproc/t1lib/Makefile
index e4144c9a2b1..8b747fafe39 100644
--- a/textproc/t1lib/Makefile
+++ b/textproc/t1lib/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2001/06/29 19:45:30 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/07/30 20:07:22 jlam Exp $
 #
 
-DISTNAME=	t1lib-1.0.1
+DISTNAME=	t1lib-1.1.1
+WRKSRC=		${WRKDIR}/T1-1.1.1
 CATEGORIES=	textproc devel graphics
 MASTER_SITES=	${MASTER_SITE_SUNSITE:=libs/graphics/} \
 		ftp://ftp.neuroinformatik.ruhr-uni-bochum.de/pub/software/t1lib/
@@ -13,10 +14,10 @@ COMMENT=	Library for generating bitmaps from Adobe Type 1 fonts
 USE_BUILDLINK_ONLY=	# defined
 GNU_CONFIGURE=		# defined
 USE_GMAKE=		# defined
-USE_LIBTOOL=		# defined
 USE_X11BASE=		# defined
+USE_LIBTOOL=		# defined
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-WRKSRC=		${WRKDIR}/T1-1.0.1
 ALL_TARGET=	without_doc
 
 post-install:
@@ -28,7 +29,7 @@ post-install:
 
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/t1lib
 	cd ${WRKSRC}/examples; \
-	  ${PAX} -rw FontDataBase README.t1example1 t1example1.c t1lib.config \
+	  ${PAX} -rw FontDataBase t1example1.c t1lib.config \
 	      ${PREFIX}/share/examples/t1lib
 	${SED}	-e 's|@@X11BASE@@|${X11BASE}|g' \
 		-e 's|@@LOCALBASE@@|${LOCALBASE}|g' \
diff --git a/textproc/t1lib/buildlink.mk b/textproc/t1lib/buildlink.mk
index 9c04ee60b1d..e3066c8241f 100644
--- a/textproc/t1lib/buildlink.mk
+++ b/textproc/t1lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/07/27 13:33:35 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/07/30 20:07:22 jlam Exp $
 #
 # This Makefile fragment is included by packages that use t1lib.
 #
@@ -17,7 +17,7 @@ T1LIB_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.t1lib?=	t1lib>=1.0.1
+BUILDLINK_DEPENDS.t1lib?=	t1lib>=1.1.1
 DEPENDS+=	${BUILDLINK_DEPENDS.t1lib}:../../textproc/t1lib
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.t1lib=t1lib
diff --git a/textproc/t1lib/distinfo b/textproc/t1lib/distinfo
index 490dab73939..5973c3393f4 100644
--- a/textproc/t1lib/distinfo
+++ b/textproc/t1lib/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 15:05:07 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/07/30 20:07:22 jlam Exp $
 
-SHA1 (t1lib-1.0.1.tar.gz) = ee75d4c574a02ed4fe1803d162a12ba634a33652
-Size (t1lib-1.0.1.tar.gz) = 928924 bytes
-SHA1 (patch-aa) = 5e898c251b7fc2fe89051f5de34ee0cd94d25f84
-SHA1 (patch-ac) = 25ed9457b321a8889b8ed83504dab4362c9d065b
+SHA1 (t1lib-1.1.1.tar.gz) = 5183f718dc0b90ff8c0aee4fbcfdbbc90e5db883
+Size (t1lib-1.1.1.tar.gz) = 1442934 bytes
+SHA1 (patch-ac) = a75f5dc4a4c5d8e564690b774345488383d21580
diff --git a/textproc/t1lib/patches/patch-aa b/textproc/t1lib/patches/patch-aa
deleted file mode 100644
index 2f3d56c2c87..00000000000
--- a/textproc/t1lib/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2000/06/21 01:58:35 jlam Exp $
-
---- configure.orig	Sun Oct 24 06:00:22 1999
-+++ configure	Thu Dec  2 14:34:33 1999
-@@ -2380,11 +2380,11 @@
- 
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
--test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${BSD_INSTALL_PROGRAM}'
- 
--test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${BSD_INSTALL_SCRIPT}'
- 
--test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-+test -z "$INSTALL_DATA" && INSTALL_DATA='${BSD_INSTALL_DATA}'
- 
- 
- 
diff --git a/textproc/t1lib/patches/patch-ac b/textproc/t1lib/patches/patch-ac
index 8d8e8fb2e05..e7d7dcdc249 100644
--- a/textproc/t1lib/patches/patch-ac
+++ b/textproc/t1lib/patches/patch-ac
@@ -1,13 +1,12 @@
-$NetBSD: patch-ac,v 1.6 2000/06/21 01:58:36 jlam Exp $
+$NetBSD: patch-ac,v 1.7 2001/07/30 20:07:23 jlam Exp $
 
---- lib/Makefile.in.orig	Sun Jan 23 08:03:45 2000
-+++ lib/Makefile.in	Sat Apr 29 10:23:49 2000
-@@ -160,17 +160,17 @@
+--- lib/Makefile.in.orig	Mon Jan 15 17:34:40 2001
++++ lib/Makefile.in
+@@ -161,17 +161,10 @@
  install: dummy
  	$(MKINSTALLDIRS) $(libdir)
  	$(MKINSTALLDIRS) $(includedir)
 -	$(MKINSTALLDIRS) @T1LIB_DATA_DIR@
-+#	$(MKINSTALLDIRS) @T1LIB_DATA_DIR@
  	$(LIBTOOL) --mode=install \
  		$(INSTALL_DATA) $(MAIN_TARGET) $(libdir)
  	$(LIBTOOL) --mode=install \
@@ -18,12 +17,6 @@ $NetBSD: patch-ac,v 1.6 2000/06/21 01:58:36 jlam Exp $
 -	else \
 -	  $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config @T1LIB_DATA_DIR@; \
 -	fi;
-+#	if (test -f @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@; \
-+#	fi;
  
  
  uninstall: dummy
diff --git a/textproc/t1lib/pkg/PLIST b/textproc/t1lib/pkg/PLIST
index 60e33c9afb8..a9782f20bf2 100644
--- a/textproc/t1lib/pkg/PLIST
+++ b/textproc/t1lib/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2001/01/04 15:10:57 agc Exp $
+@comment $NetBSD: PLIST,v 1.7 2001/07/30 20:07:23 jlam Exp $
 bin/type1afm
 bin/xglyph
 include/t1lib.h
@@ -6,67 +6,81 @@ include/t1libx.h
 lib/libt1.a
 lib/libt1.la
 lib/libt1.so
-lib/libt1.so.1
-lib/libt1.so.1.1
+lib/libt1.so.2
+lib/libt1.so.2.1
 lib/libt1x.a
 lib/libt1x.la
 lib/libt1x.so
-lib/libt1x.so.1
-lib/libt1x.so.1.1
-share/doc/t1lib/Makefile
+lib/libt1x.so.2
+lib/libt1x.so.2.1
 share/doc/t1lib/Makefile.in
 share/doc/t1lib/Tee.eps
+share/doc/t1lib/Tee.pdf
 share/doc/t1lib/arbitrary.eps
+share/doc/t1lib/arbitrary.pdf
 share/doc/t1lib/concatglyphs.eps
+share/doc/t1lib/concatglyphs.pdf
 share/doc/t1lib/concatoutlines.eps
+share/doc/t1lib/concatoutlines.pdf
 share/doc/t1lib/extenth.eps
+share/doc/t1lib/extenth.pdf
 share/doc/t1lib/extentv.eps
+share/doc/t1lib/extentv.pdf
 share/doc/t1lib/getstart.tex
 share/doc/t1lib/internals.tex
 share/doc/t1lib/intro.tex
 share/doc/t1lib/manipulate.eps
+share/doc/t1lib/manipulate.pdf
 share/doc/t1lib/mirrorh.eps
+share/doc/t1lib/mirrorh.pdf
 share/doc/t1lib/mirrorv.eps
+share/doc/t1lib/mirrorv.pdf
 share/doc/t1lib/outlineproblems1.eps
+share/doc/t1lib/outlineproblems1.pdf
 share/doc/t1lib/outlineproblems2.eps
+share/doc/t1lib/outlineproblems2.pdf
 share/doc/t1lib/outlineproblems3.eps
+share/doc/t1lib/outlineproblems3.pdf
 share/doc/t1lib/outlineproblems4.eps
+share/doc/t1lib/outlineproblems4.pdf
 share/doc/t1lib/outlineproblems5.eps
+share/doc/t1lib/outlineproblems5.pdf
 share/doc/t1lib/outlines.eps
 share/doc/t1lib/outlines.fig
+share/doc/t1lib/outlines.pdf
 share/doc/t1lib/rotate.eps
+share/doc/t1lib/rotate.pdf
 share/doc/t1lib/shearh.eps
+share/doc/t1lib/shearh.pdf
 share/doc/t1lib/shearv.eps
+share/doc/t1lib/shearv.pdf
 share/doc/t1lib/t1_data.eps
 share/doc/t1lib/t1_data.fig
+share/doc/t1lib/t1_data.pdf
+share/doc/t1lib/t1lib_doc.out
+share/doc/t1lib/t1lib_doc.pdf
 share/doc/t1lib/t1lib_doc.tex
 share/doc/t1lib/type1afm.tex
 share/doc/t1lib/ut1lib.tex
 share/doc/t1lib/xglyph.tex
 share/doc/t1lib/xinterface.tex
-@comment remove any rendered docs as well
-@unexec rm -rf %B || true
 share/examples/t1lib/FontDataBase
-share/examples/t1lib/README.t1example1
 share/examples/t1lib/t1example1.c
 share/examples/t1lib/t1lib.config
 share/examples/t1lib/t1lib.config.netbsd
-@dirrm share/examples/t1lib
 share/t1lib/Fonts/afm/README
 share/t1lib/Fonts/afm/bchb.afm
 share/t1lib/Fonts/afm/bchbi.afm
+share/t1lib/Fonts/afm/bchr.afm
 share/t1lib/Fonts/afm/bchri.afm
 share/t1lib/Fonts/afm/dcbx10.afm
 share/t1lib/Fonts/afm/dcbxti10.afm
 share/t1lib/Fonts/afm/dcr10.afm
 share/t1lib/Fonts/afm/dcti10.afm
-share/t1lib/Fonts/afm/bchr.afm
 share/t1lib/Fonts/afm/eufm10.afm
-@dirrm share/t1lib/Fonts/afm
 share/t1lib/Fonts/enc/IsoLatin1.enc
 share/t1lib/Fonts/enc/IsoLatin2.enc
 share/t1lib/Fonts/enc/PSLatin1.enc
-@dirrm share/t1lib/Fonts/enc
 share/t1lib/Fonts/type1/README
 share/t1lib/Fonts/type1/bchb.pfb
 share/t1lib/Fonts/type1/bchbi.pfb
@@ -78,4 +92,9 @@ share/t1lib/Fonts/type1/dcr10.pfb
 share/t1lib/Fonts/type1/dcti10.pfb
 share/t1lib/Fonts/type1/eufm10.pfb
 @dirrm share/t1lib/Fonts/type1
+@dirrm share/t1lib/Fonts/enc
+@dirrm share/t1lib/Fonts/afm
 @dirrm share/t1lib/Fonts
+@dirrm share/examples/t1lib
+@comment remove any rendered docs as well
+@unexec rm -rf %D/share/doc/t1lib || true