diff options
author | cvs2svn <cvs2svn@FreeBSD.org> | 1999-12-17 08:18:04 +0000 |
---|---|---|
committer | cvs2svn <cvs2svn@FreeBSD.org> | 1999-12-17 08:18:04 +0000 |
commit | c9725fb85b442f5229246e7b4e1c53e913dbbb90 (patch) | |
tree | e00c7b9a13c8748065f79c57e9e81d9a1239e743 /shells/bash3 | |
parent | ee7f9aa44a92849ab34d5b387a3d79f974023b65 (diff) |
This commit was manufactured by cvs2svn to create tag 'RELEASE_3_4_0'.release/3.4.0
Notes
Notes:
svn path=/head/; revision=23787
svn path=/tags/RELEASE_3_4_0/; revision=23788; tag=release/3.4.0
Diffstat (limited to 'shells/bash3')
-rw-r--r-- | shells/bash3/Makefile | 40 | ||||
-rw-r--r-- | shells/bash3/distinfo | 2 | ||||
-rw-r--r-- | shells/bash3/files/patch-aa | 21 | ||||
-rw-r--r-- | shells/bash3/files/patch-ab | 19 | ||||
-rw-r--r-- | shells/bash3/files/patch-ac | 20 | ||||
-rw-r--r-- | shells/bash3/files/patch-ad | 18 | ||||
-rw-r--r-- | shells/bash3/files/patch-ae | 198 | ||||
-rw-r--r-- | shells/bash3/pkg-comment | 1 | ||||
-rw-r--r-- | shells/bash3/pkg-descr | 8 | ||||
-rw-r--r-- | shells/bash3/pkg-plist | 10 |
10 files changed, 0 insertions, 337 deletions
diff --git a/shells/bash3/Makefile b/shells/bash3/Makefile deleted file mode 100644 index 9e652f2dc5f8..000000000000 --- a/shells/bash3/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# New ports collection makefile for: bash -# Version required: 2.* -# Date created: 21 August 1994 -# Whom: jkh -# -# $FreeBSD$ -# - -DISTNAME= bash-2.03 -CATEGORIES= shells -MASTER_SITES= ${MASTER_SITE_GNU} \ - ftp://ftp.cwru.edu/pub/bash/ -MASTER_SITE_SUBDIR= bash -.if !defined(NOPORTDOCS) -DISTFILES= bash-2.03.tar.gz bash-doc-2.03.tar.gz -.endif - -MAINTAINER= ache@FreeBSD.org - -GNU_CONFIGURE= Yes -CONFIGURE_ARGS= --with-installed-readline -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 89ba5a024bb4..000000000000 --- a/shells/bash3/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (bash-2.03.tar.gz) = 70e356eae4fed395c9a0fc35b752f711 -MD5 (bash-doc-2.03.tar.gz) = ede603422b9f6cf2ef70ee1a029987f0 diff --git a/shells/bash3/files/patch-aa b/shells/bash3/files/patch-aa deleted file mode 100644 index 16d0302debad..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 \ -! --defentry="* 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 aa1b826febff..000000000000 --- a/shells/bash3/files/patch-ab +++ /dev/null @@ -1,19 +0,0 @@ -*** l Wed Apr 14 15:38:05 1999 ---- Makefile.in Wed Apr 14 15:38:21 1999 -*************** -*** 550,556 **** - - install: .made installdirs - $(INSTALL_PROGRAM) $(INSTALLMODE) $(Program) $(bindir)/$(Program) -! $(INSTALL_PROGRAM) $(INSTALLMODE) bashbug $(bindir)/bashbug - -( cd $(DOCDIR) ; $(MAKE) $(MFLAGS) \ - man1dir=$(man1dir) man1ext=$(man1ext) \ - man3dir=$(man3dir) man3ext=$(man3ext) \ ---- 550,556 ---- - - install: .made installdirs - $(INSTALL_PROGRAM) $(INSTALLMODE) $(Program) $(bindir)/$(Program) -! $(INSTALL) $(INSTALLMODE) 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 86e8472b2263..000000000000 --- a/shells/bash3/files/patch-ac +++ /dev/null @@ -1,20 +0,0 @@ ---- configure.orig Thu Feb 18 21:12:00 1999 -+++ configure Fri May 28 04:35:33 1999 -@@ -733,7 +733,7 @@ - sparc-netbsd*) opt_gnu_malloc=no ;; # needs 8-byte alignment - mips-irix6*) opt_gnu_malloc=no ;; # needs 8-byte alignment - sparc-linux*) opt_gnu_malloc=no ;; # sparc running linux; requires ELF --#*-freebsd*) opt_gnu_malloc=no ;; # they claim it's better -+*-freebsd*) opt_gnu_malloc=no ;; # they claim it's better - *-aix*) opt_gnu_malloc=no ;; # AIX machines - *-nextstep*) opt_gnu_malloc=no ;; # NeXT machines running NeXTstep - *-rhapsody*) opt_gnu_malloc=no ;; # Apple Rhapsody -@@ -7086,7 +7086,7 @@ - then - echo $ac_n "checking shared object configuration for loadable builtins""... $ac_c" 1>&6 - echo "configure:7089: 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 b24eada42810..000000000000 --- a/shells/bash3/files/patch-ad +++ /dev/null @@ -1,18 +0,0 @@ ---- support/shobj-conf.bak Tue Dec 29 23:05:29 1998 -+++ support/shobj-conf Fri May 28 04:34:07 1999 -@@ -86,13 +86,13 @@ - SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)' - ;; - --freebsd3*) -+freebsd[34]*) - SHOBJ_CFLAGS=-fpic - SHOBJ_LD='${CC}' - SHOBJ_LDFLAGS='-shared' - - SHLIB_XLDFLAGS='-R$(libdir)' -- SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)' -+ SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' - ;; - - linux*) diff --git a/shells/bash3/files/patch-ae b/shells/bash3/files/patch-ae deleted file mode 100644 index 5b7b8a75a9a6..000000000000 --- a/shells/bash3/files/patch-ae +++ /dev/null @@ -1,198 +0,0 @@ -Only in : .gdbinit -diff -rc bash-2.03.old/builtins/shopt.def builtins/shopt.def -*** bash-2.03.old/builtins/shopt.def Tue Nov 10 18:56:03 1998 ---- builtins/shopt.def Mon Aug 2 17:16:36 1999 -*************** -*** 56,62 **** - - #define OPTFMT "%-15s\t%s\n" - -! extern int allow_null_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; ---- 56,62 ---- - - #define OPTFMT "%-15s\t%s\n" - -! 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; -*************** -*** 128,133 **** ---- 128,134 ---- - { "mailwarn", &mail_warning, (Function *)NULL }, - { "nocaseglob", &glob_ignore_case, (Function *)NULL }, - { "nullglob", &allow_null_glob_expansion, (Function *)NULL }, -+ { "failglob", &fail_glob_expansion, (Function *)NULL }, - { "promptvars", &promptvars, (Function *)NULL }, - #if defined (RESTRICTED_SHELL) - { "restricted_shell", &restricted_shell, set_restricted_shell }, -diff -rc bash-2.03.old/doc/bash.1 doc/bash.1 -*** bash-2.03.old/doc/bash.1 Wed Jan 20 22:48:04 1999 ---- doc/bash.1 Mon Aug 2 17:37:38 1999 -*************** -*** 2305,2310 **** ---- 2305,2314 ---- - .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 -rc bash-2.03.old/doc/bashref.texi doc/bashref.texi -*** bash-2.03.old/doc/bashref.texi Wed Jan 20 22:47:01 1999 ---- doc/bashref.texi Mon Aug 2 17:35:41 1999 -*************** -*** 1585,1591 **** - 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. - 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 ---- 1585,1592 ---- - 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. 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 -*************** -*** 1598,1605 **** - 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}, - and @code{dotglob} options. - - The @code{GLOBIGNORE} ---- 1599,1606 ---- - 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}, @code{failglob} - and @code{dotglob} options. - - The @code{GLOBIGNORE} -*************** -*** 3814,3819 **** ---- 3815,3824 ---- - @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 bash-2.03.old/lib/readline/doc: Makefile -diff -rc bash-2.03.old/subst.c subst.c -*** bash-2.03.old/subst.c Wed Jan 20 18:13:52 1999 ---- subst.c Mon Aug 2 17:17:17 1999 -*************** -*** 96,101 **** ---- 96,104 ---- - 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. */ -*************** -*** 5667,5672 **** ---- 5670,5680 ---- - { - 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 -rc bash-2.03.old/tests/shopt.right tests/shopt.right -*** bash-2.03.old/tests/shopt.right Thu Sep 3 21:16:28 1998 ---- tests/shopt.right Mon Aug 2 17:31:19 1999 -*************** -*** 20,25 **** ---- 20,26 ---- - shopt -u mailwarn - shopt -u nocaseglob - shopt -u nullglob -+ shopt -u failglob - shopt -s promptvars - shopt -u restricted_shell - shopt -u shift_verbose -*************** -*** 51,56 **** ---- 52,58 ---- - shopt -u mailwarn - shopt -u nocaseglob - shopt -u nullglob -+ shopt -u failglob - shopt -u restricted_shell - shopt -u shift_verbose - -- -*************** -*** 68,73 **** ---- 70,76 ---- - mailwarn off - nocaseglob off - nullglob off -+ failglob off - restricted_shell off - shift_verbose off - -- -*************** -*** 190,192 **** ---- 193,197 ---- - -- - ./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 -rc bash-2.03.old/tests/shopt.tests tests/shopt.tests -*** bash-2.03.old/tests/shopt.tests Thu Nov 20 17:59:32 1997 ---- tests/shopt.tests Mon Aug 2 17:26:43 1999 -*************** -*** 21,26 **** ---- 21,27 ---- - shopt -u mailwarn - shopt -u nocaseglob - shopt -u nullglob -+ shopt -u failglob - shopt -s promptvars - shopt -u shift_verbose - shopt -s sourcepath -*************** -*** 91,93 **** ---- 92,102 ---- - 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/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 497fcff47de1..000000000000 --- a/shells/bash3/pkg-descr +++ /dev/null @@ -1,8 +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. diff --git a/shells/bash3/pkg-plist b/shells/bash3/pkg-plist deleted file mode 100644 index a35ec68f292c..000000000000 --- a/shells/bash3/pkg-plist +++ /dev/null @@ -1,10 +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 -share/doc/bash/article.ps.gz -share/doc/bash/bashref.ps.gz -share/doc/bash/article.txt -@dirrm share/doc/bash |