Tweak pkg-descr, break out /etc/shell editing as seperate target, install

examples.  Also use the modern nobs bsd.port.mk provides.

PR:		30732
Submitted by:	Cyrille Lefevre <clefevre@citeweb.net>

3 files changed, 231 insertions, 13 deletions

diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index 45c2a8666123..99ffea9dd5f8 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	bash
 PORTVERSION=	2.05b.007
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		ftp://ftp.cwru.edu/pub/bash/
@@ -50,11 +50,19 @@ post-patch:
 	@${REINPLACE_CMD} -e "s,.FN /bin/bash,.FN ${PREFIX}/bin/bash," \
 		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}/doc/bash.1
 
-post-install:
+update-etc-shells:
+	@${ECHO_MSG} "updating /etc/shells"
+	@${CP} /etc/shells /etc/shells.bak
+	@( ${GREP} -v ${PREFIX}/bin/bash /etc/shells.bak; \
+		${ECHO_CMD} ${PREFIX}/bin/bash) >/etc/shells
+	@${RM} /etc/shells.bak
+
+post-install: update-etc-shells
 	${LN} -f ${PREFIX}/bin/bash ${PREFIX}/bin/bash2
-	${CP} /etc/shells /etc/shells.bak
-	(${GREP} -v ${PREFIX}/bin/bash /etc/shells.bak; ${ECHO_CMD} ${PREFIX}/bin/bash) >/etc/shells
-	${RM} /etc/shells.bak
+	@${MKDIR} ${EXAMPLESDIR}
+	@cd ${WRKSRC}/examples ; ${PAX} -rw . ${EXAMPLESDIR}
+	@${FIND} ${EXAMPLESDIR} -type d -print | xargs chmod a+rx
+	@${CHMOD} -R a+r ${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_MAN}  \
diff --git a/shells/bash2/pkg-descr b/shells/bash2/pkg-descr
index ad734fba0d65..7173cc3b1bd4 100644
--- a/shells/bash2/pkg-descr
+++ b/shells/bash2/pkg-descr
@@ -1,11 +1,19 @@
-Bash is the GNU Project's Bourne
-Again SHell, an interactive shell with Bourne shell syntax (/bin/sh);
-but also with interactive command line editing, job control on
-architectures that support it, Csh-like history features and brace
-expansion, and a slew of other stuff.  For more information on the
-features of Bash that are new to this type of shell, see the file
-`documentation/features.texi'.  There is also a processed DVI file
-there, as well as a large man page.
+Bash is the GNU Project's Bourne Again SHell
+An interactive shell with Bourne shell syntax (/bin/sh);
+It is intended to conform to the IEEE POSIX P1003.2/ISO 9945.2 Shell and
+Tools standard.  It includes the following features:
+interactive command line editing, job control on architectures that support it,
+Korn shell (ksh) features, Csh-like history features and brace expansion,
+history and command re-entry, job control, shell functions and aliases,
+arrays, arithmetic, ANSI-C quoting, tilde expansion, brace expansion,
+substring capabilities, indirect variable expansion, expanded i/o capabilities,
+control of builtin commands, help, shell optional behavior, prompt
+customization, security, directory stack, POSIX mode, internationalization,
+and command timing.
+
+For more information on the features of Bash that are new to this type
+of shell, see the file `documentation/features.texi'.
+There is also a processed DVI file there, as well as a large man page.
 
 WWW: http://www.gnu.org/software/bash/
      http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html
diff --git a/shells/bash2/pkg-plist b/shells/bash2/pkg-plist
index 6c39552d68d5..bc94f702e312 100644
--- a/shells/bash2/pkg-plist
+++ b/shells/bash2/pkg-plist
@@ -11,3 +11,205 @@ info/bash.info
 %%PORTDOCS%%%%DOCSDIR%%/bashref.ps.bz2
 %%PORTDOCS%%%%DOCSDIR%%/article.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%EXAMPLESDIR%%/bashdb/PERMISSION
