Date: Tue, 7 May 2002 04:27:26 -0700 (PDT) From: Mike Bouma <mike.bouma@talk21.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/37820: Update port: shells/bash2 Message-ID: <200205071127.g47BRQHY094707@nwww.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 37820
>Category: ports
>Synopsis: Update port: shells/bash2
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue May 07 04:30:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Mike Bouma
>Release: 4.4-RELEASE
>Organization:
Bouma, Inc
>Environment:
>Description:
The bash2 port is outdated.
>How-To-Repeat:
>Fix:
diff -ruN bash2.old/Makefile bash2/Makefile
--- bash2.old/Makefile Thu Mar 28 03:13:55 2002
+++ bash2/Makefile Thu Jan 1 01:00:00 1970
@@ -1,42 +0,0 @@
-# ex:ts=8
-# New ports collection makefile for: bash
-# Date created: 21 August 1994
-# Whom: jkh
-#
-# $FreeBSD: ports/shells/bash2/Makefile,v 1.53 2002/03/28 02:13:55 obrien Exp $
-#
-
-PORTNAME= bash
-PORTVERSION= 2.05a
-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= obrien@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_CMD} ${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 -ruN bash2.old/README.html bash2/README.html
--- bash2.old/README.html Sun Apr 7 00:43:24 2002
+++ bash2/README.html Thu Jan 1 01:00:00 1970
@@ -1,30 +0,0 @@
-<html>
-<title> The FreeBSD Ports Collection (shells/bash2)</title>
-<head><h1> The FreeBSD Ports Collection ("shells/bash2")</h1> </head> <hr>
-<body>
-
-<p>You are now in the directory for the port "shells/bash2" (package name "bash-2.05a").
-
-<p>This is the one-line description for this port:
-
-<p><hr><p>
-The GNU Bourne Again Shell
-<p><hr>
-
-<p>Please read the "<a href="pkg-descr">description file</a>" for a
-longer description.
-
-<p>Go to the <a href="../../README.html">top of the ports tree</a> for
-a summary on how to use the ports collection.
-
-<p>
-
-<p>
-
-
-<p><hr><p>
-<a href="../README.html"> Go up one level</a>
-|
-<a href="../../README.html"> Go to top of ports tree</a>
-</body>
-</html>
diff -ruN bash2.old/distinfo bash2/distinfo
--- bash2.old/distinfo Wed Nov 21 02:40:39 2001
+++ bash2/distinfo Thu Jan 1 01:00:00 1970
@@ -1,2 +0,0 @@
-MD5 (bash-2.05a.tar.gz) = eeabc3f624861c4a8a687f7701db3d06
-MD5 (bash-doc-2.05a.tar.gz) = c86e07eb43c3a1a9b2c830b6bff1331d
diff -ruN bash2.old/files/patch-ab bash2/files/patch-ab
--- bash2.old/files/patch-ab Wed Nov 21 02:40:39 2001
+++ bash2/files/patch-ab Thu Jan 1 01:00:00 1970
@@ -1,24 +0,0 @@
-
-$FreeBSD: ports/shells/bash2/files/patch-ab,v 1.11 2001/11/21 01:40:39 naddy Exp $
-
---- Makefile.in.orig Mon Nov 12 17:42:45 2001
-+++ Makefile.in Wed Nov 21 00:08:16 2001
-@@ -59,6 +59,7 @@
-
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALLMODE= -m 0755
- INSTALLMODE2 = -m 0555
-@@ -627,8 +628,8 @@
- @${SHELL} $(SUPPORT_SRC)mkdirs $(DESTDIR)$(infodir)
-
- install: .made installdirs
-- $(INSTALL_PROGRAM) $(INSTALLMODE) $(Program) $(DESTDIR)$(bindir)/$(Program)
-- $(INSTALL_PROGRAM) $(INSTALLMODE2) bashbug $(DESTDIR)$(bindir)/bashbug
-+ $(INSTALL_PROGRAM) $(Program) $(DESTDIR)$(bindir)/$(Program)
-+ $(INSTALL_SCRIPT) bashbug $(DESTDIR)$(bindir)/bashbug
- -( cd $(DOCDIR) ; $(MAKE) $(MFLAGS) \
- man1dir=$(man1dir) man1ext=$(man1ext) \
- man3dir=$(man3dir) man3ext=$(man3ext) \
diff -ruN bash2.old/files/patch-ac bash2/files/patch-ac
--- bash2.old/files/patch-ac Wed Nov 21 02:40:39 2001
+++ bash2/files/patch-ac Thu Jan 1 01:00:00 1970
@@ -1,14 +0,0 @@
-
-$FreeBSD: ports/shells/bash2/files/patch-ac,v 1.4 2001/11/21 01:40:39 naddy Exp $
-
---- configure.orig Mon Nov 19 18:27:10 2001
-+++ configure Mon Nov 19 18:27:17 2001
-@@ -1108,7 +1108,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
- *-openbsd*) opt_bash_malloc=no ;; # they claim it needs eight-bit alignment
- *-aix*) opt_bash_malloc=no ;; # AIX machines
- *-nextstep*) opt_bash_malloc=no ;; # NeXT machines running NeXTstep
diff -ruN bash2.old/files/patch-af bash2/files/patch-af
--- bash2.old/files/patch-af Wed May 24 12:12:01 2000
+++ bash2/files/patch-af Thu Jan 1 01:00:00 1970
@@ -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 -ruN bash2.old/files/patch-bashline.c bash2/files/patch-bashline.c
--- bash2.old/files/patch-bashline.c Mon Mar 25 04:18:52 2002
+++ bash2/files/patch-bashline.c Thu Jan 1 01:00:00 1970
@@ -1,118 +0,0 @@
---- bashline.c.orig Mon Nov 5 09:58:59 2001
-+++ bashline.c Sun Mar 24 19:15:04 2002
-@@ -1724,10 +1724,6 @@
- }
- }
-
--/* Define NO_FORCE_FIGNORE if you want to match filenames that would
-- otherwise be ignored if they are the only possible matches. */
--/* #define NO_FORCE_FIGNORE */
--
- /* If FIGNORE is set, then don't match files with the given suffixes when
- completing filenames. If only one of the possibilities has an acceptable
- suffix, delete the others, else just return and let the completer
-@@ -1752,10 +1748,15 @@
- {
- char **newnames;
- int idx, nidx;
--#ifdef NO_FORCE_FIGNORE
- char **oldnames;
- int oidx;
--#endif
-+ char *no_force_fignore;
-+
-+
-+/* Set NO_FORCE_FIGNORE if you want to match filenames that would
-+ otherwise be ignored if they are the only possible matches. */
-+ no_force_fignore = get_string_value ("NO_FORCE_FIGNORE");
-+//fprintf(stderr, ">NO_FORCE_FIGNORE< is [%s]\n", no_force_fignore);
-
- /* If there is only one completion, see if it is acceptable. If it is
- not, free it up. In any case, short-circuit and return. This is a
-@@ -1763,13 +1764,12 @@
- if there is only one completion; it is the completion itself. */
- if (names[1] == (char *)0)
- {
--#ifndef NO_FORCE_FIGNORE
-- if ((*name_func) (names[0]) == 0)
-- {
-- free (names[0]);
-- names[0] = (char *)NULL;
-- }
--#endif
-+ if (!no_force_fignore)
-+ if ((*name_func) (names[0]) == 0)
-+ {
-+ free (names[0]);
-+ names[0] = (char *)NULL;
-+ }
- return;
- }
-
-@@ -1778,10 +1778,11 @@
- for (nidx = 1; names[nidx]; nidx++)
- ;
- newnames = alloc_array (nidx + 1);
--#ifdef NO_FORCE_FIGNORE
-- oldnames = alloc_array (nidx - 1);
-- oidx = 0;
--#endif
-+ if (no_force_fignore)
-+ {
-+ oldnames = alloc_array (nidx - 1);
-+ oidx = 0;
-+ }
-
- newnames[0] = names[0];
- for (idx = nidx = 1; names[idx]; idx++)
-@@ -1789,11 +1790,10 @@
- if ((*name_func) (names[idx]))
- newnames[nidx++] = names[idx];
- else
--#ifndef NO_FORCE_FIGNORE
-- free (names[idx]);
--#else
-- oldnames[oidx++] = names[idx];
--#endif
-+ if (no_force_fignore)
-+ oldnames[oidx++] = names[idx];
-+ else
-+ free (names[idx]);
- }
-
- newnames[nidx] = (char *)NULL;
-@@ -1801,21 +1801,23 @@
- /* If none are acceptable then let the completer handle it. */
- if (nidx == 1)
- {
--#ifndef NO_FORCE_FIGNORE
-- free (names[0]);
-- names[0] = (char *)NULL;
--#else
-- free (oldnames);
--#endif
-+ if (no_force_fignore)
-+ free (oldnames);
-+ else
-+ {
-+ free (names[0]);
-+ names[0] = (char *)NULL;
-+ }
- free (newnames);
- return;
- }
-
--#ifdef NO_FORCE_FIGNORE
-- while (oidx)
-- free (oldnames[--oidx]);
-- free (oldnames);
--#endif
-+ if (no_force_fignore)
-+ {
-+ while (oidx)
-+ free (oldnames[--oidx]);
-+ free (oldnames);
-+ }
-
- /* If only one is acceptable, copy it to names[0] and return. */
- if (nidx == 2)
diff -ruN bash2.old/files/patch-builtins_shopt.def bash2/files/patch-builtins_shopt.def
--- bash2.old/files/patch-builtins_shopt.def Wed Nov 21 02:40:39 2001
+++ bash2/files/patch-builtins_shopt.def Thu Jan 1 01:00:00 1970
@@ -1,22 +0,0 @@
-
-$FreeBSD: ports/shells/bash2/files/patch-builtins_shopt.def,v 1.1 2001/11/21 01:40:39 na
ddy Exp $
-
---- builtins/shopt.def.orig Tue Sep 11 21:55:06 2001
-+++ builtins/shopt.def Tue Nov 20 23:52:45 2001
-@@ -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;
-@@ -140,6 +140,7 @@
- #endif
- { "nocaseglob", &glob_ignore_case, (shopt_set_func_t *)NULL },
- { "nullglob", &allow_null_glob_expansion, (shopt_set_func_t *)NULL },
-+ { "failglob", &fail_glob_expansion, (Function *)NULL },
- #if defined (PROGRAMMABLE_COMPLETION)
- { "progcomp", &prog_completion_enabled, (shopt_set_func_t *)NULL },
- #endif
diff -ruN bash2.old/files/patch-doc_bash.1 bash2/files/patch-doc_bash.1
--- bash2.old/files/patch-doc_bash.1 Wed Nov 21 02:40:39 2001
+++ bash2/files/patch-doc_bash.1 Thu Jan 1 01:00:00 1970
@@ -1,16 +0,0 @@
-
-$FreeBSD: ports/shells/bash2/files/patch-doc_bash.1,v 1.1 2001/11/21 01:40:39 naddy Exp
-
---- doc/bash.1.orig Tue Nov 13 18:55:59 2001
-+++ doc/bash.1 Tue Nov 20 23:52:45 2001
-@@ -2473,6 +2473,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 -ruN bash2.old/files/patch-doc_bashref.texi bash2/files/patch-doc_bashref.texi
--- bash2.old/files/patch-doc_bashref.texi Wed Nov 21 02:40:39 2001
+++ bash2/files/patch-doc_bashref.texi Thu Jan 1 01:00:00 1970
@@ -1,37 +0,0 @@
-
-$FreeBSD: ports/shells/bash2/files/patch-doc_bashref.texi,v 1.1 2001/11/21 01:40:39 nadd
y Exp $
-
---- doc/bashref.texi.orig Tue Nov 13 18:55:03 2001
-+++ doc/bashref.texi Tue Nov 20 23:52:45 2001
-@@ -1700,7 +1700,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
-@@ -1713,8 +1714,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 @env{GLOBIGNORE}
-@@ -3372,6 +3373,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
diff -ruN bash2.old/files/patch-subst.c bash2/files/patch-subst.c
--- bash2.old/files/patch-subst.c Wed Nov 21 02:40:39 2001
+++ bash2/files/patch-subst.c Thu Jan 1 01:00:00 1970
@@ -1,27 +0,0 @@
-
-$FreeBSD: ports/shells/bash2/files/patch-subst.c,v 1.1 2001/11/21 01:40:39 naddy Exp $
-
---- subst.c.orig Mon Nov 5 20:19:49 2001
-+++ subst.c Tue Nov 20 23:52:45 2001
-@@ -121,6 +121,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;
-+
- #if 0
- /* Variables to keep track of which words in an expanded word list (the
- output of expand_word_list_internal) are the result of globbing
-@@ -6132,6 +6135,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 -ruN bash2.old/files/patch-terminal.c bash2/files/patch-terminal.c
--- bash2.old/files/patch-terminal.c Wed Apr 11 18:47:56 2001
+++ bash2/files/patch-terminal.c Thu Jan 1 01:00:00 1970
@@ -1,14 +0,0 @@
---- lib/readline/terminal.c.orig Tue Feb 6 12:39:22 2001
-+++ lib/readline/terminal.c Wed Apr 11 09:43:44 2001
-@@ -297,7 +297,11 @@
- { "im", &_rl_term_im },
- { "kd", &_rl_term_kd },
- { "kh", &_rl_term_kh }, /* home */
-+#ifdef __FreeBSD__
-+ { "@7", &_rl_term_kH }, /* end */
-+#else
- { "kH", &_rl_term_kH }, /* end */
-+#endif
- { "kl", &_rl_term_kl },
- { "kr", &_rl_term_kr },
- { "ku", &_rl_term_ku },
diff -ruN bash2.old/files/patch-tests_shopt.right bash2/files/patch-tests_shopt.right
--- bash2.old/files/patch-tests_shopt.right Wed Nov 21 02:40:39 2001
+++ bash2/files/patch-tests_shopt.right Thu Jan 1 01:00:00 1970
@@ -1,35 +0,0 @@
-
-$FreeBSD: ports/shells/bash2/files/patch-tests_shopt.right,v 1.1 2001/11/21 01:40:39 nad
dy Exp $
-
---- tests/shopt.right.orig Wed May 9 19:40:39 2001
-+++ tests/shopt.right Tue Nov 20 23:52:45 2001
-@@ -22,6 +22,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
-@@ -58,6 +59,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
-@@ -78,6 +80,7 @@
- no_empty_cmd_completion off
- nocaseglob off
- nullglob off
-+failglob off
- restricted_shell off
- shift_verbose off
- xpg_echo off
-@@ -205,3 +208,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 -ruN bash2.old/files/patch-tests_shopt.tests bash2/files/patch-tests_shopt.tests
--- bash2.old/files/patch-tests_shopt.tests Wed Nov 21 02:40:39 2001
+++ bash2/files/patch-tests_shopt.tests Thu Jan 1 01:00:00 1970
@@ -1,25 +0,0 @@
-
-$FreeBSD: ports/shells/bash2/files/patch-tests_shopt.tests,v 1.1 2001/11/21 01:40:39 nad
dy Exp $
-
---- tests/shopt.tests.orig Tue Sep 21 17:49:32 1999
-+++ tests/shopt.tests Tue Nov 20 23:52:45 2001
-@@ -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 -ruN bash2.old/pkg-comment bash2/pkg-comment
--- bash2.old/pkg-comment Fri Dec 22 23:43:41 2000
+++ bash2/pkg-comment Thu Jan 1 01:00:00 1970
@@ -1 +0,0 @@
-The GNU Bourne Again Shell
diff -ruN bash2.old/pkg-descr bash2/pkg-descr
--- bash2.old/pkg-descr Tue Apr 10 12:47:48 2001
+++ bash2/pkg-descr Thu Jan 1 01:00:00 1970
@@ -1,11 +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/
- http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html
diff -ruN bash2.old/pkg-plist bash2/pkg-plist
--- bash2.old/pkg-plist Fri Dec 24 19:50:25 1999
+++ bash2/pkg-plist Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
-bin/bash
-@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/s
hells.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
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205071127.g47BRQHY094707>