10 files changed, 28 insertions, 36 deletions

diff --git a/security/nss/Makefile b/security/nss/Makefile
index 73137e8d4c15..0645404ee829 100644
--- a/security/nss/Makefile
+++ b/security/nss/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nss
-PORTVERSION=	3.14.3
+PORTVERSION=	3.15.1
 #DISTVERSIONSUFFIX=	.with.ckbi.1.93
 CATEGORIES=	security
 MASTER_SITES=	MOZILLA/security/${PORTNAME}/releases/${DISTNAME:U:C/[-.]/_/g}_RTM/src
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 LIB_DEPENDS=	nspr4.1:${PORTSDIR}/devel/nspr \
 		sqlite3.8:${PORTSDIR}/databases/sqlite3
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/mozilla/security/nss
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/nss
 
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/nss
@@ -25,14 +25,12 @@ USE_PERL5_BUILD=yes
 MAKE_ENV=	LIBRARY_PATH="${LOCALBASE}/lib" \
 		SQLITE_INCLUDE_DIR="${LOCALBASE}/include" \
 		NSS_ENABLE_ECC=1 NSS_USE_SYSTEM_SQLITE=1
-ALL_TARGET=	nss_build_all
 CFLAGS+=	-I${LOCALBASE}/include/nspr
 
 SUB_FILES=	nss-config nss.pc
-SUB_LIST=	MAJOR_VERSION=${PORTVERSION:R:R} \
-		PORTVERSION=${PORTVERSION}
+SUB_LIST=	PORTVERSION=${PORTVERSION}
 
-DIST=		${WRKSRC:H:H}/dist
+DIST=		${WRKSRC:H}/dist
 
 EXTERNALS=	CVS dbm security/nss/lib/zlib nsprpub security/dbm
 EXTRACT_AFTER_ARGS=| ${TAR} -xf -	\
diff --git a/security/nss/distinfo b/security/nss/distinfo
index 6cfaa9cbd8bc..5924f8ceeb34 100644
--- a/security/nss/distinfo
+++ b/security/nss/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nss-3.14.3.tar.gz) = d9d366be94d33395597ebf82363fcdedfa693a6d627cf7f6bec025f609d54cc0
-SIZE (nss-3.14.3.tar.gz) = 6189790
+SHA256 (nss-3.15.1.tar.gz) = f994106a33d1f3210f4151bbb3419a1c28fd1cb545caa7dc9afdebd6da626284
+SIZE (nss-3.15.1.tar.gz) = 6286561
diff --git a/security/nss/files/nss-config.in b/security/nss/files/nss-config.in
index eba0fa7f528c..955738ede6fb 100644
--- a/security/nss/files/nss-config.in
+++ b/security/nss/files/nss-config.in
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 prefix=%%PREFIX%%
+version=%%PORTVERSION%%
 
 usage()
 {
@@ -64,7 +65,11 @@ while test $# -gt 0; do
       echo_libdir=yes
       ;;
     --version)
-      echo %%PORTVERSION%%
+      case $version in
+      *.*.*) echo $version ;;
+      *.*) echo $version.0 ;;
+      *) echo $version.0.0 ;;
+      esac
       ;;
     --cflags)
       echo_cflags=yes
@@ -125,16 +130,16 @@ fi
 if test "$echo_libs" = "yes"; then
       libdirs="-L$libdir"
       if test -n "$lib_ssl"; then
-	libdirs="$libdirs -lssl%%MAJOR_VERSION%%"
+	libdirs="$libdirs -lssl3"
       fi
       if test -n "$lib_smime"; then
-	libdirs="$libdirs -lsmime%%MAJOR_VERSION%%"
+	libdirs="$libdirs -lsmime3"
       fi
       if test -n "$lib_nss"; then
-	libdirs="$libdirs -lnss%%MAJOR_VERSION%%"
+	libdirs="$libdirs -lnss3"
       fi
       if test -n "$lib_nssutil"; then
-	libdirs="$libdirs -lnssutil%%MAJOR_VERSION%%"
+	libdirs="$libdirs -lnssutil3"
       fi
       echo $libdirs
 fi      
