From c10f61bf50101ee934226b41e6431b1b9b1f927d Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sat, 30 Aug 2003 22:51:11 +0000
Subject: 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.

---
 emulators/compat12/Makefile          | 4 +++-
 emulators/compat13/Makefile          | 4 +++-
 emulators/compat14-crypto/Makefile   | 4 +++-
 emulators/compat14/Makefile          | 4 +++-
 emulators/netbsd32_compat14/Makefile | 4 +++-
 emulators/netbsd32_compat15/Makefile | 4 +++-
 emulators/netbsd32_compat16/Makefile | 4 +++-
 7 files changed, 21 insertions(+), 7 deletions(-)

(limited to 'emulators')

diff --git a/emulators/compat12/Makefile b/emulators/compat12/Makefile
index 9a5de26e5bc..53522d811e8 100644
--- a/emulators/compat12/Makefile
+++ b/emulators/compat12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/08/30 18:53:07 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2003/08/30 22:51:15 jlam Exp $
 #
 
 DISTNAME=		compat12-${MACHINE_ARCH}
@@ -17,6 +17,8 @@ NO_BUILD=		# defined
 NO_MTREE=		# defined
 SHLIB_HANDLING=		NO
 USE_PKGINSTALL=		YES
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
 FILES_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR}
 FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH}
diff --git a/emulators/compat13/Makefile b/emulators/compat13/Makefile
index b1491833ff8..dc01152623c 100644
--- a/emulators/compat13/Makefile
+++ b/emulators/compat13/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/08/30 18:57:03 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2003/08/30 22:51:15 jlam Exp $
 #
 
 DISTNAME=		compat13-${MACHINE_ARCH}${PKGMINOR}
@@ -19,6 +19,8 @@ NO_MTREE=		# defined
 NO_BUILD=		# defined
 SHLIB_HANDLING=		NO
 USE_PKGINSTALL=		YES
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
 FILES_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR}
 FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH}
diff --git a/emulators/compat14-crypto/Makefile b/emulators/compat14-crypto/Makefile
index a83428353b7..d94e659595f 100644
--- a/emulators/compat14-crypto/Makefile
+++ b/emulators/compat14-crypto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/08/30 19:00:03 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/08/30 22:51:16 jlam Exp $
 #
 
 DISTNAME=		compat14-crypto-${MACHINE_ARCH}-${VERSION}
@@ -23,6 +23,8 @@ NO_MTREE=		# defined
 NO_BUILD=		# defined
 SHLIB_HANDLING=		NO
 USE_PKGINSTALL=		YES
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
 FILES_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR}
 FILES_SUBST+=		COMPAT_XLIBDIR=${COMPAT_XLIBDIR}
diff --git a/emulators/compat14/Makefile b/emulators/compat14/Makefile
index 2993d101581..3690d415e5c 100644
--- a/emulators/compat14/Makefile
+++ b/emulators/compat14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/08/30 19:02:33 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2003/08/30 22:51:16 jlam Exp $
 #
 
 DISTNAME=		compat14-${MACHINE_ARCH}-${VERSION}
@@ -21,6 +21,8 @@ NO_MTREE=		# defined
 NO_BUILD=		# defined
 SHLIB_HANDLING=		NO
 USE_PKGINSTALL=		YES
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
 FILES_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR}
 FILES_SUBST+=		COMPAT_XLIBDIR=${COMPAT_XLIBDIR}
diff --git a/emulators/netbsd32_compat14/Makefile b/emulators/netbsd32_compat14/Makefile
index ad00dd97fd2..0581129b985 100644
--- a/emulators/netbsd32_compat14/Makefile
+++ b/emulators/netbsd32_compat14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/08/30 19:07:10 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2003/08/30 22:51:16 jlam Exp $
 #
 
 DISTNAME=		compat14-${MACHINE32_ARCH}-${VERSION}
@@ -25,6 +25,8 @@ NO_MTREE=		# defined
 NO_BUILD=		# defined
 SHLIB_HANDLING=		NO
 USE_PKGINSTALL=		YES
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
 FILES_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR}
 FILES_SUBST+=		COMPAT_XLIBDIR=${COMPAT_XLIBDIR}
diff --git a/emulators/netbsd32_compat15/Makefile b/emulators/netbsd32_compat15/Makefile
index aba7d946e19..d7d87122827 100644
--- a/emulators/netbsd32_compat15/Makefile
+++ b/emulators/netbsd32_compat15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/08/30 19:09:38 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/08/30 22:51:17 jlam Exp $
 #
 
 .if ${MACHINE_ARCH} == "sparc64"
@@ -24,6 +24,8 @@ NO_MTREE=		# defined
 NO_BUILD=		# defined
 SHLIB_HANDLING=		NO
 USE_PKGINSTALL=		YES
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
 FILES_SUBST+=		COMPAT_LIBEXECDIR=${COMPAT_LIBEXECDIR}
 FILES_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR}
diff --git a/emulators/netbsd32_compat16/Makefile b/emulators/netbsd32_compat16/Makefile
index c49f343bebd..cf4cf9442ce 100644
--- a/emulators/netbsd32_compat16/Makefile
+++ b/emulators/netbsd32_compat16/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/08/30 19:11:58 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/08/30 22:51:17 jlam Exp $
 #
 
 .if ${MACHINE_ARCH} == "sparc64"
@@ -25,6 +25,8 @@ NO_MTREE=		# defined
 NO_BUILD=		# defined
 SHLIB_HANDLING=		NO
 USE_PKGINSTALL= 	YES
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
 FILES_SUBST+=		COMPAT_EMULSUBDIR=${COMPAT_EMULSUBDIR}
 FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH}
-- 
cgit v1.2.3