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

9 files changed, 23 insertions, 21 deletions

diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile
index ebc258f4097..5d9507ef86d 100644
--- a/devel/bonobo-activation/Makefile
+++ b/devel/bonobo-activation/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/01/05 14:07:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2003/01/28 22:03:13 jlam Exp $
 #
 
 DISTNAME=		bonobo-activation-2.1.1
@@ -16,6 +16,7 @@ USE_X11=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_PERL5=		build
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
@@ -38,5 +39,5 @@ post-install:
 .include "../../devel/glib2/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../net/ORBit2/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cvs2p4/Makefile b/devel/cvs2p4/Makefile
index 1156f83e260..b7edc899dce 100644
--- a/devel/cvs2p4/Makefile
+++ b/devel/cvs2p4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/11/22 21:13:06 schmonz Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:14 jlam Exp $
 #
 
 DISTNAME=	cvs2p4-2.3.3
@@ -16,8 +16,9 @@ DEPENDS+=	p4d-[0-9]*:../../devel/p4d
 DEPENDS+=	rcs-[0-9]*:../../devel/rcs
 .endif
 
-USE_PERL5=	# defined
-NO_BUILD=	# defined
+USE_PKGINSTALL=	yes
+USE_PERL5=	yes
+NO_BUILD=	yes
 
 DOCDIR=		share/doc/${PKGBASE}
 EGDIR=		share/examples/${PKGBASE}
@@ -53,5 +54,4 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/test/config ${PREFIX}/${EGDIR}
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cvsgraph/Makefile b/devel/cvsgraph/Makefile
index 6d892607c0d..1122f226d06 100644
--- a/devel/cvsgraph/Makefile
+++ b/devel/cvsgraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/09/21 08:27:25 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/01/28 22:03:14 jlam Exp $
 #
 
 DISTNAME=	cvsgraph-1.2.0
@@ -11,6 +11,7 @@ HOMEPAGE=	http://www.akhphd.au.dk/~bertho/cvsgraph/
 COMMENT=	graphically represents CVS/RCS branches and file revisions
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 USE_X11=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
@@ -39,6 +40,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/cvsgraph.conf ${EGDIR}
 
 .include "../../graphics/gd/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/isect/Makefile b/devel/isect/Makefile
index fed4e9b09bf..5d0a291f0de 100644
--- a/devel/isect/Makefile
+++ b/devel/isect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/01/19 12:54:32 grant Exp $
+# $NetBSD: Makefile,v 1.15 2003/01/28 22:03:15 jlam Exp $
 #
 
 DISTNAME=	isect-1.6.2
@@ -11,6 +11,7 @@ COMMENT=	open source middleware daemon
 
 GNU_CONFIGURE=	yes
 USE_BUILDLINK2=	yes
+USE_PKGINSTALL=	yes
 USE_LIBTOOL=	yes
 LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
 PTHREAD_OPTS+=	require
@@ -32,5 +33,4 @@ post-install:
 .include "../../www/libwww/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/opencm/Makefile b/devel/opencm/Makefile
index 9a4f006e253..491d74d02c5 100644
--- a/devel/opencm/Makefile
+++ b/devel/opencm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/01/07 13:36:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2003/01/28 22:03:15 jlam Exp $
 #
 
 DISTNAME=	${OPENCM_VERSION}-1-src
@@ -13,6 +13,7 @@ HOMEPAGE=	http://www.opencm.org/
 COMMENT=	Secure, high-integrity replacement for CVS
 
 USE_BUILDLINK2=	YES
+USE_PKGINSTALL=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 
@@ -32,5 +33,4 @@ WRKSRC=		${WRKDIR}/${OPENCM_VERSION}/base
 .include "../../security/openssl/buildlink2.mk"
 
 .include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p4d/Makefile b/devel/p4d/Makefile
index 90d65fdc573..fa08f66b308 100644
--- a/devel/p4d/Makefile
+++ b/devel/p4d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/09/19 09:04:09 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:15 jlam Exp $
 #
 
 DISTNAME=	p4d
@@ -9,6 +9,8 @@ P4BINONLY=	# defined
 
 .include "../../devel/p4/Makefile.common"
 
+USE_PKGINSTALL=	yes
+
 FILES_SUBST+=	P4USER=${P4USER:Q}
 FILES_SUBST+=	P4ROOT=${P4ROOT:Q}
 FILES_SUBST+=	P4PORT=${P4PORT:Q}
@@ -30,5 +32,4 @@ P4JOURNAL?=	journal
 do-install:
 	${INSTALL_PROGRAM} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} ${PREFIX}/sbin
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index af97bf99744..cae6c053729 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/01/04 19:59:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2003/01/28 22:03:16 jlam Exp $
 #
 
 DISTNAME=		pango-1.2.0
@@ -13,6 +13,7 @@ HOMEPAGE=		http://www.pango.org
 COMMENT=		Library for layout and rendering of text
 
 USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
 USE_GMAKE=		yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
@@ -41,5 +42,4 @@ CONFIGURE_ARGS+=	--with-qt=no
 .include "../../fonts/Xft2/buildlink2.mk"
 .include "../../graphics/freetype2/buildlink2.mk"
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index 899c043d38d..208262bf5fe 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/12/08 01:30:23 salo Exp $
+# $NetBSD: Makefile,v 1.20 2003/01/28 22:03:16 jlam Exp $
 #
 
 DISTNAME=		pwlib_1.4.4
@@ -20,6 +20,7 @@ BUILD_DEPENDS=		bison-[0-9]*:../../devel/bison
 WRKSRC=			${WRKDIR}/pwlib
 
 USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
 USE_GMAKE=		yes
 USE_LIBTOOL=		yes
 
@@ -57,5 +58,4 @@ do-install:
 	done
 
 .include "../../mk/pthread.buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/rt-mysql/Makefile.common b/devel/rt-mysql/Makefile.common
index 71de9dd8aa3..9f699c569a1 100644
--- a/devel/rt-mysql/Makefile.common
+++ b/devel/rt-mysql/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2002/09/19 21:40:45 atatat Exp $
+# $NetBSD: Makefile.common,v 1.2 2003/01/28 22:03:16 jlam Exp $
 
 DISTNAME=      	rt-2-0-13
 CATEGORIES=	devel
@@ -24,6 +24,8 @@ RT_DB_PASS?=	changemeplease
 RT_WEB_USER?=	nobody
 RT_WEB_GROUP?=	nobody
 
+USE_PKGINSTALL=	yes
+
 PKGDIR=		${.CURDIR}/../../devel/rt-mysql
 DISTINFO_FILE=	${PKGDIR}/distinfo
 FILESDIR=	${PKGDIR}/files
@@ -122,5 +124,4 @@ pre-build:
 	${ECHO} '#define DATABASE_LIBRARY_PATH "${RT_DB_PATH}"' >> config.h; \
 	${ECHO} '#define RT_GROUP "${RT_GROUP}"' >> config.h )
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"