diff options
| -rw-r--r-- | shells/bash1/Makefile | 11 | ||||
| -rw-r--r-- | shells/bash1/distinfo | 2 | ||||
| -rw-r--r-- | shells/bash1/files/patch-aa | 24 | ||||
| -rw-r--r-- | shells/bash1/files/patch-ab | 69 | ||||
| -rw-r--r-- | shells/bash1/files/patch-ac | 170 | ||||
| -rw-r--r-- | shells/bash1/files/patch-ad | 53 | ||||
| -rw-r--r-- | shells/bash1/files/patch-ae | 17 | ||||
| -rw-r--r-- | shells/bash1/pkg-plist | 4 |
8 files changed, 146 insertions, 204 deletions
diff --git a/shells/bash1/Makefile b/shells/bash1/Makefile index 04a9218b42cb..85524f6c6e38 100644 --- a/shells/bash1/Makefile +++ b/shells/bash1/Makefile @@ -1,19 +1,18 @@ # New ports collection makefile for: bash -# Version required: 2.0 +# Version required: 1.14.7 # Date created: 21 August 1994 # Whom: jkh # -# $Id: Makefile,v 1.19 1996/12/27 06:26:05 obrien Exp $ +# $Id: Makefile,v 1.20 1996/12/27 11:40:41 ache Exp $ # -DISTNAME= bash-2.0 +DISTNAME= bash-1.14.7 CATEGORIES= shells MASTER_SITES= ftp://slc2.ins.cwru.edu/pub/dist/ MAINTAINER= ache@FreeBSD.ORG -GNU_CONFIGURE= Yes - -MAN1= bash.1 bashbug.1 +WRKSRC= ${WRKDIR}/${DISTNAME} +# Don't compress manpages or .so not works. .include <bsd.port.mk> diff --git a/shells/bash1/distinfo b/shells/bash1/distinfo index fb1544e5a3a1..721cbbd91ab6 100644 --- a/shells/bash1/distinfo +++ b/shells/bash1/distinfo @@ -1 +1 @@ -MD5 (bash-2.0.tar.gz) = b88fd6607a6b9b5ebee34ff283c5ba63 +MD5 (bash-1.14.7.tar.gz) = 2ba8f27c9861d57826e695278a240a04 diff --git a/shells/bash1/files/patch-aa b/shells/bash1/files/patch-aa deleted file mode 100644 index 34865eecc333..000000000000 --- a/shells/bash1/files/patch-aa +++ /dev/null @@ -1,24 +0,0 @@ -*** configure.bak Wed Dec 18 23:01:41 1996 ---- configure Fri Dec 27 14:07:59 1996 -*************** -*** 694,699 **** ---- 694,700 ---- - sparc-svr4*) opt_gnu_malloc=no ;; # sparc SVR4, SVR4.2 - sparc-netbsd*) opt_gnu_malloc=no ;; # needs 8-byte alignment - sparc-linux*) opt_gnu_malloc=no ;; # sparc running linux; requires ELF -+ *-freebsd*) opt_gnu_malloc=no ;; # has faster malloc - *-aix*) opt_gnu_malloc=no ;; # AIX machines - *-nextstep*) opt_gnu_malloc=no ;; # NeXT machines running NeXTstep - *-dgux*) opt_gnu_malloc=no ;; # DG/UX machines -*** configure.in.bak Tue Dec 17 20:49:09 1996 ---- configure.in Fri Dec 27 14:07:59 1996 -*************** -*** 36,41 **** ---- 36,42 ---- - sparc-svr4*) opt_gnu_malloc=no ;; # sparc SVR4, SVR4.2 - sparc-netbsd*) opt_gnu_malloc=no ;; # needs 8-byte alignment - sparc-linux*) opt_gnu_malloc=no ;; # sparc running linux; requires ELF -+ *-freebsd*) opt_gnu_malloc=no ;; # has faster malloc - *-aix*) opt_gnu_malloc=no ;; # AIX machines - *-nextstep*) opt_gnu_malloc=no ;; # NeXT machines running NeXTstep - *-dgux*) opt_gnu_malloc=no ;; # DG/UX machines diff --git a/shells/bash1/files/patch-ab b/shells/bash1/files/patch-ab index 46c5e4f858c3..908154888e5c 100644 --- a/shells/bash1/files/patch-ab +++ b/shells/bash1/files/patch-ab @@ -1,19 +1,56 @@ -*** Makefile.in.bak Wed Dec 18 22:57:21 1996 ---- Makefile.in Fri Dec 27 14:20:11 1996 +*** cpp-Makefile.orig Sun Jun 11 22:44:05 1995 +--- cpp-Makefile Wed Jul 19 20:17:18 1995 *************** -*** 499,505 **** +*** 133,139 **** +--- 133,143 ---- + /usr/include. Then it will break.) */ + CC = gcc -traditional -I/usr/include $(GCC_EXTRAS) + # else /* HAVE_FIXED_INCLUDES */ ++ #ifdef __FreeBSD__ ++ CC += $(GCC_EXTRAS) ++ #else + CC = gcc $(GCC_EXTRAS) ++ #endif + # endif /* HAVE_FIXED_INCLUDES */ + #else /* !HAVE_GCC */ + CC = CPP_CC +*************** +*** 151,158 **** +--- 155,167 ---- + AR = ar + + INSTALL = $(SUPPORT_SRC)install.sh ++ #ifndef __FreeBSD__ + INSTALL_PROGRAM = $(INSTALL) -c + INSTALL_DATA = $(INSTALL) -c -m 644 ++ #else ++ INSTALL_PROGRAM = install -c -o bin -g bin -m 555 ++ INSTALL_DATA = install -c -o bin -g bin -m 644 ++ #endif - install: .made installdirs - $(INSTALL_PROGRAM) $(Program) $(bindir)/$(Program) -! $(INSTALL_PROGRAM) bashbug $(bindir)/bashbug - -( cd $(DOCDIR) ; $(MAKE) $(MFLAGS) \ - man1dir=$(man1dir) man1ext=$(man1ext) \ - man3dir=$(man3dir) man3ext=$(man3ext) \ ---- 499,505 ---- + COMPRESS = gzip + COMPRESS_EXT = .gz +*************** +*** 300,306 **** +--- 309,317 ---- + /**/# The GNU coding standards don't recognize the possibility that + /**/# other information besides optimization and debugging might be + /**/# passed to cc. A different name should have been used. ++ #ifndef __FreeBSD__ + CFLAGS = -O -g ++ #endif - install: .made installdirs - $(INSTALL_PROGRAM) $(Program) $(bindir)/$(Program) -! $(INSTALL) -m 555 bashbug $(bindir)/bashbug - -( cd $(DOCDIR) ; $(MAKE) $(MFLAGS) \ - man1dir=$(man1dir) man1ext=$(man1ext) \ - man3dir=$(man3dir) man3ext=$(man3ext) \ + SYSTEM_FLAGS = $(LINEBUF) $(VPRINTF) $(UNISTD) $(STDLIB) $(LIMITSH) \ + $(GROUPS) $(RESOURCE) $(PARAM) $(SIGHANDLER) $(SYSDEP) $(WAITH) \ +*************** +*** 308,313 **** +--- 319,327 ---- + $(VARARGSH) $(STRCHR) $(STRCASE) $(DEVFD) \ + -D$(Machine) -D$(OS) + LDFLAGS = $(NOSHARE) $(SYSDEP_LD) $(EXTRA_LD_PATH) $(PROFILE_FLAGS) $(CFLAGS) ++ #ifdef __FreeBSD__ ++ LDFLAGS += -s ++ #endif + CCFLAGS = $(PROFILE_FLAGS) $(SYSTEM_FLAGS) -DSHELL $(ALLOCA_CFLAGS) \ + $(MALLOC_CFLAGS) $(CFLAGS) + CPPFLAGS= -I. -I$(srcdir) -I$(LIBSRC) diff --git a/shells/bash1/files/patch-ac b/shells/bash1/files/patch-ac index ac6d51115cd4..4176de4b36a0 100644 --- a/shells/bash1/files/patch-ac +++ b/shells/bash1/files/patch-ac @@ -1,133 +1,41 @@ -*** bashhist.c.bak Mon Jul 22 22:36:24 1996 ---- bashhist.c Fri Dec 27 13:31:20 1996 +*** readline.c.orig Wed May 24 18:43:28 1995 +--- lib/readline/readline.c Wed Jul 19 20:26:53 1995 *************** -*** 39,45 **** - #include "pathexp.h" /* for the struct ignorevar stuff */ - #include "builtins/common.h" - #include <readline/history.h> -! #include <glob/fnmatch.h> - - #if defined (READLINE) - # include "bashline.h" ---- 39,45 ---- - #include "pathexp.h" /* for the struct ignorevar stuff */ - #include "builtins/common.h" - #include <readline/history.h> -! #include <fnmatch.h> - - #if defined (READLINE) - # include "bashline.h" -*** execute_cmd.c.bak Fri Dec 20 00:22:32 1996 ---- execute_cmd.c Fri Dec 27 13:31:20 1996 -*************** -*** 74,80 **** - #include "builtins/common.h" - #include "builtins/builtext.h" /* list of builtins */ - -! #include <glob/fnmatch.h> - #include <tilde/tilde.h> - - #if defined (BUFFERED_INPUT) ---- 74,80 ---- - #include "builtins/common.h" - #include "builtins/builtext.h" /* list of builtins */ - -! #include <fnmatch.h> - #include <tilde/tilde.h> - - #if defined (BUFFERED_INPUT) -*** pathexp.c.bak Wed Oct 23 19:55:12 1996 ---- pathexp.c Fri Dec 27 13:31:20 1996 -*************** -*** 33,39 **** - #include "pathexp.h" - #include "flags.h" - -! #include <glob/fnmatch.h> - #include <glob/glob.h> - - /* Control whether * matches .files in globbing. */ ---- 33,39 ---- - #include "pathexp.h" - #include "flags.h" - -! #include <fnmatch.h> - #include <glob/glob.h> - - /* Control whether * matches .files in globbing. */ -*** shell.c.bak Wed Dec 18 23:16:50 1996 ---- shell.c Fri Dec 27 13:31:20 1996 +*** 958,964 **** + static void + readline_initialize_everything () + { +! char *t; + + /* Find out if we are running in Emacs. */ + running_in_emacs = getenv ("EMACS") != (char *)0; +--- 958,964 ---- + static void + readline_initialize_everything () + { +! char *t, *t1; + + /* Find out if we are running in Emacs. */ + running_in_emacs = getenv ("EMACS") != (char *)0; *************** -*** 68,74 **** - #endif - - #include <tilde/tilde.h> -! #include <glob/fnmatch.h> - - #if !defined (HAVE_GETPW_DECLS) - extern struct passwd *getpwuid (); ---- 68,74 ---- - #endif - - #include <tilde/tilde.h> -! #include <fnmatch.h> - - #if !defined (HAVE_GETPW_DECLS) - extern struct passwd *getpwuid (); -*** subst.c.bak Wed Dec 11 01:14:33 1996 ---- subst.c Fri Dec 27 13:31:20 1996 -*************** -*** 58,64 **** - # include <readline/history.h> - #endif - -! #include <glob/fnmatch.h> - - #if !defined (errno) - extern int errno; ---- 58,64 ---- - # include <readline/history.h> - #endif - -! #include <fnmatch.h> - - #if !defined (errno) - extern int errno; -*** lib/glob/glob.c.bak Thu Jul 11 22:09:52 1996 ---- lib/glob/glob.c Fri Dec 27 13:33:32 1996 -*************** -*** 87,93 **** - #endif /* OPENDIR_NOT_ROBUST */ - - #include "memalloc.h" -! #include "fnmatch.h" - - #if !defined (HAVE_STDLIB_H) && !defined (SHELL) - extern char *malloc (), *realloc (); ---- 87,93 ---- - #endif /* OPENDIR_NOT_ROBUST */ - - #include "memalloc.h" -! #include <fnmatch.h> - - #if !defined (HAVE_STDLIB_H) && !defined (SHELL) - extern char *malloc (), *realloc (); -*** lib/glob/Makefile.in.bak Fri Oct 4 19:02:34 1996 ---- lib/glob/Makefile.in Fri Dec 27 13:28:01 1996 -*************** -*** 45,51 **** - # The header files for this library. - HSOURCES = $(srcdir)/fnmatch.h - -! OBJECTS = glob.o fnmatch.o - - # The texinfo files which document this library. - DOCSOURCE = doc/glob.texi ---- 45,51 ---- - # The header files for this library. - HSOURCES = $(srcdir)/fnmatch.h - -! OBJECTS = glob.o #fnmatch.o - - # The texinfo files which document this library. - DOCSOURCE = doc/glob.texi +*** 993,1000 **** + /* Check for LC_CTYPE and use its value to decide the defaults for + 8-bit character input and output. */ + t = getenv ("LC_CTYPE"); +! if (t && (strcmp (t, "iso-8859-1") == 0 || strcmp (t, "iso_8859_1") == 0 || +! strcmp (t, "ISO-8859-1") == 0)) + { + _rl_meta_flag = 1; + _rl_convert_meta_chars_to_ascii = 0; +--- 993,1003 ---- + /* Check for LC_CTYPE and use its value to decide the defaults for + 8-bit character input and output. */ + t = getenv ("LC_CTYPE"); +! t1 = getenv ("LANG"); +! if (t && (strstr (t, "8859-1") != NULL || strstr (t, "8859_1") != NULL || +! strstr (t, "KOI8-R") != NULL || strstr (t, "koi8-r") != NULL) || +! t1 && (strstr (t1, "8859-1") != NULL || strstr (t1, "8859_1") != NULL || +! strstr (t1, "KOI8-R") != NULL || strstr (t1, "koi8-r") != NULL)) + { + _rl_meta_flag = 1; + _rl_convert_meta_chars_to_ascii = 0; diff --git a/shells/bash1/files/patch-ad b/shells/bash1/files/patch-ad index 541e255dcd01..6b3bc222890b 100644 --- a/shells/bash1/files/patch-ad +++ b/shells/bash1/files/patch-ad @@ -1,25 +1,30 @@ -*** doc/Makefile.in.orig Wed Dec 18 23:27:36 1996 ---- doc/Makefile.in Fri Dec 27 14:23:37 1996 +*** documentation/Makefile.orig Sun Jun 11 22:45:55 1995 +--- documentation/Makefile Wed Jul 19 20:35:38 1995 *************** -*** 145,154 **** - -test -d $(man3dir) || $(SHELL) ${MKDIRS} $(man3dir) - -test -d $(infodir) || $(SHELL) ${MKDIRS} $(infodir) - -! install: info installdirs - -$(INSTALL_DATA) $(srcdir)/bash.1 $(man1dir)/bash.${man1ext} - -$(INSTALL_DATA) $(srcdir)/bashbug.1 $(man1dir)/bashbug.${man1ext} -! -$(INSTALL_DATA) $(srcdir)/readline.3 $(man3dir)/readline.${man3ext} - -$(INSTALL_DATA) $(srcdir)/bashref.info $(infodir)/bash.info - # uncomment the next line to install the builtins man page - # $(INSTALL_DATA) builtins.1 $(man1dir)/bash_builtins.${man1ext} ---- 145,154 ---- - -test -d $(man3dir) || $(SHELL) ${MKDIRS} $(man3dir) - -test -d $(infodir) || $(SHELL) ${MKDIRS} $(infodir) - -! install: info #installdirs - -$(INSTALL_DATA) $(srcdir)/bash.1 $(man1dir)/bash.${man1ext} - -$(INSTALL_DATA) $(srcdir)/bashbug.1 $(man1dir)/bashbug.${man1ext} -! # -$(INSTALL_DATA) $(srcdir)/readline.3 $(man3dir)/readline.${man3ext} - -$(INSTALL_DATA) $(srcdir)/bashref.info $(infodir)/bash.info - # uncomment the next line to install the builtins man page - # $(INSTALL_DATA) builtins.1 $(man1dir)/bash_builtins.${man1ext} +*** 90,101 **** + + installdirs: + -[ -d $(mandir) ] || mkdir $(mandir) +! -[ -d $(man3dir) ] || mkdir $(man3dir) + -[ -d $(infodir) ] || mkdir $(infodir) + + install: all installdirs + $(INSTALL_DATA) bash.1 $(mandir) +! $(INSTALL_DATA) readline.3 $(man3dir) + $(INSTALL_DATA) features.info $(infodir)/bash.info + + uninstall: +--- 90,102 ---- + + installdirs: + -[ -d $(mandir) ] || mkdir $(mandir) +! # -[ -d $(man3dir) ] || mkdir $(man3dir) + -[ -d $(infodir) ] || mkdir $(infodir) + + install: all installdirs + $(INSTALL_DATA) bash.1 $(mandir) +! $(INSTALL_DATA) builtins.1 $(mandir)/bash_builtins.1 +! # $(INSTALL_DATA) readline.3 $(man3dir) + $(INSTALL_DATA) features.info $(infodir)/bash.info + + uninstall: diff --git a/shells/bash1/files/patch-ae b/shells/bash1/files/patch-ae new file mode 100644 index 000000000000..ec58ff4ae41a --- /dev/null +++ b/shells/bash1/files/patch-ae @@ -0,0 +1,17 @@ +*** documentation/builtins.1.bak Sat Sep 18 00:06:53 1993 +--- documentation/builtins.1 Wed Oct 4 23:29:49 1995 +*************** +*** 10,15 **** + unset, until, wait, while \- bash built-in commands, see \fBbash\fR(1) + .SH BASH BUILTIN COMMANDS + .nr zZ 1 +! .so bash.1 + .SH SEE ALSO + bash(1), sh(1) +--- 10,15 ---- + unset, until, wait, while \- bash built-in commands, see \fBbash\fR(1) + .SH BASH BUILTIN COMMANDS + .nr zZ 1 +! .so man1/bash.1 + .SH SEE ALSO + bash(1), sh(1) diff --git a/shells/bash1/pkg-plist b/shells/bash1/pkg-plist index 84a9302c4918..1824684a3b09 100644 --- a/shells/bash1/pkg-plist +++ b/shells/bash1/pkg-plist @@ -2,6 +2,6 @@ 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 -man/man1/bash.1.gz -man/man1/bashbug.1.gz +man/man1/bash.1 +man/man1/bash_builtins.1 info/bash.info |