Date: Tuesday, August 17, 2010 @ 10:52:56 Author: jgc Revision: 87667
upgpkg: nspr 4.8.6-1 Update to 4.8.6 Modified: nspr/trunk/PKGBUILD ----------+ PKGBUILD | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-08-17 14:16:33 UTC (rev 87666) +++ PKGBUILD 2010-08-17 14:52:56 UTC (rev 87667) @@ -1,8 +1,8 @@ # $Id$ -# Maintainer: Alexander Baldeck <[email protected]> -# Contributor: Jan de Groot <[email protected]> +# Maintainer: Jan de Groot <[email protected]> +# Contributor: Alexander Baldeck <[email protected]> pkgname=nspr -pkgver=4.8.4 +pkgver=4.8.6 pkgrel=1 pkgdesc="Netscape Portable Runtime" arch=(i686 x86_64) @@ -13,12 +13,16 @@ options=(!emptydirs) source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz nspr.pc.in) -md5sums=('a85bdbe1eb646aa32c785a37d8e3a2f5' +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 \ @@ -26,25 +30,25 @@ --libdir=/usr/lib \ --includedir=/usr/include/nspr \ --enable-optimize \ - --disable-debug ${confflags} || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + --disable-debug ${confflags} + make + 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" \
