Update t1lib to 0.9.2

Closes PR pkg/7746, t1lib-0.8beta->t1lib-0.9, by Kazuki Sakamoto
- - consolidate (and make obsolete) t1libx, as discussed on "packages"
- - install LaTeX doc sources and add message explaining how to build
    t1lib_doc.dvi in order to remove dependence on teTeX
- - install sample fonts
- - construct and install a sane configuration for NetBSD

14 files changed, 183 insertions, 81 deletions

diff --git a/textproc/t1lib/Makefile b/textproc/t1lib/Makefile
index 6afe69cef0c..ef74d738ed8 100644
--- a/textproc/t1lib/Makefile
+++ b/textproc/t1lib/Makefile
@@ -1,28 +1,43 @@
-# $NetBSD: Makefile,v 1.2 1999/04/15 20:39:47 tron Exp $
+# $NetBSD: Makefile,v 1.3 1999/09/24 01:00:03 fredb Exp $
 #
 
-DISTNAME=		t1lib-0.8-beta
-PKGNAME=		t1lib-0.8
-CATEGORIES=		textproc
-MASTER_SITES=		${MASTER_SITE_SUNSITE:=libs/graphics/}
+DISTNAME=	t1lib-0.9.2
+CATEGORIES=	textproc devel graphics
+MASTER_SITES=	${MASTER_SITE_SUNSITE:=libs/graphics/}
 
-MAINTAINER=		root@garbled.net
-HOMEPAGE=		http://www.neuroinformatik.ruhr-uni-bochum.de/ini/PEOPLE/rmz/t1lib.html
+MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://www.neuroinformatik.ruhr-uni-bochum.de/ini/PEOPLE/rmz/t1lib.html
 
-BUILD_DEPENDS=		latex:../../print/teTeX
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_LIBTOOL=	yes
+USE_X11BASE=	yes
 
-WRKSRC=			${WRKDIR}/T1-0.8-beta
-USE_GMAKE=		yes
-GNU_CONFIGURE=		yes
-USE_LIBTOOL=		yes
-CONFIGURE_ARGS=		--without-x
+WRKSRC=		${WRKDIR}/T1-0.9.2
+MESSAGE_FILE=	${WRKDIR}/MESSAGE
+ALL_TARGET=	without_doc
+
+post-build:
+	${SED} s^@@PREFIX@@^${PREFIX}^g < ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE
 
 post-install:
-	${MKDIR} ${LOCALBASE}/share/examples/t1lib
-	${CP} ${WRKSRC}/examples/Makefile ${LOCALBASE}/share/examples/t1lib
-	${CP} ${WRKSRC}/examples/t1example1.c ${LOCALBASE}/share/examples/t1lib
-	${CP} ${WRKSRC}/examples/t1lib.config ${LOCALBASE}/share/examples/t1lib
-	${CP} ${WRKSRC}/examples/README.t1example1 ${LOCALBASE}/share/examples/t1lib
-	${CP} ${WRKSRC}/examples/FontDataBase ${LOCALBASE}/share/examples/t1lib
+	${MKDIR} ${PREFIX}/share/t1lib
+	cd ${WRKSRC}; \
+	  ${PAX} -r -w Fonts ${PREFIX}/share/t1lib; \
+	  ${PAX} -r -w -s "/doc/t1lib/" doc ${PREFIX}/share/doc
+	${MKDIR} ${PREFIX}/share/examples/t1lib
+	cd ${WRKSRC}/examples; \
+	  ${PAX} -r -w FontDataBase README.t1example1 t1example1.c t1lib.config \
+	      ${PREFIX}/share/examples/t1lib
+	${SED} -e s^@@X11BASE@@^${X11BASE}^g -e s^@@LOCALBASE@@^${LOCALBASE}^g \
+	    -e s^@@PREFIX@@^${PREFIX}^g < ${FILESDIR}/t1lib.config.netbsd \
+	    > ${PREFIX}/share/examples/t1lib/t1lib.config.netbsd
+	if [ ! -f ${PREFIX}/share/t1lib/t1lib.config ]; then \
+	  ${CP} ${PREFIX}/share/examples/t1lib/t1lib.config.netbsd \
+	      ${PREFIX}/share/t1lib/t1lib.config; \
+	fi
+	if [ ! -f ${PREFIX}/share/t1lib/FontDataBase ]; then \
+	  ${CP} ${PREFIX}/share/examples/t1lib/FontDataBase ${PREFIX}/share/t1lib; \
+	fi
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/t1lib/files/md5 b/textproc/t1lib/files/md5
index e233eebea7b..cebb94099f7 100644
--- a/textproc/t1lib/files/md5
+++ b/textproc/t1lib/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1998/11/05 08:26:03 garbled Exp $
+$NetBSD: md5,v 1.2 1999/09/24 01:00:03 fredb Exp $
 
