svn commit: r435374 - in head/www/firefox: . files

[Jan Beich]

Author: jbeich
Date: Fri Mar  3 23:44:37 2017
New Revision: 435374
URL: https://svnweb.freebsd.org/changeset/ports/435374

Log:
  www/firefox: attempt to unbreak wifi geo and safebrowsing since 51.0
  
  MFH:		2017Q1 (requires r434999 to avoid patch conflict)

Added:
  head/www/firefox/files/patch-env-api-keys   (contents, props changed)
Modified:
  head/www/firefox/Makefile   (contents, props changed)

Modified: head/www/firefox/Makefile
==============================================================================
--- head/www/firefox/Makefile	Fri Mar  3 23:44:26 2017	(r435373)
+++ head/www/firefox/Makefile	Fri Mar  3 23:44:37 2017	(r435374)
@@ -4,7 +4,7 @@
 PORTNAME=	firefox
 DISTVERSION=	52.0
 DISTVERSIONSUFFIX=.source
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \

Added: head/www/firefox/files/patch-env-api-keys
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/firefox/files/patch-env-api-keys	Fri Mar  3 23:44:37 2017	(r435374)
@@ -0,0 +1,21 @@
+# Accept API keys from environment like before bug 1294585
+
+--- build/moz.configure/keyfiles.configure
++++ build/moz.configure/keyfiles.configure
+@@ -18,6 +18,7 @@ def keyfile(desc, help=None, callback=lambda x: x):
+     @checking('for the %s key' % desc, lambda x: x and x is not no_key)
+     @imports(_from='__builtin__', _import='open')
+     @imports(_from='__builtin__', _import='IOError')
++    @imports(_from='os', _import='environ')
+     def keyfile(value):
+         if value:
+             try:
+@@ -28,7 +29,7 @@ def keyfile(desc, help=None, callback=lambda x: x):
+                     raise FatalCheckError("'%s' is empty." % value[0])
+             except IOError as e:
+                 raise FatalCheckError("'%s': %s." % (value[0], e.strerror))
+-        return no_key
++        return environ.get('MOZ_%s_KEY' % desc.upper().replace(' ', '_')) or no_key
+ 
+     return keyfile
+