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

[andyrtr at archlinux.org]

    Date: Saturday, November 22, 2008 @ 06:20:21
  Author: andyrtr
Revision: 19392

Merged revisions 19285 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/nss/trunk

........
  r19285 | jgc | 2008-11-19 21:07:19 +0000 (Mi, 19 Nov 2008) | 1 line
  
  upgpkg: nss 3.12.1-1
........

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

----------+
 PKGBUILD |   42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)


Property changes on: nss/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /nss/trunk:1-4292
   + /nss/trunk:1-19391

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-22 05:05:39 UTC (rev 19391)
+++ extra-x86_64/PKGBUILD	2008-11-22 11:20:21 UTC (rev 19392)
@@ -2,28 +2,28 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=nss
-pkgver=3.12
-_nssver=3.12.0.3
+pkgver=3.12.1
+_nssver=3.12.1.1
 pkgrel=1
 pkgdesc="Mozilla Network Security Services"
 arch=(i686 x86_64)
 url="http://www.mozilla.org/projects/security/pki/nss/"
 license=('MPL' 'GPL')
-_nsprver=4.7.1
+_nsprver=4.7.3
 depends=("nspr>=${_nsprver}" 'sqlite3>=3.5.9-2')
 replaces=('nss-nspr')
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_RTM/src/${pkgname}-${pkgver}.tar.gz
+source=(ftp://ftp.archlinux.org/other/nss/${pkgname}-${pkgver}.tar.gz
 	nss-nolocalsql.patch
 	nss.pc.in
 	nss-config.in)
-md5sums=('917f4e05f3982bd7fceaede197f0e1d4'
+md5sums=('47859a955e253e0621be0f6752757cc2'
          '1837781eed35bfb6f826cfb3efcd6409'
          'c547b030c57fe1ed8b77c73bf52b3ded'
          '46bee81908f1e5b26d6a7a2e14c64d9f')
 
 build() {
-  cd ${startdir}/src/nss-${pkgver}
-  patch -Np0 -i ${startdir}/src/nss-nolocalsql.patch || return 1
+  cd "${srcdir}/nss-${pkgver}"
+  patch -Np0 -i "${srcdir}/nss-nolocalsql.patch" || return 1
   unset CFLAGS
   unset CXXFLAGS
   export BUILD_OPT=1
@@ -38,46 +38,46 @@
   make -j 1 -C mozilla/security/dbm || return 1
   make -j 1 -C mozilla/security/nss || return 1
 
-  install -m755 -d ${startdir}/pkg/usr/lib/pkgconfig
-  install -m755 -d ${startdir}/pkg/usr/bin
-  install -m755 -d ${startdir}/pkg/usr/include/nss
+  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
+  install -m755 -d "${pkgdir}/usr/bin"
+  install -m755 -d "${pkgdir}/usr/include/nss"
 
   NSS_VMAJOR=`grep "#define.*NSS_VMAJOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
   NSS_VMINOR=`grep "#define.*NSS_VMINOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
   NSS_VPATCH=`grep "#define.*NSS_VPATCH" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
 
-  sed ${startdir}/src/nss.pc.in -e "s,%libdir%,/usr/lib,g" \
+  sed "${srcdir}/nss.pc.in" -e "s,%libdir%,/usr/lib,g" \
   				-e "s,%prefix%,/usr,g" \
 				-e "s,%exec_prefix%,/usr/bin,g" \
 				-e "s,%includedir%,/usr/include/nss,g" \
 				-e "s,%NSPR_VERSION%,${_nsprver},g" \
 				-e "s,%NSS_VERSION%,${_nssver},g" > \
-			${startdir}/pkg/usr/lib/pkgconfig/nss.pc || return 1
-  ln -sf nss.pc ${startdir}/pkg/usr/lib/pkgconfig/mozilla-nss.pc || return 1
-  chmod 644 ${startdir}/pkg/usr/lib/pkgconfig/*.pc || return 1
+			"${pkgdir}/usr/lib/pkgconfig/nss.pc" || return 1
+  ln -sf nss.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nss.pc" || return 1
+  chmod 644 ${pkgdir}/usr/lib/pkgconfig/*.pc || return 1
 
-  sed ${startdir}/src/nss-config.in -e "s, at libdir@,/usr/lib,g" \
+  sed "${srcdir}/nss-config.in" -e "s, at libdir@,/usr/lib,g" \
   				    -e "s, at prefix@,/usr/bin,g" \
 				    -e "s, at exec_prefix@,/usr/bin,g" \
 				    -e "s, at includedir@,/usr/include/nss,g" \
 				    -e "s, at MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \
 				    -e "s, at MOD_MINOR_VERSION@,${NSS_VMINOR},g" \
 				    -e "s, at MOD_PATCH_VERSION@,${NSS_VPATCH},g" \
-			    > ${startdir}/pkg/usr/bin/nss-config || return 1
-  chmod 755 ${startdir}/pkg/usr/bin/nss-config || return 1
+			    > "${pkgdir}/usr/bin/nss-config" || return 1
+  chmod 755 "${pkgdir}/usr/bin/nss-config" || return 1
 
   for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \
               libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so
   do
-    install -m755 mozilla/dist/*.OBJ/lib/${file} ${startdir}/pkg/usr/lib/ || return 1
+    install -m755 mozilla/dist/*.OBJ/lib/${file} "${pkgdir}/usr/lib/" || return 1
   done
   for file in libcrmf.a libnssb.a libnssckfw.a; do
-    install -m644 mozilla/dist/*.OBJ/lib/${file} ${startdir}/pkg/usr/lib/ || return 1
+    install -m644 mozilla/dist/*.OBJ/lib/${file} "${pkgdir}/usr/lib/" || return 1
   done
 
   for file in certutil cmsutil crlutil modutil pk12util signtool signver ssltap; do
-    install -m755 mozilla/dist/*.OBJ/bin/${file} ${startdir}/pkg/usr/bin/ || return 1
+    install -m755 mozilla/dist/*.OBJ/bin/${file} "${pkgdir}/usr/bin/" || return 1
   done
 
-  install -m644 mozilla/dist/public/nss/*.h ${startdir}/pkg/usr/include/nss/ || return 1
+  install -m644 mozilla/dist/public/nss/*.h "${pkgdir}/usr/include/nss/" || return 1
 }