Thu Apr 18 00:06:59 PDT 2013

5 files changed, 36 insertions, 16 deletions

diff --git a/core/bison/PKGBUILD b/core/bison/PKGBUILD
index 4905ff507..7b254540a 100644
--- a/core/bison/PKGBUILD
+++ b/core/bison/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 173327 2012-12-19 01:16:33Z allan $
+# $Id: PKGBUILD 183046 2013-04-17 02:02:01Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 
 pkgname=bison
-pkgver=2.7
+pkgver=2.7.1
 pkgrel=1
 pkgdesc="The GNU general-purpose parser generator"
 arch=('i686' 'x86_64')
@@ -13,8 +13,8 @@ depends=('glibc' 'm4' 'sh')
 groups=('base-devel')
 install=bison.install
 source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('234cdfac99257cf99ac4a03c898f37b9'
-         '853204af1f9a5602d84989b4852e317e')
+md5sums=('7be02eb973eccf388f1ae750fc09eed0'
+         'SKIP')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}  
diff --git a/core/expat/PKGBUILD b/core/expat/PKGBUILD
index 73688e009..5c2967ff7 100644
--- a/core/expat/PKGBUILD
+++ b/core/expat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156201 2012-04-16 03:41:12Z allan $
+# $Id: PKGBUILD 183047 2013-04-17 02:02:02Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Committer: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=expat
 pkgver=2.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An XML parser library"
 arch=('i686' 'x86_64')
 url="http://expat.sourceforge.net/"
@@ -16,7 +16,7 @@ md5sums=('dd7dab7a5fea97d2a6a43f511449b7cd')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --mandir=/usr/share/man
+  ./configure --prefix=/usr #--mandir=/usr/share/man
   make
 }
 
diff --git a/core/m4/PKGBUILD b/core/m4/PKGBUILD
index de13524da..d0e2ffb5a 100644
--- a/core/m4/PKGBUILD
+++ b/core/m4/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142068 2011-11-04 23:36:00Z allan $
+# $Id: PKGBUILD 183048 2013-04-17 02:02:03Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=m4
 pkgver=1.4.16
-pkgrel=2
+pkgrel=3
 pkgdesc="The GNU macro processor"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/m4"
@@ -15,12 +15,21 @@ 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'
+         'SKIP'
          'cea138fa9b568d06e46269611cec8dd0')
 
-build() {
+prepare() {
   cd ${srcdir}/$pkgname-$pkgver
+  
+  # glibc-2.16 compatibility
+  sed -i -e '/gets is a/d' lib/stdio.in.h
+  
+  # patch testsuite failure with newer kernels
   patch -Np1 -i $srcdir/m4-1.4.16-readlink-einval.patch
+}
+
+build() {
+  cd ${srcdir}/$pkgname-$pkgver  
   ./configure --prefix=/usr
   make
 }
diff --git a/core/m4/m4.install b/core/m4/m4.install
index be4138170..523d39bd6 100644
--- a/core/m4/m4.install
+++ b/core/m4/m4.install
@@ -1,5 +1,5 @@
 infodir=usr/share/info
-filelist=(m4.info m4.info-1 m4.info-2)
+filelist=('m4.info' 'm4.info-1' 'm4.info-2')
 
 post_install() {
   [ -x usr/bin/install-info ] || return 0
diff --git a/core/tar/PKGBUILD b/core/tar/PKGBUILD
index f064f08c1..472bf0d44 100644
--- a/core/tar/PKGBUILD
+++ b/core/tar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142080 2011-11-04 23:36:17Z allan $
+# $Id: PKGBUILD 183049 2013-04-17 02:02:04Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=tar
 pkgver=1.26
-pkgrel=2
+pkgrel=3
 pkgdesc="Utility used to store, backup, and transport files"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/tar/tar.html"
@@ -19,10 +19,16 @@ md5sums=('0ced6f20b9fa1bea588005b5ad4b52c1'
          '6618d5fe7785e138c27d7d6a24e998b2'
          'e97e7343f4e23724b4c48bca2f033e38')
 
-build() {
+prepare() {
   cd ${srcdir}/$pkgname-$pkgver
 
-  ./configure --prefix=/usr --libexecdir=/usr/lib/tar --bindir=/bin
+  # fix build failure with glibc-2.16
+  sed -i -e '/gets is a/d' gnu/stdio.in.h
+}
+
+build() {
+  cd ${srcdir}/$pkgname-$pkgver
+  ./configure --prefix=/usr --libexecdir=/usr/lib/tar
   make
 }
 
@@ -34,5 +40,10 @@ check() {
 package() {
   cd ${srcdir}/$pkgname-$pkgver
   make DESTDIR=${pkgdir} install
+  
+  # probably needed for compatibility
+  install -dm755 ${pkgdir}/bin
+  ln -s ../usr/bin/tar ${pkgdir}/bin/tar
+  
   install -Dm644 ${srcdir}/tar.1 ${pkgdir}/usr/share/man/man1/tar.1
 }