-MD5 (t1lib-0.8-beta.tar.gz) = 3b9d03fb3178af3c2029036216e5a49b
+MD5 (t1lib-0.9.2.tar.gz) = 31c85ba473ca9cfbd9c3948d556236e7
diff --git a/textproc/t1lib/files/patch-sum b/textproc/t1lib/files/patch-sum
index db20735c6a7..df340d065e7 100644
--- a/textproc/t1lib/files/patch-sum
+++ b/textproc/t1lib/files/patch-sum
@@ -1,9 +1,9 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:14 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/09/24 01:00:03 fredb Exp $
 
-MD5 (patch-aa) = 1636c5ee691022f743eb84f991e285f3
-MD5 (patch-ab) = 79c4e834fd1558cf5d351e15f0dee542
-MD5 (patch-ac) = 3d3099ce38981d03ac2fb8cf3e936c2e
-MD5 (patch-ad) = 030b7d64a5a67804f995870c5a8e36f5
-MD5 (patch-ae) = 2a0f6e1f68d00859da3a99e564581a8b
-MD5 (patch-af) = 7c3d8782e914d12a00c5ac54eb4bb2d2
-MD5 (patch-ag) = e0ef2fd961b228acf3338d880eeb4fcd
+MD5 (patch-aa) = 2a70964883d45a33472197d54aab742d
+MD5 (patch-ab) = 1eba935919991e164d6c297457347b4a
+MD5 (patch-ac) = 81a974de441fc71d1d7c9851df1c8536
+MD5 (patch-ad) = fd6a2dbdf66b6a15604b729e99196aac
+MD5 (patch-ae) = c057e591eaf7422af236fa46652ef0b4
+MD5 (patch-af) = 7bf204fb8e5ba32f99e71b4f13091846
+MD5 (patch-ag) = 36e24044c24443963212faf3476f8eb5
diff --git a/textproc/t1lib/files/t1lib.config.netbsd b/textproc/t1lib/files/t1lib.config.netbsd
new file mode 100644
index 00000000000..268bf350c0d
--- /dev/null
+++ b/textproc/t1lib/files/t1lib.config.netbsd
@@ -0,0 +1,7 @@
+$NetBSD: t1lib.config.netbsd,v 1.1 1999/09/24 01:00:03 fredb Exp $
+This is a configuration file for t1lib
+
+FONTDATABASE=@@PREFIX@@/share/t1lib/FontDataBase
+ENCODING=@@PREFIX@@/share/t1lib/Fonts/enc
+AFM=@@PREFIX@@/share/t1lib/Fonts/afm:@@LOCALBASE@@/share/ghostscript/fonts
+TYPE1=@@PREFIX@@/share/t1lib/Fonts/type1:/usr/share/groff_font/devps:@@LOCALBASE@@/share/ghostscript/fonts
diff --git a/textproc/t1lib/patches/patch-aa b/textproc/t1lib/patches/patch-aa
index dcd7305440a..4fc766a5a6e 100644
--- a/textproc/t1lib/patches/patch-aa
+++ b/textproc/t1lib/patches/patch-aa
@@ -1,4 +1,5 @@
-$NetBSD: patch-aa,v 1.1.1.1 1998/11/05 08:26:03 garbled Exp $
+$NetBSD: patch-aa,v 1.2 1999/09/24 01:00:04 fredb Exp $
+
 --- configure.orig	Fri Oct 16 08:48:40 1998
 +++ configure	Thu Nov  5 00:55:49 1998
 @@ -634,7 +634,7 @@
diff --git a/textproc/t1lib/patches/patch-ab b/textproc/t1lib/patches/patch-ab
index ff82fd52247..81e58acaf43 100644
--- a/textproc/t1lib/patches/patch-ab
+++ b/textproc/t1lib/patches/patch-ab
@@ -1,4 +1,5 @@
-$NetBSD: patch-ab,v 1.1.1.1 1998/11/05 08:26:03 garbled Exp $
+$NetBSD: patch-ab,v 1.2 1999/09/24 01:00:04 fredb Exp $
+
 --- examples/Makefile.in.orig	Wed Nov  4 16:20:20 1998
 +++ examples/Makefile.in	Wed Nov  4 16:20:54 1998
 @@ -15,7 +15,7 @@
