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>.

13 files changed, 31 insertions, 33 deletions

diff --git a/security/PAM/Makefile b/security/PAM/Makefile
index 199e4b0389a..59ca046b3a9 100644
--- a/security/PAM/Makefile
+++ b/security/PAM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/12/23 21:23:56 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2003/01/28 22:04:03 jlam Exp $
 #
 
 DISTNAME=	Linux-${PKGNAME}
@@ -12,6 +12,7 @@ HOMEPAGE=	http://www.kernel.org/pub/linux/libs/pam/
 COMMENT=	Pluggable Authentication Modules
 
 USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
 USE_GMAKE=		yes
 USE_DB185=		yes
 
@@ -55,5 +56,4 @@ post-install:
 
 .include "../../databases/db/buildlink2.mk"
 .include "../../security/libcrack/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 417ed99ef88..bb008470eb5 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2002/12/16 10:55:03 martti Exp $
+# $NetBSD: Makefile,v 1.38 2003/01/28 22:04:04 jlam Exp $
 
 DISTNAME=		cyrus-sasl-1.5.27
 SVR4_PKGNAME=		csasl
@@ -12,6 +12,7 @@ HOMEPAGE=		http://asg.web.cmu.edu/sasl/
 COMMENT=		Simple Authentication and Security Layer
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
@@ -85,6 +86,4 @@ post-install:
 	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.txt ${HTMLDIR}
 
 .include "../../security/openssl/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 2e91254a548..b4d48e69d7a 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/12/11 23:48:58 chris Exp $
+# $NetBSD: Makefile,v 1.8 2003/01/28 22:04:04 jlam Exp $
 
 DISTNAME=		cyrus-sasl-2.1.10
 SVR4_PKGNAME=		csasl
@@ -11,6 +11,7 @@ HOMEPAGE=		http://asg.web.cmu.edu/sasl/
 COMMENT=		Simple Authentication and Security Layer
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/config/ltconfig
@@ -97,5 +98,4 @@ post-install:
 	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.txt ${HTMLDIR}
 
 .include "../../security/openssl/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/isakmpd/Makefile b/security/isakmpd/Makefile
index 096376f3be6..1dcbeec7ae7 100644
--- a/security/isakmpd/Makefile
+++ b/security/isakmpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2002/12/07 02:39:03 schmonz Exp $
+# $NetBSD: Makefile,v 1.25 2003/01/28 22:04:05 jlam Exp $
 #
 
 DISTNAME=		isakmpd-20021118
@@ -15,6 +15,7 @@ PKG_FAIL_REASON+=	"${PKGNAME} requires ipsec-ready ${OPSYS}"
 
 ALL_TARGET=		depend all
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 
 WRKSRC=			${WRKDIR}/isakmpd
 
@@ -41,5 +42,4 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/isakmpd.sh ${PREFIX}/etc/rc.d/isakmpd
 
 .include "../../security/openssl/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/mirrordir/Makefile b/security/mirrordir/Makefile
index 7a91ba85904..f952db943de 100644
--- a/security/mirrordir/Makefile
+++ b/security/mirrordir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/12/19 14:44:07 agc Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/28 22:04:05 jlam Exp $
 #
 
 DISTNAME=	mirrordir-0.10.49
@@ -9,6 +9,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://mirrordir.sourceforge.net/
 COMMENT=	directory mirroring tool
 
+USE_PKGINSTALL=	yes
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
@@ -17,5 +18,4 @@ EGDIR=		${PREFIX}/share/examples/mirrordir
 
 CONF_FILES=     ${EGDIR}/secure-mcservusers ${PKG_SYSCONFDIR}/secure-mcservusers
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 908e1267854..60b8b6fa183 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2003/01/23 00:00:17 seb Exp $
+# $NetBSD: Makefile,v 1.94 2003/01/28 22:04:06 jlam Exp $
 
 DISTNAME=		openssh-3.5p1
 PKGNAME=		openssh-3.5.0.1
@@ -47,6 +47,7 @@ PLIST_SUBST+=		MANDIR=${MANDIR}
 PLIST_SUBST+=		RCD_SCRIPTS_EGDIR=${RCD_SCRIPTS_EGDIR}
 
 USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/${MANDIR}
@@ -143,5 +144,4 @@ post-install:
 .include "../../security/openssl/buildlink2.mk"
 .include "../../security/tcp_wrappers/buildlink2.mk"
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index b6d3999662a..9e53d5c7b3c 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2003/01/23 02:23:21 grant Exp $
+# $NetBSD: Makefile,v 1.65 2003/01/28 22:04:07 jlam Exp $
 
 DISTNAME=		openssl-0.9.6g
 SVR4_PKGNAME=		ossl
@@ -20,6 +20,7 @@ CRYPTO=			YES
 LICENCE=		fee-based-commercial-use
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 CONFIGURE_SCRIPT=	config
 CONFIGURE_ARGS=		shared --openssldir=${PKG_SYSCONFDIR} --prefix=${PREFIX}
 CONFIGURE_ENV=		CC="${CC}" PERL="${PERL5}"
