Index: branches/2020Q4/www/firefox/Makefile =================================================================== --- branches/2020Q4/www/firefox/Makefile (revision 552536) +++ branches/2020Q4/www/firefox/Makefile (revision 552537) @@ -1,60 +1,60 @@ # Created by: Alan Eldridge # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 81.0.2 +DISTVERSION= 82.0 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.26:devel/nspr \ nss>=3.56:security/nss \ icu>=67.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=2.6.8:print/harfbuzz \ graphite2>=1.3.14:graphics/graphite2 \ png>=1.6.35:graphics/png \ libvpx>=1.8.2:multimedia/libvpx \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ nasm:devel/nasm \ yasm:devel/yasm \ zip:archivers/zip USE_GECKO= gecko CONFLICTS_INSTALL= firefox-esr USE_MOZILLA= -sqlite USES= tar:xz FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png FIREFOX_DESKTOP= ${MOZSRC}/taskcluster/docker/${MOZILLA}-snap/${MOZILLA}.desktop MOZ_OPTIONS= --enable-application=browser \ --enable-official-branding .include "${.CURDIR}/../../www/firefox/Makefile.options" post-patch: @${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \ -e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \ ${FIREFOX_DESKTOP} @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/browser/app/nsBrowserApp.cpp pre-configure: (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) post-install: ${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/ ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON} .include Index: branches/2020Q4/www/firefox/distinfo =================================================================== --- branches/2020Q4/www/firefox/distinfo (revision 552536) +++ branches/2020Q4/www/firefox/distinfo (revision 552537) @@ -1,3 +1,3 @@ -TIMESTAMP = 1602537269 -SHA256 (firefox-81.0.2.source.tar.xz) = 91b6482de9b193b19d1fd9a8b99015a001646a48429297bbb7fe41784f9f9b44 -SIZE (firefox-81.0.2.source.tar.xz) = 337759612 +TIMESTAMP = 1602696047 +SHA256 (firefox-82.0.source.tar.xz) = 90c58707f5bd34978e2d1bcadbe463556edc0878430f969893ae2f89c5d464c2 +SIZE (firefox-82.0.source.tar.xz) = 334793772 Index: branches/2020Q4/www/firefox/files/patch-bug1288587 =================================================================== --- branches/2020Q4/www/firefox/files/patch-bug1288587 (revision 552536) +++ branches/2020Q4/www/firefox/files/patch-bug1288587 (revision 552537) @@ -1,37 +1,37 @@ diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure index 855214a..1e91d51 100644 --- build/moz.configure/init.configure +++ build/moz.configure/init.configure -@@ -251,6 +251,7 @@ option(env='PYTHON3', nargs=1, help='Python 3 interpre +@@ -240,6 +240,7 @@ option(env='VIRTUALENV_NAME', nargs=1, default='init_p @imports(_from='mozbuild.pythonutil', _import='find_python3_executable') @imports(_from='mozbuild.pythonutil', _import='python_executable_version') @imports(_from='six', _import='ensure_text') +@imports(_from='__builtin__', _import='KeyError') - def virtualenv_python3(env_python, build_env, mozconfig, help): + def virtualenv_python3(env_python, virtualenv_name, build_env, mozconfig, help): # Avoid re-executing python when running configure --help. if help: -@@ -283,6 +284,12 @@ def virtualenv_python3(env_python, build_env, mozconfi +@@ -273,6 +274,12 @@ def virtualenv_python3(env_python, virtualenv_name, bu python = mozconfig['vars']['added']['PYTHON3'] elif 'PYTHON3' in mozconfig['vars']['modified']: python = mozconfig['vars']['modified']['PYTHON3'][1] + for i in ('env', 'vars'): + for j in ('added', 'modified'): + try: + del mozconfig[i][j]['PYTHON3'] + except KeyError: + pass log.debug("python3: executable from configuration: %r" % python) -@@ -365,7 +372,10 @@ def virtualenv_python3(env_python, build_env, mozconfi +@@ -358,7 +365,10 @@ def virtualenv_python3(env_python, virtualenv_name, bu sys.executable, manager.python_path)) log.info('Re-executing in the virtualenv') if env_python: - del os.environ['PYTHON3'] + try: + del os.environ['PYTHON3'] + except KeyError: + pass # Homebrew on macOS will change Python's sys.executable to a custom # value which messes with mach's virtualenv handling code. Override # Homebrew's changes with the correct sys.executable value. Index: branches/2020Q4/www/firefox/files/patch-bug1670807 =================================================================== --- branches/2020Q4/www/firefox/files/patch-bug1670807 (nonexistent) +++ branches/2020Q4/www/firefox/files/patch-bug1670807 (revision 552537) @@ -0,0 +1,15 @@ +Look for gm4 in addition to m4 + +diff --git build/moz.configure/old.configure build/moz.configure/old.configure +index 8c807c0794fab..5132228960f3d 100644 +--- build/moz.configure/old.configure ++++ build/moz.configure/old.configure +@@ -5,7 +5,7 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + +-m4 = check_prog('M4', ('m4',)) ++m4 = check_prog('M4', ('gm4', 'm4',)) + + + @depends(mozconfig) Property changes on: branches/2020Q4/www/firefox/files/patch-bug1670807 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q4 =================================================================== --- branches/2020Q4 (revision 552536) +++ branches/2020Q4 (revision 552537) Property changes on: branches/2020Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r552366