From 6ebf66408b2c7dcd9870ec0195d2e1e0fd81973d Mon Sep 17 00:00:00 2001
From: Florian Smeets <flo@FreeBSD.org>
Date: Tue, 31 Jan 2012 21:51:27 +0000
Subject: [PATCH] add upstream patch, to fix "__GNUC_MINOR is not defined"
 build error that causes some ports depending on nss to fail. e.g.
 net-im/pidgin-sipe. The patch is taken from
 https://bugzilla.mozilla.org/show_bug.cgi?id=702090

This patch will be part of the next nss release and can be removed with the next
update.

PR:		ports/164655
PR:		ports/164391
Submitted by:	rm
---
 security/nss/Makefile                    |  1 +
 security/nss/files/patch-bugzilla-702090 | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 security/nss/files/patch-bugzilla-702090

diff --git a/security/nss/Makefile b/security/nss/Makefile
index c0fae2db94b4..5b51b96a69e7 100644
--- a/security/nss/Makefile
+++ b/security/nss/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nss
 PORTVERSION=	${_MAJOR}.${_MINOR}.${_PATCH}
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	security/nss/releases/NSS_${PORTVERSION:S/./_/g}_WITH_CKBI_${CKBI_VER:S/./_/}_RTM/src
diff --git a/security/nss/files/patch-bugzilla-702090 b/security/nss/files/patch-bugzilla-702090
new file mode 100644
index 000000000000..1b7a43db292a
--- /dev/null
+++ b/security/nss/files/patch-bugzilla-702090
@@ -0,0 +1,23 @@
+Taken from here:
+https://bug702090.bugzilla.mozilla.org/attachment.cgi?id=575453
+
+--- ../../security/nss/lib/util/pkcs11n.h.orig	2011-09-14 10:21:10.000000000 +0900
++++ ../../security/nss/lib/util/pkcs11n.h	2011-11-19 00:45:01.131860104 +0900
+@@ -346,7 +346,7 @@
+  * labels have never been accurate to what was really implemented.
+  * The new labels correctly reflect what the values effectively mean.
+  */
+-#if __GNUC__ > 3
++#if defined(__GNUC__) && (__GNUC__ > 3)
+ /* make GCC warn when we use these #defines */
+ /*
+  *  This is really painful because GCC doesn't allow us to mark random
+@@ -362,7 +362,7 @@
+  *  cast the resulting value to the deprecated type in the #define, thus
+  *  producting the warning when the #define is used.
+  */
+-#if (__GNUC__  == 4) && (__GNUC_MINOR < 5)
++#if (__GNUC__  == 4) && (__GNUC_MINOR__ < 5)
+ /* The mac doesn't like the friendlier deprecate messages. I'm assuming this
+  * is a gcc version issue rather than mac or ppc specific */
+ typedef CK_TRUST __CKT_NSS_UNTRUSTED __attribute__((deprecated));
\ No newline at end of file