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

10 files changed, 44 insertions, 44 deletions

diff --git a/graphics/aview-x11/Makefile b/graphics/aview-x11/Makefile
index 2cb5ccc5920..e44cdc560b8 100644
--- a/graphics/aview-x11/Makefile
+++ b/graphics/aview-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/08/26 19:39:21 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/28 22:03:22 jlam Exp $
 #
 
 DISTNAME=	aview-1.3.0rc1
@@ -16,10 +16,11 @@ CONFLICTS+=	aview-[0-9]*
 WRKSRC=		${WRKDIR}/aview-1.3.0
 PLIST_SRC=	${WRKDIR}/PLIST
 
-GNU_CONFIGURE=	# defined
-USE_LIBTOOL=	# defined
-USE_BUILDLINK2=	# defined
-USE_X11=	# defined
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_BUILDLINK2=	yes
+USE_PKGINSTALL=	yes
+USE_X11=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -50,5 +51,4 @@ post-install:
 .include "../../graphics/aalib-x11/buildlink2.mk"
 .include "../../graphics/netpbm/buildlink2.mk"
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/aview/Makefile b/graphics/aview/Makefile
index ed72110737d..56c1581bc7b 100644
--- a/graphics/aview/Makefile
+++ b/graphics/aview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/08/26 19:39:21 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/01/28 22:03:22 jlam Exp $
 #
 
 DISTNAME=	aview-1.3.0rc1
@@ -16,9 +16,10 @@ CONFLICTS+=	aview-x11-[0-9]*
 WRKSRC=		${WRKDIR}/aview-1.3.0
 PLIST_SRC=	${WRKDIR}/PLIST
 
-GNU_CONFIGURE=	# defined
-USE_LIBTOOL=	# defined
-USE_BUILDLINK2=	# defined
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_BUILDLINK2=	yes
+USE_PKGINSTALL=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -49,5 +50,4 @@ post-install:
 .include "../../graphics/aalib/buildlink2.mk"
 .include "../../graphics/netpbm/buildlink2.mk"
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index c2e2fdeada4..1756fbbbe1b 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/01/02 14:20:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2003/01/28 22:03:23 jlam Exp $
 
 DISTNAME=		fnlib-0.5
 PKGREVISION=		2
@@ -8,11 +8,12 @@ MASTER_SITES=		ftp://ftp.enlightenment.org/pub/e/enlightenment/libs/
 MAINTAINER=		root@garbled.net
 COMMENT=		color font rendering library for X11R6
 
-USE_BUILDLINK2=		# defined
-USE_X11BASE=		# defined
-GNU_CONFIGURE=		# defined
+USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
+USE_X11BASE=		yes
+GNU_CONFIGURE=		yes
 
-USE_LIBTOOL=		# defined
+USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 CONFIGURE_ARGS+=	--sysconfdir="${PKG_SYSCONFDIR}"
@@ -24,5 +25,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/fontinfo.README ${PREFIX}/share/doc/fnlib
 
 .include "../../graphics/imlib/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimp-base/Makefile b/graphics/gimp-base/Makefile
index f69430248e1..d3a71fc03f0 100644
--- a/graphics/gimp-base/Makefile
+++ b/graphics/gimp-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/01/04 23:04:14 cjep Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/28 22:03:23 jlam Exp $
 
 DISTNAME=		gimp-1.2.3
 PKGNAME=		gimp-base-1.2.3
@@ -18,6 +18,7 @@ CONFLICTS+=		gimp<=1.2.3
 BUILD_USES_MSGFMT=	yes
 
 USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 USE_GMAKE=		yes
@@ -81,5 +82,4 @@ PLIST_SUBST+=	HELPBROWSER="@comment "
 .include "../../x11/gtk/buildlink2.mk"
 .endif
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index b106a0f50a9..b437e80ad1f 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2002/11/26 12:32:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.73 2003/01/28 22:03:24 jlam Exp $
 #
 
 DISTNAME=		imlib-1.9.14
@@ -20,6 +20,7 @@ USE_GMAKE=		yes
 UNLIMIT_RESOURCES=	datasize
 
 USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
 
 CPPFLAGS+=		-DENABLE_NLS
 CONFIGURE_ENV+=		ac_cv_path_CONVERT_PROG="${LOCALBASE}/bin/convert"
@@ -58,5 +59,4 @@ post-install:
 .include "../../graphics/tiff/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index 1bb6599f946..5f117cabe36 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/01/24 13:34:41 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2003/01/28 22:03:24 jlam Exp $
 #
 
 DISTNAME=	libggi-2.0b2.1
@@ -10,13 +10,14 @@ MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://www.ggi-project.org/
 COMMENT=	General Graphics Interface library is a flexible drawing library
 
