USE_LIBTOOL instead of PKGLIBTOOL.

Factor out common post-install code in Makefile and pkg/PLIST into
pkg/INSTALL.

13 files changed, 93 insertions, 122 deletions

diff --git a/textproc/t1lib/Makefile b/textproc/t1lib/Makefile
index 3bc3a575a42..0f52ef50454 100644
--- a/textproc/t1lib/Makefile
+++ b/textproc/t1lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/06/01 11:23:42 rh Exp $
+# $NetBSD: Makefile,v 1.9 2000/06/21 01:58:33 jlam Exp $
 #
 
 DISTNAME=	t1lib-1.0.1
@@ -9,37 +9,36 @@ MASTER_SITES=	${MASTER_SITE_SUNSITE:=libs/graphics/} \
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.neuroinformatik.ruhr-uni-bochum.de/ini/PEOPLE/rmz/t1lib/t1lib.html
 
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_PKGLIBTOOL=	yes
-USE_X11BASE=	yes
+GNU_CONFIGURE=	# defined
+USE_GMAKE=	# defined
+USE_LIBTOOL=	# defined
+USE_X11BASE=	# defined
 
 WRKSRC=		${WRKDIR}/T1-1.0.1
 MESSAGE_FILE=	${WRKDIR}/MESSAGE
 ALL_TARGET=	without_doc
 
 post-build:
-	${SED} -e 's|@@PREFIX@@|${PREFIX}|g' < ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE
+	${SED} -e 's|@@PREFIX@@|${PREFIX}|g' \
+		< ${PKGDIR}/MESSAGE > ${MESSAGE_FILE}
 
 post-install:
 	${MKDIR} ${PREFIX}/share/t1lib
 	cd ${WRKSRC}; \
-	  ${PAX} -r -w Fonts ${PREFIX}/share/t1lib; \
+	  ${PAX} -rw Fonts ${PREFIX}/share/t1lib; \
 	  ${CHMOD} go+r ${PREFIX}/share/t1lib/Fonts/enc/IsoLatin2.enc; \
