From ff151e8bcbd826b7c23afb84854c52ff399b51af Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 16 Jan 2011 01:01:13 +0100
Subject: [PATCH] nss: update to 3.12.9.

---
 srcpkgs/nss/nss-devel.template |  2 --
 srcpkgs/nss/template           | 31 ++++++++++++++-----------------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/nss/nss-devel.template b/srcpkgs/nss/nss-devel.template
index 3f091421397..27764da5dec 100644
--- a/srcpkgs/nss/nss-devel.template
+++ b/srcpkgs/nss/nss-devel.template
@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
-
 Add_dependency run zlib-devel
 Add_dependency run nspr-devel
 Add_dependency run sqlite-devel
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 3f25baf8e02..947e382776e 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -1,11 +1,12 @@
 # Template file for 'nss'
 pkgname=nss
-version=3.12.8
-distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_3_12_8_RTM/src/${pkgname}-${version}.tar.gz"
+version=3.12.9
+_distver=$(echo $version|sed -e "s|\.|_|g")
+distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${_distver}_RTM/src/${pkgname}-${version}.tar.gz"
 build_style=custom-install
 short_desc="Mozilla Network Security Services"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=9178ce29749e8d09cb93ce70c38f1c2c10630926b2bb7259c7dfff42cb090c14
+checksum=0dc77718016654bbf6ffdda09e968e2b2875c05dacec967abf5725b5daae5978
 long_desc="
  Network Security Services (NSS) is a set of libraries designed to support
  cross-platform development of security-enabled server applications.
@@ -24,7 +25,6 @@ Add_dependency build sqlite-devel
 
 do_build()
 {
-	cd ${wrksrc} || return 1
 	if [ "$xbps_machine" = "x86_64" ]; then
 		_use64="USE_64=1"
 	fi
@@ -33,23 +33,21 @@ do_build()
 			LIBRUNPATH= BUILD_OPT=1 \
 			NSS_USE_SYSTEM_SQLITE=1 \
 			NSPR_INCLUDE_DIR=/usr/include/nspr \
-			NSPR_LIB_DIR=/usr/lib ${_use64} || return 1
+			NSPR_LIB_DIR=/usr/lib ${_use64}
 	done
 }
 
 do_install()
 {
-	cd ${wrksrc} || return 1
-
 	install -d ${DESTDIR}/usr/include/nss \
 		${DESTDIR}/usr/lib/pkgconfig
 	install -m644 mozilla/dist/public/nss/*.h \
-		${DESTDIR}/usr/include/nss || return 1
+		${DESTDIR}/usr/include/nss
 	install -m755 mozilla/dist/*.OBJ/lib/*.so \
-		${DESTDIR}/usr/lib || return 1
+		${DESTDIR}/usr/lib
 	for f in libcrmf.a libnssb.a libnssckfw.a; do
 		install -m644 mozilla/dist/*.OBJ/lib/${f} \
-			${DESTDIR}/usr/lib || return 1
+			${DESTDIR}/usr/lib
 	done
 
 	( \
@@ -65,12 +63,11 @@ do_install()
 	  echo "Cflags: -I/usr/include/nss"; \
 	  echo "Libs: -lnss3 -lsmime3 -lssl3 -lnssutil3 -lsoftokn3 -lpthread -ldl"; \
 	) >${DESTDIR}/usr/lib/pkgconfig/nss.pc
-	chmod 644 ${DESTDIR}/usr/lib/pkgconfig/nss.pc || return 1
-	cd ${DESTDIR}/usr/lib/pkgconfig && ln -s nss.pc mozilla-nss.pc \
-		|| return 1
+	chmod 644 ${DESTDIR}/usr/lib/pkgconfig/nss.pc
+	cd ${DESTDIR}/usr/lib/pkgconfig && ln -s nss.pc mozilla-nss.pc 
 
-	cd ${wrksrc} || return 1
-	mkdir -p ${DESTDIR}/usr/bin || return 1
+	cd ${wrksrc}
+	mkdir -p ${DESTDIR}/usr/bin
 
 	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}')
@@ -79,6 +76,6 @@ do_install()
 		-e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \
 		-e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \
 		-e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \
-		> "${DESTDIR}/usr/bin/nss-config" || return 1
-	chmod 755 "${DESTDIR}/usr/bin/nss-config" || return 1
+		> "${DESTDIR}/usr/bin/nss-config"
+	chmod 755 "${DESTDIR}/usr/bin/nss-config"
 }