Add definitions for DEINSTALL_EXTRA_TMPL and INSTALL_EXTRA_TMPL if

USE_PKGINSTALL is "YES".  bsd.pkg.install.mk will no longer automatically
pick up a INSTALL/DEINSTALL script in the package directory and assume that
you want it for the corresponding *_EXTRA_TMPL variable.

9 files changed, 36 insertions, 17 deletions

diff --git a/mail/courier-auth/Makefile b/mail/courier-auth/Makefile
index 3b2462aa519..c203a675e0d 100644
--- a/mail/courier-auth/Makefile
+++ b/mail/courier-auth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/21 16:56:43 martti Exp $
+# $NetBSD: Makefile,v 1.11 2003/08/30 22:51:19 jlam Exp $
 
 PKGNAME=	courier-auth-${BASE_VERS}
 PKGREVISION?=	1
@@ -9,8 +9,10 @@ CONFLICTS=	courier-imap<=1.4.0
 CONFLICTS+=	courier-imap-ldap-*
 
 USE_PERL5=		yes
-USE_PKGINSTALL=		yes
 REPLACE_PERL=		sysconftool
+USE_PKGINSTALL=		yes
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
 .include "../../mail/courier-auth/Makefile.authdaemond"
 
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index f34b0e768c7..05c1f178aee 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/01/28 22:03:29 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2003/08/30 22:51:20 jlam Exp $
 
 DISTNAME=	courier-imap-1.4.2
 PKGREVISION=	1
@@ -8,9 +8,10 @@ HOMEPAGE=	http://www.inter7.com/courierimap/
 DEPENDS+=	courier-auth>=0.37.1:../../mail/courier-auth
 DEPENDS+=	courier-maildirmake>=0.37.1nb1:../../mail/courier-maildirmake
 
-USE_PKGINSTALL=		yes
 USE_PERL5=		yes
 REPLACE_PERL=		sysconftool
+USE_PKGINSTALL=		yes
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 
 .include "../../mail/courier-auth/Makefile.common"
 
diff --git a/mail/courier-maildirmake/Makefile b/mail/courier-maildirmake/Makefile
index 42376bb0ae6..98975463ef2 100644
--- a/mail/courier-maildirmake/Makefile
+++ b/mail/courier-maildirmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/01/28 22:03:30 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2003/08/30 22:51:20 jlam Exp $
 
 PKGNAME=	courier-maildirmake-${BASE_VERS}
 PKGREVISION?=	1
@@ -6,9 +6,10 @@ COMMENT=	Courier Maildir utilities
 
 PERL5_REQD=	5.6.0
 USE_PERL5=	build
-USE_PKGINSTALL=	yes
+REPLACE_PERL=	sysconftool
 
-REPLACE_PERL=		sysconftool
+USE_PKGINSTALL=		yes
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 
 .include "../../mail/courier-auth/Makefile.common"
 
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 6aea3c261c7..4b571dd23f2 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2003/07/17 21:45:50 grant Exp $
+# $NetBSD: Makefile,v 1.42 2003/08/30 22:51:20 jlam Exp $
 
 DISTNAME=		cyrus-imapd-2.0.17
 PKGREVISION=		1
@@ -12,11 +12,14 @@ HOMEPAGE=		http://asg.web.cmu.edu/cyrus/imapd/
 COMMENT=		Cyrus IMAP server
 
 USE_BUILDLINK2=		YES
-USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 PERL5_CONFIGURE=	NO
 AUTOCONF_REQD=		2.13
 
+USE_PKGINSTALL=		YES
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
+
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(CYRUS_USE_INET6) && ${CYRUS_USE_INET6} == "YES"
diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile
index 816e3436cbf..ec9587dd240 100644
--- a/mail/cyrus-imapd21/Makefile
+++ b/mail/cyrus-imapd21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/08/16 09:23:58 recht Exp $
+# $NetBSD: Makefile,v 1.9 2003/08/30 22:51:21 jlam Exp $
 
 DISTNAME=		cyrus-imapd-2.1.14
 SVR4_PKGNAME=		cimap
@@ -11,11 +11,14 @@ HOMEPAGE=		http://asg.web.cmu.edu/cyrus/imapd/
 COMMENT=		Cyrus IMAP server
 
 USE_BUILDLINK2=		YES
-USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 PERL5_CONFIGURE=	NO
 AUTOCONF_REQD=		2.13
 
+USE_PKGINSTALL=		YES
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
+
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(CYRUS_USE_INET6) && ${CYRUS_USE_INET6} == "YES"
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index 112cde113b8..b6e237dbf05 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/08/30 20:22:57 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2003/08/30 22:51:21 jlam Exp $
 
 DISTNAME=		mimedefang-2.35
 CATEGORIES=		mail
@@ -18,11 +18,14 @@ DEPENDS+=		p5-MIME-tools>=5.411.1:../../mail/p5-MIME-tools
 DEPENDS+=		spamassassin>=2.31:../../mail/spamassassin
 
 USE_BUILDLINK2=		YES
-USE_PKGINSTALL=		YES
 USE_PERL5=		YES
 GNU_CONFIGURE=		YES
 PKG_SYSCONFSUBDIR?=	mimedefang
 
+USE_PKGINSTALL=		YES
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
+
 DEFANG_SPOOLDIR?=	/var/spool/MIMEDefang
 DEFANG_USER?=		defang
 DEFANG_GROUP?=		defang
diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index 687ae162624..8ab0dfc932d 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2003/07/21 16:56:52 martti Exp $
+# $NetBSD: Makefile,v 1.32 2003/08/30 22:51:22 jlam Exp $
 #
 
 DISTNAME=	popa3d-0.6.3
@@ -20,6 +20,8 @@ PKG_USERS=	${POPA3D_USER}:${POPA3D_GROUP}
 USE_BUILDLINK2=	YES
 USE_PKGINSTALL=	YES
 
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
+
 RCD_SCRIPTS=	popa3d
 
 FILES_SUBST+=	POPA3D_USER=${POPA3D_USER}
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 7027b0d2894..163776799d3 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/07/17 21:46:54 grant Exp $
+# $NetBSD: Makefile,v 1.19 2003/08/30 22:51:22 jlam Exp $
 #
 
 DISTNAME=	qmail-1.03
@@ -27,6 +27,7 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 NO_PACKAGE=		"needs work to function properly as a binary package"
 
 USE_PKGINSTALL=		yes
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 OWN_DIRS+=		${QMAILDIR}
 
 FILES_SUBST+=		QMAILDIR=${QMAILDIR}
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 64da24e2787..94353805507 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/07/21 16:56:56 martti Exp $
+# $NetBSD: Makefile,v 1.14 2003/08/30 22:51:23 jlam Exp $
 
 DISTNAME=	sqwebmail-3.3.1
 CATEGORIES=	www
@@ -9,9 +9,12 @@ DEPENDS+=	courier-auth>=0.37.1nb1:../../mail/courier-auth
 DEPENDS+=	courier-maildirmake>=0.37.1nb1:../../mail/courier-maildirmake
 
 USE_PERL5=		yes
-USE_PKGINSTALL=		yes
 REPLACE_PERL=		sysconftool
 
+USE_PKGINSTALL=		yes
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
+
 .include "../../mail/courier-auth/Makefile.common"
 
 .if defined(_STRIPFLAG_INSTALL) && !empty(_STRIPFLAG_INSTALL:M-s)