@@ -87,5 +88,4 @@ CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS+=	solaris-${SPARC_TARGET_ARCH}-${CC:C|.*/||}
 .endif
 
-.include  "../../mk/bsd.pkg.install.mk"
 .include  "../../mk/bsd.pkg.mk"
diff --git a/security/pks/Makefile b/security/pks/Makefile
index 51aa2afc0c1..1b74d40e53b 100644
--- a/security/pks/Makefile
+++ b/security/pks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/09/19 09:04:25 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/28 22:04:07 jlam Exp $
 
 DISTNAME=		pks-0.9.4
 CATEGORIES=		security www
@@ -16,6 +16,7 @@ HOMEPAGE=		http://www.mit.edu/people/marc/pks/
 COMMENT=		PGP Public Key Server
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/pks
 CONFIGURE_ARGS+=	--localstatedir=/var/pks
@@ -32,6 +33,4 @@ RCD_SCRIPTS=	pksd
 OWN_DIRS=	/var/pks /var/pks/db /var/pks/incoming
 
 .include "../../databases/db/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile
index 9b892caec60..382c996662d 100644
--- a/security/ssh2/Makefile
+++ b/security/ssh2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/01/12 15:15:51 seb Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/28 22:04:08 jlam Exp $
 #
 
 DISTNAME=	ssh-3.2.2
@@ -13,6 +13,7 @@ COMMENT=	Secure Shell client and server for V.2 SSH protocol
 CONFLICTS=	openssh-[0-9]* ssh6-[0-9]* ssh-[0-9]* sftp-[0-9]*
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 USE_X11=		YES
 GNU_CONFIGURE=		YES
 
@@ -80,5 +81,4 @@ post-install:
 .endfor
 
 .include "../../security/tcp_wrappers/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 56c55c9366b..44b3cc357aa 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2002/12/25 12:26:46 grant Exp $
+# $NetBSD: Makefile,v 1.53 2003/01/28 22:04:08 jlam Exp $
 #
 
 DISTNAME=		sudo-1.6.6
@@ -14,8 +14,9 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.courtesan.com/sudo/
 COMMENT=		Allow others to run commands as root
 
-USE_BUILDLINK2=		# defined
-GNU_CONFIGURE=		# defined
+USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
+GNU_CONFIGURE=		yes
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -49,5 +50,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/sudoers ${EGDIR}/sudoers
 	${INSTALL_DATA} ${WRKSRC}/sample.sudoers ${EGDIR}/sudoers.sample
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/uvscan/Makefile b/security/uvscan/Makefile
index 401a962d3ab..571a46bda82 100644
--- a/security/uvscan/Makefile
+++ b/security/uvscan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/09/18 21:15:18 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2003/01/28 22:04:08 jlam Exp $
 
 DISTNAME=		vlnx416e
 PKGNAME=		uvscan-4.16.0
@@ -31,6 +31,7 @@ DATDIR=			${PREFIX}/share/uvscan
 UVSCANDIR=		${PREFIX}/libexec/uvscan
 DATFILES=		clean.dat internet.dat names.dat scan.dat readme.txt
 
+USE_PKGINSTALL=		yes
 FILES_SUBST+=		UVSCANDIR=${UVSCANDIR:Q}
 FILES_SUBST+=		DATFILES=${DATFILES:Q}
 
@@ -74,5 +75,4 @@ do-install:
 		${INSTALL_DATA} ${WRKSRC}/$${file} ${DOCDIR};		\
 	done
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../emulators/suse_linux/Makefile.application"
diff --git a/security/winbind/Makefile b/security/winbind/Makefile
index 017cee8f250..6088030c45e 100644
--- a/security/winbind/Makefile
+++ b/security/winbind/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2002/10/09 21:52:36 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/28 22:04:09 jlam Exp $
 
 PKGNAME=		winbind-${SAMBA_DIST_VERS}
 CATEGORIES=		security
 
-USE_BUILDLINK2=	# defined
+USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
 
 .include "../../net/samba/Makefile.common"
 
@@ -38,5 +39,4 @@ do-install:
 .include "../../security/PAM/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/xdm-krb4/Makefile b/security/xdm-krb4/Makefile
index aa0f1b476cc..67e9f14df6a 100644
--- a/security/xdm-krb4/Makefile
+++ b/security/xdm-krb4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/09/26 23:59:00 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2003/01/28 22:04:09 jlam Exp $
 #
 
 DISTNAME=		xdm-krb4-3.3.6.3
@@ -8,8 +8,9 @@ MASTER_SITES=		ftp://gutemine.geo.Uni-Koeln.DE/pub/xdm-krb4/
 MAINTAINER=		wennmach@netbsd.org
 COMMENT=		Kerberos IV and AFS aware xdm
 
-USE_BUILDLINK2=		# defined
-USE_IMAKE=		# defined
+USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
+USE_IMAKE=		yes
 
 .if exists(/usr/lib/libroken.a)
 KRB4_INCLUDE=	-I/usr/include/kerberosIV
@@ -41,5 +42,4 @@ post-patch:
 pre-install:
 	${INSTALL_DATA_DIR} ${EXAMPLEDIR}
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"