X-Git-Url: http://gitweb/?a=blobdiff_plain;f=bash%2FPkgfile;h=8a4ca027bc8968fac16472a31745083bbd273bc7;hb=90858e88af8658bf3ded1b55a71efc1e7f0adc55;hp=0b29d366f3b9f9db4f296c16ab5de06cb59ce65a;hpb=582e5de113a49b21130072f266daaac0345cf21f;p=crossrootfs.git

diff --git a/bash/Pkgfile b/bash/Pkgfile
index 0b29d36..8a4ca02 100644
--- a/bash/Pkgfile
+++ b/bash/Pkgfile
@@ -1,25 +1,27 @@
 # Description: An sh-compatible command language interpreter
 # URL: http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html
 # Maintainer: CRUX System Team, core-ports at crux dot nu
-# Arch Maintainer: CRUX ARM System Team, crux-arm at mikeux dot dyndns dot org
+# Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
 # Depends on: ncurses
 
 name=bash
-version=4.0.35
+version=4.2.7
 release=1
 source=(http://ftp.gnu.org/gnu/$name/$name-${version%.*}.tar.gz \
-        http://crux.nu/ports/crux-2.6/core/$name/$name-${version%.*}-001-0${version##*.}.patch.gz \
-        profile)
+        $name-$version.patch.gz profile)
 
 build() {
-  cd $name-${version%.*}
+  cd $name-${version::3}
+  
+  gunzip -c $SRC/$name-$version.patch.gz | patch -p0
 
-  gunzip -c $SRC/$name-${version%.*}-001-0${version##*.}.patch.gz | patch -p0
   cat > config.cache <<EOF
 bash_cv_sys_named_pipes=yes
 bash_cv_job_control_missing=present
 EOF
 
+  gunzip -c $SRC/$name-4.1-001-002.patch.gz | patch -p0
+
   touch configure
   ./configure --build=$CHOST \
               --host=$CTARGET \
@@ -31,10 +33,10 @@ EOF
               --without-bash-malloc \
               --with-curses
   make 
-  make DESTDIR=$PKG install
-
-  rm -rf $PKG/usr/share $PKG/bin/bashbug $PKG/usr/man/man1/bashbug.1
+  install -D -m 755 bash $PKG/bin/bash
+  install -D -m 644 doc/bash.1 $PKG/usr/man/man1/bash.1
   install -D -m 644 $SRC/profile $PKG/etc/profile
-  ln -sf bash $PKG/bin/sh
-  ln -sf bash.1 $PKG/usr/man/man1/sh.1
+
+  ln -s bash $PKG/bin/sh
+  ln -s bash.1 $PKG/usr/man/man1/sh.1
 }