Modify the pkginstall framework so that it manages all aspects of

INSTALL/DEINSTALL script creation within pkgsrc.

If an INSTALL or DEINSTALL script is found in the package directory,
it is automatically used as a template for the pkginstall-generated
scripts.  If instead, they should be used simply as the full scripts,
then the package Makefile should set INSTALL_SRC or DEINSTALL_SRC
explicitly, e.g.:

	INSTALL_SRC=	${PKGDIR}/INSTALL
	DEINSTALL_SRC=	# emtpy

As part of the restructuring of the pkginstall framework internals,
we now *always* generate temporary INSTALL or DEINSTALL scripts.  By
comparing these temporary scripts with minimal INSTALL/DEINSTALL
scripts formed from only the base templates, we determine whether or
not the INSTALL/DEINSTALL scripts are actually needed by the package
(see the generate-install-scripts target in bsd.pkginstall.mk).

In addition, more variables in the framework have been made private.
The *_EXTRA_TMPL variables have been renamed to *_TEMPLATE, which are
more sensible names given the very few exported variables in this
framework.  The only public variables relating to the templates are:

	INSTALL_SRC		INSTALL_TEMPLATE
	DEINSTALL_SRC		DEINSTALL_TEMPLATE
				HEADER_TEMPLATE

The packages in pkgsrc have been modified to reflect the changes in
the pkginstall framework.

8 files changed, 12 insertions, 22 deletions

diff --git a/databases/mysql4-server/Makefile b/databases/mysql4-server/Makefile
index 0b49a87f3e0..8072e41831c 100644
--- a/databases/mysql4-server/Makefile
+++ b/databases/mysql4-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/02/05 23:08:32 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2006/03/14 01:14:27 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
 PKGREVISION=		1
@@ -19,8 +19,6 @@ CONFIGURE_ARGS+=	--with-mysqld-user=${MYSQL_USER:Q}
 PTHREAD_OPTS+=		require
 CONFIGURE_ARGS+=	--with-pthreads
 
-DEINSTALL_EXTRA_TMPL=	${.CURDIR}/DEINSTALL
-
 PKG_USERS=		${MYSQL_USER}:${MYSQL_GROUP}::MySQL\ database\ administrator:${MYSQL_DATADIR}:${SH}
 PKG_GROUPS=		${MYSQL_GROUP}
 RCD_SCRIPTS=		mysqld
diff --git a/databases/mysql5-server/Makefile b/databases/mysql5-server/Makefile
index f3c1f726501..c7c2819899c 100644
--- a/databases/mysql5-server/Makefile
+++ b/databases/mysql5-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:08:32 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/03/14 01:14:27 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
 PKGREVISION=		1
@@ -18,8 +18,6 @@ CONFIGURE_ARGS+=	--with-mysqld-user=${MYSQL_USER:Q}
 PTHREAD_OPTS+=		require
 CONFIGURE_ARGS+=	--with-pthreads
 
-DEINSTALL_EXTRA_TMPL=	${.CURDIR}/DEINSTALL
-
 PKG_USERS=		${MYSQL_USER}:${MYSQL_GROUP}::MySQL\ database\ administrator:${MYSQL_DATADIR}:${SH}
 PKG_GROUPS=		${MYSQL_GROUP}
 RCD_SCRIPTS=		mysqld
diff --git a/databases/postgresql73-lib/Makefile b/databases/postgresql73-lib/Makefile
index 7037357a317..41c66c2ff2e 100644
--- a/databases/postgresql73-lib/Makefile
+++ b/databases/postgresql73-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/02/20 18:34:07 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2006/03/14 01:14:27 jlam Exp $
 
 PKGNAME=		postgresql73-lib-${BASE_VERS}
 SVR4_PKGNAME=		pstgl
@@ -14,8 +14,7 @@ BUILD_DIRS+=		${WRKSRC}/src/interfaces
 BUILD_DIRS+=		${WRKSRC}/src/pl
 USE_TOOLS+=		gtar
 
-DEINSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
-INSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
+DEINSTALL_TEMPLATE+=	${PKGDIR}/INSTALL
 
 INSTALLATION_DIRS=	man
 
diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index 41f30f6a108..61f43421b61 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/02/20 18:34:07 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2006/03/14 01:14:27 jlam Exp $
 
 PKGNAME=		postgresql73-server-${BASE_VERS}
 SVR4_PKGNAME=		pstgs
@@ -12,8 +12,6 @@ NOT_FOR_PLATFORM=	*-*-mips
 
 .include "../../databases/postgresql73/Makefile.common"
 
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-
 USE_TOOLS+=		gtar
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE:Q}
 BUILD_DIRS=		${WRKSRC}/src/backend
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index 92606f80319..79b10c8929d 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/02/21 20:23:49 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2006/03/14 01:14:27 jlam Exp $
 
 PKGNAME=		postgresql74-server-${BASE_VERS}
 SVR4_PKGNAME=		pstgs
@@ -11,7 +11,6 @@ NOT_FOR_PLATFORM=	*-*-mips
 
 .include "../../databases/postgresql74/Makefile.common"
 
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 MESSAGE_SRC=		${.CURDIR}/MESSAGE
 USE_TOOLS+=		tar
 
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index 09070f4dbf4..e6aa9cdbcdf 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/02/21 19:05:07 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2006/03/14 01:14:27 jlam Exp $
 
 PKGNAME=	postgresql80-server-${BASE_VERS}
 COMMENT=	PostgreSQL database server programs
@@ -12,7 +12,6 @@ NOT_FOR_PLATFORM=	*-*-mips
 USE_LIBTOOL=		yes
 PKG_LIBTOOL=		${PKG_SHLIBTOOL}
 
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 MESSAGE_SRC=		${.CURDIR}/MESSAGE
 
 CONFIGURE_ARGS+=	--with-openssl
diff --git a/databases/shared-mime-info/Makefile b/databases/shared-mime-info/Makefile
index e78f8083a56..1223f44dbd3 100644
--- a/databases/shared-mime-info/Makefile
+++ b/databases/shared-mime-info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:37 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2006/03/14 01:14:27 jlam Exp $
 #
 
 DISTNAME=	shared-mime-info-0.16
@@ -23,8 +23,7 @@ CONFIGURE_ARGS+=	--disable-update-mimedb
 
 CPPFLAGS+=		-DPREFIX="\"${PREFIX}\""
 
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
+DEINSTALL_TEMPLATE+=	${PKGDIR}/INSTALL
 
 FILES_SUBST+=		MIMEDB_PATH="${PREFIX}/share/mime"
 FILES_SUBST+=		UPDATE_MIMEDB="${PREFIX}/bin/update-mime-database"
diff --git a/databases/shared-mime-info/mimedb.mk b/databases/shared-mime-info/mimedb.mk
index c30b32fbf9c..5fb9f1bb1d4 100644
--- a/databases/shared-mime-info/mimedb.mk
+++ b/databases/shared-mime-info/mimedb.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mimedb.mk,v 1.3 2005/12/29 06:21:36 jlam Exp $
+# $NetBSD: mimedb.mk,v 1.4 2006/03/14 01:14:27 jlam Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # mime customization files.  It takes care of registering them in the global
@@ -10,8 +10,8 @@ SHARED_MIME_INFO_MIMEDB_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
 
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/../../databases/shared-mime-info/files/install.tmpl
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/../../databases/shared-mime-info/files/install.tmpl
+INSTALL_TEMPLATE+=	${.CURDIR}/../../databases/shared-mime-info/files/install.tmpl
+DEINSTALL_TEMPLATE+=	${.CURDIR}/../../databases/shared-mime-info/files/install.tmpl
 
 FILES_SUBST+=		MIMEDB_PATH="${BUILDLINK_PREFIX.shared-mime-info}/share/mime"
 FILES_SUBST+=		UPDATE_MIMEDB="${BUILDLINK_PREFIX.shared-mime-info}/bin/update-mime-database"