# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1287621204 0
# Node ID f620c0d3e9f48573ee11e996f0368b390a179f9b
# Parent  057151c17d05684ead7d42c93381dca294a6b6ae
Up: nss to 3.12.8. Added nspr. This way nss doesn't depend on libfirefox anymore.

diff -r 057151c17d05 -r f620c0d3e9f4 nspr-dev/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nspr-dev/receipt	Thu Oct 21 00:33:24 2010 +0000
@@ -0,0 +1,19 @@
+# SliTaz package receipt.
+
+PACKAGE="nspr-dev"
+VERSION="4.8.6"
+CATEGORY="development"
+SHORT_DESC="nspr devel library."
+MAINTAINER="slaxemulator@gmail.com"
+DEPENDS="nspr"
+WANTED="nspr"
+WEB_SITE="http://www.mozilla.org/projects/security/nspr/"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+    mkdir -p $fs/usr/bin $fs/usr/lib
+    cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
+    cp -a $_pkg/usr/include $fs/usr
+    cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
+}
diff -r 057151c17d05 -r f620c0d3e9f4 nspr/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nspr/receipt	Thu Oct 21 00:33:24 2010 +0000
@@ -0,0 +1,49 @@
+# SliTaz package receipt.
+
+PACKAGE="nspr"
+VERSION="4.8.6"
+CATEGORY="utilities"
+SHORT_DESC="Netscape Portable Runtime"
+MAINTAINER="rocky@slitaz.org"
+DEPENDS="glibc-base"
+BUILD_DEPENDS="perl"
+TARBALL="$PACKAGE-$VERSION.tar.gz"
+WEB_SITE="http://www.mozilla.org/projects/nspr/"
+WGET_URL="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${VERSION}/src/${TARBALL}"
+
+# Rules to configure and make the package.
+compile_rules()
+{
+    cd $src
+./mozilla/nsprpub/configure \
+      --prefix=/usr \
+      --libdir=/usr/lib \
+      --includedir=/usr/include/nspr \
+      --enable-optimize \
+      --disable-debug
+  make
+  make DESTDIR="$PWD/_pkg" install
+
+  mkdir -p $PWD/_pkg/usr/lib/pkgconfig
+  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 "../stuff/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}," > "$PWD/_pkg/usr/lib/pkgconfig/nspr.pc"
+  ln -sf nspr.pc "$PWD/_pkg/usr/lib/pkgconfig/mozilla-nspr.pc"
+}
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+    mkdir -p $fs/usr/lib
+    cp -a $_pkg/usr/bin $fs/usr
+    cp -a $_pkg/usr/lib/*so* $fs/usr/lib
+    rm $fs/usr/bin/nspr-config
+}
diff -r 057151c17d05 -r f620c0d3e9f4 nspr/stuff/nspr.pc.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nspr/stuff/nspr.pc.in	Thu Oct 21 00:33:24 2010 +0000
@@ -0,0 +1,10 @@
+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%
diff -r 057151c17d05 -r f620c0d3e9f4 nss-dev/receipt
--- a/nss-dev/receipt	Wed Oct 20 23:49:58 2010 +0000
+++ b/nss-dev/receipt	Thu Oct 21 00:33:24 2010 +0000
@@ -1,10 +1,11 @@
 # SliTaz package receipt.
 
 PACKAGE="nss-dev"
-VERSION="3.12.7"
+VERSION="3.12.8"
 CATEGORY="development"
 SHORT_DESC="nss devel library."
 MAINTAINER="rocky@slitaz.org"
+DEPENDS="nss"
 WANTED="nss"
 WEB_SITE="http://www.mozilla.org/projects/security/pki/nss/"
 
diff -r 057151c17d05 -r f620c0d3e9f4 nss/receipt
--- a/nss/receipt	Wed Oct 20 23:49:58 2010 +0000
+++ b/nss/receipt	Thu Oct 21 00:33:24 2010 +0000
@@ -1,12 +1,12 @@
 # SliTaz package receipt.
 
 PACKAGE="nss"
-VERSION="3.12.7"
+VERSION="3.12.8"
 CATEGORY="utilities"
 SHORT_DESC="Mozilla Network Security Services (NSS)."
 MAINTAINER="rocky@slitaz.org"
-DEPENDS="libfirefox sqlite zlib"
-BUILD_DEPENDS="firefox-dev sqlite-dev zlib-dev perl"
+DEPENDS="nspr sqlite zlib"
+BUILD_DEPENDS="nspr-dev sqlite-dev zlib-dev perl pkg-config"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.mozilla.org/projects/security/pki/nss/"
 WGET_URL="ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${VERSION//./_}_RTM/src/${TARBALL}"
@@ -24,12 +24,22 @@
     # Removes rpath
     patch -Np0 -i ../stuff/nss-no-rpath.patch
 
-    export NSPR_INCLUDE_DIR=$(ls -d /usr/include/firefox-*)
-    export NSPR_LIB_DIR=$(ls -d /usr/lib/firefox-*/lib)
+    cd $src/mozilla/security/nss/lib/ckfw/builtins
+    make generate
+
+    cd $src
+    unset CFLAGS
+    unset CXXFLAGS
     export NSS_USE_SYSTEM_SQLITE=1
     export BUILD_OPT=1
+    export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
+    export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
+    export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'`
+    export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'`
 
-    make -j1 -C mozilla/security/nss build_coreconf build_dbm all
+    make -j 1 -C mozilla/security/coreconf
+    make -j 1 -C mozilla/security/dbm
+    make -j 1 -C mozilla/security/nss
 
     mkdir -p $PWD/_pkg/usr/bin
     mkdir -p $PWD/_pkg/usr/lib/pkgconfig