Teach the +SHELLS helper script to not create an /etc/shells file if

one doesn't exist.  From now on, we only add the listed PKG_SHELL to
the /etc/shells file if it already exists.  This fixes PR pkg/27162.

20 files changed, 43 insertions, 28 deletions

diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index 246c25c2e8d..4f4bc683c5a 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2005/08/01 11:36:29 cube Exp $
+# $NetBSD: Makefile,v 1.60 2005/09/20 04:23:48 jlam Exp $
 
 DISTNAME=	screen-4.0.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	misc shells
 MASTER_SITES=	ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \
 		${MASTER_SITE_GNU:=screen/}
diff --git a/mk/install/shell b/mk/install/shell
index fb295a2bdaa..3e7ec9fb54b 100644
--- a/mk/install/shell
+++ b/mk/install/shell
@@ -1,6 +1,6 @@
 #!@SH@
 #
-# $NetBSD: shell,v 1.3 2005/08/23 09:33:14 abs Exp $
+# $NetBSD: shell,v 1.4 2005/09/20 04:23:49 jlam Exp $
 #
 # +SHELL - shell registration script
 #
@@ -71,6 +71,7 @@ ADD)
 		${TEST} -f "$shell" || continue
 
 		shelldb="/etc/shells"
+		${TEST} -f "$shelldb" || continue
 		if ${TEST} -f "$shelldb" && \
 		   ${GREP} "^$shell" $shelldb >/dev/null; then
 			:
diff --git a/shells/ast-ksh/Makefile b/shells/ast-ksh/Makefile
index 97ca2d2da8a..3d325d3b9ae 100644
--- a/shells/ast-ksh/Makefile
+++ b/shells/ast-ksh/Makefile
@@ -1,5 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2003/08/11 17:27:55 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/09/20 04:23:48 jlam Exp $
 #
 .include "Makefile.common"
 
+PKGREVISION=	1
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index 8f7843c543a..4bc55e0c5ae 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2005/07/29 18:32:17 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/09/20 04:23:48 jlam Exp $
 
 DISTNAME=	bash-3.0
 PKGNAME=	bash-3.0pl16
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_GNU:=bash/} \
 		ftp://ftp.cwru.edu/pub/bash/
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index c3a14eb5c81..e7750282633 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.65 2005/07/29 18:32:17 jlam Exp $
+# $NetBSD: Makefile,v 1.66 2005/09/20 04:23:48 jlam Exp $
 #
 
 DISTNAME=	bash-2.05b
 PKGNAME=	bash-2.05.2.7
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_GNU:=bash/} \
 		ftp://ftp.cwru.edu/pub/bash/
diff --git a/shells/es/Makefile b/shells/es/Makefile
index dff56d63da3..85107ee75da 100644
--- a/shells/es/Makefile
+++ b/shells/es/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2005/07/29 18:32:17 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/09/20 04:23:48 jlam Exp $
 
 DISTNAME=       es-0.9-alpha1
 PKGNAME=	es-0.9a1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	shells
 MASTER_SITES=   ftp://ftp.sys.toronto.edu/pub/es/
 
diff --git a/shells/esh/Makefile b/shells/esh/Makefile
index 65f216986ba..0562a73ee7a 100644
--- a/shells/esh/Makefile
+++ b/shells/esh/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2005/07/29 18:32:17 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/09/20 04:23:48 jlam Exp $
 
 DISTNAME=		esh-0.8
+PKGREVISION=		1
 CATEGORIES=		shells
 MASTER_SITES=		${MASTER_SITE_BACKUP}
 
diff --git a/shells/osh/Makefile b/shells/osh/Makefile
index 34bcbb2341b..b6ce8a36ef5 100644
--- a/shells/osh/Makefile
+++ b/shells/osh/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2005/07/29 18:32:17 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/09/20 04:23:49 jlam Exp $
 
 DISTNAME=	osh-050131
+PKGREVISION=	1
 CATEGORIES=	shells
 MASTER_SITES=	http://jneitzel.sdf1.org/osh/src/
 
diff --git a/shells/pdksh/Makefile b/shells/pdksh/Makefile
index 139a4cb6015..2d95c0cb14e 100644
--- a/shells/pdksh/Makefile
+++ b/shells/pdksh/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2005/07/29 18:32:18 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/09/20 04:23:49 jlam Exp $
 #
 
 DISTNAME=	pdksh-5.2.14
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	shells
 MASTER_SITES=	ftp://ftp.cs.mun.ca/pub/pdksh/ \
 		http://gd.tuwien.ac.at/utils/shells/pdksh/ \
diff --git a/shells/perlsh/Makefile b/shells/perlsh/Makefile
index 51cc07b3d04..b8294f80b66 100644
--- a/shells/perlsh/Makefile
+++ b/shells/perlsh/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2005/08/06 06:19:31 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/09/20 04:23:49 jlam Exp $
 # Cjep: Makefile,v 1.3 2003/04/20 16:21:44 cjep Exp
 
 DISTNAME=	psh-1.8
 PKGNAME=	perlsh-1.8
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	shells perl5
 MASTER_SITES=	http://www.gregorpurdy.com/gregor/psh/
 
