summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfrueauf <frueauf>1998-08-05 10:47:20 +0000
committerfrueauf <frueauf>1998-08-05 10:47:20 +0000
commita517dca39587e2716e087d316132751f8997b37b (patch)
treefea2a31332e16c33f807d0ec977915c097ae9102
parentf3ca8f25c356dc0584b2f207ea439b132bccf3bd (diff)
downloadpkgsrc-a517dca39587e2716e087d316132751f8997b37b.tar.gz
Update bash2 to 2.02.1, closes pr 5913 by John Darrow.
-rw-r--r--shells/bash2/Makefile21
-rw-r--r--shells/bash2/files/md52
-rw-r--r--shells/bash2/patches/patch-aa36
-rw-r--r--shells/bash2/patches/patch-ab30
-rw-r--r--shells/bash2/patches/patch-ac30
-rw-r--r--shells/bash2/patches/patch-ae10
-rw-r--r--shells/bash2/pkg/COMMENT2
7 files changed, 55 insertions, 76 deletions
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index e0425877285..ffe645e7d2f 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 1998/06/22 13:07:50 agc Exp $
+$NetBSD: Makefile,v 1.11 1998/08/05 10:47:20 frueauf Exp $
# FreeBSD Id: Makefile,v 1.26 1997/06/27 23:03:27 ache Exp
#
-V= 2.02
+V= 2.02.1
+DV= 2.02
DISTNAME= bash-${V}
CATEGORIES= shells
MASTER_SITES= ftp://slc2.ins.cwru.edu/pub/dist/ \
@@ -11,11 +12,13 @@ MASTER_SITES= ftp://slc2.ins.cwru.edu/pub/dist/ \
.include "../../mk/bsd.prefs.mk"
.if !defined(NOPORTDOCS)
-DISTFILES= bash-${V}.tar.gz bash-doc-${V}.tar.gz
+DISTFILES= bash-${V}.tar.gz bash-doc-${DV}.tar.gz
.endif
MAINTAINER= packages@netbsd.org
+CONFLICTS= bash-2.02
+
GNU_CONFIGURE= Yes
USE_GTEXINFO= yes
@@ -29,16 +32,16 @@ post-install:
.if !defined(NOPORTDOCS)
${MKDIR} ${PREFIX}/share/doc/bash
${INSTALL_MAN} \
- ${WRKDIR}/bash-doc-${V}/doc/article.ps \
- ${WRKDIR}/bash-doc-${V}/doc/bashref.ps \
+ ${WRKDIR}/bash-doc-${DV}/doc/article.ps \
+ ${WRKDIR}/bash-doc-${DV}/doc/bashref.ps \
${PREFIX}/share/doc/bash
${INSTALL_MAN} \
- ${WRKDIR}/bash-doc-${V}/doc/bash.html \
- ${WRKDIR}/bash-doc-${V}/doc/bashref.html \
- ${WRKDIR}/bash-doc-${V}/doc/bashref_toc.html \
+ ${WRKDIR}/bash-doc-${DV}/doc/bash.html \
+ ${WRKDIR}/bash-doc-${DV}/doc/bashref.html \
+ ${WRKDIR}/bash-doc-${DV}/doc/bashref_toc.html \
${PREFIX}/share/doc/bash
${INSTALL_MAN} \
- ${WRKDIR}/bash-doc-${V}/doc/article.txt \
+ ${WRKDIR}/bash-doc-${DV}/doc/article.txt \
${PREFIX}/share/doc/bash
${GZIP_CMD} ${PREFIX}/share/doc/bash/*.ps
.endif
diff --git a/shells/bash2/files/md5 b/shells/bash2/files/md5
index 06938901f24..165a00efcd3 100644
--- a/shells/bash2/files/md5
+++ b/shells/bash2/files/md5
@@ -1,2 +1,2 @@
-MD5 (bash-2.02.tar.gz) = d764f082ca73b3220b9c13bfed80d568
+MD5 (bash-2.02.1.tar.gz) = f987ca38e041fe1276d679a0158a6977
MD5 (bash-doc-2.02.tar.gz) = 94f7e06b0c73264f9ca7fb446007b5f0
diff --git a/shells/bash2/patches/patch-aa b/shells/bash2/patches/patch-aa
index d46d6ac73cb..ad4e575cc99 100644
--- a/shells/bash2/patches/patch-aa
+++ b/shells/bash2/patches/patch-aa
@@ -1,22 +1,14 @@
-*** doc/Makefile.in.orig Thu Jan 30 22:12:33 1997
---- doc/Makefile.in Wed Jan 21 00:13:58 1998
-***************
-*** 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,164 ----
- -$(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 \
-! --entry="* BASH: (bash). Bash Reference Manual." \
-! -s "Shells" \
-! --dir-file=$(infodir)/dir $(infodir)/bash.info; \
- else true; fi
-
- uninstall:
+--- doc/Makefile.in.orig Tue Mar 3 14:02:18 1998
++++ doc/Makefile.in Tue Aug 4 21:18:04 1998
+@@ -170,7 +170,10 @@
+ -$(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; \
++ install-info \
++ --entry="* BASH: (bash). Bash Reference Manual." \
++ -s "Shells" \
++ --dir-file=$(infodir)/dir $(infodir)/bash.info; \
+ else true; fi
+
+ uninstall:
diff --git a/shells/bash2/patches/patch-ab b/shells/bash2/patches/patch-ab
index 46c5e4f858c..020e22983ae 100644
--- a/shells/bash2/patches/patch-ab
+++ b/shells/bash2/patches/patch-ab
@@ -1,19 +1,11 @@
-*** Makefile.in.bak Wed Dec 18 22:57:21 1996
---- Makefile.in Fri Dec 27 14:20:11 1996
-***************
-*** 499,505 ****
-
- 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 ----
-
- 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) \
+--- Makefile.in.orig Thu Apr 16 10:35:05 1998
++++ Makefile.in Tue Aug 4 21:18:05 1998
+@@ -541,7 +541,7 @@
+
+ install: .made installdirs
+ $(INSTALL_PROGRAM) $(Program) $(bindir)/$(Program)
+- $(INSTALL_PROGRAM) bashbug $(bindir)/bashbug
++ $(INSTALL) -m 555 bashbug $(bindir)/bashbug
+ -( cd $(DOCDIR) ; $(MAKE) $(MFLAGS) \
+ man1dir=$(man1dir) man1ext=$(man1ext) \
+ man3dir=$(man3dir) man3ext=$(man3ext) \
diff --git a/shells/bash2/patches/patch-ac b/shells/bash2/patches/patch-ac
index 69790098164..4a77e1d38fa 100644
--- a/shells/bash2/patches/patch-ac
+++ b/shells/bash2/patches/patch-ac
@@ -1,19 +1,11 @@
-*** lib/glob/Makefile.in.orig Fri Oct 4 19:02:34 1996
---- lib/glob/Makefile.in Tue May 27 01:48:43 1997
-***************
-*** 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
+--- lib/glob/Makefile.in.orig Tue Sep 16 12:13:23 1997
++++ lib/glob/Makefile.in Tue Aug 4 21:18:05 1998
+@@ -46,7 +46,7 @@
+ # The header files for this library.
+ HSOURCES = $(srcdir)/fnmatch.h
+
+-OBJECTS = glob.o fnmatch.o
++OBJECTS = glob.o #fnmatch.o
+
+ # The texinfo files which document this library.
+ DOCSOURCE = doc/glob.texi
diff --git a/shells/bash2/patches/patch-ae b/shells/bash2/patches/patch-ae
index d29f6b5493c..c5d5895f924 100644
--- a/shells/bash2/patches/patch-ae
+++ b/shells/bash2/patches/patch-ae
@@ -1,8 +1,8 @@
---- builtins/enable.def~ Wed Oct 2 13:47:05 1996
-+++ builtins/enable.def Tue May 6 14:18:09 1997
-@@ -284,9 +284,10 @@
+--- builtins/enable.def.orig Fri Jul 18 15:55:00 1997
++++ builtins/enable.def Tue Aug 4 21:18:05 1998
+@@ -290,9 +290,10 @@
name = list->word->word;
-
+
size = strlen (name);
- struct_name = xmalloc (size + 8);
- strcpy (struct_name, name);
@@ -11,6 +11,6 @@
+ *struct_name = '_';
+ strcpy (struct_name + 1, name);
+ strcpy (struct_name + size + 1, "_struct");
-
+
b = (struct builtin *)dlsym (handle, struct_name);
if (b == 0)
diff --git a/shells/bash2/pkg/COMMENT b/shells/bash2/pkg/COMMENT
index 00c70ad756d..65cbc67b627 100644
--- a/shells/bash2/pkg/COMMENT
+++ b/shells/bash2/pkg/COMMENT
@@ -1 +1 @@
-The GNU Borne Again Shell.
+The GNU Bourne Again Shell.