Merge branch '2.6' into 2.7

2010-09-07 19:24:04 +02:00 · 2010-09-07 19:24:04 +02:00 · a0b37fb5ac
commit a0b37fb5ac
parent 02ddfe9918 47f3834d2b
4 changed files with 7 additions and 4 deletions
--- a/xfsprogs/.md5sum
+++ b/xfsprogs/.md5sum
@ -1 +1 @@
-86d10178ee6897cb099c97303e6d9da0  xfsprogs-3.1.2.tar.gz
+a6a4777ded0a36fa692b7eb652a85493  xfsprogs-3.1.3.tar.gz
--- a/xfsprogs/Pkgfile
+++ b/xfsprogs/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:  util-linux-ng

 name=xfsprogs
-version=3.1.2
+version=3.1.3
 release=1
 source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/$name-$version.tar.gz)

@ -14,6 +14,9 @@ build() {
    export DEBUG=-DNDEBUG
    export OPTIMIZER=$CFLAGS

+    # run autoconf because configure sets MAKEDEPEND 
+    # to "/usr/bin/makedepend" instead of "gcc -MM"
+    autoconf
    ./configure --prefix=/usr \
                --mandir=/usr/man \
                --disable-gettext
--- a/xz/.md5sum
+++ b/xz/.md5sum
@ -1 +1 @@
-c39c7ae07c1ae5b76b20a78e37358a1e  xz-4.999.9beta-168-g8c7d.tar.gz
+3979abaf503f1d282ac77d2727384297  xz-4.999.9beta-174-g41bc.tar.gz
--- a/xz/Pkgfile
+++ b/xz/Pkgfile
@ -3,7 +3,7 @@
 # Maintainer:  Juergen Daubert, juergen dot daubert at t-online dot de

 name=xz
-version=4.999.9beta-168-g8c7d
+version=4.999.9beta-174-g41bc
 release=1
 source=(http://tukaani.org/xz/$name-$version.tar.gz)