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.

18 files changed, 23 insertions, 51 deletions

diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index f802a044a42..becb3a6ec11 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2006/02/19 00:05:11 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2006/03/14 01:14:29 jlam Exp $
 
 DISTNAME=	clamav-${CLAMAV_VERSION}
 PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
@@ -31,8 +31,6 @@ BUILD_DEFS+=	CLAMAV_USER CLAMAV_GROUP
 FILES_SUBST+=	CLAMAV_USER=${CLAMAV_USER:Q}
 MESSAGE_SUBST+=	CLAMAV_USER=${CLAMAV_USER}
 
-DEINSTALL_EXTRA_TMPL=	${.CURDIR}/DEINSTALL
-
 RCD_SCRIPTS=	clamd freshclamd
 PKG_GROUPS+=	${CLAMAV_GROUP}
 PKG_USERS+=	${CLAMAV_USER}:${CLAMAV_GROUP}::Clamav\ User
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 44fcf0e74e2..19430436fd5 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2006/02/05 23:09:53 joerg Exp $
+# $NetBSD: Makefile,v 1.51 2006/03/14 01:14:29 jlam Exp $
 
 DISTNAME=	courier-imap-4.0.6
 PKGREVISION=	1
@@ -38,7 +38,6 @@ SSLCNF_FILES=		imapd.cnf pop3d.cnf
 FILES_SUBST+=		SSLCERTS=${SSLCERTS:Q}
 FILES_SUBST+=		GEN_FILES=${GEN_FILES:Q}
 
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 MAKE_DIRS=		${VARBASE}/run
 CONF_FILES_PERMS=	# empty
 .for FILE in ${GEN_FILES}
diff --git a/mail/courier-maildir/Makefile b/mail/courier-maildir/Makefile
index cb11ae3a639..56ca4a73702 100644
--- a/mail/courier-maildir/Makefile
+++ b/mail/courier-maildir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/02/05 23:09:54 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2006/03/14 01:14:30 jlam Exp $
 
 DISTNAME=	courier-0.52.2
 PKGNAME=	${DISTNAME:S/-/-maildir-/}
