This commit was manufactured by cvs2svn to create tag 'RELEASE_3_5_0'.release/3.5.0

36 files changed, 0 insertions, 772 deletions

diff --git a/shells/bash/Makefile b/shells/bash/Makefile
deleted file mode 100644
index a9a8ba9fe9f4..000000000000
--- a/shells/bash/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# New ports collection makefile for:	bash
-# Date created:		21 August 1994
-# Whom:			jkh
-#
-# $FreeBSD$
-#
-
-PORTNAME=	bash
-PORTVERSION=    2.04
-CATEGORIES=	shells
-MASTER_SITES=	${MASTER_SITE_GNU} \
-		ftp://ftp.cwru.edu/pub/bash/
-MASTER_SITE_SUBDIR=	bash
-.if !defined(NOPORTDOCS)
-DISTFILES=      bash-${PORTVERSION}.tar.gz bash-doc-${PORTVERSION}.tar.gz
-.endif
-
-MAINTAINER=	ache@FreeBSD.org
-
-GNU_CONFIGURE=	Yes
-CONFIGURE_ARGS=	--with-installed-readline
-CONFIGURE_ENV=  LDFLAGS=-static
-MAN1=		bash.1 bashbug.1
-
-post-install:
-	${CP} /etc/shells /etc/shells.bak
-	(${GREP} -v ${PREFIX}/bin/bash /etc/shells.bak; ${ECHO} ${PREFIX}/bin/bash) >/etc/shells
-	${RM} /etc/shells.bak
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/bash
-	${INSTALL_MAN}  \
-		${WRKDIR}/doc/article.ps  \
-		${WRKDIR}/doc/bashref.ps  \
-		${PREFIX}/share/doc/bash
-	${INSTALL_MAN}  \
-		${WRKDIR}/doc/article.txt  \
-		${PREFIX}/share/doc/bash
-	${GZIP_CMD} ${PREFIX}/share/doc/bash/*.ps
-.endif
-
-.include <bsd.port.mk>
diff --git a/shells/bash/distinfo b/shells/bash/distinfo
deleted file mode 100644
index fdeba66bf41c..000000000000
--- a/shells/bash/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (bash-2.04.tar.gz) = 49b548a8b72a4c925ff26930e4c31c6c
-MD5 (bash-doc-2.04.tar.gz) = a9684d1095e7ea1adb8759c3f4fca13d
diff --git a/shells/bash/files/patch-aa b/shells/bash/files/patch-aa
deleted file mode 100644
index f30ca9d79b7b..000000000000
--- a/shells/bash/files/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-*** doc/Makefile.in.bak	Fri Jan 31 00:12:33 1997
---- doc/Makefile.in	Sat Jun 28 02:23:01 1997
-***************
-*** 155,161 ****
-  	-$(INSTALL_DATA) $(srcdir)/bashref.info $(infodir)/bash.info
-  # run install-info if it is present to update the info directory
-  	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-! 		install-info --dir-file=$(infodir)/dir $(infodir)/bash.info; \
-  	else true; fi
-  
-  uninstall:
---- 155,163 ----
-  	-$(INSTALL_DATA) $(srcdir)/bashref.info $(infodir)/bash.info
-  # run install-info if it is present to update the info directory
-  	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-! 		install-info \
-! 		--entry="* BASH: (bash).                 Bash Reference Manual." \
-! 		--dir-file=$(infodir)/dir $(infodir)/bash.info; \
-  	else true; fi
-  
-  uninstall:
diff --git a/shells/bash/files/patch-ab b/shells/bash/files/patch-ab
deleted file mode 100644
index db11179f5a31..000000000000
--- a/shells/bash/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Wed Mar  1 22:52:12 2000
-+++ Makefile.in	Mon May  8 00:05:03 2000
-@@ -582,7 +582,7 @@
- 
- install:	.made installdirs
- 	$(INSTALL_PROGRAM) $(INSTALLMODE) $(Program) $(bindir)/$(Program)
--	$(INSTALL_PROGRAM) $(INSTALLMODE2) bashbug $(bindir)/bashbug
-+	$(INSTALL) $(INSTALLMODE2) bashbug $(bindir)/bashbug
- 	-( cd $(DOCDIR) ; $(MAKE) $(MFLAGS) \
- 		man1dir=$(man1dir) man1ext=$(man1ext) \
- 		man3dir=$(man3dir) man3ext=$(man3ext) \
diff --git a/shells/bash/files/patch-ac b/shells/bash/files/patch-ac
deleted file mode 100644
index 33c30ce82e7e..000000000000
--- a/shells/bash/files/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	Tue Feb 22 19:46:17 2000
-+++ configure	Mon May  8 00:23:05 2000
-@@ -761,7 +761,7 @@
- mips-irix6*)	opt_bash_malloc=no ;;	# needs 8-byte alignment
- m68k-sysv)	opt_bash_malloc=no ;;	# fixes file descriptor leak in closedir
- sparc-linux*)	opt_bash_malloc=no ;;	# sparc running linux; requires ELF
--#*-freebsd*)	opt_bash_malloc=no ;;	# they claim it's better
-+*-freebsd*)     opt_bash_malloc=no ;;   # they claim it's better
- *-aix*)		opt_bash_malloc=no ;;	# AIX machines
- *-nextstep*)	opt_bash_malloc=no ;;	# NeXT machines running NeXTstep
- *-rhapsody*)	opt_bash_malloc=no ;;	# Apple Rhapsody
-@@ -8099,7 +8099,7 @@
- then
- 	echo $ac_n "checking shared object configuration for loadable builtins""... $ac_c" 1>&6
- echo "configure:8102: checking shared object configuration for loadable builtins" >&5
--	eval `${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}`
-+	eval `${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c "${host_cpu}" -o "${host_os}" -v "${host_vendor}"`
- 	
- 	
- 	
diff --git a/shells/bash/files/patch-ad b/shells/bash/files/patch-ad
deleted file mode 100644
index db321acb895b..000000000000
--- a/shells/bash/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- support/shobj-conf.orig	Tue Sep 21 21:03:43 1999
-+++ support/shobj-conf	Mon May  8 00:12:30 2000
-@@ -97,7 +97,7 @@
- #	;;
- 
- # FreeBSD-3.x ELF
--freebsd3*)
-+freebsd[3-9]*)
- 	SHOBJ_CFLAGS=-fpic
- 	SHOBJ_LD='${CC}'
- 
diff --git a/shells/bash/files/patch-ae b/shells/bash/files/patch-ae
deleted file mode 100644
index c0ae0bccf270..000000000000
--- a/shells/bash/files/patch-ae
+++ /dev/null
@@ -1,151 +0,0 @@
-diff -ru ../work/bash-2.04/builtins/shopt.def ./builtins/shopt.def
---- ../work/bash-2.04/builtins/shopt.def	Tue Sep 21 17:20:01 1999
-+++ ./builtins/shopt.def	Wed May 24 12:18:31 2000
-@@ -56,7 +56,7 @@
- 
- #define OPTFMT		"%-15s\t%s\n"
- 
--extern int allow_null_glob_expansion, glob_dot_filenames;
-+extern int allow_null_glob_expansion, fail_glob_expansion, glob_dot_filenames;
- extern int cdable_vars, mail_warning, source_uses_path;
- extern int no_exit_on_failed_exec, print_shift_error;
- extern int check_hashed_filenames, promptvars, interactive_comments;
-@@ -137,6 +137,7 @@
- #endif
-   { "nocaseglob", &glob_ignore_case, (Function *)NULL },
-   { "nullglob",	&allow_null_glob_expansion, (Function *)NULL },
-+  { "failglob",	&fail_glob_expansion, (Function *)NULL },
- #if defined (PROGRAMMABLE_COMPLETION)
-   { "progcomp", &prog_completion_enabled, (Function *)NULL },
- #endif
-diff -ru ../work/bash-2.04/doc/bash.1 ./doc/bash.1
---- ../work/bash-2.04/doc/bash.1	Tue Mar 14 17:37:56 2000
-+++ ./doc/bash.1	Wed May 24 12:17:39 2000
-@@ -2414,6 +2414,10 @@
- .B nullglob
- option is set, and no matches are found,
- the word is removed.
-+If the 
-+.B failglob
-+option is set, and no matches are found, an error message is printed
-+and the command is not executed.
- If the shell option
- .B nocaseglob
- is enabled, the match is performed without regard to the case
-diff -ru ../work/bash-2.04/doc/bashref.texi ./doc/bashref.texi
---- ../work/bash-2.04/doc/bashref.texi	Tue Mar 14 17:38:33 2000
-+++ ./doc/bashref.texi	Wed May 24 12:17:39 2000
-@@ -1679,7 +1679,8 @@
- and replaced with an alphabetically sorted list of
- file names matching the pattern. If no matching file names are found,
- and the shell option @code{nullglob} is disabled, the word is left
--unchanged.
-+unchanged. If the @code{failglob} option is set, an error message is
-+printed and the commandline is not executed.
- If the @code{nullglob} option is set, and no matches are found, the word
- is removed.
- If the shell option @code{nocaseglob} is enabled, the match is performed
-@@ -1692,8 +1693,8 @@
- matched explicitly.
- In other cases, the @samp{.} character is not treated specially.
- 
--See the description of @code{shopt} in @ref{Bash Builtins},
--for a description of the @code{nocaseglob}, @code{nullglob},
-+See the description of @code{shopt} in @ref{Bash Builtins}, for a
-+description of the @code{nocaseglob}, @code{nullglob}, @code{failglob}
- and @code{dotglob} options.
- 
- The @code{GLOBIGNORE}
-@@ -3319,6 +3320,10 @@
- @item extglob
- If set, the extended pattern matching features described above
- (@pxref{Pattern Matching}) are enabled.
-+
-+@item failglob
-+If set, filenames that have globbing characters in them, but don't match
-+anything, will cause an error.
- 
- @item histappend
- If set, the history list is appended to the file named by the value
-Only in ../work/bash-2.04/lib/readline/doc: Makefile
-diff -ru ../work/bash-2.04/subst.c ./subst.c
---- ../work/bash-2.04/subst.c	Tue Mar 14 16:42:02 2000
-+++ ./subst.c	Wed May 24 12:17:39 2000
-@@ -106,6 +106,9 @@
-    a null file. */
- int allow_null_glob_expansion;
- 
-+/* Non-zero means to signal an error when globbing fails to match. */
-+int fail_glob_expansion;
-+
- /* Variables to keep track of which words in an expanded word list (the
-    output of expand_word_list_internal) are the result of globbing
-    expansions.  GLOB_ARGV_FLAGS is used by execute_cmd.c. */
-@@ -6018,6 +6021,11 @@
- 	    {
- 	      output_list = (WORD_LIST *)list_append (glob_list, output_list);
- 	      PREPEND_LIST (tlist, disposables);
-+	    }
-+	  else if (fail_glob_expansion != 0)
-+	    {
-+	      report_error ("no match: %s", tlist->word->word);
-+	      jump_to_top_level (DISCARD);
- 	    }
- 	  else if (allow_null_glob_expansion == 0)
- 	    {
-diff -ru ../work/bash-2.04/tests/shopt.right ./tests/shopt.right
---- ../work/bash-2.04/tests/shopt.right	Tue Sep 21 17:55:58 1999
-+++ ./tests/shopt.right	Wed May 24 12:17:23 2000
-@@ -21,6 +21,7 @@
- shopt -u no_empty_cmd_completion
- shopt -u nocaseglob
- shopt -u nullglob
-+shopt -u failglob
- shopt -s progcomp
- shopt -s promptvars
- shopt -u restricted_shell
-@@ -56,6 +57,7 @@
- shopt -u no_empty_cmd_completion
- shopt -u nocaseglob
- shopt -u nullglob
-+shopt -u failglob
- shopt -u restricted_shell
- shopt -u shift_verbose
- shopt -u xpg_echo
-@@ -75,6 +77,7 @@
- no_empty_cmd_completion	off
- nocaseglob     	off
- nullglob       	off
-+failglob       	off
- restricted_shell	off
- shift_verbose  	off
- xpg_echo       	off
-@@ -198,3 +201,5 @@
- --
- ./shopt.tests: shopt: xyz1: unknown shell option name
- ./shopt.tests: shopt: xyz1: unknown option name
-+tmp/l1 tmp/l2 tmp/*4 tmp/l3
-+./shopt.tests: no match: tmp/*4
-diff -ru ../work/bash-2.04/tests/shopt.tests ./tests/shopt.tests
---- ../work/bash-2.04/tests/shopt.tests	Tue Sep 21 17:49:32 1999
-+++ ./tests/shopt.tests	Wed May 24 12:17:39 2000
-@@ -21,6 +21,7 @@
- shopt -u mailwarn
- shopt -u nocaseglob
- shopt -u nullglob
-+shopt -u failglob
- shopt -s promptvars
- shopt -u shift_verbose
- shopt -s sourcepath
-@@ -92,3 +93,11 @@
- builtin printf -- "--\n"
- shopt -p xyz1
- shopt -o -p xyz1
-+
-+mkdir tmp
-+touch tmp/l1 tmp/l2 tmp/l3
-+builtin echo tmp/l[12] tmp/*4 tmp/*3
-+shopt -s failglob
-+builtin echo tmp/l[12] tmp/*4 tmp/*3
-+rm -r tmp
-+shopt -u failglob
diff --git a/shells/bash/files/patch-af b/shells/bash/files/patch-af
deleted file mode 100644
index 73c7e7972ed3..000000000000
--- a/shells/bash/files/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
---- error.c.old	Wed May 24 12:04:50 2000
-+++ error.c	Wed May 24 12:05:21 2000
-@@ -465,9 +465,9 @@
-    terminal. */
- void
- #if defined (PREFER_STDARG)
--trace (const char *format, ...)
-+bash_trace (const char *format, ...)
- #else
--trace (format, va_alist)
-+bash_trace (format, va_alist)
-      const char *format;
-      va_dcl
- #endif
diff --git a/shells/bash/pkg-comment b/shells/bash/pkg-comment
deleted file mode 100644
index 2049031d771d..000000000000
--- a/shells/bash/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The GNU Borne Again Shell
diff --git a/shells/bash/pkg-descr b/shells/bash/pkg-descr
deleted file mode 100644
index b3a252cb863f..000000000000
--- a/shells/bash/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-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.
-
-WWW: http://www.gnu.org/software/bash/
diff --git a/shells/bash/pkg-plist b/shells/bash/pkg-plist
deleted file mode 100644
index b08793be186e..000000000000
--- a/shells/bash/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-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
-@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells
-bin/bashbug
-@unexec install-info --delete %D/info/bash.info %D/info/dir
-info/bash.info
-@exec install-info %D/info/bash.info %D/info/dir
-share/doc/bash/article.ps.gz
-share/doc/bash/bashref.ps.gz
-share/doc/bash/article.txt
-@dirrm share/doc/bash
diff --git a/shells/bash3/Makefile b/shells/bash3/Makefile
deleted file mode 100644
index a9a8ba9fe9f4..000000000000
--- a/shells/bash3/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# New ports collection makefile for:	bash
-# Date created:		21 August 1994
-# Whom:			jkh
-#
-# $FreeBSD$
-#
-
-PORTNAME=	bash
-PORTVERSION=    2.04
-CATEGORIES=	shells
-MASTER_SITES=	${MASTER_SITE_GNU} \
-		ftp://ftp.cwru.edu/pub/bash/
-MASTER_SITE_SUBDIR=	bash
-.if !defined(NOPORTDOCS)
-DISTFILES=      bash-${PORTVERSION}.tar.gz bash-doc-${PORTVERSION}.tar.gz
-.endif
-
-MAINTAINER=	ache@FreeBSD.org
-
-GNU_CONFIGURE=	Yes
-CONFIGURE_ARGS=	--with-installed-readline
-CONFIGURE_ENV=  LDFLAGS=-static
-MAN1=		bash.1 bashbug.1
-
-post-install:
-	${CP} /etc/shells /etc/shells.bak
-	(${GREP} -v ${PREFIX}/bin/bash /etc/shells.bak; ${ECHO} ${PREFIX}/bin/bash) >/etc/shells
-	${RM} /etc/shells.bak
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/bash
-	${INSTALL_MAN}  \
-		${WRKDIR}/doc/article.ps  \
-		${WRKDIR}/doc/bashref.ps  \
-		${PREFIX}/share/doc/bash
-	${INSTALL_MAN}  \
-		${WRKDIR}/doc/article.txt  \
-		${PREFIX}/share/doc/bash
-	${GZIP_CMD} ${PREFIX}/share/doc/bash/*.ps
-.endif
-
-.include <bsd.port.mk>
diff --git a/shells/bash3/distinfo b/shells/bash3/distinfo
deleted file mode 100644
index fdeba66bf41c..000000000000
--- a/shells/bash3/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (bash-2.04.tar.gz) = 49b548a8b72a4c925ff26930e4c31c6c
-MD5 (bash-doc-2.04.tar.gz) = a9684d1095e7ea1adb8759c3f4fca13d
diff --git a/shells/bash3/files/patch-aa b/shells/bash3/files/patch-aa
deleted file mode 100644
index f30ca9d79b7b..000000000000
--- a/shells/bash3/files/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-*** doc/Makefile.in.bak	Fri Jan 31 00:12:33 1997
---- doc/Makefile.in	Sat Jun 28 02:23:01 1997
-***************
-*** 155,161 ****
-  	-$(INSTALL_DATA) $(srcdir)/bashref.info $(infodir)/bash.info
-  # run install-info if it is present to update the info directory
-  	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-! 		install-info --dir-file=$(infodir)/dir $(infodir)/bash.info; \
-  	else true; fi
-  
-  uninstall:
---- 155,163 ----
-  	-$(INSTALL_DATA) $(srcdir)/bashref.info $(infodir)/bash.info
-  # run install-info if it is present to update the info directory
-  	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-! 		install-info \
-! 		--entry="* BASH: (bash).                 Bash Reference Manual." \
-! 		--dir-file=$(infodir)/dir $(infodir)/bash.info; \
-  	else true; fi
-  
-  uninstall:
diff --git a/shells/bash3/files/patch-ab b/shells/bash3/files/patch-ab
deleted file mode 100644
index db11179f5a31..000000000000
--- a/shells/bash3/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Wed Mar  1 22:52:12 2000
-+++ Makefile.in	Mon May  8 00:05:03 2000
-@@ -582,7 +582,7 @@
- 
- install:	.made installdirs
- 	$(INSTALL_PROGRAM) $(INSTALLMODE) $(Program) $(bindir)/$(Program)
--	$(INSTALL_PROGRAM) $(INSTALLMODE2) bashbug $(bindir)/bashbug
-+	$(INSTALL) $(INSTALLMODE2) bashbug $(bindir)/bashbug
- 	-( cd $(DOCDIR) ; $(MAKE) $(MFLAGS) \
- 		man1dir=$(man1dir) man1ext=$(man1ext) \
- 		man3dir=$(man3dir) man3ext=$(man3ext) \
diff --git a/shells/bash3/files/patch-ac b/shells/bash3/files/patch-ac
deleted file mode 100644
index 33c30ce82e7e..000000000000
--- a/shells/bash3/files/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	Tue Feb 22 19:46:17 2000
-+++ configure	Mon May  8 00:23:05 2000
-@@ -761,7 +761,7 @@
- mips-irix6*)	opt_bash_malloc=no ;;	# needs 8-byte alignment
- m68k-sysv)	opt_bash_malloc=no ;;	# fixes file descriptor leak in closedir
- sparc-linux*)	opt_bash_malloc=no ;;	# sparc running linux; requires ELF
--#*-freebsd*)	opt_bash_malloc=no ;;	# they claim it's better
-+*-freebsd*)     opt_bash_malloc=no ;;   # they claim it's better
- *-aix*)		opt_bash_malloc=no ;;	# AIX machines
- *-nextstep*)	opt_bash_malloc=no ;;	# NeXT machines running NeXTstep
- *-rhapsody*)	opt_bash_malloc=no ;;	# Apple Rhapsody
-@@ -8099,7 +8099,7 @@
- then
- 	echo $ac_n "checking shared object configuration for loadable builtins""... $ac_c" 1>&6
- echo "configure:8102: checking shared object configuration for loadable builtins" >&5
--	eval `${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}`
-+	eval `${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c "${host_cpu}" -o "${host_os}" -v "${host_vendor}"`
- 	
- 	
- 	
diff --git a/shells/bash3/files/patch-ad b/shells/bash3/files/patch-ad
deleted file mode 100644
index db321acb895b..000000000000
--- a/shells/bash3/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- support/shobj-conf.orig	Tue Sep 21 21:03:43 1999
-+++ support/shobj-conf	Mon May  8 00:12:30 2000
-@@ -97,7 +97,7 @@
- #	;;
- 
- # FreeBSD-3.x ELF
--freebsd3*)
-+freebsd[3-9]*)
- 	SHOBJ_CFLAGS=-fpic
- 	SHOBJ_LD='${CC}'
- 
diff --git a/shells/bash3/files/patch-ae b/shells/bash3/files/patch-ae
deleted file mode 100644
index c0ae0bccf270..000000000000
--- a/shells/bash3/files/patch-ae
+++ /dev/null
@@ -1,151 +0,0 @@
-diff -ru ../work/bash-2.04/builtins/shopt.def ./builtins/shopt.def
---- ../work/bash-2.04/builtins/shopt.def	Tue Sep 21 17:20:01 1999
-+++ ./builtins/shopt.def	Wed May 24 12:18:31 2000
-@@ -56,7 +56,7 @@
- 
- #define OPTFMT		"%-15s\t%s\n"
- 
--extern int allow_null_glob_expansion, glob_dot_filenames;
-+extern int allow_null_glob_expansion, fail_glob_expansion, glob_dot_filenames;
- extern int cdable_vars, mail_warning, source_uses_path;
- extern int no_exit_on_failed_exec, print_shift_error;
- extern int check_hashed_filenames, promptvars, interactive_comments;
-@@ -137,6 +137,7 @@
- #endif
-   { "nocaseglob", &glob_ignore_case, (Function *)NULL },
-   { "nullglob",	&allow_null_glob_expansion, (Function *)NULL },
-+  { "failglob",	&fail_glob_expansion, (Function *)NULL },
- #if defined (PROGRAMMABLE_COMPLETION)
-   { "progcomp", &prog_completion_enabled, (Function *)NULL },
- #endif
-diff -ru ../work/bash-2.04/doc/bash.1 ./doc/bash.1
---- ../work/bash-2.04/doc/bash.1	Tue Mar 14 17:37:56 2000
-+++ ./doc/bash.1	Wed May 24 12:17:39 2000
-@@ -2414,6 +2414,10 @@
- .B nullglob
- option is set, and no matches are found,
- the word is removed.
-+If the 
-+.B failglob
-+option is set, and no matches are found, an error message is printed
-+and the command is not executed.
- If the shell option
- .B nocaseglob
- is enabled, the match is performed without regard to the case
-diff -ru ../work/bash-2.04/doc/bashref.texi ./doc/bashref.texi
---- ../work/bash-2.04/doc/bashref.texi	Tue Mar 14 17:38:33 2000
-+++ ./doc/bashref.texi	Wed May 24 12:17:39 2000
-@@ -1679,7 +1679,8 @@
- and replaced with an alphabetically sorted list of
- file names matching the pattern. If no matching file names are found,
- and the shell option @code{nullglob} is disabled, the word is left
--unchanged.
-+unchanged. If the @code{failglob} option is set, an error message is
-+printed and the commandline is not executed.
- If the @code{nullglob} option is set, and no matches are found, the word
- is removed.
- If the shell option @code{nocaseglob} is enabled, the match is performed
-@@ -1692,8 +1693,8 @@
- matched explicitly.
- In other cases, the @samp{.} character is not treated specially.
- 
--See the description of @code{shopt} in @ref{Bash Builtins},
--for a description of the @code{nocaseglob}, @code{nullglob},
-+See the description of @code{shopt} in @ref{Bash Builtins}, for a
-+description of the @code{nocaseglob}, @code{nullglob}, @code{failglob}
- and @code{dotglob} options.
- 
- The @code{GLOBIGNORE}
-@@ -3319,6 +3320,10 @@
- @item extglob
- If set, the extended pattern matching features described above
- (@pxref{Pattern Matching}) are enabled.
-+
-+@item failglob
-+If set, filenames that have globbing characters in them, but don't match
-+anything, will cause an error.
- 
- @item histappend
- If set, the history list is appended to the file named by the value
-Only in ../work/bash-2.04/lib/readline/doc: Makefile
-diff -ru ../work/bash-2.04/subst.c ./subst.c
---- ../work/bash-2.04/subst.c	Tue Mar 14 16:42:02 2000
-+++ ./subst.c	Wed May 24 12:17:39 2000
-@@ -106,6 +106,9 @@
-    a null file. */
- int allow_null_glob_expansion;
- 
-+/* Non-zero means to signal an error when globbing fails to match. */
-+int fail_glob_expansion;
-+
- /* Variables to keep track of which words in an expanded word list (the
-    output of expand_word_list_internal) are the result of globbing
-    expansions.  GLOB_ARGV_FLAGS is used by execute_cmd.c. */
-@@ -6018,6 +6021,11 @@
- 	    {
- 	      output_list = (WORD_LIST *)list_append (glob_list, output_list);
- 	      PREPEND_LIST (tlist, disposables);
-+	    }
-+	  else if (fail_glob_expansion != 0)
-+	    {
-+	      report_error ("no match: %s", tlist->word->word);
-+	      jump_to_top_level (DISCARD);
- 	    }
- 	  else if (allow_null_glob_expansion == 0)
- 	    {
-diff -ru ../work/bash-2.04/tests/shopt.right ./tests/shopt.right
---- ../work/bash-2.04/tests/shopt.right	Tue Sep 21 17:55:58 1999
-+++ ./tests/shopt.right	Wed May 24 12:17:23 2000
-@@ -21,6 +21,7 @@
- shopt -u no_empty_cmd_completion
- shopt -u nocaseglob
- shopt -u nullglob
-+shopt -u failglob
- shopt -s progcomp
- shopt -s promptvars
- shopt -u restricted_shell
-@@ -56,6 +57,7 @@
- shopt -u no_empty_cmd_completion
- shopt -u nocaseglob
- shopt -u nullglob
-+shopt -u failglob
- shopt -u restricted_shell
- shopt -u shift_verbose
- shopt -u xpg_echo
-@@ -75,6 +77,7 @@
- no_empty_cmd_completion	off
- nocaseglob     	off
- nullglob       	off
-+failglob       	off
- restricted_shell	off
- shift_verbose  	off
- xpg_echo       	off
-@@ -198,3 +201,5 @@
- --
- ./shopt.tests: shopt: xyz1: unknown shell option name
- ./shopt.tests: shopt: xyz1: unknown option name
-+tmp/l1 tmp/l2 tmp/*4 tmp/l3
-+./shopt.tests: no match: tmp/*4
-diff -ru ../work/bash-2.04/tests/shopt.tests ./tests/shopt.tests
---- ../work/bash-2.04/tests/shopt.tests	Tue Sep 21 17:49:32 1999
-+++ ./tests/shopt.tests	Wed May 24 12:17:39 2000
-@@ -21,6 +21,7 @@
- shopt -u mailwarn
- shopt -u nocaseglob
- shopt -u nullglob
-+shopt -u failglob
- shopt -s promptvars
- shopt -u shift_verbose
- shopt -s sourcepath
-@@ -92,3 +93,11 @@
- builtin printf -- "--\n"
- shopt -p xyz1
- shopt -o -p xyz1
-+
-+mkdir tmp
-+touch tmp/l1 tmp/l2 tmp/l3
-+builtin echo tmp/l[12] tmp/*4 tmp/*3
-+shopt -s failglob
-+builtin echo tmp/l[12] tmp/*4 tmp/*3
-+rm -r tmp
-+shopt -u failglob
diff --git a/shells/bash3/files/patch-af b/shells/bash3/files/patch-af
deleted file mode 100644
index 73c7e7972ed3..000000000000
--- a/shells/bash3/files/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
---- error.c.old	Wed May 24 12:04:50 2000
-+++ error.c	Wed May 24 12:05:21 2000
-@@ -465,9 +465,9 @@
-    terminal. */
- void
- #if defined (PREFER_STDARG)
--trace (const char *format, ...)
-+bash_trace (const char *format, ...)
- #else
--trace (format, va_alist)
-+bash_trace (format, va_alist)
-      const char *format;
-      va_dcl
- #endif
diff --git a/shells/bash3/pkg-comment b/shells/bash3/pkg-comment
deleted file mode 100644
index 2049031d771d..000000000000
--- a/shells/bash3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The GNU Borne Again Shell
diff --git a/shells/bash3/pkg-descr b/shells/bash3/pkg-descr
deleted file mode 100644
index b3a252cb863f..000000000000
--- a/shells/bash3/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-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.
-
-WWW: http://www.gnu.org/software/bash/
diff --git a/shells/bash3/pkg-plist b/shells/bash3/pkg-plist
deleted file mode 100644
index b08793be186e..000000000000
--- a/shells/bash3/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-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
-@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells
-bin/bashbug
-@unexec install-info --delete %D/info/bash.info %D/info/dir
-info/bash.info
-@exec install-info %D/info/bash.info %D/info/dir
-share/doc/bash/article.ps.gz
-share/doc/bash/bashref.ps.gz
-share/doc/bash/article.txt
-@dirrm share/doc/bash
diff --git a/shells/fd/Makefile b/shells/fd/Makefile
deleted file mode 100644
index 373018b1c55f..000000000000
--- a/shells/fd/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# New ports collection makefile for:    FDclone
-# Date created:         20 Feb 1996
-# Whom:                 Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	fd
-PORTVERSION=	1.03l
-CATEGORIES=	misc
-MASTER_SITES=	ftp://ftp.ics.es.osaka-u.ac.jp/pub/FDclone/ \
-		http://people.FreeBSD.org/~steve/distfiles/
-DISTNAME=	FD-${PORTVERSION}
-
-MAINTAINER=	nobu@psrc.isac.co.jp
-
-MANLANG=	ja
-MAN1=		fd.1
-MAKE_ENV=	LANG=${MANLANG}
-DOCS=		README FAQ HISTORY ToAdmin
-SIGNATURE=	Nobuhiro Yasutomi <${MAINTAINER}>
-
-# require maintainer signature for binary package distributions
-do-configure:
-	@cd ${WRKSRC}; v=version.h; ${MV} $$v $$v.orig; \
-	${SED} 's/\(distributor = \)NULL/\1"${SIGNATURE}"/' $$v.orig > $$v
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/fd
-	@for i in $(DOCS); do \
-		${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/fd; \
-	done
-.endif
-	@${CAT} ${PKGDIR}/MESSAGE
-
-.include <bsd.port.mk>
diff --git a/shells/fd/distinfo b/shells/fd/distinfo
deleted file mode 100644
index 99286a7a90a4..000000000000
--- a/shells/fd/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (FD-1.03l.tar.gz) = 290d37e37945a98829ddc59fc7fa3fed
diff --git a/shells/fd/files/patch-aa b/shells/fd/files/patch-aa
deleted file mode 100644
index 4487cbbd6cfb..000000000000
--- a/shells/fd/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Tue Sep 16 00:00:15 1997
-+++ Makefile.in	Fri Sep 19 21:42:41 1997
-@@ -3,7 +3,7 @@
- #
- 
- TITLE	= FD-
--PREFIX	= /usr/local
-+PREFIX	?= /usr/local
- TOPDIR	= $(PREFIX)
- BINDIR	= $(TOPDIR)/bin
- MANDIR	= $(TOPDIR)/man__LANGDIR__/man$(MANSEC)
diff --git a/shells/fd/pkg-comment b/shells/fd/pkg-comment
deleted file mode 100644
index 2a1c33f6ef57..000000000000
--- a/shells/fd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A file and directory management tool
diff --git a/shells/fd/pkg-descr b/shells/fd/pkg-descr
deleted file mode 100644
index a078751d2411..000000000000
--- a/shells/fd/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-`FD' is a file and directory management tool for text terminal.
-Browsing file list, viewing, editing, archiving/extracting management
-with a few touch.
-
-FD for unix by shirai@nintendo.co.jp, and it is a clone of
-FD for DOS (AT and PC9801) designed by A. Idei (SDI00544@niftyserve.or.jp).
-
-      Currently, the man page is available only in Japanese, but it's
-    easy to use. Setting `FD_LANGUAGE' environment to 'english' you can 
-    use English help.
-                                     -- nobu@psrc.isac.co.jp
diff --git a/shells/fd/pkg-message b/shells/fd/pkg-message
deleted file mode 100644
index 8fe25b4fd54f..000000000000
--- a/shells/fd/pkg-message
+++ /dev/null
@@ -1 +0,0 @@
-see additional documents at /usr/local/share/doc/fd/* on your disk.
diff --git a/shells/fd/pkg-plist b/shells/fd/pkg-plist
deleted file mode 100644
index c14d2454823e..000000000000
--- a/shells/fd/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/fd
-bin/fd-unicd.tbl
-share/doc/fd/FAQ
-share/doc/fd/HISTORY
-share/doc/fd/README
-share/doc/fd/ToAdmin
-@dirrm share/doc/fd
diff --git a/shells/psh/Makefile b/shells/psh/Makefile
deleted file mode 100644
index 46691f1f1abe..000000000000
--- a/shells/psh/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# New ports collection makefile for:	perlsh
-# Date created:		11 Dec 1999
-# Whom:			Will Andrews <andrews@technologist.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	perlsh
-PORTVERSION=	0.007
-CATEGORIES=	shells perl5
-MASTER_SITES=	http://www.focusresearch.com/gregor/psh/
-DISTNAME=	psh-${PORTVERSION}
-
-MAINTAINER=	will@FreeBSD.org
-
-USE_PERL5=	yes
-FETCH_BEFORE_ARGS+=	-t
-MAKE_ENV+=	PPREFIX="${PREFIX}"
-MAN1=		psh.1
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-
-.include "${.CURDIR}/files/man3"
-
-do-build:
-	@(cd ${WRKSRC} && ${PERL} Makefile.PL && ${MAKE})
-
-post-install:  
-	@${ECHO} "Updating /etc/shells"
-	@${CP} /etc/shells /etc/shells.bak
-	@(${GREP} -v ${PREFIX}/bin/psh /etc/shells.bak; \
-	${ECHO} ${PREFIX}/bin/psh) > /etc/shells
-	@${RM} /etc/shells.bak
-
-.include <bsd.port.mk>
diff --git a/shells/psh/distinfo b/shells/psh/distinfo
deleted file mode 100644
index 64afe5342cf8..000000000000
--- a/shells/psh/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (psh-0.007.tar.gz) = caae93083d1cf5724b9e7d5864ba1d2c
diff --git a/shells/psh/files/man3 b/shells/psh/files/man3
deleted file mode 100644
index 72352696c2a6..000000000000
--- a/shells/psh/files/man3
+++ /dev/null
@@ -1,19 +0,0 @@
-MAN3=	\
-	Psh::OS::Unix.3 \
-	Psh::Locale::French.3 \
-	Psh::Locale::Spanish.3 \
-	Psh::Joblist.3 \
-	Psh::Locale::German.3 \
-	Psh::Locale::Base.3 \
-	Psh::Completion.3 \
-	Psh::PerlEval.3 \
-	Psh::Job.3 \
-	Psh::Util.3 \
-	Psh::OS::Win.3 \
-	Psh::Locale::Italian.3 \
-	Psh::OS.3 \
-	Psh::OS::Mac.3 \
-	Psh::Locale::Default.3 \
-	Psh::Builtins.3 \
-	Psh::Parser.3 \
-	Psh::Locale::Portuguese.3
diff --git a/shells/psh/files/patch-aa b/shells/psh/files/patch-aa
deleted file mode 100644
index 365334e4e1eb..000000000000
--- a/shells/psh/files/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.PL	Mon Dec 27 06:11:05 1999
-+++ Makefile.PL.new	Sun Feb 27 22:34:55 2000
-@@ -17,6 +17,7 @@
- 
- WriteMakefile (
- 	NAME         => 'psh',
-+	PREFIX	     => '${PPREFIX}',
- 	VERSION_FROM => 'psh',
- 	AUTHOR       => 'Gregor N. Purdy (gregor@focusresearch.com)',
- 	ABSTRACT     => 'Perl Shell',
diff --git a/shells/psh/pkg-comment b/shells/psh/pkg-comment
deleted file mode 100644
index e8c5ab06be0f..000000000000
--- a/shells/psh/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-New shell made entirely out of a Perl script
diff --git a/shells/psh/pkg-descr b/shells/psh/pkg-descr
deleted file mode 100644
index 0025c8a8c1c0..000000000000
--- a/shells/psh/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Perl Shell is a new shell that combines the power of bash
-and several other shells with the power of perl programming.
-
-WWW: http://www.focusresearch.com/gregor/psh/
diff --git a/shells/psh/pkg-plist b/shells/psh/pkg-plist
deleted file mode 100644
index 01d5d21d0578..000000000000
--- a/shells/psh/pkg-plist
+++ /dev/null
@@ -1,48 +0,0 @@
-bin/psh
-lib/perl5/site_perl/%%PERL_VER%%/Psh.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/OS/Unix.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/OS/Win.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/OS/Mac.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Joblist.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fallback/Ls.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fallback/Env.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Readline.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Bg.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Symbols.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fg.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Jobs.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Which.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Builtin.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Exit.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Help.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Kill.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Source.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Strategy.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Completion.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/Italian.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/Default.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/French.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/Spanish.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/German.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/Portuguese.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/PerlEval.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Perlfunc.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Fallback_builtin.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Auto_resume.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Auto_cd.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Perlscript.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/OS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Job.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Prompt.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/psh/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/psh
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fallback
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh/OS
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh