Merge branch 'master' of github.com:archlinuxarm/PKGBUILDs

core/diffutils/PKGBUILD

@@ -7,7 +7,7 @@ plugrel=1
 
 pkgname=diffutils
 pkgver=3.2
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Utility programs used for creating patch files"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/diffutils"

core/m4/PKGBUILD

@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 142067 2011-11-04 23:35:59Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: Andreas Radke <andyrtr@archlinux.org>
+
+# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
+#  - rebuild because goddamn upstream built theirs statically linked, didn't trigger rebuild
+#    for libsigsegv.. STOP DOING THIS IF IT'S NOT IN THE PKGBUILD
+
+plugrel=1
+
+pkgname=m4
+pkgver=1.4.16
+pkgrel=2.1
+pkgdesc="The GNU macro processor"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/m4"
+license=('GPL3')
+groups=('base-devel')
+depends=('glibc' 'bash')
+install=m4.install
+source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz{,.sig}
+        m4-1.4.16-readlink-einval.patch)
+md5sums=('7548ec061a1ba993790159764f522d0e'
+         'eebe5c94e74e7551e2e30c5844f1b653'
+         'cea138fa9b568d06e46269611cec8dd0')
+
+build() {
+  cd ${srcdir}/$pkgname-$pkgver
+  patch -Np1 -i $srcdir/m4-1.4.16-readlink-einval.patch
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd ${srcdir}/$pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd ${srcdir}/$pkgname-$pkgver
+  make prefix=${pkgdir}/usr install
+}

core/m4/m4-1.4.16-readlink-einval.patch

@@ -0,0 +1,12 @@
+diff -up m4-1.4.16/tests/test-readlink.h.orig m4-1.4.16/tests/test-readlink.h
+--- m4-1.4.16/tests/test-readlink.h.orig	2011-09-19 12:44:58.745546826 +0200
++++ m4-1.4.16/tests/test-readlink.h	2011-09-19 12:46:00.079548410 +0200
+@@ -38,7 +38,7 @@ test_readlink (ssize_t (*func) (char con
+   ASSERT (errno == ENOENT);
+   errno = 0;
+   ASSERT (func ("", buf, sizeof buf) == -1);
+-  ASSERT (errno == ENOENT);
++  ASSERT (errno == ENOENT || errno == EINVAL);
+   errno = 0;
+   ASSERT (func (".", buf, sizeof buf) == -1);
+   ASSERT (errno == EINVAL);

core/m4/m4.install

@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(m4.info m4.info-1 m4.info-2)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}

extra/fftw/PKGBUILD

@@ -10,8 +10,8 @@
 plugrel=1
 
 pkgname=fftw
-pkgver=3.3
-pkgrel=2
+pkgver=3.3.1
+pkgrel=1
 pkgdesc="A library for computing the discrete Fourier transform (DFT)"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -21,7 +21,7 @@ makedepends=('gcc-fortran')
 options=('!libtool')
 source=("http://www.fftw.org/${pkgname}-${pkgver}.tar.gz")
 install=fftw.install
-sha1sums=('e44493ba4babeacba184568e727876d9aed44205')
+sha1sums=('3fecc492f576503a6a509d2073bd82b3fe0aef13')
 
 # notes:
 # http://www.fftw.org/fftw2_doc/fftw_6.html#SEC69