revision bump, with proper modification for nss-config

(Portage version: 2.1_pre4-r1)

6 files changed, 256 insertions, 10 deletions

diff --git a/dev-libs/nss/files/digest-nss-3.10 b/dev-libs/nss/files/digest-nss-3.10
deleted file mode 100644
index 09ec1b0b9833..000000000000
--- a/dev-libs/nss/files/digest-nss-3.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f0d75d52aff21f88d9c055bdb78f54f8 nss-3.10.tar.gz 3622858
diff --git a/dev-libs/nss/files/digest-nss-3.11 b/dev-libs/nss/files/digest-nss-3.11
new file mode 100644
index 000000000000..802d7b71a488
--- /dev/null
+++ b/dev-libs/nss/files/digest-nss-3.11
@@ -0,0 +1,3 @@
+MD5 9be73bd73e361e5e36edf77f456fa20a nss-3.11.tar.gz 5002908
+RMD160 90be4b42e490084c23451ce8abcf089150357d1e nss-3.11.tar.gz 5002908
+SHA256 35b65a672c699f1e5fc082fccc29bcc65102ef8d31cff106f2ec68beace96809 nss-3.11.tar.gz 5002908
diff --git a/dev-libs/nss/files/nss-3.11-config.patch b/dev-libs/nss/files/nss-3.11-config.patch
new file mode 100644
index 000000000000..ac579c890875
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.11-config.patch
@@ -0,0 +1,91 @@
+--- mozilla/security/nss/lib/ckfw/builtins/config.mk.orig	2005-01-20 02:25:46.000000000 +0000
++++ mozilla/security/nss/lib/ckfw/builtins/config.mk	2006-01-15 05:13:08.000000000 +0000
+@@ -69,3 +69,9 @@
+ MKSHLIB += -R '$$ORIGIN'
+ endif
+ 
++ifeq ($(OS_TARGET),Linux)
++# The -R '$ORIGIN' linker option instructs this library to search for its
++# dependencies in the same directory where it resides.
++DSO_LDOPTS += -Wl,-R,'$$ORIGIN'
++endif
++
+--- mozilla/security/nss/lib/ckfw/capi/config.mk.orig	2005-11-04 02:05:04.000000000 +0000
++++ mozilla/security/nss/lib/ckfw/capi/config.mk	2006-01-15 05:13:52.000000000 +0000
+@@ -69,3 +69,9 @@
+ MKSHLIB += -R '$$ORIGIN'
+ endif
+ 
++ifeq ($(OS_TARGET),Linux)
++# The -R '$ORIGIN' linker option instructs this library to search for its
++# dependencies in the same directory where it resides.
++DSO_LDOPTS += -Wl,-R,'$$ORIGIN'
++endif
++
+--- mozilla/security/nss/lib/freebl/Makefile.orig	2005-11-22 07:13:32.000000000 +0000
++++ mozilla/security/nss/lib/freebl/Makefile	2006-01-15 05:16:05.000000000 +0000
+@@ -132,6 +132,7 @@
+ endif
+ 
+ ifeq ($(OS_TARGET),Linux)
++DSO_LDOPTS += -Wl,-R,'$$ORIGIN'
+ ifeq ($(CPU_ARCH),x86_64)
+     ASFILES  = arcfour-amd64-gas.s mpi_amd64_gas.s
+     ASFLAGS += -march=opteron -m64 -fPIC
+--- mozilla/security/nss/lib/nss/config.mk.orig	2005-07-21 23:48:28.000000000 +0000
++++ mozilla/security/nss/lib/nss/config.mk	2006-01-15 05:11:58.000000000 +0000
+@@ -122,6 +122,11 @@
+ endif
+ endif
+ 
++ifeq ($(OS_TARGET),Linux)
++# The -R '$ORIGIN' linker option instructs this library to search for its
++# dependencies in the same directory where it resides.
++DSO_LDOPTS += -Wl,-R,'$$ORIGIN'
++endif
+ 
+ ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET)))
+ ifndef NS_USE_GCC
+--- mozilla/security/nss/lib/smime/config.mk.orig	2005-09-02 01:24:57.000000000 +0000
++++ mozilla/security/nss/lib/smime/config.mk	2006-01-15 05:05:53.000000000 +0000
+@@ -97,3 +97,10 @@
+ # dependencies in the same directory where it resides.
+ MKSHLIB += -R '$$ORIGIN'
+ endif
++
++ifeq ($(OS_TARGET),Linux)
++# The -R '$ORIGIN' linker option instructs this library to search for its
++# dependencies in the same directory where it resides.
++DSO_LDOPTS += -Wl,-R,'$$ORIGIN'
++endif
++
+--- mozilla/security/nss/lib/softoken/config.mk.orig	2005-10-19 01:03:31.000000000 +0000
++++ mozilla/security/nss/lib/softoken/config.mk	2006-01-15 05:07:15.000000000 +0000
+@@ -93,6 +93,12 @@
+ MKSHLIB += -R '$$ORIGIN'
+ endif
+ 
++ifeq ($(OS_TARGET),Linux)
++# The -R '$ORIGIN' linker option instructs this library to search for its
++# dependencies in the same directory where it resides.
++DSO_LDOPTS += -Wl,-R,'$$ORIGIN'
++endif
++
+ ifeq ($(OS_TARGET),WINCE)
+ DEFINES += -DDBM_USING_NSPR
+ endif
+--- mozilla/security/nss/lib/ssl/config.mk.orig	2005-10-19 01:04:16.000000000 +0000
++++ mozilla/security/nss/lib/ssl/config.mk	2006-01-15 05:10:38.000000000 +0000
+@@ -119,6 +119,12 @@
+ #EXTRA_SHARED_LIBS += -ldl -lrt -lc -z defs
+ endif
+ 
++ifeq ($(OS_TARGET),Linux)
++# The -R '$ORIGIN' linker option instructs this library to search for its
++# dependencies in the same directory where it resides.
++DSO_LDOPTS += -Wl,-R,'$$ORIGIN'
++endif
++
+ endif
+ 
+ # indicates dependency on freebl static lib
diff --git a/dev-libs/nss/files/nss-3.11-zdefs.patch b/dev-libs/nss/files/nss-3.11-zdefs.patch
new file mode 100644
index 000000000000..0e8128cbcaf1
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.11-zdefs.patch
@@ -0,0 +1,16 @@
+Index: mozilla/security/coreconf/Linux.mk
+===================================================================
+RCS file: /cvsroot/mozilla/security/coreconf/Linux.mk,v
+retrieving revision 1.27
+diff -u -r1.27 Linux.mk
+--- mozilla/security/coreconf/Linux.mk	16 Sep 2005 17:09:23 -0000	1.27
++++ mozilla/security/coreconf/Linux.mk	15 Dec 2005 21:25:00 -0000
+@@ -165,7 +165,7 @@
+ ARCH			= linux
+ 
+ DSO_CFLAGS		= -fPIC
+-DSO_LDOPTS		= -shared $(ARCHFLAG) -z defs
++DSO_LDOPTS		= -shared $(ARCHFLAG) -Wl,-z,defs
+ DSO_LDFLAGS		=
+ LDFLAGS			+= $(ARCHFLAG)
+ 
diff --git a/dev-libs/nss/files/nss-config.in b/dev-libs/nss/files/nss-config.in
new file mode 100644
index 000000000000..664fafeed06e
--- /dev/null
+++ b/dev-libs/nss/files/nss-config.in
@@ -0,0 +1,137 @@
+#!/bin/sh
+
+prefix=@prefix@
+
+major_version=@MOD_MAJOR_VERSION@
+minor_version=@MOD_MINOR_VERSION@
+patch_version=@MOD_PATCH_VERSION@
+
+usage()
+{
+	cat <<EOF
+Usage: nss-config [OPTIONS] [LIBRARIES]
+Options:
+	[--prefix[=DIR]]
+	[--exec-prefix[=DIR]]
+	[--includedir[=DIR]]
+	[--libdir[=DIR]]
+	[--version]
+	[--libs]
+	[--cflags]
+Dynamic Libraries:
+	nss
+	ssl
+	smime
+EOF
+	exit $1
+}
+
+if test $# -eq 0; then
+	usage 1 1>&2
+fi
+
+lib_ssl=yes
+lib_smime=yes
+lib_nss=yes
+
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  case $1 in
+    --prefix=*)
+      prefix=$optarg
+      ;;
+    --prefix)
+      echo_prefix=yes
+      ;;
+    --exec-prefix=*)
+      exec_prefix=$optarg
+      ;;
+    --exec-prefix)
+      echo_exec_prefix=yes
+      ;;
+    --includedir=*)
+      includedir=$optarg
+      ;;
+    --includedir)
+      echo_includedir=yes
+      ;;
+    --libdir=*)
+      libdir=$optarg
+      ;;
+    --libdir)
+      echo_libdir=yes
+      ;;
+    --version)
+      echo ${major_version}.${minor_version}.${patch_version}
+      ;;
+    --cflags)
+      echo_cflags=yes
+      ;;
+    --libs)
+      echo_libs=yes
+      ;;
+    ssl)
+      lib_ssl=yes
+      ;;
+    smime)
+      lib_smime=yes
+      ;;
+    nss)
+      lib_nss=yes
+      ;;
+    *)
+      usage 1 1>&2
+      ;;
+  esac
+  shift
+done
+
+# Set variables that may be dependent upon other variables
+if test -z "$exec_prefix"; then
+    exec_prefix=@exec_prefix@
+fi
+if test -z "$includedir"; then
+    includedir=@includedir@
+fi
+if test -z "$libdir"; then
+    libdir=@libdir@
+fi
+
+if test "$echo_prefix" = "yes"; then
+    echo $prefix
+fi
+
+if test "$echo_exec_prefix" = "yes"; then
+    echo $exec_prefix
+fi
+
+if test "$echo_includedir" = "yes"; then
+    echo $includedir
+fi
+
+if test "$echo_libdir" = "yes"; then
+    echo $libdir
+fi
+
+if test "$echo_cflags" = "yes"; then
+    echo -I$includedir
+fi
+
+if test "$echo_libs" = "yes"; then
+      libdirs="-Wl,-R$libdir -L$libdir"
+      if test -n "$lib_ssl"; then
+	libdirs="$libdirs -lssl${major_version}"
+      fi
+      if test -n "$lib_smime"; then
+	libdirs="$libdirs -lsmime${major_version}"
+      fi
+      if test -n "$lib_nss"; then
+	libdirs="$libdirs -lnss${major_version}"
+      fi
+      echo $libdirs
+fi      
+
diff --git a/dev-libs/nss/files/nss.pc.in b/dev-libs/nss/files/nss.pc.in
index c8e9ada7c36b..1c5ac9626409 100644
--- a/dev-libs/nss/files/nss.pc.in
+++ b/dev-libs/nss/files/nss.pc.in
@@ -1,11 +1,11 @@
-prefix=/usr
-exec_prefix=/usr
-libdir=/usr/lib/nss
-includedir=/usr/include
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
 
 Name: NSS
-Description: Mozilla Network Security Services
-Version: @NSS_VER@
-Requires: nspr >= @NSPR_VER@
-Libs: -L${libdir} -lnss3 -lsmime3 -lssl3 -lsoftokn3 -Wl,-R${libdir}
-Cflags: -I${includedir}/nss
+Description: Network Security Services
+Version: @NSS_VERSION@
+Requires: nspr >= @NSPR_VERSION@
+Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -Wl,-R${libdir}
+Cflags: -I${includedir}