head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.72
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.70
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.68
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.66
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.64
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.62
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.60
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.58
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.56
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.54
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.52
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.50
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.48
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.46
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.44
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.42
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.40
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.38
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.36
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.34
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.32
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.30
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.28
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.24
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.4
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.26
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.22
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.20
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.18
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.16
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.14
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.12
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.10
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.8
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.6
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.2
	pkgsrc-2017Q2-base:1.1;
locks; strict;
comment	@# @;


1.1
date	2017.04.27.01.55.57;	author ryoon;	state Exp;
branches;
next	;
commitid	6CghKLrfFNzt67Pz;


desc
@@


1.1
log
@Import firefox52-52.1.0 as www/firefox52.

Mozilla Firefox is a free, open-source and cross-platform web browser
for Windows, Linux, MacOS X and many other operating systems.

It is fast and easy to use, and offers many advantages over other web
browsers, such as tabbed browsing and the ability to block pop-up
windows.

Firefox also offers excellent bookmark and history management, and it
can be extended by developers using industry standards such as XML,
CSS, JavaScript, C++, etc. Many extensions are available.
@
text
@$NetBSD: patch-build_moz.configure_init.configure,v 1.1 2016/12/03 09:58:26 ryoon Exp $

--- build/moz.configure/init.configure.orig	2016-10-31 20:15:27.000000000 +0000
+++ build/moz.configure/init.configure
@@@@ -170,6 +170,7 @@@@ option(env='PYTHON', nargs=1, help='Pyth
 @@imports(_from='mozbuild.configure.util', _import='LineIO')
 @@imports(_from='mozbuild.virtualenv', _import='VirtualenvManager')
 @@imports(_from='mozbuild.virtualenv', _import='verify_python_version')
+@@imports(_from='__builtin__', _import='KeyError')
 @@imports('distutils.sysconfig')
 def virtualenv_python(env_python, build_env, mozconfig, help):
     if help:
@@@@ -189,6 +190,12 @@@@ def virtualenv_python(env_python, build_
             python = mozconfig['vars']['added']['PYTHON']
         elif 'PYTHON' in mozconfig['vars']['modified']:
             python = mozconfig['vars']['modified']['PYTHON'][1]
+        for i in ('env', 'vars'):
+            for j in ('added', 'modified'):
+                try:
+                    del mozconfig[i][j]['PYTHON']
+                except KeyError:
+                    pass
 
     with LineIO(lambda l: log.error(l)) as out:
         verify_python_version(out)
@@@@ -224,7 +231,10 @@@@ def virtualenv_python(env_python, build_
     if python != normsep(sys.executable):
         log.info('Reexecuting in the virtualenv')
         if env_python:
-            del os.environ['PYTHON']
+            try:
+                del os.environ['PYTHON']
+            except KeyError:
+                pass
         # One would prefer to use os.execl, but that's completely borked on
         # Windows.
         sys.exit(subprocess.call([python] + sys.argv))
@