Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/librep/PKGBUILD
	extra/pixman/PKGBUILD

1 files changed, 10 insertions, 5 deletions

diff --git a/community/confuse/PKGBUILD b/community/confuse/PKGBUILD
index ddfb63ec2..14cc92378 100755
--- a/community/confuse/PKGBUILD
+++ b/community/confuse/PKGBUILD
@@ -1,23 +1,28 @@
-# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# $Id: PKGBUILD 64161 2012-02-09 16:35:50Z ttopper $
+# Contributor : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Alexander Mieland (dma147) <dma147@linux-stats.org>
+# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=confuse
 pkgver=2.7
-pkgrel=1
+pkgrel=2
 pkgdesc="C-library for parsing configuration files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nongnu.org/confuse"
 license=('LGPL')
 depends=('glibc')
-source=(http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+source=("http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 options=('!libtool' '!emptydirs')
 md5sums=('45932fdeeccbb9ef4228f1c1a25e9c8f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --enable-shared
-  make || return 1
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }