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

8 files changed, 18 insertions, 16 deletions

diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index e1ee0fe76e9..b3a013186ba 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/10/26 18:45:28 grant Exp $
+# $NetBSD: Makefile,v 1.13 2003/01/28 22:03:10 jlam Exp $
 
 DISTNAME=	freetds-0.60
 CATEGORIES=	databases
@@ -10,6 +10,7 @@ HOMEPAGE=	http://www.freetds.org/
 COMMENT=	LGPL'd implementation of Sybase's db-lib/ct-lib/ODBC libs
 
 USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
 USE_GMAKE=		yes
 
 GNU_CONFIGURE=		yes
@@ -31,5 +32,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/locales.conf ${EGDIR}
 
 .include "../../converters/libiconv/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/geneweb/Makefile b/databases/geneweb/Makefile
index bec75d1951e..5a6db68fc08 100644
--- a/databases/geneweb/Makefile
+++ b/databases/geneweb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/01/24 04:05:22 grant Exp $
+# $NetBSD: Makefile,v 1.13 2003/01/28 22:03:10 jlam Exp $
 #
 
 DISTNAME=	geneweb-4.09
@@ -11,6 +11,7 @@ COMMENT=	GeneWeb is a comprehensive genealogy database application
 
 DEPENDS+=	ocaml>=3.04:../../lang/ocaml
 
+USE_PKGINSTALL=	yes
 USE_GMAKE=	yes
 
 RCD_SCRIPTS=	geneweb
@@ -65,5 +66,4 @@ do-install:
 		${CHMOD} 600 ${PREFIX}/share/geneweb/gwtp_tmp/gwtp.log
 		${CHOWN} -R nobody.${ROOT_GROUP} ${PREFIX}/share/geneweb
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/gnome-mime-data/Makefile b/databases/gnome-mime-data/Makefile
index 64a4b45b0bd..8ec0d16326c 100644
--- a/databases/gnome-mime-data/Makefile
+++ b/databases/gnome-mime-data/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/01/02 03:21:34 rh Exp $
+# $NetBSD: Makefile,v 1.7 2003/01/28 22:03:11 jlam Exp $
 #
 
 DISTNAME=		gnome-mime-data-2.0.1
@@ -16,6 +16,7 @@ BUILD_USES_MSGFMT=	YES
 CONFLICTS=		gnome-vfs<=1.0.3
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_PERL5=		build
 GNU_CONFIGURE=		YES
@@ -27,5 +28,5 @@ CONF_FILES=		${EGDIR}/gnome-vfs-mime-magic ${PKG_SYSCONFDIR}/gnome-vfs-mime-magi
 
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../lang/perl5/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/libgda/Makefile.common b/databases/libgda/Makefile.common
index 3801475eafc..3819548b3e2 100644
--- a/databases/libgda/Makefile.common
+++ b/databases/libgda/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2002/12/26 18:56:05 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.5 2003/01/28 22:03:12 jlam Exp $
 #
 
 DISTNAME?=		libgda-0.8.199
@@ -14,6 +14,7 @@ USE_X11=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 
@@ -32,4 +33,3 @@ CONF_FILES+=		${EGDIR}/config ${PKG_SYSCONFDIR}/config
 .include "../../lang/python22/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
 .include "../../devel/popt/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile
index b87d4930066..c6becc99f72 100644
--- a/databases/mysql-server/Makefile
+++ b/databases/mysql-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2003/01/21 08:13:18 lukem Exp $
+# $NetBSD: Makefile,v 1.35 2003/01/28 22:03:12 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
 PKGREVISION=		3
@@ -10,6 +10,7 @@ COMMENT=		MySQL, a free SQL database (server)
 CONFIGURE_ARGS+=	--with-libwrap
 CONFIGURE_ARGS+=	--without-berkeley-db
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 USE_GMAKE=		YES
 
 
@@ -66,5 +67,5 @@ post-install:
 
 .include "../../databases/mysql-client/buildlink2.mk"
 .include "../../security/tcp_wrappers/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index 18906d136e7..929170517fc 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2003/01/19 09:26:33 skrll Exp $
+# $NetBSD: Makefile,v 1.51 2003/01/28 22:03:12 jlam Exp $
 
 DISTNAME=	openldap-2.0.27
 PKGREVISION=	1
@@ -14,6 +14,7 @@ COMMENT=	Lightweight directory access protocol server and client package
 CONFLICTS+=	ldapsdk-[0-9]*
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/build/ltconfig
 
@@ -107,5 +108,4 @@ CONFIGURE_ARGS+=	--with-threads
 PLIST_SRC=		${.CURDIR}/PLIST.slurpd ${.CURDIR}/PLIST
 .endif
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile
index 8e2a133eeda..d4c6295849f 100644
--- a/databases/postgresql-server/Makefile
+++ b/databases/postgresql-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2003/01/20 22:39:27 lukem Exp $
+# $NetBSD: Makefile,v 1.29 2003/01/28 22:03:13 jlam Exp $
 
 PKGNAME=		postgresql-server-${BASE_VERS}
 PKGREVISION=		1
@@ -11,6 +11,7 @@ NOT_FOR_PLATFORM=	*-*-mips
 
 .include "../postgresql/Makefile.common"
 
+USE_PKGINSTALL=		yes
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
 BUILD_DIRS=		${WRKSRC}/src/backend
 BUILD_DIRS+=		${WRKSRC}/src/backend/utils/mb/conversion_procs
@@ -65,5 +66,4 @@ post-install:
 		`${SED} -e "s|^#.*||" ${FILESDIR}/man.server`
 
 .include "../postgresql-lib/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/unixodbc/Makefile b/databases/unixodbc/Makefile
index 3c1ee8a0e3b..37e7f96d994 100644
--- a/databases/unixodbc/Makefile
+++ b/databases/unixodbc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/09/20 21:26:30 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/01/28 22:03:13 jlam Exp $
 
 PKGNAME=		unixodbc-${ODBC_BASE_VERS}
 PKGREVISION=		1
@@ -8,6 +8,7 @@ CONFLICTS+=		iodbc-[0-9]*
 
 .include "../../databases/unixodbc/Makefile.common"
 
+USE_PKGINSTALL=		yes
 CONFIGURE_ARGS+=	--disable-gui
 
 PLIST_SUBST+=		UNIXODBC_DRIVERS_DIR=${UNIXODBC_DRIVERS_DIR}
@@ -30,5 +31,4 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/odbcinst.ini ${EGDIR}/odbcinst.ini
 
 .include "../../devel/readline/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"