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, 20 insertions, 20 deletions

diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile
index fcb3109397b..271875315b0 100644
--- a/fonts/fontconfig/Makefile
+++ b/fonts/fontconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/01/21 14:25:31 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/28 22:03:17 jlam Exp $
 #
 
 DISTNAME=	fcpackage.2_1
@@ -13,6 +13,7 @@ COMMENT=	Library for configuring and customizing font access
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 USE_GMAKE=		YES
 USE_X11=		YES
 
@@ -41,5 +42,4 @@ post-install:
 
 .include "../../graphics/freetype2/buildlink2.mk"
 .include "../../textproc/expat/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/ghostscript-cidfonts/Makefile b/fonts/ghostscript-cidfonts/Makefile
index bf0dd1ed287..ff736e9b1fd 100644
--- a/fonts/ghostscript-cidfonts/Makefile
+++ b/fonts/ghostscript-cidfonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/13 22:35:01 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/28 22:03:18 jlam Exp $
 
 DISTNAME=	ghostscript-cidfonts-20000901
 CATEGORIES=	fonts
@@ -16,8 +16,9 @@ ADOBE_RESOURCEDIR=	${PREFIX}/share/Adobe/Resource
 GS_RESOURCEDIR=		${PREFIX}/share/ghostscript/Resource
 
 EXTRACT_ONLY=		# empty
-NO_CONFIGURE=		# defined
-NO_BUILD=		# defined
+NO_CONFIGURE=		yes
+NO_BUILD=		yes
+USE_PKGINSTALL=		yes
 
 DEINSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
 INSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
@@ -31,5 +32,4 @@ MAKE_DIRS=		${GS_RESOURCEDIR} ${GS_RESOURCEDIR}/CIDFont
 do-install:	# nothing
 
 .include "../../mk/ghostscript.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/ghostscript-cmaps/Makefile b/fonts/ghostscript-cmaps/Makefile
index 34ac754dd69..1b570cf8d49 100644
--- a/fonts/ghostscript-cmaps/Makefile
+++ b/fonts/ghostscript-cmaps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/09/13 22:49:44 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/28 22:03:18 jlam Exp $
 
 DISTNAME=	ghostscript-cmaps-20020913
 CATEGORIES=	fonts
@@ -16,8 +16,9 @@ ADOBE_RESOURCEDIR=	${PREFIX}/share/Adobe/Resource
 GS_RESOURCEDIR=		${PREFIX}/share/ghostscript/Resource
 
 EXTRACT_ONLY=		# empty
-NO_CONFIGURE=		# defined
-NO_BUILD=		# defined
+NO_CONFIGURE=		yes
+NO_BUILD=		yes
+USE_PKGINSTALL=		yes
 
 DEINSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
 INSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
@@ -31,5 +32,4 @@ MAKE_DIRS=		${GS_RESOURCEDIR} ${GS_RESOURCEDIR}/CMap
 do-install:	# nothing
 
 .include "../../mk/ghostscript.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/kochi-ttf/Makefile b/fonts/kochi-ttf/Makefile
index c5e38e1d67e..69ece9bbf67 100644
--- a/fonts/kochi-ttf/Makefile
+++ b/fonts/kochi-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/08/16 13:23:09 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:18 jlam Exp $
 
 DISTNAME=	kochi-gothic-20020503
 PKGNAME=	kochi-ttf-20020503
@@ -18,8 +18,9 @@ KOCHI_VERSION=	0.2.20020503
 
 WRKSRC=		${WRKDIR}/kochi-gothic
 
-NO_BUILD=	# Defined
-USE_X11BASE=	# Defined
+NO_BUILD=	yes
+USE_X11BASE=	yes
+USE_PKGINSTALL=	yes
 
 INSTALL_TMPL=	${FILESDIR}/install
 DEINSTALL_TMPL=	${FILESDIR}/deinstall
@@ -37,5 +38,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/fonts/kochi-mincho.ttf \
 	    ${PREFIX}/lib/X11/fonts/TrueType/kochi-mincho.ttf
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/monafonts/Makefile b/fonts/monafonts/Makefile
index e2d4ee85412..a4a56f4dbfb 100644
--- a/fonts/monafonts/Makefile
+++ b/fonts/monafonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/12/23 12:52:29 toshii Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:19 jlam Exp $
 
 DISTNAME=	monafont-2.22
 PKGNAME=	${DISTNAME:S/font/fonts/}
@@ -10,8 +10,9 @@ MAINTAINER=	uebayasi@soum.co.jp
 HOMEPAGE=	http://monafont.sourceforge.net/
 COMMENT=	Japanese fonts for "Mona" seen at 2ch.net
 
-USE_X11BASE=	# Defined
-USE_PERL5=	# Defined
+USE_X11BASE=	yes
+USE_PKGINSTALL=	yes
+USE_PERL5=	yes
 ALL_TARGET=	bdf
 MAKE_FLAGS+=	SED_CMD=${SED:Q}
 MAKE_FLAGS+=	PERL_CMD=${PERL5:Q}
@@ -24,5 +25,4 @@ FILES_SUBST+=	X11FONTSSUBDIR=local
 post-extract:
 	${MKDIR} ${WRKSRC}/dist
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/t1lib/Makefile b/fonts/t1lib/Makefile
index f0c93605674..49fe0e455c5 100644
--- a/fonts/t1lib/Makefile
+++ b/fonts/t1lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/09/19 14:47:34 tron Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/28 22:03:19 jlam Exp $
 
 DISTNAME=	t1lib-1.3.1
 CATEGORIES=	fonts devel graphics
@@ -9,6 +9,7 @@ MAINTAINER=	packages@netbsd.org
 COMMENT=	library for generating bitmaps from Adobe Type 1 fonts
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 USE_GMAKE=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
@@ -39,5 +40,4 @@ post-install:
 	${SED}	${FILES_SUBST_SED}					\
 		${FILESDIR}/t1lib.config.sample > ${EGDIR}/t1lib.config.sample
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"