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.

---
 shells/ast-ksh/Makefile.common | 3 +--
 shells/bash/Makefile           | 3 +--
 shells/bash2/Makefile          | 3 +--
 shells/es/Makefile             | 3 +--
 shells/esh/Makefile            | 3 +--
 shells/osh/Makefile            | 3 +--
 shells/pdksh/Makefile          | 3 +--
 shells/perlsh/Makefile         | 3 +--
 shells/posh/Makefile           | 3 +--
 shells/rc/Makefile             | 3 +--
 shells/rssh/Makefile           | 3 +--
 shells/scponly/Makefile        | 3 +--
 shells/scsh/Makefile           | 3 +--
 shells/tcsh/Makefile           | 3 +--
 shells/zsh/Makefile.common     | 3 +--
 shells/zsh3/Makefile           | 3 +--
 16 files changed, 16 insertions(+), 32 deletions(-)

(limited to 'shells')

diff --git a/shells/ast-ksh/Makefile.common b/shells/ast-ksh/Makefile.common
index 95644b78b33..5f947d8fea6 100644
--- a/shells/ast-ksh/Makefile.common
+++ b/shells/ast-ksh/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2005/12/05 20:50:58 rillig Exp $
+# $NetBSD: Makefile.common,v 1.17 2005/12/29 06:22:12 jlam Exp $
 
 DISTNAME=	ast-ksh-${ASTKSH_VERSION}
 PKGNAME=	ast-ksh-${ASTKSH_VERSION:S/-//g}
@@ -25,7 +25,6 @@ NO_SRC_ON_FTP=	${RESTRICTED}
 ASTKSH_VERSION=	2003-07-24
 
 WRKSRC=		${WRKDIR}
-USE_PKGINSTALL=	YES
 MAKE_FLAGS+=	CC=${CC:Q} CCFLAGS=${CFLAGS:M*:Q}
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index ffcf9572534..0809495e652 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/12/27 21:32:59 reed Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/29 06:22:12 jlam Exp $
 
 DISTNAME=	bash-3.0
 PKGNAME=	bash-3.0pl16
@@ -22,7 +22,6 @@ CONFLICTS=	static-bash-[0-9]*
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_MAKEINFO=		yes
-USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 MAKE_ENV+=		INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index 1b3b7c39edd..c3dcd1bd459 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2005/12/27 21:32:59 reed Exp $
+# $NetBSD: Makefile,v 1.70 2005/12/29 06:22:12 jlam Exp $
 #
 
 DISTNAME=	bash-2.05b
@@ -21,7 +21,6 @@ CONFLICTS=	static-bash-[0-9]*
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_GNU_READLINE=	yes
-USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-installed-readline
 MAKE_ENV+=		INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
diff --git a/shells/es/Makefile b/shells/es/Makefile
index 85107ee75da..ff5fc5d6356 100644
--- a/shells/es/Makefile
+++ b/shells/es/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/09/20 04:23:48 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/29 06:22:12 jlam Exp $
 
 DISTNAME=       es-0.9-alpha1
 PKGNAME=	es-0.9a1
@@ -10,7 +10,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://hawkwind.utcs.utoronto.ca:8001/mlists/es.html
 COMMENT=	Extensible shell, derived from plan9's rc
 
-USE_PKGINSTALL=	yes
 PKG_SHELL=	bin/es
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/esh/Makefile b/shells/esh/Makefile
index 0562a73ee7a..fe7b07aaa5f 100644
--- a/shells/esh/Makefile
+++ b/shells/esh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/09/20 04:23:48 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/29 06:22:12 jlam Exp $
 
 DISTNAME=		esh-0.8
 PKGREVISION=		1
@@ -11,7 +11,6 @@ COMMENT=		Unix shell with Lisp-like syntax
 INFO_FILES=		esh.info
 
 WRKSRC=			${WRKDIR}/esh
-USE_PKGINSTALL=		yes
 PKG_SHELL=		bin/esh
 INSTALLATION_DIRS=	bin info
 
diff --git a/shells/osh/Makefile b/shells/osh/Makefile
index b6ce8a36ef5..b6adb207392 100644
--- a/shells/osh/Makefile
+++ b/shells/osh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/09/20 04:23:49 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/29 06:22:12 jlam Exp $
 
 DISTNAME=	osh-050131
 PKGREVISION=	1
@@ -11,7 +11,6 @@ COMMENT=	Implementation of the UNIX 6th Edition shell
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_PKGINSTALL=		yes
 PKG_SHELL=		bin/osh
 
 TEST_TARGET=	check
diff --git a/shells/pdksh/Makefile b/shells/pdksh/Makefile
index f5851e74dd7..d99dc2cbce9 100644
--- a/shells/pdksh/Makefile
+++ b/shells/pdksh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/10/23 15:26:30 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/29 06:22:12 jlam Exp $
 #
 
 DISTNAME=	pdksh-5.2.14
@@ -20,7 +20,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--program-prefix=pd
 
-USE_PKGINSTALL=	yes
 PKG_SHELL=	bin/pdksh
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/perlsh/Makefile b/shells/perlsh/Makefile
index b8294f80b66..49870ef2b6b 100644
--- a/shells/perlsh/Makefile
+++ b/shells/perlsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/09/20 04:23:49 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/29 06:22:12 jlam Exp $
 # Cjep: Makefile,v 1.3 2003/04/20 16:21:44 cjep Exp
 
 DISTNAME=	psh-1.8
@@ -15,7 +15,6 @@ DEPENDS+=	p5-Term-ReadKey>=2.21:../../devel/p5-Term-ReadKey
 DEPENDS+=	p5-Term-ReadLine>=1.12:../../devel/p5-Term-ReadLine
 DEPENDS+=	p5-BSD-Resource>=1.15:../../devel/p5-BSD-Resource
 
-USE_PKGINSTALL=	yes
 PKG_SHELL=	bin/psh
 
 PERL5_PACKLIST=	auto/psh/.packlist
diff --git a/shells/posh/Makefile b/shells/posh/Makefile
index 284d3ae87da..995283b9955 100644
--- a/shells/posh/Makefile
+++ b/shells/posh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/09/21 16:10:08 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/29 06:22:12 jlam Exp $
 #
 
 DISTNAME=	posh_0.3.14
@@ -15,7 +15,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		YES
 PKG_SHELL=		bin/posh
-USE_PKGINSTALL=		YES
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 
 post-install:
diff --git a/shells/rc/Makefile b/shells/rc/Makefile
index 9789725a3ad..15a619750ff 100644
--- a/shells/rc/Makefile
+++ b/shells/rc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/10/23 15:27:20 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/29 06:22:12 jlam Exp $
 
 DISTNAME=       rc-1.6
 PKGREVISION=	1
@@ -12,7 +12,6 @@ COMMENT=	Unix incarnation of the plan9 shell
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-history
 
-USE_PKGINSTALL=	yes
 PKG_SHELL=	bin/rc
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/rssh/Makefile b/shells/rssh/Makefile
index baaa3ac7579..a0a7198c916 100644
--- a/shells/rssh/Makefile
+++ b/shells/rssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/12/28 17:55:39 seb Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/29 06:22:13 jlam Exp $
 #
 
 DISTNAME=		rssh-2.3.0
@@ -10,7 +10,6 @@ HOMEPAGE=		http://rssh.sourceforge.net/
 COMMENT=		Restricted shell allowing only scp and/or sftp
 
 GNU_CONFIGURE=		yes
-USE_PKGINSTALL=		yes
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
diff --git a/shells/scponly/Makefile b/shells/scponly/Makefile
index ec71ea730be..43e2ce6796c 100644
--- a/shells/scponly/Makefile
+++ b/shells/scponly/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/12/28 18:55:07 snj Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/29 06:22:13 jlam Exp $
 
 DISTNAME=	scponly-4.3
 CATEGORIES=	shells security
@@ -28,7 +28,6 @@ CONFIGURE_ENV+=		PROG_RM=${TOOLS_RM:Q}
 CONFIGURE_ENV+=		scponly_PROG_RM=${TOOLS_RM:Q}
 CONFIGURE_ENV+=		scponly_PROG_RMDIR=${TOOLS_RMDIR:Q}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-USE_PKGINSTALL=		yes
 PKG_SHELL=		bin/scponly
 PKG_SYSCONFSUBDIR=	scponly
 
diff --git a/shells/scsh/Makefile b/shells/scsh/Makefile
index f4ca1c938a4..436d7fd7528 100644
--- a/shells/scsh/Makefile
+++ b/shells/scsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/09/20 04:23:49 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2005/12/29 06:22:13 jlam Exp $
 
 DISTNAME=		scsh-0.6.6
 PKGREVISION=		1
@@ -16,7 +16,6 @@ GNU_CONFIGURE=		yes
 BUILD_TARGET=		enough
 TEST_TARGET=		check
 
-USE_PKGINSTALL=		yes
 PKG_SHELL=		bin/scsh
 
 # Build references from dumped environment variables is not a problem.
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index fa41b6b8f72..690befa22b0 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2005/09/20 04:23:49 jlam Exp $
+# $NetBSD: Makefile,v 1.53 2005/12/29 06:22:13 jlam Exp $
 #
 
 DISTNAME=	tcsh-6.14.00
@@ -18,7 +18,6 @@ COMMENT=	Extended C-shell with many useful features
 
 CONFLICTS=	static-tcsh-[0-9]*
 
-USE_PKGINSTALL=	yes
 GNU_CONFIGURE=	yes
 BUILD_TARGET=	all catalogs
 INSTALL_TARGET=	install install.man
diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common
index 3cc4dfddcc8..debd8c42f54 100644
--- a/shells/zsh/Makefile.common
+++ b/shells/zsh/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2005/12/05 23:55:19 rillig Exp $
+# $NetBSD: Makefile.common,v 1.32 2005/12/29 06:22:13 jlam Exp $
 
 DISTNAME=       zsh-${ZSH_VERSION}
 CATEGORIES=	shells
@@ -13,7 +13,6 @@ MAINTAINER=	${ZSH_MAINTAINER}
 HOMEPAGE=	http://sunsite.dk/zsh/
 COMMENT=	The Z shell
 
-USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--enable-etcdir=${PKG_SYSCONFDIR:Q}
diff --git a/shells/zsh3/Makefile b/shells/zsh3/Makefile
index 8d1a4561fda..13f2cd819b7 100644
--- a/shells/zsh3/Makefile
+++ b/shells/zsh3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/09/20 04:23:49 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/29 06:22:16 jlam Exp $
 #
 
 DISTNAME=       zsh-3.0.8
@@ -16,7 +16,6 @@ COMMENT=	The Z shell
 
 GNU_CONFIGURE=	yes
 USE_MAKEINFO=	YES
-USE_PKGINSTALL=	YES
 
 INFO_FILES=	zsh.info
 
-- 
cgit v1.2.3