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.

12 files changed, 44 insertions, 17 deletions

diff --git a/net/arla/Makefile b/net/arla/Makefile
index d62f4028d78..c250f40aedc 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2003/08/09 11:16:17 seb Exp $
+# $NetBSD: Makefile,v 1.37 2003/08/30 22:51:23 jlam Exp $
 
 DISTNAME=		arla-0.35.12
 #PKGREVISION=
@@ -16,10 +16,13 @@ OSVERSION_SPECIFIC=	yes
 INFO_FILES=		arla.info
 
 USE_BUILDLINK2=		yes
-USE_PKGINSTALL=		yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
 
+USE_PKGINSTALL=		yes
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
+
 .if exists(/usr/lib/libroken.a)
 CONFIGURE_ARGS+=	--with-krb4-lib=/usr/lib
 CONFIGURE_ARGS+=	--with-krb4-include=/usr/include/kerberosIV
diff --git a/net/coda5_client/Makefile b/net/coda5_client/Makefile
index 50ab6b2fc38..9e60f61f65a 100644
--- a/net/coda5_client/Makefile
+++ b/net/coda5_client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2003/07/21 17:10:28 martti Exp $
+# $NetBSD: Makefile,v 1.40 2003/08/30 22:51:24 jlam Exp $
 
 PKGNAME=	coda-client-${DIST_VERS}
 COMMENT=	Client programs for a replicated high-performance network file system
@@ -8,7 +8,10 @@ COMMENT=	Client programs for a replicated high-performance network file system
 ALL_TARGET=		coda
 INSTALL_TARGET=		client-install
 
-USE_PKGINSTALL=	yes
+USE_PKGINSTALL=		yes
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
+
 CONF_FILES+=	${EGDIR}/sidekick.intr.ex ${PKG_SYSCONFDIR}/sidekick.intr
 CONF_FILES+=	${EGDIR}/venus.conf.ex ${PKG_SYSCONFDIR}/venus.conf
 
diff --git a/net/coda5_server/Makefile b/net/coda5_server/Makefile
index 535f76e7a5b..a0e7785d13c 100644
--- a/net/coda5_server/Makefile
+++ b/net/coda5_server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2003/07/21 17:10:29 martti Exp $
+# $NetBSD: Makefile,v 1.39 2003/08/30 22:51:24 jlam Exp $
 
 PKGNAME=	coda-server-${DIST_VERS}
 COMMENT=	Server programs for a replicated high-performance network file system
@@ -8,7 +8,10 @@ COMMENT=	Server programs for a replicated high-performance network file system
 ALL_TARGET=		coda
 INSTALL_TARGET=		server-install
 
-USE_PKGINSTALL=	yes
+USE_PKGINSTALL=		yes
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
+
 CONF_FILES+=	${EGDIR}/server.conf.ex ${PKG_SYSCONFDIR}/server.conf
 
 post-install:
diff --git a/net/ddclient/Makefile b/net/ddclient/Makefile
index fe4587b9977..a65d2bfc3db 100644
--- a/net/ddclient/Makefile
+++ b/net/ddclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 22:51:04 grant Exp $
+# $NetBSD: Makefile,v 1.13 2003/08/30 22:51:25 jlam Exp $
 
 DISTNAME=	ddclient-3.6.2
 CATEGORIES=	net
@@ -10,6 +10,7 @@ COMMENT=	Client to update dynamic DNS entries
 
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 
 DOCDIR=			${PREFIX}/share/doc/ddclient
 EGDIR=			${PREFIX}/share/examples/ddclient
diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile
index ec5853b0406..fc3302b1853 100644
--- a/net/ja-samba/Makefile
+++ b/net/ja-samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/08/30 01:31:11 taca Exp $
+# $NetBSD: Makefile,v 1.20 2003/08/30 22:51:25 jlam Exp $
 
 .include "Makefile.common"
 
@@ -13,6 +13,7 @@ CONFLICTS+=		samba-[0-9]*
 
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
 USE_PKGLOCALEDIR=	YES
 
