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.

5 files changed, 17 insertions, 5 deletions

diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 22c27b12443..9cef4085949 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2003/03/19 21:02:00 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2003/08/30 22:51:34 jlam Exp $
 
 .include "Makefile.common"
 
@@ -31,6 +31,9 @@ PLIST_SRC+=		${.CURDIR}/PLIST.krb5
 PLIST_SRC+=		${.CURDIR}/PLIST.plugins
 
 USE_PKGINSTALL=		YES
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
+
 PKG_GROUPS=		${CYRUS_GROUP}
 PKG_USERS=		${CYRUS_USER}:${CYRUS_GROUP}::::${SH}
 RCD_SCRIPTS=		sasl_pwcheck saslauthd
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 29a9a70c3b0..cc91a1a05c5 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/08/16 09:06:41 recht Exp $
+# $NetBSD: Makefile,v 1.12 2003/08/30 22:51:35 jlam Exp $
 
 .include "Makefile.common"
 
@@ -40,6 +40,9 @@ CPPFLAGS+=		-I/usr/include/krb5
 PLIST_SRC+=		${PKGDIR}/PLIST.plugins
 
 USE_PKGINSTALL=		YES
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
+
 PKG_GROUPS=		${CYRUS_GROUP}
 PKG_USERS=		${CYRUS_USER}:${CYRUS_GROUP}::::${SH}
 RCD_SCRIPTS=		saslauthd
diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile
index ea738ce0bc4..4374b015ddf 100644
--- a/security/openssh+gssapi/Makefile
+++ b/security/openssh+gssapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/08/05 15:44:46 jwise Exp $
+# $NetBSD: Makefile,v 1.5 2003/08/30 22:51:37 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
@@ -144,6 +144,8 @@ MESSAGE_SUBST+=		EGDIR=${EGDIR}
 MESSAGE_SUBST+=		OPENSSH_USER=${OPENSSH_USER}
 MESSAGE_SUBST+=		OPENSSH_GROUP=${OPENSSH_GROUP}
 
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
+
 .if defined(UPDATE_INTREE_OPENSSH)
 .  include "Makefile.intree"
 .endif
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 70dce24dd49..6bbd8ea30e3 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.106 2003/07/30 18:35:53 grant Exp $
+# $NetBSD: Makefile,v 1.107 2003/08/30 22:51:36 jlam Exp $
 
 DISTNAME=		openssh-3.6.1p2
 PKGNAME=		openssh-3.6.1.2
@@ -136,6 +136,8 @@ MESSAGE_SUBST+=		EGDIR=${EGDIR}
 MESSAGE_SUBST+=		OPENSSH_USER=${OPENSSH_USER}
 MESSAGE_SUBST+=		OPENSSH_GROUP=${OPENSSH_GROUP}
 
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
+
 .if defined(UPDATE_INTREE_OPENSSH)
 .  include "Makefile.intree"
 .endif
diff --git a/security/uvscan/Makefile b/security/uvscan/Makefile
index 3b6a1668601..1394e7b980f 100644
--- a/security/uvscan/Makefile
+++ b/security/uvscan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/07/21 17:20:39 martti Exp $
+# $NetBSD: Makefile,v 1.22 2003/08/30 22:51:37 jlam Exp $
 
 DISTNAME=		vlnx416e
 PKGNAME=		uvscan-4.16.0
@@ -32,6 +32,8 @@ UVSCANDIR=		${PREFIX}/libexec/uvscan
 DATFILES=		clean.dat internet.dat names.dat scan.dat readme.txt
 
 USE_PKGINSTALL=		yes
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
+
 FILES_SUBST+=		UVSCANDIR=${UVSCANDIR:Q}
 FILES_SUBST+=		DATFILES=${DATFILES:Q}