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, 15 insertions, 16 deletions

diff --git a/www/firefox/Makefile-firefox.common b/www/firefox/Makefile-firefox.common
index 0d8a3ecb211..e80663b49a0 100644
--- a/www/firefox/Makefile-firefox.common
+++ b/www/firefox/Makefile-firefox.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile-firefox.common,v 1.27 2006/02/06 00:37:54 ghen Exp $
+# $NetBSD: Makefile-firefox.common,v 1.28 2006/03/14 01:14:34 jlam Exp $
 
 MOZILLA_BIN=		firefox-bin
 MOZ_VER=		1.5.0.1
@@ -34,4 +34,4 @@ MESSAGE=		${.CURDIR}/../../www/firefox/MESSAGE
 
 .include "../../www/firefox/Makefile.common"
 
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/../../www/firefox/INSTALL
+INSTALL_TEMPLATE+=	${.CURDIR}/../../www/firefox/INSTALL
diff --git a/www/firefox/Makefile.common b/www/firefox/Makefile.common
index 1463b029263..7b0124d20e4 100644
--- a/www/firefox/Makefile.common
+++ b/www/firefox/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2006/02/07 09:21:38 rillig Exp $
+# $NetBSD: Makefile.common,v 1.8 2006/03/14 01:14:34 jlam Exp $
 
 MOZ_DIST_VER?=		${MOZ_VER}
 DISTNAME?=		mozilla-${MOZ_DIST_VER}-source
@@ -18,7 +18,7 @@ USE_LANGUAGES=		c c++
 USE_TOOLS+=		autoconf213 gmake perl pkg-config
 GNU_CONFIGURE=		yes
 
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/../../www/mozilla/INSTALL
+INSTALL_TEMPLATE+=	${.CURDIR}/../../www/mozilla/INSTALL
 
 CONFIG_GUESS_OVERRIDE=	build/autoconf/config.guess
 CONFIG_GUESS_OVERRIDE+=	nsprpub/build/autoconf/config.guess
diff --git a/www/htdig-devel/Makefile b/www/htdig-devel/Makefile
index f5c7e70ce8e..3b08d9ffff3 100644
--- a/www/htdig-devel/Makefile
+++ b/www/htdig-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:30:58 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2006/03/14 01:14:34 jlam Exp $
 
 DISTNAME=	htdig-3.2.0b6
 CATEGORIES=	www databases
@@ -25,7 +25,6 @@ CONFIGURE_ARGS+=	--with-search-dir=${PREFIX}/share/examples/htdig
 CONFIGURE_ENV+=		PDF_PARSER="${LOCALBASE}/bin/acroread"
 CXXFLAGS+=		-Wno-deprecated
 
-INSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL
 PKG_SYSCONFSUBDIR=	htdig
 
 DBDIR?=		${VARBASE}/db/htdig
diff --git a/www/htdig/Makefile b/www/htdig/Makefile
index a6646e049e3..5973f08e32d 100644
--- a/www/htdig/Makefile
+++ b/www/htdig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/03/04 21:30:58 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2006/03/14 01:14:34 jlam Exp $
 
 DISTNAME=	htdig-3.1.6
 PKGREVISION=	3
@@ -30,7 +30,6 @@ CONFIGURE_ENV+=	PDF_PARSER="${LOCALBASE}/bin/acroread"
 CXXFLAGS+=	-Wno-deprecated
 CPPFLAGS+=	${CXXFLAGS}
 
-INSTALL_EXTRA_TMPL=     ${PKGDIR}/INSTALL
 PKG_SYSCONFSUBDIR=	htdig
 
 DBDIR?=		${VARBASE}/db/htdig
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index c1a9ad55e9f..e4f0e3a29ae 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.72 2006/02/07 09:07:19 rillig Exp $
+# $NetBSD: Makefile.common,v 1.73 2006/03/14 01:14:34 jlam Exp $
 
 MOZ_DIST_VER?=		${MOZ_VER}
 DISTNAME?=		mozilla-${MOZ_DIST_VER}-source
@@ -18,7 +18,7 @@ USE_LANGUAGES=		c c++
 USE_TOOLS+=		autoconf213 gmake perl pkg-config
 GNU_CONFIGURE=		yes
 
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/../../www/mozilla/INSTALL
+INSTALL_TEMPLATE+=	${.CURDIR}/../../www/mozilla/INSTALL
 
 CONFIG_GUESS_OVERRIDE=	build/autoconf/config.guess
 CONFIG_GUESS_OVERRIDE+=	nsprpub/build/autoconf/config.guess
diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index 7572b66b824..0adff984f81 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/02/05 23:11:28 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2006/03/14 01:14:34 jlam Exp $
 #
 
 DISTNAME=	${PKGNAME_NOREV}-stable-src
@@ -52,8 +52,7 @@ CONF_FILES_PERMS+=	${EGDIR}/${i} ${PKG_SYSCONFDIR}/${i} ${USER_GROUP} 0660
 
 OWN_DIRS_PERMS+=	/var/log/privoxy ${USER_GROUP} 0775
 
-DEINSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
-INSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
+DEINSTALL_TEMPLATE+=	${PKGDIR}/INSTALL
 
 FILES_SUBST+=		PRIVOXY_USER=${PRIVOXY_USER:Q}
 
diff --git a/www/wwwcount/Makefile b/www/wwwcount/Makefile
index ead52500a6c..93606d96129 100644
--- a/www/wwwcount/Makefile
+++ b/www/wwwcount/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:31:04 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/03/14 01:14:34 jlam Exp $
 
 DISTNAME=       wwwcount2.5
 PKGNAME=        wwwcount-2.5
@@ -13,6 +13,9 @@ GNU_CONFIGURE=  yes
 INSTALLATION_DIRS=	bin man/man1 share/doc/wwwcount/Count2.5/images \
 			share/doc/wwwcount/Count2.5/eximages share/examples
 
+DEINSTALL_SRC=	${PKGDIR}/DEINSTALL
+INSTALL_SRC=	# empty
+
 pre-configure:
 	cd ${WRKSRC}; yes "" | PREFIX=${PREFIX} VARBASE=${VARBASE} ./Count-config
 
diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index db9efa867ae..d9f17345022 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2006/02/22 23:01:28 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2006/03/14 01:14:34 jlam Exp $
 
 DISTNAME=	wwwoffle-2.8e
 PKGREVISION=	2
@@ -19,7 +19,6 @@ CONFIGURE_ARGS+= --with-spooldir=${VARBASE}/wwwoffle
 
 PKG_SYSCONFSUBDIR= 	wwwoffle
 PLIST_SUBST+=		GZIP_CMD=${GZIP_CMD:Q}
-INSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL
 
 RCD_SCRIPTS=		wwwoffled