Depend on an nss providing nss-config, and remove workaround patch.

Bump PKGREVISION.

4 files changed, 5 insertions, 51 deletions

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 2d7b14b89fa..474ad78b213 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.253 2016/05/05 11:46:15 ryoon Exp $
+# $NetBSD: Makefile,v 1.254 2016/05/20 12:25:20 wiz Exp $
 
 FIREFOX_VER=	${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=	46.0
@@ -6,6 +6,7 @@ MOZ_BRANCH_MINOR=	.1
 
 DISTNAME=	firefox-${FIREFOX_VER}.source
 PKGNAME=	firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES+=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 MASTER_SITES+=	${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 16863284ac8..6b7ce3b0d02 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.246 2016/05/15 07:25:50 ryoon Exp $
+$NetBSD: distinfo,v 1.247 2016/05/20 12:25:20 wiz Exp $
 
 SHA1 (firefox-46.0.1.source.tar.xz) = 6705d7d1561dfa156ddd3277dc4a901c4c982d82
 RMD160 (firefox-46.0.1.source.tar.xz) = 4550b03bad6e101bb129645222a8dd3adc8a9646
@@ -10,7 +10,6 @@ SHA1 (patch-as) = d5d7f8250a9cd462f25d529c2a79c59a1bba9db2
 SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756
 SHA1 (patch-browser_installer_package-manifest.in) = 7c4f1822cd78a5ed465b954f4b62514c64ad7b84
 SHA1 (patch-build_autoconf_compiler-opts.m4) = ccdc06a2b07b7664f9cb91bcc4fb29052dda8b07
-SHA1 (patch-build_autoconf_nss.m4) = 970fcd9aeede2347651c516d5211c4555dd28a4d
 SHA1 (patch-build_gyp.mozbuild) = 201715e30e20090e9a9ef54cb981d283c9aabf8f
 SHA1 (patch-build_pgo_profileserver.py) = 8666187258e47c037f2065a19a5b38946fdc0f6c
 SHA1 (patch-config_Makefile.in) = 0a072de112e0e5cc4b929a7094498fcf003e27b3
diff --git a/www/firefox/mozilla-common.mk b/www/firefox/mozilla-common.mk
index 5405e033931..73acc3c1e52 100644
--- a/www/firefox/mozilla-common.mk
+++ b/www/firefox/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.74 2016/04/29 23:42:49 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.75 2016/05/20 12:25:20 wiz Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -220,7 +220,7 @@ BUILDLINK_API_DEPENDS.libevent+=	libevent>=1.1
 BUILDLINK_API_DEPENDS.nspr+=	nspr>=4.10.10
 .include "../../devel/nspr/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
-BUILDLINK_API_DEPENDS.nss+=	nss>=3.21
+BUILDLINK_API_DEPENDS.nss+=	nss>=3.23nb1
 .include "../../devel/nss/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
diff --git a/www/firefox/patches/patch-build_autoconf_nss.m4 b/www/firefox/patches/patch-build_autoconf_nss.m4
deleted file mode 100644
index f09b68dfa94..00000000000
--- a/www/firefox/patches/patch-build_autoconf_nss.m4
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-build_autoconf_nss.m4,v 1.5 2015/05/12 22:48:54 ryoon Exp $
-
---- build/autoconf/nss.m4.orig	2015-04-29 21:11:43.000000000 +0000
-+++ build/autoconf/nss.m4
-@@ -22,18 +22,18 @@ AC_ARG_WITH(nss-exec-prefix,
- 	if test -n "$nss_config_exec_prefix"; then
- 		nss_config_args="$nss_config_args --exec-prefix=$nss_config_exec_prefix"
- 		if test -z "$NSS_CONFIG"; then
--			NSS_CONFIG=$nss_config_exec_prefix/bin/nss-config
-+			NSS_CONFIG=$nss_config_exec_prefix/bin/pkg-config
- 		fi
- 	fi
- 	if test -n "$nss_config_prefix"; then
- 		nss_config_args="$nss_config_args --prefix=$nss_config_prefix"
- 		if test -z "$NSS_CONFIG"; then
--			NSS_CONFIG=$nss_config_prefix/bin/nss-config
-+			NSS_CONFIG=$nss_config_prefix/bin/pkg-config
- 		fi
- 	fi
- 
- 	unset ac_cv_path_NSS_CONFIG
--	AC_PATH_PROG(NSS_CONFIG, nss-config, no)
-+	AC_PATH_PROG(NSS_CONFIG, pkg-config, no)
- 	min_nss_version=ifelse([$1], ,3.0.0,$1)
- 	AC_MSG_CHECKING(for NSS - version >= $min_nss_version)
- 
-@@ -41,14 +41,14 @@ AC_ARG_WITH(nss-exec-prefix,
- 	if test "$NSS_CONFIG" = "no"; then
- 		no_nss="yes"
- 	else
--		NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags`
--		NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs`
-+		NSS_CFLAGS=`$NSS_CONFIG $nss_config_args nss --cflags`
-+		NSS_LIBS=`$NSS_CONFIG $nss_config_args nss --libs`
- 
--		nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \
-+		nss_config_major_version=`$NSS_CONFIG $nss_config_args nss --modversion | \
- 			sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\1/'`
--		nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \
-+		nss_config_minor_version=`$NSS_CONFIG $nss_config_args nss --modversion | \
- 			sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\2/'`
--		nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \
-+		nss_config_micro_version=`$NSS_CONFIG $nss_config_args nss --modversion | \
- 			sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\{0,1\}/\4/'`
- 		if test -z "$nss_config_micro_version"; then
- 			nss_config_micro_version="0"