-	  ${PAX} -r -w -s "/doc/t1lib/" doc ${PREFIX}/share/doc
+	  ${PAX} -rw -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 \
+	  ${PAX} -rw 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
+	${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
+
+	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/t1lib/files/patch-sum b/textproc/t1lib/files/patch-sum
index 73497919701..72e111c663a 100644
--- a/textproc/t1lib/files/patch-sum
+++ b/textproc/t1lib/files/patch-sum
@@ -1,9 +1,4 @@
-$NetBSD: patch-sum,v 1.5 2000/05/08 17:23:47 drochner Exp $
+$NetBSD: patch-sum,v 1.6 2000/06/21 01:58:34 jlam Exp $
 
-MD5 (patch-aa) = c5c0ec93d20ac6feed1cae4619d92746
-MD5 (patch-ab) = 83d6bab8db0da2e04151d58f3389e3f2
-MD5 (patch-ac) = 1cf7685ba88bd7d0faa67cd90568e87b
-MD5 (patch-ad) = fb3f55770475208cdf0ff0a43fbc2a60
-MD5 (patch-ae) = c52437f7d6efc2c74f551f84302e92f6
-MD5 (patch-af) = 8fefe2333a337dd2fcc326a937568586
-MD5 (patch-ag) = 36e24044c24443963212faf3476f8eb5
+MD5 (patch-aa) = 54fedfb1e62f436b52aba7322beac458
+MD5 (patch-ac) = bbae6e54feade7f1dcfadf6022ced0c9
diff --git a/textproc/t1lib/patches/patch-aa b/textproc/t1lib/patches/patch-aa
index be337973922..2f3d56c2c87 100644
--- a/textproc/t1lib/patches/patch-aa
+++ b/textproc/t1lib/patches/patch-aa
@@ -1,16 +1,7 @@
-$NetBSD: patch-aa,v 1.4 1999/12/02 21:19:13 fredb Exp $
+$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
-@@ -2277,7 +2277,7 @@
- fi
- 
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+#LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
- # Check for any special flags to pass to ltconfig.
- libtool_flags=
 @@ -2380,11 +2380,11 @@
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
diff --git a/textproc/t1lib/patches/patch-ab b/textproc/t1lib/patches/patch-ab
deleted file mode 100644
index 77f1292e417..00000000000
--- a/textproc/t1lib/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 1999/11/14 04:45:17 fredb Exp $
-
---- examples/Makefile.in.orig	Wed Aug  4 06:04:14 1999
-+++ examples/Makefile.in	Sat Nov 13 22:25:24 1999
-@@ -15,7 +15,7 @@
- #
- 
- 
--LIBTOOL   = ../libtool
-+LIBTOOL   = @LIBTOOL@
- SHELL     = /bin/sh
- CC        = @CC@
- CPP       = @CPP@
diff --git a/textproc/t1lib/patches/patch-ac b/textproc/t1lib/patches/patch-ac
index a50a56d1403..8d8e8fb2e05 100644
--- a/textproc/t1lib/patches/patch-ac
+++ b/textproc/t1lib/patches/patch-ac
@@ -1,16 +1,7 @@
-$NetBSD: patch-ac,v 1.5 2000/05/08 17:23:48 drochner Exp $
+$NetBSD: patch-ac,v 1.6 2000/06/21 01:58:36 jlam Exp $
 
 --- lib/Makefile.in.orig	Sun Jan 23 08:03:45 2000
 +++ lib/Makefile.in	Sat Apr 29 10:23:49 2000
-@@ -15,7 +15,7 @@
- #
- # Modified by H.Kakugawa to use libtool
- 
--LIBTOOL   = ../libtool
-+LIBTOOL   = @LIBTOOL@
- SHELL     = /bin/sh
- CC        = @CC@
- CPP       = @CPP@
 @@ -160,17 +160,17 @@
  install: dummy
  	$(MKINSTALLDIRS) $(libdir)
diff --git a/textproc/t1lib/patches/patch-ad b/textproc/t1lib/patches/patch-ad
deleted file mode 100644
index 370cf2cc569..00000000000
--- a/textproc/t1lib/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.3 1999/11/14 04:45:17 fredb Exp $
-
---- type1afm/Makefile.in.orig	Wed Aug  4 06:05:05 1999
-+++ type1afm/Makefile.in	Sat Nov 13 22:25:24 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/patches/patch-ae b/textproc/t1lib/patches/patch-ae
deleted file mode 100644
index 51f4696728c..00000000000
--- a/textproc/t1lib/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.3 1999/11/14 04:45:17 fredb Exp $
-
---- lib/t1lib/Makefile.in.orig	Wed Aug  4 05:59:24 1999
-+++ lib/t1lib/Makefile.in	Sat Nov 13 22:25:24 1999
-@@ -14,7 +14,7 @@
- #
- # Modified by H.Kakugawa to use libtool
- 
--LIBTOOL   = ../../libtool
-+LIBTOOL   = @LIBTOOL@
- SHELL     = /bin/sh
- CC        = @CC@
- CPP       = @CPP@
diff --git a/textproc/t1lib/patches/patch-af b/textproc/t1lib/patches/patch-af
deleted file mode 100644
index 322185acd72..00000000000
--- a/textproc/t1lib/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.3 1999/11/14 04:45:17 fredb Exp $
-
---- lib/type1/Makefile.in.orig	Tue Feb 23 10:50:13 1999
-+++ lib/type1/Makefile.in	Sat Nov 13 22:25:24 1999
-@@ -14,7 +14,7 @@
- #
- # Modified by H.Kakugawa to use libtool
- 
--LIBTOOL   = ../../libtool
-+LIBTOOL   = @LIBTOOL@
- SHELL     = /bin/sh
- CC        = @CC@
- CPP       = @CPP@
diff --git a/textproc/t1lib/patches/patch-ag b/textproc/t1lib/patches/patch-ag
deleted file mode 100644
index 1c24da46b1c..00000000000
--- a/textproc/t1lib/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
index a679d838ba9..301ebfc291b 100644
--- a/textproc/t1lib/pkg/DEINSTALL
+++ b/textproc/t1lib/pkg/DEINSTALL
@@ -1,7 +1,26 @@
 #!/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
+#
+# $NetBSD: DEINSTALL,v 1.2 2000/06/21 01:58:40 jlam Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+case ${STAGE} in
+DEINSTALL)
+	;;
+POST-DEINSTALL)
+	CONFDIR=${PKG_PREFIX}/share/t1lib
+
+	cat << EOF
+===========================================================================
+If you won't be using ${PKGNAME} any longer, you may wish to manually
+remove the ${CONFDIR} directory.
+===========================================================================
+EOF
+	;;
+*)
+	echo "Unexpected argument: $2"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/textproc/t1lib/pkg/INSTALL b/textproc/t1lib/pkg/INSTALL
new file mode 100644
index 00000000000..e735fc0374c
--- /dev/null
+++ b/textproc/t1lib/pkg/INSTALL
@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# $NetBSD: INSTALL,v 1.1 2000/06/21 01:58:40 jlam Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+case ${STAGE} in
+PRE-INSTALL)
+	;;
+POST-INSTALL)
+	CONFDIR=${PKG_PREFIX}/share/t1lib
+
+	echo "Installing configuration files:"
+	if [ ! -f ${CONFDIR}/t1lib.config ]
+	then
+		echo "	t1lib.config"
+		cp ${PKG_PREFIX}/share/examples/t1lib/t1lib.config.netbsd \
+			${CONFDIR}/t1lib.config
+		chmod 644 ${CONFDIR}/t1lib.config
+	fi
+	if [ ! -f ${CONFDIR}/FontDataBase ]
+	then
+		echo "	FontDataBase"
+		cp ${PKG_PREFIX}/share/examples/t1lib/FontDataBase \
+			${CONFDIR}/FontDataBase
+		chmod 644 ${CONFDIR}/FontDataBase
+	fi
+	echo "done."
+	;;
+*)
+	echo "Unexpected argument: $2"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/textproc/t1lib/pkg/MESSAGE b/textproc/t1lib/pkg/MESSAGE
index 6cf8b26cc84..3284d657d33 100644
--- a/textproc/t1lib/pkg/MESSAGE
+++ b/textproc/t1lib/pkg/MESSAGE
@@ -1,3 +1,6 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.3 2000/06/21 01:58:40 jlam Exp $
+
 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.
@@ -11,3 +14,5 @@ to run the "xglyph" test X client. E.g, for Bourne shells:
 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 b8f39693e02..3cc48641a47 100644
--- a/textproc/t1lib/pkg/PLIST
+++ b/textproc/t1lib/pkg/PLIST
@@ -1,11 +1,13 @@
-@comment $NetBSD: PLIST,v 1.4 2000/05/08 17:23:48 drochner Exp $
+@comment $NetBSD: PLIST,v 1.5 2000/06/21 01:58:40 jlam Exp $
 bin/type1afm
 bin/xglyph
 include/t1lib.h
 include/t1libx.h
 lib/libt1.a
-lib/libt1x.a
+lib/libt1.la
 lib/libt1.so.1.1
+lib/libt1x.a
+lib/libt1x.la
 lib/libt1x.so.1.1
 share/doc/t1lib/Makefile
 share/doc/t1lib/Makefile.in
@@ -73,5 +75,3 @@ 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