diff options
| author | jbeich <jbeich@FreeBSD.org> | 2016-06-03 18:52:44 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2016-06-03 18:52:44 +0800 |
| commit | 144a0549a48515993919f4033ce930e674cfdb1c (patch) | |
| tree | 93614db74786adbd4b3b2235b850c350ac69d67a /Mk | |
| parent | c7ba04b8a59fcf7c27394e89f714a10dfb8a9ec8 (diff) | |
| download | freebsd-ports-gnome-144a0549a48515993919f4033ce930e674cfdb1c.tar.gz freebsd-ports-gnome-144a0549a48515993919f4033ce930e674cfdb1c.tar.zst freebsd-ports-gnome-144a0549a48515993919f4033ce930e674cfdb1c.zip | |
www/firefox: update to 47.0 (rc2) / 45.2esr
- Adjust firefox-esr-i18n for linux-firefox after r414580
- Unbreak DTRACE=on + DEBUG=on [1]
- Unbreak FFMPEG=off [2]
Changes: https://www.mozilla.org/firefox/47.0/releasenotes/
Changes: https://www.mozilla.org/firefox/45.2.0/releasenotes/
Security: 8065d37b-8e7c-4707-a608-1b0a2b8509c3
PR: 200845, 209952 [1], 209308 [2]
MFH: 2016Q2
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/gecko.mk | 4 | ||||
| -rw-r--r-- | Mk/bsd.gecko.mk | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Mk/Uses/gecko.mk b/Mk/Uses/gecko.mk index db98b93ac582..4f0388ad2042 100644 --- a/Mk/Uses/gecko.mk +++ b/Mk/Uses/gecko.mk @@ -37,12 +37,12 @@ RUN_DEPENDS+= libxul>=45:www/libxul .elif ${gecko_ARGS:Mfirefox} _GECKO_DEFAULT_VERSION= 45 -_GECKO_VERSIONS= 45 46 +_GECKO_VERSIONS= 45 47 _GECKO_TYPE= firefox # Dependence lines for different Firefox versions 45_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox-esr -46_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox +47_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox .if exists(${LOCALBASE}/bin/firefox) _GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 47f9bf5517bd..d77ee832c83b 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -327,8 +327,6 @@ MOZ_OPTIONS+= --disable-dbus --disable-libnotify .if ${PORT_OPTIONS:MFFMPEG} # dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp RUN_DEPENDS+= ffmpeg>=0.8,1:multimedia/ffmpeg -.else -MOZ_OPTIONS+= --disable-ffmpeg .endif .if ${PORT_OPTIONS:MGSTREAMER} @@ -413,7 +411,8 @@ MOZ_OPTIONS+= --disable-debug --enable-release .endif .if ${PORT_OPTIONS:MDTRACE} -MOZ_OPTIONS+= --enable-dtrace +MOZ_OPTIONS+= --enable-dtrace \ + --disable-gold . if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100061 LIBS+= -lelf . endif |