summaryrefslogtreecommitdiff
path: root/shells
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2000-03-30 11:56:31 +0000
committerwiz <wiz@pkgsrc.org>2000-03-30 11:56:31 +0000
commit30d77e4e21862327b24dee888bbd7740ac253677 (patch)
tree3c304ad3ddf94629c94f1e5a32e60d84ea218f06 /shells
parente8ed14de039bea7b78ce2be99ff1cbc54751b50c (diff)
downloadpkgsrc-30d77e4e21862327b24dee888bbd7740ac253677.tar.gz
Update bash to 2.04; also add variable BASH_STATIC for static linking.
Changes: too many to list here, check the CHANGES file.
Diffstat (limited to 'shells')
-rw-r--r--shells/bash2/Makefile18
-rw-r--r--shells/bash2/files/md56
-rw-r--r--shells/bash2/files/patch-sum8
-rw-r--r--shells/bash2/patches/patch-ab12
-rw-r--r--shells/bash2/patches/patch-ac13
-rw-r--r--shells/bash2/patches/patch-ae8
6 files changed, 24 insertions, 41 deletions
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index fb4073f9780..9c6ad7d96e5 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 1999/09/19 22:27:36 kim Exp $
+# $NetBSD: Makefile,v 1.23 2000/03/30 11:56:31 wiz Exp $
# FreeBSD Id: Makefile,v 1.26 1997/06/27 23:03:27 ache Exp
#
-V= 2.03
-DV= 2.03
+V= 2.04
+DV= 2.04
DISTNAME= bash-${V}
CATEGORIES= shells
MASTER_SITES= ${MASTER_SITE_GNU:=bash/} \
@@ -15,9 +15,7 @@ HOMEPAGE= http://www.gnu.org/software/bash/bash.html
GNU_CONFIGURE= yes
USE_GTEXINFO= yes
-
-pre-install:
- strip ${WRKSRC}/bash
+MAKE_ENV+= INSTALL_SCRIPT='${INSTALL_SCRIPT}'
post-install:
${CP} /etc/shells /etc/shells.bak
@@ -27,14 +25,14 @@ post-install:
${INSTALL_MAN} \
${WRKDIR}/doc/article.ps \
${WRKDIR}/doc/bashref.ps \
- ${PREFIX}/share/doc/bash
- ${INSTALL_MAN} \
${WRKDIR}/doc/bash.html \
${WRKDIR}/doc/bashref.html \
- ${PREFIX}/share/doc/bash
- ${INSTALL_MAN} \
${WRKDIR}/doc/article.txt \
${PREFIX}/share/doc/bash
${GZIP_CMD} ${PREFIX}/share/doc/bash/*.ps
.include "../../mk/bsd.pkg.mk"
+
+.if defined(BASH_STATIC) && ${BASH_STATIC} == YES
+CONFIGURE_ARGS+= --enable-static-link
+.endif
diff --git a/shells/bash2/files/md5 b/shells/bash2/files/md5
index 4151b9757c3..9b05c2a732a 100644
--- a/shells/bash2/files/md5
+++ b/shells/bash2/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.5 1999/02/21 02:58:30 hubertf Exp $
+$NetBSD: md5,v 1.6 2000/03/30 11:56:32 wiz Exp $
-MD5 (bash-2.03.tar.gz) = 70e356eae4fed395c9a0fc35b752f711
-MD5 (bash-doc-2.03.tar.gz) = ede603422b9f6cf2ef70ee1a029987f0
+MD5 (bash-2.04.tar.gz) = 49b548a8b72a4c925ff26930e4c31c6c
+MD5 (bash-doc-2.04.tar.gz) = a9684d1095e7ea1adb8759c3f4fca13d
diff --git a/shells/bash2/files/patch-sum b/shells/bash2/files/patch-sum
index 5dba1d8e918..22ec6a5ee61 100644
--- a/shells/bash2/files/patch-sum
+++ b/shells/bash2/files/patch-sum
@@ -1,6 +1,4 @@
-$NetBSD: patch-sum,v 1.2 2000/02/24 23:04:06 tron Exp $
+$NetBSD: patch-sum,v 1.3 2000/03/30 11:56:32 wiz Exp $
-MD5 (patch-aa) = f9578af0984d6a3979cf301ffa4df2d3
-MD5 (patch-ab) = d40900b85f7bba316fb1ab582273ac78
-MD5 (patch-ac) = 557451c3fd9e0b5c1fbc139e9feffc93
-MD5 (patch-ae) = 39535a6d53bf4ef794e74563be965816
+MD5 (patch-ab) = b6a0c310aaa0daf47f8e1ddcf3c94e01
+MD5 (patch-ae) = 9b785c38c94aac20f39451fee24407a6
diff --git a/shells/bash2/patches/patch-ab b/shells/bash2/patches/patch-ab
index 5b16f4265dd..461df092a99 100644
--- a/shells/bash2/patches/patch-ab
+++ b/shells/bash2/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.4 1999/02/21 02:58:30 hubertf Exp $
+$NetBSD: patch-ab,v 1.5 2000/03/30 11:56:32 wiz Exp $
---- Makefile.in.orig Thu Feb 18 18:07:38 1999
-+++ Makefile.in Sun Feb 21 03:07:56 1999
-@@ -550,7 +550,7 @@
+--- Makefile.in.orig Wed Mar 1 20:52:12 2000
++++ Makefile.in Thu Mar 30 13:09:26 2000
+@@ -582,7 +582,7 @@
install: .made installdirs
$(INSTALL_PROGRAM) $(INSTALLMODE) $(Program) $(bindir)/$(Program)
-- $(INSTALL_PROGRAM) $(INSTALLMODE) bashbug $(bindir)/bashbug
-+ $(INSTALL) -m 555 $(INSTALLMODE) bashbug $(bindir)/bashbug
+- $(INSTALL_PROGRAM) $(INSTALLMODE2) bashbug $(bindir)/bashbug
++ $(INSTALL_SCRIPT) $(INSTALLMODE2) 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
deleted file mode 100644
index 7bd2138a2fd..00000000000
--- a/shells/bash2/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 1998/08/07 11:13:53 agc Exp $
-
---- 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 555907bd60b..02898ca9723 100644
--- a/shells/bash2/patches/patch-ae
+++ b/shells/bash2/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.4 2000/02/24 23:04:07 tron Exp $
+$NetBSD: patch-ae,v 1.5 2000/03/30 11:56:32 wiz Exp $
---- builtins/enable.def.orig Fri Jul 18 15:55:00 1997
-+++ builtins/enable.def Tue Aug 4 21:18:05 1998
-@@ -290,9 +290,16 @@
+--- builtins/enable.def.orig Thu Aug 5 13:41:13 1999
++++ builtins/enable.def Thu Mar 30 13:08:21 2000
+@@ -305,9 +305,16 @@
name = list->word->word;
size = strlen (name);