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.

11 files changed, 13 insertions, 30 deletions

diff --git a/net/arla/Makefile b/net/arla/Makefile
index 6bf575dc3df..95877683da9 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2006/03/13 04:29:16 rillig Exp $
+# $NetBSD: Makefile,v 1.55 2006/03/14 01:14:31 jlam Exp $
 
 DISTNAME=		arla-0.41
 PKGREVISION=		3
@@ -21,9 +21,6 @@ INFO_FILES=		arla.info send-pr.info
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
-
 .include "../../mk/bsd.prefs.mk"
 
 .if !exists(/usr/src/sys/lib/libkern/libkern.h)
diff --git a/net/ddclient/Makefile b/net/ddclient/Makefile
index dcb955d0d60..e087825a557 100644
--- a/net/ddclient/Makefile
+++ b/net/ddclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/03/04 21:30:17 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2006/03/14 01:14:31 jlam Exp $
 
 DISTNAME=	ddclient-3.6.6
 CATEGORIES=	net
@@ -13,7 +13,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_TOOLS+=		perl:run
 USE_LANGUAGES=		# empty
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 
 DOCDIR=			${PREFIX}/share/doc/ddclient
 EGDIR=			${PREFIX}/share/examples/ddclient
diff --git a/net/djbdns-run/Makefile b/net/djbdns-run/Makefile
index be8c04ac5cf..9e94e3e9367 100644
--- a/net/djbdns-run/Makefile
+++ b/net/djbdns-run/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/01/08 14:08:58 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/03/14 01:14:31 jlam Exp $
 #
 
 DISTNAME=		djbdns-run-20050415
@@ -20,7 +20,6 @@ WRKSRC=			${WRKDIR}
 NO_CHECKSUM=		yes
 NO_BUILD=		yes
 
-INSTALL_EXTRA_TMPL+=	${PKGDIR}/INSTALL
 MAKE_DIRS+=		${PKG_SYSCONFDIR}/axfrdns
 MAKE_DIRS+=		${PKG_SYSCONFDIR}/dnscache/ip
 MAKE_DIRS+=		${PKG_SYSCONFDIR}/dnscache/servers
diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile
index c2163f62e01..804ebe373d2 100644
--- a/net/ja-samba/Makefile
+++ b/net/ja-samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2006/01/19 01:36:25 joerg Exp $
+# $NetBSD: Makefile,v 1.44 2006/03/14 01:14:31 jlam Exp $
 
 DISTNAME=		samba-${SAMBA_VERSION}-ja-${JA_VERSION}
 PKGNAME=		ja-samba-${SAMBA_VERSION}.${JA_PKG_VERSION}
