Instead of including bsd.pkg.install.mk directly in a package Makefile,

have it be automatically included by bsd.pkg.mk if USE_PKGINSTALL is set
to "YES".  This enforces the requirement that bsd.pkg.install.mk be
included at the end of a package Makefile.  Idea suggested by Julio M.
Merino Vidal <jmmv at menta.net>.

11 files changed, 24 insertions, 24 deletions

diff --git a/shells/ast-ksh/Makefile b/shells/ast-ksh/Makefile
index c045487fc17..9dce1d62781 100644
--- a/shells/ast-ksh/Makefile
+++ b/shells/ast-ksh/Makefile
@@ -1,5 +1,5 @@
 # $OpenBSD: Makefile,v 1.5 2001/11/21 01:17:43 naddy Exp $
-# $NetBSD: Makefile,v 1.5 2003/01/08 07:04:13 uebayasi Exp $
+# $NetBSD: Makefile,v 1.6 2003/01/28 22:04:10 jlam Exp $
 
 DISTNAME=	ast-ksh-${ASTKSH_VERSION}
 PKGNAME=	ast-ksh-${ASTKSH_VERSION:S/-//g}
@@ -23,6 +23,7 @@ ONLY_FOR_PLATFORM=	NetBSD-*
 ASTKSH_VERSION=	2002-12-21
 
 USE_BUILDLINK2=	YES
+USE_PKGINSTALL=	YES
 WRKSRC=		${WRKDIR}
 MAKE_FLAGS=	CC="${CC}" CCFLAGS="${CFLAGS}"
 
@@ -55,5 +56,4 @@ do-test:
 #	@cd ${WRKSRC}; \
 #		${SETENV} SHELL=${PDKSH} ${PDKSH} ./bin/package test
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index a9b5bcc6be8..71d0a381a46 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2002/12/22 19:04:08 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2003/01/28 22:04:10 jlam Exp $
 #
 
 DISTNAME=	bash-2.05b
@@ -11,8 +11,9 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/bash/bash.html
 COMMENT=	The GNU Bourne Again Shell
 
-USE_BUILDLINK2=		# defined
-GNU_CONFIGURE=		# defined
+USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
+GNU_CONFIGURE=		yes
 MAKE_ENV+=		INSTALL_SCRIPT='${INSTALL_SCRIPT}'
 
 PKG_SHELL=		${PREFIX}/bin/bash
@@ -30,5 +31,4 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/bashbug.1 ${PREFIX}/man/man1
 
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/es/Makefile b/shells/es/Makefile
index 3b5f439e88c..aa578a12dac 100644
--- a/shells/es/Makefile
+++ b/shells/es/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/11/17 09:02:00 salo Exp $
+# $NetBSD: Makefile,v 1.10 2003/01/28 22:04:10 jlam Exp $
 # FreeBSD Id: Makefile,v 1.4 1996/11/18 11:39:46 asami Exp
 #
 
@@ -13,7 +13,7 @@ COMMENT=	Extensible shell, derived from plan9's rc
 
 MANCOMPRESSED=	yes
 
+USE_PKGINSTALL=	yes
 PKG_SHELL=	${PREFIX}/bin/es
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/esh/Makefile b/shells/esh/Makefile
index 2ead43facf1..86ad37dab54 100644
--- a/shells/esh/Makefile
+++ b/shells/esh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/11/17 09:02:00 salo Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/28 22:04:11 jlam Exp $
 
 DISTNAME=		esh-0.8
 CATEGORIES=		shells
@@ -10,6 +10,7 @@ COMMENT=		Unix shell with Lisp-like syntax
 WRKSRC=			${WRKDIR}/esh
 INFO_FILES=		esh.info
 
+USE_PKGINSTALL=		yes
 PKG_SHELL=		${PREFIX}/bin/esh
 
 do-install:
@@ -26,5 +27,4 @@ do-install:
 		${PREFIX}/share/doc/esh/
 
 .include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/osh/Makefile b/shells/osh/Makefile
index 58075ebe5de..ac0d4524585 100644
--- a/shells/osh/Makefile
+++ b/shells/osh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/11/17 09:02:01 salo Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/28 22:04:11 jlam Exp $
 # FreeBSD Id: ports/shells/osh/Makefile,v 1.3 2002/01/29 11:58:43 knu Exp
 
 DISTNAME=	osh-020214
@@ -10,7 +10,7 @@ COMMENT=	Implementation of the UNIX 6th Edition shell
 
 MAKEFILE=	makefile
 
+USE_PKGINSTALL=	yes
 PKG_SHELL=	${PREFIX}/bin/osh
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/pdksh/Makefile b/shells/pdksh/Makefile
index 1dcc0938e67..0d6ac09c08c 100644
--- a/shells/pdksh/Makefile
+++ b/shells/pdksh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/11/28 07:42:05 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/28 22:04:12 jlam Exp $
 #
 
 DISTNAME=	pdksh-5.2.14
@@ -16,9 +16,9 @@ USE_BUILDLINK2=	no
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=pd
 
+USE_PKGINSTALL=	yes
 PKG_SHELL=	${PREFIX}/bin/pdksh
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
 
 LDFLAGS=	# empty
diff --git a/shells/rc/Makefile b/shells/rc/Makefile
index 95de4cf25db..9567a026eda 100644
--- a/shells/rc/Makefile
+++ b/shells/rc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/11/17 09:02:01 salo Exp $
+# $NetBSD: Makefile,v 1.14 2003/01/28 22:04:12 jlam Exp $
 # FreeBSD Id: Makefile,v 1.3 1996/11/12 02:19:38 obrien Exp
 #
 
@@ -13,7 +13,7 @@ COMMENT=	Unix incarnation of the plan9 shell
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-history
 
+USE_PKGINSTALL=	yes
 PKG_SHELL=	${PREFIX}/bin/rc
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/scsh/Makefile b/shells/scsh/Makefile
index 1b3c0b318ed..60261a6044a 100644
--- a/shells/scsh/Makefile
+++ b/shells/scsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/01/19 09:12:06 salo Exp $
+# $NetBSD: Makefile,v 1.20 2003/01/28 22:04:12 jlam Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/07/15 15:00:30 cracauer Exp 
 #
 
@@ -16,6 +16,7 @@ GNU_CONFIGURE=		yes
 
 ALL_TARGET=		enough
 
+USE_PKGINSTALL=		yes
 PKG_SHELL=		${PREFIX}/bin/scsh
 
 post-configure:
@@ -28,5 +29,4 @@ post-install:
 	${RM} -f ${PREFIX}/share/doc/scsh
 	${LN} -fs ${PREFIX}/lib/scsh/doc ${PREFIX}/share/doc/scsh
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index a79422cdcb8..a62f786ea13 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2002/11/17 09:02:01 salo Exp $
+# $NetBSD: Makefile,v 1.41 2003/01/28 22:04:13 jlam Exp $
 #
 
 DISTNAME=	tcsh-6.12.00
@@ -13,6 +13,7 @@ HOMEPAGE=	http://www.tcsh.org/
 COMMENT=	Extended C-shell with many useful features
 
 USE_BUILDLINK2=	yes
+USE_PKGINSTALL=	yes
 GNU_CONFIGURE=	yes
 ALL_TARGET=	all catalogs
 INSTALL_TARGET=	install install.man
@@ -75,5 +76,4 @@ post-install:
 	    done;						\
 	done
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 66096deb700..8201e5e42cc 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2002/11/17 09:02:02 salo Exp $
+# $NetBSD: Makefile,v 1.37 2003/01/28 22:04:13 jlam Exp $
 
 DISTNAME=       zsh-4.0.6
 CATEGORIES=	shells
@@ -14,6 +14,7 @@ HOMEPAGE=	http://sunsite.dk/zsh/
 COMMENT=	The Z shell
 
 USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 INFO_FILES=		zsh.info
 TEXINFO_OVERRIDE=	yes
@@ -43,5 +44,4 @@ post-install:
 		${PREFIX}/share/doc/zsh
 
 .include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/zsh3/Makefile b/shells/zsh3/Makefile
index c7e07046ec4..186e2fc7beb 100644
--- a/shells/zsh3/Makefile
+++ b/shells/zsh3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/12/23 13:03:39 seb Exp $
+# $NetBSD: Makefile,v 1.6 2003/01/28 22:04:14 jlam Exp $
 
 DISTNAME=       zsh-3.0.8
 CATEGORIES=	shells
@@ -16,6 +16,7 @@ GNU_CONFIGURE=	yes
 INFO_FILES=	zsh.info
 TEXINFO_OVERRIDE=	YES
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -25,6 +26,5 @@ LDFLAGS+=	-static
 
 PKG_SHELL=	${PREFIX}/bin/zsh
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"