Set USE_PKGINSTALL instead of directly including bsd.pkg.install.mk.

13 files changed, 29 insertions, 27 deletions

diff --git a/editors/jed/Makefile.common b/editors/jed/Makefile.common
index ae7d2be2d74..c726c008423 100644
--- a/editors/jed/Makefile.common
+++ b/editors/jed/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2003/04/05 21:34:14 wiz Exp $
+# $NetBSD: Makefile.common,v 1.2 2003/07/30 10:41:22 jmmv Exp $
 #
 DISTNAME=		jed-0.99-16
 CATEGORIES=		editors
@@ -13,6 +13,7 @@ MAINTAINER=		joerg@gmx.net
 HOMEPAGE=		http://www.jedsoft.org/jed/
 
 USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 
 EGDIR=			${PREFIX}/share/examples/jed
@@ -24,5 +25,4 @@ post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/lib/jed.conf ${EGDIR}
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../devel/libslang/buildlink2.mk"
diff --git a/fonts/ja-kappa20/Makefile b/fonts/ja-kappa20/Makefile
index 05dfb042ad5..c839aa4242c 100644
--- a/fonts/ja-kappa20/Makefile
+++ b/fonts/ja-kappa20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/07/17 21:37:10 grant Exp $
+# $NetBSD: Makefile,v 1.3 2003/07/30 10:41:23 jmmv Exp $
 
 DISTNAME=		Kappa20-0.394
 PKGNAME=		ja-kappa20-0.394
@@ -10,6 +10,7 @@ MAINTAINER=		tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=		http://kappa.allnet.ne.jp/20dot.fonts/
 COMMENT=		20x20 dots X11 bitmap font for Japanese with several extra fonts
 
+USE_PKGINSTALL=		YES
 USE_X11BASE=		YES
 FONTDIR=		${PREFIX}/lib/X11/fonts/local
 ALIAS_KAPPA=		${PREFIX}/share/examples/fonts.alias.Kappa20
