AN writes:
> URL:
> https://trillian.chruetertee.ch/svn/freebsd-gecko/trunk/www/firefox-nightly
> Relative URL: ^/trunk/www/firefox-nightly
[...]
> Last Changed Date: 2015-06-23 12:55:13 -0400 (Tue, 23 Jun 2015)
I no longer dogfood gecko@ ports but some bits can be salvaged e.g.,
diff --git Mk/bsd.gecko.mk Mk/bsd.gecko.mk
index 21cecb4761f9..ee872f156ff9 100644
--- Mk/bsd.gecko.mk
+++ Mk/bsd.gecko.mk
@@ -328,12 +328,14 @@ MOZ_OPTIONS+= --enable-gconf
MOZ_OPTIONS+= --disable-gconf
.endif
-.if ${PORT_OPTIONS:MGNOMEUI}
+.if ${MOZILLA_VER:R:R} < 55
+. if ${PORT_OPTIONS:MGNOMEUI}
BUILD_DEPENDS+=${libgnomeui_DETECT}:${libgnomeui_LIB_DEPENDS:C/.*://}
USE_GNOME+=libgnomeui:build
MOZ_OPTIONS+= --enable-gnomeui
-.else
+. else
MOZ_OPTIONS+= --disable-gnomeui
+. endif
.endif
.if ${PORT_OPTIONS:MLIBPROXY}
@@ -389,14 +391,20 @@ post-patch-SNDIO-on:
.endif
.if ${PORT_OPTIONS:MRUST}
-BUILD_DEPENDS+=rustc:${RUST_PORT}
+BUILD_DEPENDS+=rust>=1.15.1:${RUST_PORT}
. if ${MOZILLA_VER:R:R} >= 51
-BUILD_DEPENDS+=cargo:devel/cargo
+BUILD_DEPENDS+=cargo>=0.16.0:devel/cargo
. endif
RUST_PORT?=lang/rust
MOZ_OPTIONS+= --enable-rust
+# XXX Build Servo for testing via about:config
+# layout.css.servo.enabled + gfx.webrender.enabled
+BUILD_DEPENDS+=llvm-config39:devel/llvm39 # bindgen crashes with llvm40
+MOZ_EXPORT+= LLVM_CONFIG="${LOCALBASE}/bin/llvm-config39"
+MOZ_OPTIONS+= --enable-stylo --enable-webrender=build
.else
MOZ_OPTIONS+= --disable-rust
+MOZ_OPTIONS+= --disable-stylo --disable-webrender # XXX
.endif
.if ${PORT_OPTIONS:MDEBUG}
diff --git www/firefox/Makefile www/firefox/Makefile
index 596737fa65f9..e8e01c4c16af 100644
--- www/firefox/Makefile
+++ www/firefox/Makefile
@@ -2,26 +2,25 @@
# $FreeBSD$
PORTNAME= firefox
-DISTVERSION= 53.0
-DISTVERSIONSUFFIX=.source
-PORTREVISION= 2
+DISTVERSION= 55.0a1.r354069
PORTEPOCH= 1
CATEGORIES=www ipv6
-MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
-
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build6/source
+MASTER_SITES= https://hg.mozilla.org/mozilla-central/archive/
+DISTNAME= 5e3dc7e1288a
+DIST_SUBDIR= ${MOZILLA}
MAINTAINER=ge...@freebsd.org
COMMENT= Web browser based on the browser portion of Mozilla
-BUILD_DEPENDS= nspr>=4.13.1:devel/nspr \
- nss>=3.29.5:security/nss \
- libevent>=2.0.21_2:devel/libevent \
- harfbuzz>=1.4.1:print/harfbuzz \
- graphite2>=1.3.8:graphics/graphite2 \
+BUILD_DEPENDS= nspr>=4.14:devel/nspr \
+ nss>=3.30.1:security/nss \
+ libevent>=2.0.22:devel/libevent \
+ harfbuzz>=1.4.5:print/harfbuzz \
+ graphite2>=1.3.9:graphics/graphite2 \
png>=1.6.28:graphics/png \
libvorbis>=1.3.5,3:audio/libvorbis \
libvpx>=1.5.0:multimedia/libvpx \
- sqlite3>=3.17.0:databases/sqlite3 \
+ sqlite3>=3.18.0:databases/sqlite3 \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
v4l_compat>0:multimedia/v4l_compat \
autoconf-2.13:devel/autoconf213 \
@@ -38,7 +37,7 @@ USE_MOZILLA= -soundtouch
MOZILLA_NAME= Firefox
USE_GL=gl
-USES= tar:xz
+USES= tar:bzip2
FIREFOX_ICON= ${MOZILLA}.png
FIREFOX_ICON_SRC=
${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
@@ -47,13 +46,14 @@ MOZ_OPTIONS=--enable-application=browser \
OPTIONS_DEFINE=RUST
OPTIONS_DEFAULT= BUNDLED_CAIRO
+OPTIONS_EXCLUDE= GNOMEUI
# XXX lang/rust and devel/cargo currently build only on these platforms
OPTIONS_DEFAULT_amd64= RUST
OPTIONS_DEFAULT_i386= RUST
.include "${.CURDIR}/../../www/firefox/Makefile.options"
-WRKSRC:= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
+WRKSRC:= ${WRKDIR}/${MASTER_SITES:M*hg*:H:H:T}-${DISTNAME}
post-extract:
@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e
's|@MOZILLA@|${MOZILLA}|' \
@@ -61,6 +61,7 @@ post-extract:
<${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop
post-patch:
+ @${REINPLACE_CMD} '/AM_PATH_NSS/s/3\.31/3.30.1/'
${MOZSRC}/old-configure.in
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/browser/app/nsBrowserApp.cpp
diff --git www/firefox/distinfo www/firefox/distinfo
index 32126eab09d0..a5c4936c4c74 100644
--- www/firefox/distinfo
+++ www/firefox/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1492149930
-SHA256 (firefox-53.0.source.tar.xz) =
4ed1b23ea7c08f81a08817ddf3b4f06849e01420ee074008b6f390366e95b7d0
-SIZE (firefox-53.0.source.tar.xz) = 213676692
+SHA256 (firefox/5e3dc7e1288a.tar.bz2) =
67afc9eccf4b2f6147ba9c6f6bf310d5e26a2fb11c3a4c1af14a387a2b096c53
+SIZE (firefox/5e3dc7e1288a.tar.bz2) = 272765098
diff --git