Bump PKGREVISION

* Use graphics/libwebp
* Bump devel/cbindgen requirement (PR pkg/53925)
* Enable system's addons, for example langpacks from www/firefox-l10n
* Fix potential configure error from clock_gettime(CLOCK_MONOTONIC, ...)

4 files changed, 16 insertions, 8 deletions

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 4e232b50733..c6d2cc95e52 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.357 2019/01/29 22:33:58 tnn Exp $
+# $NetBSD: Makefile,v 1.358 2019/02/01 16:47:59 ryoon Exp $
 
 FIREFOX_VER=		${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=		65.0
@@ -6,6 +6,7 @@ MOZ_BRANCH_MINOR=
 
 DISTNAME=	firefox-${FIREFOX_VER}.source
 PKGNAME=	${DISTNAME:S/.source//:S/b/beta/:S/esr//}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES+=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index ab0a8ac9e48..ba33fe12529 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.336 2019/01/29 16:28:22 ryoon Exp $
+$NetBSD: distinfo,v 1.337 2019/02/01 16:47:59 ryoon Exp $
 
 SHA1 (firefox-65.0.source.tar.xz) = fb79c84b58da18ca9248058c68b95bbcea829512
 RMD160 (firefox-65.0.source.tar.xz) = 22124edda9588fb0a64b2f7494dd3a0ee99df6d4
 SHA512 (firefox-65.0.source.tar.xz) = 10ab04612c55f020fd4fe9ba7184f77e27bb62e7204ebd4e2e8e4af9fbb97b5594dd057b3c9c1fd960a48cedfd09c11939210dba873cc66ee651dc83dc9cbed2
 Size (firefox-65.0.source.tar.xz) = 278317028 bytes
 SHA1 (patch-aa) = 649bafc86814ed9819a51f8347c5058123bd2d51
-SHA1 (patch-browser_app_profile_firefox.js) = 527e2b0043ad12e8eb9feab4933733963f35b644
+SHA1 (patch-browser_app_profile_firefox.js) = 2ea08bf7030853fe9aff3c43c69266c07f0b0b14
 SHA1 (patch-build_moz.configure_old.configure) = 91bab1cbbe02332ec076b49b6e598730202fbc99
 SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
 SHA1 (patch-dom_media_CubebUtils.cpp) = cafbfb2781967ebe96b4f77b8a0630fff537fd02
diff --git a/www/firefox/mozilla-common.mk b/www/firefox/mozilla-common.mk
index 05fa9a8a08d..e114793507b 100644
--- a/www/firefox/mozilla-common.mk
+++ b/www/firefox/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.123 2019/01/29 16:28:22 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.124 2019/02/01 16:47:59 ryoon Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -25,7 +25,7 @@ USE_TOOLS+=		pkg-config perl gmake autoconf213 unzip zip
 USE_LANGUAGES+=		c99 gnu++14
 UNLIMIT_RESOURCES+=	datasize
 
-TOOL_DEPENDS+=		cbindgen-[0-9]*:../../devel/cbindgen
+TOOL_DEPENDS+=		cbindgen>=0.6.8:../../devel/cbindgen
 .if ${MACHINE_ARCH} == "sparc64"
 CONFIGURE_ARGS+=	--disable-nodejs
 .else
@@ -97,6 +97,7 @@ CONFIGURE_ARGS+=	--disable-crashreporter
 CONFIGURE_ARGS+=	--disable-necko-wifi
 CONFIGURE_ARGS+=	--enable-chrome-format=flat
 CONFIGURE_ARGS+=	--disable-libjpeg-turbo
+CONFIGURE_ARGS+=	--with-system-webp
 
 CONFIGURE_ARGS+=	--disable-gconf
 #CONFIGURE_ARGS+=	--enable-readline
@@ -189,6 +190,8 @@ create-rm-wrapper:
 # The configure test for __thread succeeds, but later we end up with:
 # dist/bin/libxul.so: undefined reference to `__tls_get_addr'
 CONFIGURE_ENV.NetBSD+=	ac_cv_thread_keyword=no
+# In unspecified case, clock_gettime(CLOCK_MONOTONIC, ...) fails.
+CONFIGURE_ENV.NetBSD+=	ac_cv_clock_monotonic=
 
 .if ${OPSYS} == "SunOS"
 # native libbz2.so hides BZ2_crc32Table
@@ -217,6 +220,7 @@ BUILDLINK_API_DEPENDS.nss+=	nss>=3.40.1
 .include "../../graphics/MesaLib/buildlink3.mk"
 #BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.10.2nb4
 #.include "../../graphics/cairo/buildlink3.mk"
+.include "../../graphics/libwebp/buildlink3.mk"
 BUILDLINK_DEPMETHOD.clang=	build
 BUILDLINK_API_DEPENDS.clang+=	clang>=6.0.1nb1
 .include "../../lang/clang/buildlink3.mk"
diff --git a/www/firefox/patches/patch-browser_app_profile_firefox.js b/www/firefox/patches/patch-browser_app_profile_firefox.js
index de4fed27056..a160ef38e83 100644
--- a/www/firefox/patches/patch-browser_app_profile_firefox.js
+++ b/www/firefox/patches/patch-browser_app_profile_firefox.js
@@ -1,14 +1,17 @@
-$NetBSD: patch-browser_app_profile_firefox.js,v 1.11 2019/01/29 16:28:22 ryoon Exp $
+$NetBSD: patch-browser_app_profile_firefox.js,v 1.12 2019/02/01 16:47:59 ryoon Exp $
 
---- browser/app/profile/firefox.js.orig	2019-01-18 00:20:22.000000000 +0000
+--- browser/app/profile/firefox.js.orig	2019-01-24 18:48:38.000000000 +0000
 +++ browser/app/profile/firefox.js
-@@ -1770,6 +1770,12 @@ pref("toolkit.coverage.endpoint.base", "
+@@ -1770,6 +1770,15 @@ pref("toolkit.coverage.endpoint.base", "
  pref("prio.enabled", true);
  #endif
  
 +// Select UI locale from LANG/LC_MESSAGE environmental variables
 +pref("intl.locale.requested", "");
 +
++// Enable system addons, for example langpacks from www/firefox-l10n
++pref("extensions.autoDisableScopes", 11);
++
 +// Disable multiprocess window support. Workaround for PR 53273.
 +pref("browser.tabs.remote.autostart", false);
 +