+%%EXAMPLESDIR%%/bashdb/bashdb
+%%EXAMPLESDIR%%/bashdb/bashdb.el
+%%EXAMPLESDIR%%/complete/complete-examples
+%%EXAMPLESDIR%%/complete/complete.ianmac
+%%EXAMPLESDIR%%/complete/complete2.ianmac
+%%EXAMPLESDIR%%/complete/complete.freebsd
+%%EXAMPLESDIR%%/complete/complete.gnu-longopt
+%%EXAMPLESDIR%%/functions/array-stuff
+%%EXAMPLESDIR%%/functions/array-to-string
+%%EXAMPLESDIR%%/functions/autoload
+%%EXAMPLESDIR%%/functions/autoload.v2
+%%EXAMPLESDIR%%/functions/autoload.v3
+%%EXAMPLESDIR%%/functions/basename
+%%EXAMPLESDIR%%/functions/basename2
+%%EXAMPLESDIR%%/functions/coproc.bash
+%%EXAMPLESDIR%%/functions/coshell.README
+%%EXAMPLESDIR%%/functions/coshell.bash
+%%EXAMPLESDIR%%/functions/csh-compat
+%%EXAMPLESDIR%%/functions/dirfuncs
+%%EXAMPLESDIR%%/functions/dirname
+%%EXAMPLESDIR%%/functions/emptydir
+%%EXAMPLESDIR%%/functions/exitstat
+%%EXAMPLESDIR%%/functions/external
+%%EXAMPLESDIR%%/functions/fact
+%%EXAMPLESDIR%%/functions/fstty
+%%EXAMPLESDIR%%/functions/func
+%%EXAMPLESDIR%%/functions/gethtml
+%%EXAMPLESDIR%%/functions/getoptx.bash
+%%EXAMPLESDIR%%/functions/inetaddr
+%%EXAMPLESDIR%%/functions/inpath
+%%EXAMPLESDIR%%/functions/isnum.bash
+%%EXAMPLESDIR%%/functions/isnum2
+%%EXAMPLESDIR%%/functions/isvalidip
+%%EXAMPLESDIR%%/functions/jdate.bash
+%%EXAMPLESDIR%%/functions/jj.bash
+%%EXAMPLESDIR%%/functions/keep
+%%EXAMPLESDIR%%/functions/ksh-cd
+%%EXAMPLESDIR%%/functions/ksh-compat-test
+%%EXAMPLESDIR%%/functions/kshenv
+%%EXAMPLESDIR%%/functions/login
+%%EXAMPLESDIR%%/functions/lowercase
+%%EXAMPLESDIR%%/functions/manpage
+%%EXAMPLESDIR%%/functions/mhfold
+%%EXAMPLESDIR%%/functions/notify.bash
+%%EXAMPLESDIR%%/functions/pathfuncs
+%%EXAMPLESDIR%%/functions/recurse
+%%EXAMPLESDIR%%/functions/repeat2
+%%EXAMPLESDIR%%/functions/repeat3
+%%EXAMPLESDIR%%/functions/seq
+%%EXAMPLESDIR%%/functions/seq2
+%%EXAMPLESDIR%%/functions/shcat
+%%EXAMPLESDIR%%/functions/shcat2
+%%EXAMPLESDIR%%/functions/sort-pos-params
+%%EXAMPLESDIR%%/functions/substr
+%%EXAMPLESDIR%%/functions/substr2
+%%EXAMPLESDIR%%/functions/term
+%%EXAMPLESDIR%%/functions/whatis
+%%EXAMPLESDIR%%/functions/whence
+%%EXAMPLESDIR%%/functions/which
+%%EXAMPLESDIR%%/functions/xalias.bash
+%%EXAMPLESDIR%%/functions/xfind.bash
+%%EXAMPLESDIR%%/loadables/perl/Makefile
+%%EXAMPLESDIR%%/loadables/perl/Makefile.in
+%%EXAMPLESDIR%%/loadables/perl/README
+%%EXAMPLESDIR%%/loadables/perl/bperl.c
+%%EXAMPLESDIR%%/loadables/perl/iperl.c
+%%EXAMPLESDIR%%/loadables/README
+%%EXAMPLESDIR%%/loadables/template.c
+%%EXAMPLESDIR%%/loadables/Makefile
+%%EXAMPLESDIR%%/loadables/Makefile.in
+%%EXAMPLESDIR%%/loadables/necho.c
+%%EXAMPLESDIR%%/loadables/hello.c
+%%EXAMPLESDIR%%/loadables/print.c
+%%EXAMPLESDIR%%/loadables/realpath.c
+%%EXAMPLESDIR%%/loadables/sleep.c
+%%EXAMPLESDIR%%/loadables/truefalse.c
+%%EXAMPLESDIR%%/loadables/getconf.h
+%%EXAMPLESDIR%%/loadables/getconf.c
+%%EXAMPLESDIR%%/loadables/finfo.c
+%%EXAMPLESDIR%%/loadables/cat.c
+%%EXAMPLESDIR%%/loadables/cut.c
+%%EXAMPLESDIR%%/loadables/logname.c
+%%EXAMPLESDIR%%/loadables/basename.c
+%%EXAMPLESDIR%%/loadables/dirname.c
+%%EXAMPLESDIR%%/loadables/tty.c
+%%EXAMPLESDIR%%/loadables/pathchk.c
+%%EXAMPLESDIR%%/loadables/tee.c
+%%EXAMPLESDIR%%/loadables/rmdir.c
+%%EXAMPLESDIR%%/loadables/head.c
+%%EXAMPLESDIR%%/loadables/printenv.c
+%%EXAMPLESDIR%%/loadables/push.c
+%%EXAMPLESDIR%%/loadables/id.c
+%%EXAMPLESDIR%%/loadables/whoami.c
+%%EXAMPLESDIR%%/loadables/uname.c
+%%EXAMPLESDIR%%/loadables/sync.c
+%%EXAMPLESDIR%%/loadables/mkdir.c
+%%EXAMPLESDIR%%/loadables/ln.c
+%%EXAMPLESDIR%%/loadables/unlink.c
+%%EXAMPLESDIR%%/misc/suncmd.termcap
+%%EXAMPLESDIR%%/misc/aliasconv.sh
+%%EXAMPLESDIR%%/misc/aliasconv.bash
+%%EXAMPLESDIR%%/misc/cshtobash
+%%EXAMPLESDIR%%/scripts/adventure.sh
+%%EXAMPLESDIR%%/scripts/bcsh.sh
+%%EXAMPLESDIR%%/scripts/cat.sh
+%%EXAMPLESDIR%%/scripts/center
+%%EXAMPLESDIR%%/scripts/dd-ex.sh
+%%EXAMPLESDIR%%/scripts/fixfiles.bash
+%%EXAMPLESDIR%%/scripts/hanoi.bash
+%%EXAMPLESDIR%%/scripts/inpath
+%%EXAMPLESDIR%%/scripts/krand.bash
+%%EXAMPLESDIR%%/scripts/line-input.bash
+%%EXAMPLESDIR%%/scripts/nohup.bash
+%%EXAMPLESDIR%%/scripts/precedence
+%%EXAMPLESDIR%%/scripts/randomcard.bash
+%%EXAMPLESDIR%%/scripts/scrollbar
+%%EXAMPLESDIR%%/scripts/scrollbar2
+%%EXAMPLESDIR%%/scripts/self-repro
+%%EXAMPLESDIR%%/scripts/showperm.bash
+%%EXAMPLESDIR%%/scripts/shprompt
+%%EXAMPLESDIR%%/scripts/spin.bash
+%%EXAMPLESDIR%%/scripts/timeout
+%%EXAMPLESDIR%%/scripts/vtree2
+%%EXAMPLESDIR%%/scripts/vtree3
+%%EXAMPLESDIR%%/scripts/vtree3a
+%%EXAMPLESDIR%%/scripts/websrv.sh
+%%EXAMPLESDIR%%/scripts/xterm_title
+%%EXAMPLESDIR%%/scripts/zprintf
+%%EXAMPLESDIR%%/scripts.v2/PERMISSION
+%%EXAMPLESDIR%%/scripts.v2/README
+%%EXAMPLESDIR%%/scripts.v2/arc2tarz
+%%EXAMPLESDIR%%/scripts.v2/bashrand
+%%EXAMPLESDIR%%/scripts.v2/cal2day.bash
+%%EXAMPLESDIR%%/scripts.v2/cdhist.bash
+%%EXAMPLESDIR%%/scripts.v2/corename
+%%EXAMPLESDIR%%/scripts.v2/fman
+%%EXAMPLESDIR%%/scripts.v2/frcp
+%%EXAMPLESDIR%%/scripts.v2/lowercase
+%%EXAMPLESDIR%%/scripts.v2/ncp
+%%EXAMPLESDIR%%/scripts.v2/newext
+%%EXAMPLESDIR%%/scripts.v2/nmv
+%%EXAMPLESDIR%%/scripts.v2/pages
+%%EXAMPLESDIR%%/scripts.v2/pf
+%%EXAMPLESDIR%%/scripts.v2/ren
+%%EXAMPLESDIR%%/scripts.v2/rename
+%%EXAMPLESDIR%%/scripts.v2/repeat
+%%EXAMPLESDIR%%/scripts.v2/untar
+%%EXAMPLESDIR%%/scripts.v2/uudec
+%%EXAMPLESDIR%%/scripts.v2/uuenc
+%%EXAMPLESDIR%%/scripts.v2/vtree
+%%EXAMPLESDIR%%/scripts.v2/where
+%%EXAMPLESDIR%%/scripts.v2/pmtop
+%%EXAMPLESDIR%%/scripts.v2/shprof
+%%EXAMPLESDIR%%/scripts.noah/PERMISSION
+%%EXAMPLESDIR%%/scripts.noah/README
+%%EXAMPLESDIR%%/scripts.noah/aref.bash
+%%EXAMPLESDIR%%/scripts.noah/bash.sub.bash
+%%EXAMPLESDIR%%/scripts.noah/bash_version.bash
+%%EXAMPLESDIR%%/scripts.noah/meta.bash
+%%EXAMPLESDIR%%/scripts.noah/mktmp.bash
+%%EXAMPLESDIR%%/scripts.noah/number.bash
+%%EXAMPLESDIR%%/scripts.noah/prompt.bash
+%%EXAMPLESDIR%%/scripts.noah/remap_keys.bash
+%%EXAMPLESDIR%%/scripts.noah/require.bash
+%%EXAMPLESDIR%%/scripts.noah/send_mail.bash
+%%EXAMPLESDIR%%/scripts.noah/shcat.bash
+%%EXAMPLESDIR%%/scripts.noah/source.bash
+%%EXAMPLESDIR%%/scripts.noah/string.bash
+%%EXAMPLESDIR%%/scripts.noah/stty.bash
+%%EXAMPLESDIR%%/scripts.noah/y_or_n_p.bash
+%%EXAMPLESDIR%%/startup-files/apple/README
+%%EXAMPLESDIR%%/startup-files/apple/aliases
+%%EXAMPLESDIR%%/startup-files/apple/bash.defaults
+%%EXAMPLESDIR%%/startup-files/apple/environment
+%%EXAMPLESDIR%%/startup-files/apple/login
+%%EXAMPLESDIR%%/startup-files/apple/logout
+%%EXAMPLESDIR%%/startup-files/apple/rc
+%%EXAMPLESDIR%%/startup-files/README
+%%EXAMPLESDIR%%/startup-files/Bashrc.bfox
+%%EXAMPLESDIR%%/startup-files/Bash_aliases
+%%EXAMPLESDIR%%/startup-files/Bash_profile
+%%EXAMPLESDIR%%/startup-files/bash-profile
+%%EXAMPLESDIR%%/startup-files/bashrc
+%%EXAMPLESDIR%%/obashdb/PERMISSION
+%%EXAMPLESDIR%%/obashdb/README
+%%EXAMPLESDIR%%/obashdb/bashdb
+%%EXAMPLESDIR%%/obashdb/bashdb.fns
+%%EXAMPLESDIR%%/obashdb/bashdb.pre
+@dirrm %%EXAMPLESDIR%%/bashdb
+@dirrm %%EXAMPLESDIR%%/complete
+@dirrm %%EXAMPLESDIR%%/functions
+@dirrm %%EXAMPLESDIR%%/loadables/perl
+@dirrm %%EXAMPLESDIR%%/loadables
+@dirrm %%EXAMPLESDIR%%/misc
+@dirrm %%EXAMPLESDIR%%/obashdb
+@dirrm %%EXAMPLESDIR%%/scripts
+@dirrm %%EXAMPLESDIR%%/scripts.noah
+@dirrm %%EXAMPLESDIR%%/scripts.v2
+@dirrm %%EXAMPLESDIR%%/startup-files/apple
+@dirrm %%EXAMPLESDIR%%/startup-files
+@dirrm %%EXAMPLESDIR%%