[pkgsrc/trunk]: pkgsrc Teach the +SHELLS helper script to not create an /etc/...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Teach the +SHELLS helper script to not create an /etc/...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 02:17:01 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/44d273ae8b5f
branches:  trunk
changeset: 499332:44d273ae8b5f
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Sep 20 04:23:48 2005 +0000

description:
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.

diffstat:

 misc/screen/Makefile           |  4 ++--
 mk/install/shell               |  3 ++-
 shells/ast-ksh/Makefile        |  4 +++-
 shells/bash/Makefile           |  4 ++--
 shells/bash2/Makefile          |  4 ++--
 shells/es/Makefile             |  4 ++--
 shells/esh/Makefile            |  3 ++-
 shells/osh/Makefile            |  3 ++-
 shells/pdksh/Makefile          |  4 ++--
 shells/perlsh/Makefile         |  4 ++--
 shells/posh/Makefile           |  3 ++-
 shells/rc/Makefile             |  3 ++-
 shells/rssh/Makefile           |  3 ++-
 shells/scponly/Makefile        |  4 ++--
 shells/scsh/Makefile           |  3 ++-
 shells/static-ast-ksh/Makefile |  4 +++-
 shells/tcsh/Makefile           |  3 ++-
 shells/xsh/Makefile            |  4 ++--
 shells/zsh/Makefile            |  4 +++-
 shells/zsh3/Makefile           |  3 ++-
 20 files changed, 43 insertions(+), 28 deletions(-)

diffs (272 lines):

diff -r d26a40ea4b65 -r 44d273ae8b5f misc/screen/Makefile
--- a/misc/screen/Makefile      Tue Sep 20 03:52:01 2005 +0000
+++ b/misc/screen/Makefile      Tue Sep 20 04:23:48 2005 +0000
@@ -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 -r d26a40ea4b65 -r 44d273ae8b5f mk/install/shell
--- a/mk/install/shell  Tue Sep 20 03:52:01 2005 +0000
+++ b/mk/install/shell  Tue Sep 20 04:23:48 2005 +0000
@@ -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 @@
                ${TEST} -f "$shell" || continue
 
                shelldb="/etc/shells"
+               ${TEST} -f "$shelldb" || continue
                if ${TEST} -f "$shelldb" && \
                   ${GREP} "^$shell" $shelldb >/dev/null; then
                        :
