Add an @shell keyword to handle adding and remove a shell path in /etc/shell

Bump port revision of all ports that were doing it wrong prior to the keyword

CR:		D208
Reviewed by:	antoine
With hat:	portmgr

27 files changed, 70 insertions, 70 deletions

diff --git a/Keywords/pkg_install.awk b/Keywords/pkg_install.awk
index e4207d744d03..c5bc96de82cf 100644
--- a/Keywords/pkg_install.awk
+++ b/Keywords/pkg_install.awk
@@ -14,6 +14,14 @@
 #  @exec if ! [ -f %D/etc/somefile.conf ]; then cp %D/etc/somefile.conf.sample %D/etc/somefile.conf; fi
 #  @comment end @sample somefile.conf.sample
 # 
+##
+#  @shell bin/shell
+# ->
+#  @comment begin @shell bin/shell
+#  @exec cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
+#  @unexec cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
+#  @comment end @shell bin/shell
+
 $1 == "@sample" {
   sample_file=$2
   # Take out .sample
@@ -25,6 +33,17 @@ $1 == "@sample" {
   print "@comment end " $0
   next
 }
+
+$1 == "@shell" {
+	shell_file=$2
+	print "@comment begin " $0
+	print shell_file
+	print "@exec cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak"
+	print "@unexec cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak"
+	print "@comment end " $0
+	next
+}
+
 # Print everything else as-is
 {
   print $0
diff --git a/Keywords/shell.yaml b/Keywords/shell.yaml
new file mode 100644
index 000000000000..0b373d1c52a0
--- /dev/null
+++ b/Keywords/shell.yaml
@@ -0,0 +1,22 @@
+# $FreeBSD$
+#
+# MAINTAINER: portmgr@FreeBSD.org
+#
+# @shell bin/shell
+#
+# Handle adding and remove a path to a shell binary into /etc/shells
+# it replaces the following code:
+#
+# bin/shell
+# @exec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
+# @unexec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
+
+actions: [file]
+post-install: |
+        cp /etc/shells /etc/shells.bak
+        (grep -v %D/%@ /etc/shells.bak; echo %D/%@) > /etc/shells
+        rm -f /etc/shells.bak
+pre-deinstall: |
+        cp /etc/shells /etc/shells.bak
+        grep -v %D/%@ /etc/shells.bak > /etc/shells
+        rm -f /etc/shells.bak
diff --git a/Mk/Scripts/check-stagedir.sh b/Mk/Scripts/check-stagedir.sh
index bfcd8a4fbc1e..ba105ca1864a 100644
--- a/Mk/Scripts/check-stagedir.sh
+++ b/Mk/Scripts/check-stagedir.sh
@@ -64,7 +64,7 @@ parse_plist() {
 			esac
 		;;
 		# Handle [file] Keywords
-		@info\ *)
+		@info\ *|@shell\ *)
 			set -- $line
 			shift
 			echo "${comment}${cwd}/$@"
diff --git a/shells/44bsd-csh/Makefile b/shells/44bsd-csh/Makefile
index 5131f03b9ac7..27001a70da6e 100644
--- a/shells/44bsd-csh/Makefile
+++ b/shells/44bsd-csh/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 PORTNAME=	44bsd-csh
 PORTVERSION=	20001106
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	cy
diff --git a/shells/44bsd-csh/pkg-plist b/shells/44bsd-csh/pkg-plist
index 2cc066b3ecb2..780de495222b 100644
--- a/shells/44bsd-csh/pkg-plist
+++ b/shells/44bsd-csh/pkg-plist
@@ -1,4 +1,2 @@
-bin/44bsd-csh
+@shell bin/44bsd-csh
 man/man1/44bsd-csh.1.gz
-@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells
-@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells
diff --git a/shells/bash/pkg-plist b/shells/bash/pkg-plist
index e6b3406b3a78..1adc63653eb8 100644
--- a/shells/bash/pkg-plist
+++ b/shells/bash/pkg-plist
@@ -1,9 +1,5 @@
-bin/bash
-@exec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
-@unexec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
-bin/rbash
-@exec cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
-@unexec cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
+@shell bin/bash
+@shell bin/rbash
 bin/bashbug
 man/man1/bash.1.gz
 man/man1/bashbug.1.gz
diff --git a/shells/ch/pkg-plist b/shells/ch/pkg-plist
index b602e3033a2a..fb4f82f2b777 100644
--- a/shells/ch/pkg-plist
+++ b/shells/ch/pkg-plist
@@ -1,6 +1,4 @@
-@exec cp /etc/shells /etc/shells.bak; (grep -v %D/bin/ch /etc/shells.bak; echo %D/bin/ch) >/etc/shells; rm -f /etc/shells.bak
-@unexec cp /etc/shells /etc/shells.bak; (grep -v %D/bin/ch /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
-bin/ch
+@shell bin/ch
 %%DATADIR%%/docs/images/softIntegration.gif
 %%DATADIR%%/docs/README
 %%DATADIR%%/docs/index.html
diff --git a/shells/esh/pkg-plist b/shells/esh/pkg-plist
index eb4592f41c25..c1def7c71c37 100644
--- a/shells/esh/pkg-plist
+++ b/shells/esh/pkg-plist
@@ -1,3 +1 @@
-bin/esh
-@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells
-@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells
+@shell bin/esh
diff --git a/shells/fd/pkg-plist b/shells/fd/pkg-plist
index 346ca6d25f73..c36957fb6026 100644
--- a/shells/fd/pkg-plist
+++ b/shells/fd/pkg-plist
@@ -1,15 +1,11 @@
 bin/fd
 bin/fd-cat.C
 bin/fd-cat.ja
-bin/fdsh
-@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
-@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
+@shell bin/fdsh
 bin/fd-dict.tbl
 bin/fd-unicd.tbl
 etc/fd2rc.dist
-@unexec if cmp -s %D/etc/fd2rc %D/etc/fd2rc.sample; then rm -f %D/etc/fd2rc; fi
-etc/fd2rc.sample
-@exec [ ! -f %B/fd2rc ] && cp %B/%f %B/fd2rc
+@sample etc/fd2rc.sample
 man/ja/man1/fd.1.gz
 man/ja/man1/fdsh.1.gz
 man/man1/fd.1.gz
diff --git a/shells/fish/pkg-plist b/shells/fish/pkg-plist
index 80412b798b54..fa1da5283b88 100644
--- a/shells/fish/pkg-plist
+++ b/shells/fish/pkg-plist
@@ -1,4 +1,4 @@
-bin/fish
+@shell bin/fish
 bin/fish_indent
 bin/fish_pager
 bin/fishd
@@ -572,5 +572,3 @@ man/man1/mimedb.1.gz
 @dirrm %%DATADIR%%/completions
 @dirrm %%DATADIR%%
 @dirrm %%ETCDIR%%
-@exec cp /etc/shells /etc/shells.bak; (grep -v %D/bin/fish /etc/shells.bak; echo %D/bin/fish) > /etc/shells; rm -f /etc/shells.bak
-@unexec cp /etc/shells /etc/shells.bak; (grep -v %D/bin/fish /etc/shells.bak) > /etc/shells; rm -f /etc/shells.bak
diff --git a/shells/jailkit/Makefile b/shells/jailkit/Makefile
index 2999a490d7bb..8abd664ea093 100644
--- a/shells/jailkit/Makefile
+++ b/shells/jailkit/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	jailkit
 PORTVERSION=	2.15
+PORTREVISION=	1
 CATEGORIES=	shells
 MASTER_SITES=	http://olivier.sessink.nl/jailkit/ \
 		http://www.sfr-fresh.com/unix/privat/
diff --git a/shells/jailkit/pkg-plist b/shells/jailkit/pkg-plist
index 58912d4c6772..775ba21e6b64 100644
--- a/shells/jailkit/pkg-plist
+++ b/shells/jailkit/pkg-plist
@@ -20,7 +20,7 @@ man/man8/jk_socketd.8.gz
 man/man8/jk_uchroot.8.gz
 man/man8/jk_update.8.gz
 sbin/jk_chrootlaunch
-sbin/jk_chrootsh
+@shell sbin/jk_chrootsh
 sbin/jk_cp
 sbin/jk_init
 sbin/jk_check
@@ -30,8 +30,6 @@ sbin/jk_list
 sbin/jk_update
 sbin/jk_lsh
 sbin/jk_socketd
-@exec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v jk_chrootsh /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
-@unexec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v jk_chrootsh /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
 %%DATADIR%%/jk_lib.py
 %%DATADIR%%/jk_lib.pyc
 @dirrm %%DATADIR%%
diff --git a/shells/ksh93/pkg-plist b/shells/ksh93/pkg-plist
index 8c2880a9dc27..f4850a427f4d 100644
--- a/shells/ksh93/pkg-plist
+++ b/shells/ksh93/pkg-plist
@@ -1,6 +1,4 @@
-bin/ksh93
-@unexec echo "Updating /etc/shells"; sed -i "" "\|%D/%F|d" /etc/shells
-@exec echo "Updating /etc/shells"; sed -i "" "\|%D/%F|d" /etc/shells; echo %D/%F >> /etc/shells
+@shell bin/ksh93
 man/man1/ksh93.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dirs
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/popd
diff --git a/shells/lshell/pkg-plist b/shells/lshell/pkg-plist
index 011f93675e8c..248e459d0929 100644
--- a/shells/lshell/pkg-plist
+++ b/shells/lshell/pkg-plist
@@ -1,10 +1,6 @@
-bin/lshell
+@shell bin/lshell
 man/man1/lshell.1.gz
-@exec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
-@unexec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
-@unexec if cmp -s %D/etc/lshell.conf %D/etc/lshell.conf.sample; then rm -f %D/etc/lshell.conf; fi
-etc/lshell.conf.sample
-@exec if [ ! -f %D/etc/lshell.conf ]; then cp %B/%f %D/etc/lshell.conf; fi
+@sample etc/lshell.conf.sample
 etc/logrotate.d/lshell
 %%PYTHON_SITELIBDIR%%/lshell.py
 %%PYTHON_SITELIBDIR%%/lshell.pyc
diff --git a/shells/mksh/pkg-plist b/shells/mksh/pkg-plist
index 378073b2e583..989a4a4b9937 100644
--- a/shells/mksh/pkg-plist
+++ b/shells/mksh/pkg-plist
@@ -1,7 +1,4 @@
 man/man1/mksh.1.gz
-@comment Please mind the order. bin/mksh needs to come right before the exec/unexec magic.
-bin/mksh
-@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
-@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
+@shell bin/mksh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dot.mkshrc
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/shells/osh/Makefile b/shells/osh/Makefile
index 7247df730503..9fccd3e163c7 100644
--- a/shells/osh/Makefile
+++ b/shells/osh/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	osh
 DISTVERSION=	20140410
+PORTREVISION=	1
 CATEGORIES=	shells
 MASTER_SITES=	http://v6shell.org/src/
 
diff --git a/shells/osh/pkg-plist b/shells/osh/pkg-plist
index 4db1b64e8f89..504dde8295e1 100644
--- a/shells/osh/pkg-plist
+++ b/shells/osh/pkg-plist
@@ -1,7 +1,7 @@
 bin/fd2
 bin/goto
 bin/if
-bin/osh
+@shell bin/osh
 bin/sh6
 bin/glob6
 man/man1/fd2.1.gz
@@ -10,5 +10,3 @@ man/man1/goto.1.gz
 man/man1/if.1.gz
 man/man1/osh.1.gz
 man/man1/sh6.1.gz
-@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
-@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
diff --git a/shells/pdksh/Makefile b/shells/pdksh/Makefile
index a82fb848b919..00d8f7b131f5 100644
--- a/shells/pdksh/Makefile
+++ b/shells/pdksh/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pdksh
 PORTVERSION=	5.2.14p2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	shells
 MASTER_SITES=	http://gd.tuwien.ac.at/utils/shells/pdksh/ \
 		ftp://ftp.lip6.fr/pub/unix/shells/pdksh/ \
diff --git a/shells/pdksh/pkg-plist b/shells/pdksh/pkg-plist
index bf663d281265..71a8054ab011 100644
--- a/shells/pdksh/pkg-plist
+++ b/shells/pdksh/pkg-plist
@@ -1,4 +1,2 @@
-bin/ksh
+@shell bin/ksh
 man/man1/ksh.1.gz
-@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells
-@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells
diff --git a/shells/rssh/Makefile b/shells/rssh/Makefile
index 15efed278db9..7aca6be55f38 100644
--- a/shells/rssh/Makefile
+++ b/shells/rssh/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	rssh
 PORTVERSION=	2.3.4
+PORTREVISION=	1
 CATEGORIES=	shells security
 MASTER_SITES=	SF
 
diff --git a/shells/rssh/pkg-plist b/shells/rssh/pkg-plist
index be3401b000b7..7976ca9a5483 100644
--- a/shells/rssh/pkg-plist
+++ b/shells/rssh/pkg-plist
@@ -1,7 +1,5 @@
-bin/rssh
+@shell bin/rssh
 man/man1/rssh.1.gz
 man/man5/rssh.conf.5.gz
-@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
-@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
 etc/rssh.conf.default.dist
 libexec/rssh_chroot_helper
diff --git a/shells/sash/pkg-plist b/shells/sash/pkg-plist
index 355e8cfb338b..71242f07d40d 100644
--- a/shells/sash/pkg-plist
+++ b/shells/sash/pkg-plist
@@ -1,4 +1,2 @@
-bin/sash
-@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells ; rm -f /etc/shells.bak
-@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells ; rm -f /etc/shells.bak
+@shell bin/sash
 man/man1/sash.1.gz
diff --git a/shells/scponly/pkg-plist b/shells/scponly/pkg-plist
index 744216e6a3cf..dee68060efd7 100644
--- a/shells/scponly/pkg-plist
+++ b/shells/scponly/pkg-plist
@@ -1,6 +1,4 @@
-bin/scponly
-@exec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
-@unexec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
+@shell bin/scponly
 %%CHROOT%%@exec echo ""
 %%CHROOT%%@exec echo "To setup chroot cage, run the following commands:"
 %%CHROOT%%@exec echo "  1) cd %%PREFIX%%/%%EXAMPLESDIR%%/ && /bin/sh setup_chroot.sh"
diff --git a/shells/v7sh/Makefile b/shells/v7sh/Makefile
index 0061662cdd5e..f9d1c3bb25df 100644
--- a/shells/v7sh/Makefile
+++ b/shells/v7sh/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	v7sh
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	shells
 MASTER_SITES=	ftp://minnie.tuhs.org/UnixArchive/PDP-11/Trees/V7/usr/src/cmd/sh/:s \
 		http://minnie.tuhs.org/UnixTree/V7/usr/src/cmd/sh/:s \
diff --git a/shells/v7sh/pkg-plist b/shells/v7sh/pkg-plist
index 645af0f4fde8..1e2a32315f0b 100644
--- a/shells/v7sh/pkg-plist
+++ b/shells/v7sh/pkg-plist
@@ -1,4 +1,2 @@
-bin/v7sh
+@shell bin/v7sh
 man/man1/v7sh.1.gz
-@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells
-@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells
diff --git a/shells/vshnu/pkg-plist b/shells/vshnu/pkg-plist
index 59e360ff8209..eca016d734c4 100644
--- a/shells/vshnu/pkg-plist
+++ b/shells/vshnu/pkg-plist
@@ -1,6 +1,4 @@
-bin/vshnu
-@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells
-@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells
+@shell bin/vshnu
 %%SITE_PERL%%/vshnucfg.pl
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/vshnu/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/vshnu
diff --git a/shells/zsh/pkg-plist b/shells/zsh/pkg-plist
index ce61923d4ddb..f25469bf8240 100644
--- a/shells/zsh/pkg-plist
+++ b/shells/zsh/pkg-plist
@@ -1,9 +1,5 @@
-bin/zsh
-@exec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
-@unexec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
-bin/rzsh
-@exec cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
-@unexec cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
+@shell bin/zsh
+@shell bin/rzsh
 bin/zsh-%%ZSH_VER%%
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/cap.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/clone.so