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

[Jan Steffens]

    Date: Saturday, July 13, 2013 @ 20:13:02
  Author: heftig
Revision: 190058

simplify

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-13 17:35:12 UTC (rev 190057)
+++ PKGBUILD	2013-07-13 18:13:02 UTC (rev 190058)
@@ -1,27 +1,27 @@
 # $Id$
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Alexander Baldeck <alexander at archlinux.org>
+
 pkgname=nspr
 pkgver=4.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Netscape Portable Runtime"
 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=('f5466def95726b3c900d8a0227bdd034'
-         'bce1611f3117b53fc904cab549c09967')
+options=('!emptydirs')
+source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz)
+md5sums=('f5466def95726b3c900d8a0227bdd034')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  if [ "$CARCH" = "x86_64" ]; then
-    confflags="--enable-64bit"
+  cd $pkgname-$pkgver
+
+  if [[ $CARCH = x86_64 ]]; then
+    _confflags="--enable-64bit"
   else
-    confflags=""
+    _confflags=""
   fi
 
   ./nspr/configure \
@@ -29,32 +29,16 @@
       --libdir=/usr/lib \
       --includedir=/usr/include/nspr \
       --enable-optimize \
-      --disable-debug ${confflags}
+      --disable-debug ${_confflags}
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd $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"
-  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"
-  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
-
-  rm -rf "${pkgdir}/usr/bin/compile-et.pl" \
-	"${pkgdir}/usr/bin/prerr.properties" \
-	"${pkgdir}/usr/share/aclocal/nspr.m4" \
-	"${pkgdir}/usr/include/nspr/md"
+  chmod 644 "$pkgdir"/usr/lib/*.a
+  ln -s nspr.pc "$pkgdir/usr/lib/pkgconfig/mozilla-nspr.pc"
+  rm -r "$pkgdir"/usr/bin/{compile-et.pl,prerr.properties} \
+         "$pkgdir/usr/include/nspr/md"
 }

Deleted: nspr.pc.in
===================================================================
--- nspr.pc.in	2013-07-13 17:35:12 UTC (rev 190057)
+++ nspr.pc.in	2013-07-13 18:13:02 UTC (rev 190058)
@@ -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%