diff --git a/shells/posh/Makefile b/shells/posh/Makefile
index 5146c5a6802..cc93ec1d385 100644
--- a/shells/posh/Makefile
+++ b/shells/posh/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2005/07/29 18:32:18 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/09/20 04:23:49 jlam Exp $
 #
 
 DISTNAME=	posh_0.3.14
 PKGNAME=	${DISTNAME:S/_/-/}
+PKGREVISION=	1
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/p/posh/}
 
diff --git a/shells/rc/Makefile b/shells/rc/Makefile
index b8baa9cc5b2..651d8093b50 100644
--- a/shells/rc/Makefile
+++ b/shells/rc/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2005/07/29 18:32:18 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/09/20 04:23:49 jlam Exp $
 
 DISTNAME=       rc-1.6
+PKGREVISION=	1
 CATEGORIES=	shells plan9
 MASTER_SITES=   http://www.star.le.ac.uk/%7Etjg/rc/release/
 
diff --git a/shells/rssh/Makefile b/shells/rssh/Makefile
index 3317d3c364b..612984681c0 100644
--- a/shells/rssh/Makefile
+++ b/shells/rssh/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2005/07/29 18:32:18 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2005/09/20 04:23:49 jlam Exp $
 #
 
 DISTNAME=		rssh-2.2.3
+PKGREVISION=		1
 CATEGORIES=		shells security
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=rssh/}
 
diff --git a/shells/scponly/Makefile b/shells/scponly/Makefile
index 6a9b784a74e..c63eb1ea270 100644
--- a/shells/scponly/Makefile
+++ b/shells/scponly/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2005/07/29 18:32:18 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/09/20 04:23:49 jlam Exp $
 
 DISTNAME=	scponly-4.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	shells security
 MASTER_SITES=	http://www.sublimation.org/scponly/
 EXTRACT_SUFX=	.tgz
diff --git a/shells/scsh/Makefile b/shells/scsh/Makefile
index 84be450d68d..f4ca1c938a4 100644
--- a/shells/scsh/Makefile
+++ b/shells/scsh/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2005/07/29 18:32:18 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2005/09/20 04:23:49 jlam Exp $
 
 DISTNAME=		scsh-0.6.6
+PKGREVISION=		1
 CATEGORIES=		shells lang
 MASTER_SITES=		ftp://ftp.scsh.net/pub/scsh/0.6/
 
diff --git a/shells/static-ast-ksh/Makefile b/shells/static-ast-ksh/Makefile
index 811e82b37f6..539054c9af6 100644
--- a/shells/static-ast-ksh/Makefile
+++ b/shells/static-ast-ksh/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2004/01/11 23:06:54 grant Exp $
+# $NetBSD: Makefile,v 1.5 2005/09/20 04:23:49 jlam Exp $
 #
 .include "../../shells/ast-ksh/Makefile.common"
 
+PKGREVISION=	1
+
 CONFLICTS=	ast-ksh-[0-9]*	# Override.
 
 DISTINFO_FILE=	${.CURDIR}/../../shells/ast-ksh/distinfo
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index 92310281318..fa41b6b8f72 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2005/07/29 18:32:18 jlam Exp $
+# $NetBSD: Makefile,v 1.52 2005/09/20 04:23:49 jlam Exp $
 #
 
 DISTNAME=	tcsh-6.14.00
+PKGREVISION=	1
 CATEGORIES=	shells
 MASTER_SITES=	ftp://ftp.astron.com/pub/tcsh/ \
 		ftp://ftp.gw.com/pub/unix/tcsh/ \
diff --git a/shells/xsh/Makefile b/shells/xsh/Makefile
index 6e2e34595ac..b6de1ccb5a5 100644
--- a/shells/xsh/Makefile
+++ b/shells/xsh/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2005/08/06 06:19:31 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/09/20 04:23:49 jlam Exp $
 
 DISTNAME=	XML-XSH-1.8.2
 PKGNAME=	${DISTNAME:S/XML-XSH/xsh/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xsh/}
 
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 100e3178d28..020f7085f9e 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.48 2005/04/07 14:16:41 adam Exp $
+# $NetBSD: Makefile,v 1.49 2005/09/20 04:23:49 jlam Exp $
 
 .include "../../shells/zsh/Makefile.common"
 
+PKGREVISION=	1
+
 ZSH_VERSION=	4.2.5
 ZSH_MAINTAINER=	uebayasi@NetBSD.org
 
diff --git a/shells/zsh3/Makefile b/shells/zsh3/Makefile
index d870afb75f2..8d1a4561fda 100644
--- a/shells/zsh3/Makefile
+++ b/shells/zsh3/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2005/07/29 18:32:18 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/09/20 04:23:49 jlam Exp $
 #
 
 DISTNAME=       zsh-3.0.8
+PKGREVISION=	1
 CATEGORIES=	shells
 MASTER_SITES=   ftp://ftp.rge.com/pub/shells/zsh/old/ \
 		ftp://sunsite.auc.dk/pub/unix/shells/zsh/old/ \