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, 10 insertions, 20 deletions

diff --git a/security/AiCA/Makefile b/security/AiCA/Makefile
index 7184923526e..8fa7012d09f 100644
--- a/security/AiCA/Makefile
+++ b/security/AiCA/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/12/29 06:22:09 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/03/14 01:14:33 jlam Exp $
 #
 
 DISTNAME=	AiCA-0.81
@@ -9,7 +9,6 @@ MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=	http://mars.elcom.nitech.ac.jp/security/
 COMMENT=	Manage Certification Authority and PKI utilities
 
-INSTALL_EXTRA_TMPL+=    ${.CURDIR}/INSTALL
 GNU_CONFIGURE=		yes
 WRKSRC=			${WRKDIR}/AiCA
 
diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index fd0bf8cc2a8..6526c5259cf 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/02/05 23:10:42 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2006/03/14 01:14:33 jlam Exp $
 
 .include "Makefile.common"
 
@@ -55,8 +55,6 @@ GEN_FILES=		authdaemonrc
 FILES_SUBST+=		GEN_FILES=${GEN_FILES:Q}
 AUTHLIB_PLIST=		${AUTHEXAMPLEDIR}/authdaemonrc.dist
 
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-
 # Install the example config files into ${EGDIR}.
 INSTALL_AM_MAKEFLAGS=	authdaemonrc=${EGDIR}/authdaemonrc		\
 			authldaprc=${EGDIR}/authldaprc			\
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index eba44e735fa..3fda4c1a293 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2006/02/05 23:10:43 joerg Exp $
+# $NetBSD: Makefile,v 1.47 2006/03/14 01:14:33 jlam Exp $
 
 .include "Makefile.common"
 
@@ -48,8 +48,6 @@ CONFIGURE_ARGS+=	--with-devrandom=${SASL_ENTROPY_SOURCE:Q}
 .endif
 BUILD_DEFS+=		SASL_ENTROPY_SOURCE
 
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-
 # CYRUS_USER		username of the Cyrus administrator
 # CYRUS_GROUP		group of the Cyrus administrator
 #
diff --git a/security/cyrus-saslauthd/Makefile b/security/cyrus-saslauthd/Makefile
index da989be319b..4da99a62bb5 100644
--- a/security/cyrus-saslauthd/Makefile
+++ b/security/cyrus-saslauthd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/12/29 06:22:09 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2006/03/14 01:14:33 jlam Exp $
 
 DISTNAME=	cyrus-sasl-2.1.20
 PKGNAME=	${DISTNAME:S/sasl/saslauthd/}
@@ -33,7 +33,6 @@ CONFIGURE_ARGS+=	--with-openssl=${SSLBASE:Q}
 
 .include "options.mk"
 
-DEINSTALL_EXTRA_TMPL=	${PKGDIR}/DEINSTALL
 RCD_SCRIPTS=		saslauthd
 FILES_SUBST+=		ROOT_USER=${ROOT_USER:Q}
 
diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile
index 385b7b45649..18d8ca28244 100644
--- a/security/openssh+gssapi/Makefile
+++ b/security/openssh+gssapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/02/20 23:03:00 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2006/03/14 01:14:33 jlam Exp $
 
 # NOTE:  This package is modeled on ../openssh, but does not share
 # files with it as that package may update faster than the gssapi
@@ -133,8 +133,6 @@ MESSAGE_SUBST+=		EGDIR=${EGDIR}
 MESSAGE_SUBST+=		OPENSSH_USER=${OPENSSH_USER}
 MESSAGE_SUBST+=		OPENSSH_GROUP=${OPENSSH_GROUP}
 
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
-
 pre-configure:
 	cd ${WRKSRC} && autoreconf
 
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 337f2688407..326339771fa 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.165 2006/03/04 21:30:35 jlam Exp $
+# $NetBSD: Makefile,v 1.166 2006/03/14 01:14:33 jlam Exp $
 
 DISTNAME=		openssh-4.3p1
 PKGNAME=		openssh-4.3.1
@@ -140,8 +140,6 @@ RCD_SCRIPTS=		sshd
 PLIST_SRC+=		${.CURDIR}/PLIST
 FILES_SUBST+=		SSH_PID_DIR=${SSH_PID_DIR:Q}
 
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
-
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
diff --git a/security/smtpd/Makefile b/security/smtpd/Makefile
index 275dd05bb7a..a95fdb64129 100644
--- a/security/smtpd/Makefile
+++ b/security/smtpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:38 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/03/14 01:14:33 jlam Exp $
 #
 
 DISTNAME=	smtpd-2.0
@@ -26,6 +26,8 @@ CFLAGS.AIX+=	-DGETOPT_EOF -DUSE_LOCKF -DNEEDS_FCNTL_H -DNEEDS_LOCKF_H -DNEEDS_ST
 OPSYSVARS+=	LD_LIBS
 LD_LIBS.SunOS+=	-lnsl -lsocket -lresolv
 MAKE_ENV+=	LD_LIBS=${LD_LIBS:Q}
+DEINSTALL_SRC=	${PKGDIR}/DEINSTALL
+INSTALL_SRC=	# empty
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/security/uvscan/Makefile b/security/uvscan/Makefile
index 2eb4d7a89aa..6f1d0506428 100644
--- a/security/uvscan/Makefile
+++ b/security/uvscan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/03/04 21:30:38 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2006/03/14 01:14:33 jlam Exp $
 
 DISTNAME=		vlnx440e
 PKGNAME=		uvscan-4.40
@@ -37,8 +37,6 @@ EGDATDIR=		${PREFIX}/share/examples/uvscan
 UVSCANDIR=		${PREFIX}/libexec/uvscan
 DATFILES=		clean.dat internet.dat names.dat scan.dat pkgdesc.ini
 
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-
 FILES_SUBST+=		UVSCANDIR=${UVSCANDIR:Q}
 FILES_SUBST+=		DATFILES=${DATFILES:Q}