From 241deeec55ea5d904f071bc4ef12e8c2a4d8c76b Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Tue, 7 Dec 2010 01:41:28 +0000
Subject: nspr: upgrade

---
 abs/extra/nspr/PKGBUILD | 49 ++++++++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/abs/extra/nspr/PKGBUILD b/abs/extra/nspr/PKGBUILD
index 453b515..750f05f 100644
--- a/abs/extra/nspr/PKGBUILD
+++ b/abs/extra/nspr/PKGBUILD
@@ -1,50 +1,57 @@
-# $Id: PKGBUILD 18817 2008-11-09 12:29:50Z jgc $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 87667 2010-08-17 14:52:56Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=nspr
-pkgver=4.8
-pkgrel=2
+pkgver=4.8.6
+pkgrel=1
 pkgdesc="Netscape Portable Runtime"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://www.mozilla.org/projects/nspr/"
 license=('MPL' 'GPL')
 depends=('glibc')
 makedepends=('zip')
 options=(!emptydirs)
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz
-	nspr.pc.in)
-md5sums=('e0916a72bcc6c427551ea262183fdb26'
+        nspr.pc.in)
+md5sums=('592c275728c29d193fdba8009165990b'
          'bce1611f3117b53fc904cab549c09967')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  [ "$CARCH" = "x86_64" ] && confflags="--enable-64bit"
+  if [ "$CARCH" = "x86_64" ]; then
+    confflags="--enable-64bit"
+  else
+    confflags=""
+  fi
   unset CFLAGS
   unset CXXFLAGS
   ./mozilla/nsprpub/configure \
-  	--prefix=/usr \
-	--libdir=/usr/lib \
-	--includedir=/usr/include/nspr \
-	--enable-optimize \
-	--disable-debug ${confflags} || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+      --prefix=/usr \
+      --libdir=/usr/lib \
+      --includedir=/usr/include/nspr \
+      --enable-optimize \
+      --disable-debug ${confflags}
+  make
+}
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 
   NSPR_LIBS=`./config/nspr-config --libs`
   NSPR_CFLAGS=`./config/nspr-config --cflags`
   NSPR_VERSION=`./config/nspr-config --version`
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig" || return 1
+  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
   sed "${srcdir}/nspr.pc.in" -e "s,%libdir%,/usr/lib," \
   	-e "s,%prefix%,/usr," \
 	-e "s,%exec_prefix%,/usr/bin," \
 	-e "s,%includedir%,/usr/include/nspr," \
 	-e "s,%NSPR_VERSION%,${NSPR_VERSION}," \
 	-e "s,%FULL_NSPR_LIBS%,${NSPR_LIBS}," \
-	-e "s,%FULL_NSPR_CFLAGS%,${NSPR_CFLAGS}," > "${pkgdir}/usr/lib/pkgconfig/nspr.pc" || return 1
-  chmod 644 "${pkgdir}/usr/lib/pkgconfig/nspr.pc" || return 1
-  ln -sf nspr.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nspr.pc" || return 1
+	-e "s,%FULL_NSPR_CFLAGS%,${NSPR_CFLAGS}," > "${pkgdir}/usr/lib/pkgconfig/nspr.pc"
+  chmod 644 "${pkgdir}/usr/lib/pkgconfig/nspr.pc"
+  ln -sf nspr.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nspr.pc"
 
-  chmod 644 ${pkgdir}/usr/lib/*.a || return 1
+  chmod 644 ${pkgdir}/usr/lib/*.a
 
   rm -rf "${pkgdir}/usr/bin/compile-et.pl" \
 	"${pkgdir}/usr/bin/prerr.properties" \
-- 
cgit v0.12