diff --git a/textproc/t1lib/patches/patch-ac b/textproc/t1lib/patches/patch-ac
index 4dec531b633..1beda7f1032 100644
--- a/textproc/t1lib/patches/patch-ac
+++ b/textproc/t1lib/patches/patch-ac
@@ -1,6 +1,7 @@
-$NetBSD: patch-ac,v 1.2 1998/11/13 15:41:08 tv Exp $
---- lib/Makefile.in.orig	Sun Aug 30 08:01:22 1998
-+++ lib/Makefile.in	Thu Nov  5 00:48:07 1998
+$NetBSD: patch-ac,v 1.3 1999/09/24 01:00:04 fredb Exp $
+
+--- lib/Makefile.in.orig	Wed Aug  4 05:59:02 1999
++++ lib/Makefile.in	Thu Sep 23 14:11:08 1999
 @@ -15,7 +15,7 @@
  #
  # Modified by H.Kakugawa to use libtool
@@ -10,24 +11,24 @@ $NetBSD: patch-ac,v 1.2 1998/11/13 15:41:08 tv Exp $
  SHELL     = /bin/sh
  CC        = @CC@
  CPP       = @CPP@
-@@ -251,15 +251,15 @@
- 
- install: dummy
- 	$(LIBTOOL) --mode=install \
--		$(INSTALL_DATA) libt1.la libt1x.la $(libdir)
-+		$(INSTALL_DATA) libt1.la $(libdir)
+@@ -162,13 +162,13 @@
+ 		$(INSTALL_DATA) $(MAIN_TARGET) $(libdir)
  	$(LIBTOOL) --mode=install \
--		$(INSTALL_DATA) t1lib.h t1libx.h $(includedir)
+ 		$(INSTALL_DATA) $(MAIN_HEADER) $(includedir)
 -	$(MKINSTALLDIRS) $(datadir)/t1lib-$(t1lib_version).$(t1lib_revision)
 -	if (test -f $(datadir)/t1lib-$(t1lib_version).$(t1lib_revision)/t1lib.config) \
-+		$(INSTALL_DATA) t1lib.h t1lib.h $(includedir)
-+	$(MKINSTALLDIRS) $(datadir)/t1lib
-+	if (test -f $(datadir)/t1lib/t1lib.config) \
- 	then \
- 	  echo "Alert: Global configuration file exists, installation skipped!"; \
- 	else \
+-	then \
+-	  echo "Alert: Global configuration file exists, installation skipped!"; \
+-	else \
 -	  $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config $(datadir)/t1lib-$(t1lib_version).$(t1lib_revision); \
-+	  $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config $(datadir)/t1lib; \
- 	fi;
+-	fi;
++#	$(MKINSTALLDIRS) $(datadir)/t1lib-$(t1lib_version).$(t1lib_revision)
++#	if (test -f $(datadir)/t1lib-$(t1lib_version).$(t1lib_revision)/t1lib.config) \
++#	then \
++#	  echo "Alert: Global configuration file exists, installation skipped!"; \
++#	else \
++#	  $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config $(datadir)/t1lib-$(t1lib_version).$(t1lib_revision); \
++#	fi;
  
  
+ uninstall: dummy
diff --git a/textproc/t1lib/patches/patch-ad b/textproc/t1lib/patches/patch-ad
index 0a99f5d5006..2ba12871abd 100644
--- a/textproc/t1lib/patches/patch-ad
+++ b/textproc/t1lib/patches/patch-ad
@@ -1,4 +1,5 @@
-$NetBSD: patch-ad,v 1.1.1.1 1998/11/05 08:26:03 garbled Exp $
+$NetBSD: patch-ad,v 1.2 1999/09/24 01:00:04 fredb Exp $
+
 --- type1afm/Makefile.in.orig	Wed Nov  4 16:20:31 1998
 +++ type1afm/Makefile.in	Wed Nov  4 16:21:22 1998
 @@ -15,7 +15,7 @@