diff -r d26a40ea4b65 -r 44d273ae8b5f shells/ast-ksh/Makefile
--- a/shells/ast-ksh/Makefile   Tue Sep 20 03:52:01 2005 +0000
+++ b/shells/ast-ksh/Makefile   Tue Sep 20 04:23:48 2005 +0000
@@ -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 -r d26a40ea4b65 -r 44d273ae8b5f shells/bash/Makefile
--- a/shells/bash/Makefile      Tue Sep 20 03:52:01 2005 +0000
+++ b/shells/bash/Makefile      Tue Sep 20 04:23:48 2005 +0000
@@ -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 -r d26a40ea4b65 -r 44d273ae8b5f shells/bash2/Makefile
--- a/shells/bash2/Makefile     Tue Sep 20 03:52:01 2005 +0000
+++ b/shells/bash2/Makefile     Tue Sep 20 04:23:48 2005 +0000
@@ -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 -r d26a40ea4b65 -r 44d273ae8b5f shells/es/Makefile
--- a/shells/es/Makefile        Tue Sep 20 03:52:01 2005 +0000
+++ b/shells/es/Makefile        Tue Sep 20 04:23:48 2005 +0000
@@ -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 -r d26a40ea4b65 -r 44d273ae8b5f shells/esh/Makefile
--- a/shells/esh/Makefile       Tue Sep 20 03:52:01 2005 +0000
+++ b/shells/esh/Makefile       Tue Sep 20 04:23:48 2005 +0000
@@ -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 -r d26a40ea4b65 -r 44d273ae8b5f shells/osh/Makefile
--- a/shells/osh/Makefile       Tue Sep 20 03:52:01 2005 +0000
+++ b/shells/osh/Makefile       Tue Sep 20 04:23:48 2005 +0000
@@ -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 -r d26a40ea4b65 -r 44d273ae8b5f shells/pdksh/Makefile
--- a/shells/pdksh/Makefile     Tue Sep 20 03:52:01 2005 +0000
+++ b/shells/pdksh/Makefile     Tue Sep 20 04:23:48 2005 +0000
@@ -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 -r d26a40ea4b65 -r 44d273ae8b5f shells/perlsh/Makefile
--- a/shells/perlsh/Makefile    Tue Sep 20 03:52:01 2005 +0000
+++ b/shells/perlsh/Makefile    Tue Sep 20 04:23:48 2005 +0000
@@ -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 -r d26a40ea4b65 -r 44d273ae8b5f shells/posh/Makefile
--- a/shells/posh/Makefile      Tue Sep 20 03:52:01 2005 +0000
+++ b/shells/posh/Makefile      Tue Sep 20 04:23:48 2005 +0000
@@ -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 -r d26a40ea4b65 -r 44d273ae8b5f shells/rc/Makefile
--- a/shells/rc/Makefile        Tue Sep 20 03:52:01 2005 +0000
+++ b/shells/rc/Makefile        Tue Sep 20 04:23:48 2005 +0000
@@ -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 -r d26a40ea4b65 -r 44d273ae8b5f shells/rssh/Makefile
--- a/shells/rssh/Makefile      Tue Sep 20 03:52:01 2005 +0000
+++ b/shells/rssh/Makefile      Tue Sep 20 04:23:48 2005 +0000
@@ -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 -r d26a40ea4b65 -r 44d273ae8b5f shells/scponly/Makefile
--- a/shells/scponly/Makefile   Tue Sep 20 03:52:01 2005 +0000
+++ b/shells/scponly/Makefile   Tue Sep 20 04:23:48 2005 +0000
@@ -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 -r d26a40ea4b65 -r 44d273ae8b5f shells/scsh/Makefile
--- a/shells/scsh/Makefile      Tue Sep 20 03:52:01 2005 +0000
+++ b/shells/scsh/Makefile      Tue Sep 20 04:23:48 2005 +0000
@@ -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 -r d26a40ea4b65 -r 44d273ae8b5f shells/static-ast-ksh/Makefile
--- a/shells/static-ast-ksh/Makefile    Tue Sep 20 03:52:01 2005 +0000
+++ b/shells/static-ast-ksh/Makefile    Tue Sep 20 04:23:48 2005 +0000
@@ -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 -r d26a40ea4b65 -r 44d273ae8b5f shells/tcsh/Makefile
--- a/shells/tcsh/Makefile      Tue Sep 20 03:52:01 2005 +0000
+++ b/shells/tcsh/Makefile      Tue Sep 20 04:23:48 2005 +0000
@@ -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 -r d26a40ea4b65 -r 44d273ae8b5f shells/xsh/Makefile
--- a/shells/xsh/Makefile       Tue Sep 20 03:52:01 2005 +0000
+++ b/shells/xsh/Makefile       Tue Sep 20 04:23:48 2005 +0000
@@ -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 -r d26a40ea4b65 -r 44d273ae8b5f shells/zsh/Makefile
--- a/shells/zsh/Makefile       Tue Sep 20 03:52:01 2005 +0000
+++ b/shells/zsh/Makefile       Tue Sep 20 04:23:48 2005 +0000
@@ -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@localhost
 
diff -r d26a40ea4b65 -r 44d273ae8b5f shells/zsh3/Makefile
--- a/shells/zsh3/Makefile      Tue Sep 20 03:52:01 2005 +0000
+++ b/shells/zsh3/Makefile      Tue Sep 20 04:23:48 2005 +0000
@@ -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/ \
Prev by Date: [pkgsrc/trunk]: pkgsrc/games/xvier Use do-install target to install the three...
Next by Date: [pkgsrc/trunk]: pkgsrc/mk/tools Teach the tools framework about "byacc", whic...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/games/xvier Use do-install target to install the three...
Next by Thread: [pkgsrc/trunk]: pkgsrc/mk/tools Teach the tools framework about "byacc", whic...
Indexes:
Home | Main Index | Thread Index | Old Index