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

6 files changed, 15 insertions, 14 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 61620f2fc79..80e67b9f11d 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2003/01/10 17:26:55 jmmv Exp $
+# $NetBSD: Makefile,v 1.36 2003/01/28 22:04:34 jlam Exp $
 
 DISTNAME=	gdm-2.2.0
 PKGREVISION=	2
@@ -14,6 +14,7 @@ COMMENT=	Gnome Display Manager - a re-implementation of the xdm program
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 USE_X11BASE=		YES
@@ -115,5 +116,5 @@ post-install:
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/libglade/buildlink2.mk"
 .include "../../x11/gnome-libs/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 16970f05c7f..118014123cb 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/01/04 20:01:18 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2003/01/28 22:04:34 jlam Exp $
 #
 
 DISTNAME=		gtk+-2.2.0
@@ -16,6 +16,7 @@ COMMENT=		Gimp toolkit. Libraries for building X11 user interfaces
 
 BUILD_USES_MSGFMT=	yes
 USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 USE_GMAKE=		yes
@@ -58,5 +59,4 @@ post-install:
 .include "../../graphics/png/buildlink2.mk"
 .include "../../graphics/tiff/buildlink2.mk"
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 31e52048846..071f180b4d2 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/01/20 10:04:02 skrll Exp $
+# $NetBSD: Makefile,v 1.16 2003/01/28 22:04:35 jlam Exp $
 
 DISTNAME=	kdebase-3.0.5a
 PKGREVISION=	2
@@ -12,6 +12,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} Daemon.png Daemon.README
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 
 CONFIGURE_ARGS+=	--with-ssl-dir="${BUILDLINK_PREFIX.openssl}"
 CONFIGURE_ARGS+=	--with-ldap="${BUILDLINK_PREFIX.openldap}"
@@ -138,5 +139,4 @@ post-install:
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdelibs3/buildlink2.mk"
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kterm/Makefile b/x11/kterm/Makefile
index 1556fd01c3e..668e9a8caf2 100644
--- a/x11/kterm/Makefile
+++ b/x11/kterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/10/08 13:22:20 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2003/01/28 22:04:36 jlam Exp $
 
 DISTNAME=	kterm-6.2.0
 CATEGORIES=	x11
@@ -13,6 +13,7 @@ MAINTAINER=	sakamoto@netbsd.org
 COMMENT=	Multi-lingual terminal emulator for X
 
 USE_BUILDLINK2=	YES
+USE_PKGINSTALL=	YES
 USE_IMAKE=	YES
 
 _SETUID_ROOT=	${ROOT_USER} ${ROOT_GROUP} 4711
@@ -42,5 +43,4 @@ post-patch:
 .endif
 
 .include "../../mk/xaw.buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile
index b26c970554c..c4a1ca51b01 100644
--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/08/25 18:40:39 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2003/01/28 22:04:36 jlam Exp $
 # FreeBSD: /c/ncvs/ports/x11-toolkits/open-motif/Makefile,v 1.18 2000/10/09 01:40:02 asami Exp 
 # OpenBSD: Makefile,v 1.5 2000/10/23 16:08:12 espie Exp 
 
@@ -24,8 +24,9 @@ CONFLICTS+=		lesstif-[0-9]*
 
 DIST_SUBDIR=		openmotif
 WRKSRC=			${WRKDIR}/motif
-USE_X11BASE=		# defined
-USE_BUILDLINK2=		# defined
+USE_X11BASE=		yes
+USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
 ALL_TARGET=		World
 
 DEINSTALL_TMPL=		${.CURDIR}/DEINSTALL
@@ -105,5 +106,4 @@ post-install:
 		${INSTALL_MAN} $${file} ${PREFIX}/man/$${file};		\
         done
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfstt/Makefile b/x11/xfstt/Makefile
index c0d4bdc7ec3..a973008303c 100644
--- a/x11/xfstt/Makefile
+++ b/x11/xfstt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/09/29 12:58:37 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/28 22:04:36 jlam Exp $
 #
 
 DISTNAME=		xfstt_1.3
@@ -14,6 +14,7 @@ COMMENT=		TrueType font server for X11
 CXXFLAGS+=		-fomit-frame-pointer -ffast-math
 MAKE_ENV+=		CXXFLAGS="${CXXFLAGS}"
 
+USE_PKGINSTALL=		YES
 USE_X11BASE=		YES
 USE_GMAKE=		YES
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
@@ -41,5 +42,4 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fonts/TrueType
 	${ECHO} belongs to xfstt pkg >${PREFIX}/lib/X11/fonts/TrueType/.keepme
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"