diff options
-rw-r--r-- | shells/bash/Makefile | 6 | ||||
-rw-r--r-- | shells/bash/distinfo | 2 | ||||
-rw-r--r-- | shells/bash/files/patch-ab | 26 | ||||
-rw-r--r-- | shells/bash/pkg-comment | 2 | ||||
-rw-r--r-- | shells/bash1/Makefile | 6 | ||||
-rw-r--r-- | shells/bash1/distinfo | 2 | ||||
-rw-r--r-- | shells/bash1/files/patch-ab | 26 | ||||
-rw-r--r-- | shells/bash1/files/patch-ac | 13 | ||||
-rw-r--r-- | shells/bash1/files/patch-ad | 28 | ||||
-rw-r--r-- | shells/bash1/pkg-comment | 2 | ||||
-rw-r--r-- | shells/bash2/Makefile | 6 | ||||
-rw-r--r-- | shells/bash2/distinfo | 2 | ||||
-rw-r--r-- | shells/bash2/files/patch-ab | 26 | ||||
-rw-r--r-- | shells/bash2/pkg-comment | 2 | ||||
-rw-r--r-- | shells/bash3/Makefile | 6 | ||||
-rw-r--r-- | shells/bash3/distinfo | 2 | ||||
-rw-r--r-- | shells/bash3/files/patch-ab | 26 | ||||
-rw-r--r-- | shells/bash3/pkg-comment | 2 |
18 files changed, 97 insertions, 88 deletions
diff --git a/shells/bash/Makefile b/shells/bash/Makefile index 81561adc0ba5..3703dd0b42bc 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -1,12 +1,12 @@ # New ports collection makefile for: bash -# Version required: 1.14.4 +# Version required: 1.14.5 # Date created: 21 August 1994 # Whom: jkh # -# $Id: Makefile,v 1.9 1995/04/11 19:26:27 asami Exp $ +# $Id: Makefile,v 1.11 1995/04/18 11:05:37 ache Exp $ # -DISTNAME= bash-1.14.4 +DISTNAME= bash-1.14.5 CATEGORIES+= shells MASTER_SITES= ftp://slc2.ins.cwru.edu/pub/dist/ MAINTAINER= ache@FreeBSD.ORG diff --git a/shells/bash/distinfo b/shells/bash/distinfo index 88a7cadab252..28a3b272d6e2 100644 --- a/shells/bash/distinfo +++ b/shells/bash/distinfo @@ -1 +1 @@ -MD5 (bash-1.14.4.tar.gz) = bc1f600f6884984314d1439ed1450801 +MD5 (bash-1.14.5.tar.gz) = 66ad9afe53ef71bfb35a9a09c6761729 diff --git a/shells/bash/files/patch-ab b/shells/bash/files/patch-ab index d41ffcfd88cd..908154888e5c 100644 --- a/shells/bash/files/patch-ab +++ b/shells/bash/files/patch-ab @@ -1,8 +1,8 @@ -*** cpp-Makefile.orig Tue Jan 31 00:48:36 1995 ---- cpp-Makefile Fri Mar 17 03:24:29 1995 +*** cpp-Makefile.orig Sun Jun 11 22:44:05 1995 +--- cpp-Makefile Wed Jul 19 20:17:18 1995 *************** -*** 138,144 **** ---- 138,148 ---- +*** 133,139 **** +--- 133,143 ---- /usr/include. Then it will break.) */ CC = gcc -traditional -I/usr/include $(GCC_EXTRAS) # else /* HAVE_FIXED_INCLUDES */ @@ -15,14 +15,14 @@ #else /* !HAVE_GCC */ CC = CPP_CC *************** -*** 155,162 **** ---- 159,171 ---- - RM = rm -f +*** 151,158 **** +--- 155,167 ---- AR = ar + INSTALL = $(SUPPORT_SRC)install.sh + #ifndef __FreeBSD__ - INSTALL_PROGRAM = install -c - INSTALL_DATA = install -c -m 644 + 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 @@ -31,8 +31,8 @@ COMPRESS = gzip COMPRESS_EXT = .gz *************** -*** 304,310 **** ---- 313,321 ---- +*** 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. @@ -43,8 +43,8 @@ SYSTEM_FLAGS = $(LINEBUF) $(VPRINTF) $(UNISTD) $(STDLIB) $(LIMITSH) \ $(GROUPS) $(RESOURCE) $(PARAM) $(SIGHANDLER) $(SYSDEP) $(WAITH) \ *************** -*** 312,317 **** ---- 323,331 ---- +*** 308,313 **** +--- 319,327 ---- $(VARARGSH) $(STRCHR) $(STRCASE) $(DEVFD) \ -D$(Machine) -D$(OS) LDFLAGS = $(NOSHARE) $(SYSDEP_LD) $(EXTRA_LD_PATH) $(PROFILE_FLAGS) $(CFLAGS) diff --git a/shells/bash/pkg-comment b/shells/bash/pkg-comment index 2470326d00fa..58ea57edd4e1 100644 --- a/shells/bash/pkg-comment +++ b/shells/bash/pkg-comment @@ -1 +1 @@ -bash, the GNU Borne Again Shell. Version 1.14.4 +bash, the GNU Borne Again Shell. Version 1.14.5 diff --git a/shells/bash1/Makefile b/shells/bash1/Makefile index 81561adc0ba5..3703dd0b42bc 100644 --- a/shells/bash1/Makefile +++ b/shells/bash1/Makefile @@ -1,12 +1,12 @@ # New ports collection makefile for: bash -# Version required: 1.14.4 +# Version required: 1.14.5 # Date created: 21 August 1994 # Whom: jkh # -# $Id: Makefile,v 1.9 1995/04/11 19:26:27 asami Exp $ +# $Id: Makefile,v 1.11 1995/04/18 11:05:37 ache Exp $ # -DISTNAME= bash-1.14.4 +DISTNAME= bash-1.14.5 CATEGORIES+= shells MASTER_SITES= ftp://slc2.ins.cwru.edu/pub/dist/ MAINTAINER= ache@FreeBSD.ORG diff --git a/shells/bash1/distinfo b/shells/bash1/distinfo index 88a7cadab252..28a3b272d6e2 100644 --- a/shells/bash1/distinfo +++ b/shells/bash1/distinfo @@ -1 +1 @@ -MD5 (bash-1.14.4.tar.gz) = bc1f600f6884984314d1439ed1450801 +MD5 (bash-1.14.5.tar.gz) = 66ad9afe53ef71bfb35a9a09c6761729 diff --git a/shells/bash1/files/patch-ab b/shells/bash1/files/patch-ab index d41ffcfd88cd..908154888e5c 100644 --- a/shells/bash1/files/patch-ab +++ b/shells/bash1/files/patch-ab @@ -1,8 +1,8 @@ -*** cpp-Makefile.orig Tue Jan 31 00:48:36 1995 ---- cpp-Makefile Fri Mar 17 03:24:29 1995 +*** cpp-Makefile.orig Sun Jun 11 22:44:05 1995 +--- cpp-Makefile Wed Jul 19 20:17:18 1995 *************** -*** 138,144 **** ---- 138,148 ---- +*** 133,139 **** +--- 133,143 ---- /usr/include. Then it will break.) */ CC = gcc -traditional -I/usr/include $(GCC_EXTRAS) # else /* HAVE_FIXED_INCLUDES */ @@ -15,14 +15,14 @@ #else /* !HAVE_GCC */ CC = CPP_CC *************** -*** 155,162 **** ---- 159,171 ---- - RM = rm -f +*** 151,158 **** +--- 155,167 ---- AR = ar + INSTALL = $(SUPPORT_SRC)install.sh + #ifndef __FreeBSD__ - INSTALL_PROGRAM = install -c - INSTALL_DATA = install -c -m 644 + 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 @@ -31,8 +31,8 @@ COMPRESS = gzip COMPRESS_EXT = .gz *************** -*** 304,310 **** ---- 313,321 ---- +*** 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. @@ -43,8 +43,8 @@ SYSTEM_FLAGS = $(LINEBUF) $(VPRINTF) $(UNISTD) $(STDLIB) $(LIMITSH) \ $(GROUPS) $(RESOURCE) $(PARAM) $(SIGHANDLER) $(SYSDEP) $(WAITH) \ *************** -*** 312,317 **** ---- 323,331 ---- +*** 308,313 **** +--- 319,327 ---- $(VARARGSH) $(STRCHR) $(STRCASE) $(DEVFD) \ -D$(Machine) -D$(OS) LDFLAGS = $(NOSHARE) $(SYSDEP_LD) $(EXTRA_LD_PATH) $(PROFILE_FLAGS) $(CFLAGS) diff --git a/shells/bash1/files/patch-ac b/shells/bash1/files/patch-ac index 8c2733eacc55..4176de4b36a0 100644 --- a/shells/bash1/files/patch-ac +++ b/shells/bash1/files/patch-ac @@ -1,5 +1,5 @@ -*** readline.c.bak Tue Dec 6 01:47:48 1994 ---- lib/readline/readline.c Mon Dec 12 04:29:49 1994 +*** readline.c.orig Wed May 24 18:43:28 1995 +--- lib/readline/readline.c Wed Jul 19 20:26:53 1995 *************** *** 958,964 **** static void @@ -18,11 +18,12 @@ /* Find out if we are running in Emacs. */ running_in_emacs = getenv ("EMACS") != (char *)0; *************** -*** 993,999 **** +*** 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)) +! 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; @@ -32,9 +33,9 @@ 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) || +! 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)) +! 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 8f66ce9ed935..b13158b75001 100644 --- a/shells/bash1/files/patch-ad +++ b/shells/bash1/files/patch-ad @@ -1,21 +1,29 @@ -*** documentation/Makefile.bak Fri Jan 6 23:48:35 1995 ---- documentation/Makefile Fri Jan 6 23:50:06 1995 +*** documentation/Makefile.orig Sun Jun 11 22:45:55 1995 +--- documentation/Makefile Wed Jul 19 20:35:38 1995 *************** -*** 109,116 **** +*** 90,101 **** + + installdirs: -[ -d $(mandir) ] || mkdir $(mandir) - $(INSTALL_DATA) bash.1 $(mandir) - sed 's:so bash.1:so man1/bash.1:' < builtins.1 > $(mandir)/bash_builtins.1 ! -[ -d $(man3dir) ] || mkdir $(man3dir) -! $(INSTALL_DATA) readline.3 $(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 ---- 109,116 ---- + uninstall: +--- 90,101 ---- + + installdirs: -[ -d $(mandir) ] || mkdir $(mandir) - $(INSTALL_DATA) bash.1 $(mandir) - sed 's:so bash.1:so man1/bash.1:' < builtins.1 > $(mandir)/bash_builtins.1 ! # -[ -d $(man3dir) ] || mkdir $(man3dir) -! # $(INSTALL_DATA) readline.3 $(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: diff --git a/shells/bash1/pkg-comment b/shells/bash1/pkg-comment index 2470326d00fa..58ea57edd4e1 100644 --- a/shells/bash1/pkg-comment +++ b/shells/bash1/pkg-comment @@ -1 +1 @@ -bash, the GNU Borne Again Shell. Version 1.14.4 +bash, the GNU Borne Again Shell. Version 1.14.5 diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile index 81561adc0ba5..3703dd0b42bc 100644 --- a/shells/bash2/Makefile +++ b/shells/bash2/Makefile @@ -1,12 +1,12 @@ # New ports collection makefile for: bash -# Version required: 1.14.4 +# Version required: 1.14.5 # Date created: 21 August 1994 # Whom: jkh # -# $Id: Makefile,v 1.9 1995/04/11 19:26:27 asami Exp $ +# $Id: Makefile,v 1.11 1995/04/18 11:05:37 ache Exp $ # -DISTNAME= bash-1.14.4 +DISTNAME= bash-1.14.5 CATEGORIES+= shells MASTER_SITES= ftp://slc2.ins.cwru.edu/pub/dist/ MAINTAINER= ache@FreeBSD.ORG diff --git a/shells/bash2/distinfo b/shells/bash2/distinfo index 88a7cadab252..28a3b272d6e2 100644 --- a/shells/bash2/distinfo +++ b/shells/bash2/distinfo @@ -1 +1 @@ -MD5 (bash-1.14.4.tar.gz) = bc1f600f6884984314d1439ed1450801 +MD5 (bash-1.14.5.tar.gz) = 66ad9afe53ef71bfb35a9a09c6761729 diff --git a/shells/bash2/files/patch-ab b/shells/bash2/files/patch-ab index d41ffcfd88cd..908154888e5c 100644 --- a/shells/bash2/files/patch-ab +++ b/shells/bash2/files/patch-ab @@ -1,8 +1,8 @@ -*** cpp-Makefile.orig Tue Jan 31 00:48:36 1995 ---- cpp-Makefile Fri Mar 17 03:24:29 1995 +*** cpp-Makefile.orig Sun Jun 11 22:44:05 1995 +--- cpp-Makefile Wed Jul 19 20:17:18 1995 *************** -*** 138,144 **** ---- 138,148 ---- +*** 133,139 **** +--- 133,143 ---- /usr/include. Then it will break.) */ CC = gcc -traditional -I/usr/include $(GCC_EXTRAS) # else /* HAVE_FIXED_INCLUDES */ @@ -15,14 +15,14 @@ #else /* !HAVE_GCC */ CC = CPP_CC *************** -*** 155,162 **** ---- 159,171 ---- - RM = rm -f +*** 151,158 **** +--- 155,167 ---- AR = ar + INSTALL = $(SUPPORT_SRC)install.sh + #ifndef __FreeBSD__ - INSTALL_PROGRAM = install -c - INSTALL_DATA = install -c -m 644 + 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 @@ -31,8 +31,8 @@ COMPRESS = gzip COMPRESS_EXT = .gz *************** -*** 304,310 **** ---- 313,321 ---- +*** 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. @@ -43,8 +43,8 @@ SYSTEM_FLAGS = $(LINEBUF) $(VPRINTF) $(UNISTD) $(STDLIB) $(LIMITSH) \ $(GROUPS) $(RESOURCE) $(PARAM) $(SIGHANDLER) $(SYSDEP) $(WAITH) \ *************** -*** 312,317 **** ---- 323,331 ---- +*** 308,313 **** +--- 319,327 ---- $(VARARGSH) $(STRCHR) $(STRCASE) $(DEVFD) \ -D$(Machine) -D$(OS) LDFLAGS = $(NOSHARE) $(SYSDEP_LD) $(EXTRA_LD_PATH) $(PROFILE_FLAGS) $(CFLAGS) diff --git a/shells/bash2/pkg-comment b/shells/bash2/pkg-comment index 2470326d00fa..58ea57edd4e1 100644 --- a/shells/bash2/pkg-comment +++ b/shells/bash2/pkg-comment @@ -1 +1 @@ -bash, the GNU Borne Again Shell. Version 1.14.4 +bash, the GNU Borne Again Shell. Version 1.14.5 diff --git a/shells/bash3/Makefile b/shells/bash3/Makefile index 81561adc0ba5..3703dd0b42bc 100644 --- a/shells/bash3/Makefile +++ b/shells/bash3/Makefile @@ -1,12 +1,12 @@ # New ports collection makefile for: bash -# Version required: 1.14.4 +# Version required: 1.14.5 # Date created: 21 August 1994 # Whom: jkh # -# $Id: Makefile,v 1.9 1995/04/11 19:26:27 asami Exp $ +# $Id: Makefile,v 1.11 1995/04/18 11:05:37 ache Exp $ # -DISTNAME= bash-1.14.4 +DISTNAME= bash-1.14.5 CATEGORIES+= shells MASTER_SITES= ftp://slc2.ins.cwru.edu/pub/dist/ MAINTAINER= ache@FreeBSD.ORG diff --git a/shells/bash3/distinfo b/shells/bash3/distinfo index 88a7cadab252..28a3b272d6e2 100644 --- a/shells/bash3/distinfo +++ b/shells/bash3/distinfo @@ -1 +1 @@ -MD5 (bash-1.14.4.tar.gz) = bc1f600f6884984314d1439ed1450801 +MD5 (bash-1.14.5.tar.gz) = 66ad9afe53ef71bfb35a9a09c6761729 diff --git a/shells/bash3/files/patch-ab b/shells/bash3/files/patch-ab index d41ffcfd88cd..908154888e5c 100644 --- a/shells/bash3/files/patch-ab +++ b/shells/bash3/files/patch-ab @@ -1,8 +1,8 @@ -*** cpp-Makefile.orig Tue Jan 31 00:48:36 1995 ---- cpp-Makefile Fri Mar 17 03:24:29 1995 +*** cpp-Makefile.orig Sun Jun 11 22:44:05 1995 +--- cpp-Makefile Wed Jul 19 20:17:18 1995 *************** -*** 138,144 **** ---- 138,148 ---- +*** 133,139 **** +--- 133,143 ---- /usr/include. Then it will break.) */ CC = gcc -traditional -I/usr/include $(GCC_EXTRAS) # else /* HAVE_FIXED_INCLUDES */ @@ -15,14 +15,14 @@ #else /* !HAVE_GCC */ CC = CPP_CC *************** -*** 155,162 **** ---- 159,171 ---- - RM = rm -f +*** 151,158 **** +--- 155,167 ---- AR = ar + INSTALL = $(SUPPORT_SRC)install.sh + #ifndef __FreeBSD__ - INSTALL_PROGRAM = install -c - INSTALL_DATA = install -c -m 644 + 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 @@ -31,8 +31,8 @@ COMPRESS = gzip COMPRESS_EXT = .gz *************** -*** 304,310 **** ---- 313,321 ---- +*** 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. @@ -43,8 +43,8 @@ SYSTEM_FLAGS = $(LINEBUF) $(VPRINTF) $(UNISTD) $(STDLIB) $(LIMITSH) \ $(GROUPS) $(RESOURCE) $(PARAM) $(SIGHANDLER) $(SYSDEP) $(WAITH) \ *************** -*** 312,317 **** ---- 323,331 ---- +*** 308,313 **** +--- 319,327 ---- $(VARARGSH) $(STRCHR) $(STRCASE) $(DEVFD) \ -D$(Machine) -D$(OS) LDFLAGS = $(NOSHARE) $(SYSDEP_LD) $(EXTRA_LD_PATH) $(PROFILE_FLAGS) $(CFLAGS) diff --git a/shells/bash3/pkg-comment b/shells/bash3/pkg-comment index 2470326d00fa..58ea57edd4e1 100644 --- a/shells/bash3/pkg-comment +++ b/shells/bash3/pkg-comment @@ -1 +1 @@ -bash, the GNU Borne Again Shell. Version 1.14.4 +bash, the GNU Borne Again Shell. Version 1.14.5 |