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

5 files changed, 12 insertions, 11 deletions

diff --git a/games/koth/Makefile b/games/koth/Makefile
index e4dee5cfeb9..cdc81426efc 100644
--- a/games/koth/Makefile
+++ b/games/koth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/01/04 12:25:13 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/01/28 22:03:19 jlam Exp $
 #
 
 DISTNAME=	koth-0.7.6
@@ -10,9 +10,10 @@ MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://www-unix.oit.umass.edu/~tetron/koth/
 COMMENT=	The classic "shoot the other tank" artillery game, networked
 
+USE_BUILDLINK2=	YES
+USE_PKGINSTALL=	YES
 GNU_CONFIGURE=	YES
 CPPFLAGS+=	-DPKG_SYSCONFDIR=\"\\\"${PKG_SYSCONFDIR:Q}\\\"\"
-USE_BUILDLINK2=	YES
 
 EGDIR=		${PREFIX}/share/examples/koth
 CONF_FILES=	${EGDIR}/koth.cfg ${PKG_SYSCONFDIR}/koth.cfg
@@ -25,5 +26,5 @@ post-install:
 
 .include "../../graphics/libggi/buildlink2.mk"
 .include "../../graphics/libgii/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/sarien/Makefile b/games/sarien/Makefile
index 5558679fce8..6edad510a9c 100644
--- a/games/sarien/Makefile
+++ b/games/sarien/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/10 16:16:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/28 22:03:20 jlam Exp $
 #
 
 DISTNAME=	sarien-0.7.0
@@ -11,6 +11,7 @@ COMMENT=	Adventure Game Interpreter (AGI) for Sierra On-Line Titles
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 USE_GMAKE=		YES
 
 CONFIGURE_ARGS=		--with-sdl
@@ -27,5 +28,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/etc/sarien.cfg ${EGDIR}/sarien.conf
 
 .include "../../devel/SDL/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xmris/Makefile b/games/xmris/Makefile
index e2fbfd72d49..618c1c8f075 100644
--- a/games/xmris/Makefile
+++ b/games/xmris/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/12/06 04:03:01 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/28 22:03:20 jlam Exp $
 
 DISTNAME=		xmris.4.04
 PKGNAME=		xmris-4.04
@@ -10,6 +10,7 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.cs.bris.ac.uk/~nathan/xmris/
 COMMENT=		Version of the Mr Do video arcade game for X
 
+USE_PKGINSTALL=		yes
 USE_IMAKE=		yes
 ALL_TARGET=		initialize xmris xmred
 NO_INSTALL_MANPAGES=	yes
@@ -21,5 +22,4 @@ post-install:
 	${LN} -fs xmris.6 ${PREFIX}/man/man6/xmsit.6
 	${INSTALL_MAN} ${WRKSRC}/xmred.man ${PREFIX}/man/man6/xmred.6
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xpat2/Makefile b/games/xpat2/Makefile
index bf4aea685e1..9aaa3f7a0ca 100644
--- a/games/xpat2/Makefile
+++ b/games/xpat2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/10/10 12:56:00 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2003/01/28 22:03:21 jlam Exp $
 # FreeBSD: ports/games/xpat2/Makefile,v 1.11 2000/04/14 12:27:59 asami Exp
 
 DISTNAME=	xpat2-1.06
@@ -9,6 +9,7 @@ MAINTAINER=	kuebart@mathematik.uni-ulm.de
 COMMENT=	X11 solitaire game with 14 variations
 
 USE_BUILDLINK2=	YES
+USE_PKGINSTALL=	YES
 USE_X11BASE=	YES
 
 # This package uses imake, but invokes it directly as part of the build
@@ -26,5 +27,4 @@ post-install:
 	${CHMOD} 2555 ${PREFIX}/bin/xpat2
 
 .include "../../graphics/xpm/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xsoldier/Makefile b/games/xsoldier/Makefile
index 81a146220a8..2df6df73bf1 100644
--- a/games/xsoldier/Makefile
+++ b/games/xsoldier/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/10/10 12:52:08 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2003/01/28 22:03:21 jlam Exp $
 #
 
 DISTNAME=		xsoldier-0.96
@@ -10,6 +10,7 @@ HOMEPAGE=		http://www.surfline.ne.jp/hachi/xsoldier.html
 COMMENT=		Updated xgalaga type game with awesome graphics
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 USE_IMAKE=		YES
 NO_INSTALL_MANPAGES=	YES
 
@@ -23,5 +24,4 @@ post-patch:
 	${TOUCH} ${WRKSRC}/xsoldier.man
 
 .include "../../graphics/xpm/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"