@@ -109,7 +109,6 @@ USE_PKGLOCALEDIR=	YES
 USE_LANGUAGE=		c
 USE_LIBTOOL=		yes
 SHLIBTOOL_OVERRIDE=	libtool
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
 CONF_FILES=		${EGDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf
 CONF_FILES_PERMS+=	${EGDIR}/adduser.sh ${SAMBA_ETCDIR}/adduser \
diff --git a/net/lambdamoo/Makefile b/net/lambdamoo/Makefile
index 14d90fc6364..6040c0305bf 100644
--- a/net/lambdamoo/Makefile
+++ b/net/lambdamoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:30:20 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/03/14 01:14:31 jlam Exp $
 
 DISTNAME=		LambdaMOO-1.8.1
 PKGNAME=		lambdamoo-1.8.1
@@ -18,8 +18,6 @@ LAMBDAMOO_USER?=	lambdamoo
 LAMBDAMOO_GROUP?=	lambdamoo
 LAMBDAMOO_HOME?=	${PREFIX}/share/${LAMBDAMOO_USER}
 
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-
 PKG_GROUPS=		${LAMBDAMOO_GROUP}
 PKG_USERS=		${LAMBDAMOO_USER}:${LAMBDAMOO_GROUP}
 _PKG_USER_HOME=		${LAMBDAMOO_HOME}
diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index 22b1591dd9c..d3164d19c08 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2006/03/11 16:59:54 rillig Exp $
+# $NetBSD: Makefile,v 1.47 2006/03/14 01:14:31 jlam Exp $
 
 DISTNAME=	net-snmp-5.3.0.1
 PKGREVISION=	2
@@ -21,8 +21,6 @@ USE_LIBTOOL=		yes
 # `make test TEST_TARGET=perltest'
 TEST_TARGET?=		test
 
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD"
diff --git a/net/netdisco/Makefile b/net/netdisco/Makefile
index d5b5da8781c..b8a1567e60c 100644
--- a/net/netdisco/Makefile
+++ b/net/netdisco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/10 22:15:24 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2006/03/14 01:14:31 jlam Exp $
 #
 
 DISTNAME=		netdisco-0.94_with_mibs
@@ -22,9 +22,6 @@ DEPENDS+=		p5-Graph-*:../../devel/p5-Graph
 DEPENDS+=		p5-GraphViz-*:../../graphics/p5-GraphViz
 DEPENDS+=		p5-Compress-Zlib-*:../../devel/p5-Compress-Zlib
 
-#DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-#MESSAGE_SRC=		${.CURDIR}/MESSAGE
-
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/net/nocol/Makefile b/net/nocol/Makefile
index 02310e4aa49..d834a9e8809 100644
--- a/net/nocol/Makefile
+++ b/net/nocol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/03/04 21:30:21 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2006/03/14 01:14:31 jlam Exp $
 #
 
 DISTNAME=		nocol-4.3.1
@@ -22,6 +22,8 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/cmu-snmp/snmp/libtool \
 			${WRKSRC}/cmu-snmp/snmpapps/libtool
 
 INSTALL_TARGET=		install root
+DEINSTALL_SRC=		${PKGDIR}/DEINSTALL
+INSTALL_SRC=		# empty
 
 post-patch:
 	@(hostname=`/bin/hostname`;					\
diff --git a/net/sendfile/Makefile b/net/sendfile/Makefile
index bc4e246c292..28806707e27 100644
--- a/net/sendfile/Makefile
+++ b/net/sendfile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:30:24 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/03/14 01:14:31 jlam Exp $
 #
 
 DISTNAME=	sendfile-20010216
@@ -13,8 +13,6 @@ COMMENT=	Implementation of the Simple asynchronous file transfer protocol
 
 WRKSRC=		${WRKDIR}/sendfile-2.1a
 
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-
 PKG_SYSCONFSUBDIR=	sendfile
 EGDIR=		${PREFIX}/share/examples/sendfile
 CONF_FILES=	${EGDIR}/sendfile.cf ${PKG_SYSCONFDIR}/sendfile.cf
diff --git a/net/tor/Makefile b/net/tor/Makefile
index 09245b12ec8..2357decf8f8 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/02/23 03:39:25 jschauma Exp $
+# $NetBSD: Makefile,v 1.26 2006/03/14 01:14:31 jlam Exp $
 #
 
 DISTNAME=		tor-0.1.0.17
@@ -34,8 +34,6 @@ CONF_FILES+=		${PREFIX}/share/examples/tor/torrc.sample 	\
 
 RCD_SCRIPT=		tor
 
-INSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
-
 FILES_SUBST+=		PKG_HOME=${PKG_HOME:Q}
 FILES_SUBST+=		TOR_USER=${TOR_USER:Q} TOR_GROUP=${TOR_GROUP:Q}
 
diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index 57025b1662a..b395c9c7379 100644
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/12/29 06:22:04 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2006/03/14 01:14:31 jlam Exp $
 
 DISTNAME=	vtun-2.6
 PKGREVISION=	6
@@ -14,8 +14,6 @@ HOMEPAGE=	http://vtun.sourceforge.net/
 COMMENT=	Virtual Tunnels over TCP/IP networks with traffic shaping
 
 WRKSRC=			${WRKDIR}/vtun
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}