Remove USE_PKGINSTALL from pkgsrc now that mk/install/pkginstall.mk

automatically detects whether we want the pkginstall machinery to be
used by the package Makefile.

12 files changed, 12 insertions, 24 deletions

diff --git a/textproc/chasen-base/Makefile b/textproc/chasen-base/Makefile
index 24eec9366f8..85f865b039b 100644
--- a/textproc/chasen-base/Makefile
+++ b/textproc/chasen-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:02 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/29 06:22:19 jlam Exp $
 #
 
 DISTNAME=		chasen-${CHASEN_VERSION}
@@ -18,7 +18,6 @@ COMMENT=		ChaSen, Japanese Morphological Analysis System
 GNU_CONFIGURE=		yes
 USE_LANGUAGE=		c c++
 USE_LIBTOOL=		yes
-USE_PKGINSTALL=		yes
 OWN_DIRS=		${CHASEN_DICDIR}
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
diff --git a/textproc/dict-server/Makefile b/textproc/dict-server/Makefile
index 85b474e7130..6f89395a64e 100644
--- a/textproc/dict-server/Makefile
+++ b/textproc/dict-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/12/05 23:55:20 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/29 06:22:19 jlam Exp $
 
 DISTNAME=	dictd-1.9.15
 PKGNAME=	dict-server-1.9.15
@@ -11,7 +11,6 @@ HOMEPAGE=	http://www.dict.org/
 COMMENT=	Dictionary Service Protocol server
 
 USE_TOOLS+=		gmake
-USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-cflags=${CFLAGS:M*:Q}
 CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR:Q}
diff --git a/textproc/eb/Makefile b/textproc/eb/Makefile
index 9dc8578fc45..54a21ccde54 100644
--- a/textproc/eb/Makefile
+++ b/textproc/eb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/12/05 23:55:20 rillig Exp $
+# $NetBSD: Makefile,v 1.36 2005/12/29 06:22:19 jlam Exp $
 
 DISTNAME=	eb-4.1.3
 CATEGORIES=	textproc japanese
@@ -51,7 +51,6 @@ DIST_SUBDIR=	${PKGNAME_NOREV}
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_PKGINSTALL=		YES
 USE_TOOLS+=		gmake gtar perl
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index 4e54a164ccd..85ded117835 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2005/12/05 23:55:20 rillig Exp $
+# $NetBSD: Makefile,v 1.45 2005/12/29 06:22:19 jlam Exp $
 #
 
 DISTNAME=	icu-3.2
@@ -13,7 +13,6 @@ COMMENT=	Robust and full-featured Unicode services
 
 WRKSRC=			${WRKDIR}/${PKGBASE}/source
 USE_TOOLS+=		gmake
-USE_PKGINSTALL=		YES
 USE_LANGUAGES=		c c++
 TEST_TARGET=		check
 
diff --git a/textproc/ipadic/Makefile b/textproc/ipadic/Makefile
index 338557fb92a..11f30211375 100644
--- a/textproc/ipadic/Makefile
+++ b/textproc/ipadic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/08/18 15:46:24 taca Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/29 06:22:19 jlam Exp $
 #
 
 DISTNAME=	ipadic-2.7.0
@@ -11,7 +11,6 @@ HOMEPAGE=      	http://chasen.aist-nara.ac.jp/
 COMMENT=	Japanese Morphological Dictionary for ChaSen
 
 GNU_CONFIGURE=	yes
-USE_PKGINSTALL=	yes
 CONF_FILES=	${CHASEN_DICDIR}/ipadic/chasenrc.example \
 		${PKG_SYSCONFDIR}/chasenrc
 
diff --git a/textproc/namazu2/Makefile b/textproc/namazu2/Makefile
index 202e99b6b90..cb98d908275 100644
--- a/textproc/namazu2/Makefile
+++ b/textproc/namazu2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/12/05 23:55:20 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/29 06:22:19 jlam Exp $
 
 DISTNAME=	namazu-2.0.14
 PKGREVISION=	3
@@ -17,7 +17,6 @@ DEPENDS+=	p5-Text-ChaSen>=1.0:../../textproc/p5-Text-ChaSen
 CONFLICTS+=	namazu-[0-9]*
 
 USE_PKGLOCALEDIR=	yes
-USE_PKGINSTALL=		yes
 USE_TOOLS+=		perl:run
 GNU_CONFIGURE=		yes
 USE_LANGUAGE=		c
diff --git a/textproc/ndtpd/Makefile b/textproc/ndtpd/Makefile
index 820ab220dad..532513c94ad 100644
--- a/textproc/ndtpd/Makefile
+++ b/textproc/ndtpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/12/05 23:55:20 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/29 06:22:19 jlam Exp $
 #
 
 DISTNAME=	ndtpd-3.1.5