diff --git a/textproc/t1lib/patches/patch-ae b/textproc/t1lib/patches/patch-ae
index 2030b35b83b..4318fa53f9e 100644
--- a/textproc/t1lib/patches/patch-ae
+++ b/textproc/t1lib/patches/patch-ae
@@ -1,4 +1,5 @@
-$NetBSD: patch-ae,v 1.1.1.1 1998/11/05 08:26:03 garbled Exp $
+$NetBSD: patch-ae,v 1.2 1999/09/24 01:00:04 fredb Exp $
+
 --- lib/t1lib/Makefile.in.orig	Wed Nov  4 16:23:04 1998
 +++ lib/t1lib/Makefile.in	Wed Nov  4 16:23:24 1998
 @@ -14,7 +14,7 @@
diff --git a/textproc/t1lib/patches/patch-af b/textproc/t1lib/patches/patch-af
index 05376c0a1c8..3de7a8991cd 100644
--- a/textproc/t1lib/patches/patch-af
+++ b/textproc/t1lib/patches/patch-af
@@ -1,4 +1,5 @@
-$NetBSD: patch-af,v 1.1.1.1 1998/11/05 08:26:03 garbled Exp $
+$NetBSD: patch-af,v 1.2 1999/09/24 01:00:04 fredb Exp $
+
 --- lib/type1/Makefile.in.orig	Wed Nov  4 16:23:58 1998
 +++ lib/type1/Makefile.in	Wed Nov  4 16:24:14 1998
 @@ -14,7 +14,7 @@
diff --git a/textproc/t1lib/patches/patch-ag b/textproc/t1lib/patches/patch-ag
index fa792284172..1c24da46b1c 100644
--- a/textproc/t1lib/patches/patch-ag
+++ b/textproc/t1lib/patches/patch-ag
@@ -1,17 +1,13 @@
-$NetBSD: patch-ag,v 1.1.1.1 1998/11/05 08:26:03 garbled Exp $
---- doc/Makefile.in.orig	Thu Nov  5 00:43:43 1998
-+++ doc/Makefile.in	Thu Nov  5 00:45:26 1998
-@@ -77,9 +77,10 @@
- install: dummy
- 	if (test -f t1lib_doc.dvi) \
- 	then \
--	  $(MKINSTALLDIRS) $(datadir)/t1lib-$(t1lib_version).$(t1lib_revision)/doc; \
--	  $(INSTALL_DATA) t1lib_doc.dvi $(datadir)/t1lib-$(t1lib_version).$(t1lib_revision)/doc; \
--	  $(INSTALL_DATA) t1_data.eps $(datadir)/t1lib-$(t1lib_version).$(t1lib_revision)/doc; \
-+	  $(MKINSTALLDIRS) $(datadir)/t1lib; \
-+	  $(MKINSTALLDIRS) $(datadir)/doc/t1lib; \
-+	  $(INSTALL_DATA) t1lib_doc.dvi $(datadir)/doc/t1lib; \
-+	  $(INSTALL_DATA) t1_data.eps $(datadir)/doc/t1lib; \
- 	fi;
- 
+$NetBSD: patch-ag,v 1.2 1999/09/24 01:00:04 fredb Exp $
+
+--- xglyph/Makefile.in.orig	Wed Aug  4 06:06:36 1999
++++ xglyph/Makefile.in	Mon Sep 13 08:15:30 1999
+@@ -15,7 +15,7 @@
+ #
+ # Modified by H.Kakugawa to use libtool
  
