summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2010-01-24 16:24:04 +0100
committertnut <thierryn1 at hispeed dot ch>2010-01-24 16:24:04 +0100
commitd1a05d8b4d07c43b4561f03be49a7f7965575b59 (patch)
tree59480609c03cc595244a596b7229adfc08104864
parent39dfbb517918a09a9654594949739a4b94e6fec6 (diff)
downloadnutyx-extra-d1a05d8b4d07c43b4561f03be49a7f7965575b59.tar.gz
nutyx-extra-d1a05d8b4d07c43b4561f03be49a7f7965575b59.tar.bz2
nutyx-extra-d1a05d8b4d07c43b4561f03be49a7f7965575b59.tar.xz
nutyx-extra-d1a05d8b4d07c43b4561f03be49a7f7965575b59.zip
Maj bash#4.1-1
-rw-r--r--base/bash/.footprint4
-rw-r--r--base/bash/.md5sum3
-rwxr-xr-xbase/bash/Pkgfile19
3 files changed, 9 insertions, 17 deletions
diff --git a/base/bash/.footprint b/base/bash/.footprint
index ec43d9b4e..9894719ad 100644
--- a/base/bash/.footprint
+++ b/base/bash/.footprint
@@ -3,10 +3,6 @@ drwxr-xr-x root/root bin/
-r-xr-xr-x root/root bin/bashbug
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/share/
-drwxr-xr-x root/root usr/share/doc/
-drwxr-xr-x root/root usr/share/doc/bash-4.0/
--rw-r--r-- root/root usr/share/doc/bash-4.0/bash.html
--rw-r--r-- root/root usr/share/doc/bash-4.0/bashref.html
drwxr-xr-x root/root usr/share/info/
-rw-r--r-- root/root usr/share/info/bash.info.gz
drwxr-xr-x root/root usr/share/locale/
diff --git a/base/bash/.md5sum b/base/bash/.md5sum
index edf0a8400..335c8f8fc 100644
--- a/base/bash/.md5sum
+++ b/base/bash/.md5sum
@@ -1,2 +1 @@
-9b8ef92bf27abeb0ff57069f4fbc4a48 bash-4.0-fixes-5.patch
-a90a1b5a6db4838483f05438e05e8eb9 bash-4.0.tar.gz
+9800d8724815fd84994d9be65ab5e7b8 bash-4.1.tar.gz
diff --git a/base/bash/Pkgfile b/base/bash/Pkgfile
index 58f6f6b93..0c0b245aa 100755
--- a/base/bash/Pkgfile
+++ b/base/bash/Pkgfile
@@ -2,26 +2,23 @@
# URL: http://www.gnu.org/software/bash/
# Maintainer: NuTyX core team
# Packager: thierryn1 at hispeed dot ch
-# Depends on:
name=bash
-version=4.0
-release=2
-source=( http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz \
-http://www.linuxfromscratch.org/patches/lfs/development/bash-$version-fixes-5.patch)
+version=4.1
+release=1
+source=( http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz)
+
build() {
cd $name-$version
-patch -Np1 -i ../bash-$version-fixes-5.patch
-./configure --prefix=/usr \
- --bindir=/bin \
- --htmldir=/usr/share/doc/bash-4.0 \
+./configure --prefix=/usr --bindir=/bin \
+ --htmldir=/usr/share/doc/$name-$version \
--infodir=/usr/share/info \
--mandir=/usr/share/man \
- --without-bash-malloc \
- --with-installed-readline
+ --without-bash-malloc --with-installed-readline
make
make DESTDIR=$PKG install
if [ -f $PKG/usr/share/info/dir ]; then
rm $PKG/usr/share/info/dir
fi
+ rm -rf $PKG/usr/share/doc
}