diff --git a/security/nss/files/patch-Makefile b/security/nss/files/patch-Makefile
deleted file mode 100644
index af20e9a2a5cd..000000000000
--- a/security/nss/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	Thu Apr 14 20:28:40 2005
-+++ Makefile	Tue Aug 30 15:32:11 2005
-@@ -78,7 +78,7 @@
- # (7) Execute "local" rules. (OPTIONAL).                              #
- #######################################################################
- 
--nss_build_all: build_coreconf build_nspr build_dbm all
-+nss_build_all: build_coreconf all
- 
- build_coreconf:
- 	cd $(CORE_DEPTH)/coreconf ;  $(MAKE)
diff --git a/security/nss/files/patch-..::coreconf::FreeBSD.mk b/security/nss/files/patch-coreconf_FreeBSD.mk
index 6bdfef625b29..46e7c13e19f8 100644
--- a/security/nss/files/patch-..::coreconf::FreeBSD.mk
+++ b/security/nss/files/patch-coreconf_FreeBSD.mk
@@ -1,5 +1,5 @@
---- ../../security/coreconf/FreeBSD.mk.orig	2009-08-22 07:33:09.000000000 +0200
-+++ ../../security/coreconf/FreeBSD.mk	2010-03-28 23:01:33.000000000 +0200
+--- coreconf/FreeBSD.mk.orig	2009-08-22 07:33:09.000000000 +0200
++++ coreconf/FreeBSD.mk	2010-03-28 23:01:33.000000000 +0200
 @@ -37,9 +37,9 @@
  
  include $(CORE_DEPTH)/coreconf/UNIX.mk
diff --git a/security/nss/files/patch-..::coreconf::UNIX.mk b/security/nss/files/patch-coreconf_UNIX.mk
index def25e7ab936..6a020fa14d88 100644
--- a/security/nss/files/patch-..::coreconf::UNIX.mk
+++ b/security/nss/files/patch-coreconf_UNIX.mk
@@ -1,5 +1,5 @@
---- ../coreconf/UNIX.mk~
-+++ ../coreconf/UNIX.mk
+--- coreconf/UNIX.mk~
++++ coreconf/UNIX.mk
 @@ -42,10 +42,8 @@ AR          = ar cr $@
  LDOPTS     += -L$(SOURCE_LIB_DIR)
  
diff --git a/security/nss/files/patch-.._coreconf_arch.mk b/security/nss/files/patch-coreconf_arch.mk
index e39682dce3e2..5a95a494f72f 100644
--- a/security/nss/files/patch-.._coreconf_arch.mk
+++ b/security/nss/files/patch-coreconf_arch.mk
@@ -1,5 +1,5 @@
---- ../coreconf/arch.mk.orig	2011-03-03 18:13:52.000000000 +0100
-+++ ../coreconf/arch.mk	2011-03-03 18:14:09.000000000 +0100
+--- coreconf/arch.mk.orig	2011-03-03 18:13:52.000000000 +0100
++++ coreconf/arch.mk	2011-03-03 18:14:09.000000000 +0100
 @@ -66,7 +66,7 @@
  # Attempt to differentiate between sparc and x86 Solaris
  #
diff --git a/security/nss/files/patch-..::coreconf::command.mk b/security/nss/files/patch-coreconf_command.mk
index 1e3de66f7ae2..4be941cef587 100644
--- a/security/nss/files/patch-..::coreconf::command.mk
+++ b/security/nss/files/patch-coreconf_command.mk
@@ -1,5 +1,5 @@
---- ../coreconf/command.mk	Mon Oct 10 19:46:12 2005
-+++ ../coreconf/command.mk	Wed Jan 18 17:23:28 2006
+--- coreconf/command.mk	Mon Oct 10 19:46:12 2005
++++ coreconf/command.mk	Wed Jan 18 17:23:28 2006
 @@ -46,5 +46,5 @@
  LINK_DLL      = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
  LINK_EXE      = $(LINK) $(OS_LFLAGS) $(LFLAGS)
diff --git a/security/nss/files/patch-..::coreconf::rules.mk b/security/nss/files/patch-coreconf_rules.mk
index 7b2adc31a707..22fb9a317288 100644
--- a/security/nss/files/patch-..::coreconf::rules.mk
+++ b/security/nss/files/patch-coreconf_rules.mk
@@ -1,5 +1,5 @@
---- ../coreconf/rules.mk.orig	Sat Jan  6 00:48:54 2007
-+++ ../coreconf/rules.mk	Fri Mar 23 10:15:46 2007
+--- coreconf/rules.mk.orig	Sat Jan  6 00:48:54 2007
++++ coreconf/rules.mk	Fri Mar 23 10:15:46 2007
 @@ -114,6 +114,9 @@
  endif
  ifdef SHARED_LIBRARY
diff --git a/security/nss/files/patch-..::coreconf::ruleset.mk b/security/nss/files/patch-coreconf_ruleset.mk
index fd21eb0ca2fc..44c8b8f03ffc 100644
--- a/security/nss/files/patch-..::coreconf::ruleset.mk
+++ b/security/nss/files/patch-coreconf_ruleset.mk
@@ -1,5 +1,5 @@
---- ../coreconf/ruleset.mk~
-+++ ../coreconf/ruleset.mk
+--- coreconf/ruleset.mk~
++++ coreconf/ruleset.mk
 @@ -85,7 +85,7 @@
  #