diff options
Diffstat (limited to 'shells')
38 files changed, 0 insertions, 958 deletions
diff --git a/shells/bash/Makefile b/shells/bash/Makefile deleted file mode 100644 index 149ab6847a97..000000000000 --- a/shells/bash/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# ex:ts=8 -# New ports collection makefile for: bash -# Date created: 21 August 1994 -# Whom: jkh -# -# $FreeBSD$ -# - -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 --git a/shells/bash/distinfo b/shells/bash/distinfo deleted file mode 100644 index 280f0ce20569..000000000000 --- a/shells/bash/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (bash-2.05a.tar.gz) = eeabc3f624861c4a8a687f7701db3d06 -MD5 (bash-doc-2.05a.tar.gz) = c86e07eb43c3a1a9b2c830b6bff1331d diff --git a/shells/bash/files/patch-ab b/shells/bash/files/patch-ab deleted file mode 100644 index f810ff94da33..000000000000 --- a/shells/bash/files/patch-ab +++ /dev/null @@ -1,24 +0,0 @@ - -$FreeBSD$ - ---- 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 --git a/shells/bash/files/patch-ac b/shells/bash/files/patch-ac deleted file mode 100644 index 51506a030580..000000000000 --- a/shells/bash/files/patch-ac +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- 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 --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/files/patch-bashline.c b/shells/bash/files/patch-bashline.c deleted file mode 100644 index 62f2199612dc..000000000000 --- a/shells/bash/files/patch-bashline.c +++ /dev/null @@ -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 --git a/shells/bash/files/patch-builtins_shopt.def b/shells/bash/files/patch-builtins_shopt.def deleted file mode 100644 index 4a896b397684..000000000000 --- a/shells/bash/files/patch-builtins_shopt.def +++ /dev/null @@ -1,22 +0,0 @@ - -$FreeBSD$ - ---- 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 --git a/shells/bash/files/patch-doc_bash.1 b/shells/bash/files/patch-doc_bash.1 deleted file mode 100644 index fc26ea10be05..000000000000 --- a/shells/bash/files/patch-doc_bash.1 +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- 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 --git a/shells/bash/files/patch-doc_bashref.texi b/shells/bash/files/patch-doc_bashref.texi deleted file mode 100644 index b4fc6acc6e6e..000000000000 --- a/shells/bash/files/patch-doc_bashref.texi +++ /dev/null @@ -1,37 +0,0 @@ - -$FreeBSD$ - ---- 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 --git a/shells/bash/files/patch-subst.c b/shells/bash/files/patch-subst.c deleted file mode 100644 index 8ef29a8b5774..000000000000 --- a/shells/bash/files/patch-subst.c +++ /dev/null @@ -1,27 +0,0 @@ - -$FreeBSD$ - ---- 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 --git a/shells/bash/files/patch-terminal.c b/shells/bash/files/patch-terminal.c deleted file mode 100644 index 73e5c793650b..000000000000 --- a/shells/bash/files/patch-terminal.c +++ /dev/null @@ -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 --git a/shells/bash/files/patch-tests_shopt.right b/shells/bash/files/patch-tests_shopt.right deleted file mode 100644 index fbbd9a8a27ff..000000000000 --- a/shells/bash/files/patch-tests_shopt.right +++ /dev/null @@ -1,35 +0,0 @@ - -$FreeBSD$ - ---- 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 --git a/shells/bash/files/patch-tests_shopt.tests b/shells/bash/files/patch-tests_shopt.tests deleted file mode 100644 index ad2eac3d811e..000000000000 --- a/shells/bash/files/patch-tests_shopt.tests +++ /dev/null @@ -1,25 +0,0 @@ - -$FreeBSD$ - ---- 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 --git a/shells/bash/pkg-comment b/shells/bash/pkg-comment deleted file mode 100644 index 0f4244ddda46..000000000000 --- a/shells/bash/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -The GNU Bourne Again Shell diff --git a/shells/bash/pkg-descr b/shells/bash/pkg-descr deleted file mode 100644 index ad734fba0d65..000000000000 --- a/shells/bash/pkg-descr +++ /dev/null @@ -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 --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 149ab6847a97..000000000000 --- a/shells/bash3/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# ex:ts=8 -# New ports collection makefile for: bash -# Date created: 21 August 1994 -# Whom: jkh -# -# $FreeBSD$ -# - -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 --git a/shells/bash3/distinfo b/shells/bash3/distinfo deleted file mode 100644 index 280f0ce20569..000000000000 --- a/shells/bash3/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (bash-2.05a.tar.gz) = eeabc3f624861c4a8a687f7701db3d06 -MD5 (bash-doc-2.05a.tar.gz) = c86e07eb43c3a1a9b2c830b6bff1331d diff --git a/shells/bash3/files/patch-ab b/shells/bash3/files/patch-ab deleted file mode 100644 index f810ff94da33..000000000000 --- a/shells/bash3/files/patch-ab +++ /dev/null @@ -1,24 +0,0 @@ - -$FreeBSD$ - ---- 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 --git a/shells/bash3/files/patch-ac b/shells/bash3/files/patch-ac deleted file mode 100644 index 51506a030580..000000000000 --- a/shells/bash3/files/patch-ac +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- 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 --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/files/patch-bashline.c b/shells/bash3/files/patch-bashline.c deleted file mode 100644 index 62f2199612dc..000000000000 --- a/shells/bash3/files/patch-bashline.c +++ /dev/null @@ -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 --git a/shells/bash3/files/patch-builtins_shopt.def b/shells/bash3/files/patch-builtins_shopt.def deleted file mode 100644 index 4a896b397684..000000000000 --- a/shells/bash3/files/patch-builtins_shopt.def +++ /dev/null @@ -1,22 +0,0 @@ - -$FreeBSD$ - ---- 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 --git a/shells/bash3/files/patch-doc_bash.1 b/shells/bash3/files/patch-doc_bash.1 deleted file mode 100644 index fc26ea10be05..000000000000 --- a/shells/bash3/files/patch-doc_bash.1 +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- 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 --git a/shells/bash3/files/patch-doc_bashref.texi b/shells/bash3/files/patch-doc_bashref.texi deleted file mode 100644 index b4fc6acc6e6e..000000000000 --- a/shells/bash3/files/patch-doc_bashref.texi +++ /dev/null @@ -1,37 +0,0 @@ - -$FreeBSD$ - ---- 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 --git a/shells/bash3/files/patch-subst.c b/shells/bash3/files/patch-subst.c deleted file mode 100644 index 8ef29a8b5774..000000000000 --- a/shells/bash3/files/patch-subst.c +++ /dev/null @@ -1,27 +0,0 @@ - -$FreeBSD$ - ---- 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 --git a/shells/bash3/files/patch-terminal.c b/shells/bash3/files/patch-terminal.c deleted file mode 100644 index 73e5c793650b..000000000000 --- a/shells/bash3/files/patch-terminal.c +++ /dev/null @@ -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 --git a/shells/bash3/files/patch-tests_shopt.right b/shells/bash3/files/patch-tests_shopt.right deleted file mode 100644 index fbbd9a8a27ff..000000000000 --- a/shells/bash3/files/patch-tests_shopt.right +++ /dev/null @@ -1,35 +0,0 @@ - -$FreeBSD$ - ---- 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 --git a/shells/bash3/files/patch-tests_shopt.tests b/shells/bash3/files/patch-tests_shopt.tests deleted file mode 100644 index ad2eac3d811e..000000000000 --- a/shells/bash3/files/patch-tests_shopt.tests +++ /dev/null @@ -1,25 +0,0 @@ - -$FreeBSD$ - ---- 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 --git a/shells/bash3/pkg-comment b/shells/bash3/pkg-comment deleted file mode 100644 index 0f4244ddda46..000000000000 --- a/shells/bash3/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -The GNU Bourne Again Shell diff --git a/shells/bash3/pkg-descr b/shells/bash3/pkg-descr deleted file mode 100644 index ad734fba0d65..000000000000 --- a/shells/bash3/pkg-descr +++ /dev/null @@ -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 --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/psh/Makefile b/shells/psh/Makefile deleted file mode 100644 index 1138c9ec4c3e..000000000000 --- a/shells/psh/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# New ports collection makefile for: perlsh -# Date created: 11 Dec 1999 -# Whom: Will Andrews <andrews@technologist.com> -# -# $FreeBSD$ -# - -PORTNAME= perlsh -PORTVERSION= 0.009 -PORTREVISION= 1 -CATEGORIES= shells perl5 -MASTER_SITES= http://www.focusresearch.com/gregor/psh/ -DISTNAME= psh-${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org - -PERL_CONFIGURE= yes - -MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} -MAN3= Psh::Builtins.3 \ - Psh::Completion.3 \ - Psh::Job.3 \ - Psh::Joblist.3 \ - Psh::Locale::Base.3 \ - Psh::Locale::Default.3 \ - Psh::Locale::French.3 \ - Psh::Locale::German.3 \ - Psh::Locale::Italian.3 \ - Psh::Locale::Portuguese.3 \ - Psh::Locale::Spanish.3 \ - Psh::OS.3 \ - Psh::OS::Mac.3 \ - Psh::OS::Unix.3 \ - Psh::OS::Win.3 \ - Psh::PCompletion.3 \ - Psh::Parser.3 \ - Psh::PerlEval.3 \ - Psh::Util.3 - -pre-install: - ${PERL} -pi -e "s:/usr/local:${PREFIX}:g" ${WRKSRC}/Makefile; - ${PERL} -pi -e "s:/usr/local/man/man1:${MAN3PREFIX}/man/man1:g" ${WRKSRC}/Makefile; - ${PERL} -pi -e "s:/usr/local/lib/perl5/5.00503/man/man3:${MAN3PREFIX}/man/man3:g" ${WRKSRC}/Makefile; - -post-install: - @${ECHO} "Updating /etc/shells" - @${CP} /etc/shells /etc/shells.bak - @(${GREP} -v ${PREFIX}/bin/psh /etc/shells.bak; \ - ${ECHO_CMD} ${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 aae4721f834d..000000000000 --- a/shells/psh/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (psh-0.009.tar.gz) = a6d9dd7dc80ceb7ac63203bda7976622 diff --git a/shells/psh/files/patch-aa b/shells/psh/files/patch-aa deleted file mode 100644 index 1e15fc8f9b87..000000000000 --- a/shells/psh/files/patch-aa +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.PL Tue Mar 14 05:29:39 2000 -+++ Makefile.PL.new Fri Jan 5 16:36:49 2001 -@@ -25,6 +25,7 @@ - - WriteMakefile ( - NAME => 'psh', -+ PREFIX => '${PREFIX}', - 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 95105c3d076a..000000000000 --- a/shells/psh/pkg-plist +++ /dev/null @@ -1,64 +0,0 @@ -bin/psh -lib/perl5/%%PERL_VERSION%%/man/man1/psh.pod1 -lib/perl5/%%PERL_VERSION%%/man/man1/pshdevel.pod1 -lib/perl5/site_perl/%%PERL_VER%%/Psh.pm -lib/perl5/site_perl/%%PERL_VER%%/Psh/Joblist.pm -lib/perl5/site_perl/%%PERL_VER%%/Psh/OS/Mac.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/Builtins/Bg.pm -lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Bind.pm -lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Complete.pm -lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Builtin.pm -lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Drives.pm -lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Dirs.pm -lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Exit.pm -lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fc.pm -lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fg.pm -lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Firsttime.pm -lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Function.pm -lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Help.pm -lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/History.pm -lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Jobs.pm -lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Kill.pm -lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Pshtokenize.pm -lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Readline.pm -lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Rename.pm -lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Set.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/Builtins/Symbols.pm -lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Which.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/Completion.pm -lib/perl5/site_perl/%%PERL_VER%%/Psh/PCompletion.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/Debug.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 -@unexec rmdir %D/lib/perl5/%%PERL_VERSION%%/man/man1 2>/dev/null || true |