From a6ddf0896caaa04f7ce70125d01e117e6fa08c04 Mon Sep 17 00:00:00 2001
From: Michael Johnson <ahze@FreeBSD.org>
Date: Fri, 23 Mar 2007 14:33:23 +0000
Subject: [PATCH] Update to 3.11.5

---
 security/nss/Makefile                           |  3 +--
 security/nss/distinfo                           |  6 +++---
 security/nss/files/patch-..::coreconf::rules.mk | 12 ++++++------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/security/nss/Makefile b/security/nss/Makefile
index 0daf6859b2ec..81493c511ec7 100644
--- a/security/nss/Makefile
+++ b/security/nss/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	nss
 PORTVERSION=	${_MAJOR}.${_MINOR}.${_PATCH}
-PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	security/nss/releases/NSS_${PORTVERSION:S/./_/g}_RTM/src
@@ -20,7 +19,7 @@ LIB_DEPENDS=	nspr4.1:${PORTSDIR}/devel/nspr
 
 _MAJOR=	3
 _MINOR=	11
-_PATCH=	4
+_PATCH=	5
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/mozilla/security/nss
 
diff --git a/security/nss/distinfo b/security/nss/distinfo
index 11baff729f30..b10271adaf4e 100644
--- a/security/nss/distinfo
+++ b/security/nss/distinfo
@@ -1,3 +1,3 @@
-MD5 (nss-3.11.4.tar.gz) = 74af8ebdf94307f47ff8931adbef9c39
-SHA256 (nss-3.11.4.tar.gz) = c50062df123d733f25d4903f42e8855adf51b7324c786c714f7dd1ab9e328f06
-SIZE (nss-3.11.4.tar.gz) = 3713920
+MD5 (nss-3.11.5.tar.gz) = 1add44e6a41dbf5091cfd000f19ad6b9
+SHA256 (nss-3.11.5.tar.gz) = ea3876f5aea92231228130b451479a7fda94436d7c328f0fe1c07ea6f8fc9a40
+SIZE (nss-3.11.5.tar.gz) = 3696893
diff --git a/security/nss/files/patch-..::coreconf::rules.mk b/security/nss/files/patch-..::coreconf::rules.mk
index 59178ff6da50..707f69da83ea 100644
--- a/security/nss/files/patch-..::coreconf::rules.mk
+++ b/security/nss/files/patch-..::coreconf::rules.mk
@@ -1,10 +1,10 @@
---- ../coreconf/rules.mk.orig	Thu Apr  3 16:48:00 2003
-+++ ../coreconf/rules.mk	Fri Apr 11 01:01:50 2003
-@@ -110,6 +110,7 @@
+--- ../coreconf/rules.mk.orig	Sat Jan  6 00:48:54 2007
++++ ../coreconf/rules.mk	Fri Mar 23 10:15:46 2007
+@@ -114,6 +114,7 @@
  endif
  ifdef SHARED_LIBRARY
  	$(INSTALL) -m 775 $(SHARED_LIBRARY) $(SOURCE_LIB_DIR)
 +	ln -sf $(notdir $(SHARED_LIBRARY)) $(SOURCE_LIB_DIR)/$(notdir $(SHARED_LIBRARY:.so.1=.so))
- endif
- ifdef IMPORT_LIBRARY
- 	$(INSTALL) -m 775 $(IMPORT_LIBRARY) $(SOURCE_LIB_DIR)
+ ifdef MOZ_DEBUG_SYMBOLS
+ ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
+ 	$(INSTALL) -m 644 $(SHARED_LIBRARY:$(DLL_SUFFIX)=pdb) $(SOURCE_LIB_DIR)