diff --git a/net/lambdamoo/Makefile b/net/lambdamoo/Makefile
index 4410024a4cb..b4850e30ab7 100644
--- a/net/lambdamoo/Makefile
+++ b/net/lambdamoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/08/30 19:49:25 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/08/30 22:51:26 jlam Exp $
 
 DISTNAME=		LambdaMOO-1.8.1
 PKGNAME=		lambdamoo-1.8.1
@@ -20,6 +20,9 @@ LAMBDAMOO_GROUP?=	lambdamoo
 LAMBDAMOO_HOME?=	${PREFIX}/share/${LAMBDAMOO_USER}
 
 USE_PKGINSTALL=		yes
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
+
 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 7779f8b20b8..0f584314e11 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 22:51:26 grant Exp $
+# $NetBSD: Makefile,v 1.9 2003/08/30 22:51:27 jlam Exp $
 
 DISTNAME=	net-snmp-5.0.6
 CATEGORIES=	net
@@ -23,6 +23,8 @@ NET_SNMP_MIBDIRS?=		\$$HOME/.snmp/mibs:${PREFIX}/share/snmp/mibs
 
 USE_BUILDLINK2=		yes
 USE_PKGINSTALL=		yes
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
+
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index a4b1f4d26a6..e6909cccf4d 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2003/07/30 10:41:24 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2003/08/30 22:51:27 jlam Exp $
 
 DISTNAME=	netatalk-1.6.2
 CATEGORIES=	net print
@@ -13,8 +13,12 @@ GNU_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
 USE_GMAKE=	YES
 USE_PERL5=	YES
-USE_PKGINSTALL=	YES
-USE_LIBTOOL=	YES
+
+USE_PKGINSTALL=		YES
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
+
+USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 CONFLICTS=	netatalk-asun-[0-9]* netatalk-umich-[0-9]*
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 4e1c4b45276..b8fa10eb090 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2003/07/17 22:51:48 grant Exp $
+# $NetBSD: Makefile,v 1.101 2003/08/30 22:51:27 jlam Exp $
 
 .include "Makefile.common"
 PKGREVISION=		2
@@ -9,6 +9,7 @@ COMMENT=		SMB/CIFS protocol server suite for UNIX
 
 USE_BUILDLINK2=		yes
 USE_PKGINSTALL=		yes
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
 USE_GNU_READLINE=	# uses rl_event_hook interface to GNU readline
 CONFIGURE_ARGS+=	--with-readline
diff --git a/net/samba20/Makefile b/net/samba20/Makefile
index 684873ad2cf..5f81a114704 100644
--- a/net/samba20/Makefile
+++ b/net/samba20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/07/17 22:51:49 grant Exp $
+# $NetBSD: Makefile,v 1.15 2003/08/30 22:51:28 jlam Exp $
 
 DISTNAME=		samba-2.0.10
 PKGREVISION=				1
@@ -16,6 +16,7 @@ BUILD_USES_MSGFMT=	yes
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
 USE_PKGINSTALL=		yes
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/sendfile/Makefile b/net/sendfile/Makefile
index 3a397ebfedc..dc34de29d9e 100644
--- a/net/sendfile/Makefile
+++ b/net/sendfile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/07/17 22:51:50 grant Exp $
+# $NetBSD: Makefile,v 1.14 2003/08/30 22:51:28 jlam Exp $
 #
 
 DISTNAME=	sendfile-20010216
@@ -15,6 +15,8 @@ COMMENT=	Implementation of the Simple asynchronous file transfer protocol
 USE_BUILDLINK2=	yes
 USE_PKGINSTALL=	yes
 
+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/vtun/Makefile b/net/vtun/Makefile
index f71d3422ffd..b0249cd26f5 100644
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/07/17 22:52:01 grant Exp $
+# $NetBSD: Makefile,v 1.21 2003/08/30 22:51:29 jlam Exp $
 
 DISTNAME=	vtun-2.6
 WRKSRC=		${WRKDIR}/vtun
@@ -11,6 +11,9 @@ COMMENT=	Virtual Tunnels over TCP/IP networks with traffic shaping
 
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
+
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--localstatedir=/var
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}