Index: Mk/Uses/gecko.mk =================================================================== --- Mk/Uses/gecko.mk +++ Mk/Uses/gecko.mk @@ -22,12 +22,12 @@ .if ${gecko_ARGS:Mfirefox} _GECKO_DEFAULT_VERSION= 60 -_GECKO_VERSIONS= 60 64 +_GECKO_VERSIONS= 60 65 _GECKO_TYPE= firefox # Dependence lines for different Firefox versions 60_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox-esr -64_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox +65_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox .if exists(${LOCALBASE}/bin/firefox) _GECKO_INSTALLED_VER!= ${PKG_QUERY} %v firefox firefox-esr Index: Mk/bsd.gecko.mk =================================================================== --- Mk/bsd.gecko.mk +++ Mk/bsd.gecko.mk @@ -152,7 +152,7 @@ .endif # Standard depends -_ALL_DEPENDS= event ffi graphite harfbuzz hunspell icu jpeg nspr nss png pixman sqlite vpx +_ALL_DEPENDS= event ffi graphite harfbuzz hunspell icu jpeg nspr nss png pixman sqlite vpx webp event_LIB_DEPENDS= libevent.so:devel/libevent event_MOZ_OPTIONS= --with-system-libevent @@ -197,6 +197,9 @@ vpx_LIB_DEPENDS= libvpx.so:multimedia/libvpx vpx_MOZ_OPTIONS= --with-system-libvpx +webp_LIB_DEPENDS= libwebp.so:graphics/webp +webp_MOZ_OPTIONS= --with-system-webp + .for use in ${USE_MOZILLA} ${use:S/-/_WITHOUT_/}= ${TRUE} .endfor Index: mail/thunderbird/Makefile =================================================================== --- mail/thunderbird/Makefile +++ mail/thunderbird/Makefile @@ -30,7 +30,7 @@ SSP_UNSAFE= yes USE_GECKO= gecko -USE_MOZILLA= # empty +USE_MOZILLA= -webp USES= tar:xz Index: www/firefox-esr/Makefile =================================================================== --- www/firefox-esr/Makefile +++ www/firefox-esr/Makefile @@ -34,7 +34,7 @@ CPE_PRODUCT= ${PORTNAME}_esr CONFLICTS_INSTALL= firefox MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= # empty +USE_MOZILLA= -webp USES= tar:xz Index: www/firefox-i18n/Makefile =================================================================== --- www/firefox-i18n/Makefile +++ www/firefox-i18n/Makefile @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= firefox-i18n -PORTVERSION= 64.0 -PORTREVISION= 1 +PORTVERSION= 65.0b2 CATEGORIES= www -MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \ - MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build2/linux-i686/xpi +MASTER_SITES= MOZILLA/devedition/releases/${DISTVERSION}/linux-i686/xpi \ + MOZILLA/devedition/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi PKGNAMEPREFIX= DISTFILES= ${FIREFOX_I18N_:S/$/.xpi/} DIST_SUBDIR= xpi/${DISTNAME} @@ -16,7 +15,7 @@ EXTRACT_DEPENDS= zip:archivers/zip -USES= zip:infozip gecko:firefox,64,build +USES= zip:infozip gecko:firefox,65,build USE_XPI= firefox NO_ARCH= yes @@ -81,7 +80,7 @@ ${XARGS} -0L1 ${REINPLACE_CMD} -i '' -e '/=1.6.34:graphics/png \ libvorbis>=1.3.6,3:audio/libvorbis \ libvpx>=1.5.0:multimedia/libvpx \ - sqlite3>=3.25.1:databases/sqlite3 \ + sqlite3>=3.25.3:databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ Index: www/firefox/distinfo =================================================================== --- www/firefox/distinfo +++ www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544057824 -SHA256 (firefox-64.0.source.tar.xz) = 982f624f4ad42bbd075bb9b6b3acecb36fe112e51a0720e0842496f0ffa84674 -SIZE (firefox-64.0.source.tar.xz) = 272951092 +TIMESTAMP = 1544124345 +SHA256 (firefox-65.0b2.source.tar.xz) = 20c17e82b9e7387c85ec5611b166ef8fe6b411e8223ed33b3359fd34f43f86d0 +SIZE (firefox-65.0b2.source.tar.xz) = 278757932 Index: www/firefox/files/patch-bug847568 =================================================================== --- www/firefox/files/patch-bug847568 +++ www/firefox/files/patch-bug847568 @@ -213,9 +213,9 @@ index 24f940e1ed7e..079a575adec3 100644 --- toolkit/library/moz.build +++ toolkit/library/moz.build -@@ -223,6 +223,12 @@ if CONFIG['MOZ_SYSTEM_JPEG']: - if CONFIG['MOZ_SYSTEM_PNG']: - OS_LIBS += CONFIG['MOZ_PNG_LIBS'] +@@ -226,6 +226,12 @@ if CONFIG['MOZ_SYSTEM_PNG']: + if CONFIG['MOZ_SYSTEM_WEBP']: + OS_LIBS += CONFIG['MOZ_WEBP_LIBS'] +if CONFIG['MOZ_SYSTEM_GRAPHITE2']: + OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS'] @@ -230,7 +230,7 @@ index 9297e4d6f501..d8e273887e4b 100644 --- toolkit/moz.configure +++ toolkit/moz.configure -@@ -883,6 +883,26 @@ add_old_configure_assignment('FT2_LIBS', +@@ -894,6 +894,26 @@ add_old_configure_assignment('FT2_LIBS', add_old_configure_assignment('FT2_CFLAGS', ft2_info.cflags) @@ -254,6 +254,6 @@ + +set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True)) + - # Mortar + # Marionette remote protocol # ============================================================== - option('--enable-mortar', help='Enable mortar extension') + # Index: www/palemoon/Makefile =================================================================== --- www/palemoon/Makefile +++ www/palemoon/Makefile @@ -29,7 +29,7 @@ USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= # empty +USE_MOZILLA= -webp PM_ICON= ${PORTNAME}.png PM_ICON_SRC= ${PREFIX}/lib/${PORTNAME}/browser/icons/mozicon128.png Index: www/seamonkey/Makefile =================================================================== --- www/seamonkey/Makefile +++ www/seamonkey/Makefile @@ -37,7 +37,7 @@ MOZ_OPTIONS+= --enable-application=suite -USE_MOZILLA= # empty +USE_MOZILLA= -webp MOZ_PKGCONFIG_FILES= OPTIONS_DEFINE= LDAP LIGHTNING RUST