[arch-commits] Commit in lib32-nspr/trunk (PKGBUILD nspr.pc.in)

[Daniel Wallace]

    Date: Thursday, July 18, 2013 @ 01:58:19
  Author: dwallace
Revision: 94245

upgpkg: lib32-nspr 4.10-1

upgpkg: lib32-nspr 4.10

Modified:
  lib32-nspr/trunk/PKGBUILD
Deleted:
  lib32-nspr/trunk/nspr.pc.in

------------+
 PKGBUILD   |   38 ++++++++++----------------------------
 nspr.pc.in |   10 ----------
 2 files changed, 10 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-17 23:44:11 UTC (rev 94244)
+++ PKGBUILD	2013-07-17 23:58:19 UTC (rev 94245)
@@ -5,7 +5,7 @@
 
 _pkgbasename=nspr
 pkgname=lib32-${_pkgbasename}
-pkgver=4.9.6
+pkgver=4.10
 pkgrel=1
 pkgdesc="Netscape Portable Runtime (32-bit)"
 arch=('x86_64')
@@ -15,48 +15,30 @@
 depends=('lib32-glibc' ${_pkgbasename})
 makedepends=('zip' 'gcc-multilib')
 options=(!emptydirs)
-source=(http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${_pkgbasename}-${pkgver}.tar.gz
-        nspr.pc.in)
+source=(http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${_pkgbasename}-${pkgver}.tar.gz)
+md5sums=('f5466def95726b3c900d8a0227bdd034')
 
-md5sums=('62b1e9d376d503d972f90c3c0031d879'
-         'bce1611f3117b53fc904cab549c09967')
 
 build() {
   cd "${srcdir}"/${_pkgbasename}-${pkgver}
 
-  sed -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
-    -i mozilla/nsprpub/config/rules.mk
-
-  ./mozilla/nsprpub/configure \
+  ./nspr/configure \
       --prefix=/usr \
       --libdir=/usr/lib32 \
       --includedir=/usr/include/nspr \
       --enable-optimize \
-      --disable-debug ${confflags}
+      --disable-debug \
+      --enable-32bit
   make
-
-  NSPR_LIBS=`./config/nspr-config --libs`
-  NSPR_CFLAGS=`./config/nspr-config --cflags`
-  NSPR_VERSION=`./config/nspr-config --version`
-  sed "${srcdir}"/nspr.pc.in -e "s,%libdir%,/usr/lib32," \
-  	-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}," > "${srcdir}"/nspr.pc
 }
 
 package() {
   cd "${srcdir}"/${_pkgbasename}-${pkgver}
 
-  install -m755 -d "${pkgdir}"/usr/lib/pkgconfig
   make DESTDIR="${pkgdir}" install
-
-  install -m755 -D "${srcdir}"/nspr.pc "${pkgdir}"/usr/lib32/pkgconfig/nspr.pc
-  chmod 644 "${pkgdir}"/usr/lib32/pkgconfig/nspr.pc
-  ln -sf nspr.pc "${pkgdir}"/usr/lib32/pkgconfig/mozilla-nspr.pc
-  chmod 644 "${pkgdir}"/usr/lib32/*.a
-
+  chmod 644 "$pkgdir"/usr/lib32/*.a
+  ln -s nspr.pc "$pkgdir/usr/lib32/pkgconfig/mozilla-nspr.pc"
+  rm -r "$pkgdir"/usr/bin/{compile-et.pl,prerr.properties} \
+        "$pkgdir/usr/include/nspr/md"
   rm -rf "${pkgdir}"/usr/{bin,share,include}
 }

Deleted: nspr.pc.in
===================================================================
--- nspr.pc.in	2013-07-17 23:44:11 UTC (rev 94244)
+++ nspr.pc.in	2013-07-17 23:58:19 UTC (rev 94245)
@@ -1,10 +0,0 @@
-prefix=%prefix%
-exec_prefix=%exec_prefix%
-libdir=%libdir%
-includedir=%includedir%
-
-Name: NSPR
-Description: The Netscape Portable Runtime
-Version: %NSPR_VERSION%
-Libs: %FULL_NSPR_LIBS%
-Cflags: %FULL_NSPR_CFLAGS%