@@ -12,7 +12,6 @@ COMMENT=	Server for accessing CD-ROM books with NDTP
 
 PKG_INSTALLATION_TYPES=	pkgviews overwrite
 
-USE_PKGINSTALL=	YES
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 
diff --git a/textproc/ruby-rdtool/Makefile b/textproc/ruby-rdtool/Makefile
index b2c250cba57..091e5426ef6 100644
--- a/textproc/ruby-rdtool/Makefile
+++ b/textproc/ruby-rdtool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/11/09 04:25:09 taca Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/29 06:22:19 jlam Exp $
 
 DISTNAME=	rdtool-0.6.18
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
@@ -16,7 +16,6 @@ CONFLICTS+=	ruby[1-9][0-9]-rdtool-*
 USE_RUBY_DIST_SUBDIR=	yes
 
 USE_RUBY_SETUP=	yes
-USE_PKGINSTALL=	yes
 REPLACE_RUBY=	bin/rd2 bin/rdswap.rb
 
 CONF_FILES+=	${RUBY_SITELIBDIR}/rd/dot.rd2rc ${PKG_SYSCONFDIR}/dot.rd2rc
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index e25fb36e6fa..c40877ba8bc 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/12/05 23:55:21 rillig Exp $
+# $NetBSD: Makefile,v 1.32 2005/12/29 06:22:20 jlam Exp $
 #
 
 DISTNAME=		scrollkeeper-0.3.14
@@ -19,7 +19,6 @@ DEPENDS+=		docbook-xml>=4.2nb7:../../textproc/docbook-xml
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
-USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 
 CONFIGURE_ARGS+= 	--localstatedir=${SCROLLKEEPER_DATADIR:Q}
diff --git a/textproc/scrollkeeper/omf.mk b/textproc/scrollkeeper/omf.mk
index 120f4910c38..f11025b353b 100644
--- a/textproc/scrollkeeper/omf.mk
+++ b/textproc/scrollkeeper/omf.mk
@@ -1,4 +1,4 @@
-# $NetBSD: omf.mk,v 1.9 2005/12/05 20:51:08 rillig Exp $
+# $NetBSD: omf.mk,v 1.10 2005/12/29 06:22:20 jlam Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # OMF files.  It takes care of registering them in scrollkeeper's global
@@ -22,7 +22,6 @@ SCROLLKEEPER_DATADIR=	${BUILDLINK_PREFIX.scrollkeeper}/libdata/scrollkeeper
 SCROLLKEEPER_REBUILDDB=	${BUILDLINK_PREFIX.scrollkeeper}/bin/scrollkeeper-rebuilddb
 SCROLLKEEPER_UPDATEDB=	${BUILDLINK_PREFIX.scrollkeeper}/bin/scrollkeeper-update
 
-USE_PKGINSTALL=		YES
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/../../textproc/scrollkeeper/files/install.tmpl
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/../../textproc/scrollkeeper/files/install.tmpl
 
diff --git a/textproc/xmlcatmgr/Makefile b/textproc/xmlcatmgr/Makefile
index 50b8ec508c0..8a67ff72032 100644
--- a/textproc/xmlcatmgr/Makefile
+++ b/textproc/xmlcatmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/12/05 23:55:21 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2005/12/29 06:22:20 jlam Exp $
 #
 
 DISTNAME=	xmlcatmgr-2.2
@@ -13,7 +13,6 @@ COMMENT=	XML and SGML catalog manager
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=	YES
-USE_PKGINSTALL=	YES
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
diff --git a/textproc/xmlcatmgr/catalogs.mk b/textproc/xmlcatmgr/catalogs.mk
index 8e74e33b0ed..ee9b5c7ae42 100644
--- a/textproc/xmlcatmgr/catalogs.mk
+++ b/textproc/xmlcatmgr/catalogs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: catalogs.mk,v 1.13 2005/12/05 20:51:08 rillig Exp $
+# $NetBSD: catalogs.mk,v 1.14 2005/12/29 06:22:20 jlam Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # catalog files or DTDs.  It takes care of registering them into the right
@@ -54,7 +54,6 @@ FILES_SUBST+=	SGML_ENTRIES=${SGML_ENTRIES:Q}
 FILES_SUBST+=	XML_ENTRIES=${XML_ENTRIES:Q}
 INSTALL_EXTRA_TMPL+=	../../textproc/xmlcatmgr/files/install.tmpl
 DEINSTALL_EXTRA_TMPL+=	../../textproc/xmlcatmgr/files/deinstall.tmpl
-USE_PKGINSTALL=	YES
 .endif # !empty(SGML_ENTRIES) || !empty(XML_ENTRIES)
 
 PRINT_PLIST_AWK+=	/^share\/(sgml|xml)\/catalog$$/ \