+-LIBTOOL   = ../libtool
++LIBTOOL   = @LIBTOOL@
+ SHELL     = /bin/sh
+ CC        = @CC@
+ CPP       = @CPP@
diff --git a/textproc/t1lib/pkg/DEINSTALL b/textproc/t1lib/pkg/DEINSTALL
new file mode 100644
index 00000000000..a679d838ba9
--- /dev/null
+++ b/textproc/t1lib/pkg/DEINSTALL
@@ -0,0 +1,7 @@
+#!/bin/sh
+if [ "$2" = "POST-DEINSTALL" ]; then
+echo Please note:
+echo
+echo If you do not intend to re-install t1lib, you may wish
+echo to manually remove the ${PKG_PREFIX}/share/t1lib directory.
+fi
diff --git a/textproc/t1lib/pkg/MESSAGE b/textproc/t1lib/pkg/MESSAGE
index 0378b749dea..6cf8b26cc84 100644
--- a/textproc/t1lib/pkg/MESSAGE
+++ b/textproc/t1lib/pkg/MESSAGE
@@ -1,2 +1,13 @@
-Examples of how to configure and use this package have been installed
-in your share/examples directory, under t1lib.
+Sample configs tailored for NetBSD may have been copied to
+@@PREFIX@@/share/t1lib, but no existing files were overwritten.
+More samples may be found in @@PREFIX@@/share/examples/t1lib.
+
+Most programs that use the lib will look first in the directory
+specified by the environment variable T1LIB_CONFIG_DIR, and then
+@@PREFIX@@/share/t1lib. However, you *must* set T1LIB_CONFIG_DIR
+to run the "xglyph" test X client. E.g, for Bourne shells:
+ ``T1LIB_CONFIG_DIR=@@PREFIX@@/share/t1lib xglyph &''
+
+The complete documentation requires LaTeX to build. If you have
+the print/teTeX package (or some other "tex"),
+``cd @@PREFIX@@/share/doc/t1lib; make'' to build t1lib_doc.dvi.
diff --git a/textproc/t1lib/pkg/PLIST b/textproc/t1lib/pkg/PLIST
index 095c7f270f5..2b105fcf9f8 100644
--- a/textproc/t1lib/pkg/PLIST
+++ b/textproc/t1lib/pkg/PLIST
@@ -1,16 +1,76 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1998/11/05 08:26:03 garbled Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/09/24 01:00:05 fredb Exp $
 bin/type1afm
-share/t1lib/t1lib.config
-share/doc/t1lib/t1lib_doc.dvi
+bin/xglyph
+include/t1lib.h
+include/t1libx.h
+lib/libt1.a
+lib/libt1x.a
+lib/libt1.so.9.2
+lib/libt1x.so.9.2
+share/doc/t1lib/Makefile
+share/doc/t1lib/Makefile.in
+share/doc/t1lib/Tee.eps
+share/doc/t1lib/arbitrary.eps
+share/doc/t1lib/concatglyphs.eps
+share/doc/t1lib/concatoutlines.eps
+share/doc/t1lib/extenth.eps
+share/doc/t1lib/extentv.eps
+share/doc/t1lib/getstart.tex
+share/doc/t1lib/internals.tex
+share/doc/t1lib/intro.tex
+share/doc/t1lib/manipulate.eps
+share/doc/t1lib/mirrorh.eps
+share/doc/t1lib/mirrorv.eps
+share/doc/t1lib/outlineproblems1.eps
+share/doc/t1lib/outlineproblems2.eps
+share/doc/t1lib/outlineproblems3.eps
+share/doc/t1lib/outlineproblems4.eps
+share/doc/t1lib/outlineproblems5.eps
+share/doc/t1lib/outlines.eps
+share/doc/t1lib/outlines.fig
+share/doc/t1lib/rotate.eps
+share/doc/t1lib/shearh.eps
+share/doc/t1lib/shearv.eps
 share/doc/t1lib/t1_data.eps
-share/examples/t1lib/Makefile
+share/doc/t1lib/t1_data.fig
+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/README.t1example1
-share/examples/t1lib/FontDataBase
-include/t1lib.h
-lib/libt1.a
-lib/libt1.so.8.0
-@dirrm share/doc/t1lib
+share/examples/t1lib/t1lib.config.netbsd
 @dirrm share/examples/t1lib
-@dirrm share/t1lib
+share/t1lib/Fonts/afm/README
+share/t1lib/Fonts/afm/bchb.afm
+share/t1lib/Fonts/afm/bchbi.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
+@dirrm share/t1lib/Fonts/enc
+share/t1lib/Fonts/type1/README
+share/t1lib/Fonts/type1/bchb.pfb
+share/t1lib/Fonts/type1/bchbi.pfb
+share/t1lib/Fonts/type1/bchr.pfb
+share/t1lib/Fonts/type1/bchri.pfb
+share/t1lib/Fonts/type1/dcbx10.pfb
+share/t1lib/Fonts/type1/dcbxti10.pfb
+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
+@exec if [ ! -f %D/share/t1lib/t1lib.config ]; then cp %D/share/examples/t1lib/t1lib.config.netbsd %D/share/t1lib/t1lib.config; fi
+@exec if [ ! -f %D/share/t1lib/FontDataBase ]; then cp %D/share/examples/t1lib/FontDataBase %D/share/t1lib; fi