-USE_BUILDLINK2=		# defined
-USE_X11=		# defined
+USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
+USE_X11=		yes
 
-USE_LIBTOOL=		# defined
+USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-GNU_CONFIGURE=		# defined
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-debug
 CONFIGURE_ARGS+=	--with-x
 CONFIGURE_ARGS+=	--sysconfdir="${PKG_SYSCONFDIR}"
@@ -39,5 +40,4 @@ post-configure:
 .include "../../devel/ncurses/buildlink2.mk"
 .include "../../graphics/libgii/buildlink2.mk"
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libgii/Makefile b/graphics/libgii/Makefile
index d7ff8b53e5f..cba4fadc394 100644
--- a/graphics/libgii/Makefile
+++ b/graphics/libgii/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/01/02 23:15:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/28 22:03:24 jlam Exp $
 #
 
 DISTNAME=	libgii-0.6
@@ -10,13 +10,14 @@ MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://www.ggi-project.org/
 COMMENT=	General Input Interface - API for all possible input sources
 
-USE_BUILDLINK2=		# defined
-USE_X11=		# defined
+USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
+USE_X11=		yes
 
-USE_LIBTOOL=		# defined
+USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-GNU_CONFIGURE=		# defined
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-mutexes=int
 CONFIGURE_ARGS+=	--with-x
 CONFIGURE_ARGS+=	--sysconfdir="${PKG_SYSCONFDIR}"
@@ -25,5 +26,4 @@ PKG_SYSCONFSUBDIR=	ggi
 EGDIR=			${PREFIX}/share/examples/ggi
 CONF_FILES=		${EGDIR}/libgii.conf ${PKG_SYSCONFDIR}/libgii.conf
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tcm/Makefile b/graphics/tcm/Makefile
index 5f9b5e49de0..63eea973b07 100644
--- a/graphics/tcm/Makefile
+++ b/graphics/tcm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/01/01 22:02:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2003/01/28 22:03:25 jlam Exp $
 
 DISTNAME=		tcm-2.01.src
 PKGNAME=		tcm-2.01
@@ -13,6 +13,7 @@ COMMENT=		TCM - Toolkit for Conceptual Modeling
 WRKSRC=			${WRKDIR}/tcm-2.01/src
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 USE_X11BASE=		YES
 
 # These two variables denote where the installed location of the libraries
@@ -92,7 +93,6 @@ do-install:
 		${PREFIX}/share/doc/html/tcm/wishlist/
 
 .include "../../mk/motif.buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
 
 .if defined(MOTIF_TYPE) && (${MOTIF_TYPE} == "lesstif")
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index b24095bfe31..dd7cd2df114 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2002/12/25 14:25:27 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2003/01/28 22:03:25 jlam Exp $
 
 DISTNAME=	tiff-v3.5.7
 PKGNAME=	tiff-3.5.7
@@ -13,9 +13,9 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.libtiff.org/
 COMMENT=	Library and tools for reading and writing TIFF data files
 
-USE_BUILDLINK2=	# defined
-USE_LIBTOOL=	# defined
-HAS_CONFIGURE=	# defined
+USE_BUILDLINK2=	yes
+USE_LIBTOOL=	yes
+HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--noninteractive --site=${FILESDIR} --prefix=${PREFIX}
 
 .include "../../mk/bsd.prefs.mk"
@@ -51,10 +51,9 @@ pre-patch:
 .include "../../graphics/jpeg/buildlink2.mk"
 
 .if !empty(X11BASE:M*openwin)
-INSTALL_TMPL=	${.CURDIR}/INSTALL.OpenWindows
+USE_PKGINSTALL=	yes
 DEINSTALL_TMPL=	${INSTALL_TMPL}
-
-.  include "../../mk/bsd.pkg.install.mk"
+INSTALL_TMPL=	${.CURDIR}/INSTALL.OpenWindows
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile
index a5e0951f9e6..a0e4f3f727c 100644
--- a/graphics/tuxpaint/Makefile
+++ b/graphics/tuxpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/01/01 19:24:19 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2003/01/28 22:03:26 jlam Exp $
 #
 
 DISTNAME=	tuxpaint-2002.10.26
@@ -11,6 +11,7 @@ HOMEPAGE=	http://www.newbreedsoftware.com/tuxpaint/
 COMMENT=	drawing program for small children
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_GMAKE=		YES
 MANCOMPRESSED=		YES
@@ -23,5 +24,5 @@ CONF_FILES=		${EGDIR}/tuxpaint.conf ${PKG_SYSCONFDIR}/tuxpaint.conf
 .include "../../devel/SDL/buildlink2.mk"
 .include "../../devel/SDL_ttf/buildlink2.mk"
 .include "../../graphics/SDL-image/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
+
 .include "../../mk/bsd.pkg.mk"