@@ -25,5 +26,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/pcf/fonts.alias ${ALIAS_KAPPA}; \
 	${INSTALL_DATA} ${WRKSRC}/pcf/*.pcf.* ${FONTDIR}
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/ja-shinonome/Makefile b/fonts/ja-shinonome/Makefile
index 103b97e497e..82716497a49 100644
--- a/fonts/ja-shinonome/Makefile
+++ b/fonts/ja-shinonome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:37:12 grant Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/30 10:41:23 jmmv Exp $
 #
 
 DISTNAME=		shinonome-0.9.10-src
@@ -14,6 +14,7 @@ COMMENT=		12, 14, 16 dots bitmap fonts for Japanese, iso8859-1
 
 GNU_CONFIGURE=		YES
 USE_PERL5=		build
+USE_PKGINSTALL=		YES
 USE_X11BASE=		YES
 USE_GMAKE=		YES
 FONTDIR=		${PREFIX}/lib/X11/fonts/local
@@ -32,5 +33,4 @@ do-install:
 	${MAKE_PROGRAM} install; \
 	${INSTALL_DATA} ${WRKSRC}/fonts.alias ${ALIAS_SHINONOME}
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/vfontcap-kochi/Makefile b/fonts/vfontcap-kochi/Makefile
index 90f904de173..6e8b9a5668a 100644
--- a/fonts/vfontcap-kochi/Makefile
+++ b/fonts/vfontcap-kochi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/21 16:47:10 martti Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/30 10:41:23 jmmv Exp $
 
 DISTNAME=		vfontcap-kochi-0.0
 WRKSRC=			${WRKDIR}
@@ -16,6 +16,8 @@ EXTRACT_ONLY=		# empty
 NO_CHECKSUM=		YES
 NO_BUILD=		YES
 
+USE_PKGINSTALL=		YES
+
 VFONTCAPDIR=		${PREFIX}/share/VFlib/2.24.2
 FILES_SUBST+=		VFONTCAPDIR=${VFONTCAPDIR}
 
@@ -25,5 +27,4 @@ do-configure:
 do-install:
 	${INSTALL_DATA} ${WRKDIR}/vfontcap ${VFONTCAPDIR}
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/getmail/Makefile b/mail/getmail/Makefile
index 74700df6f81..b16b1b9a08d 100644
--- a/mail/getmail/Makefile
+++ b/mail/getmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/07/17 21:46:11 grant Exp $
+# $NetBSD: Makefile,v 1.12 2003/07/30 10:41:24 jmmv Exp $
 #
 
 DISTNAME=	getmail-3.1.7
@@ -13,6 +13,8 @@ COMMENT=	POP3 mail retriever with reliable Maildir and command delivery
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
+USE_PKGINSTALL=	YES
+
 PYTHON_PATCH_SCRIPTS=	ConfParser.py getmail.py getmail_classes.py
 PYTHON_PATCH_SCRIPTS+=	getmail_constants.py getmail_defaults.py
 PYTHON_PATCH_SCRIPTS+=	getmail_utilities.py
@@ -61,5 +63,4 @@ do-install:
 
 .include "../../lang/python/application.mk"
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 02934de6b52..a4b1f4d26a6 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2003/07/17 22:51:26 grant Exp $
+# $NetBSD: Makefile,v 1.25 2003/07/30 10:41:24 jmmv Exp $
 
 DISTNAME=	netatalk-1.6.2
 CATEGORIES=	net print
@@ -13,6 +13,7 @@ GNU_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
 USE_GMAKE=	YES
 USE_PERL5=	YES
+USE_PKGINSTALL=	YES
 USE_LIBTOOL=	YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
@@ -53,5 +54,4 @@ pre-install:
 #.include "../../databases/db3/buildlink2.mk"
 .include "../../devel/rx/buildlink2.mk"
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/spread/Makefile b/net/spread/Makefile
index df9843d184b..c2817817118 100644
--- a/net/spread/Makefile
+++ b/net/spread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/05/05 19:05:17 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/07/30 10:41:24 jmmv Exp $
 #
 
 DISTNAME=	${BASENAME}-src-${VER}
@@ -23,6 +23,7 @@ _FETCH_MESSAGE= \
 BASENAME=	spread
 VER=		3.17.0
 USE_BUILDLINK2=	YES
+USE_PKGINSTALL=	YES
 GNU_CONFIGURE=	YES
 
 BUILD_DEPENDS+=        perl-[0-9]*:../../lang/perl5:build
@@ -61,5 +62,4 @@ post-install:
 	${INSTALL} -d -o ${SPREAD_USER} -g ${SPREAD_GROUP} -m 0750 ${RUNDIR}
 
 .include "../../mk/pthread.buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/pkg_filecheck/Makefile b/pkgtools/pkg_filecheck/Makefile
index 69b1b710d6b..8c48b0c7caf 100644
--- a/pkgtools/pkg_filecheck/Makefile
+++ b/pkgtools/pkg_filecheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/21 17:14:07 martti Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/30 10:41:25 jmmv Exp $
 #
 
 DISTNAME=		pkg_filecheck-0.1
@@ -12,6 +12,7 @@ MAINTAINER=		dillo@NetBSD.org
 COMMENT=		Check for files not owned by any package
 
 USE_PERL5=	run
+USE_PKGINSTALL=	yes
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
@@ -41,5 +42,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/pkg_filecheck.conf \
 		${PREFIX}/share/examples/pkg_filecheck/pkg_filecheck.conf
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/dvipdfmx/Makefile b/print/dvipdfmx/Makefile
index 0a006edfaf4..dda1cd7ba76 100644
--- a/print/dvipdfmx/Makefile
+++ b/print/dvipdfmx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/21 17:16:20 martti Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/30 10:41:25 jmmv Exp $
 
 DISTNAME=	dvipdfmx-20021230
 PKGNAME=	dvipdfmx-0.0.0.20021230
@@ -17,6 +17,7 @@ CONFLICTS+=	dvipdfm-[0-9]*
 CONFLICTS+=	ja-dvipdfm-[0-9]*
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 #CONFIGURE_ARGS+=	--datadir=${PREFIX}/share
 
@@ -28,5 +29,4 @@ post-patch:
 .include "../../print/teTeX2-bin/kpathsea.buildlink2.mk"
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../mk/ghostscript.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/ja-jsclasses/Makefile b/print/ja-jsclasses/Makefile
index d2b6a6757e7..07d71592266 100644
--- a/print/ja-jsclasses/Makefile
+++ b/print/ja-jsclasses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 17:16:23 martti Exp $
+# $NetBSD: Makefile,v 1.8 2003/07/30 10:41:25 jmmv Exp $
 
 DISTNAME=	jsclasses-030624
 PKGNAME=	ja-${DISTNAME}
@@ -13,6 +13,8 @@ COMMENT=	New document class files for pLaTeX
 
 DEPENDS+=	ja-ptex-bin>=2.1.3:../../print/ja-ptex-bin
 
+USE_PKGINSTALL=	YES
+
 PLATEX_DIR=	${PREFIX}/share/texmf.local/ptex/platex
 NO_BUILD=	YES
 
@@ -28,5 +30,4 @@ do-install:
 	${INSTALL_DATA_DIR} ${PLATEX_DIR}/js; \
 	${INSTALL_DATA} *.cls *.dtx *.ins *.sty ${PLATEX_DIR}/js
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/teTeX2-bin/Makefile.common b/print/teTeX2-bin/Makefile.common
index c997d2a7687..930654e9ac9 100644
--- a/print/teTeX2-bin/Makefile.common
+++ b/print/teTeX2-bin/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2003/03/15 08:17:08 kei Exp $
+# $NetBSD: Makefile.common,v 1.3 2003/07/30 10:41:26 jmmv Exp $
 
 TETEX_BIN_VERS=		2.0.2
 DIST_SUBDIR=		teTeX
@@ -7,6 +7,7 @@ INSTALL_TARGET=		install strip
 
 USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
+USE_PKGINSTALL=		yes
 USE_X11=		yes
 CFLAGS+=		-Dunix
 
@@ -59,5 +60,3 @@ OWN_DIRS_PERMS+=	${TEXFONTSDIR}/tfm ${ROOT_USER} ${ROOT_GROUP} 1777
 .include "../../fonts/t1lib/buildlink2.mk"
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../devel/ncurses/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.install.mk"
diff --git a/shells/perlsh/Makefile b/shells/perlsh/Makefile
index 6d673be8eb3..23c58d4f480 100644
--- a/shells/perlsh/Makefile
+++ b/shells/perlsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 22:53:23 grant Exp $
+# $NetBSD: Makefile,v 1.6 2003/07/30 10:41:26 jmmv Exp $
 # Cjep: Makefile,v 1.3 2003/04/20 16:21:44 cjep Exp
 
 DISTNAME=	psh-1.8
@@ -16,10 +16,10 @@ DEPENDS+=	p5-Term-ReadLine>=1.12:../../devel/p5-Term-ReadLine
 DEPENDS+=	p5-BSD-Resource>=1.15:../../devel/p5-BSD-Resource
 
 USE_BUILDLINK2=	yes
+USE_PKGINSTALL=	yes
 PKG_SHELL=	${PREFIX}/bin/psh
 
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/psh/.packlist
 
 .include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/phoenix-bin-flash/Makefile b/www/phoenix-bin-flash/Makefile
index 1fcb277eb14..d0538b00f23 100644
--- a/www/phoenix-bin-flash/Makefile
+++ b/www/phoenix-bin-flash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 22:55:56 grant Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/30 10:41:26 jmmv Exp $
 
 DISTNAME=		install_flash_player_6_${DISTUNAME}
 PKGNAME=		phoenix-bin-flash-${FLASH_VERS:S/r/./}
@@ -32,6 +32,7 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
 USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
 CHECK_SHLIBS=		no
@@ -48,6 +49,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/flashplayer.xpt ${NS_PLUGINS_DIR}
 	${INSTALL_DATA} ${WRKSRC}/libflashplayer.so ${NS_PLUGINS_DIR}
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"