From dc9594e09db96635641a7e05b49d34b554b9bb21 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Thu, 29 Dec 2005 06:21:30 +0000
Subject: 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.

---
 misc/XFree86-dirs/Makefile    | 3 +--
 misc/celestia/Makefile        | 3 +--
 misc/dnetc/Makefile           | 3 +--
 misc/dpkg/Makefile            | 3 +--
 misc/gnome-dirs/Makefile      | 3 +--
 misc/gnome1-dirs/Makefile     | 3 +--
 misc/gnome2-dirs/Makefile     | 3 +--
 misc/kdeutils3/Makefile       | 3 +--
 misc/libutf/Makefile          | 3 +--
 misc/openoffice-bin/Makefile  | 3 +--
 misc/openoffice2-bin/Makefile | 3 +--
 misc/pinfo/Makefile           | 3 +--
 misc/qterm/Makefile           | 3 +--
 misc/rpm/Makefile             | 3 +--
 misc/screen/Makefile          | 3 +--
 misc/setiathome/Makefile      | 3 +--
 misc/theme-dirs/Makefile      | 3 +--
 misc/vfu/Makefile             | 3 +--
 misc/xdg-dirs/Makefile        | 3 +--
 misc/xdg-x11-dirs/Makefile    | 3 +--
 misc/xorg-dirs/Makefile       | 3 +--
 misc/xtide/Makefile           | 3 +--
 22 files changed, 22 insertions(+), 44 deletions(-)

(limited to 'misc')

diff --git a/misc/XFree86-dirs/Makefile b/misc/XFree86-dirs/Makefile
index 80b08381a57..9fcc4829089 100644
--- a/misc/XFree86-dirs/Makefile
+++ b/misc/XFree86-dirs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/12/08 09:52:15 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/29 06:21:54 jlam Exp $
 #
 
 DISTNAME=	XFree86-dirs-1.1
@@ -16,7 +16,6 @@ NO_CHECKSUM=		yes
 NO_CONFIGURE=		yes
 NO_EXTRACT=		yes
 NO_XFREE86_TARGETS=	yes
-USE_PKGINSTALL=		yes
 WRKSRC=			${WRKDIR}
 
 XFREE86_ONLY_DIRS=	# defined
diff --git a/misc/celestia/Makefile b/misc/celestia/Makefile
index 619689de1c6..a05802e360b 100644
--- a/misc/celestia/Makefile
+++ b/misc/celestia/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2005/09/04 05:00:36 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/29 06:21:54 jlam Exp $
 
 PKGREVISION=	1
 COMMENT=	Free real-time 3D space simulator
 
-USE_PKGINSTALL=		yes
 
 EGDIR=		${PREFIX}/share/examples/celestia
 CONF_FILES=	${EGDIR}/celestia.cfg.default ${PKG_SYSCONFDIR}/celestia.cfg
diff --git a/misc/dnetc/Makefile b/misc/dnetc/Makefile
index 3df33392c4b..120c44acac8 100644
--- a/misc/dnetc/Makefile
+++ b/misc/dnetc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/15 18:27:52 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/29 06:21:54 jlam Exp $
 
 DISTNAME=	${DISTNAME_${OPSYS}_${MACHINE_ARCH}}
 PKGNAME=	dnetc-2.${DISTVER_${OPSYS}_${MACHINE_ARCH}}
@@ -15,7 +15,6 @@ ONLY_FOR_PLATFORM=	Darwin-*-powerpc NetBSD-*-alpha NetBSD-*-arm	\
 			NetBSD-*-mipsel NetBSD-*-powerpc NetBSD-*-sparc \
 			NetBSD-*-sparc64 NetBSD-*-vax SunOS-*-sparc
 NO_BUILD=	YES
-USE_PKGINSTALL=	YES
 
 USE_TOOLS+=	gtar
 
diff --git a/misc/dpkg/Makefile b/misc/dpkg/Makefile
index aada939aa27..826fe48d591 100644
--- a/misc/dpkg/Makefile
+++ b/misc/dpkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/12/05 23:55:12 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/29 06:21:54 jlam Exp $
 #
 
 DISTNAME=	${PKGNAME:S,-,_,}
