When using bsd.pkg.install.mk, if a DEINSTALL or INSTALL file already

exists, then use it as the default value of DEINSTALL_EXTRA_TMPL or
INSTALL_EXTRA_TMPL.

6 files changed, 6 insertions, 17 deletions

diff --git a/net/coda5_client/Makefile b/net/coda5_client/Makefile
index f66f02e0576..184fb7a2e0b 100644
--- a/net/coda5_client/Makefile
+++ b/net/coda5_client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2002/09/10 11:02:16 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2002/09/18 21:15:13 jlam Exp $
 
 PKGNAME=	coda-client-${DIST_VERS}
 COMMENT=	client programs for a replicated high-performance network file system
@@ -7,8 +7,6 @@ COMMENT=	client programs for a replicated high-performance network file system
 
 ALL_TARGET=		coda
 INSTALL_TARGET=		client-install
-INSTALL_EXTRA_TMPL=	${.CURDIR}/DEINSTALL
-DEINSTALL_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 5f51eb79fc7..427a68ce29d 100644
--- a/net/coda5_server/Makefile
+++ b/net/coda5_server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2002/09/10 11:02:17 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2002/09/18 21:15:14 jlam Exp $
 
 PKGNAME=	coda-server-${DIST_VERS}
 COMMENT=	server programs for a replicated high-performance network file system
@@ -7,8 +7,6 @@ COMMENT=	server programs for a replicated high-performance network file system
 
 ALL_TARGET=		coda
 INSTALL_TARGET=		server-install
-INSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
-DEINSTALL_EXTRA_TMPL=	${.CURDIR}/DEINSTALL
 
 CONF_FILES+=	${EGDIR}/server.conf.ex ${PKG_SYSCONFDIR}/server.conf
 
diff --git a/net/ddclient/Makefile b/net/ddclient/Makefile
index b571df4532b..22d9aa4fbbd 100644
--- a/net/ddclient/Makefile
+++ b/net/ddclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/08/25 21:49:56 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2002/09/18 21:15:14 jlam Exp $
 
 DISTNAME=	ddclient-3.6.2
 CATEGORIES=	net
@@ -16,7 +16,6 @@ RCD_SCRIPTS=		ddclient
 CONF_FILES_PERMS=	${EGDIR}/sample-etc_ddclient.conf		\
 			${PKG_SYSCONFDIR}/ddclient.conf			\
 			${ROOT_USER} ${ROOT_GROUP} 0600
-DEINSTALL_EXTRA_TMPL=	${.CURDIR}/DEINSTALL
 
 do-configure:
 	cd ${WRKSRC}; for file in ddclient; do				\
diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile
index 8fbd2aae667..7896d47d95b 100644
--- a/net/ja-samba/Makefile
+++ b/net/ja-samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/07/07 14:36:40 taca Exp $
+# $NetBSD: Makefile,v 1.5 2002/09/18 21:15:14 jlam Exp $
 
 DISTNAME=		samba-${SAMBA_BASE_VERSION}-ja-${SAMBA_JA_VERSION}
 PKGNAME=		ja-samba-${SAMBA_BASE_VERSION}.${SAMBA_JA_VERSION}
@@ -111,8 +111,6 @@ RCD_SCRIPTS=		samba nmbd smbd
 OWN_DIRS=		${SAMBA_ETCDIR} ${SAMBA_LOCKDIR}
 OWN_DIRS_PERMS=		${SAMBA_PRIVATE} ${ROOT_USER} ${ROOT_GROUP} 0500
 
-INSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL
-
 # Remove irrelevant files for this package.
 post-extract:
 	${FIND} ${WRKDIR}/${DISTNAME} -name ".cvsignore" -print |	\
diff --git a/net/samba/Makefile b/net/samba/Makefile
index ff7127755e7..5c721c2d3fd 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2002/08/25 21:50:10 jlam Exp $
+# $NetBSD: Makefile,v 1.88 2002/09/18 21:15:15 jlam Exp $
 
 .include "Makefile.common"
 
@@ -53,8 +53,6 @@ RCD_SCRIPTS=		samba nmbd smbd
 OWN_DIRS=		${SAMBA_ETCDIR} ${SAMBA_LOCKDIR}
 OWN_DIRS_PERMS=		${SAMBA_PRIVATE} ${ROOT_USER} ${ROOT_GROUP} 0500
 
-INSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL
-
 # Remove irrelevant files for this package.
 post-extract:
 	${FIND} ${WRKDIR}/${DISTNAME} -name ".cvsignore" -print |	\
diff --git a/net/samba20/Makefile b/net/samba20/Makefile
index f52d13795ff..70987a6af4f 100644
--- a/net/samba20/Makefile
+++ b/net/samba20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/08/25 21:50:14 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/09/18 21:15:16 jlam Exp $
 
 DISTNAME=		samba-2.0.10
 WRKSRC=			${WRKDIR}/${DISTNAME}/source
@@ -66,8 +66,6 @@ RCD_SCRIPTS=		samba nmbd smbd
 MAKE_DIRS=		${SAMBA_LOCKDIR}
 OWN_DIRS=		${SAMBA_ETCDIR} ${SAMBA_PRIVATE}
 
-INSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL
-
 pre-install:
 	for script in ${RCD_SCRIPTS}; do				\
 		${SED} ${FILES_SUBST_SED} ${FILESDIR}/$${script}.sh	\