[arch-commits] Commit in nspr/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[andyrtr at archlinux.org]

    Date: Sunday, November 9, 2008 @ 17:47:50
  Author: andyrtr
Revision: 18878

Merged revisions 18816 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/nspr/trunk

........
  r18816 | jgc | 2008-11-09 12:29:35 +0000 (So, 09 Nov 2008) | 1 line
  
  upgpkg: nspr 4.7.3-1
........

Modified:
  nspr/repos/extra-x86_64/	(properties)
  nspr/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)


Property changes on: nspr/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /nspr/trunk:1-3222
   + /nspr/trunk:1-18877

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-09 22:44:36 UTC (rev 18877)
+++ extra-x86_64/PKGBUILD	2008-11-09 22:47:50 UTC (rev 18878)
@@ -2,7 +2,7 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=nspr
-pkgver=4.7.1
+pkgver=4.7.3
 pkgrel=1
 pkgdesc="Netscape Portable Runtime"
 arch=(i686 x86_64)
@@ -13,11 +13,11 @@
 options=(!emptydirs)
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz
 	nspr.pc.in)
-md5sums=('7c6e75a0867ce2b9ec62e399a908b5ac'
+md5sums=('3496d6656f3e02dddc7e29f1b122b744'
          'bce1611f3117b53fc904cab549c09967')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   [ "$CARCH" = "x86_64" ] && confflags="--enable-64bit"
   unset CFLAGS
   unset CXXFLAGS
@@ -28,26 +28,26 @@
 	--enable-optimize \
 	--disable-debug ${confflags} || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  make DESTDIR="${pkgdir}" install || return 1
 
   NSPR_LIBS=`./config/nspr-config --libs`
   NSPR_CFLAGS=`./config/nspr-config --cflags`
   NSPR_VERSION=`./config/nspr-config --version`
-  install -m755 -d ${startdir}/pkg/usr/lib/pkgconfig || return 1
-  sed ${startdir}/src/nspr.pc.in -e "s,%libdir%,/usr/lib," \
+  install -m755 -d "${pkgdir}/usr/lib/pkgconfig" || return 1
+  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}," > ${startdir}/pkg/usr/lib/pkgconfig/nspr.pc || return 1
-  chmod 644 ${startdir}/pkg/usr/lib/pkgconfig/nspr.pc || return 1
-  ln -sf nspr.pc ${startdir}/pkg/usr/lib/pkgconfig/mozilla-nspr.pc || return 1
+	-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
 
-  chmod 644 ${startdir}/pkg/usr/lib/*.a || return 1
+  chmod 644 ${pkgdir}/usr/lib/*.a || return 1
 
-  rm -rf ${startdir}/pkg/usr/bin/compile-et.pl \
-	${startdir}/pkg/usr/bin/prerr.properties \
-	${startdir}/pkg/usr/share/aclocal/nspr.m4 \
-	${startdir}/pkg/usr/include/nspr/md
+  rm -rf "${pkgdir}/usr/bin/compile-et.pl" \
+	"${pkgdir}/usr/bin/prerr.properties" \
+	"${pkgdir}/usr/share/aclocal/nspr.m4" \
+	"${pkgdir}/usr/include/nspr/md"
 }