@@ -18,7 +18,6 @@ USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake perl
 USE_NCURSES=		# tigetstr()
-USE_PKGINSTALL=		yes
 
 REPLACE_PERL=		${WRKSRC}/scripts/*.pl
 
diff --git a/misc/gnome-dirs/Makefile b/misc/gnome-dirs/Makefile
index e09e9749553..2d1baecdd54 100644
--- a/misc/gnome-dirs/Makefile
+++ b/misc/gnome-dirs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/09/28 19:51:27 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/29 06:21:54 jlam Exp $
 #
 
 DISTNAME=	gnome-dirs-1.5
@@ -13,7 +13,6 @@ COMMENT=	Shared GTK/GNOME (v1 and v2) directories
 
 WRKSRC=		${WRKDIR}
 USE_LANGUAGES=	# empty
-USE_PKGINSTALL=	yes
 USE_X11BASE=	yes
 NO_CHECKSUM=	yes
 NO_EXTRACT=	yes
diff --git a/misc/gnome1-dirs/Makefile b/misc/gnome1-dirs/Makefile
index b9d53e7a706..05165df6165 100644
--- a/misc/gnome1-dirs/Makefile
+++ b/misc/gnome1-dirs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/09/28 19:51:27 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/29 06:21:54 jlam Exp $
 #
 
 DISTNAME=	gnome1-dirs-1.5
@@ -15,7 +15,6 @@ DEPENDS+=	gnome-dirs>=1.0:../../misc/gnome-dirs
 
 WRKSRC=		${WRKDIR}
 USE_LANGUAGES=	# empty
-USE_PKGINSTALL=	yes
 USE_X11BASE=	yes
 NO_CHECKSUM=	yes
 NO_EXTRACT=	yes
diff --git a/misc/gnome2-dirs/Makefile b/misc/gnome2-dirs/Makefile
index 00a04862eb5..dd1ef8938e2 100644
--- a/misc/gnome2-dirs/Makefile
+++ b/misc/gnome2-dirs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/09/28 19:51:27 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/29 06:21:54 jlam Exp $
 #
 
 DISTNAME=	gnome2-dirs-1.5
@@ -13,7 +13,6 @@ COMMENT=	Shared GTK/GNOME (v2) directories
 
 WRKSRC=		${WRKDIR}
 USE_LANGUAGES=	# empty
-USE_PKGINSTALL=	yes
 NO_EXTRACT=	yes
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index bcef27a7242..cc6d740bd2a 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2005/12/11 11:45:44 markd Exp $
+# $NetBSD: Makefile,v 1.47 2005/12/29 06:21:54 jlam Exp $
 
 DISTNAME=	kdeutils-${_KDE_VERSION}
 COMMENT=	Utilities for the KDE integrated X11 desktop
@@ -8,7 +8,6 @@ COMMENT=	Utilities for the KDE integrated X11 desktop
 .include "../../mk/bsd.prefs.mk"
 
 USE_DIRS+=		xdg-1.1
-USE_PKGINSTALL=		YES
 
 # Ensure we export symbols in the linked shared object.
 LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
diff --git a/misc/libutf/Makefile b/misc/libutf/Makefile
index ec54dba1843..ce39a392a68 100644
--- a/misc/libutf/Makefile
+++ b/misc/libutf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/12/05 23:55:12 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/29 06:21:55 jlam Exp $
 #
 
 DISTNAME=	libutf-2.10
@@ -10,7 +10,6 @@ MAINTAINER=	agc@NetBSD.org
 HOMEPAGE=	http://www.alistaircrooks.co.uk/software.html
 COMMENT=	UTF-8 character set support library, including regular expressions
 
-USE_PKGINSTALL=	yes
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 BUILD_TARGET=	tst
diff --git a/misc/openoffice-bin/Makefile b/misc/openoffice-bin/Makefile
index efabd641b97..de38653eb35 100644
--- a/misc/openoffice-bin/Makefile
+++ b/misc/openoffice-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:40 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/29 06:21:55 jlam Exp $
 
 PKGNAME=		openoffice-bin-${OO_VER}
 PKGREVISION=		1
@@ -38,7 +38,6 @@ CHECK_SHLIBS=		no
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD"
-USE_PKGINSTALL=         yes
 
 .  if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
 .    if !exists(/emul/svr4/usr/lib/ld.so)
diff --git a/misc/openoffice2-bin/Makefile b/misc/openoffice2-bin/Makefile
index 0aab411a897..af5361467bf 100644
--- a/misc/openoffice2-bin/Makefile
+++ b/misc/openoffice2-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:40 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/29 06:21:55 jlam Exp $
 
 PKGNAME=		openoffice-bin-2.0.0
 PKGREVISION=		3
@@ -43,7 +43,6 @@ PLIST_SRC+=		${WRKDIR}/PLIST
 #
 ARCH=	${MACHINE_ARCH:C/i[3-6]86/i386/g}
 
-USE_PKGINSTALL=         yes
 INSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL
 DEINSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL
 
diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile
index c70afdc64fc..95ea659dedf 100644
--- a/misc/pinfo/Makefile
+++ b/misc/pinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/12/05 23:55:12 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2005/12/29 06:21:55 jlam Exp $
 #
 
 DISTNAME=		pinfo-0.6.1
@@ -14,7 +14,6 @@ BUILD_USES_MSGFMT=	yes
 
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_PKGINSTALL=		yes
 
 INFO_FILES=	pinfo.info
 
diff --git a/misc/qterm/Makefile b/misc/qterm/Makefile
index 38b1f28f77e..3b45ca12e27 100644
--- a/misc/qterm/Makefile
+++ b/misc/qterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/12/05 23:55:12 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/29 06:21:55 jlam Exp $
 #
 
 DISTNAME=	qterm-ac-1.0
@@ -11,7 +11,6 @@ MAINTAINER=	agc@NetBSD.org
 HOMEPAGE=	http://www.alistaircrooks.co.uk/software.html
 COMMENT=	Utility to recognise terminal type automatically
 
-USE_PKGINSTALL=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile
index dbc5341c0f9..bc76e8f9637 100644
--- a/misc/rpm/Makefile
+++ b/misc/rpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2005/12/05 20:50:40 rillig Exp $
+# $NetBSD: Makefile,v 1.55 2005/12/29 06:21:55 jlam Exp $
 
 DISTNAME=	rpm-2.5.4
 PKGREVISION=	3
@@ -18,7 +18,6 @@ NOT_FOR_PLATFORM+=	Interix-*-* # getmntent() is nonpublic; needs porting
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 
-USE_PKGINSTALL=		yes
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index 99d427ce3aa..abbdf43c061 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2005/12/28 17:53:24 reed Exp $
+# $NetBSD: Makefile,v 1.64 2005/12/29 06:21:55 jlam Exp $
 
 DISTNAME=	screen-4.0.2
 PKGREVISION=	4
@@ -14,7 +14,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 NOT_FOR_PLATFORM=	Interix-*-* # user auth and username size fixes needed
 
-USE_PKGINSTALL=		YES
 INFO_FILES=		screen.info
 PLIST_SUBST+=		DISTNAME=${DISTNAME:Q}
 FILES_SUBST+=		EXAMPLES=${PREFIX:Q}/share/examples/screen
diff --git a/misc/setiathome/Makefile b/misc/setiathome/Makefile
index 6d9036f8061..ea151be6e57 100644
--- a/misc/setiathome/Makefile
+++ b/misc/setiathome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/25 15:21:29 abs Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/29 06:21:55 jlam Exp $
 #
 
 DISTNAME=       ${PKGNAME_NOREV}
@@ -56,7 +56,6 @@ ONLY_FOR_PLATFORM+= Linux-*-i386 Linux-*-x86_64
 DIST_SUBDIR=    setiathome
 DECOMPRESS_CMD=	${CAT}
 NO_BUILD=	yes
-USE_PKGINSTALL=	yes
 
 RCD_SCRIPTS=	setiathome
 
diff --git a/misc/theme-dirs/Makefile b/misc/theme-dirs/Makefile
index b4c80279e4c..e540a1793bc 100644
--- a/misc/theme-dirs/Makefile
+++ b/misc/theme-dirs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/09/28 19:51:27 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/29 06:21:55 jlam Exp $
 #
 
 DISTNAME=	theme-dirs-1.1
@@ -17,7 +17,6 @@ NO_CHECKSUM=	yes
 NO_EXTRACT=	yes
 USE_DIRS=	xdg-1.1
 USE_LANGUAGES=	# empty
-USE_PKGINSTALL=	yes
 WRKSRC=		${WRKDIR}
 
 .include "dirs.mk"
diff --git a/misc/vfu/Makefile b/misc/vfu/Makefile
index 3b702b91933..d0aa941bf95 100644
--- a/misc/vfu/Makefile
+++ b/misc/vfu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/12/05 20:50:41 rillig Exp $
+# $NetBSD: Makefile,v 1.42 2005/12/29 06:21:55 jlam Exp $
 #
 
 DISTNAME=	vfu-3.04
@@ -13,7 +13,6 @@ COMMENT=	Small, handy, easy-to-use file manager
 
 USE_TOOLS+=	perl:run
 USE_LANGUAGES=	c c++
-USE_PKGINSTALL=	YES
 
 INCOMPAT_CURSES=	NetBSD-1.5*-* NetBSD-1.6[-_.]*-*
 INCOMPAT_CURSES+=	NetBSD-1.6[A-U]-*
diff --git a/misc/xdg-dirs/Makefile b/misc/xdg-dirs/Makefile
index 6dac764b0f3..4715a9af67e 100644
--- a/misc/xdg-dirs/Makefile
+++ b/misc/xdg-dirs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/09/28 19:51:27 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/29 06:21:56 jlam Exp $
 #
 
 DISTNAME=	xdg-dirs-1.2
@@ -18,7 +18,6 @@ NO_CONFIGURE=	yes
 NO_CHECKSUM=	yes
 NO_EXTRACT=	yes
 USE_LANGUAGES=	# empty
-USE_PKGINSTALL=	yes
 WRKSRC=		${WRKDIR}
 
 .include "dirs.mk"
diff --git a/misc/xdg-x11-dirs/Makefile b/misc/xdg-x11-dirs/Makefile
index a02aa7afcfc..6522d6acb21 100644
--- a/misc/xdg-x11-dirs/Makefile
+++ b/misc/xdg-x11-dirs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/09/28 19:51:27 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/29 06:21:56 jlam Exp $
 #
 
 DISTNAME=	xdg-x11-dirs-1.2
@@ -18,7 +18,6 @@ NO_CONFIGURE=	yes
 NO_CHECKSUM=	yes
 NO_EXTRACT=	yes
 USE_LANGUAGES=	# empty
-USE_PKGINSTALL=	yes
 USE_X11BASE=	yes
 WRKSRC=		${WRKDIR}
 
diff --git a/misc/xorg-dirs/Makefile b/misc/xorg-dirs/Makefile
index 3e5e888ebd8..ff8e125d885 100644
--- a/misc/xorg-dirs/Makefile
+++ b/misc/xorg-dirs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/12/08 09:52:16 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/29 06:21:56 jlam Exp $
 #
 
 DISTNAME=	xorg-dirs-1.1
@@ -16,7 +16,6 @@ NO_CHECKSUM=		yes
 NO_CONFIGURE=		yes
 NO_EXTRACT=		yes
 NO_XORG_TARGETS=	yes
-USE_PKGINSTALL=		yes
 WRKSRC=			${WRKDIR}
 
 XORG_ONLY_DIRS=		# defined
diff --git a/misc/xtide/Makefile b/misc/xtide/Makefile
index 787568fab28..13b817fc0a1 100644
--- a/misc/xtide/Makefile
+++ b/misc/xtide/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/12/05 23:55:12 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/29 06:21:56 jlam Exp $
 
 DISTNAME=	xtide-2.4
 PKGREVISION=	3
@@ -13,7 +13,6 @@ COMMENT=	X11 tide predictor
 EXTRACT_ONLY=	${XTIDE_SRC}
 XTIDE_SRC=	${DISTNAME}${EXTRACT_SUFX}
 
-USE_PKGINSTALL=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q}
-- 
cgit v1.2.3