@@ -41,7 +41,6 @@ EXTRACT_ELEMENTS+=	${WRKSRC_SUBDIRS:S/^/${DISTNAME}\//}
 BUILD_DIRS=		${WRKSRC_SUBDIRS:S/^/${WRKSRC}\//}
 INSTALLATION_DIRS=	bin man/man1 man/man5 man/man5 man/man7 man/man8 sbin
 
-DEINSTALL_EXTRA_TMPL+=	${PKGDIR}/DEINSTALL
 OWN_DIRS=		${PKG_SYSCONFDIR}/shared
 OWN_DIRS+=		${PKG_SYSCONFDIR}/shared.tmp
 CONF_FILES=		${EGDIR}/quotawarnmsg ${PKG_SYSCONFDIR}/quotawarnmsg
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 917bb5a0630..51a34c9d8d3 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2006/02/05 23:09:54 joerg Exp $
+# $NetBSD: Makefile,v 1.62 2006/03/14 01:14:30 jlam Exp $
 
 DISTNAME=	cyrus-imapd-2.2.12
 PKGREVISION=	4
@@ -15,8 +15,6 @@ GNU_CONFIGURE=		yes
 PERL5_CONFIGURE=	no
 BDB_ACCEPTED=		db4 db3
 
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-
 .include "../../mk/bsd.prefs.mk"
 
 # CYRUS_USER		username of the Cyrus administrator
diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile
index bd09a67a728..bbb3553e004 100644
--- a/mail/cyrus-imapd21/Makefile
+++ b/mail/cyrus-imapd21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2006/02/05 23:09:54 joerg Exp $
+# $NetBSD: Makefile,v 1.40 2006/03/14 01:14:30 jlam Exp $
 
 DISTNAME=		cyrus-imapd-2.1.18
 PKGREVISION=		3
@@ -17,8 +17,6 @@ GNU_CONFIGURE=		yes
 PERL5_CONFIGURE=	no
 USE_TOOLS+=		autoconf213
 
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-
 .include "../../mk/bsd.prefs.mk"
 
 # CYRUS_USER		username of the Cyrus administrator
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 9575d10f28d..9814625bb0e 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/02/05 23:09:56 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2006/03/14 01:14:30 jlam Exp $
 
 DISTNAME=	mailman-2.1.7
 PKGREVISION=	2
@@ -56,8 +56,8 @@ CONF_FILES+=		${EXECDIR}/Mailman/mm_cfg.py.dist ${EXECDIR}/Mailman/mm_cfg.py
 
 RCD_SCRIPTS=		mailman
 
-INSTALL_EXTRA_TMPL+=	${FILESDIR}/INSTALL
-DEINSTALL_EXTRA_TMPL+=	${FILESDIR}/DEINSTALL
+INSTALL_TEMPLATE+=	${FILESDIR}/INSTALL
+DEINSTALL_TEMPLATE+=	${FILESDIR}/DEINSTALL
 
 PYTHON_VERSIONS_ACCEPTED= 24 23 22 21
 PYTHON_PATCH_SCRIPTS+=	Mailman/Archiver/pipermail.py
diff --git a/mail/mailwrapper/Makefile b/mail/mailwrapper/Makefile
index 25ce9dcb804..e4388d79219 100644
--- a/mail/mailwrapper/Makefile
+++ b/mail/mailwrapper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/03/04 21:30:00 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/03/14 01:14:30 jlam Exp $
 
 DISTNAME=	mailwrapper-19990412
 PKGREVISION=	4
@@ -13,8 +13,6 @@ NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 WRKSRC=			${WRKDIR}/mailwrapper
 MANCOMPRESSED_IF_MANZ=	yes
 
-DEINSTALL_EXTRA_TMPL=	${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
 EGDIR=			${PREFIX}/share/examples/mailwrapper
 
 MAILWRAPPER_BACKUP_SFX=	.pkgsrc.mailwrapper
diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index d75810583f8..69177ecd095 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/03/10 20:08:57 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/03/14 01:14:30 jlam Exp $
 
 DISTNAME=		majordomo-1.94.5
 PKGREVISION=		1
@@ -32,8 +32,8 @@ NO_BIN_ON_CDROM=	${NO_BIN_ON_FTP}
 BUILD_TARGET=		wrapper
 INSTALL_TARGET=		install install-wrapper
 
-INSTALL_SRC=		${PKGDIR}/INSTALL
 DEINSTALL_SRC=		${PKGDIR}/DEINSTALL
+INSTALL_SRC=		${PKGDIR}/INSTALL
 MAKEFILE=		Makefile.netbsd
 
 MAJORDOMO_TMPDIR?=	/var/tmp
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index a765b4e6c2d..d0b521551a0 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/03/13 00:05:14 markd Exp $
+# $NetBSD: Makefile,v 1.34 2006/03/14 01:14:30 jlam Exp $
 
 DISTNAME=		mimedefang-2.56
 CATEGORIES=		mail
@@ -23,8 +23,6 @@ USE_TOOLS+=		perl:run
 GNU_CONFIGURE=		YES
 PKG_SYSCONFSUBDIR?=	mimedefang
 
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
-
 DEFANG_SPOOLDIR?=	${VARBASE}/spool/MIMEDefang
 DEFANG_USER?=		defang
 DEFANG_GROUP?=		defang
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 10087c021f7..c07696ef04b 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2006/02/05 23:09:56 joerg Exp $
+# $NetBSD: Makefile,v 1.45 2006/03/14 01:14:30 jlam Exp $
 
 DISTNAME=		mutt-1.5.11
 PKGREVISION=	3
@@ -45,8 +45,7 @@ CONFIGURE_ARGS+=	--with-exec-shell=/bin/ksh
 
 LDFLAGS+=		${_STRIPFLAG_CC}
 
-DEINSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
-INSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
+DEINSTALL_TEMPLATE+=	${PKGDIR}/INSTALL
 DOCDIR=			${PREFIX}/share/doc/mutt
 EGDIR=			${PREFIX}/share/examples/mutt
 CONF_FILES=		${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index fd9eb797283..087b3058923 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.135 2006/02/05 23:09:56 joerg Exp $
+# $NetBSD: Makefile,v 1.136 2006/03/14 01:14:30 jlam Exp $
 
 DISTNAME=		mutt-1.4.2.1i
 PKGNAME=		${DISTNAME:C/i$//}
@@ -57,8 +57,7 @@ CONFIGURE_ARGS+=	--with-exec-shell=/bin/ksh
 
 LDFLAGS+=		${_STRIPFLAG_CC}
 
-DEINSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
-INSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
+DEINSTALL_TEMPLATE+=	${PKGDIR}/INSTALL
 DOCDIR=			${PREFIX}/share/doc/mutt
 EGDIR=			${PREFIX}/share/examples/mutt
 CONF_FILES=		${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile
index 3be6546d975..b592d768226 100644
--- a/mail/nullmailer/Makefile
+++ b/mail/nullmailer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/01/20 23:38:47 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2006/03/14 01:14:30 jlam Exp $
 
 DISTNAME=		nullmailer-1.02
 CATEGORIES=		mail
@@ -48,8 +48,6 @@ SPECIAL_PERMS+=		libexec/nullmailer/nullmailer-queue		\
 			${NULLMAILER_USER} ${NULLMAILER_GROUP} 4555
 SPECIAL_PERMS+=		${VARBASE}/spool/nullmailer/trigger		\
 			${NULLMAILER_USER} ${NULLMAILER_GROUP} 0600
-INSTALL_EXTRA_TMPL+=	${PKGDIR}/INSTALL
-DEINSTALL_EXTRA_TMPL+=	${PKGDIR}/DEINSTALL
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKDIR}/mailer.conf
diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index a4175c2f046..f5a89f5a544 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/12/29 06:21:52 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2006/03/14 01:14:30 jlam Exp $
 #
 
 DISTNAME=	popa3d-1.0
@@ -17,9 +17,6 @@ POPA3D_GROUP?=	popa3d
 PKG_GROUPS=	${POPA3D_GROUP}
 PKG_USERS=	${POPA3D_USER}:${POPA3D_GROUP}
 
-
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-
 RCD_SCRIPTS=	popa3d
 
 FILES_SUBST+=	POPA3D_USER=${POPA3D_USER:Q}
diff --git a/mail/pymsgauth/Makefile b/mail/pymsgauth/Makefile
index f19460d830a..92a0c18f9b8 100644
--- a/mail/pymsgauth/Makefile
+++ b/mail/pymsgauth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/02/05 23:09:57 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/03/14 01:14:30 jlam Exp $
 #
 
 DISTNAME=		pymsgauth-2.1.0
@@ -23,8 +23,6 @@ EGDIR=			share/examples/pymsgauth
 NO_BUILD=		yes
 PYTHON_PATCH_SCRIPTS=	${PYMSGAUTH_PROGRAMS} *.py
 
-INSTALL_EXTRA_TMPL+=	${PKGDIR}/INSTALL
-DEINSTALL_EXTRA_TMPL+=	${PKGDIR}/DEINSTALL
 FILES_SUBST+=		SHAREDIR=${SHAREDIR:Q}
 
 INSTALLATION_DIRS=	${SHAREDIR} ${DOCDIR} ${HTMLDOCDIR} ${EGDIR} bin
diff --git a/mail/qmail-run/Makefile b/mail/qmail-run/Makefile
index 81a04990b22..ddd787deb54 100644
--- a/mail/qmail-run/Makefile
+++ b/mail/qmail-run/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/01/20 23:47:42 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2006/03/14 01:14:30 jlam Exp $
 #
 
 DISTNAME=		qmail-run-20050415
@@ -20,7 +20,6 @@ WRKSRC=			${WRKDIR}
 NO_CHECKSUM=		yes
 NO_BUILD=		yes
 
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 FILES_SUBST+=		QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA:Q}
 FILES_SUBST+=		PKGNAME=${PKGNAME:Q}
 RCD_SCRIPTS=		qmail qmailpop3d qmailqread qmailsend qmailsmtpd
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 95f4ce42a5f..72726ec65e9 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2006/03/12 14:15:43 rillig Exp $
+# $NetBSD: Makefile,v 1.47 2006/03/14 01:14:30 jlam Exp $
 #
 
 DISTNAME=		netqmail-1.05
@@ -31,8 +31,6 @@ DJB_BUILD_TARGETS= 	man
 
 DJB_RESTRICTED=		YES
 
-DEINSTALL_EXTRA_TMPL+=	${PKGDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL+=	${PKGDIR}/INSTALL
 MAKE_DIRS+=		${PKG_SYSCONFDIR} ${PKG_SYSCONFDIR}/alias
 MAKE_DIRS+=		${PKG_SYSCONFDIR}/control ${PKG_SYSCONFDIR}/users
 OWN_DIRS+=		${QMAILDIR} ${QMAIL_QUEUE_DIR}
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 156d3345be8..6c205de5ca7 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2006/03/10 20:12:28 jlam Exp $
+# $NetBSD: Makefile,v 1.47 2006/03/14 01:14:30 jlam Exp $
 
 DISTNAME=	sqwebmail-5.0.7
 PKGREVISION=	2
@@ -37,7 +37,6 @@ BUILD_DEFS+=		SQWEBMAIL_IMAGEURL
 FILES_SUBST+=		SQWEBMAIL_STATEDIR=${SQWEBMAIL_STATEDIR:Q}
 MESSAGE_SUBST+=		IMAGEDIR=${SQWEBMAIL_IMAGEDIR}
 MESSAGE_SUBST+=		IMAGEURL=${SQWEBMAIL_IMAGEURL}
-DEINSTALL_EXTRA_TMPL=	${PKGDIR}/DEINSTALL
 
 SENDMAIL?=		/usr/sbin/sendmail
 MIME_TYPES=		${PKG_SYSCONFDIR}/mime.types:${PKG_SYSCONFBASEDIR}/httpd/mime.types:${PREFIX}/etc/mime.types:/etc/mime.types
diff --git a/mail/yatsvrs/Makefile b/mail/yatsvrs/Makefile
index 747fee44511..979bdae8cf3 100644
--- a/mail/yatsvrs/Makefile
+++ b/mail/yatsvrs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/12/29 06:21:54 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/03/14 01:14:30 jlam Exp $
 #
 
 DISTNAME=		yatsvrs-5.00p6
@@ -32,9 +32,6 @@ FILES_SUBST+=		DEFAULT_ADMIN=${DEFAULT_YATADMIN:Q}
 FILES_SUBST+=		YATSVR_MINGID=${YATSVR_MINGID:Q}
 FILES_SUBST+=		YATSVR_MAXGID=${YATSVR_MAXGID:Q}
 
-DEINSTALL_EXTRA_TMPL=	${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
-
 .for f in ${EXAMPLES}
 CONF_FILES+=		${EXAMPLESDIR}/${f}	${PKG_SYSCONFDIR}/${f}
 .endfor