Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/shells
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv17981
Modified Files:
bash-doc.info bash.info bash.patch
Log Message:
bash 3.2, taking over maintainership
Index: bash.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/shells/bash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- bash.patch 20 Jan 2006 20:30:43 -0000 1.1
+++ bash.patch 8 Feb 2007 18:46:36 -0000 1.2
@@ -1,7 +1,7 @@
-diff -u -Naur bash-3.0/Makefile.in bash-3.0.fink/Makefile.in
---- bash-3.0/Makefile.in Wed Mar 17 08:34:39 2004
-+++ bash-3.0.fink/Makefile.in Fri Nov 19 14:28:02 2004
-@@ -376,7 +376,7 @@
+diff -uNr bash-3.2/Makefile.in bash-3.2-patched/Makefile.in
+--- bash-3.2/Makefile.in 2006-08-17 14:03:35.000000000 -0400
++++ bash-3.2-patched/Makefile.in 2007-02-07 17:09:54.000000000 -0500
+@@ -384,7 +384,7 @@
$(BASHINCDIR)/shtty.h $(BASHINCDIR)/typemax.h \
$(BASHINCDIR)/ocache.h
@@ -10,10 +10,10 @@
$(TILDE_LIB) $(MALLOC_LIB) $(INTL_LIB) $(LOCAL_LIBS)
LIBDEP = $(SHLIB_DEP) $(INTL_DEP) $(READLINE_DEP) $(HISTORY_DEP)
$(TERMCAP_DEP) $(GLOB_DEP) \
-diff -u -Naur bash-3.0/README.Fink bash-3.0.fink/README.Fink
---- bash-3.0/README.Fink Wed Dec 31 19:00:00 1969
-+++ bash-3.0.fink/README.Fink Fri Nov 19 14:57:47 2004
-@@ -0,0 +1,32 @@
+diff -uNr bash-3.2/README.Fink bash-3.2-patched/README.Fink
+--- bash-3.2/README.Fink 1969-12-31 19:00:00.000000000 -0500
++++ bash-3.2-patched/README.Fink 2007-02-07 17:10:16.000000000 -0500
+@@ -0,0 +1,29 @@
+This installation of bash has been set up to use an init system similar
+to the tcsh installed by OS X.
+
@@ -43,12 +43,9 @@
+
+The init files were originally written by Wilfredo Sanchez, but they contained
+a few errors which I've taken the liberty of correcting.
-+
-+-Christian Swinehart <[EMAIL PROTECTED]>
-+ 16 Jan 2002
-diff -u -Naur bash-3.0/doc/Makefile.in bash-3.0.fink/doc/Makefile.in
---- bash-3.0/doc/Makefile.in Tue Jul 27 08:57:48 2004
-+++ bash-3.0.fink/doc/Makefile.in Fri Nov 19 15:17:46 2004
+diff -uNr bash-3.2/doc/Makefile.in bash-3.2-patched/doc/Makefile.in
+--- bash-3.2/doc/Makefile.in 2004-07-27 08:57:48.000000000 -0400
++++ bash-3.2-patched/doc/Makefile.in 2007-02-07 17:09:54.000000000 -0500
@@ -228,7 +228,7 @@
-$(INSTALL_DATA) $(srcdir)/bash.info $(DESTDIR)$(infodir)/bash.info
# run install-info if it is present to update the info directory
@@ -58,10 +55,10 @@
else true; fi
# if htmldir is set, install the html files into that directory
-if test -n "${htmldir}" ; then \
-diff -u -Naur bash-3.0/doc/bash.1 bash-3.0.fink/doc/bash.1
---- bash-3.0/doc/bash.1 Mon Jul 12 11:27:08 2004
-+++ bash-3.0.fink/doc/bash.1 Fri Nov 19 14:57:47 2004
-@@ -197,7 +197,7 @@
+diff -uNr bash-3.2/doc/bash.1 bash-3.2-patched/doc/bash.1
+--- bash-3.2/doc/bash.1 2006-10-03 08:54:26.000000000 -0400
++++ bash-3.2-patched/doc/bash.1 2007-02-07 17:09:54.000000000 -0500
+@@ -202,7 +202,7 @@
.TP
.B \-\-noprofile
Do not read either the system-wide startup file
@@ -70,7 +67,7 @@
or any of the personal initialization files
.IR ~/.bash_profile ,
.IR ~/.bash_login ,
-@@ -303,7 +303,7 @@
+@@ -308,7 +308,7 @@
.B bash
is invoked as an interactive login shell, or as a non-interactive shell
with the \fB\-\-login\fP option, it first reads and
@@ -79,7 +76,7 @@
file exists.
After reading that file, it looks for \fI~/.bash_profile\fP,
\fI~/.bash_login\fP, and \fI~/.profile\fP, in that order, and reads
-@@ -359,7 +359,7 @@
+@@ -364,7 +364,7 @@
When invoked as an interactive login shell, or a non-interactive
shell with the \fB\-\-login\fP option, it first attempts to
read and execute commands from
@@ -88,7 +85,7 @@
and
.IR ~/.profile ,
in that order.
-@@ -8636,10 +8636,10 @@
+@@ -8783,10 +8783,10 @@
.SH FILES
.PD 0
.TP
@@ -101,10 +98,10 @@
The systemwide initialization file, executed for login shells
.TP
.FN ~/.bash_profile
-diff -u -Naur bash-3.0/doc/bashref.texi bash-3.0.fink/doc/bashref.texi
---- bash-3.0/doc/bashref.texi Sat Jun 26 14:26:07 2004
-+++ bash-3.0.fink/doc/bashref.texi Fri Nov 19 14:57:47 2004
-@@ -4806,7 +4806,7 @@
+diff -uNr bash-3.2/doc/bashref.texi bash-3.2-patched/doc/bashref.texi
+--- bash-3.2/doc/bashref.texi 2006-09-28 10:25:28.000000000 -0400
++++ bash-3.2-patched/doc/bashref.texi 2007-02-07 17:09:55.000000000 -0500
+@@ -4881,7 +4881,7 @@
to read command lines when the shell is interactive.
@item --noprofile
@@ -113,7 +110,7 @@
or any of the personal initialization files
@file{~/.bash_profile}, @file{~/.bash_login}, or @file{~/.profile}
when Bash is invoked as a login shell.
-@@ -4931,7 +4931,7 @@
+@@ -5006,7 +5006,7 @@
When Bash is invoked as an interactive login shell, or as a
non-interactive shell with the @option{--login} option, it first reads and
@@ -122,7 +119,7 @@
After reading that file, it looks for @file{~/.bash_profile},
@file{~/.bash_login}, and @file{~/.profile}, in that order, and reads
and executes commands from the first one that exists and is readable.
-@@ -4982,7 +4982,7 @@
+@@ -5057,7 +5057,7 @@
When invoked as an interactive login shell, or as a non-interactive
shell with the @option{--login} option, it first attempts to read
@@ -131,9 +128,9 @@
that order.
The @option{--noprofile} option may be used to inhibit this behavior.
When invoked as an interactive shell with the name @code{sh}, Bash
-diff -u -Naur bash-3.0/doc/rbash.1 bash-3.0.fink/doc/rbash.1
---- bash-3.0/doc/rbash.1 Mon May 24 10:19:39 2004
-+++ bash-3.0.fink/doc/rbash.1 Fri Nov 19 14:57:47 2004
+diff -uNr bash-3.2/doc/rbash.1 bash-3.2-patched/doc/rbash.1
+--- bash-3.2/doc/rbash.1 2004-05-24 10:19:39.000000000 -0400
++++ bash-3.2-patched/doc/rbash.1 2007-02-07 17:09:55.000000000 -0500
@@ -3,6 +3,6 @@
rbash \- restricted bash, see \fBbash\fR(1)
.SH RESTRICTED SHELL
@@ -142,9 +139,9 @@
+.so man1/bash.1
.SH SEE ALSO
bash(1)
-diff -u -Naur bash-3.0/init/README bash-3.0.fink/init/README
---- bash-3.0/init/README Wed Dec 31 19:00:00 1969
-+++ bash-3.0.fink/init/README Fri Nov 19 14:57:47 2004
+diff -uNr bash-3.2/init/README bash-3.2-patched/init/README
+--- bash-3.2/init/README 1969-12-31 19:00:00.000000000 -0500
++++ bash-3.2-patched/init/README 2007-02-07 17:09:55.000000000 -0500
@@ -0,0 +1,28 @@
+This directory contains some useful bash files.
+
@@ -174,9 +171,9 @@
+
+ -christian
+ [EMAIL PROTECTED]
-diff -u -Naur bash-3.0/init/aliases bash-3.0.fink/init/aliases
---- bash-3.0/init/aliases Wed Dec 31 19:00:00 1969
-+++ bash-3.0.fink/init/aliases Fri Nov 19 14:57:47 2004
+diff -uNr bash-3.2/init/aliases bash-3.2-patched/init/aliases
+--- bash-3.2/init/aliases 1969-12-31 19:00:00.000000000 -0500
++++ bash-3.2-patched/init/aliases 2007-02-07 17:09:55.000000000 -0500
@@ -0,0 +1,39 @@
+##
+# Bash aliases file
@@ -217,9 +214,9 @@
+# mode:shell-script
+# sh-shell:bash
+# End:
-diff -u -Naur bash-3.0/init/bash.defaults bash-3.0.fink/init/bash.defaults
---- bash-3.0/init/bash.defaults Wed Dec 31 19:00:00 1969
-+++ bash-3.0.fink/init/bash.defaults Fri Nov 19 14:57:47 2004
+diff -uNr bash-3.2/init/bash.defaults bash-3.2-patched/init/bash.defaults
+--- bash-3.2/init/bash.defaults 1969-12-31 19:00:00.000000000 -0500
++++ bash-3.2-patched/init/bash.defaults 2007-02-07 17:09:55.000000000
-0500
@@ -0,0 +1,27 @@
+##
+# Bash
@@ -248,9 +245,9 @@
+# mode:shell-script
+# sh-shell:bash
+# End:
-diff -u -Naur bash-3.0/init/completions bash-3.0.fink/init/completions
---- bash-3.0/init/completions Wed Dec 31 19:00:00 1969
-+++ bash-3.0.fink/init/completions Fri Nov 19 14:57:47 2004
+diff -uNr bash-3.2/init/completions bash-3.2-patched/init/completions
+--- bash-3.2/init/completions 1969-12-31 19:00:00.000000000 -0500
++++ bash-3.2-patched/init/completions 2007-02-07 17:09:55.000000000 -0500
@@ -0,0 +1,17 @@
+##
+# Add completions for the fink command
@@ -269,9 +266,9 @@
+# mode:shell-script
+# sh-shell:bash
+# End:
-diff -u -Naur bash-3.0/init/environment bash-3.0.fink/init/environment
---- bash-3.0/init/environment Wed Dec 31 19:00:00 1969
-+++ bash-3.0.fink/init/environment Fri Nov 19 14:57:47 2004
+diff -uNr bash-3.2/init/environment bash-3.2-patched/init/environment
+--- bash-3.2/init/environment 1969-12-31 19:00:00.000000000 -0500
++++ bash-3.2-patched/init/environment 2007-02-07 17:09:55.000000000 -0500
@@ -0,0 +1,29 @@
+##
+# Bourne Again Shell environment file
@@ -302,9 +299,9 @@
+# mode:shell-script
+# sh-shell:bash
+# End:
-diff -u -Naur bash-3.0/init/logout bash-3.0.fink/init/logout
---- bash-3.0/init/logout Wed Dec 31 19:00:00 1969
-+++ bash-3.0.fink/init/logout Fri Nov 19 14:57:47 2004
+diff -uNr bash-3.2/init/logout bash-3.2-patched/init/logout
+--- bash-3.2/init/logout 1969-12-31 19:00:00.000000000 -0500
++++ bash-3.2-patched/init/logout 2007-02-07 17:09:55.000000000 -0500
@@ -0,0 +1,15 @@
+##
+# Destroy credentials
@@ -321,9 +318,9 @@
+# mode:shell-script
+# sh-shell:bash
+# End:
-diff -u -Naur bash-3.0/init/profile bash-3.0.fink/init/profile
---- bash-3.0/init/profile Wed Dec 31 19:00:00 1969
-+++ bash-3.0.fink/init/profile Fri Nov 19 14:57:47 2004
+diff -uNr bash-3.2/init/profile bash-3.2-patched/init/profile
+--- bash-3.2/init/profile 1969-12-31 19:00:00.000000000 -0500
++++ bash-3.2-patched/init/profile 2007-02-07 17:09:55.000000000 -0500
@@ -0,0 +1,31 @@
+##
+# Set path
@@ -356,9 +353,9 @@
+# mode:shell-script
+# sh-shell:bash
+# End:
-diff -u -Naur bash-3.0/init/rc bash-3.0.fink/init/rc
---- bash-3.0/init/rc Wed Dec 31 19:00:00 1969
-+++ bash-3.0.fink/init/rc Fri Nov 19 14:57:47 2004
+diff -uNr bash-3.2/init/rc bash-3.2-patched/init/rc
+--- bash-3.2/init/rc 1969-12-31 19:00:00.000000000 -0500
++++ bash-3.2-patched/init/rc 2007-02-07 17:09:55.000000000 -0500
@@ -0,0 +1,71 @@
+##
+# Bourne Again Shell config file
@@ -431,9 +428,9 @@
+# mode:shell-script
+# sh-shell:bash
+# End:
-diff -u -Naur bash-3.0/pathnames.h.in bash-3.0.fink/pathnames.h.in
---- bash-3.0/pathnames.h.in Tue Feb 25 11:31:46 2003
-+++ bash-3.0.fink/pathnames.h.in Fri Nov 19 14:57:47 2004
+diff -uNr bash-3.2/pathnames.h.in bash-3.2-patched/pathnames.h.in
+--- bash-3.2/pathnames.h.in 2003-02-25 11:31:46.000000000 -0500
++++ bash-3.2-patched/pathnames.h.in 2007-02-07 17:09:55.000000000 -0500
@@ -25,7 +25,7 @@
#define DEFAULT_HOSTS_FILE "/etc/hosts"
@@ -443,8 +440,8 @@
/* The default location of the bash debugger initialization/startup file. */
#define DEBUGGER_START_FILE "@DEBUGGER_START_FILE@"
-diff -u -Naur bash-3.0/profile.fink bash-3.0.fink/profile.fink
---- bash-3.0/profile.fink Wed Dec 31 19:00:00 1969
-+++ bash-3.0.fink/profile.fink Fri Nov 19 14:57:47 2004
+diff -uNr bash-3.2/profile.fink bash-3.2-patched/profile.fink
+--- bash-3.2/profile.fink 1969-12-31 19:00:00.000000000 -0500
++++ bash-3.2-patched/profile.fink 2007-02-07 17:09:55.000000000 -0500
@@ -0,0 +1 @@
+source @PREFIX@/share/init/bash/profile
Index: bash-doc.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/shells/bash-doc.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- bash-doc.info 27 Jan 2006 23:09:54 -0000 1.2
+++ bash-doc.info 8 Feb 2007 18:46:36 -0000 1.3
@@ -1,42 +1,58 @@
Package: bash-doc
-Version: 3.0
-Revision: 2
-Suggests: bash, texinfo
+Version: 3.2
+Revision: 1
+Suggests: bash
+Depends: texinfo
+BuildDepends: tetex3-base
Source: mirror:gnu:bash/bash-%v.tar.gz
-Source-MD5: 26c4d642e29b3533d8d754995bc277b3
+Source-MD5: 00bfa16d58e034e3c2aa27f390390d30
+Source2: mirror:gnu:bash/bash-3.2-patches/bash32-001
+Source2-MD5: d8e10c754f477e3f3a581af566b89301
+Source3: mirror:gnu:bash/bash-3.2-patches/bash32-002
+Source3-MD5: d38a5288b2f0ea6c9ac76b66cc74ef7d
+Source4: mirror:gnu:bash/bash-3.2-patches/bash32-003
+Source4-MD5: 0b90d37911827d8cb95f3b4353cc225e
+Source5: mirror:gnu:bash/bash-3.2-patches/bash32-004
+Source5-MD5: 8062f3a59631f58d78b180d83759b68a
+Source6: mirror:gnu:bash/bash-3.2-patches/bash32-005
+Source6-MD5: 585b5943fadf0875ced243b245adde58
+Source7: mirror:gnu:bash/bash-3.2-patches/bash32-006
+Source7-MD5: 1d5732e01ea938aeed42f3def131fa4d
+Source8: mirror:gnu:bash/bash-3.2-patches/bash32-007
+Source8-MD5: dcd0cc5d801607827f7c851e72b0eabc
+Source9: mirror:gnu:bash/bash-3.2-patches/bash32-008
+Source9-MD5: bb3c7dd11198c0ab93d0e960bebf6256
+Source10: mirror:gnu:bash/bash-3.2-patches/bash32-009
+Source10-MD5: 434a6f29b0ca5f1ab784b2437ae8eaed
PatchScript: sed 's|@PREFIX@|%p|g' <%a/bash.patch | patch -p1
SetCPPFLAGS: -DHAVE_STRERROR
CompileScript:<<
- cd support ; make man2html
- MAN2HTML=support/man2html; HTMLPOST=doc/htmlpost.sh; ${MAN2HTML} doc/bash.1 |
${HTMLPOST} > doc/bash.html
- TEXI2HTML=../support/texi2html; TEXINPUTDIR=../lib/readline/doc; cd doc;
${TEXI2HTML} -menu -monolithic -I ${TEXINPUTDIR} bashref.texi
+ ./configure %c
+ make doc
<<
InstallScript: <<
- mkdir -p %i/share/doc/%n/html
- install -m 644 doc/bash.html doc/bashref.html %i/share/doc/%n/html
- mv examples %i/share/doc/%n
- mkdir -p %i/share/info
- install -m 644 doc/bashref.info %i/share/info/bash.info
- mkdir -p %i/share/doc/bash/
- ln -s %p/share/doc/%n/examples %i/share/doc/bash/
- ln -s %p/share/doc/%n/html %i/share/doc/bash/
+ mkdir -p %i/share/doc/%n/html
+ install -m 644 doc/bash.html doc/bashref.html %i/share/doc/%n/html
+ mv examples %i/share/doc/%n
+ mkdir -p %i/share/info
+ install -m 644 doc/bashref.info %i/share/info/bash.info
+ mkdir -p %i/share/doc/bash/
+ ln -s %p/share/doc/%n/examples %i/share/doc/bash/
+ ln -s %p/share/doc/%n/html %i/share/doc/bash/
<<
DocFiles: COPYING
InfoDocs: bash.info
Description: Extra documentation for the GNU bash shell
DescDetail: <<
- Documentation in texinfo and html format and example files for bash.
- <<
+ Documentation in texinfo and html format and example files for bash.
+<<
DescPort: <<
- Manually build man2html and install the info & html documents to
- avoid running configure for the entire package. But remember to pass
- some essential tokens that would have been in config.h
- Man files installed as part of main bash package.
- Texinfo is not required to build this package, only to read the
- bash.info file.
- Thanks to Carsten Klapp for help breaking bash-doc out into a
- separate package.
+ Man files installed as part of main bash package.
+ Texinfo is not required to build this package, only to read the
+ bash.info file.
+ Thanks to Carsten Klapp for help breaking bash-doc out into a
+ separate package.
<<
License: GPL
-Maintainer: Christian Swinehart <[EMAIL PROTECTED]>
+Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Homepage: http://www.gnu.org/software/bash/bash.html
Index: bash.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/shells/bash.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- bash.info 13 Jan 2007 19:33:25 -0000 1.2
+++ bash.info 8 Feb 2007 18:46:36 -0000 1.3
@@ -1,29 +1,48 @@
Package: bash
-Version: 3.0
-Revision: 2
-Depends: libiconv
+Version: 3.2
+Revision: 1
+Depends: libgettext3-shlibs, libiconv
Recommends: bash-completion, bash-doc
-BuildDepends: gettext-dev, gettext-bin, gettext-tools, libiconv-dev
+BuildDepends: libgettext3-dev, gettext-bin, gettext-tools, libiconv-dev
Source: gnu
-Source-MD5: 26c4d642e29b3533d8d754995bc277b3
-NoSetCPPFLAGS: yes
-SetCFLAGS: -I%p/include
+Source-MD5: 00bfa16d58e034e3c2aa27f390390d30
+Source2: mirror:gnu:bash/bash-3.2-patches/bash32-001
+Source2-MD5: d8e10c754f477e3f3a581af566b89301
+Source3: mirror:gnu:bash/bash-3.2-patches/bash32-002
+Source3-MD5: d38a5288b2f0ea6c9ac76b66cc74ef7d
+Source4: mirror:gnu:bash/bash-3.2-patches/bash32-003
+Source4-MD5: 0b90d37911827d8cb95f3b4353cc225e
+Source5: mirror:gnu:bash/bash-3.2-patches/bash32-004
+Source5-MD5: 8062f3a59631f58d78b180d83759b68a
+Source6: mirror:gnu:bash/bash-3.2-patches/bash32-005
+Source6-MD5: 585b5943fadf0875ced243b245adde58
+Source7: mirror:gnu:bash/bash-3.2-patches/bash32-006
+Source7-MD5: 1d5732e01ea938aeed42f3def131fa4d
+Source8: mirror:gnu:bash/bash-3.2-patches/bash32-007
+Source8-MD5: dcd0cc5d801607827f7c851e72b0eabc
+Source9: mirror:gnu:bash/bash-3.2-patches/bash32-008
+Source9-MD5: bb3c7dd11198c0ab93d0e960bebf6256
+Source10: mirror:gnu:bash/bash-3.2-patches/bash32-009
+Source10-MD5: 434a6f29b0ca5f1ab784b2437ae8eaed
ConfigureParams: --enable-restricted --with-curses
-PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
-CompileScript:<<
- ./configure %c
- make
+PatchScript: <<
+#!/bin/sh -ev
+
+ sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
+ for patch in ../bash32*; do
+ patch -p0 < $patch
+ done
<<
InstallScript: <<
- make install prefix="" DESTDIR=%i infodir=/share/info mandir=/share/man
htmldir=/share/doc/bash-doc/html
- mkdir -p %i/share/init/bash
- mv init/* %i/share/init/bash/
- mkdir -p %i/etc
- mv profile.fink %i/etc/profile
- (cd %i/bin; ln -s bash rbash;)
- install -m 644 doc/rbash.1 %i/share/man/man1/
- rm -r %i/share/info
- rm -r %i/share/doc/bash-doc
+ install -d -m 755 %i/share/doc/%N
+ make -j1 install DESTDIR=%d infodir=%p/share/info mandir=%p/share/man
htmldir=%p/share/doc/%N/html
+ mkdir -p %i/share/init/bash
+ mv init/* %i/share/init/bash/
+ mkdir -p %i/etc
+ mv profile.fink %i/etc/profile
+ (cd %i/bin; ln -s bash rbash;)
+ install -m 644 doc/rbash.1 %i/share/man/man1/
+ rm %i/share/info/*.info
<<
DocFiles: doc/FAQ doc/INTRO CHANGES COPYING NEWS COMPAT README.Fink
Description: The GNU Bourne Again Shell
@@ -49,5 +68,5 @@
of ./
<<
License: GPL
-Maintainer: Christian Swinehart <[EMAIL PROTECTED]>
+Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Homepage: http://www.gnu.org/software/bash/bash.html
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
