aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Smeets <flo@FreeBSD.org>2013-08-08 18:42:03 +0000
committerFlorian Smeets <flo@FreeBSD.org>2013-08-08 18:42:03 +0000
commit48f9528b90d58ac57bc0dcf8b05e939026b26799 (patch)
treee865dbceb17400d2f950e44a8979cf576a6eee98
parent1004b19b87434832a42045b63a6c0d71d11048c4 (diff)
downloadports-48f9528b90d58ac57bc0dcf8b05e939026b26799.tar.gz
ports-48f9528b90d58ac57bc0dcf8b05e939026b26799.zip
- update firefox to 23.0
- update firefox-esr, thunderbird and libxul to 17.0.8 - update seamonkey to 2.20 - fix plist for *-i18n Security: 0998e79d-0055-11e3-905b-0025905a4771 In collaboration with: Jan Beich <jbeich@tormail.org>
Notes
Notes: svn path=/head/; revision=324409
-rw-r--r--Mk/bsd.gecko.mk86
-rw-r--r--mail/linux-thunderbird/Makefile2
-rw-r--r--mail/linux-thunderbird/distinfo4
-rw-r--r--mail/thunderbird-i18n/Makefile12
-rw-r--r--mail/thunderbird-i18n/distinfo168
-rw-r--r--mail/thunderbird/Makefile2
-rw-r--r--mail/thunderbird/distinfo4
-rw-r--r--security/nss/Makefile10
-rw-r--r--security/nss/files/patch-sysdb11
-rw-r--r--security/vuxml/vuln.xml89
-rw-r--r--www/firefox-esr-i18n/Makefile11
-rw-r--r--www/firefox-esr-i18n/distinfo328
-rw-r--r--www/firefox-esr/Makefile32
-rw-r--r--www/firefox-esr/distinfo4
-rw-r--r--www/firefox-i18n/Makefile13
-rw-r--r--www/firefox-i18n/distinfo328
-rw-r--r--www/firefox/Makefile38
-rw-r--r--www/firefox/Makefile.options2
-rw-r--r--www/firefox/distinfo4
-rw-r--r--www/firefox/files/patch-bug80348094
-rw-r--r--www/firefox/files/patch-bug80749222
-rw-r--r--www/firefox/files/patch-bug8269858
-rw-r--r--www/firefox/files/patch-bug851992373
-rw-r--r--www/firefox/files/patch-bug86275910
-rw-r--r--www/firefox/files/patch-bug878791 (renamed from www/firefox/files/patch-toolkit-components-osfile-osfile_unix_allthreads.jsm)0
-rw-r--r--www/firefox/files/patch-bug893397205
-rw-r--r--www/libxul/Makefile2
-rw-r--r--www/libxul/distinfo4
-rw-r--r--www/linux-firefox/Makefile11
-rw-r--r--www/linux-firefox/distinfo4
-rw-r--r--www/linux-firefox/pkg-plist4
-rw-r--r--www/linux-seamonkey/Makefile2
-rw-r--r--www/linux-seamonkey/Makefile.common2
-rw-r--r--www/linux-seamonkey/distinfo4
-rw-r--r--www/seamonkey-i18n/Makefile11
-rw-r--r--www/seamonkey-i18n/distinfo92
-rw-r--r--www/seamonkey/Makefile22
-rw-r--r--www/seamonkey/distinfo4
-rw-r--r--www/seamonkey/files/extra-bug88609530
-rw-r--r--www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk11
-rw-r--r--www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mozbuild9
-rw-r--r--www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile26
-rw-r--r--www/seamonkey/files/patch-bug79130517
-rw-r--r--www/seamonkey/files/patch-bug803480135
-rw-r--r--www/seamonkey/files/patch-bug80749222
-rw-r--r--www/seamonkey/files/patch-bug81071627
-rw-r--r--www/seamonkey/files/patch-bug8269858
-rw-r--r--www/seamonkey/files/patch-bug851992373
-rw-r--r--www/seamonkey/files/patch-bug86275910
-rw-r--r--www/seamonkey/files/patch-bug878791 (renamed from www/seamonkey/files/patch-toolkit-components-osfile-osfile_unix_allthreads.jsm)0
-rw-r--r--www/seamonkey/files/patch-bug893397205
-rw-r--r--www/seamonkey/files/patch-clang32-libc++-visibility-hack19
-rw-r--r--www/seamonkey/files/patch-configure.in49
53 files changed, 2078 insertions, 885 deletions
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index 32aec7b70c95..0e40edb05dbb 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -176,7 +176,7 @@ Gecko_Pre_Include= bsd.gecko.mk
# is given by the maintainer via the port or by the
# user via defined variable try to find the highest
# stable installed version.
-# Available values: yes 17+ 22+ 17 22+
+# Available values: yes 17+ 23+ 17 23+
# NOTE:
# default value 17 is used in case of USE_FIREFOX=yes
#
@@ -187,9 +187,9 @@ Gecko_Pre_Include= bsd.gecko.mk
# version is given by the maintainer via the port
# or by the user via defined variable try to find
# the highest stable installed version.
-# Available values: yes 19+ 19
+# Available values: yes 20+ 20
# NOTE:
-# default value 19 is used in case of USE_SEAMONKEY=yes
+# default value 20 is used in case of USE_SEAMONKEY=yes
#
# USE_SEAMONKEY_BUILD Add buildtime dependency on SeaMonkey.
# Available values: see USE_SEAMONKEY
@@ -218,11 +218,11 @@ _FIREFOX_BUILD_DEPENDS= yes
.endif
_FIREFOX_DEFAULT_VERSION= 17
-_FIREFOX_VERSIONS= 17 22
-_FIREFOX_RANGE_VERSIONS= 17+ 22+
+_FIREFOX_VERSIONS= 17 23
+_FIREFOX_RANGE_VERSIONS= 17+ 23+
# For specifying [17, ..]+
-_FIREFOX_22P= 22 ${_FIREFOX_17P}
+_FIREFOX_23P= 23 ${_FIREFOX_17P}
_FIREFOX_17P= 17
# Set the default Firefox version and check if USE_FIREFOX=yes was given
@@ -269,7 +269,7 @@ IGNORE= cannot install: unknown Firefox version: firefox-${USE_FIREFOX:C/([0-9
# Dependence lines for different Firefox versions
17_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr
-22_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
+23_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
# Add dependencies
.if defined(USE_FIREFOX)
@@ -291,12 +291,12 @@ USE_SEAMONKEY:= ${USE_SEAMONKEY_BUILD}
_SEAMONKEY_BUILD_DEPENDS= yes
.endif
-_SEAMONKEY_DEFAULT_VERSION= 19
-_SEAMONKEY_VERSIONS= 19
-_SEAMONKEY_RANGE_VERSIONS= 19+
+_SEAMONKEY_DEFAULT_VERSION= 20
+_SEAMONKEY_VERSIONS= 20
+_SEAMONKEY_RANGE_VERSIONS= 20+
-# For specifying [19, ..]+
-_SEAMONKEY_19P= 19
+# For specifying [20, ..]+
+_SEAMONKEY_20P= 20
# Set the default SeaMonkey version and check if USE_SEAMONKEY=yes was given
.if ${USE_SEAMONKEY} == "yes"
@@ -338,7 +338,7 @@ IGNORE= cannot install: unknown SeaMonkey version: seamonkey-2.${USE_SEAMONKEY
.endif
# Dependence lines for different SeaMonkey versions
-19_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey
+20_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey
# Add dependencies
.if defined(USE_SEAMONKEY)
@@ -560,7 +560,7 @@ USE_GCC?= yes
. endif
.endif
-.if ${MOZILLA_VER:R:R} >= 19 || exists(${.CURDIR}/files/patch-bug788955)
+.if ${MOZILLA_VER:R:R} >= 19 || ${MOZILLA:Mseamonkey*} || exists(${.CURDIR}/files/patch-bug788955)
.if ${OSVERSION} > 1000011
# use jemalloc 3.0.0 API in libc
MOZ_EXPORT+= MOZ_JEMALLOC=1 MOZ_JEMALLOC3=1
@@ -593,6 +593,13 @@ ffi_EXTRACT_AFTER_ARGS= --exclude mozilla*/js/src/ctypes/libffi
hunspell_LIB_DEPENDS= hunspell-1.3:${PORTSDIR}/textproc/hunspell
hunspell_MOZ_OPTIONS= --enable-system-hunspell
+.if ${MOZILLA_VER:R:R} >= 23 || ${MOZILLA:Mseamonkey*}
+_ALL_DEPENDS+= icu
+.endif
+
+icu_LIB_DEPENDS= icui18n:${PORTSDIR}/devel/icu
+icu_MOZ_OPTIONS= --enable-intl-api --with-system-icu
+
# XXX: depends on pkgng package flavor support
#jpeg_LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/libjpeg-turbo
jpeg_LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg
@@ -668,12 +675,12 @@ MOZ_OPTIONS+= --with-system-zlib \
--disable-updater \
--disable-pedantic
-.if exists(/usr/lib/libcxxrt.so)
-LIBS+= -Wl,--as-needed,-lcxxrt,--no-as-needed
+.if ${MOZILLA_VER:R:R} < 25 && !exists(${FILESDIR}/patch-bug803480)
+MOZ_OPTIONS+= --disable-necko-wifi
.endif
-.if !exists(${FILESDIR}/patch-bug803480) || ! ${PORT_OPTIONS:MDBUS}
-MOZ_OPTIONS+= --disable-necko-wifi
+.if ${PORT_OPTIONS:MGTK3}
+MOZ_TOOLKIT= cairo-gtk3
.endif
.if ${MOZ_TOOLKIT:Mcairo-qt}
@@ -684,6 +691,8 @@ USE_GNOME+= pango
USE_QT4+= moc_build gui network opengl
MOZ_OPTIONS+= --with-qtdir= # pkg-config
MOZ_EXPORT+= HOST_MOC="${MOC}" HOST_RCC="${FALSE}"
+.elif ${MOZ_TOOLKIT:Mcairo-gtk3}
+USE_GNOME+= gtk30
.else # gtk2, cairo-gtk2
USE_GNOME+= gtk20
.endif
@@ -747,6 +756,17 @@ MOZ_OPTIONS+= --enable-libproxy
MOZ_OPTIONS+= --disable-libproxy
.endif
+.if ${PORT_OPTIONS:MPGO}
+USE_GCC?= yes
+USE_DISPLAY=yes
+
+.undef GNU_CONFIGURE
+MAKEFILE= ${WRKSRC}/client.mk
+ALL_TARGET= profiledbuild
+MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT="${PYTHON_CMD} \
+ @MOZ_OBJDIR@/_profile/pgo/profileserver.py"
+.endif
+
.if ${PORT_OPTIONS:MWEBRTC}
BUILD_DEPENDS+= v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat
LIB_DEPENDS+= v4l2:${PORTSDIR}/multimedia/libv4l
@@ -810,7 +830,16 @@ MOZ_SED_ARGS+= -e's|@CPPFLAGS@|${CPPFLAGS}|g' \
MOZCONFIG_SED?= ${SED} ${MOZ_SED_ARGS}
.if ${ARCH} == amd64
-CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=x86_64-unknown-${OPSYS:L}${OSREL}
+. if ${USE_MOZILLA:M-nss} && (${MOZILLA_VER:R:R} >= 20 || ${MOZILLA:Mseamonkey*} )
+USE_BINUTILS= # intel-gcm.s
+CFLAGS+= -B${LOCALBASE}/bin
+LDFLAGS+= -B${LOCALBASE}/bin
+. if ${OSVERSION} < 1000041 && exists(/usr/lib/libcxxrt.so) && \
+ ${CXXFLAGS:M-stdlib=libc++}
+LIBS+= -lcxxrt
+. endif
+. endif
.elif ${ARCH:Mpowerpc*}
USE_GCC?= yes
CFLAGS+= -D__STDC_CONSTANT_MACROS
@@ -836,6 +865,22 @@ MOZ_OBJDIR= ${WRKSRC}
.else # bsd.port.post.mk
+pre-extract: gecko-pre-extract
+
+gecko-pre-extract:
+.if ${PORT_OPTIONS:MPGO}
+ @${ECHO} "*****************************************************************"
+ @${ECHO} "**************************** attention **************************"
+ @${ECHO} "*****************************************************************"
+ @${ECHO} "To build ${MOZILLA} with PGO support you need a running X server and"
+ @${ECHO} " build this port with an user who could access the X server! "
+ @${ECHO} ""
+ @${ECHO} "During the build a ${MOZILLA} instance will start and run some test."
+ @${ECHO} " Do not interrupt or close ${MOZILLA} during this tests! "
+ @${ECHO} "*****************************************************************"
+ @sleep 10
+.endif
+
post-patch: gecko-post-patch gecko-moz-pis-patch
gecko-post-patch:
@@ -882,12 +927,9 @@ gecko-post-patch:
@if [ -f ${MOZSRC}/${subdir}/config/system-headers ] ; then \
for f in \
cairo-qt.h \
- fenv.h \
kvm.h \
malloc_np.h \
ostream \
- pthread_np.h \
- pulse/pulseaudio.h \
spawn.h \
sys/thr.h \
sys/user.h \
diff --git a/mail/linux-thunderbird/Makefile b/mail/linux-thunderbird/Makefile
index e3553410d174..0f43787bd66b 100644
--- a/mail/linux-thunderbird/Makefile
+++ b/mail/linux-thunderbird/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= thunderbird
-PORTVERSION= 17.0.7
+PORTVERSION= 17.0.8
CATEGORIES= mail
DISTNAME= ${PORTNAME}-${DISTVERSION}esr
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${PORTVERSION}esr/linux-i686/en-US
diff --git a/mail/linux-thunderbird/distinfo b/mail/linux-thunderbird/distinfo
index e14b3283f5f4..969827097198 100644
--- a/mail/linux-thunderbird/distinfo
+++ b/mail/linux-thunderbird/distinfo
@@ -1,2 +1,2 @@
-SHA256 (thunderbird-17.0.7esr.tar.bz2) = b6af8d3b5950dab46e7ab5868091177f2da8474e879080e273ff816f4f460c5a
-SIZE (thunderbird-17.0.7esr.tar.bz2) = 21511954
+SHA256 (thunderbird-17.0.8esr.tar.bz2) = 50a79b52784c8f7611c5ca491a5668f712485483494a7b3e18030a0cc89eb9bb
+SIZE (thunderbird-17.0.8esr.tar.bz2) = 21488005
diff --git a/mail/thunderbird-i18n/Makefile b/mail/thunderbird-i18n/Makefile
index e0517a939923..f28e48d9d32a 100644
--- a/mail/thunderbird-i18n/Makefile
+++ b/mail/thunderbird-i18n/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= thunderbird-i18n
-PORTVERSION= 17.0.7
+PORTVERSION= 17.0.8
CATEGORIES= mail
MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}esr/linux-i686/xpi
PKGNAMEPREFIX=
@@ -67,14 +67,8 @@ do-install:
@${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A}
@${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \
${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A}
- @for lang in ${THUNDERBIRD_I18N_}; do \
- for xpi in ${XPI_LINKFARMS} ; do \
- if [ -d $${xpi} ] ; \
- then \
- ${ECHO_CMD} $$xpi/langpack-$$lang@thunderbird.mozilla.org ${_A} ; \
- fi ; \
- done ; \
- done
+ @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ${XPI_LIBDIR}; { ${RM} -fR $$_dir/${WDIR} ; }' ${_A}
+ @${ECHO_CMD} '@unexec ${RMDIR} ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A}
post-patch:
${FIND} ${WRKSRC} -name install.rdf -print0 | \
diff --git a/mail/thunderbird-i18n/distinfo b/mail/thunderbird-i18n/distinfo
index 2540162674be..73c7cde80bc2 100644
--- a/mail/thunderbird-i18n/distinfo
+++ b/mail/thunderbird-i18n/distinfo
@@ -1,84 +1,84 @@
-SHA256 (xpi/thunderbird-i18n-17.0.7/ar.xpi) = 44fe3d4de0116dc9a429ab11be394ee588e1c0f5317c5ffc8e0e24e587fb99f8
-SIZE (xpi/thunderbird-i18n-17.0.7/ar.xpi) = 445976
-SHA256 (xpi/thunderbird-i18n-17.0.7/br.xpi) = 398adbed46ebd2cf1ac24224d0511236b27de23ff5593d4a7516ade97d80d17f
-SIZE (xpi/thunderbird-i18n-17.0.7/br.xpi) = 417071
-SHA256 (xpi/thunderbird-i18n-17.0.7/ca.xpi) = 62d22918155f64c981e1a2020ebc084b48fbc274b72e05c0e45844d73d059706
-SIZE (xpi/thunderbird-i18n-17.0.7/ca.xpi) = 418407
-SHA256 (xpi/thunderbird-i18n-17.0.7/cs.xpi) = f3e5fb42eb4e1e17a99529ce30bac387570b5a5434a23488e3be0fb70db0bd57
-SIZE (xpi/thunderbird-i18n-17.0.7/cs.xpi) = 420627
-SHA256 (xpi/thunderbird-i18n-17.0.7/da.xpi) = d0a7943308f308d06899daa28317ca989fdaf75919bed5ee8361132e38d0020d
-SIZE (xpi/thunderbird-i18n-17.0.7/da.xpi) = 398980
-SHA256 (xpi/thunderbird-i18n-17.0.7/de.xpi) = b67a0d7400b260f91dda55975f0a5aa8638acd095666bb7e84df1efad266b914
-SIZE (xpi/thunderbird-i18n-17.0.7/de.xpi) = 393632
-SHA256 (xpi/thunderbird-i18n-17.0.7/en-GB.xpi) = ff44cb57de261674ab2fb1620914c926555e5561387451353230eb94007290a2
-SIZE (xpi/thunderbird-i18n-17.0.7/en-GB.xpi) = 390694
-SHA256 (xpi/thunderbird-i18n-17.0.7/en-US.xpi) = 03e166185b06a331e29736be8f379dbc563b37e7a06b35055aca9a32de3a92ff
-SIZE (xpi/thunderbird-i18n-17.0.7/en-US.xpi) = 390780
-SHA256 (xpi/thunderbird-i18n-17.0.7/es-AR.xpi) = e507feb192e0f1e89df2579417ea2e850bc073887bf89ddefb984200d589ea83
-SIZE (xpi/thunderbird-i18n-17.0.7/es-AR.xpi) = 415499
-SHA256 (xpi/thunderbird-i18n-17.0.7/es-ES.xpi) = 9422bc6a60e130921e68ee9a438aa9d4e8ebf55c8c96e6859773ace71d535e0b
-SIZE (xpi/thunderbird-i18n-17.0.7/es-ES.xpi) = 356861
-SHA256 (xpi/thunderbird-i18n-17.0.7/et.xpi) = 8cbde9ab3162eb4ecb3efffaa09c9fccafc01dc8ccaf49c7d827e8f9b66ea291
-SIZE (xpi/thunderbird-i18n-17.0.7/et.xpi) = 411892
-SHA256 (xpi/thunderbird-i18n-17.0.7/eu.xpi) = 2a583bb8ebf691f0b8c8dde4be24c1b788d76a553069ff81f03072ebb0b46a4e
-SIZE (xpi/thunderbird-i18n-17.0.7/eu.xpi) = 407189
-SHA256 (xpi/thunderbird-i18n-17.0.7/fi.xpi) = 7211be29a9a4201bacb6c49746115d71399d077dffc53f31ada7222b2b7f666b
-SIZE (xpi/thunderbird-i18n-17.0.7/fi.xpi) = 413620
-SHA256 (xpi/thunderbird-i18n-17.0.7/fr.xpi) = 19118767c853d85a2bc8433b685f3c177ab4e44409b200fc6654e00f54351d04
-SIZE (xpi/thunderbird-i18n-17.0.7/fr.xpi) = 420826
-SHA256 (xpi/thunderbird-i18n-17.0.7/fy-NL.xpi) = fc54a98367f053ccdc3d052cb2d4280da8761c1a98e7af2768c73b9a5c3e5d41
-SIZE (xpi/thunderbird-i18n-17.0.7/fy-NL.xpi) = 415712
-SHA256 (xpi/thunderbird-i18n-17.0.7/ga-IE.xpi) = 885564443522cc29dfcb593332b5dc0908783f82df52ef247262fcb662e63896
-SIZE (xpi/thunderbird-i18n-17.0.7/ga-IE.xpi) = 425395
-SHA256 (xpi/thunderbird-i18n-17.0.7/gd.xpi) = 33cdc4a93d89ae0e3b2b4b5ac6782b052073d2d3cd478e28592f6de1d351dd91
-SIZE (xpi/thunderbird-i18n-17.0.7/gd.xpi) = 428939
-SHA256 (xpi/thunderbird-i18n-17.0.7/gl.xpi) = 7a5b48676696deebc3e8797b13f6b907b4f9cac7b2217cb70e09a1a9a6b0eeb8
-SIZE (xpi/thunderbird-i18n-17.0.7/gl.xpi) = 410370
-SHA256 (xpi/thunderbird-i18n-17.0.7/he.xpi) = 78139a85717ea42393e8e2f6c3da5192442abdc9d91e7ca052e48cc759859784
-SIZE (xpi/thunderbird-i18n-17.0.7/he.xpi) = 439504
-SHA256 (xpi/thunderbird-i18n-17.0.7/hu.xpi) = b0df73e923c31beb7846589898efe76c87e091498b66b62a0edf7c642174884c
-SIZE (xpi/thunderbird-i18n-17.0.7/hu.xpi) = 433187
-SHA256 (xpi/thunderbird-i18n-17.0.7/is.xpi) = 154aff2b1ab9d8267e3b7ef7a0339fc239dc7bb0975c0429033be8beeb4e8fc8
-SIZE (xpi/thunderbird-i18n-17.0.7/is.xpi) = 414068
-SHA256 (xpi/thunderbird-i18n-17.0.7/it.xpi) = af798f3dd93d5d843a2dcbcd77866f970a78be4b172e9abc9e4af9365c835ad3
-SIZE (xpi/thunderbird-i18n-17.0.7/it.xpi) = 348621
-SHA256 (xpi/thunderbird-i18n-17.0.7/ja.xpi) = fa155cb29ea3a25e5d0efb42514a970c92cb2512f6d2836737e1b78c4fe69d4b
-SIZE (xpi/thunderbird-i18n-17.0.7/ja.xpi) = 463488
-SHA256 (xpi/thunderbird-i18n-17.0.7/ko.xpi) = d337a8056ac11663a21ff6d53ac41db3de610c601c88bb05d244ea4123694496
-SIZE (xpi/thunderbird-i18n-17.0.7/ko.xpi) = 412964
-SHA256 (xpi/thunderbird-i18n-17.0.7/lt.xpi) = 4b03c05bc812e78fc5a6a8d95aa57d58faa9c5125ab211ba41c4947e53b872ec
-SIZE (xpi/thunderbird-i18n-17.0.7/lt.xpi) = 519802
-SHA256 (xpi/thunderbird-i18n-17.0.7/nb-NO.xpi) = 977d9db36ed32d5b736fca430317891ece6f80ddf101d9ff0b27bd792bc664ea
-SIZE (xpi/thunderbird-i18n-17.0.7/nb-NO.xpi) = 408520
-SHA256 (xpi/thunderbird-i18n-17.0.7/nl.xpi) = 188b116c6b78a85f999cdfda1d217a300a964eec7af78098bf8d336ad8cc4526
-SIZE (xpi/thunderbird-i18n-17.0.7/nl.xpi) = 408527
-SHA256 (xpi/thunderbird-i18n-17.0.7/nn-NO.xpi) = 51aec0a0b303b6babd2ab00e024dc0bdcb58f7134feca13a0166007c160946dc
-SIZE (xpi/thunderbird-i18n-17.0.7/nn-NO.xpi) = 431472
-SHA256 (xpi/thunderbird-i18n-17.0.7/pl.xpi) = 224079ebee813160fd743ea3da291430dedc53fec040864d5aa13d0ad226e70b
-SIZE (xpi/thunderbird-i18n-17.0.7/pl.xpi) = 402114
-SHA256 (xpi/thunderbird-i18n-17.0.7/pt-BR.xpi) = faee7b566a253be5fdd4fee26a02b8bb2caca4c37246ddcaefde2a4323f09234
-SIZE (xpi/thunderbird-i18n-17.0.7/pt-BR.xpi) = 415778
-SHA256 (xpi/thunderbird-i18n-17.0.7/pt-PT.xpi) = 9de9c419f89804503f74013eb1d613c7224ead72b664270383c3672df9ff7786
-SIZE (xpi/thunderbird-i18n-17.0.7/pt-PT.xpi) = 445754
-SHA256 (xpi/thunderbird-i18n-17.0.7/rm.xpi) = a3d1c1af367d836415a2ed03f25020c4e820996285ff47adca84a0b9ea8ca4b2
-SIZE (xpi/thunderbird-i18n-17.0.7/rm.xpi) = 415531
-SHA256 (xpi/thunderbird-i18n-17.0.7/ru.xpi) = 3a3a5aad50a6e13914fea177b13a0d118ff0ee9954500a537c8d05037108d0aa
-SIZE (xpi/thunderbird-i18n-17.0.7/ru.xpi) = 415709
-SHA256 (xpi/thunderbird-i18n-17.0.7/si.xpi) = 03adeffcae250398946958c56c6db75736e571acfc7f8c99547af68a4b764085
-SIZE (xpi/thunderbird-i18n-17.0.7/si.xpi) = 494163
-SHA256 (xpi/thunderbird-i18n-17.0.7/sk.xpi) = 22a4483584bb969e098569379795b46c276db450c8066b85b41e8c7cd4316eb3
-SIZE (xpi/thunderbird-i18n-17.0.7/sk.xpi) = 429756
-SHA256 (xpi/thunderbird-i18n-17.0.7/sl.xpi) = 799eae2ede769e5289ea226d736fba5e91906ea43db96428899b70603caa6fe1
-SIZE (xpi/thunderbird-i18n-17.0.7/sl.xpi) = 442096
-SHA256 (xpi/thunderbird-i18n-17.0.7/sq.xpi) = 89c8320f66324f15a28da27165bfcbac3ab9a7bfb6922676261f513ebd9f0edc
-SIZE (xpi/thunderbird-i18n-17.0.7/sq.xpi) = 418780
-SHA256 (xpi/thunderbird-i18n-17.0.7/sv-SE.xpi) = 4ceb3a1db101b9a724f82005f85a397be9e7a118a89370b089a26aeac152372a
-SIZE (xpi/thunderbird-i18n-17.0.7/sv-SE.xpi) = 413218
-SHA256 (xpi/thunderbird-i18n-17.0.7/ta-LK.xpi) = 10f6a01416ba512eb46be7b782d519e5ab92216eacf9a0d2aefca01cf96ffcc0
-SIZE (xpi/thunderbird-i18n-17.0.7/ta-LK.xpi) = 517912
-SHA256 (xpi/thunderbird-i18n-17.0.7/tr.xpi) = e00f52cce549ca0da209a7b7fd1d3906dcc06e2457d92a5a92e9284714a3fe68
-SIZE (xpi/thunderbird-i18n-17.0.7/tr.xpi) = 444945
-SHA256 (xpi/thunderbird-i18n-17.0.7/uk.xpi) = 797591405e0bf09da2cce4efb19e46ac6de6c65e01b0577e21d791ca4776184f
-SIZE (xpi/thunderbird-i18n-17.0.7/uk.xpi) = 471143
-SHA256 (xpi/thunderbird-i18n-17.0.7/zh-TW.xpi) = cd2e425035e76c6a2eddc54996fe539cf1724502f13277c054fbd7a95cb59803
-SIZE (xpi/thunderbird-i18n-17.0.7/zh-TW.xpi) = 437591
+SHA256 (xpi/thunderbird-i18n-17.0.8/ar.xpi) = 06aa4989dafac30777a9f1733372038bf27ea6ebe2689bbfb1f32ee84bbce570
+SIZE (xpi/thunderbird-i18n-17.0.8/ar.xpi) = 445976
+SHA256 (xpi/thunderbird-i18n-17.0.8/br.xpi) = 7cec403004e5dfa547452aa3885d6a30711eebfdbeb708897e3be58eb95f038a
+SIZE (xpi/thunderbird-i18n-17.0.8/br.xpi) = 417071
+SHA256 (xpi/thunderbird-i18n-17.0.8/ca.xpi) = 9608970325c28c29e63c6db0c841c84588ec6af39ddbbbc305e18188b2591628
+SIZE (xpi/thunderbird-i18n-17.0.8/ca.xpi) = 418406
+SHA256 (xpi/thunderbird-i18n-17.0.8/cs.xpi) = 4e530ad1281db4f52484ff15d117c49b4204ad6e9c743452d72acb6ee716ae03
+SIZE (xpi/thunderbird-i18n-17.0.8/cs.xpi) = 420626
+SHA256 (xpi/thunderbird-i18n-17.0.8/da.xpi) = cbf06bd93d1244f07974176e13802bd1bf6a81783de6ef598be3011104e60d6a
+SIZE (xpi/thunderbird-i18n-17.0.8/da.xpi) = 398980
+SHA256 (xpi/thunderbird-i18n-17.0.8/de.xpi) = 49e0a19e794d4c3a12d8cee63fd6818583ea3b1c61cd604c62445d6217a8e3a2
+SIZE (xpi/thunderbird-i18n-17.0.8/de.xpi) = 393631
+SHA256 (xpi/thunderbird-i18n-17.0.8/en-GB.xpi) = ff7de06053de1ba904d3020d0706a0f8951127c307ab3c620b580ae72273243f
+SIZE (xpi/thunderbird-i18n-17.0.8/en-GB.xpi) = 390693
+SHA256 (xpi/thunderbird-i18n-17.0.8/en-US.xpi) = f28070ed90bb00befe74dda876194773ff334b16a1eb738847e3a41f5ba58617
+SIZE (xpi/thunderbird-i18n-17.0.8/en-US.xpi) = 390779
+SHA256 (xpi/thunderbird-i18n-17.0.8/es-AR.xpi) = 4976d3892ba2051a5182ab605c6ef9b2d2394cb6474af689fb7c96083070b643
+SIZE (xpi/thunderbird-i18n-17.0.8/es-AR.xpi) = 415498
+SHA256 (xpi/thunderbird-i18n-17.0.8/es-ES.xpi) = 7d0c65387f0d429eaf0f1a9e9cf96a1614378cf4f2c34c4db2fda3981fe777ac
+SIZE (xpi/thunderbird-i18n-17.0.8/es-ES.xpi) = 356860
+SHA256 (xpi/thunderbird-i18n-17.0.8/et.xpi) = fe6475d3fd4e025e4fd907389d522fce86fd9674f32b5f63d9b636503499ce18
+SIZE (xpi/thunderbird-i18n-17.0.8/et.xpi) = 411891
+SHA256 (xpi/thunderbird-i18n-17.0.8/eu.xpi) = f3f2be6e12a2fcad30233c45a700c72ae202802b430b7ba8b2b51c8b7f644f19
+SIZE (xpi/thunderbird-i18n-17.0.8/eu.xpi) = 407189
+SHA256 (xpi/thunderbird-i18n-17.0.8/fi.xpi) = 7a83de772a2b98927835d38a01bb7304149cf5958aff858d1120380f0c1f04b1
+SIZE (xpi/thunderbird-i18n-17.0.8/fi.xpi) = 413619
+SHA256 (xpi/thunderbird-i18n-17.0.8/fr.xpi) = f5b43059ea2e3b3f08087b040abfa0f04f3c51b865fc99b6095f953a14690cb6
+SIZE (xpi/thunderbird-i18n-17.0.8/fr.xpi) = 420825
+SHA256 (xpi/thunderbird-i18n-17.0.8/fy-NL.xpi) = ebc9b148fb7cd63b0225ce3bd6c1da1ff1ba88627fd9c0cb96d86c2618596217
+SIZE (xpi/thunderbird-i18n-17.0.8/fy-NL.xpi) = 415712
+SHA256 (xpi/thunderbird-i18n-17.0.8/ga-IE.xpi) = 095fe84c70d846aeb77ad9dcaf9a2c25096166e2594f85d52af3050ddcbef2ed
+SIZE (xpi/thunderbird-i18n-17.0.8/ga-IE.xpi) = 425394
+SHA256 (xpi/thunderbird-i18n-17.0.8/gd.xpi) = c88bb185f2e863a1114d23d31172ea1aab3a9b4856a6f2c0b4d7fe834af07f50
+SIZE (xpi/thunderbird-i18n-17.0.8/gd.xpi) = 428939
+SHA256 (xpi/thunderbird-i18n-17.0.8/gl.xpi) = e1f1e1745f635eb3a58a32fa466ca96ac913ff8ffc81c31b904ebfd843be21cb
+SIZE (xpi/thunderbird-i18n-17.0.8/gl.xpi) = 410369
+SHA256 (xpi/thunderbird-i18n-17.0.8/he.xpi) = 2e095d156027034db8c7d9ed44a23dade5f872651aed611df3428c05c7a9261d
+SIZE (xpi/thunderbird-i18n-17.0.8/he.xpi) = 439503
+SHA256 (xpi/thunderbird-i18n-17.0.8/hu.xpi) = 959666ffb50493b56db8832a4a4910e8f2839a248b0fe9da30b802fd197f0884
+SIZE (xpi/thunderbird-i18n-17.0.8/hu.xpi) = 433186
+SHA256 (xpi/thunderbird-i18n-17.0.8/is.xpi) = 09bd200fc261a525c42d66451fcd14fd1db4d1e4549d300683e88fb3d9dc6f97
+SIZE (xpi/thunderbird-i18n-17.0.8/is.xpi) = 414067
+SHA256 (xpi/thunderbird-i18n-17.0.8/it.xpi) = 591612ff988180ed4c654b800106d66c318543322d6f64170189abf9244ed6d6
+SIZE (xpi/thunderbird-i18n-17.0.8/it.xpi) = 348620
+SHA256 (xpi/thunderbird-i18n-17.0.8/ja.xpi) = 70bfb44ed2eedf8adb52eec63597fd4c75e0c71ac5616b2a1596132016ca9484
+SIZE (xpi/thunderbird-i18n-17.0.8/ja.xpi) = 463487
+SHA256 (xpi/thunderbird-i18n-17.0.8/ko.xpi) = 39972768c671f80dcb679947b4e4e205effad1006a887a871571efac8d74bff5
+SIZE (xpi/thunderbird-i18n-17.0.8/ko.xpi) = 412963
+SHA256 (xpi/thunderbird-i18n-17.0.8/lt.xpi) = 72aa8c347afc860e47242382e790f991e522d3185d1dcc7b0996118db9885dfd
+SIZE (xpi/thunderbird-i18n-17.0.8/lt.xpi) = 519802
+SHA256 (xpi/thunderbird-i18n-17.0.8/nb-NO.xpi) = 56a06fca489f0d3f001884d2c5d700869f78ab90ca99f4953249db68e7337bae
+SIZE (xpi/thunderbird-i18n-17.0.8/nb-NO.xpi) = 408518
+SHA256 (xpi/thunderbird-i18n-17.0.8/nl.xpi) = 0fb6c31b37d4a80044dede14d66c2e6c1d324cfd636da8cb48e6404d57bf8c09
+SIZE (xpi/thunderbird-i18n-17.0.8/nl.xpi) = 408526
+SHA256 (xpi/thunderbird-i18n-17.0.8/nn-NO.xpi) = fd94eea4d179135ba0603f1b1e73234b1de0ffec9d1c20e4226536fbb8a3efaa
+SIZE (xpi/thunderbird-i18n-17.0.8/nn-NO.xpi) = 431471
+SHA256 (xpi/thunderbird-i18n-17.0.8/pl.xpi) = e556ddf3ff2c4bc426f527bbc8f4ad0a9a2aedc4a9ed97e6de63aa0b0f9e8c8d
+SIZE (xpi/thunderbird-i18n-17.0.8/pl.xpi) = 402114
+SHA256 (xpi/thunderbird-i18n-17.0.8/pt-BR.xpi) = 204e3aacb4afae9dddd554fc7f3d422ca5ee14ba3611d49ca0143114da91f640
+SIZE (xpi/thunderbird-i18n-17.0.8/pt-BR.xpi) = 415777
+SHA256 (xpi/thunderbird-i18n-17.0.8/pt-PT.xpi) = e7f49b3552060eaa264ae80bd8f80342b875810e3c968e1b5e78713035696c27
+SIZE (xpi/thunderbird-i18n-17.0.8/pt-PT.xpi) = 445753
+SHA256 (xpi/thunderbird-i18n-17.0.8/rm.xpi) = 2effe0850bdf4fe6c3155a812e47ef2016b0eaf50f437e899861878cd1187b4f
+SIZE (xpi/thunderbird-i18n-17.0.8/rm.xpi) = 415530
+SHA256 (xpi/thunderbird-i18n-17.0.8/ru.xpi) = 9a9d855d12c59c975a293ca0c3fb9345c51b2108ab24c3b4863fe8d310d14405
+SIZE (xpi/thunderbird-i18n-17.0.8/ru.xpi) = 415707
+SHA256 (xpi/thunderbird-i18n-17.0.8/si.xpi) = 7c4554283aafae7ecbdd7736f46e4ae6d8f3fdd53590b5c94a9dcfa749e00460
+SIZE (xpi/thunderbird-i18n-17.0.8/si.xpi) = 494162
+SHA256 (xpi/thunderbird-i18n-17.0.8/sk.xpi) = 541f4b02312b5e8eec972067e0eca91b76f8d1be75767220813efb2a8e351cd9
+SIZE (xpi/thunderbird-i18n-17.0.8/sk.xpi) = 429755
+SHA256 (xpi/thunderbird-i18n-17.0.8/sl.xpi) = c86f305935aaa443cb3eca302595d401655a3e90dcb3b6b1270de5d9be7ba74a
+SIZE (xpi/thunderbird-i18n-17.0.8/sl.xpi) = 442095
+SHA256 (xpi/thunderbird-i18n-17.0.8/sq.xpi) = a3b6a6dcc81f4a780faa55f9cc7f43030bef80cb2f754d24077cb45ef80f9d51
+SIZE (xpi/thunderbird-i18n-17.0.8/sq.xpi) = 418779
+SHA256 (xpi/thunderbird-i18n-17.0.8/sv-SE.xpi) = 3758e651c99db3325703508d73010d7ca97e1904117ddc29a1132fa168a44e50
+SIZE (xpi/thunderbird-i18n-17.0.8/sv-SE.xpi) = 413217
+SHA256 (xpi/thunderbird-i18n-17.0.8/ta-LK.xpi) = e7e06c7ab1538571b0f71083230cd3d72d6cc2cd16e88268667e5239481a7941
+SIZE (xpi/thunderbird-i18n-17.0.8/ta-LK.xpi) = 517912
+SHA256 (xpi/thunderbird-i18n-17.0.8/tr.xpi) = 5f17ce575f00a08c5abd6536856469d388e9797195e7dadf20e1b3d980e10b91
+SIZE (xpi/thunderbird-i18n-17.0.8/tr.xpi) = 444944
+SHA256 (xpi/thunderbird-i18n-17.0.8/uk.xpi) = 77ea7dcee6ea87dafcf0ea49800c6a4318188ddc9906fca7f57b2e942e238389
+SIZE (xpi/thunderbird-i18n-17.0.8/uk.xpi) = 471142
+SHA256 (xpi/thunderbird-i18n-17.0.8/zh-TW.xpi) = bdda98eaebcd1c8104100002ef1c25db939039e533646f74ffd72b8faf381b10
+SIZE (xpi/thunderbird-i18n-17.0.8/zh-TW.xpi) = 437590
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 9abe96133e28..5d8c66c716fc 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= thunderbird
-DISTVERSION= 17.0.7
+DISTVERSION= 17.0.8
CATEGORIES= mail ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source
DISTFILES= ${PORTNAME}-${DISTVERSION}esr.source${EXTRACT_SUFX}
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index 46c0abc03ace..a48ae8137937 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,4 +1,4 @@
-SHA256 (thunderbird-17.0.7esr.source.tar.bz2) = cc1e1e1be3fd1ad26520f433ccb1c37a416236055e6cbdb223742248f28a9a8b
-SIZE (thunderbird-17.0.7esr.source.tar.bz2) = 113569841
+SHA256 (thunderbird-17.0.8esr.source.tar.bz2) = 6e9f5899f97a6efd11b231909d534b2dec40502a20e1ab06eb12a4953e3deb54
+SIZE (thunderbird-17.0.8esr.source.tar.bz2) = 113699743
SHA256 (enigmail-1.5.1.tar.gz) = 234ca3c8f7c74afb64ebdaa4762e358f35a72c1f8de007b992497fc2db803af0
SIZE (enigmail-1.5.1.tar.gz) = 1213954
diff --git a/security/nss/Makefile b/security/nss/Makefile
index 0645404ee829..a14556f9202a 100644
--- a/security/nss/Makefile
+++ b/security/nss/Makefile
@@ -11,7 +11,7 @@ MAINTAINER= gecko@FreeBSD.org
COMMENT= Libraries to support development of security-enabled applications
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \
- nspr>=4.8.8:${PORTSDIR}/devel/nspr \
+ nspr>=4.10:${PORTSDIR}/devel/nspr \
sqlite3>=3.7.15:${PORTSDIR}/databases/sqlite3
LIB_DEPENDS= nspr4.1:${PORTSDIR}/devel/nspr \
sqlite3.8:${PORTSDIR}/databases/sqlite3
@@ -32,9 +32,7 @@ SUB_LIST= PORTVERSION=${PORTVERSION}
DIST= ${WRKSRC:H}/dist
-EXTERNALS= CVS dbm security/nss/lib/zlib nsprpub security/dbm
-EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
- ${EXTERNALS:C,^,--exclude ${PORTNAME}-${PORTVERSION}/mozilla/,}
+EXTRACT_AFTER_ARGS=--exclude */lib/zlib --exclude */lib/dbm --exclude */lib/sqlite
INSTALL_BINS= certcgi certutil checkcert cmsutil crlutil derdump makepqg \
mangle modutil ocspclnt oidcalc p7content p7env p7sign \
@@ -61,8 +59,8 @@ check regression-test test:
LD_LIBRARY_PATH="${BINS}/lib" \
${MAKE_ENV} \
./all.sh
- @if ${GREP} -F '>Failed<' \
- ${WRKSRC:H:H}/tests_results/security/*/results.html; then \
+ @if ${GREP} -Fh '>Failed<' \
+ ${WRKSRC:H}/tests_results/security/*/results.html; then \
echo "Some tests have failed. Let ${MAINTAINER} know."; \
exit 1; \
else \
diff --git a/security/nss/files/patch-sysdb b/security/nss/files/patch-sysdb
index 7874a3ad9f09..7c67d21aa651 100644
--- a/security/nss/files/patch-sysdb
+++ b/security/nss/files/patch-sysdb
@@ -122,6 +122,17 @@
#include "seccomon.h"
#include "secdert.h"
#include "secoidt.h"
+--- lib/manifest.mn~
++++ lib/manifest.mn
+@@ -20,7 +20,7 @@ DIRS = \
+ $(UTIL_SRCDIR) \
+ $(FREEBL_SRCDIR) \
+ $(SQLITE_SRCDIR) \
+- $(DBM_SRCDIR) \
++ $(NULL) \
+ $(SOFTOKEN_SRCDIR) \
+ base dev pki \
+ libpkix \
--- cmd/platlibs.mk.orig 2009-08-31 12:57:13.000000000 +0200
+++ cmd/platlibs.mk 2009-08-31 12:57:29.000000000 +0200
@@ -85,7 +85,7 @@
diff --git a/security/vuxml/vuln.xml b/security/vuxml/vuln.xml
index fa1ed801cc85..4870de8c1bcf 100644
--- a/security/vuxml/vuln.xml
+++ b/security/vuxml/vuln.xml
@@ -51,6 +51,95 @@ Note: Please add new entries to the beginning of this file.
-->
<vuxml xmlns="http://www.vuxml.org/apps/vuxml-1">
+ <vuln vid="0998e79d-0055-11e3-905b-0025905a4771">
+ <topic>mozilla -- multiple vulnerabilities</topic>
+ <affects>
+ <package>
+ <name>firefox</name>
+ <range><gt>18.0,1</gt><lt>23.0,1</lt></range>
+ <range><lt>17.0.8,1</lt></range>
+ </package>
+ <package>
+ <name>linux-firefox</name>
+ <range><lt>17.0.8,1</lt></range>
+ </package>
+ <package>
+ <name>linux-seamonkey</name>
+ <range><lt>2.20</lt></range>
+ </package>
+ <package>
+ <name>linux-thunderbird</name>
+ <range><lt>17.0.8</lt></range>
+ </package>
+ <package>
+ <name>seamonkey</name>
+ <range><lt>2.20</lt></range>
+ </package>
+ <package>
+ <name>thunderbird</name>
+ <range><gt>11.0</gt><lt>17.0.8</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>The Mozilla Project reports:</p>
+ <blockquote cite="http://www.mozilla.org/security/known-vulnerabilities/">
+ <p>MFSA 2013-63 Miscellaneous memory safety hazards (rv:23.0 /
+ rv:17.0.8)</p>
+ <p>MFSA 2013-64 Use after free mutating DOM during SetBody</p>
+ <p>MFSA 2013-65 Buffer underflow when generating CRMF requests</p>
+ <p>MFSA 2013-66 Buffer overflow in Mozilla Maintenance Service and
+ Mozilla Updater</p>
+ <p>MFSA 2013-67 Crash during WAV audio file decoding</p>
+ <p>MFSA 2013-68 Document URI misrepresentation and masquerading</p>
+ <p>MFSA 2013-69 CRMF requests allow for code execution and XSS
+ attacks</p>
+ <p>MFSA 2013-70 Bypass of XrayWrappers using XBL Scopes</p>
+ <p>MFSA 2013-71 Further Privilege escalation through Mozilla Updater</p>
+ <p>MFSA 2013-72 Wrong principal used for validating URI for some
+ Javascript components</p>
+ <p>MFSA 2013-73 Same-origin bypass with web workers and
+ XMLHttpRequest</p>
+ <p>MFSA 2013-74 Firefox full and stub installer DLL hijacking</p>
+ <p>MFSA 2013-75 Local Java applets may read contents of local file
+ system</p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <cvename>CVE-2013-1701</cvename>
+ <cvename>CVE-2013-1702</cvename>
+ <cvename>CVE-2013-1704</cvename>
+ <cvename>CVE-2013-1705</cvename>
+ <cvename>CVE-2013-1706</cvename>
+ <cvename>CVE-2013-1707</cvename>
+ <cvename>CVE-2013-1708</cvename>
+ <cvename>CVE-2013-1709</cvename>
+ <cvename>CVE-2013-1710</cvename>
+ <cvename>CVE-2013-1711</cvename>
+ <cvename>CVE-2013-1712</cvename>
+ <cvename>CVE-2013-1713</cvename>
+ <cvename>CVE-2013-1714</cvename>
+ <cvename>CVE-2013-1715</cvename>
+ <cvename>CVE-2013-1717</cvename>
+ <url>https://www.mozilla.org/security/announce/2013/mfsa2013-63.html</url>
+ <url>https://www.mozilla.org/security/announce/2013/mfsa2013-64.html</url>
+ <url>https://www.mozilla.org/security/announce/2013/mfsa2013-65.html</url>
+ <url>https://www.mozilla.org/security/announce/2013/mfsa2013-66.html</url>
+ <url>https://www.mozilla.org/security/announce/2013/mfsa2013-67.html</url>
+ <url>https://www.mozilla.org/security/announce/2013/mfsa2013-68.html</url>
+ <url>https://www.mozilla.org/security/announce/2013/mfsa2013-69.html</url>
+ <url>https://www.mozilla.org/security/announce/2013/mfsa2013-70.html</url>
+ <url>https://www.mozilla.org/security/announce/2013/mfsa2013-71.html</url>
+ <url>https://www.mozilla.org/security/announce/2013/mfsa2013-72.html</url>
+ <url>http://www.mozilla.org/security/known-vulnerabilities/</url>
+ </references>
+ <dates>
+ <discovery>2013-08-06</discovery>
+ <entry>2013-08-08</entry>
+ </dates>
+ </vuln>
+
<vuln vid="4b448a96-ff73-11e2-b28d-080027ef73ec">
<topic>PuTTY -- Four security holes in versions before 0.63</topic>
<affects>
diff --git a/www/firefox-esr-i18n/Makefile b/www/firefox-esr-i18n/Makefile
index 986d2870aac5..f8c9d961faa1 100644
--- a/www/firefox-esr-i18n/Makefile
+++ b/www/firefox-esr-i18n/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= firefox-i18n
-PORTVERSION= 17.0.7
+PORTVERSION= 17.0.8
CATEGORIES= www
MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}esr/linux-i686/xpi
PKGNAMEPREFIX=
@@ -77,14 +77,7 @@ do-install:
@${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A}
@${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \
${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A}
- @for lang in ${FIREFOX_I18N_}; do \
- for xpi in ${XPI_LINKFARMS} ; do \
- if [ -d $${xpi} ] ; \
- then \
- ${ECHO_CMD} $$xpi/langpack-$$lang@firefox.mozilla.org ${_A} ; \
- fi ; \
- done ; \
- done
+ @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ; { ${RM} -f $$_dir/${WDIR} ; }' ${_A}
post-patch:
${FIND} ${WRKSRC} -name install.rdf -print0 | \
diff --git a/www/firefox-esr-i18n/distinfo b/www/firefox-esr-i18n/distinfo
index 951d9ffd0103..1037efe9c2f9 100644
--- a/www/firefox-esr-i18n/distinfo
+++ b/www/firefox-esr-i18n/distinfo
@@ -1,164 +1,164 @@
-SHA256 (xpi/firefox-i18n-17.0.7/af.xpi) = 74bf225a30cc04972370caea7010bebaf6d0c051802d0672aa54f1a7dce04ba6
-SIZE (xpi/firefox-i18n-17.0.7/af.xpi) = 281146
-SHA256 (xpi/firefox-i18n-17.0.7/ak.xpi) = 681df16dd1d6bca0190937927a4f1559f148e07c14d8e4bfc041f0fa514ce51d
-SIZE (xpi/firefox-i18n-17.0.7/ak.xpi) = 282977
-SHA256 (xpi/firefox-i18n-17.0.7/ar.xpi) = 819f105b7c1b8b7eccd058ddc508c34f7ebcba538eec9b6ac1fc20c56e529166
-SIZE (xpi/firefox-i18n-17.0.7/ar.xpi) = 311507
-SHA256 (xpi/firefox-i18n-17.0.7/ast.xpi) = 8c6684e83782f95889c992a027b516f023062c3f630c0e1795ba0925fcddbf5a
-SIZE (xpi/firefox-i18n-17.0.7/ast.xpi) = 264123
-SHA256 (xpi/firefox-i18n-17.0.7/be.xpi) = c6af3605cef370bad3a5e053a04ba1578b140eda59bd49f3f77b8b621f0f5402
-SIZE (xpi/firefox-i18n-17.0.7/be.xpi) = 273412
-SHA256 (xpi/firefox-i18n-17.0.7/bg.xpi) = cead5bca8aa5466824c1449b006ac1e527f420b3cc1fec8a74127120a45f6669
-SIZE (xpi/firefox-i18n-17.0.7/bg.xpi) = 327261
-SHA256 (xpi/firefox-i18n-17.0.7/bn-BD.xpi) = 26962dd73e0103daa86d9e8bfef02d318c4895cd8f65ac8fe02ab1ae06759832
-SIZE (xpi/firefox-i18n-17.0.7/bn-BD.xpi) = 339303
-SHA256 (xpi/firefox-i18n-17.0.7/bn-IN.xpi) = 67149dd5e3665c8e23b938346c7410eb67e02ebd93842ed69642d7ebb785dd55
-SIZE (xpi/firefox-i18n-17.0.7/bn-IN.xpi) = 373020
-SHA256 (xpi/firefox-i18n-17.0.7/br.xpi) = 29acef5bbea4ac0ac27dabce0d12904ecfad0bc471970bae5ffbac76f5ddae0c
-SIZE (xpi/firefox-i18n-17.0.7/br.xpi) = 291583
-SHA256 (xpi/firefox-i18n-17.0.7/bs.xpi) = 1b4781a36f14fe8e2cdc9e2fb96457072a7683ea7c635d8bdfaa600a1e01fed1
-SIZE (xpi/firefox-i18n-17.0.7/bs.xpi) = 292223
-SHA256 (xpi/firefox-i18n-17.0.7/ca.xpi) = db6230514f43d0f67baff9a4ae8af267151a47c64c29ad7aedbdd714925d8da1
-SIZE (xpi/firefox-i18n-17.0.7/ca.xpi) = 293532
-SHA256 (xpi/firefox-i18n-17.0.7/cs.xpi) = 0d2e2628ad80b033ba8e56165f1dec001d41fbc55bed54d34461ab957d894de2
-SIZE (xpi/firefox-i18n-17.0.7/cs.xpi) = 294133
-SHA256 (xpi/firefox-i18n-17.0.7/cy.xpi) = 4059f990d84e5c02d674adf1ebd2f0d084eed8aed949dc963e9a1030ec51e0a5
-SIZE (xpi/firefox-i18n-17.0.7/cy.xpi) = 284868
-SHA256 (xpi/firefox-i18n-17.0.7/da.xpi) = 3021974d39dc5d984ac71dc6ee092c0ce30870c812451f53dea49a78112ce474
-SIZE (xpi/firefox-i18n-17.0.7/da.xpi) = 282668
-SHA256 (xpi/firefox-i18n-17.0.7/de.xpi) = 175da5ce3eeb5209ef9f23d582d5cb0588d259bb8326e9f1b204e7426aae8393
-SIZE (xpi/firefox-i18n-17.0.7/de.xpi) = 270384
-SHA256 (xpi/firefox-i18n-17.0.7/el.xpi) = 51e8fb44c81ddd1c95384c90556ec697444d6c57de04ad88bf8d764e676880b9
-SIZE (xpi/firefox-i18n-17.0.7/el.xpi) = 311653
-SHA256 (xpi/firefox-i18n-17.0.7/en-GB.xpi) = 45fdaa20904a312a13591b5ce6274fef656550efff80cf0c37a3d8124ad06a5e
-SIZE (xpi/firefox-i18n-17.0.7/en-GB.xpi) = 272104
-SHA256 (xpi/firefox-i18n-17.0.7/en-US.xpi) = ea45f519ae36bdd232fd454246e3ec4522880be45a04a22aaf7a0d0053f12b1d
-SIZE (xpi/firefox-i18n-17.0.7/en-US.xpi) = 272156
-SHA256 (xpi/firefox-i18n-17.0.7/en-ZA.xpi) = 620f7cb74cbf23a3a33630064a48c57acf8b2e98834eb9e6f812ddfbed34e946
-SIZE (xpi/firefox-i18n-17.0.7/en-ZA.xpi) = 272935
-SHA256 (xpi/firefox-i18n-17.0.7/eo.xpi) = 05ef00a9a3ee26fc6250f72aa1c3a6e33841d2f51eb82b826f95a7c1d03c896e
-SIZE (xpi/firefox-i18n-17.0.7/eo.xpi) = 284800
-SHA256 (xpi/firefox-i18n-17.0.7/es-AR.xpi) = 8d54f3f1c83876938dc05ab9e68be9e227ab943d61e1c012853d7ed5ae9da803
-SIZE (xpi/firefox-i18n-17.0.7/es-AR.xpi) = 289239
-SHA256 (xpi/firefox-i18n-17.0.7/es-CL.xpi) = fca01c4742c9fd7137d1fef68edbda1f38390db0b6439bd7b572100102bb4cf5
-SIZE (xpi/firefox-i18n-17.0.7/es-CL.xpi) = 296878
-SHA256 (xpi/firefox-i18n-17.0.7/es-ES.xpi) = 98ebaa2bf3e267ebf3afb3179ac081dba5698626d7a2187cdd97b47909800c9b
-SIZE (xpi/firefox-i18n-17.0.7/es-ES.xpi) = 242185
-SHA256 (xpi/firefox-i18n-17.0.7/es-MX.xpi) = 36f1f74b66c41cb44f203294b96aba95c7849fe2b825e1f53f9f10718332976c
-SIZE (xpi/firefox-i18n-17.0.7/es-MX.xpi) = 247971
-SHA256 (xpi/firefox-i18n-17.0.7/et.xpi) = c6f0904759e4f82902a9c988aa7bea18d9ea1495261c0894fa800d765143279b
-SIZE (xpi/firefox-i18n-17.0.7/et.xpi) = 284694
-SHA256 (xpi/firefox-i18n-17.0.7/eu.xpi) = 7cfe1fdbceee0708f89ec7c1dccb19bb02d4069f05709dbd447e7107a26add30
-SIZE (xpi/firefox-i18n-17.0.7/eu.xpi) = 284227
-SHA256 (xpi/firefox-i18n-17.0.7/fa.xpi) = fce435814c1f9419110ff48f8a21dfb4df9c5434b84c1ccc57b86636e9c4707a
-SIZE (xpi/firefox-i18n-17.0.7/fa.xpi) = 323997
-SHA256 (xpi/firefox-i18n-17.0.7/fi.xpi) = fb1b40aee5dea000875bd02eff42ab1cf6a558cf46060cc77ae82e0b472d940b
-SIZE (xpi/firefox-i18n-17.0.7/fi.xpi) = 288655
-SHA256 (xpi/firefox-i18n-17.0.7/fr.xpi) = a62c3ad915b327654274ac9e7223587c06ef783dc8e8ae1290d704a96f588957
-SIZE (xpi/firefox-i18n-17.0.7/fr.xpi) = 293362
-SHA256 (xpi/firefox-i18n-17.0.7/fy-NL.xpi) = 867ae3fe9625209740d7d031067a56734392ddfdcfff58740e1975cf53df8de1
-SIZE (xpi/firefox-i18n-17.0.7/fy-NL.xpi) = 289690
-SHA256 (xpi/firefox-i18n-17.0.7/ga-IE.xpi) = 38fed4a42b4e76f5b5162e8ddcff0a9dab14fed8012f8c2f1962e2f0fbcdef8d
-SIZE (xpi/firefox-i18n-17.0.7/ga-IE.xpi) = 296976
-SHA256 (xpi/firefox-i18n-17.0.7/gl.xpi) = b5e5fe25fb478894c003ee21f4793f42b5dfaf225d99aaf82f8cb50d7fd7ea9d
-SIZE (xpi/firefox-i18n-17.0.7/gl.xpi) = 286997
-SHA256 (xpi/firefox-i18n-17.0.7/gu-IN.xpi) = d4c24ce26e75c832277a8f751987f5df6708aa2baae7e8169648594c6b71b55b
-SIZE (xpi/firefox-i18n-17.0.7/gu-IN.xpi) = 319480
-SHA256 (xpi/firefox-i18n-17.0.7/he.xpi) = 8af4ad6c4807edfb8587dca1a18599fba14002a51e325c1694c96e57bfcc6309
-SIZE (xpi/firefox-i18n-17.0.7/he.xpi) = 301482
-SHA256 (xpi/firefox-i18n-17.0.7/hi-IN.xpi) = 05ed11fb2a7843efaf2262501e75195cab2049d4df9c10d14b00f8a829923208
-SIZE (xpi/firefox-i18n-17.0.7/hi-IN.xpi) = 330864
-SHA256 (xpi/firefox-i18n-17.0.7/hr.xpi) = ee2c8f53a000d3d4e40636f1a7fcf3d0ce218a8ba05c8f4992ba4941d74cd2b8
-SIZE (xpi/firefox-i18n-17.0.7/hr.xpi) = 287940
-SHA256 (xpi/firefox-i18n-17.0.7/hu.xpi) = a567495cdf722b4286c56605dc7c2ed13777729bb90574c9e798c3762e66046f
-SIZE (xpi/firefox-i18n-17.0.7/hu.xpi) = 303044
-SHA256 (xpi/firefox-i18n-17.0.7/hy-AM.xpi) = cc58d8e5e875a316af456a8b1b5374446becff68b95fe9298e03c458588d1607
-SIZE (xpi/firefox-i18n-17.0.7/hy-AM.xpi) = 328203
-SHA256 (xpi/firefox-i18n-17.0.7/id.xpi) = f5e437c96d1d74aefcc3ff886a0e648b0f1173606e55b5e5dcd5e19f451f1277
-SIZE (xpi/firefox-i18n-17.0.7/id.xpi) = 283726
-SHA256 (xpi/firefox-i18n-17.0.7/is.xpi) = 1802addd16309db28ea6e927decb720772515528a154af0676f952746d2d21cc
-SIZE (xpi/firefox-i18n-17.0.7/is.xpi) = 284908
-SHA256 (xpi/firefox-i18n-17.0.7/it.xpi) = 30dbb3a702a442e331417be405656b448b63faa747948b659129f5ddfc9cce69
-SIZE (xpi/firefox-i18n-17.0.7/it.xpi) = 238645
-SHA256 (xpi/firefox-i18n-17.0.7/ja.xpi) = fd65567657572dfabcf8f1845c099adef96d350bfbbc6403a8d4424b75b4233b
-SIZE (xpi/firefox-i18n-17.0.7/ja.xpi) = 322490
-SHA256 (xpi/firefox-i18n-17.0.7/kk.xpi) = d245734b9bfd099d1d6b3b4b8380baf744d22cd49c720b9c48324e18aafbcd84
-SIZE (xpi/firefox-i18n-17.0.7/kk.xpi) = 330352
-SHA256 (xpi/firefox-i18n-17.0.7/kn.xpi) = b1c81e19554d9f06e130245d4a777389c9097719047906d5f8662945a4cd3156
-SIZE (xpi/firefox-i18n-17.0.7/kn.xpi) = 354901
-SHA256 (xpi/firefox-i18n-17.0.7/ko.xpi) = 81febd5b62a1a1da137ff051bd4542b33dab7573bcdc15b2b6177d4ecf69037f
-SIZE (xpi/firefox-i18n-17.0.7/ko.xpi) = 296729
-SHA256 (xpi/firefox-i18n-17.0.7/ku.xpi) = 29be49ec772fd51f00a70fe6c0f1c3322d8f3dbf4d62ab931e31bae384af1f55
-SIZE (xpi/firefox-i18n-17.0.7/ku.xpi) = 304898
-SHA256 (xpi/firefox-i18n-17.0.7/lg.xpi) = f6b2e6463bd619b217d335016d7f8845052038bce34dec7360af9f5ee24bd409
-SIZE (xpi/firefox-i18n-17.0.7/lg.xpi) = 290627
-SHA256 (xpi/firefox-i18n-17.0.7/lt.xpi) = 599633cbf8d0f1f2b313d88aff7a0114480dd88f9e899fae111c7455277ddb50
-SIZE (xpi/firefox-i18n-17.0.7/lt.xpi) = 349462
-SHA256 (xpi/firefox-i18n-17.0.7/lv.xpi) = 11e3879b5ac3444ccb2cc6fc7c9465b3cfac0ec0e45de0b7a90406d18d1dead1
-SIZE (xpi/firefox-i18n-17.0.7/lv.xpi) = 291404
-SHA256 (xpi/firefox-i18n-17.0.7/mai.xpi) = 0bf0a8592a04144c8f897e1af83bad5386e728f7ec07f1bcd65f7572046c0aad
-SIZE (xpi/firefox-i18n-17.0.7/mai.xpi) = 328267
-SHA256 (xpi/firefox-i18n-17.0.7/mk.xpi) = 430c30cf1d7df013288e3861a23303f73d59a0711a77b6aa5ebfa67e2a6ec83a
-SIZE (xpi/firefox-i18n-17.0.7/mk.xpi) = 315578
-SHA256 (xpi/firefox-i18n-17.0.7/ml.xpi) = f42443cf981c20fa53ef69163e7a275fce9f45020ae1555dadf8129adc0a79f9
-SIZE (xpi/firefox-i18n-17.0.7/ml.xpi) = 361541
-SHA256 (xpi/firefox-i18n-17.0.7/mr.xpi) = 81cf6fc871c13302a055f9bd5831e44b873112e3df19ba0573a0bb8c1c5436cf
-SIZE (xpi/firefox-i18n-17.0.7/mr.xpi) = 327860
-SHA256 (xpi/firefox-i18n-17.0.7/nb-NO.xpi) = d543754f85da54cf3d650c95358270635bf8984f6efa387a31ca7304d9af80bc
-SIZE (xpi/firefox-i18n-17.0.7/nb-NO.xpi) = 284889
-SHA256 (xpi/firefox-i18n-17.0.7/nl.xpi) = feb20ea9c8582e01d580f1a32859af0178a357508dc113ae2fb2e16e009edb0f
-SIZE (xpi/firefox-i18n-17.0.7/nl.xpi) = 286112
-SHA256 (xpi/firefox-i18n-17.0.7/nn-NO.xpi) = 3bc334a581a5712d3e251b4b4dd9cc27fb5d125e456c857d773c02d6025987ae
-SIZE (xpi/firefox-i18n-17.0.7/nn-NO.xpi) = 287844
-SHA256 (xpi/firefox-i18n-17.0.7/nso.xpi) = 9d41bd59dc34d335f0fc27d4d8c2912290fbaba25cd234e965a8739f8ce9559b
-SIZE (xpi/firefox-i18n-17.0.7/nso.xpi) = 288150
-SHA256 (xpi/firefox-i18n-17.0.7/or.xpi) = 019aaeaa54920e852ef3c377ebc98a822cf928b1af0d4e8f89f76faa482609c2
-SIZE (xpi/firefox-i18n-17.0.7/or.xpi) = 329684
-SHA256 (xpi/firefox-i18n-17.0.7/pa-IN.xpi) = 3efeb0e03390716051c38ac232e5b3e3a1c97aa766d621f2c51807e72e3960db
-SIZE (xpi/firefox-i18n-17.0.7/pa-IN.xpi) = 318504
-SHA256 (xpi/firefox-i18n-17.0.7/pl.xpi) = 7af402459060dd138c6e4cf0232c29660847c280ea3ceefa431374fbe9627a6a
-SIZE (xpi/firefox-i18n-17.0.7/pl.xpi) = 301035
-SHA256 (xpi/firefox-i18n-17.0.7/pt-BR.xpi) = 4ec43982e0d46f98e3aba6eb73c991bdbf919ec0ad71e15990289a8770fde048
-SIZE (xpi/firefox-i18n-17.0.7/pt-BR.xpi) = 289244
-SHA256 (xpi/firefox-i18n-17.0.7/pt-PT.xpi) = 2e786ce630ab2add3c3de61eeb368c388704e25cad9e4ff22d3b52d0e46240d7
-SIZE (xpi/firefox-i18n-17.0.7/pt-PT.xpi) = 291458
-SHA256 (xpi/firefox-i18n-17.0.7/rm.xpi) = b3c1d552b2345b425cf447329479e440d5c545e26bc3ebecf069cafad744a909
-SIZE (xpi/firefox-i18n-17.0.7/rm.xpi) = 288466
-SHA256 (xpi/firefox-i18n-17.0.7/ro.xpi) = 0f3084786125119e70c87e43189b1bd389c38b0c7dfa87ffaa2ea716f19088f9
-SIZE (xpi/firefox-i18n-17.0.7/ro.xpi) = 310252
-SHA256 (xpi/firefox-i18n-17.0.7/ru.xpi) = 697156a29547c449242a612a66e2bc5be04d0dca144f59a50815a6b3716b9297
-SIZE (xpi/firefox-i18n-17.0.7/ru.xpi) = 284915
-SHA256 (xpi/firefox-i18n-17.0.7/si.xpi) = 6731835e1473765c9217136f4dcfef2632d6630802b22605bad5fd0bb95dc0be
-SIZE (xpi/firefox-i18n-17.0.7/si.xpi) = 317364
-SHA256 (xpi/firefox-i18n-17.0.7/sk.xpi) = cb6f8b863b66dd3fc13c65599d3b92e35f890bce47cce3d160be91a618d0bdca
-SIZE (xpi/firefox-i18n-17.0.7/sk.xpi) = 301478
-SHA256 (xpi/firefox-i18n-17.0.7/sl.xpi) = 023c26ccb4cb2fdf57f44c180721811fa51cd6b2018dcc81c327331a6f7ac233
-SIZE (xpi/firefox-i18n-17.0.7/sl.xpi) = 286638
-SHA256 (xpi/firefox-i18n-17.0.7/son.xpi) = df325d6ce5665edff22a4f26a6434e0807cfbe4fd8ca96204eb2b90e42c2db1d
-SIZE (xpi/firefox-i18n-17.0.7/son.xpi) = 283684
-SHA256 (xpi/firefox-i18n-17.0.7/sq.xpi) = be510f3fee40ef6cb125b1347958784988b8b4724757442d518ef2e0837e5376
-SIZE (xpi/firefox-i18n-17.0.7/sq.xpi) = 291166
-SHA256 (xpi/firefox-i18n-17.0.7/sr.xpi) = c8c572ea17d35c85f887e78e95e8820c1bffc33b23f1e441a0200a2deddc238a
-SIZE (xpi/firefox-i18n-17.0.7/sr.xpi) = 334015
-SHA256 (xpi/firefox-i18n-17.0.7/sv-SE.xpi) = 967f89cfac130667467c5369f2f03e19f34495466eb8abba9abed1dc7056aacf
-SIZE (xpi/firefox-i18n-17.0.7/sv-SE.xpi) = 288084
-SHA256 (xpi/firefox-i18n-17.0.7/ta-LK.xpi) = 01a23056b60d2f298709f04cd2864fb91432d70d1f95f8d3956eab4dda01b022
-SIZE (xpi/firefox-i18n-17.0.7/ta-LK.xpi) = 339932
-SHA256 (xpi/firefox-i18n-17.0.7/ta.xpi) = 68887628bf9951b50c208fd61a65264ad58b0e9c60b324d76955797bbf0177f3
-SIZE (xpi/firefox-i18n-17.0.7/ta.xpi) = 325367
-SHA256 (xpi/firefox-i18n-17.0.7/te.xpi) = 240d57b52f0b71395f91fdc340385b73d7db3be6b73fa3c33df6edc1d86ae3fc
-SIZE (xpi/firefox-i18n-17.0.7/te.xpi) = 341958
-SHA256 (xpi/firefox-i18n-17.0.7/th.xpi) = 34579b3c1eed030e772f3524e84320dd54ae00b3dfc2721e59667a0fbf6d0377
-SIZE (xpi/firefox-i18n-17.0.7/th.xpi) = 323677
-SHA256 (xpi/firefox-i18n-17.0.7/tr.xpi) = fd66b98dc118503925333bee2e85de5af18aabc73fdcacf54aeb9ff8d32bf7a6
-SIZE (xpi/firefox-i18n-17.0.7/tr.xpi) = 295842
-SHA256 (xpi/firefox-i18n-17.0.7/uk.xpi) = 63b43edd306d7d7b1e91e55044bb57685f087eae850ad0f77d4ff7c0e4d0da63
-SIZE (xpi/firefox-i18n-17.0.7/uk.xpi) = 324251
-SHA256 (xpi/firefox-i18n-17.0.7/vi.xpi) = a619ed26bd2e1faf639907a9303122b881275363905f5d93363cb7f15ca5ff18
-SIZE (xpi/firefox-i18n-17.0.7/vi.xpi) = 313549
-SHA256 (xpi/firefox-i18n-17.0.7/zh-CN.xpi) = 88de49866b923d0ed0b2df7018275fa4d9c645b0a121399018e12eed042eba77
-SIZE (xpi/firefox-i18n-17.0.7/zh-CN.xpi) = 304251
-SHA256 (xpi/firefox-i18n-17.0.7/zh-TW.xpi) = 8f293b66e88e9b9ada84537e0ba91c28691d65797889ca5f6f642516b58d102c
-SIZE (xpi/firefox-i18n-17.0.7/zh-TW.xpi) = 305438
-SHA256 (xpi/firefox-i18n-17.0.7/zu.xpi) = 4fb2ac54b2049358c696a885862f503b23c37febe78963338b1345d62a739437
-SIZE (xpi/firefox-i18n-17.0.7/zu.xpi) = 296594
+SHA256 (xpi/firefox-i18n-17.0.8/af.xpi) = b230ec6216b66cd4ebb562f6dba8d7d83450e24cd9fcee8f935984ba18af8101
+SIZE (xpi/firefox-i18n-17.0.8/af.xpi) = 281145
+SHA256 (xpi/firefox-i18n-17.0.8/ak.xpi) = ad19c1528c0655919be353b9cdd48341783b74ab7a5f3164492b986d4c656e86
+SIZE (xpi/firefox-i18n-17.0.8/ak.xpi) = 282976
+SHA256 (xpi/firefox-i18n-17.0.8/ar.xpi) = d231ff048e817b50c2f70934b7f4ad166b3a90098a0b6d64ba99eda9823342cd
+SIZE (xpi/firefox-i18n-17.0.8/ar.xpi) = 311506
+SHA256 (xpi/firefox-i18n-17.0.8/ast.xpi) = 30415f6d08bf4371ce81ebe4be53a15e10f4481e08fab8af684b7d61401f784a
+SIZE (xpi/firefox-i18n-17.0.8/ast.xpi) = 264122
+SHA256 (xpi/firefox-i18n-17.0.8/be.xpi) = 9a82182e59950ed11f867e6595f3ba17d1cb695196eeb51b30e76215852aa4da
+SIZE (xpi/firefox-i18n-17.0.8/be.xpi) = 273411
+SHA256 (xpi/firefox-i18n-17.0.8/bg.xpi) = 4e6de543f17f626092badac19cb2025951f414592b4cecfd958fd0cf38a35ee6
+SIZE (xpi/firefox-i18n-17.0.8/bg.xpi) = 327260
+SHA256 (xpi/firefox-i18n-17.0.8/bn-BD.xpi) = e441286a34f177c757209447191b4b0e03cd1f2a9913aad8037b93136e8709c8
+SIZE (xpi/firefox-i18n-17.0.8/bn-BD.xpi) = 339303
+SHA256 (xpi/firefox-i18n-17.0.8/bn-IN.xpi) = d7e1858997060d73dc0636d96a42c6c5225995cd3517a6bf99b31c19a8d93408
+SIZE (xpi/firefox-i18n-17.0.8/bn-IN.xpi) = 373020
+SHA256 (xpi/firefox-i18n-17.0.8/br.xpi) = dc76c59ee7ea381ebba96d751ab1c13e61ece1621a9ab0ba1bab1ac762d6bc08
+SIZE (xpi/firefox-i18n-17.0.8/br.xpi) = 291582
+SHA256 (xpi/firefox-i18n-17.0.8/bs.xpi) = cd017af4a9bfd7b1d83bf6963b33c3f8297c0c52ce2c4b114f0022cc6ed275a8
+SIZE (xpi/firefox-i18n-17.0.8/bs.xpi) = 292222
+SHA256 (xpi/firefox-i18n-17.0.8/ca.xpi) = 466e188e66115d29d7e58d59243c9bfc40b0a65d001e04565a93b9d8e405db32
+SIZE (xpi/firefox-i18n-17.0.8/ca.xpi) = 293531
+SHA256 (xpi/firefox-i18n-17.0.8/cs.xpi) = 812cb191176fde28282e97ab788279b06d89b10ca1fff216f87338057774db6f
+SIZE (xpi/firefox-i18n-17.0.8/cs.xpi) = 294132
+SHA256 (xpi/firefox-i18n-17.0.8/cy.xpi) = 63b256f0adc1106f3284b46844409d81a7aed6c8247783e01e80578ab198486c
+SIZE (xpi/firefox-i18n-17.0.8/cy.xpi) = 284867
+SHA256 (xpi/firefox-i18n-17.0.8/da.xpi) = 051443a3f523907feea4a28f5b33642f0255561223ed0239a9ad16ea1825bfa7
+SIZE (xpi/firefox-i18n-17.0.8/da.xpi) = 282668
+SHA256 (xpi/firefox-i18n-17.0.8/de.xpi) = 91ace69f197ea68091cb1ffaf0f02b6f26786c2f057c002ce7a37664f32283ec
+SIZE (xpi/firefox-i18n-17.0.8/de.xpi) = 270383
+SHA256 (xpi/firefox-i18n-17.0.8/el.xpi) = 468f0d3c3a7df86fc5797c7153f87fbee0e19909e57a2fe5da5585dbd2779980
+SIZE (xpi/firefox-i18n-17.0.8/el.xpi) = 311652
+SHA256 (xpi/firefox-i18n-17.0.8/en-GB.xpi) = 416064538e1bc74c5489e7d4dbddcf334d8a6c7284a6f17066388a68bcbb4fac
+SIZE (xpi/firefox-i18n-17.0.8/en-GB.xpi) = 272103
+SHA256 (xpi/firefox-i18n-17.0.8/en-US.xpi) = 82fa43a711d466ae618212e720718e0480dde2f63319b985b0bce673415a58da
+SIZE (xpi/firefox-i18n-17.0.8/en-US.xpi) = 272155
+SHA256 (xpi/firefox-i18n-17.0.8/en-ZA.xpi) = adcda2ac9ea782d84faad11e138dc71b60558f2ab1cce71e80b9081bb0fb00f0
+SIZE (xpi/firefox-i18n-17.0.8/en-ZA.xpi) = 272934
+SHA256 (xpi/firefox-i18n-17.0.8/eo.xpi) = 3c1cdc4caef2e5c670b271d2ef7eb704256db883083b58ac0697deffe8ce708f
+SIZE (xpi/firefox-i18n-17.0.8/eo.xpi) = 284799
+SHA256 (xpi/firefox-i18n-17.0.8/es-AR.xpi) = 254e8cdf8c06e180578b2d9f353fbb64c0825560bd0bf882fb42f7f8c03e5072
+SIZE (xpi/firefox-i18n-17.0.8/es-AR.xpi) = 289238
+SHA256 (xpi/firefox-i18n-17.0.8/es-CL.xpi) = 3334e3a1c783235be7d48a30fa79476030eccebda6ccf0034eaa7d85a53d3eec
+SIZE (xpi/firefox-i18n-17.0.8/es-CL.xpi) = 296877
+SHA256 (xpi/firefox-i18n-17.0.8/es-ES.xpi) = 03a4d82e6e104329b78d6fde6285b1d0f274ac1dc62e3139a1a44121e2e4824c
+SIZE (xpi/firefox-i18n-17.0.8/es-ES.xpi) = 242184
+SHA256 (xpi/firefox-i18n-17.0.8/es-MX.xpi) = ea49b40abcc36a4a32fae739e39b1700bf172b5dddc14919592bbd1b6e1db3a5
+SIZE (xpi/firefox-i18n-17.0.8/es-MX.xpi) = 247970
+SHA256 (xpi/firefox-i18n-17.0.8/et.xpi) = f8b40208cecbe5423e072f0063f43d85358f47c2535e837b0c3ca8258ec71cfb
+SIZE (xpi/firefox-i18n-17.0.8/et.xpi) = 284693
+SHA256 (xpi/firefox-i18n-17.0.8/eu.xpi) = 08b98652a8523d6c7db09d8450f25136d778f9917b26192672d454d5c1e6c752
+SIZE (xpi/firefox-i18n-17.0.8/eu.xpi) = 284226
+SHA256 (xpi/firefox-i18n-17.0.8/fa.xpi) = 8fa06ed42c935fc4032a7ecf3efcf9a4604bcea06239546c3ff0e28fcbf4406c
+SIZE (xpi/firefox-i18n-17.0.8/fa.xpi) = 323996
+SHA256 (xpi/firefox-i18n-17.0.8/fi.xpi) = 8e32ca2ec68e8b405d4eb06d6e1fc7b81e3a8368241da71e979cf98d026b5eb0
+SIZE (xpi/firefox-i18n-17.0.8/fi.xpi) = 288654
+SHA256 (xpi/firefox-i18n-17.0.8/fr.xpi) = d94d3dc443433ccf773165eb190d953efa41b52a893a0784868749c953d4f3d1
+SIZE (xpi/firefox-i18n-17.0.8/fr.xpi) = 293361
+SHA256 (xpi/firefox-i18n-17.0.8/fy-NL.xpi) = bd2ed697ed7a6962d57a46e1bfa91dad09ee2e2afd72246699a87270cd09d4c4
+SIZE (xpi/firefox-i18n-17.0.8/fy-NL.xpi) = 289689
+SHA256 (xpi/firefox-i18n-17.0.8/ga-IE.xpi) = 4061b160586f9e7cb298e39f96ddeae64e1e6b37dc8b5955e01dff4f78a9d920
+SIZE (xpi/firefox-i18n-17.0.8/ga-IE.xpi) = 296975
+SHA256 (xpi/firefox-i18n-17.0.8/gl.xpi) = 59c1888ffd571ed199bb921bd82c2810eed8d1fee2e0057e2da463beab48b603
+SIZE (xpi/firefox-i18n-17.0.8/gl.xpi) = 286996
+SHA256 (xpi/firefox-i18n-17.0.8/gu-IN.xpi) = b8b78e370e75b8de1211cf0d0d88fb56efb77b5aa79f56e17d0142f93d795328
+SIZE (xpi/firefox-i18n-17.0.8/gu-IN.xpi) = 319479
+SHA256 (xpi/firefox-i18n-17.0.8/he.xpi) = d3aa3790c1c0023ec3a306d38227401a0c76ebd2480ad5a1a366ea9ac37696e0
+SIZE (xpi/firefox-i18n-17.0.8/he.xpi) = 301481
+SHA256 (xpi/firefox-i18n-17.0.8/hi-IN.xpi) = 6caad9514b2ab45b6e7fc6ee5a146a6735c9e74f80fa4d8ae9de19215644c5c4
+SIZE (xpi/firefox-i18n-17.0.8/hi-IN.xpi) = 330863
+SHA256 (xpi/firefox-i18n-17.0.8/hr.xpi) = 336a9fa402e16201c699a3ac2f3f61d3a8ce8e77286c21ae92ea6ca4ab7a02c6
+SIZE (xpi/firefox-i18n-17.0.8/hr.xpi) = 287939
+SHA256 (xpi/firefox-i18n-17.0.8/hu.xpi) = 588d58f50d75680a371d139f8ff5bcf85d1c747c1ce5ea68fa005548df515562
+SIZE (xpi/firefox-i18n-17.0.8/hu.xpi) = 303043
+SHA256 (xpi/firefox-i18n-17.0.8/hy-AM.xpi) = 22037ccc6a0088f8410ede7c81d12d6c0fdb1074f28c9a1a22e681d580196edd
+SIZE (xpi/firefox-i18n-17.0.8/hy-AM.xpi) = 328202
+SHA256 (xpi/firefox-i18n-17.0.8/id.xpi) = 773894853aa09990d2b9d37b7882d2dc3278828886f9b85597baa69c5347889f
+SIZE (xpi/firefox-i18n-17.0.8/id.xpi) = 283725
+SHA256 (xpi/firefox-i18n-17.0.8/is.xpi) = 1341dc8eee9a07d1061f3beff8ea746be36ae9f1336aac915290d286b6b1ea25
+SIZE (xpi/firefox-i18n-17.0.8/is.xpi) = 284907
+SHA256 (xpi/firefox-i18n-17.0.8/it.xpi) = ddfaabc26f18f2881afda0d9b62d1b42cd7b40e3e98ca99529c7387d98fd4bbe
+SIZE (xpi/firefox-i18n-17.0.8/it.xpi) = 238644
+SHA256 (xpi/firefox-i18n-17.0.8/ja.xpi) = 48346c6e27fd398802bdb8fdf2da32769fec39db78b62250a1cbf72f1fc2908f
+SIZE (xpi/firefox-i18n-17.0.8/ja.xpi) = 322489
+SHA256 (xpi/firefox-i18n-17.0.8/kk.xpi) = db597265643957a0cfeb21e2fdd85907c1224f52af9cb4bd24670b5783de6bf8
+SIZE (xpi/firefox-i18n-17.0.8/kk.xpi) = 330351
+SHA256 (xpi/firefox-i18n-17.0.8/kn.xpi) = 518dfdbf264c42071b7d6e06e319aa07e77d41e42fc17b3d7412f95b4f8a1bf4
+SIZE (xpi/firefox-i18n-17.0.8/kn.xpi) = 354899
+SHA256 (xpi/firefox-i18n-17.0.8/ko.xpi) = e13ff9b91db6ec679f2bc390b58e17e451af66433d77b4ff230b5e0a7986912d
+SIZE (xpi/firefox-i18n-17.0.8/ko.xpi) = 296728
+SHA256 (xpi/firefox-i18n-17.0.8/ku.xpi) = d4866a48150e7d6af889f84aa34c822d9f8a4596e237f027cacef4eba85df663
+SIZE (xpi/firefox-i18n-17.0.8/ku.xpi) = 304897
+SHA256 (xpi/firefox-i18n-17.0.8/lg.xpi) = 01450fe3487e69a920b6181499268b9cd453d9de66bad06415b5a6a0dfcc19d6
+SIZE (xpi/firefox-i18n-17.0.8/lg.xpi) = 290627
+SHA256 (xpi/firefox-i18n-17.0.8/lt.xpi) = 74ab59a24994f2256a58387e80ec9986b4152906889a2d8cbba80cfcb71186e7
+SIZE (xpi/firefox-i18n-17.0.8/lt.xpi) = 349461
+SHA256 (xpi/firefox-i18n-17.0.8/lv.xpi) = 6bb40de2eb19cb92f6630dd6f88a3fa2e881d6e10bf9ef8facfb18d0ef68de52
+SIZE (xpi/firefox-i18n-17.0.8/lv.xpi) = 291403
+SHA256 (xpi/firefox-i18n-17.0.8/mai.xpi) = b0e421debb03d0d5c567c33d17c6b3f7edca6f458bca6ceac0553977648c9e88
+SIZE (xpi/firefox-i18n-17.0.8/mai.xpi) = 328266
+SHA256 (xpi/firefox-i18n-17.0.8/mk.xpi) = 85c2d2d6781bd5aa1d9ac7cae20bfa3cb654d4dbb230f89a95cae053e0563f35
+SIZE (xpi/firefox-i18n-17.0.8/mk.xpi) = 315578
+SHA256 (xpi/firefox-i18n-17.0.8/ml.xpi) = f6a288766bf716aff11707382c808998d0ea222881d7bf2fe4add1acdb44cc49
+SIZE (xpi/firefox-i18n-17.0.8/ml.xpi) = 361541
+SHA256 (xpi/firefox-i18n-17.0.8/mr.xpi) = 2920a89bbf8860a23f1af367c2a97771d4c1446c6255f56358ccfd396e0f9d9a
+SIZE (xpi/firefox-i18n-17.0.8/mr.xpi) = 327860
+SHA256 (xpi/firefox-i18n-17.0.8/nb-NO.xpi) = c5baedc2320fba99d7cea011d188e2153ccf45ea02dc4877f37f7ac3c9cc4cb8
+SIZE (xpi/firefox-i18n-17.0.8/nb-NO.xpi) = 284888
+SHA256 (xpi/firefox-i18n-17.0.8/nl.xpi) = 4ff95dba4e22d16860fd0f1c78d1a48e491854da4a64973521a551c619b83200
+SIZE (xpi/firefox-i18n-17.0.8/nl.xpi) = 286111
+SHA256 (xpi/firefox-i18n-17.0.8/nn-NO.xpi) = bf43f46d3c7096fa12d9ae463b70f42f81ea62d7e8e8a8b9fd51f402e1496b35
+SIZE (xpi/firefox-i18n-17.0.8/nn-NO.xpi) = 287843
+SHA256 (xpi/firefox-i18n-17.0.8/nso.xpi) = 84fabb7dd08eeab63a01b0d355b489482a131e0455d7d29c2d330d433831601d
+SIZE (xpi/firefox-i18n-17.0.8/nso.xpi) = 288149
+SHA256 (xpi/firefox-i18n-17.0.8/or.xpi) = 860c48ab8b8e2fdb07bb911fc5e8464b766315bf1ecf828e0edb7b2f545d5d0c
+SIZE (xpi/firefox-i18n-17.0.8/or.xpi) = 329683
+SHA256 (xpi/firefox-i18n-17.0.8/pa-IN.xpi) = b706b38a4b56116b3b511aa10b220163460369396fdd2e51d27cea2bf55841cf
+SIZE (xpi/firefox-i18n-17.0.8/pa-IN.xpi) = 318503
+SHA256 (xpi/firefox-i18n-17.0.8/pl.xpi) = 7585c41ff1782425e58b983854351e6f46e7f393903da89a935ac4a326f14ba7
+SIZE (xpi/firefox-i18n-17.0.8/pl.xpi) = 301034
+SHA256 (xpi/firefox-i18n-17.0.8/pt-BR.xpi) = 374a98cf06339353107cc90df09b71031e86928391daa8773fe326fcd747cc48
+SIZE (xpi/firefox-i18n-17.0.8/pt-BR.xpi) = 289243
+SHA256 (xpi/firefox-i18n-17.0.8/pt-PT.xpi) = 43b73d362ad90bce3ff441dfc9190cdbe087edefc1940414e2ba19a7cfb782bd
+SIZE (xpi/firefox-i18n-17.0.8/pt-PT.xpi) = 291457
+SHA256 (xpi/firefox-i18n-17.0.8/rm.xpi) = 3bc04a2b8ab825a2bb1799da4caf247344e827c8519dee0d1b36e0891df458fd
+SIZE (xpi/firefox-i18n-17.0.8/rm.xpi) = 288466
+SHA256 (xpi/firefox-i18n-17.0.8/ro.xpi) = fa58ef604f0165d7016ba64cf13a6a1792dc30af84b5a3a2d4531a4b0c0ec753
+SIZE (xpi/firefox-i18n-17.0.8/ro.xpi) = 310251
+SHA256 (xpi/firefox-i18n-17.0.8/ru.xpi) = b3baf4f5f539a792722ebbed6d8c27162812548459d2ff5a78ae2917c739d02e
+SIZE (xpi/firefox-i18n-17.0.8/ru.xpi) = 284914
+SHA256 (xpi/firefox-i18n-17.0.8/si.xpi) = 16fcc9103fb5ed622458c35c4115d3513a6aff065336aac9ce3a7304db826ec9
+SIZE (xpi/firefox-i18n-17.0.8/si.xpi) = 317364
+SHA256 (xpi/firefox-i18n-17.0.8/sk.xpi) = 8ab8a0c823083e0fa5db5c8b9e78779a2553ee2c453b2d8190b53ce82788be59
+SIZE (xpi/firefox-i18n-17.0.8/sk.xpi) = 301478
+SHA256 (xpi/firefox-i18n-17.0.8/sl.xpi) = b525ac9584c3803fd5f22ce611b3462f3959f89817ad27e682d31e50079ebd79
+SIZE (xpi/firefox-i18n-17.0.8/sl.xpi) = 286637
+SHA256 (xpi/firefox-i18n-17.0.8/son.xpi) = 70098df1962037b466d1e5f757bdd065575cfc0f90c5b60310f632ce1385f62c
+SIZE (xpi/firefox-i18n-17.0.8/son.xpi) = 283683
+SHA256 (xpi/firefox-i18n-17.0.8/sq.xpi) = c5a59d0ec7d1721fd806e8e5bfe11494848af04ded5f7755041c09e44d3f88d5
+SIZE (xpi/firefox-i18n-17.0.8/sq.xpi) = 291165
+SHA256 (xpi/firefox-i18n-17.0.8/sr.xpi) = 9ee6800e5f774556d5a6f0a6e9ba506524e01c944b17bbc9d2e588222078e5f6
+SIZE (xpi/firefox-i18n-17.0.8/sr.xpi) = 334014
+SHA256 (xpi/firefox-i18n-17.0.8/sv-SE.xpi) = c7ee92f5d8dc48208299fee3aae747d79c8e971d7f27ef99b4591e9ad658f167
+SIZE (xpi/firefox-i18n-17.0.8/sv-SE.xpi) = 288083
+SHA256 (xpi/firefox-i18n-17.0.8/ta-LK.xpi) = 481185f7b6441b483d220178f3fc35c0a27156a4983d0e42c2a8131795a7a572
+SIZE (xpi/firefox-i18n-17.0.8/ta-LK.xpi) = 339931
+SHA256 (xpi/firefox-i18n-17.0.8/ta.xpi) = 474ea9b302f95b65a448b160febef1524e08bf41dcd32b9f29d5080febc7ea5e
+SIZE (xpi/firefox-i18n-17.0.8/ta.xpi) = 325366
+SHA256 (xpi/firefox-i18n-17.0.8/te.xpi) = 0bf544b82f849920b06d14f6035bb29d2d63848bef949d8b8f3d032e6259d1f6
+SIZE (xpi/firefox-i18n-17.0.8/te.xpi) = 341957
+SHA256 (xpi/firefox-i18n-17.0.8/th.xpi) = 426b343db09a6fec7714c067eaa945d1ba0db27e2e0787efb7c897107ca0b004
+SIZE (xpi/firefox-i18n-17.0.8/th.xpi) = 323677
+SHA256 (xpi/firefox-i18n-17.0.8/tr.xpi) = 0d4c80148bbffeba4d1b27bd22c1f6dde4a755274f3c33a933d223fba53b0975
+SIZE (xpi/firefox-i18n-17.0.8/tr.xpi) = 295841
+SHA256 (xpi/firefox-i18n-17.0.8/uk.xpi) = 9965c7f6bcf5eacc2e494b5cf0f034f950f81cbc239cb9aadaa877d0b6825843
+SIZE (xpi/firefox-i18n-17.0.8/uk.xpi) = 324250
+SHA256 (xpi/firefox-i18n-17.0.8/vi.xpi) = de96642a822d7d31079ae4e2209492e54a08eb3e4cf35f4c35269120b2ee95ed
+SIZE (xpi/firefox-i18n-17.0.8/vi.xpi) = 313548
+SHA256 (xpi/firefox-i18n-17.0.8/zh-CN.xpi) = ec85c2473bf4b28f40394d7153b0e8a1197e60eea2ab8fee86cf408ba510e79f
+SIZE (xpi/firefox-i18n-17.0.8/zh-CN.xpi) = 304250
+SHA256 (xpi/firefox-i18n-17.0.8/zh-TW.xpi) = b2881a5b4abbe19246a423427129d4111e531c765740ad5474c370a57e74cd6b
+SIZE (xpi/firefox-i18n-17.0.8/zh-TW.xpi) = 305437
+SHA256 (xpi/firefox-i18n-17.0.8/zu.xpi) = a2e5eccccbaa7eecedf293c558c8d04a24c6ad1aaecfb2136772aba0edf3d7ab
+SIZE (xpi/firefox-i18n-17.0.8/zu.xpi) = 296593
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index d2cc41a103fa..1e9b30d89dff 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= firefox
-DISTVERSION= 17.0.7
-PORTREVISION= 1
+DISTVERSION= 17.0.8
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source
@@ -46,40 +45,11 @@ MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \
--enable-application=browser \
--enable-official-branding
-OPTIONS_DEFINE= PGO
-
.include "${.CURDIR}/../../www/firefox/Makefile.options"
.include <bsd.port.pre.mk>
WRKSRC:= ${WRKDIR}/mozilla-esr17
-.if ${PORT_OPTIONS:MPGO}
-USE_GCC?= any
-USE_DISPLAY= yes
-.include "${PORTSDIR}/Mk/bsd.python.mk"
-
-.undef GNU_CONFIGURE
-MOZ_OPTIONS+= ${CONFIGURE_TARGET}
-MAKEFILE= ${WRKSRC}/client.mk
-ALL_TARGET= profiledbuild
-MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT="${PYTHON_CMD} \
- @MOZ_OBJDIR@/_profile/pgo/profileserver.py"
-.endif
-
-pre-extract:
-.if ${PORT_OPTIONS:MPGO}
- @${ECHO} "*****************************************************************"
- @${ECHO} "**************************** attention **************************"
- @${ECHO} "*****************************************************************"
- @${ECHO} "To build Firefox with PGO support you need a running X server and"
- @${ECHO} " build this port with an user who could access the X server! "
- @${ECHO} ""
- @${ECHO} "During the build a Firefox instance will start and run some test."
- @${ECHO} " Do not interrupt or close Firefox during this tests! "
- @${ECHO} "*****************************************************************"
- @sleep 10
-.endif
-
post-extract:
@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo
index c156a930cfc8..8423f8c9a451 100644
--- a/www/firefox-esr/distinfo
+++ b/www/firefox-esr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (firefox-17.0.7esr.source.tar.bz2) = 126dbb0660cec3290be718b08eb6e8af4adb453d6a57fd4f7334d4b37fea9f33
-SIZE (firefox-17.0.7esr.source.tar.bz2) = 90603436
+SHA256 (firefox-17.0.8esr.source.tar.bz2) = 87f846d0cc6e1b2f4c1baeb58d2123ffbc8c166a1ec81a3b1e0551fbbd6ef1e8
+SIZE (firefox-17.0.8esr.source.tar.bz2) = 90765879
diff --git a/www/firefox-i18n/Makefile b/www/firefox-i18n/Makefile
index 7e98510a53a8..f0d6b5c54897 100644
--- a/www/firefox-i18n/Makefile
+++ b/www/firefox-i18n/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= firefox-i18n
-PORTVERSION= 22.0
+PORTVERSION= 23.0
CATEGORIES= www
MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/linux-i686/xpi
PKGNAMEPREFIX=
@@ -14,7 +14,7 @@ COMMENT= Localized interface for Firefox
EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip
-USE_FIREFOX= 22
+USE_FIREFOX= 23
USE_XPI= firefox linux-firefox
USE_SUBMAKE= yes
@@ -76,14 +76,7 @@ do-install:
@${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A}
@${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \
${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A}
- @for lang in ${FIREFOX_I18N_}; do \
- for xpi in ${XPI_LINKFARMS} ; do \
- if [ -d $${xpi} ] ; \
- then \
- ${ECHO_CMD} $$xpi/langpack-$$lang@firefox.mozilla.org ${_A} ; \
- fi ; \
- done ; \
- done
+ @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ${XPI_LIBDIR}; { ${RM} -f $$_dir/${WDIR} ; }' ${_A}
post-patch:
${FIND} ${WRKSRC} -name install.rdf -print0 | \
diff --git a/www/firefox-i18n/distinfo b/www/firefox-i18n/distinfo
index af6d67c76654..1b770f0cd979 100644
--- a/www/firefox-i18n/distinfo
+++ b/www/firefox-i18n/distinfo
@@ -1,164 +1,164 @@
-SHA256 (xpi/firefox-i18n-22.0/af.xpi) = 45bff2042073c939f8fe8535986e70821dc6abe807377ae1edc378703da95948
-SIZE (xpi/firefox-i18n-22.0/af.xpi) = 316858
-SHA256 (xpi/firefox-i18n-22.0/ak.xpi) = 18ad567495b98726bd3b90268fa932ebb79fcfc28015b074d2f986f5d75859b3
-SIZE (xpi/firefox-i18n-22.0/ak.xpi) = 326809
-SHA256 (xpi/firefox-i18n-22.0/ar.xpi) = cb203396ea13e934edf2d6f26e6c08bc5068b85f251ae8854d0d4917a9208d5d
-SIZE (xpi/firefox-i18n-22.0/ar.xpi) = 348672
-SHA256 (xpi/firefox-i18n-22.0/ast.xpi) = 77200da49f63129cfa81d0bdf8315a7ee02cc9054d33b62fe828984c31f8cfbe
-SIZE (xpi/firefox-i18n-22.0/ast.xpi) = 295831
-SHA256 (xpi/firefox-i18n-22.0/be.xpi) = bdd0a451c444410ae8ed2c35875b351918ae1a4e20a4b6c9525db07f46f69ffd
-SIZE (xpi/firefox-i18n-22.0/be.xpi) = 314114
-SHA256 (xpi/firefox-i18n-22.0/bg.xpi) = e48040a2f2fd74bdea65ff1027d0acd759169a10a15c290a7b542eb519767adb
-SIZE (xpi/firefox-i18n-22.0/bg.xpi) = 372560
-SHA256 (xpi/firefox-i18n-22.0/bn-BD.xpi) = 7fb20e7b6d2f4222960d99ee3ba5b6c65ab7c68f88efb24d85e2997e4dbeb155
-SIZE (xpi/firefox-i18n-22.0/bn-BD.xpi) = 383879
-SHA256 (xpi/firefox-i18n-22.0/bn-IN.xpi) = c158c870a702ede19c5640662004df17473ba17e1c89bd2e741c732e388f6557
-SIZE (xpi/firefox-i18n-22.0/bn-IN.xpi) = 418945
-SHA256 (xpi/firefox-i18n-22.0/br.xpi) = 7f781a7218458c0d75d0e836a689c352d0bf55f82dffa2be0e22d3f865a70368
-SIZE (xpi/firefox-i18n-22.0/br.xpi) = 327153
-SHA256 (xpi/firefox-i18n-22.0/bs.xpi) = 48a361177346727bf3940406b13320041df991b05ab0b61a39679e66b61c01d6
-SIZE (xpi/firefox-i18n-22.0/bs.xpi) = 328335
-SHA256 (xpi/firefox-i18n-22.0/ca.xpi) = a8783b32bc7e3b1dca8667f832ad5451e196a99747c66acda67af65809f140cf
-SIZE (xpi/firefox-i18n-22.0/ca.xpi) = 332979
-SHA256 (xpi/firefox-i18n-22.0/cs.xpi) = cf045ae1b18a7773284176c98bae49e95d7fd2839a7693dd620c2f644776925a
-SIZE (xpi/firefox-i18n-22.0/cs.xpi) = 328760
-SHA256 (xpi/firefox-i18n-22.0/cy.xpi) = cd4480b4196fcc56eacb1f0a6535f65a3d02db0f17a2bada7e61f91a64264802
-SIZE (xpi/firefox-i18n-22.0/cy.xpi) = 323195
-SHA256 (xpi/firefox-i18n-22.0/da.xpi) = c86bde7d779ed8532aea1591f586a451b2229797d3d62d44b8a24e8bbc2d4fb7
-SIZE (xpi/firefox-i18n-22.0/da.xpi) = 317743
-SHA256 (xpi/firefox-i18n-22.0/de.xpi) = def6ac88a73af496f198fc5ddef9e1b32e0e83cf4b6b32ae783a2a19f0738c00
-SIZE (xpi/firefox-i18n-22.0/de.xpi) = 313181
-SHA256 (xpi/firefox-i18n-22.0/el.xpi) = 3433b34931285f999f686097a7d3ca92eca0f5ccf1bce8f4213968be73e4839b
-SIZE (xpi/firefox-i18n-22.0/el.xpi) = 355668
-SHA256 (xpi/firefox-i18n-22.0/en-GB.xpi) = e411d06c38d053c4c134bcb608a6e86c2f33e3a6e075cd70a0c086af2b23bd15
-SIZE (xpi/firefox-i18n-22.0/en-GB.xpi) = 309389
-SHA256 (xpi/firefox-i18n-22.0/en-US.xpi) = 2c3802507a8163817aebb9ed6741f7692873664e158e2c791eaa938c29944d99
-SIZE (xpi/firefox-i18n-22.0/en-US.xpi) = 309156
-SHA256 (xpi/firefox-i18n-22.0/en-ZA.xpi) = 64218a87966e2e42cdd078f6ad0fb228fcc49e711b4e989809cd55f9372654b6
-SIZE (xpi/firefox-i18n-22.0/en-ZA.xpi) = 312269
-SHA256 (xpi/firefox-i18n-22.0/eo.xpi) = b906ef30f0b1ce083974a4d161f74de48a5c6c61f7c049e020c65a96a98b26ed
-SIZE (xpi/firefox-i18n-22.0/eo.xpi) = 323899
-SHA256 (xpi/firefox-i18n-22.0/es-AR.xpi) = 3c2fa4a2304dd9670a06e63c463c3acf01d3a26515965bf74041cc85e7490e5c
-SIZE (xpi/firefox-i18n-22.0/es-AR.xpi) = 326406
-SHA256 (xpi/firefox-i18n-22.0/es-CL.xpi) = ef083cc13bac5c007e8b9dfe9cdacfb1fb3e9859f3fc8aed29a07139f1f8e5e7
-SIZE (xpi/firefox-i18n-22.0/es-CL.xpi) = 287983
-SHA256 (xpi/firefox-i18n-22.0/es-ES.xpi) = c0da94323202c67c513789792e0a46bc2c6b6e583c5c6c8c2e74d624147d92af
-SIZE (xpi/firefox-i18n-22.0/es-ES.xpi) = 274473
-SHA256 (xpi/firefox-i18n-22.0/es-MX.xpi) = cc6bc3197a35f764b9e40bc9e431bed625ca0e2845633065b78ddb869979a212
-SIZE (xpi/firefox-i18n-22.0/es-MX.xpi) = 292194
-SHA256 (xpi/firefox-i18n-22.0/et.xpi) = e72f9e253f6722409aa51776ffd888ec5a04dbe6e79ee7a7d16b887a0a8309da
-SIZE (xpi/firefox-i18n-22.0/et.xpi) = 319856
-SHA256 (xpi/firefox-i18n-22.0/eu.xpi) = bc77ea1f85cc42b97c51aede25fdd6d88274744e35e7b33d1bfaad5f11e5dd0e
-SIZE (xpi/firefox-i18n-22.0/eu.xpi) = 322790
-SHA256 (xpi/firefox-i18n-22.0/fa.xpi) = ac4581e51a937edffe0f280f2586aac268906efd3957b56cf91c2210436f2cf3
-SIZE (xpi/firefox-i18n-22.0/fa.xpi) = 363905
-SHA256 (xpi/firefox-i18n-22.0/fi.xpi) = 082fe8e4e5f438c8888d779da3f983cb05af0041668f151c91791292ac5de9e9
-SIZE (xpi/firefox-i18n-22.0/fi.xpi) = 324442
-SHA256 (xpi/firefox-i18n-22.0/fr.xpi) = c58ef42000426d0dae9675190fd0410910b1b497654ad21c8355211cd1dd6e21
-SIZE (xpi/firefox-i18n-22.0/fr.xpi) = 331061
-SHA256 (xpi/firefox-i18n-22.0/fy-NL.xpi) = 065475bdede5d2bed9b4fe680b8216f8aeffd777b0b668588247317a8e7fc2d1
-SIZE (xpi/firefox-i18n-22.0/fy-NL.xpi) = 328569
-SHA256 (xpi/firefox-i18n-22.0/ga-IE.xpi) = 62d4dd1eb18c88597e71f71910652a09267664d54a75a672f62465e3c5a80918
-SIZE (xpi/firefox-i18n-22.0/ga-IE.xpi) = 337138
-SHA256 (xpi/firefox-i18n-22.0/gl.xpi) = c85fca8316061650c7b43adad9ca7b36f4e801d37ffa26cfa35fb9f7c9cab9e3
-SIZE (xpi/firefox-i18n-22.0/gl.xpi) = 326563
-SHA256 (xpi/firefox-i18n-22.0/gu-IN.xpi) = 7a3104e3b16d059b3f8966fdb51cd6a0d5b1c75b6befd841573000b29d3b5fc2
-SIZE (xpi/firefox-i18n-22.0/gu-IN.xpi) = 354210
-SHA256 (xpi/firefox-i18n-22.0/he.xpi) = e7ca97b786ceb68a0777988eac5a375144ec55b65ed0401487a8859480c2d656
-SIZE (xpi/firefox-i18n-22.0/he.xpi) = 344041
-SHA256 (xpi/firefox-i18n-22.0/hi-IN.xpi) = e94ac57dff638398635aa6af886c70dba6e3b948474d79ad634f28282df4d986
-SIZE (xpi/firefox-i18n-22.0/hi-IN.xpi) = 369188
-SHA256 (xpi/firefox-i18n-22.0/hr.xpi) = c5a8bb6ec11a2e3797aeae5edd297560b4d1cad7cb0083222cba6bd36cad5dfd
-SIZE (xpi/firefox-i18n-22.0/hr.xpi) = 326422
-SHA256 (xpi/firefox-i18n-22.0/hu.xpi) = e944ba4ef2f1f1d9bd9bfef008d576a7c221136a26474e3e02933d06f669bbc0
-SIZE (xpi/firefox-i18n-22.0/hu.xpi) = 337669
-SHA256 (xpi/firefox-i18n-22.0/hy-AM.xpi) = e0c12c643359547ca8d8fc04ef2d041a7280ef419c5524fc6ad7865e76b174bc
-SIZE (xpi/firefox-i18n-22.0/hy-AM.xpi) = 365203
-SHA256 (xpi/firefox-i18n-22.0/id.xpi) = b07525031fc61edddc8f1fae103b9a47307278eb18ec0337e838e88a6261efa3
-SIZE (xpi/firefox-i18n-22.0/id.xpi) = 312678
-SHA256 (xpi/firefox-i18n-22.0/is.xpi) = 71791638424f87d1ebb724e2a7f2fd04ae80953b41991f00ba5a52e6c6033667
-SIZE (xpi/firefox-i18n-22.0/is.xpi) = 321769
-SHA256 (xpi/firefox-i18n-22.0/it.xpi) = 88cabb1d33748c93ceae405033cedc9c22897819fe8e38e22f7954e451369269
-SIZE (xpi/firefox-i18n-22.0/it.xpi) = 269421
-SHA256 (xpi/firefox-i18n-22.0/ja.xpi) = f6a1379cf1ba9e7317c2f7996c215254244afa8f488fa88bf1cc5e0e140ebc44
-SIZE (xpi/firefox-i18n-22.0/ja.xpi) = 363732
-SHA256 (xpi/firefox-i18n-22.0/kk.xpi) = ca6a1989580204b0d8ff7430ae39cb00f46a955149809f23dcdf25835d5f3cf3
-SIZE (xpi/firefox-i18n-22.0/kk.xpi) = 374566
-SHA256 (xpi/firefox-i18n-22.0/kn.xpi) = adffe1eddb64d950688673ff57ae85b8af902fd0ee12baf0a4f5b540a4c8e593
-SIZE (xpi/firefox-i18n-22.0/kn.xpi) = 380310
-SHA256 (xpi/firefox-i18n-22.0/ko.xpi) = ec504449a232ec124d512fb15ca280fb8b371f74b4c69ee0925c5bff81b44386
-SIZE (xpi/firefox-i18n-22.0/ko.xpi) = 338112
-SHA256 (xpi/firefox-i18n-22.0/ku.xpi) = e636207f8a095b15b532fb91584e1d538335183e4c3afc83de793c703b520a99
-SIZE (xpi/firefox-i18n-22.0/ku.xpi) = 346244
-SHA256 (xpi/firefox-i18n-22.0/lg.xpi) = 064d6879960de6bbc4b437c5d2175d22b80449d702b5562804c6ef851392f2d9
-SIZE (xpi/firefox-i18n-22.0/lg.xpi) = 336412
-SHA256 (xpi/firefox-i18n-22.0/lt.xpi) = 34823c713a5b0853ec395d20ad6013a9d9f4ab42f85f980e93dd7dcf43ba59ae
-SIZE (xpi/firefox-i18n-22.0/lt.xpi) = 341155
-SHA256 (xpi/firefox-i18n-22.0/lv.xpi) = 8349ffdae7327039c6ce532d31311375389e686c4a8f015bf1333eef2c4d515c
-SIZE (xpi/firefox-i18n-22.0/lv.xpi) = 322015
-SHA256 (xpi/firefox-i18n-22.0/mai.xpi) = 6f0d51daa4cd022dae1e5ecb260fa2885cc4ed099664088e5b1aaf00405b3360
-SIZE (xpi/firefox-i18n-22.0/mai.xpi) = 372097
-SHA256 (xpi/firefox-i18n-22.0/mk.xpi) = a36b44442697f5c056f74bbb26871f11aa4fd48529e3e9777e37b1cf1f4f4821
-SIZE (xpi/firefox-i18n-22.0/mk.xpi) = 362901
-SHA256 (xpi/firefox-i18n-22.0/ml.xpi) = e09c5c1f2450b2d81285428fb140cf27a147ecc244f1c6c3658e63afa9fef390
-SIZE (xpi/firefox-i18n-22.0/ml.xpi) = 389748
-SHA256 (xpi/firefox-i18n-22.0/mr.xpi) = c419520fc651e1fdb45b27b2bc42db67555249fdd7cc16e323172d1cac5c6b2a
-SIZE (xpi/firefox-i18n-22.0/mr.xpi) = 374613
-SHA256 (xpi/firefox-i18n-22.0/nb-NO.xpi) = 12b09e9bccda3eb44efbe7d806f1b4411254964c94e989def42f09ee082fc96c
-SIZE (xpi/firefox-i18n-22.0/nb-NO.xpi) = 322348
-SHA256 (xpi/firefox-i18n-22.0/nl.xpi) = e6ed600814d301d791000caa50fc3000b12f4e44c2efdf6b8c17bcec452419ac
-SIZE (xpi/firefox-i18n-22.0/nl.xpi) = 323156
-SHA256 (xpi/firefox-i18n-22.0/nn-NO.xpi) = 3044f2a8978146e414ecc6e006fb26dbc537d54553790d31e32886f2bd9cd0ee
-SIZE (xpi/firefox-i18n-22.0/nn-NO.xpi) = 326769
-SHA256 (xpi/firefox-i18n-22.0/nso.xpi) = 9c0d047749a961fec174d59e06fded810b55d64c12a815a2c5e94cd4bd08f1b2
-SIZE (xpi/firefox-i18n-22.0/nso.xpi) = 323942
-SHA256 (xpi/firefox-i18n-22.0/or.xpi) = 1805ea9ef48cc8110bccb0448d8d914f19f2ca208b21fab74427d6697c637f1d
-SIZE (xpi/firefox-i18n-22.0/or.xpi) = 359907
-SHA256 (xpi/firefox-i18n-22.0/pa-IN.xpi) = 45502c0794a3414350c3eecc33a275d2404df8ba15d4ec057d4002462f7973e8
-SIZE (xpi/firefox-i18n-22.0/pa-IN.xpi) = 358777
-SHA256 (xpi/firefox-i18n-22.0/pl.xpi) = 2d05fa63d25699b82e2ecb833ce26f763e7cee9b71e60be4d2fae8123a39d9a9
-SIZE (xpi/firefox-i18n-22.0/pl.xpi) = 335056
-SHA256 (xpi/firefox-i18n-22.0/pt-BR.xpi) = 28699e8569b902e24f4753d95fba313db917220eef23f715276ea4f3eb3879b0
-SIZE (xpi/firefox-i18n-22.0/pt-BR.xpi) = 326589
-SHA256 (xpi/firefox-i18n-22.0/pt-PT.xpi) = eea48a61570b84eb62c6c59ce87d81acc22678233996df176878cf55eedc3444
-SIZE (xpi/firefox-i18n-22.0/pt-PT.xpi) = 325360
-SHA256 (xpi/firefox-i18n-22.0/rm.xpi) = 8e7bca286966512233242d1dd321d2b6fa7e47458da09360625a5967dbc4dfbf
-SIZE (xpi/firefox-i18n-22.0/rm.xpi) = 328388
-SHA256 (xpi/firefox-i18n-22.0/ro.xpi) = 1a6e78e8b5b4a9c18cbe44cd6c1e01ebe88b872dc8818ec58c2bcb093c2a6c98
-SIZE (xpi/firefox-i18n-22.0/ro.xpi) = 354180
-SHA256 (xpi/firefox-i18n-22.0/ru.xpi) = 2dde2c50ec4b1261acf12907aa6313af9ca444ac48ae1816e3bcb3c39c5ca01e
-SIZE (xpi/firefox-i18n-22.0/ru.xpi) = 321116
-SHA256 (xpi/firefox-i18n-22.0/si.xpi) = 81992c6202dd649327c3522d7456444c86029a39adab1905668604bea9bfc769
-SIZE (xpi/firefox-i18n-22.0/si.xpi) = 362274
-SHA256 (xpi/firefox-i18n-22.0/sk.xpi) = f7b1a04a964f12f8b769756b77c3e39e93a06cfdee13e4101d7a54902ea5c589
-SIZE (xpi/firefox-i18n-22.0/sk.xpi) = 339869
-SHA256 (xpi/firefox-i18n-22.0/sl.xpi) = 9d36610cd9d322d75f8aacd05eeaeea420d7fb6b9061c42aecf66b3baeef822c
-SIZE (xpi/firefox-i18n-22.0/sl.xpi) = 323692
-SHA256 (xpi/firefox-i18n-22.0/son.xpi) = 1b9b80689ad827eef70e57b9b193cea8aa63840089cd3b4470b0e5034284b544
-SIZE (xpi/firefox-i18n-22.0/son.xpi) = 320574
-SHA256 (xpi/firefox-i18n-22.0/sq.xpi) = e713bbfba3002508572f9cd6bf587ada31cd4e0d8cab95ffad33f5bbed3fc399
-SIZE (xpi/firefox-i18n-22.0/sq.xpi) = 327244
-SHA256 (xpi/firefox-i18n-22.0/sr.xpi) = 86bdf6aeda16d5d56071412f7fce7d017e73e44c50bcab31f4fa732021105f98
-SIZE (xpi/firefox-i18n-22.0/sr.xpi) = 377277
-SHA256 (xpi/firefox-i18n-22.0/sv-SE.xpi) = d7cb126e958e0dc6751c6dd1b29fb87e17f6dcb97a08ead3a09ea261f24bbbd7
-SIZE (xpi/firefox-i18n-22.0/sv-SE.xpi) = 325292
-SHA256 (xpi/firefox-i18n-22.0/ta-LK.xpi) = f91c38b2293ae26db43c5c128df0825d730d26d48fd5df2f172333e4461d73e5
-SIZE (xpi/firefox-i18n-22.0/ta-LK.xpi) = 377041
-SHA256 (xpi/firefox-i18n-22.0/ta.xpi) = 710b6ce1f693d5ddb8ef7ff6c57df6b4742cee5e5857e2a2777948b327761d5d
-SIZE (xpi/firefox-i18n-22.0/ta.xpi) = 373336
-SHA256 (xpi/firefox-i18n-22.0/te.xpi) = 45f064bb1a3ea751cd5706c88046c2e14bd7876aeeef2abd53fe55028edc66c4
-SIZE (xpi/firefox-i18n-22.0/te.xpi) = 381472
-SHA256 (xpi/firefox-i18n-22.0/th.xpi) = 45aaf5349b97970587bda15e29521ebfea9cb0ac325ce8514915fbb7151afa09
-SIZE (xpi/firefox-i18n-22.0/th.xpi) = 368326
-SHA256 (xpi/firefox-i18n-22.0/tr.xpi) = 80fdfd7903e5326d33ccaec73e6f0a07cfd736e863b51737d24944b23763223d
-SIZE (xpi/firefox-i18n-22.0/tr.xpi) = 331454
-SHA256 (xpi/firefox-i18n-22.0/uk.xpi) = 0bee75a8c860a80c0995cb5df1d9df71e76a6311433a3bd537589da2ead59994
-SIZE (xpi/firefox-i18n-22.0/uk.xpi) = 360223
-SHA256 (xpi/firefox-i18n-22.0/vi.xpi) = 62edd66562fc2a377baaff3b7b8df0a1cddc05e40c923e0c1fbe9c29f1f997fc
-SIZE (xpi/firefox-i18n-22.0/vi.xpi) = 348951
-SHA256 (xpi/firefox-i18n-22.0/zh-CN.xpi) = 07562371b8ee4109d8f625208938b7040d13d9474ea361374c74460e50b47f10
-SIZE (xpi/firefox-i18n-22.0/zh-CN.xpi) = 349262
-SHA256 (xpi/firefox-i18n-22.0/zh-TW.xpi) = b02c82e7ead9fcbbef5b999e133a832ffa8f0215d5963747001a5b16698c544e
-SIZE (xpi/firefox-i18n-22.0/zh-TW.xpi) = 344209
-SHA256 (xpi/firefox-i18n-22.0/zu.xpi) = 3a23c47cbf55136c656f619a8214a50cbf1388bca207a38bd7c976d52473d6d4
-SIZE (xpi/firefox-i18n-22.0/zu.xpi) = 337950
+SHA256 (xpi/firefox-i18n-23.0/af.xpi) = 605c80e630208861999267baaa26116318348abaacb89046bd0c8f31fefcdc72
+SIZE (xpi/firefox-i18n-23.0/af.xpi) = 327802
+SHA256 (xpi/firefox-i18n-23.0/ak.xpi) = 94729a66479b1b4fc646b23a0c5030e845730b1fb9171b2766bf6170dff41d4f
+SIZE (xpi/firefox-i18n-23.0/ak.xpi) = 337922
+SHA256 (xpi/firefox-i18n-23.0/ar.xpi) = e54c34292e9e82745ae52b1207da0a7a30a529a383a3faeb9fb57a4eb100e24e
+SIZE (xpi/firefox-i18n-23.0/ar.xpi) = 357354
+SHA256 (xpi/firefox-i18n-23.0/ast.xpi) = 0437e02a78cf70be598bc09d11d555a594bfa7ac2c9dec2a82b1a5f6dfc91244
+SIZE (xpi/firefox-i18n-23.0/ast.xpi) = 292709
+SHA256 (xpi/firefox-i18n-23.0/be.xpi) = ee292fe369503b49af7d4dedb61454104315ecde961ce5d05b5ea135d8ae922d
+SIZE (xpi/firefox-i18n-23.0/be.xpi) = 317611
+SHA256 (xpi/firefox-i18n-23.0/bg.xpi) = 72d8a52728d620620154a5759a12596ba1da28729c340f60277d4ffd12654c89
+SIZE (xpi/firefox-i18n-23.0/bg.xpi) = 369539
+SHA256 (xpi/firefox-i18n-23.0/bn-BD.xpi) = 732884ad98bcd3cef1ccc9d8793f21577e35aee4034985bdd104674069aad59e
+SIZE (xpi/firefox-i18n-23.0/bn-BD.xpi) = 391947
+SHA256 (xpi/firefox-i18n-23.0/bn-IN.xpi) = 540ec878c270af9f725de827f622a7f545dd405b341faae96fd325daeeddbc3b
+SIZE (xpi/firefox-i18n-23.0/bn-IN.xpi) = 425722
+SHA256 (xpi/firefox-i18n-23.0/br.xpi) = 2b45cafe2c587397297e8beb76fb56041f4683abba3b73ae00d8223b46a2e429
+SIZE (xpi/firefox-i18n-23.0/br.xpi) = 328980
+SHA256 (xpi/firefox-i18n-23.0/bs.xpi) = c7bbabddd4ea8563426f1be0a4e7ed5b8577a81c81816f8ed7a9e98adf9fce1f
+SIZE (xpi/firefox-i18n-23.0/bs.xpi) = 338261
+SHA256 (xpi/firefox-i18n-23.0/ca.xpi) = ac67c1116654263980fb554e99a02057285cd1684d034a9d125826ac9e74060b
+SIZE (xpi/firefox-i18n-23.0/ca.xpi) = 339906
+SHA256 (xpi/firefox-i18n-23.0/cs.xpi) = 32dfeaad473ed1fbfd6a4948d4654004c0a22a8db7ab9ba0b6f9cd0873f0a3df
+SIZE (xpi/firefox-i18n-23.0/cs.xpi) = 335900
+SHA256 (xpi/firefox-i18n-23.0/cy.xpi) = 110a9c2ff2009ed95fc31adb175679f60c87fd7896089e8177541e783a0b57bf
+SIZE (xpi/firefox-i18n-23.0/cy.xpi) = 329223
+SHA256 (xpi/firefox-i18n-23.0/da.xpi) = bce47ff39d42d08c51d3d988e83229df2146a42ab2f3cdf996d1d43e781f9307
+SIZE (xpi/firefox-i18n-23.0/da.xpi) = 325405
+SHA256 (xpi/firefox-i18n-23.0/de.xpi) = fb8e6ca9f0f1c1f8f6dec458964ec39eec236c8cd4734cd245c5ac3b8b21c82d
+SIZE (xpi/firefox-i18n-23.0/de.xpi) = 321446
+SHA256 (xpi/firefox-i18n-23.0/el.xpi) = d69824a235a0cb67c7a4396264c058a74d06ede2e6af1eb725403ccf3e56f1c5
+SIZE (xpi/firefox-i18n-23.0/el.xpi) = 361848
+SHA256 (xpi/firefox-i18n-23.0/en-GB.xpi) = 0c5a97be0cb3387b2f670cd7861bbeed61f6420938ad3679f0ffd99850de2305
+SIZE (xpi/firefox-i18n-23.0/en-GB.xpi) = 317404
+SHA256 (xpi/firefox-i18n-23.0/en-US.xpi) = 06dbda07dbc033627f7cf4d520ded4fa6c3b26ad42be629ca4ce86ce699f15e6
+SIZE (xpi/firefox-i18n-23.0/en-US.xpi) = 319723
+SHA256 (xpi/firefox-i18n-23.0/en-ZA.xpi) = 20fda947dd17ff761d562123d9070af34a8d0fcc61896021d65bbb282e8aeb36
+SIZE (xpi/firefox-i18n-23.0/en-ZA.xpi) = 315913
+SHA256 (xpi/firefox-i18n-23.0/eo.xpi) = 4e8d924d34755d987eea58cf4f285284003f42696f8ac53e5b34d94ed8d031ae
+SIZE (xpi/firefox-i18n-23.0/eo.xpi) = 333550
+SHA256 (xpi/firefox-i18n-23.0/es-AR.xpi) = 1ce72cec98422a6bf65a9ba7315ecaaef97fbff8185f26416c06301307c8e8ae
+SIZE (xpi/firefox-i18n-23.0/es-AR.xpi) = 332702
+SHA256 (xpi/firefox-i18n-23.0/es-CL.xpi) = e7883be5d3f1bf90e44df1cb264accdc7027c86fecb10be813ebfb86580b0fa9
+SIZE (xpi/firefox-i18n-23.0/es-CL.xpi) = 288650
+SHA256 (xpi/firefox-i18n-23.0/es-ES.xpi) = b611cd894d257959b786f26700a4a0517da46c7abea010a7160c4a019d20d8bd
+SIZE (xpi/firefox-i18n-23.0/es-ES.xpi) = 278341
+SHA256 (xpi/firefox-i18n-23.0/es-MX.xpi) = 1968519496ab24388153d129b289641c057960c95eabcb1a41644c3cc5e61294
+SIZE (xpi/firefox-i18n-23.0/es-MX.xpi) = 299977
+SHA256 (xpi/firefox-i18n-23.0/et.xpi) = df10cd8da1bab2b68d9f8e62fad603dcae092a213255f093e334d169ad34d934
+SIZE (xpi/firefox-i18n-23.0/et.xpi) = 326111
+SHA256 (xpi/firefox-i18n-23.0/eu.xpi) = 6724f528629c17c4aa1c08291804384232b2aca9dec29daddc334afe318fc67b
+SIZE (xpi/firefox-i18n-23.0/eu.xpi) = 331012
+SHA256 (xpi/firefox-i18n-23.0/fa.xpi) = d793eb9f4b3f87cff198f97d58d097cb57478dff19f8d3558f2b4d72516c65d3
+SIZE (xpi/firefox-i18n-23.0/fa.xpi) = 372628
+SHA256 (xpi/firefox-i18n-23.0/fi.xpi) = 729f3fa0261730ae0a81f6fdce83cf990ba5e2be3a458fb5c0e61c2edd1ae02c
+SIZE (xpi/firefox-i18n-23.0/fi.xpi) = 331330
+SHA256 (xpi/firefox-i18n-23.0/fr.xpi) = 0b68515b49cd129dabe371596b2f7149629028eab574ff80413685c7ab6eb327
+SIZE (xpi/firefox-i18n-23.0/fr.xpi) = 338028
+SHA256 (xpi/firefox-i18n-23.0/fy-NL.xpi) = 53a0d9a6f28ecf06c58a981b6f2eccd1cbec4c62f073ed47b87731e8a97f1ac6
+SIZE (xpi/firefox-i18n-23.0/fy-NL.xpi) = 335449
+SHA256 (xpi/firefox-i18n-23.0/ga-IE.xpi) = e2c6bf5fe75efcb334e53ce4df92d5be8243fb3622e4bc5a56a9aaff6d769dce
+SIZE (xpi/firefox-i18n-23.0/ga-IE.xpi) = 343744
+SHA256 (xpi/firefox-i18n-23.0/gl.xpi) = 7ce8d52a43c88ca41f9211df7bce7308112cb7798b4c3e7a72b96ffd55215253
+SIZE (xpi/firefox-i18n-23.0/gl.xpi) = 333639
+SHA256 (xpi/firefox-i18n-23.0/gu-IN.xpi) = 6101fba9779ca0e849d886c6b4949cea7d00fe1cc081a7bd4a71f746574109a9
+SIZE (xpi/firefox-i18n-23.0/gu-IN.xpi) = 360068
+SHA256 (xpi/firefox-i18n-23.0/he.xpi) = 0ff4ec4b6bc33538de55028733ff8fb7f551405b064cf4708874e82027ed7d05
+SIZE (xpi/firefox-i18n-23.0/he.xpi) = 351645
+SHA256 (xpi/firefox-i18n-23.0/hi-IN.xpi) = d47db705f8b35c9f0328fefd51f527840a60faad5ce42e62e9b2821c18d7b9d9
+SIZE (xpi/firefox-i18n-23.0/hi-IN.xpi) = 377468
+SHA256 (xpi/firefox-i18n-23.0/hr.xpi) = bda10cfe04a21aaa4b41d5fcb1ec85ec43e735de9c0cbba67cbd4080d9a62eea
+SIZE (xpi/firefox-i18n-23.0/hr.xpi) = 335431
+SHA256 (xpi/firefox-i18n-23.0/hu.xpi) = 6ce9c6beda803ded950c8cfdbe48a0bc57ecd09a85abb84517ffbf58c49406a0
+SIZE (xpi/firefox-i18n-23.0/hu.xpi) = 342505
+SHA256 (xpi/firefox-i18n-23.0/hy-AM.xpi) = 49632ab2496f730ed239fd71a206b8da43960adf62155d391e0b820951244deb
+SIZE (xpi/firefox-i18n-23.0/hy-AM.xpi) = 378651
+SHA256 (xpi/firefox-i18n-23.0/id.xpi) = 1cfbd74bb35a908f7ec1a7afefcc1f322b01ab1b6da932c46608c8698ee92fb3
+SIZE (xpi/firefox-i18n-23.0/id.xpi) = 318472
+SHA256 (xpi/firefox-i18n-23.0/is.xpi) = 357a21c539058667c4e021e5b8d8fc23ceefe6e4653e10f8d232ca15e0f5b275
+SIZE (xpi/firefox-i18n-23.0/is.xpi) = 330561
+SHA256 (xpi/firefox-i18n-23.0/it.xpi) = 9c379ad73c5e4e8a5d90209bb50487f484350215bb55ef779d768b0cf6eae6bf
+SIZE (xpi/firefox-i18n-23.0/it.xpi) = 272505
+SHA256 (xpi/firefox-i18n-23.0/ja.xpi) = fdd2297d43f154bebcefcee627cc7da6f2e75f5621f3e88872fcea6db6a495c9
+SIZE (xpi/firefox-i18n-23.0/ja.xpi) = 369564
+SHA256 (xpi/firefox-i18n-23.0/kk.xpi) = 4aa9907ac906bf479a6162dd0ce2362674002132afa113976c5ccbecc126caf7
+SIZE (xpi/firefox-i18n-23.0/kk.xpi) = 381213
+SHA256 (xpi/firefox-i18n-23.0/kn.xpi) = 1ff2a0d92a0574d7ffba7de2ab68c56304a38c958b4b954f5d8e9ad3cf19203c
+SIZE (xpi/firefox-i18n-23.0/kn.xpi) = 386149
+SHA256 (xpi/firefox-i18n-23.0/ko.xpi) = 338b7d3aee28efad489e93a95cc05b5c5d8cde9d181bec41eb36a40b483d3c36
+SIZE (xpi/firefox-i18n-23.0/ko.xpi) = 344588
+SHA256 (xpi/firefox-i18n-23.0/ku.xpi) = bf3afcd47186d91327ab89ee22c3fbc164c33af8b42bbe07eaa1ad21cbed85cf
+SIZE (xpi/firefox-i18n-23.0/ku.xpi) = 353895
+SHA256 (xpi/firefox-i18n-23.0/lg.xpi) = 5c72dc67efd5956b15623f4011473d25994e23a7edaeecd03c37d7847257360a
+SIZE (xpi/firefox-i18n-23.0/lg.xpi) = 348084
+SHA256 (xpi/firefox-i18n-23.0/lt.xpi) = df098d7ca24230be34740fb8f87859de3729bfc20ad494e00c147de79175462b
+SIZE (xpi/firefox-i18n-23.0/lt.xpi) = 350812
+SHA256 (xpi/firefox-i18n-23.0/lv.xpi) = b84705c5d91088b6244d87d7c21ada96d4561c031166806c1af1c21eb78ded01
+SIZE (xpi/firefox-i18n-23.0/lv.xpi) = 328567
+SHA256 (xpi/firefox-i18n-23.0/mai.xpi) = fa333d8f8a11b074e234a24cd54e9303f62571d0950003559e0ff60795af4486
+SIZE (xpi/firefox-i18n-23.0/mai.xpi) = 375990
+SHA256 (xpi/firefox-i18n-23.0/mk.xpi) = 7bf6fc032634ab18a448d88ac6926324bf3d775c832418903ff8500136056d36
+SIZE (xpi/firefox-i18n-23.0/mk.xpi) = 373116
+SHA256 (xpi/firefox-i18n-23.0/ml.xpi) = 6c2e63577d468dddbbd05aeadd9ce39194ded56e96240a3a856029cf4b3604d7
+SIZE (xpi/firefox-i18n-23.0/ml.xpi) = 397891
+SHA256 (xpi/firefox-i18n-23.0/mr.xpi) = b286f29c15b3dadac1a8f57e360578012657a683d19819c62738e0152992a68b
+SIZE (xpi/firefox-i18n-23.0/mr.xpi) = 374966
+SHA256 (xpi/firefox-i18n-23.0/nb-NO.xpi) = d92fa4fd8f9905e070177ddc3c3e4ed724f0689f4a71108472067c312f9e9da4
+SIZE (xpi/firefox-i18n-23.0/nb-NO.xpi) = 329365
+SHA256 (xpi/firefox-i18n-23.0/nl.xpi) = e8c107b030c791b839637c393ff465d47a9e851171dd14c54e0a0a7d036a0f91
+SIZE (xpi/firefox-i18n-23.0/nl.xpi) = 330284
+SHA256 (xpi/firefox-i18n-23.0/nn-NO.xpi) = a40e3879b8eb2096fbbb65d05248a884f8fc16524af11424dc30db5e62d4fa93
+SIZE (xpi/firefox-i18n-23.0/nn-NO.xpi) = 330070
+SHA256 (xpi/firefox-i18n-23.0/nso.xpi) = 28004f5b3dbfa6706886994ababafd40fb51da15cc2ad13226d729b647998a48
+SIZE (xpi/firefox-i18n-23.0/nso.xpi) = 332702
+SHA256 (xpi/firefox-i18n-23.0/or.xpi) = a2499a51416b9df5ff552a596515056cc77eef2be22c2c1d6ab632974b366def
+SIZE (xpi/firefox-i18n-23.0/or.xpi) = 366758
+SHA256 (xpi/firefox-i18n-23.0/pa-IN.xpi) = b0247b3bd127b2f3706893e4820a707a8276184c3c32b9326df3bbb316252917
+SIZE (xpi/firefox-i18n-23.0/pa-IN.xpi) = 365286
+SHA256 (xpi/firefox-i18n-23.0/pl.xpi) = 46303bca8ef23942b700675c7283e5986fdc6651676762d56bea12dea405b72c
+SIZE (xpi/firefox-i18n-23.0/pl.xpi) = 340767
+SHA256 (xpi/firefox-i18n-23.0/pt-BR.xpi) = dc389f8085c11c4e5cfd82409a2280583b22bd795c0240cf8eafafa85e517321
+SIZE (xpi/firefox-i18n-23.0/pt-BR.xpi) = 333263
+SHA256 (xpi/firefox-i18n-23.0/pt-PT.xpi) = 77df87937ac1a14e8b84617b2ebd4e3dcf90a84211ff58d8eee048b78b50e065
+SIZE (xpi/firefox-i18n-23.0/pt-PT.xpi) = 331617
+SHA256 (xpi/firefox-i18n-23.0/rm.xpi) = dd54ca9ad65acffeb4d68c5110d32cd889f1aa688acb8d638977fd2effe49da1
+SIZE (xpi/firefox-i18n-23.0/rm.xpi) = 336476
+SHA256 (xpi/firefox-i18n-23.0/ro.xpi) = 4506239b3f8a7c2cf61c390a3341004c13ba0200cbbc023ddb6b7bc183dc2f8d
+SIZE (xpi/firefox-i18n-23.0/ro.xpi) = 363859
+SHA256 (xpi/firefox-i18n-23.0/ru.xpi) = f9c4e988f717a24022b5d53726381fc3501e86e36b276307b860d6d4847f8fc4
+SIZE (xpi/firefox-i18n-23.0/ru.xpi) = 323396
+SHA256 (xpi/firefox-i18n-23.0/si.xpi) = c90411a77609f29a9186651ad17c2e536eebdb1a75ea6f05deae19730a4f04dd
+SIZE (xpi/firefox-i18n-23.0/si.xpi) = 371040
+SHA256 (xpi/firefox-i18n-23.0/sk.xpi) = b107525402df0cf159fe39de63e4d723ce5fcbb05a916988fb38d9f72408c680
+SIZE (xpi/firefox-i18n-23.0/sk.xpi) = 346642
+SHA256 (xpi/firefox-i18n-23.0/sl.xpi) = a79940578e590ce58814d9fb29a160f4ed83aefa71f52ac19354b239ea0523e5
+SIZE (xpi/firefox-i18n-23.0/sl.xpi) = 331750
+SHA256 (xpi/firefox-i18n-23.0/son.xpi) = 2c4dc8f4bcbf4bf61a6fea66a95d399d0562a8005945167d0cca32e0e7a141c1
+SIZE (xpi/firefox-i18n-23.0/son.xpi) = 327536
+SHA256 (xpi/firefox-i18n-23.0/sq.xpi) = a4be91ec74e1d1d9c38dc6a5dd617cd9257f2a7ac0acda296f357373f083f565
+SIZE (xpi/firefox-i18n-23.0/sq.xpi) = 337351
+SHA256 (xpi/firefox-i18n-23.0/sr.xpi) = dee5a813cbba7291986e7480763865a58761b6986f0bf419da7f443bfb69fca7
+SIZE (xpi/firefox-i18n-23.0/sr.xpi) = 383307
+SHA256 (xpi/firefox-i18n-23.0/sv-SE.xpi) = f7bf67cc9a40f4ffd0cfc29b5e97cacf6e0527a38934a86bb05e231e6adf00f2
+SIZE (xpi/firefox-i18n-23.0/sv-SE.xpi) = 332160
+SHA256 (xpi/firefox-i18n-23.0/ta-LK.xpi) = b25166fb6f6f4d3a247333a80f1627fe8f395438415b62a00d641576832ffd48
+SIZE (xpi/firefox-i18n-23.0/ta-LK.xpi) = 382507
+SHA256 (xpi/firefox-i18n-23.0/ta.xpi) = f755bb60998ec6e96c7be1560a2cc04671800fe1b5f55bc14a5db6a0ac640e71
+SIZE (xpi/firefox-i18n-23.0/ta.xpi) = 379873
+SHA256 (xpi/firefox-i18n-23.0/te.xpi) = 72ea93ea5aeda66aea71b5cf5c6db87527d5ac63f166521bf2a2579fdb44670e
+SIZE (xpi/firefox-i18n-23.0/te.xpi) = 393197
+SHA256 (xpi/firefox-i18n-23.0/th.xpi) = cacbde5afef3b4eea276943c892d27a18f733d6624a6f40499f4c31951aa2ad0
+SIZE (xpi/firefox-i18n-23.0/th.xpi) = 376175
+SHA256 (xpi/firefox-i18n-23.0/tr.xpi) = 5a41abe1e2e4e24afb4f363d2a2f9a311e500f0010342cf29288e595557a7b46
+SIZE (xpi/firefox-i18n-23.0/tr.xpi) = 338837
+SHA256 (xpi/firefox-i18n-23.0/uk.xpi) = 1a7dbd32d6866763b5531da43fc237469ea9a6b623ded6ea164f46cfd60d8ec1
+SIZE (xpi/firefox-i18n-23.0/uk.xpi) = 364675
+SHA256 (xpi/firefox-i18n-23.0/vi.xpi) = 9e55c6ce9b91e2d4831fe56e0dfbfcc9e533fe858496191a6a2d36e6f84e771a
+SIZE (xpi/firefox-i18n-23.0/vi.xpi) = 353841
+SHA256 (xpi/firefox-i18n-23.0/zh-CN.xpi) = 872efce7eeaeb3360de14960a4e3e0dd984e1717d9b547ab8bda8db3d6f32628
+SIZE (xpi/firefox-i18n-23.0/zh-CN.xpi) = 356629
+SHA256 (xpi/firefox-i18n-23.0/zh-TW.xpi) = cb81271870355cac22150d00b1d0dee88a17b5b810160a2151295695d703024c
+SIZE (xpi/firefox-i18n-23.0/zh-TW.xpi) = 350212
+SHA256 (xpi/firefox-i18n-23.0/zu.xpi) = 2b04eb6c9cc7aae57c4fffc4e77d2c8271122073c1eb568078a326659ac329b8
+SIZE (xpi/firefox-i18n-23.0/zu.xpi) = 332833
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 79ba698589fa..b41d77d97bca 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= firefox
-DISTVERSION= 22.0
+DISTVERSION= 23.0
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source
@@ -11,9 +11,9 @@ DISTNAME= ${PORTNAME}-${DISTVERSION}.source
MAINTAINER= gecko@FreeBSD.org
COMMENT= Web browser based on the browser portion of Mozilla
-BUILD_DEPENDS= nspr>=4.9.6:${PORTSDIR}/devel/nspr \
- nss>=3.14.3:${PORTSDIR}/security/nss \
- sqlite3>=3.7.14.1:${PORTSDIR}/databases/sqlite3 \
+BUILD_DEPENDS= nspr>=4.10:${PORTSDIR}/devel/nspr \
+ nss>=3.15:${PORTSDIR}/security/nss \
+ sqlite3>=3.7.16.1:${PORTSDIR}/databases/sqlite3 \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
unzip:${PORTSDIR}/archivers/unzip
@@ -45,7 +45,7 @@ MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \
--enable-application=browser \
--enable-official-branding
-OPTIONS_DEFINE= PGO WEBRTC
+OPTIONS_DEFINE= WEBRTC
OPTIONS_DEFAULT=WEBRTC
.include "${.CURDIR}/../../www/firefox/Makefile.options"
@@ -57,33 +57,6 @@ OPTIONS_SINGLE_AUDIO:=${OPTIONS_SINGLE_AUDIO:S/OSS//}
WRKSRC:= ${WRKDIR}/mozilla-release
-.if ${PORT_OPTIONS:MPGO}
-USE_GCC?= yes
-USE_DISPLAY= yes
-.include "${PORTSDIR}/Mk/bsd.python.mk"
-
-.undef GNU_CONFIGURE
-MOZ_OPTIONS+= ${CONFIGURE_TARGET}
-MAKEFILE= ${WRKSRC}/client.mk
-ALL_TARGET= profiledbuild
-MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT="${PYTHON_CMD} \
- @MOZ_OBJDIR@/_profile/pgo/profileserver.py"
-.endif
-
-pre-extract:
-.if ${PORT_OPTIONS:MPGO}
- @${ECHO} "*****************************************************************"
- @${ECHO} "**************************** attention **************************"
- @${ECHO} "*****************************************************************"
- @${ECHO} "To build Firefox with PGO support you need a running X server and"
- @${ECHO} " build this port with an user who could access the X server! "
- @${ECHO} ""
- @${ECHO} "During the build a Firefox instance will start and run some test."
- @${ECHO} " Do not interrupt or close Firefox during this tests! "
- @${ECHO} "*****************************************************************"
- @sleep 10
-.endif
-
post-extract:
@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
@@ -91,7 +64,6 @@ post-extract:
post-patch:
@${REINPLACE_CMD} -e '/MOZPNG/s/=[0-9]*/=10511/' \
- -e '/^SQLITE_VERSION/s/=.*/=3.7.14.1/' \
${WRKSRC}/configure.in
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/browser/app/nsBrowserApp.cpp
diff --git a/www/firefox/Makefile.options b/www/firefox/Makefile.options
index 2636d411aae4..23feea6ee0c6 100644
--- a/www/firefox/Makefile.options
+++ b/www/firefox/Makefile.options
@@ -1,7 +1,7 @@
# -*- makefile-bsdmake -*-
OPTIONS_DEFINE+= DBUS DEBUG GCONF GIO GNOMEUI GNOMEVFS2 GSTREAMER \
- LIBPROXY LOGGING OPTIMIZED_CFLAGS
+ LIBPROXY LOGGING OPTIMIZED_CFLAGS PGO
OPTIONS_DEFAULT+= ALSA DBUS GIO LOGGING
OPTIONS_SINGLE+= AUDIO
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index ac6d99fc0121..b34a489f9980 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,2 +1,2 @@
-SHA256 (firefox-22.0.source.tar.bz2) = 040d4e7fb5076b6aa25f0d3851f8d98c2a2e72ef1599f4387f09f47f6096515e
-SIZE (firefox-22.0.source.tar.bz2) = 111109062
+SHA256 (firefox-23.0.source.tar.bz2) = 2d64bd12cfa80c57e4a7f4156c7b4fde725a6173dfe48e2fac12e1927faf563e
+SIZE (firefox-23.0.source.tar.bz2) = 115821591
diff --git a/www/firefox/files/patch-bug803480 b/www/firefox/files/patch-bug803480
index c15992fa36f8..1d99d93d7215 100644
--- a/www/firefox/files/patch-bug803480
+++ b/www/firefox/files/patch-bug803480
@@ -1,8 +1,55 @@
diff --git configure.in configure.in
-index fa283d0..936b6e0 100644
+index a0575dc..be327fd 100644
--- configure.in
+++ configure.in
-@@ -8229,16 +8229,26 @@ MOZ_ARG_DISABLE_BOOL(necko-wifi,
+@@ -4306,7 +4306,6 @@ NS_PRINTING=1
+ MOZ_PDF_PRINTING=
+ MOZ_DISABLE_CRYPTOLEGACY=
+ NSS_DISABLE_DBM=
+-NECKO_WIFI=1
+ NECKO_COOKIES=1
+ NECKO_PROTOCOLS_DEFAULT="about data file ftp http res viewsource websocket wyciwyg device"
+ USE_ARM_KUSER=
+@@ -4336,11 +4335,6 @@ case "${target}" in
+ fi
+
+ NSS_DISABLE_DBM=1
+- if test -z "$gonkdir"; then
+- NECKO_WIFI=
+- else
+- NECKO_WIFI=1
+- fi
+ MOZ_THEME_FASTSTRIPE=1
+ MOZ_TREE_FREETYPE=1
+ MOZ_MEMORY=1
+@@ -8485,28 +8479,39 @@ done
+ dnl
+ dnl option to disable necko's wifi scanner
+ dnl
++
++case "$OS_TARGET" in
++ OS2)
++ dnl OS/2 implementation of Necko-WiFi support will be added in bug 506566
++ ;;
++ Android)
++ if test -n "$gonkdir"; then
++ NECKO_WIFI=1
++ fi
++ ;;
++ Darwin|SunOS|WINNT)
++ NECKO_WIFI=1
++ ;;
++ Linux)
++ if test -z "$MOZ_ENABLE_DBUS"; then
++ AC_MSG_ERROR([Necko WiFi scanning needs DBus on your platform, remove --disable-dbus or use --disable-necko-wifi])
++ fi
++ NECKO_WIFI=1
++ NECKO_WIFI_DBUS=1
++ ;;
++esac
++
+ MOZ_ARG_DISABLE_BOOL(necko-wifi,
+ [ --disable-necko-wifi Disable necko wifi scanner],
NECKO_WIFI=,
NECKO_WIFI=1)
@@ -16,26 +63,27 @@ index fa283d0..936b6e0 100644
- "$OS_ARCH" != "SunOS" -a \
- "$OS_ARCH" != "WINNT"; then
- AC_MSG_ERROR([Necko WiFi scanning not supported on your platform, use --disable-necko-wifi])
-+if test "$NECKO_WIFI"; then
-+ case "$OS_TARGET" in
-+ Android)
-+ ;;
-+ Darwin)
-+ ;;
-+ SunOS)
-+ ;;
-+ WINNT)
-+ ;;
-+ OS2)
-+ dnl OS/2 implementation of Necko-WiFi support will be added in bug 506566
-+ NECKO_WIFI=
-+ ;;
-+ *)
-+ if test -z "$MOZ_ENABLE_DBUS"; then
-+ AC_MSG_ERROR([Necko WiFi scanning needs DBus on your platform, remove --disable-dbus or use --disable-necko-wifi])
-+ fi
-+ ;;
-+ esac
+-fi
+-
+ if test "$NECKO_WIFI"; then
+ AC_DEFINE(NECKO_WIFI)
+ _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_WIFI"
fi
+ AC_SUBST(NECKO_WIFI)
++AC_SUBST(NECKO_WIFI_DBUS)
- if test "$NECKO_WIFI"; then
+ dnl
+ dnl option to disable cookies
+diff --git netwerk/wifi/Makefile.in netwerk/wifi/Makefile.in
+index 39d7364..e8d276b 100644
+--- netwerk/wifi/Makefile.in
++++ netwerk/wifi/Makefile.in
+@@ -41,7 +41,7 @@ CPPSRCS += nsWifiScannerSolaris.cpp
+ OS_INCLUDES += $(GLIB_CFLAGS)
+ endif
+
+-ifdef MOZ_ENABLE_DBUS
++ifdef NECKO_WIFI_DBUS
+ CPPSRCS += nsWifiScannerDBus.cpp
+ OS_INCLUDES += $(MOZ_DBUS_GLIB_CFLAGS)
+ endif
diff --git a/www/firefox/files/patch-bug807492 b/www/firefox/files/patch-bug807492
index f9e5de6739ac..4b4e90f52ba1 100644
--- a/www/firefox/files/patch-bug807492
+++ b/www/firefox/files/patch-bug807492
@@ -17,17 +17,17 @@ diff --git configure.in configure.in
index c167461..8346c11 100644
--- configure.in
+++ configure.in
-@@ -5258,17 +5258,17 @@ if test -n "$MOZ_WEBRTC"; then
- *-android*|*-linuxandroid*)
- if test -n "$MOZ_B2G"; then
- MOZ_WEBRTC=1
- else
- dnl Make sure doesn't get matched by *-linux*
- MOZ_WEBRTC=
- fi
- ;;
-- *-linux*|*-mingw*|*-darwin*)
-+ *-linux*|*-mingw*|*-darwin*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
+@@ -5246,17 +5246,17 @@ if test "$NS_PRINTING"; then
+ AC_DEFINE(NS_PRINT_PREVIEW)
+ fi
+
+ dnl Turn off webrtc for OS's we don't handle yet, but allow
+ dnl --enable-webrtc to override. Can disable for everything in
+ dnl the master list above.
+ if test -n "$MOZ_WEBRTC"; then
+ case "$target" in
+- *-linux*|*-mingw*|*-darwin*|*-android*|*-linuxandroid*)
++ *-linux*|*-mingw*|*-darwin*|*-android*|*-linuxandroid*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
dnl Leave enabled
;;
*)
diff --git a/www/firefox/files/patch-bug826985 b/www/firefox/files/patch-bug826985
index 217655c0b81a..fe55ff667281 100644
--- a/www/firefox/files/patch-bug826985
+++ b/www/firefox/files/patch-bug826985
@@ -16,16 +16,16 @@ diff --git configure.in configure.in
index 55e4cd1..76567b3 100644
--- configure.in
+++ configure.in
-@@ -5294,6 +5294,9 @@ if test -n "$MOZ_WEBRTC"; then
+@@ -5309,6 +5309,9 @@ if test -n "$MOZ_WEBRTC"; then
MOZ_VP8_ENCODER=1
MOZ_VP8_ERROR_CONCEALMENT=1
+ dnl with libv4l2 we can support more cameras
+ PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2)
+
- if test "$MOZ_WIDGET_TOOLKIT" != "gonk"; then
- dnl OpenSLES is only available in Android 2.3 and later; we'll change this
- dnl hard dependency to a dynamic load with graceful runtime failure before
+ dnl enable once Signaling lands
+ MOZ_WEBRTC_SIGNALING=1
+ AC_DEFINE(MOZ_WEBRTC_SIGNALING)
@@ -8981,6 +8984,10 @@ elif test "${OS_TARGET}" = "Android"; then
fi
fi
diff --git a/www/firefox/files/patch-bug851992 b/www/firefox/files/patch-bug851992
new file mode 100644
index 000000000000..3185452e2b44
--- /dev/null
+++ b/www/firefox/files/patch-bug851992
@@ -0,0 +1,373 @@
+diff --git a/config/Makefile.in b/config/Makefile.in
+--- config/Makefile.in
++++ config/Makefile.in
+@@ -97,16 +97,17 @@ export:: $(export-preqs)
+ -DMOZ_TREE_PIXMAN=$(MOZ_TREE_PIXMAN) \
+ -DMOZ_NATIVE_HUNSPELL=$(MOZ_NATIVE_HUNSPELL) \
+ -DMOZ_NATIVE_BZ2=$(MOZ_NATIVE_BZ2) \
+ -DMOZ_NATIVE_ZLIB=$(MOZ_NATIVE_ZLIB) \
+ -DMOZ_NATIVE_PNG=$(MOZ_NATIVE_PNG) \
+ -DMOZ_NATIVE_JPEG=$(MOZ_NATIVE_JPEG) \
+ -DMOZ_NATIVE_LIBEVENT=$(MOZ_NATIVE_LIBEVENT) \
+ -DMOZ_NATIVE_LIBVPX=$(MOZ_NATIVE_LIBVPX) \
++ -DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \
+ $(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
+ $(INSTALL) system_wrappers $(DIST)
+
+ GARBAGE_DIRS += system_wrappers
+ endif
+
+ ifdef WRAP_STL_INCLUDES
+ ifdef GNU_CXX
+diff --git a/config/system-headers b/config/system-headers
+--- config/system-headers
++++ config/system-headers
+@@ -1125,8 +1125,19 @@ gst/video/video.h
+ sys/msg.h
+ sys/ipc.h
+ sys/thr.h
+ sys/user.h
+ kvm.h
+ spawn.h
+ err.h
+ xlocale.h
++#if MOZ_NATIVE_ICU==1
++unicode/locid.h
++unicode/numsys.h
++unicode/ucal.h
++unicode/ucol.h
++unicode/udat.h
++unicode/udatpg.h
++unicode/uenum.h
++unicode/unum.h
++unicode/ustring.h
++#endif
+diff --git a/configure.in b/configure.in
+--- configure.in
++++ configure.in
+@@ -4134,16 +4134,32 @@ if test -n "$MOZ_NATIVE_FFI"; then
+ PKG_CHECK_MODULES(MOZ_FFI, libffi > 3.0.9)
+ else
+ PKG_CHECK_MODULES(MOZ_FFI, libffi >= 3.0.9)
+ fi
+ MOZ_JS_STATIC_LIBS="$MOZ_JS_STATIC_LIBS $MOZ_FFI_LIBS"
+ fi
+
+ dnl ========================================================
++dnl system icu support
++dnl ========================================================
++MOZ_NATIVE_ICU=
++MOZ_ARG_WITH_BOOL(system-icu,
++[ --with-system-icu
++ Use system icu (located with pkgconfig)],
++ MOZ_NATIVE_ICU=1)
++
++if test -n "$MOZ_NATIVE_ICU"; then
++ PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1)
++ MOZ_JS_STATIC_LIBS="$MOZ_JS_STATIC_LIBS $MOZ_ICU_LIBS"
++fi
++
++AC_SUBST(MOZ_NATIVE_ICU)
++
++dnl ========================================================
+ dnl Java SDK support
+ dnl ========================================================
+
+ JAVA_BIN_PATH=
+ MOZ_ARG_WITH_STRING(java-bin-path,
+ [ --with-java-bin-path=dir
+ Location of Java binaries (java, javac, jar)],
+ JAVA_BIN_PATH=$withval)
+diff --git a/js/src/Makefile.in b/js/src/Makefile.in
+--- js/src/Makefile.in
++++ js/src/Makefile.in
+@@ -232,48 +232,54 @@ endif
+
+ #############################################
+ # BEGIN ECMAScript Internationalization API
+ #
+
+ # ICU headers need to be available whether we build with the complete
+ # Internationalization API or not - ICU stubs rely on them.
+
++ifdef MOZ_NATIVE_ICU
++LOCAL_INCLUDES += $(MOZ_ICU_CFLAGS)
++else
+ LOCAL_INCLUDES += \
+ -I$(topsrcdir)/../../intl/icu/source/common \
+ -I$(topsrcdir)/../../intl/icu/source/i18n \
+ $(NULL)
++endif
+
+ ifdef ENABLE_INTL_API
+
+ ifeq ($(OS_ARCH),WINNT)
+ # Parallel gmake is buggy on Windows
+ ICU_GMAKE_OPTIONS="-j1"
+ # Library names: On Windows, ICU uses modified library names for static
+ # and debug libraries.
+ ifdef MOZ_DEBUG
+ ICU_LIB_SUFFIX=d
+ endif
+ ICU_LIB_RENAME = $(foreach libname,$(ICU_LIB_NAMES),\
+ cp -p intl/icu/lib/s$(libname)$(ICU_LIB_SUFFIX).lib intl/icu/lib/$(libname).lib;)
+ endif
+
++ifndef MOZ_NATIVE_ICU
+ # - Build ICU as part of the "export" target, so things get built
+ # in the right order.
+ # - ICU requires GNU make according to its readme.html. pymake can't be used
+ # because it doesn't support order only dependencies.
+ # - Force ICU to use the standard suffix for object files because expandlibs
+ # will discard all files with a non-standard suffix (bug 857450).
+ # - Options for genrb: -k strict parsing; -R omit collation tailoring rules.
+ export::
+ $(GMAKE) $(ICU_GMAKE_OPTIONS) -C intl/icu STATIC_O=$(OBJ_SUFFIX) GENRBOPTS='-k -R'
+ $(ICU_LIB_RENAME)
+
+ distclean clean::
+ $(call SUBMAKE,$@,intl/icu)
++endif
+
+ endif
+
+ #
+ # END ECMAScript Internationalization API
+ #############################################
+
+
+@@ -398,17 +404,21 @@ CFLAGS += $(MOZ_ZLIB_CFLAGS)
+ EXTRA_LIBS += $(MOZ_ZLIB_LIBS)
+ # Enable zlib usage if zlib has been located. When building the browser on
+ # Windows, MOZ_ZLIB_LIBS is empty because zlib is part of libmozglue. We thus
+ # also enable zlib if mozglue is present.
+ ifneq (,$(MOZ_ZLIB_LIBS)$(MOZ_GLUE_LDFLAGS))
+ DEFINES += -DUSE_ZLIB
+ endif
+
+-SHARED_LIBRARY_LIBS += $(ICU_LIBS)
++ifdef MOZ_NATIVE_ICU
++EXTRA_DSO_LDOPTS += $(MOZ_ICU_LIBS)
++else
++SHARED_LIBRARY_LIBS += $(MOZ_ICU_LIBS)
++endif
+
+ # Prevent floating point errors caused by VC++ optimizations
+ ifdef _MSC_VER
+ # XXX We should add this to CXXFLAGS, too?
+ CFLAGS += -fp:precise
+
+ ifeq ($(CPU_ARCH),x86)
+ # Workaround compiler bug on PGO (Bug 721284)
+diff --git a/js/src/config/Makefile.in b/js/src/config/Makefile.in
+--- js/src/config/Makefile.in
++++ js/src/config/Makefile.in
+@@ -54,16 +54,17 @@ include $(topsrcdir)/config/rules.mk
+
+ HOST_CFLAGS += -DUNICODE -D_UNICODE
+
+ ifdef WRAP_SYSTEM_INCLUDES
+ export:: \
+ $(call mkdir_deps,system_wrappers_js) \
+ $(NULL)
+ $(PYTHON) $(srcdir)/Preprocessor.py $(DEFINES) $(ACDEFINES) \
++ -DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \
+ $(srcdir)/system-headers | $(PERL) $(srcdir)/make-system-wrappers.pl system_wrappers_js
+ $(INSTALL) system_wrappers_js $(DIST)
+
+ GARBAGE_DIRS += system_wrappers_js
+ endif
+
+ GARBAGE += $(srcdir)/*.pyc *.pyc
+
+diff --git a/js/src/config/system-headers b/js/src/config/system-headers
+--- js/src/config/system-headers
++++ js/src/config/system-headers
+@@ -1125,8 +1125,19 @@ gst/video/video.h
+ sys/msg.h
+ sys/ipc.h
+ sys/thr.h
+ sys/user.h
+ kvm.h
+ spawn.h
+ err.h
+ xlocale.h
++#if MOZ_NATIVE_ICU==1
++unicode/locid.h
++unicode/numsys.h
++unicode/ucal.h
++unicode/ucol.h
++unicode/udat.h
++unicode/udatpg.h
++unicode/uenum.h
++unicode/unum.h
++unicode/ustring.h
++#endif
+diff --git a/js/src/configure.in b/js/src/configure.in
+--- js/src/configure.in
++++ js/src/configure.in
+@@ -4406,59 +4406,68 @@ if test "$ACCESSIBILITY" -a "$MOZ_ENABLE
+ AC_DEFINE_UNQUOTED(ATK_MINOR_VERSION, $ATK_MINOR_VERSION)
+ AC_DEFINE_UNQUOTED(ATK_REV_VERSION, $ATK_REV_VERSION)
+ fi
+
+
+ dnl ========================================================
+ dnl ECMAScript Internationalization API Support (uses ICU)
+ dnl ========================================================
++ICU_LIB_NAMES=
++MOZ_NATIVE_ICU=
++MOZ_ARG_WITH_BOOL(system-icu,
++[ --with-system-icu
++ Use system icu (located with pkgconfig)],
++ MOZ_NATIVE_ICU=1)
++
++if test -n "$MOZ_NATIVE_ICU"; then
++ PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1)
++fi
+
+ if test -n "$JS_STANDALONE"; then
+ ENABLE_INTL_API=1
+ fi
+ MOZ_ARG_ENABLE_BOOL(intl-api,
+ [ --enable-intl-api Enable ECMAScript Internationalization API (default=yes for standalone JS)],
+ ENABLE_INTL_API=1,
+ ENABLE_INTL_API= )
+
+ dnl Settings for the implementation of the ECMAScript Internationalization API
+ if test -n "$ENABLE_INTL_API"; then
+ AC_DEFINE(ENABLE_INTL_API)
+- # We build ICU as a static library.
+- AC_DEFINE(U_STATIC_IMPLEMENTATION)
+-
+- case "$OS_TARGET" in
+- WINNT)
+- ICU_LIB_NAMES="icuin icuuc icudt"
+- ;;
+- Darwin|Linux)
+- ICU_LIB_NAMES="icui18n icuuc icudata"
+- ;;
+- *)
+- AC_MSG_ERROR([ECMAScript Internationalization API is not yet supported on this platform])
+- esac
+-
+- ICU_LIBS='$(call EXPAND_LIBNAME_PATH,$(ICU_LIB_NAMES),$(DEPTH)/intl/icu/lib)'
+-else
+- ICU_LIB_NAMES=
+- ICU_LIBS=
++
++ if test -z "$MOZ_NATIVE_ICU"; then
++ case "$OS_TARGET" in
++ WINNT)
++ ICU_LIB_NAMES="icuin icuuc icudt"
++ ;;
++ Darwin|Linux)
++ ICU_LIB_NAMES="icui18n icuuc icudata"
++ ;;
++ *)
++ AC_MSG_ERROR([ECMAScript Internationalization API is not yet supported on this platform])
++ esac
++ MOZ_ICU_LIBS='$(call EXPAND_LIBNAME_PATH,$(ICU_LIB_NAMES),$(DEPTH)/intl/icu/lib)'
++ fi
+ fi
+
+ AC_SUBST(ENABLE_INTL_API)
+ AC_SUBST(ICU_LIB_NAMES)
+-AC_SUBST(ICU_LIBS)
+-
+-dnl Source files that use ICU should have control over which parts of the ICU
+-dnl namespace they want to use.
+-AC_DEFINE(U_USING_ICU_NAMESPACE,0)
+-
++AC_SUBST(MOZ_ICU_LIBS)
++AC_SUBST(MOZ_NATIVE_ICU)
+
+ dnl Settings for ICU
+-if test -n "$ENABLE_INTL_API" ; then
++if test -n "$ENABLE_INTL_API" -a -z "$MOZ_NATIVE_ICU"; then
++ dnl We build ICU as a static library.
++ AC_DEFINE(U_STATIC_IMPLEMENTATION)
++
++ dnl Source files that use ICU should have control over which parts of the ICU
++ dnl namespace they want to use.
++ AC_DEFINE(U_USING_ICU_NAMESPACE,0)
++
+ # Set ICU compile options
+ ICU_CPPFLAGS=""
+ # don't use icu namespace automatically in client code
+ ICU_CPPFLAGS="$ICU_CPPFLAGS -DU_USING_ICU_NAMESPACE=0"
+ # don't include obsolete header files
+ ICU_CPPFLAGS="$ICU_CPPFLAGS -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1"
+ # remove chunks of the library that we don't need (yet)
+ ICU_CPPFLAGS="$ICU_CPPFLAGS -DUCONFIG_NO_LEGACY_CONVERSION"
+diff --git a/js/src/gdb/Makefile.in b/js/src/gdb/Makefile.in
+--- js/src/gdb/Makefile.in
++++ js/src/gdb/Makefile.in
+@@ -14,16 +14,20 @@ include $(DEPTH)/config/autoconf.mk
+ # Building against js_static requires that we declare mfbt sybols "exported"
+ # on its behalf.
+ DEFINES += -DEXPORT_JS_API -DIMPL_MFBT
+
+ LIBS = $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS) $(MOZ_ZLIB_LIBS)
+
+ LOCAL_INCLUDES += -I$(topsrcdir) -I..
+
++ifdef MOZ_NATIVE_ICU
++EXTRA_LIBS += $(MOZ_ICU_LIBS)
++endif
++
+ EXTRA_LIBS += $(MOZ_FFI_LIBS)
+
+ # Place a GDB Python auto-load file next to the gdb-tests executable, both
+ # in the build directory and in the dist/bin directory.
+ PP_TARGETS += GDB_AUTOLOAD
+ GDB_AUTOLOAD := gdb-tests-gdb.py.in
+ GDB_AUTOLOAD_FLAGS := -Dtopsrcdir=$(abspath $(topsrcdir))
+
+diff --git a/js/src/jsapi-tests/Makefile.in b/js/src/jsapi-tests/Makefile.in
+--- js/src/jsapi-tests/Makefile.in
++++ js/src/jsapi-tests/Makefile.in
+@@ -15,16 +15,20 @@ DEFINES += -DEXPORT_JS_API
+ # Building against js_static requires that we declare mfbt sybols "exported"
+ # on its behalf.
+ DEFINES += -DIMPL_MFBT
+
+ LIBS = $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS) $(MOZ_ZLIB_LIBS)
+
+ LOCAL_INCLUDES += -I$(topsrcdir) -I..
+
++ifdef MOZ_NATIVE_ICU
++EXTRA_LIBS += $(MOZ_ICU_LIBS)
++endif
++
+ EXTRA_LIBS += $(MOZ_FFI_LIBS)
+
+ ifdef QEMU_EXE
+ MOZ_POST_PROGRAM_COMMAND = $(topsrcdir)/build/qemu-wrap --qemu $(QEMU_EXE) --libdir $(CROSS_LIB)
+ endif
+
+ # Place a GDB Python auto-load file next to the jsapi-tests executable in
+ # the build directory.
+diff --git a/js/src/shell/Makefile.in b/js/src/shell/Makefile.in
+--- js/src/shell/Makefile.in
++++ js/src/shell/Makefile.in
+@@ -22,16 +22,19 @@ DEFINES += -DEXPORT_JS_API
+ # Building against js_static requires that we declare mfbt sybols "exported"
+ # on its behalf.
+ DEFINES += -DIMPL_MFBT
+
+ LIBS = $(NSPR_LIBS) $(EDITLINE_LIBS) $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(MOZ_ZLIB_LIBS)
+ ifdef MOZ_NATIVE_FFI
+ EXTRA_LIBS += $(MOZ_FFI_LIBS)
+ endif
++ifdef MOZ_NATIVE_ICU
++EXTRA_LIBS += $(MOZ_ICU_LIBS)
++endif
+
+ LOCAL_INCLUDES += -I$(topsrcdir) -I..
+
+ ifeq ($(OS_ARCH),Darwin)
+ ifeq ($(TARGET_CPU),x86_64)
+ DARWIN_EXE_LDFLAGS += -pagezero_size 10000 -image_base 100000000
+ endif
+ endif
diff --git a/www/firefox/files/patch-bug862759 b/www/firefox/files/patch-bug862759
new file mode 100644
index 000000000000..c6ff6607f75c
--- /dev/null
+++ b/www/firefox/files/patch-bug862759
@@ -0,0 +1,10 @@
+--- js/src/frontend/ParseMaps.cpp~
++++ js/src/frontend/ParseMaps.cpp
+@@ -134,5 +134,5 @@ frontend::InitAtomMap(JSContext *cx, frontend::AtomIndexMap *indices, HeapPtrAto
+ }
+ }
+
+-template class AtomDecls<FullParseHandler>;
+-template class AtomDecls<SyntaxParseHandler>;
++template class frontend::AtomDecls<FullParseHandler>;
++template class frontend::AtomDecls<SyntaxParseHandler>;
diff --git a/www/firefox/files/patch-toolkit-components-osfile-osfile_unix_allthreads.jsm b/www/firefox/files/patch-bug878791
index d8a3612e1702..d8a3612e1702 100644
--- a/www/firefox/files/patch-toolkit-components-osfile-osfile_unix_allthreads.jsm
+++ b/www/firefox/files/patch-bug878791
diff --git a/www/firefox/files/patch-bug893397 b/www/firefox/files/patch-bug893397
new file mode 100644
index 000000000000..b9bd05aaa7f3
--- /dev/null
+++ b/www/firefox/files/patch-bug893397
@@ -0,0 +1,205 @@
+diff --git configure.in configure.in
+index 549ad06..2878d9f 100644
+--- configure.in
++++ configure.in
+@@ -8491,7 +8491,7 @@ case "$OS_TARGET" in
+ NECKO_WIFI=1
+ fi
+ ;;
+- Darwin|SunOS|WINNT)
++ Darwin|FreeBSD|SunOS|WINNT)
+ NECKO_WIFI=1
+ ;;
+ Linux)
+diff --git netwerk/wifi/Makefile.in netwerk/wifi/Makefile.in
+index 07b01de..11706af 100644
+--- netwerk/wifi/Makefile.in
++++ netwerk/wifi/Makefile.in
+@@ -32,6 +32,10 @@ CPPSRCS += nsWifiScannerMac.cpp
+ CMMSRCS = osx_corewlan.mm
+ endif
+
++ifeq ($(OS_ARCH),FreeBSD)
++CPPSRCS += nsWifiScannerFreeBSD.cpp
++endif
++
+ ifneq (,$(filter WINNT,$(OS_ARCH)))
+ CPPSRCS += nsWifiScannerWin.cpp
+ endif
+diff --git netwerk/wifi/nsWifiScannerFreeBSD.cpp netwerk/wifi/nsWifiScannerFreeBSD.cpp
+new file mode 100644
+index 0000000..80d4cb6
+--- /dev/null
++++ netwerk/wifi/nsWifiScannerFreeBSD.cpp
+@@ -0,0 +1,171 @@
++/* This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this
++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
++
++// Developed by J.R. Oldroyd <fbsd@opal.com>, December 2012.
++
++// For FreeBSD we use the getifaddrs(3) to obtain the list of interfaces
++// and then check for those with an 802.11 media type and able to return
++// a list of stations. This is similar to ifconfig(8).
++
++#include <sys/types.h>
++#include <sys/ioctl.h>
++#include <sys/socket.h>
++#include <net/if.h>
++#include <net/if_media.h>
++#include <net80211/ieee80211_ioctl.h>
++
++#include <ifaddrs.h>
++#include <string.h>
++#include <unistd.h>
++
++#include "nsWifiAccessPoint.h"
++
++using namespace mozilla;
++
++static nsresult
++FreeBSDGetAccessPointData(nsCOMArray<nsWifiAccessPoint> &accessPoints)
++{
++ bool res = false;
++ char *dupn = NULL;
++ struct ifaddrs *ifal, *ifa;
++ unsigned len;
++
++ // get list of interfaces
++ if (getifaddrs(&ifal) < 0)
++ return NS_ERROR_FAILURE;
++
++ accessPoints.Clear();
++
++ // loop through the interfaces
++ for (ifa = ifal; ifa; ifa = ifa->ifa_next) {
++ int s;
++ struct ifreq ifr;
++ struct ifmediareq ifmr;
++ struct ieee80211req i802r;
++ char iscanbuf[32*1024], *vsr;
++
++ memset(&ifr, 0, sizeof(ifr));
++
++ // list can contain duplicates, so ignore those
++ if (dupn != NULL && strcmp(dupn, ifa->ifa_name) == 0)
++ continue;
++ dupn = ifa->ifa_name;
++
++ // store interface name in socket structure
++ strncpy(ifr.ifr_name, ifa->ifa_name, sizeof(ifr.ifr_name));
++ ifr.ifr_addr.sa_family = AF_LOCAL;
++
++ // open socket to interface
++ if ((s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0)) < 0)
++ continue;
++
++ // clear interface media structure
++ (void) memset(&ifmr, 0, sizeof(ifmr));
++ (void) strncpy(ifmr.ifm_name, ifa->ifa_name, sizeof(ifmr.ifm_name));
++
++ // get interface media information
++ if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) {
++ close(s);
++ continue;
++ }
++
++ // check interface is a WiFi interface
++ if (IFM_TYPE(ifmr.ifm_active) != IFM_IEEE80211) {
++ close(s);
++ continue;
++ }
++
++ // perform WiFi scan
++ (void) memset(&i802r, 0, sizeof(i802r));
++ (void) strncpy(i802r.i_name, ifa->ifa_name, sizeof(i802r.i_name));
++ i802r.i_type = IEEE80211_IOC_SCAN_RESULTS;
++ i802r.i_data = iscanbuf;
++ i802r.i_len = sizeof(iscanbuf);
++ if (ioctl(s, SIOCG80211, &i802r) < 0) {
++ close(s);
++ continue;
++ }
++
++ // close socket
++ close(s);
++
++ // loop through WiFi networks and build geoloc-lookup structure
++ vsr = (char *) i802r.i_data;
++ len = i802r.i_len;
++ while (len >= sizeof(struct ieee80211req_scan_result)) {
++ struct ieee80211req_scan_result *isr;
++ char *id;
++ int idlen;
++ char ssid[IEEE80211_NWID_LEN+1];
++ nsWifiAccessPoint *ap;
++
++ isr = (struct ieee80211req_scan_result *) vsr;
++
++ // determine size of this entry
++ if (isr->isr_meshid_len) {
++ id = vsr + isr->isr_ie_off + isr->isr_ssid_len;
++ idlen = isr->isr_meshid_len;
++ }
++ else {
++ id = vsr + isr->isr_ie_off;
++ idlen = isr->isr_ssid_len;
++ }
++
++ // copy network data
++ strncpy(ssid, id, idlen);
++ ssid[idlen] = '\0';
++ ap = new nsWifiAccessPoint();
++ ap->setSSID(ssid, strlen(ssid));
++ ap->setMac(isr->isr_bssid);
++ ap->setSignal(isr->isr_rssi);
++ accessPoints.AppendObject(ap);
++ res = true;
++
++ // log the data
++ LOG(( "FreeBSD access point: "
++ << "SSID: " << ssid << ", "
++ << "MAC: " << isr->isr_bssid << ", "
++ << "Strength: " << isr->isr_rssi ", "
++ << "Channel: " << isr->isr_freq << "MHz" ));
++
++ // increment pointers
++ len -= isr->isr_len;
++ vsr += isr->isr_len;
++ }
++ }
++
++ freeifaddrs(ifal);
++
++ return res ? NS_OK : NS_ERROR_FAILURE;
++}
++
++nsresult
++nsWifiMonitor::DoScan()
++{
++ // Regularly get the access point data.
++
++ nsCOMArray<nsWifiAccessPoint> lastAccessPoints;
++ nsCOMArray<nsWifiAccessPoint> accessPoints;
++
++ do {
++ nsresult rv = FreeBSDGetAccessPointData(accessPoints);
++ if (NS_FAILED(rv))
++ return rv;
++
++ bool accessPointsChanged = !AccessPointsEqual(accessPoints, lastAccessPoints);
++ ReplaceArray(lastAccessPoints, accessPoints);
++
++ rv = CallWifiListeners(lastAccessPoints, accessPointsChanged);
++ NS_ENSURE_SUCCESS(rv, rv);
++
++ // wait for some reasonable amount of time. pref?
++ LOG(("waiting on monitor\n"));
++
++ ReentrantMonitorAutoEnter mon(mReentrantMonitor);
++ mon.Wait(PR_SecondsToInterval(60));
++ }
++ while (mKeepGoing);
++
++ return NS_OK;
++}
diff --git a/www/libxul/Makefile b/www/libxul/Makefile
index 13367e89ff53..bc50cd9579cc 100644
--- a/www/libxul/Makefile
+++ b/www/libxul/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= libxul
-DISTVERSION= 17.0.7
+DISTVERSION= 17.0.8
CATEGORIES?= www devel
MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source
DISTNAME= firefox-${DISTVERSION}esr.source
diff --git a/www/libxul/distinfo b/www/libxul/distinfo
index c156a930cfc8..8423f8c9a451 100644
--- a/www/libxul/distinfo
+++ b/www/libxul/distinfo
@@ -1,2 +1,2 @@
-SHA256 (firefox-17.0.7esr.source.tar.bz2) = 126dbb0660cec3290be718b08eb6e8af4adb453d6a57fd4f7334d4b37fea9f33
-SIZE (firefox-17.0.7esr.source.tar.bz2) = 90603436
+SHA256 (firefox-17.0.8esr.source.tar.bz2) = 87f846d0cc6e1b2f4c1baeb58d2123ffbc8c166a1ec81a3b1e0551fbbd6ef1e8
+SIZE (firefox-17.0.8esr.source.tar.bz2) = 90765879
diff --git a/www/linux-firefox/Makefile b/www/linux-firefox/Makefile
index 50b492cba4a8..726227ea9219 100644
--- a/www/linux-firefox/Makefile
+++ b/www/linux-firefox/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= firefox
-PORTVERSION= 22.0
+PORTVERSION= 23.0
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${PORTVERSION}/linux-i686/en-US
@@ -18,6 +18,7 @@ USE_BZIP2= yes
USE_LINUX_APPS= dbusglib dbuslibs alsalib alsa-plugins-oss
+PREFS_FILE= ${WRKSRC}/${APP_SUBDIR}defaults/preferences/browser-prefs.js
APP_SUBDIR= browser/ # plugins, extensions
.include "${.CURDIR}/../linux-seamonkey/Makefile.common"
@@ -27,15 +28,15 @@ APP_SUBDIR= browser/ # plugins, extensions
post-extract: replace-gre
replace-gre: version-compat-check
@${ECHO_MSG} "===> GRE versions are compatible, replacing with" \
- "$$(${MAKE} -V PKGNAME -C ${PORTSDIR}/www/linux-seamonkey)"
- cd $$(${MAKE} -V WRKSRC -C ${PORTSDIR}/www/linux-seamonkey); \
+ "$$(${MAKE} -V PKGNAME -C ${.CURDIR}/../linux-seamonkey)"
+ cd $$(${MAKE} -V WRKSRC -C ${.CURDIR}/../linux-seamonkey); \
${CP} lib* dependentlibs.list ${WRKSRC}
version-compat-check:
@${ECHO_MSG} "===> Checking GRE version is compatible with" \
- "$$(${MAKE} -V PKGNAME -C ${PORTSDIR}/www/linux-seamonkey)"
+ "$$(${MAKE} -V PKGNAME -C ${.CURDIR}/../linux-seamonkey)"
@ff_gre_version=$$(${AWK} -F= '/Milestone/ { print $$2 }' ${WRKSRC}/platform.ini); \
- sm_gre_version=$$(${AWK} -F= '/Milestone/ { print $$2 }' $$(${MAKE} -V WRKSRC -C ${PORTSDIR}/www/linux-seamonkey)/platform.ini); \
+ sm_gre_version=$$(${AWK} -F= '/Milestone/ { print $$2 }' $$(${MAKE} -V WRKSRC -C ${.CURDIR}/../linux-seamonkey)/platform.ini); \
if [ $$ff_gre_version != $$sm_gre_version ]; then \
${ECHO_MSG} "===> GRE versions aren't compatible, aborting"; \
exit 1; \
diff --git a/www/linux-firefox/distinfo b/www/linux-firefox/distinfo
index 71044b97d68b..f5ca792100aa 100644
--- a/www/linux-firefox/distinfo
+++ b/www/linux-firefox/distinfo
@@ -1,2 +1,2 @@
-SHA256 (firefox-22.0.tar.bz2) = 3253966e8ca81b872d8fb03fefdd574c1d1bc7555b9aecfa6f354161f676370b
-SIZE (firefox-22.0.tar.bz2) = 25314325
+SHA256 (firefox-23.0.tar.bz2) = 5a3318f5a8c0ad3d039f22fd58694211f18169ef9a7b5b9fbe122a8fab0f5685
+SIZE (firefox-23.0.tar.bz2) = 26109538
diff --git a/www/linux-firefox/pkg-plist b/www/linux-firefox/pkg-plist
index cadceb21658f..40c79c61c362 100644
--- a/www/linux-firefox/pkg-plist
+++ b/www/linux-firefox/pkg-plist
@@ -10,6 +10,7 @@ lib/%%APP_NAME%%/browser/chrome/icons/default/default48.png
lib/%%APP_NAME%%/browser/components/components.manifest
lib/%%APP_NAME%%/browser/components/libbrowsercomps.so
lib/%%APP_NAME%%/browser/crashreporter-override.ini
+lib/%%APP_NAME%%/browser/defaults/preferences/browser-prefs.js
lib/%%APP_NAME%%/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
lib/%%APP_NAME%%/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
lib/%%APP_NAME%%/browser/icons/mozicon128.png
@@ -27,7 +28,6 @@ lib/%%APP_NAME%%/components/libdbusservice.so
lib/%%APP_NAME%%/components/libmozgnome.so
lib/%%APP_NAME%%/crashreporter
lib/%%APP_NAME%%/crashreporter.ini
-lib/%%APP_NAME%%/defaults/pref/browser-prefs.js
lib/%%APP_NAME%%/defaults/pref/channel-prefs.js
lib/%%APP_NAME%%/dependentlibs.list
lib/%%APP_NAME%%/dictionaries/en-US.aff
@@ -76,6 +76,8 @@ lib/%%APP_NAME%%/webapprt/webapprt.ini
@dirrm lib/%%APP_NAME%%/browser/chrome/icons
@dirrm lib/%%APP_NAME%%/browser/chrome
@dirrm lib/%%APP_NAME%%/browser/components
+@dirrm lib/%%APP_NAME%%/browser/defaults/preferences
+@dirrm lib/%%APP_NAME%%/browser/defaults
@dirrm lib/%%APP_NAME%%/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
@dirrm lib/%%APP_NAME%%/browser/extensions
@dirrm lib/%%APP_NAME%%/browser/icons
diff --git a/www/linux-seamonkey/Makefile b/www/linux-seamonkey/Makefile
index 1d030ab6578c..3bb2a0bcc02b 100644
--- a/www/linux-seamonkey/Makefile
+++ b/www/linux-seamonkey/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= seamonkey
-PORTVERSION= 2.19
+PORTVERSION= 2.20
CATEGORIES= www
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${PORTVERSION}/linux-i686/en-US
diff --git a/www/linux-seamonkey/Makefile.common b/www/linux-seamonkey/Makefile.common
index ace1516151fc..82f389b301a9 100644
--- a/www/linux-seamonkey/Makefile.common
+++ b/www/linux-seamonkey/Makefile.common
@@ -67,7 +67,7 @@ do-install:
# Keep empty directories with pkg_* tools
.if !target(post-extract-script)
post-extract-script:
- @if [ "${PKG_BIN:T}" != "pkg" ]; then \
+ @if [ "${PKG_BIN:T}" != "pkg-static" ]; then \
for d in $$(${FIND} ${WRKSRC} -type d -empty); do \
${TOUCH} $$d/.keep_me; \
${ECHO_CMD} lib/${APP_NAME}/$${d#${WRKSRC}/}/.keep_me \
diff --git a/www/linux-seamonkey/distinfo b/www/linux-seamonkey/distinfo
index 4f2b6b743ed5..50d33cd40823 100644
--- a/www/linux-seamonkey/distinfo
+++ b/www/linux-seamonkey/distinfo
@@ -1,2 +1,2 @@
-SHA256 (seamonkey-2.19.tar.bz2) = 418d8ebc992340f8719042c599aeaf2c3751e4dc99454c1e28648d8be9e5f006
-SIZE (seamonkey-2.19.tar.bz2) = 26816834
+SHA256 (seamonkey-2.20.tar.bz2) = d2ac37fbb15f1d2a4297fc12c9db2116e64f6318c3a3b63c6e05dbffdec835e7
+SIZE (seamonkey-2.20.tar.bz2) = 27791845
diff --git a/www/seamonkey-i18n/Makefile b/www/seamonkey-i18n/Makefile
index 1c7d33f7aa3a..9b92cbd8b90d 100644
--- a/www/seamonkey-i18n/Makefile
+++ b/www/seamonkey-i18n/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= seamonkey-i18n
-PORTVERSION= 2.19
+PORTVERSION= 2.20
CATEGORIES= www
MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/langpack
PKGNAMEPREFIX=
@@ -71,14 +71,7 @@ do-install:
@${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A}
@${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \
${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A}
- @for lang in ${SEAMONKEY_I18N_}; do \
- for xpi in ${XPI_LINKFARMS} ; do \
- if [ -d $${xpi} ] ; \
- then \
- ${ECHO_CMD} $$xpi/langpack-$$lang@seamonkey.mozilla.org ${_A} ; \
- fi ; \
- done ; \
- done
+ @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ; { ${RM} -f $$_dir/${WDIR} ; }' ${_A}
post-patch:
${FIND} ${WRKSRC} -name install.rdf -print0 | \
diff --git a/www/seamonkey-i18n/distinfo b/www/seamonkey-i18n/distinfo
index 8a36756991e2..72a616218244 100644
--- a/www/seamonkey-i18n/distinfo
+++ b/www/seamonkey-i18n/distinfo
@@ -1,46 +1,46 @@
-SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.ca.langpack.xpi) = 43bc80367ac83b52fc8196eb794ec44faa478259de4e791506f8b8ab183e2a1c
-SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.ca.langpack.xpi) = 782120
-SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.cs.langpack.xpi) = c77a8fdd500cef05f3bcca2e82a17b1a7a92c9de5620d0aa0e51e1f9a0c5a6a2
-SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.cs.langpack.xpi) = 788132
-SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.de.langpack.xpi) = cc10f5cb1278981ce2725ed9f6e8f276d9530b40b90864072344f0608c429dba
-SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.de.langpack.xpi) = 811668
-SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.en-GB.langpack.xpi) = 4d26df065da998674f0feb701b0491c4481e52c377f5c2e52a85c93dfa9c36ea
-SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.en-GB.langpack.xpi) = 766029
-SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.en-US.langpack.xpi) = 7e29cfb57078b9022279745dc9fb182138c96cf7e134e7267ee5d7df4228bfc8
-SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.en-US.langpack.xpi) = 766506
-SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.es-AR.langpack.xpi) = f2551937b5bf0d40c72149b7d0502d7b82f7cd75cbddbee14bc2409aedd1aa89
-SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.es-AR.langpack.xpi) = 829099
-SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.es-ES.langpack.xpi) = c6d22970c82c182fb6506be2ab65852405e7d4ed3ab22a367e30bf5f46e26a33
-SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.es-ES.langpack.xpi) = 787293
-SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.fi.langpack.xpi) = 2c1feb90c524c5bcd07258839b41d06b2435cc78602713546710aba411d29ab7
-SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.fi.langpack.xpi) = 777244
-SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.fr.langpack.xpi) = 98c8cf48da13468a016c027745e1c1374d83ebfe025182b22dc71c69e985c9a5
-SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.fr.langpack.xpi) = 786708
-SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.hu.langpack.xpi) = 69f81bd9ed97cd45222892bd8ba5c848fbb899018150fe52ab1036b8eb5d78a5
-SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.hu.langpack.xpi) = 819737
-SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.it.langpack.xpi) = 06997605d522ded7af7daae0b33b1de3804ae801f803eb66dd16bea0fb041ed7
-SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.it.langpack.xpi) = 723359
-SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.ja-JP-mac.langpack.xpi) = a06bfb44abff6508016046df3e547612dc3ff49d6cdd8f1a6b65d8e2d9909a55
-SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.ja-JP-mac.langpack.xpi) = 871084
-SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.ja.langpack.xpi) = a899460ae18a4d8e5a9d2f5dbe02dc10156d6d6af7f6e5dde51450cb6cb990dd
-SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.ja.langpack.xpi) = 845891
-SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.lt.langpack.xpi) = c1de1df7602e9fa294d624b31e2c30bf78ab2ee2a916ebceaf7857276f5f218d
-SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.lt.langpack.xpi) = 819104
-SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.nb-NO.langpack.xpi) = ed86364d32e7def012ddf4ab87da215ee97e62223eef6d1040d14593db367044
-SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.nb-NO.langpack.xpi) = 778423
-SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.nl.langpack.xpi) = bbe767f7e0a7bf4b3127e914f9dc537748bfda11e61f0f789265445a649d622d
-SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.nl.langpack.xpi) = 772729
-SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.pl.langpack.xpi) = 433d5fb608abf5cfe1a021b793ef59b88c29aeb6f056ce8b2c34ee28d4d2a8c4
-SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.pl.langpack.xpi) = 818458
-SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.pt-PT.langpack.xpi) = b4150bb86c0986c3da75f4d26d1d3e98fab4f92d9dd388e6734f9044a003bff1
-SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.pt-PT.langpack.xpi) = 813536
-SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.ru.langpack.xpi) = a39e3acf34ad7ddbffbadc1077e776759f13031333f707907daad47797f8c6f9
-SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.ru.langpack.xpi) = 880523
-SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.sk.langpack.xpi) = 19febc855bcf4f3d14a85433f98dacb8a9bd7816cd7f4d54f71abf4b90289ff5
-SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.sk.langpack.xpi) = 814425
-SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.sv-SE.langpack.xpi) = 8c9ee97d5606c109e715e67b79d3ff9f9499c2ef6a731ea5279130ba93761399
-SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.sv-SE.langpack.xpi) = 799857
-SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.tr.langpack.xpi) = 3e0f47c6704f6553a881c6a645a7d837073604731fcd32cef93244f3528a27e5
-SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.tr.langpack.xpi) = 842484
-SHA256 (xpi/seamonkey-i18n-2.19/seamonkey-2.19.uk.langpack.xpi) = 949176949a02ae353f70355b82c0c61ce85eef83edc536619c9dc52c082e0fa4
-SIZE (xpi/seamonkey-i18n-2.19/seamonkey-2.19.uk.langpack.xpi) = 843376
+SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.ca.langpack.xpi) = dcda87f448ba649460454c705affc3c8682b61acf674ec60524ecdf93c1c6494
+SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.ca.langpack.xpi) = 786234
+SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.cs.langpack.xpi) = 433efaae462b6661692f9dd2f35e2c1e90f8dfeefca02ef949d20a3111611697
+SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.cs.langpack.xpi) = 792681
+SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.de.langpack.xpi) = 8066849c5fa8ca4154fde88398471a598cdc793e22ae0ddd537c0897c66fce33
+SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.de.langpack.xpi) = 816125
+SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.en-GB.langpack.xpi) = 07631754db0f117ab0f4726179f632f2b004922e510a434452dbfe40c707e95f
+SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.en-GB.langpack.xpi) = 778706
+SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.en-US.langpack.xpi) = 8727a79f3ca7c468850275a20a9b56c9381658d01b69b6ccada7108bc88be3a8
+SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.en-US.langpack.xpi) = 779133
+SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.es-AR.langpack.xpi) = 814a12b160f4684de2b959c370900253c1f95006b02c4e81bcacb376d5623508
+SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.es-AR.langpack.xpi) = 832957
+SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.es-ES.langpack.xpi) = c526baf8c7a1e1cbd92b1162c91432757387b285c8c14a6afe2868e9c1db804f
+SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.es-ES.langpack.xpi) = 808970
+SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.fi.langpack.xpi) = 50736285028571543888147dd96602c396863e8a631ea3bd9edad10861d1b8f2
+SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.fi.langpack.xpi) = 781765
+SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.fr.langpack.xpi) = ed81f900ff6cddfb4d35dd2e47697643987f55837556a79df67481256a64c3ed
+SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.fr.langpack.xpi) = 790900
+SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.hu.langpack.xpi) = b57c83830504da0aff5a6bca57140f6098689621e9d60fe77202fcb9c0620de8
+SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.hu.langpack.xpi) = 824136
+SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.it.langpack.xpi) = 24d9846fbb6bd35dc5952f561efe217287728107ba0a8669dd166edb0a2b2f19
+SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.it.langpack.xpi) = 726883
+SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.ja-JP-mac.langpack.xpi) = 6716fc1d7274c55bbf58212cfd103e34505957c6fdc5d258fa531e2341b7ee92
+SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.ja-JP-mac.langpack.xpi) = 876109
+SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.ja.langpack.xpi) = 9a8154ebc3a547802da7b8c39375f834e85457cc5abd177fc8210f4701223039
+SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.ja.langpack.xpi) = 850888
+SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.lt.langpack.xpi) = 5cbeebc6c69ad6cd9720219dfa6a608c99e55ec01f05acf01e1b16bfae40b441
+SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.lt.langpack.xpi) = 823333
+SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.nb-NO.langpack.xpi) = 3ba560dd072544b6de6985e979add1fda74a4cae88d6d2a10bf322aba241f798
+SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.nb-NO.langpack.xpi) = 782759
+SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.nl.langpack.xpi) = 0faa1d06063e5f629b29bf2d43f241c3cf71f22ea7c7c329bd252f86849bfd58
+SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.nl.langpack.xpi) = 776794
+SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.pl.langpack.xpi) = ce8a980121bb9bb00c62594b90c9f8230cd35a79d3e5ac992c4dcc4117839482
+SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.pl.langpack.xpi) = 822501
+SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.pt-PT.langpack.xpi) = 489fdce1e57d24975e6576d4bc8e923345e771edde5e2d80795f6ff6b16a3280
+SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.pt-PT.langpack.xpi) = 817878
+SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.ru.langpack.xpi) = b713226abf662a8c04a275bfc86a6a8414284fd3851fbe4cc446bf30872cc478
+SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.ru.langpack.xpi) = 884270
+SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.sk.langpack.xpi) = 40d6413ec8b39ab623a32808a341c0bdd717d97dcd76a62bbb1cadc2cad4a085
+SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.sk.langpack.xpi) = 818446
+SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.sv-SE.langpack.xpi) = 9d1ca084ac20a9b1ff9e4c6e028e5e0a7222b84841fcea6e4e7cc7d6c62c3ee6
+SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.sv-SE.langpack.xpi) = 804382
+SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.tr.langpack.xpi) = f79ebcf49f9129944dba82ec57397812135b24d59e29f720c2402d46120d5e19
+SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.tr.langpack.xpi) = 846836
+SHA256 (xpi/seamonkey-i18n-2.20/seamonkey-2.20.uk.langpack.xpi) = 4202c86c0427506e216491b63662f50429ffe351e80850780d9eea9c36eb823f
+SIZE (xpi/seamonkey-i18n-2.20/seamonkey-2.20.uk.langpack.xpi) = 847645
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 5d53b41c988e..62e0bb3b416c 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= seamonkey
-DISTVERSION= 2.19
-PORTREVISION= 1
+DISTVERSION= 2.20
CATEGORIES?= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source
DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
@@ -12,14 +11,14 @@ EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
MAINTAINER= gecko@FreeBSD.org
COMMENT= The open source, standards compliant web browser
-BUILD_DEPENDS= nspr>=4.9.6:${PORTSDIR}/devel/nspr \
- nss>=3.14.3:${PORTSDIR}/security/nss \
+BUILD_DEPENDS= nspr>=4.10:${PORTSDIR}/devel/nspr \
+ nss>=3.15:${PORTSDIR}/security/nss \
sqlite3>=3.7.16.1:${PORTSDIR}/databases/sqlite3 \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
unzip:${PORTSDIR}/archivers/unzip
EM_VERSION= 1.5.2
-L_VERSION= 2.4b1
+L_VERSION= 2.5b1
USE_AUTOTOOLS= autoconf213:env
USE_PYTHON_BUILD=-2.7
@@ -31,7 +30,6 @@ WANT_GNOME= yes
USE_QT4= # empty
QT_NONSTANDARD= yes
WANT_PERL= yes
-GNU_CONFIGURE= yes
ALL_TARGET= default
USE_GL= gl
USE_DOS2UNIX= mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp
@@ -55,6 +53,11 @@ COMPOSER_DESC?= HTML Composer module
LDAP_DESC?= LDAP support for Mailnews
MAILNEWS_DESC?= Mail and News modules
+# non-client.mk objdir build broken after bug 846540
+.undef GNU_CONFIGURE
+ALL_TARGET= build
+MAKEFILE= ${WRKSRC}/client.mk
+
.include "${.CURDIR}/../../www/firefox/Makefile.options"
# OSS is gone after bug 852401
@@ -74,7 +77,8 @@ MOZSRC:= ${WRKSRC}/mozilla
XPI_LIBDIR= ${PREFIX}/lib/xpi
.if ! ${PORT_OPTIONS:MMAILNEWS}
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-configure.in
+EXTRA_PATCHES+= ${FILESDIR}/extra-mailnews-patch-bridge-bridge.mk \
+ ${FILESDIR}/extra-patch-configure.in
MOZ_OPTIONS+= --disable-ldap --disable-mailnews
.else
# mail and news desired, but not LDAP
@@ -95,8 +99,8 @@ EM_ID= ${PORTNAME}@mozilla-enigmail.org
EM_ID_RFILES= ${XPI_LIBDIR}/${EM_ID}/install.rdf \
${XPI_LIBDIR}/${EM_ID}/components/enigmail.js \
${XPI_LIBDIR}/${EM_ID}/modules/enigmailCommon.jsm
-EXTRA_PATCHES+= ${FILESDIR}/extrapatch-enigmail-ipc-src-Makefile \
- ${FILESDIR}/extra-bug886095
+EXTRA_PATCHES+= ${FILESDIR}/extrapatch-enigmail-ipc-src-Makefile
+EXTRA_PATCHES+= ${FILESDIR}/extra-bug886095
.endif
.endif
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index cd388e2f1370..1ebb687b263b 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,4 +1,4 @@
-SHA256 (seamonkey-2.19.source.tar.bz2) = 3d05fc6af5a6bb7c30da38b7dfc32b68c6d8e3ab3257545e6605aa4d682abb46
-SIZE (seamonkey-2.19.source.tar.bz2) = 136076805
+SHA256 (seamonkey-2.20.source.tar.bz2) = 17463fbbfe75a52317bbfb09e25dfce45539914f0559cdfe95f545408a8084fd
+SIZE (seamonkey-2.20.source.tar.bz2) = 139969292
SHA256 (enigmail-1.5.2.tar.gz) = f20d6d1be1ab12dc2f1208d8f01227fd7e5c4dcf5d6f4bd0833a932b58973a26
SIZE (enigmail-1.5.2.tar.gz) = 1211395
diff --git a/www/seamonkey/files/extra-bug886095 b/www/seamonkey/files/extra-bug886095
index 7f0b7d411cdd..d72ace7c04e6 100644
--- a/www/seamonkey/files/extra-bug886095
+++ b/www/seamonkey/files/extra-bug886095
@@ -1,18 +1,32 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=886095
---- mailnews/extensions/enigmail/genxpi.orig Wed Jul 3 13:21:33 2013
-+++ mailnews/extensions/enigmail/genxpi Thu Jul 11 09:33:44 2013
-@@ -78,6 +78,7 @@ fi
+diff --git genxpi genxpi
+index a50e7ab..6083c55 100755
+--- mailnews/extensions/enigmail/genxpi~
++++ mailnews/extensions/enigmail/genxpi
+@@ -74,16 +74,17 @@ if [ ${platform} = OS2_x86-gcc3 ]; then
+ else
+ enigDllFile=platform/${platform}/components/${libPrefix}enigmime-${xpcomAbi}${dllSuffix}
+ fi
+
subprocessDll=${libPrefix}subprocess${dllSuffix}
spDllFile=platform/${platform}/lib/${libPrefix}subprocess-${xpcomAbi}${dllSuffix}
-+cp ${targetDir}/chrome.manifest ${targetDir}/chrome.manifest.save
# Prepare chrome.manifest
++cp ${targetDir}/chrome.manifest ${targetDir}/chrome.manifest.save
cat ${srcDir}/package/chrome.manifest | \
sed 's/##ENIGMIMEDLL-PLACEHOLDER##/binary-component platform\/'${platform}'\/components\/'`basename ${enigDllFile}`' ABI='${platform}'/' \
-@@ -151,4 +152,5 @@ zip ${xpiFile} \
+ > ${targetDir}/chrome.manifest
+
+ # Prepare languages other than en-US
+
+ if [ -s ${srcDir}/lang/current-languages.txt ]; then
+ localeJar=chrome/${xpiModule}.jar
+@@ -147,8 +148,9 @@ zip ${xpiFile} \
+ ${localeJar} \
+ components/enigmime.xpt \
+ ${enigDllFile} \
+ ${spDllFile} \
chrome.manifest \
install.rdf
--rm install.rdf chrome.manifest
-+rm install.rdf
+ rm install.rdf chrome.manifest
+mv chrome.manifest.save chrome.manifest
diff --git a/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk b/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk
new file mode 100644
index 000000000000..76cd7b97fdd4
--- /dev/null
+++ b/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk
@@ -0,0 +1,11 @@
+--- bridge/bridge.mk.orig 2012-03-13 06:23:10.000000000 +0100
++++ bridge/bridge.mk 2012-03-14 12:28:03.000000000 +0100
+@@ -47,8 +47,10 @@
+ APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/db/mork
+ #endif
+
++ifdef disabled
+ APP_LIBXUL_DIRS += \
+ $(DEPTH)$(SUBDIR)/mailnews \
+ $(NULL)
++endif
diff --git a/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mozbuild b/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mozbuild
deleted file mode 100644
index fb73319de6f2..000000000000
--- a/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mozbuild
+++ /dev/null
@@ -1,9 +0,0 @@
---- bridge/bridge.mozbuild.orig 2013-07-03 22:34:52.815960909 +0200
-+++ bridge/bridge.mozbuild 2013-07-03 22:34:28.504986226 +0200
-@@ -14,4 +14,6 @@
- if 'mork' in component_libs or CONFIG['MOZ_MORK']:
- app_libxul_dirs += [bridge_reldir + 'db/mork']
-
-+ifdef disabled
- app_libxul_dirs += [bridge_reldir + 'mailnews']
-+endif
diff --git a/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile b/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile
index 489f8f38d2da..55071518aaf1 100644
--- a/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile
+++ b/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile
@@ -1,6 +1,6 @@
---- mailnews/extensions/enigmail/ipc/src/Makefile.enig.orig 2013-07-08 16:36:56.488828884 +0200
-+++ mailnews/extensions/enigmail/ipc/src/Makefile.enig 2013-07-08 16:38:38.044988437 +0200
-@@ -19,13 +19,13 @@
+--- mailnews/extensions/enigmail/ipc/src/Makefile.enig~
++++ mailnews/extensions/enigmail/ipc/src/Makefile.enig
+@@ -19,13 +19,13 @@ endif
ifeq ($(OS_ARCH),NetBSD)
ifeq ($(DLL_SUFFIX),.so.1.0)
@@ -16,7 +16,7 @@
CFLAGS += -fPIC
endif
-@@ -36,7 +36,7 @@
+@@ -36,14 +36,14 @@ endif
ifeq ($(OS_ARCH),HP-UX)
ifeq ($(GNU_CC)$(GNU_CXX),)
@@ -25,15 +25,11 @@
CFLAGS += -fPIC
endif
endif
-@@ -67,7 +67,11 @@
- $(CC) $(LDFLAGS) -o $(libname) $(objfiles)
- source: $(source)
-+ifneq (,$(filter 4.2.%, $(CC_VERSION)))
-+ $(CC) $(CFLAGS) -c -o $(objfiles) $^
-+else
- $(CC) $(CFLAGS) -Wno-return-type-c-linkage -c -o $(objfiles) $^
-+endif
-
-
- clean:
+ ifeq ($(OS_ARCH),OSF1)
+ ifeq ($(GNU_CC)$(GNU_CXX),)
+-LDFLAGS += -B symbolic
++LDFLAGS += -shared -B symbolic
+ CFLAGS += -fPIC
+ endif
+ endif
diff --git a/www/seamonkey/files/patch-bug791305 b/www/seamonkey/files/patch-bug791305
index b4197b85b9d7..633415128199 100644
--- a/www/seamonkey/files/patch-bug791305
+++ b/www/seamonkey/files/patch-bug791305
@@ -17,23 +17,6 @@ Date: Fri Sep 14 15:54:55 2012 -0400
diff --git configure.in configure.in
index f0aeb5d..1c01010 100644
---- configure.in
-+++ configure.in
-@@ -4027,11 +4027,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
- #include <jpeglib.h> ],
- [ #if JPEG_LIB_VERSION < $MOZJPEG
- #error "Insufficient JPEG library version ($MOZJPEG required)."
-- #endif
-- #ifndef JCS_EXTENSIONS
-- #error "libjpeg-turbo JCS_EXTENSIONS required"
-- #endif
-- ],
-+ #endif ],
- MOZ_NATIVE_JPEG=1,
- AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
- fi
-diff --git configure.in configure.in
-index f0aeb5d..1c01010 100644
--- mozilla/configure.in
+++ mozilla/configure.in
@@ -4027,11 +4027,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
diff --git a/www/seamonkey/files/patch-bug803480 b/www/seamonkey/files/patch-bug803480
index 7ccbe5181a10..3a3788b171d7 100644
--- a/www/seamonkey/files/patch-bug803480
+++ b/www/seamonkey/files/patch-bug803480
@@ -1,49 +1,55 @@
diff --git configure.in configure.in
-index fa283d0..936b6e0 100644
---- configure.in
-+++ configure.in
-@@ -8229,16 +8229,26 @@ MOZ_ARG_DISABLE_BOOL(necko-wifi,
- NECKO_WIFI=,
- NECKO_WIFI=1)
-
--if test "$OS_ARCH" = "OS2"; then
-- dnl OS/2 implementation of Necko-WiFi support will be added in bug 506566
-- NECKO_WIFI=
--fi
--if test "$NECKO_WIFI" -a \
-- "$OS_ARCH" != "Linux" -a \
-- "$OS_ARCH" != "Darwin" -a \
-- "$OS_ARCH" != "SunOS" -a \
-- "$OS_ARCH" != "WINNT"; then
-- AC_MSG_ERROR([Necko WiFi scanning not supported on your platform, use --disable-necko-wifi])
-+if test "$NECKO_WIFI"; then
-+ case "$OS_TARGET" in
-+ Android)
-+ ;;
-+ Darwin)
-+ ;;
-+ SunOS)
-+ ;;
-+ WINNT)
-+ ;;
-+ OS2)
-+ dnl OS/2 implementation of Necko-WiFi support will be added in bug 506566
-+ NECKO_WIFI=
-+ ;;
-+ *)
-+ if test -z "$MOZ_ENABLE_DBUS"; then
-+ AC_MSG_ERROR([Necko WiFi scanning needs DBus on your platform, remove --disable-dbus or use --disable-necko-wifi])
-+ fi
-+ ;;
-+ esac
- fi
-
- if test "$NECKO_WIFI"; then
-diff --git configure.in configure.in
-index fa283d0..936b6e0 100644
+index a0575dc..be327fd 100644
--- mozilla/configure.in
+++ mozilla/configure.in
-@@ -8229,16 +8229,26 @@ MOZ_ARG_DISABLE_BOOL(necko-wifi,
+@@ -4306,7 +4306,6 @@ NS_PRINTING=1
+ MOZ_PDF_PRINTING=
+ MOZ_DISABLE_CRYPTOLEGACY=
+ NSS_DISABLE_DBM=
+-NECKO_WIFI=1
+ NECKO_COOKIES=1
+ NECKO_PROTOCOLS_DEFAULT="about data file ftp http res viewsource websocket wyciwyg device"
+ USE_ARM_KUSER=
+@@ -4336,11 +4335,6 @@ case "${target}" in
+ fi
+
+ NSS_DISABLE_DBM=1
+- if test -z "$gonkdir"; then
+- NECKO_WIFI=
+- else
+- NECKO_WIFI=1
+- fi
+ MOZ_THEME_FASTSTRIPE=1
+ MOZ_TREE_FREETYPE=1
+ MOZ_MEMORY=1
+@@ -8485,28 +8479,39 @@ done
+ dnl
+ dnl option to disable necko's wifi scanner
+ dnl
++
++case "$OS_TARGET" in
++ OS2)
++ dnl OS/2 implementation of Necko-WiFi support will be added in bug 506566
++ ;;
++ Android)
++ if test -n "$gonkdir"; then
++ NECKO_WIFI=1
++ fi
++ ;;
++ Darwin|SunOS|WINNT)
++ NECKO_WIFI=1
++ ;;
++ Linux)
++ if test -z "$MOZ_ENABLE_DBUS"; then
++ AC_MSG_ERROR([Necko WiFi scanning needs DBus on your platform, remove --disable-dbus or use --disable-necko-wifi])
++ fi
++ NECKO_WIFI=1
++ NECKO_WIFI_DBUS=1
++ ;;
++esac
++
+ MOZ_ARG_DISABLE_BOOL(necko-wifi,
+ [ --disable-necko-wifi Disable necko wifi scanner],
NECKO_WIFI=,
NECKO_WIFI=1)
@@ -57,26 +63,27 @@ index fa283d0..936b6e0 100644
- "$OS_ARCH" != "SunOS" -a \
- "$OS_ARCH" != "WINNT"; then
- AC_MSG_ERROR([Necko WiFi scanning not supported on your platform, use --disable-necko-wifi])
-+if test "$NECKO_WIFI"; then
-+ case "$OS_TARGET" in
-+ Android)
-+ ;;
-+ Darwin)
-+ ;;
-+ SunOS)
-+ ;;
-+ WINNT)
-+ ;;
-+ OS2)
-+ dnl OS/2 implementation of Necko-WiFi support will be added in bug 506566
-+ NECKO_WIFI=
-+ ;;
-+ *)
-+ if test -z "$MOZ_ENABLE_DBUS"; then
-+ AC_MSG_ERROR([Necko WiFi scanning needs DBus on your platform, remove --disable-dbus or use --disable-necko-wifi])
-+ fi
-+ ;;
-+ esac
+-fi
+-
+ if test "$NECKO_WIFI"; then
+ AC_DEFINE(NECKO_WIFI)
+ _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_WIFI"
fi
+ AC_SUBST(NECKO_WIFI)
++AC_SUBST(NECKO_WIFI_DBUS)
- if test "$NECKO_WIFI"; then
+ dnl
+ dnl option to disable cookies
+diff --git netwerk/wifi/Makefile.in netwerk/wifi/Makefile.in
+index 39d7364..e8d276b 100644
+--- mozilla/netwerk/wifi/Makefile.in
++++ mozilla/netwerk/wifi/Makefile.in
+@@ -41,7 +41,7 @@ CPPSRCS += nsWifiScannerSolaris.cpp
+ OS_INCLUDES += $(GLIB_CFLAGS)
+ endif
+
+-ifdef MOZ_ENABLE_DBUS
++ifdef NECKO_WIFI_DBUS
+ CPPSRCS += nsWifiScannerDBus.cpp
+ OS_INCLUDES += $(MOZ_DBUS_GLIB_CFLAGS)
+ endif
diff --git a/www/seamonkey/files/patch-bug807492 b/www/seamonkey/files/patch-bug807492
index f339c7f6c01e..6ecd6107b38f 100644
--- a/www/seamonkey/files/patch-bug807492
+++ b/www/seamonkey/files/patch-bug807492
@@ -17,17 +17,17 @@ diff --git configure.in configure.in
index c167461..8346c11 100644
--- mozilla/configure.in
+++ mozilla/configure.in
-@@ -5258,17 +5258,17 @@ if test -n "$MOZ_WEBRTC"; then
- *-android*|*-linuxandroid*)
- if test -n "$MOZ_B2G"; then
- MOZ_WEBRTC=1
- else
- dnl Make sure doesn't get matched by *-linux*
- MOZ_WEBRTC=
- fi
- ;;
-- *-linux*|*-mingw*|*-darwin*)
-+ *-linux*|*-mingw*|*-darwin*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
+@@ -5246,17 +5246,17 @@ if test "$NS_PRINTING"; then
+ AC_DEFINE(NS_PRINT_PREVIEW)
+ fi
+
+ dnl Turn off webrtc for OS's we don't handle yet, but allow
+ dnl --enable-webrtc to override. Can disable for everything in
+ dnl the master list above.
+ if test -n "$MOZ_WEBRTC"; then
+ case "$target" in
+- *-linux*|*-mingw*|*-darwin*|*-android*|*-linuxandroid*)
++ *-linux*|*-mingw*|*-darwin*|*-android*|*-linuxandroid*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
dnl Leave enabled
;;
*)
diff --git a/www/seamonkey/files/patch-bug810716 b/www/seamonkey/files/patch-bug810716
index 93e59a2d7929..05637dc71251 100644
--- a/www/seamonkey/files/patch-bug810716
+++ b/www/seamonkey/files/patch-bug810716
@@ -1,32 +1,5 @@
diff --git configure.in configure.in
index 2084be9..eb6eeb2 100644
---- configure.in
-+++ configure.in
-@@ -3369,14 +3369,19 @@ fi
- AC_CACHE_CHECK(
- [for res_ninit()],
- ac_cv_func_res_ninit,
-- [AC_TRY_LINK([
-+ [AC_TRY_RUN([
- #ifdef linux
- #define _BSD_SOURCE 1
- #endif
-+ #include <sys/types.h>
-+ #include <netinet/in.h>
-+ #include <arpa/nameser.h>
- #include <resolv.h>
-- ],
-- [int foo = res_ninit(&_res);],
-+ int main(int argc, char **argv){
-+ int foo = res_ninit(&_res);
-+ }],
- [ac_cv_func_res_ninit=yes],
-+ [ac_cv_func_res_ninit=no],
- [ac_cv_func_res_ninit=no])
- ])
-
-diff --git configure.in configure.in
-index 2084be9..eb6eeb2 100644
--- mozilla/configure.in
+++ mozilla/configure.in
@@ -3369,14 +3369,19 @@ fi
diff --git a/www/seamonkey/files/patch-bug826985 b/www/seamonkey/files/patch-bug826985
index 95335485942f..c7bd5a99a7f9 100644
--- a/www/seamonkey/files/patch-bug826985
+++ b/www/seamonkey/files/patch-bug826985
@@ -16,16 +16,16 @@ diff --git configure.in configure.in
index 55e4cd1..76567b3 100644
--- mozilla/configure.in
+++ mozilla/configure.in
-@@ -5294,6 +5294,9 @@ if test -n "$MOZ_WEBRTC"; then
+@@ -5309,6 +5309,9 @@ if test -n "$MOZ_WEBRTC"; then
MOZ_VP8_ENCODER=1
MOZ_VP8_ERROR_CONCEALMENT=1
+ dnl with libv4l2 we can support more cameras
+ PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2)
+
- if test "$MOZ_WIDGET_TOOLKIT" != "gonk"; then
- dnl OpenSLES is only available in Android 2.3 and later; we'll change this
- dnl hard dependency to a dynamic load with graceful runtime failure before
+ dnl enable once Signaling lands
+ MOZ_WEBRTC_SIGNALING=1
+ AC_DEFINE(MOZ_WEBRTC_SIGNALING)
@@ -8981,6 +8984,10 @@ elif test "${OS_TARGET}" = "Android"; then
fi
fi
diff --git a/www/seamonkey/files/patch-bug851992 b/www/seamonkey/files/patch-bug851992
new file mode 100644
index 000000000000..59e39f81d68d
--- /dev/null
+++ b/www/seamonkey/files/patch-bug851992
@@ -0,0 +1,373 @@
+diff --git a/config/Makefile.in b/config/Makefile.in
+--- mozilla/config/Makefile.in
++++ mozilla/config/Makefile.in
+@@ -97,16 +97,17 @@ export:: $(export-preqs)
+ -DMOZ_TREE_PIXMAN=$(MOZ_TREE_PIXMAN) \
+ -DMOZ_NATIVE_HUNSPELL=$(MOZ_NATIVE_HUNSPELL) \
+ -DMOZ_NATIVE_BZ2=$(MOZ_NATIVE_BZ2) \
+ -DMOZ_NATIVE_ZLIB=$(MOZ_NATIVE_ZLIB) \
+ -DMOZ_NATIVE_PNG=$(MOZ_NATIVE_PNG) \
+ -DMOZ_NATIVE_JPEG=$(MOZ_NATIVE_JPEG) \
+ -DMOZ_NATIVE_LIBEVENT=$(MOZ_NATIVE_LIBEVENT) \
+ -DMOZ_NATIVE_LIBVPX=$(MOZ_NATIVE_LIBVPX) \
++ -DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \
+ $(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
+ $(INSTALL) system_wrappers $(DIST)
+
+ GARBAGE_DIRS += system_wrappers
+ endif
+
+ ifdef WRAP_STL_INCLUDES
+ ifdef GNU_CXX
+diff --git a/config/system-headers b/config/system-headers
+--- mozilla/config/system-headers
++++ mozilla/config/system-headers
+@@ -1125,8 +1125,19 @@ gst/video/video.h
+ sys/msg.h
+ sys/ipc.h
+ sys/thr.h
+ sys/user.h
+ kvm.h
+ spawn.h
+ err.h
+ xlocale.h
++#if MOZ_NATIVE_ICU==1
++unicode/locid.h
++unicode/numsys.h
++unicode/ucal.h
++unicode/ucol.h
++unicode/udat.h
++unicode/udatpg.h
++unicode/uenum.h
++unicode/unum.h
++unicode/ustring.h
++#endif
+diff --git a/configure.in b/configure.in
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -4134,16 +4134,32 @@ if test -n "$MOZ_NATIVE_FFI"; then
+ PKG_CHECK_MODULES(MOZ_FFI, libffi > 3.0.9)
+ else
+ PKG_CHECK_MODULES(MOZ_FFI, libffi >= 3.0.9)
+ fi
+ MOZ_JS_STATIC_LIBS="$MOZ_JS_STATIC_LIBS $MOZ_FFI_LIBS"
+ fi
+
+ dnl ========================================================
++dnl system icu support
++dnl ========================================================
++MOZ_NATIVE_ICU=
++MOZ_ARG_WITH_BOOL(system-icu,
++[ --with-system-icu
++ Use system icu (located with pkgconfig)],
++ MOZ_NATIVE_ICU=1)
++
++if test -n "$MOZ_NATIVE_ICU"; then
++ PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1)
++ MOZ_JS_STATIC_LIBS="$MOZ_JS_STATIC_LIBS $MOZ_ICU_LIBS"
++fi
++
++AC_SUBST(MOZ_NATIVE_ICU)
++
++dnl ========================================================
+ dnl Java SDK support
+ dnl ========================================================
+
+ JAVA_BIN_PATH=
+ MOZ_ARG_WITH_STRING(java-bin-path,
+ [ --with-java-bin-path=dir
+ Location of Java binaries (java, javac, jar)],
+ JAVA_BIN_PATH=$withval)
+diff --git a/js/src/Makefile.in b/js/src/Makefile.in
+--- mozilla/js/src/Makefile.in
++++ mozilla/js/src/Makefile.in
+@@ -232,48 +232,54 @@ endif
+
+ #############################################
+ # BEGIN ECMAScript Internationalization API
+ #
+
+ # ICU headers need to be available whether we build with the complete
+ # Internationalization API or not - ICU stubs rely on them.
+
++ifdef MOZ_NATIVE_ICU
++LOCAL_INCLUDES += $(MOZ_ICU_CFLAGS)
++else
+ LOCAL_INCLUDES += \
+ -I$(topsrcdir)/../../intl/icu/source/common \
+ -I$(topsrcdir)/../../intl/icu/source/i18n \
+ $(NULL)
++endif
+
+ ifdef ENABLE_INTL_API
+
+ ifeq ($(OS_ARCH),WINNT)
+ # Parallel gmake is buggy on Windows
+ ICU_GMAKE_OPTIONS="-j1"
+ # Library names: On Windows, ICU uses modified library names for static
+ # and debug libraries.
+ ifdef MOZ_DEBUG
+ ICU_LIB_SUFFIX=d
+ endif
+ ICU_LIB_RENAME = $(foreach libname,$(ICU_LIB_NAMES),\
+ cp -p intl/icu/lib/s$(libname)$(ICU_LIB_SUFFIX).lib intl/icu/lib/$(libname).lib;)
+ endif
+
++ifndef MOZ_NATIVE_ICU
+ # - Build ICU as part of the "export" target, so things get built
+ # in the right order.
+ # - ICU requires GNU make according to its readme.html. pymake can't be used
+ # because it doesn't support order only dependencies.
+ # - Force ICU to use the standard suffix for object files because expandlibs
+ # will discard all files with a non-standard suffix (bug 857450).
+ # - Options for genrb: -k strict parsing; -R omit collation tailoring rules.
+ export::
+ $(GMAKE) $(ICU_GMAKE_OPTIONS) -C intl/icu STATIC_O=$(OBJ_SUFFIX) GENRBOPTS='-k -R'
+ $(ICU_LIB_RENAME)
+
+ distclean clean::
+ $(call SUBMAKE,$@,intl/icu)
++endif
+
+ endif
+
+ #
+ # END ECMAScript Internationalization API
+ #############################################
+
+
+@@ -398,17 +404,21 @@ CFLAGS += $(MOZ_ZLIB_CFLAGS)
+ EXTRA_LIBS += $(MOZ_ZLIB_LIBS)
+ # Enable zlib usage if zlib has been located. When building the browser on
+ # Windows, MOZ_ZLIB_LIBS is empty because zlib is part of libmozglue. We thus
+ # also enable zlib if mozglue is present.
+ ifneq (,$(MOZ_ZLIB_LIBS)$(MOZ_GLUE_LDFLAGS))
+ DEFINES += -DUSE_ZLIB
+ endif
+
+-SHARED_LIBRARY_LIBS += $(ICU_LIBS)
++ifdef MOZ_NATIVE_ICU
++EXTRA_DSO_LDOPTS += $(MOZ_ICU_LIBS)
++else
++SHARED_LIBRARY_LIBS += $(MOZ_ICU_LIBS)
++endif
+
+ # Prevent floating point errors caused by VC++ optimizations
+ ifdef _MSC_VER
+ # XXX We should add this to CXXFLAGS, too?
+ CFLAGS += -fp:precise
+
+ ifeq ($(CPU_ARCH),x86)
+ # Workaround compiler bug on PGO (Bug 721284)
+diff --git a/js/src/config/Makefile.in b/js/src/config/Makefile.in
+--- mozilla/js/src/config/Makefile.in
++++ mozilla/js/src/config/Makefile.in
+@@ -54,16 +54,17 @@ include $(topsrcdir)/config/rules.mk
+
+ HOST_CFLAGS += -DUNICODE -D_UNICODE
+
+ ifdef WRAP_SYSTEM_INCLUDES
+ export:: \
+ $(call mkdir_deps,system_wrappers_js) \
+ $(NULL)
+ $(PYTHON) $(srcdir)/Preprocessor.py $(DEFINES) $(ACDEFINES) \
++ -DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \
+ $(srcdir)/system-headers | $(PERL) $(srcdir)/make-system-wrappers.pl system_wrappers_js
+ $(INSTALL) system_wrappers_js $(DIST)
+
+ GARBAGE_DIRS += system_wrappers_js
+ endif
+
+ GARBAGE += $(srcdir)/*.pyc *.pyc
+
+diff --git a/js/src/config/system-headers b/js/src/config/system-headers
+--- mozilla/js/src/config/system-headers
++++ mozilla/js/src/config/system-headers
+@@ -1125,8 +1125,19 @@ gst/video/video.h
+ sys/msg.h
+ sys/ipc.h
+ sys/thr.h
+ sys/user.h
+ kvm.h
+ spawn.h
+ err.h
+ xlocale.h
++#if MOZ_NATIVE_ICU==1
++unicode/locid.h
++unicode/numsys.h
++unicode/ucal.h
++unicode/ucol.h
++unicode/udat.h
++unicode/udatpg.h
++unicode/uenum.h
++unicode/unum.h
++unicode/ustring.h
++#endif
+diff --git a/js/src/configure.in b/js/src/configure.in
+--- mozilla/js/src/configure.in
++++ mozilla/js/src/configure.in
+@@ -4406,59 +4406,68 @@ if test "$ACCESSIBILITY" -a "$MOZ_ENABLE
+ AC_DEFINE_UNQUOTED(ATK_MINOR_VERSION, $ATK_MINOR_VERSION)
+ AC_DEFINE_UNQUOTED(ATK_REV_VERSION, $ATK_REV_VERSION)
+ fi
+
+
+ dnl ========================================================
+ dnl ECMAScript Internationalization API Support (uses ICU)
+ dnl ========================================================
++ICU_LIB_NAMES=
++MOZ_NATIVE_ICU=
++MOZ_ARG_WITH_BOOL(system-icu,
++[ --with-system-icu
++ Use system icu (located with pkgconfig)],
++ MOZ_NATIVE_ICU=1)
++
++if test -n "$MOZ_NATIVE_ICU"; then
++ PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1)
++fi
+
+ if test -n "$JS_STANDALONE"; then
+ ENABLE_INTL_API=1
+ fi
+ MOZ_ARG_ENABLE_BOOL(intl-api,
+ [ --enable-intl-api Enable ECMAScript Internationalization API (default=yes for standalone JS)],
+ ENABLE_INTL_API=1,
+ ENABLE_INTL_API= )
+
+ dnl Settings for the implementation of the ECMAScript Internationalization API
+ if test -n "$ENABLE_INTL_API"; then
+ AC_DEFINE(ENABLE_INTL_API)
+- # We build ICU as a static library.
+- AC_DEFINE(U_STATIC_IMPLEMENTATION)
+-
+- case "$OS_TARGET" in
+- WINNT)
+- ICU_LIB_NAMES="icuin icuuc icudt"
+- ;;
+- Darwin|Linux)
+- ICU_LIB_NAMES="icui18n icuuc icudata"
+- ;;
+- *)
+- AC_MSG_ERROR([ECMAScript Internationalization API is not yet supported on this platform])
+- esac
+-
+- ICU_LIBS='$(call EXPAND_LIBNAME_PATH,$(ICU_LIB_NAMES),$(DEPTH)/intl/icu/lib)'
+-else
+- ICU_LIB_NAMES=
+- ICU_LIBS=
++
++ if test -z "$MOZ_NATIVE_ICU"; then
++ case "$OS_TARGET" in
++ WINNT)
++ ICU_LIB_NAMES="icuin icuuc icudt"
++ ;;
++ Darwin|Linux)
++ ICU_LIB_NAMES="icui18n icuuc icudata"
++ ;;
++ *)
++ AC_MSG_ERROR([ECMAScript Internationalization API is not yet supported on this platform])
++ esac
++ MOZ_ICU_LIBS='$(call EXPAND_LIBNAME_PATH,$(ICU_LIB_NAMES),$(DEPTH)/intl/icu/lib)'
++ fi
+ fi
+
+ AC_SUBST(ENABLE_INTL_API)
+ AC_SUBST(ICU_LIB_NAMES)
+-AC_SUBST(ICU_LIBS)
+-
+-dnl Source files that use ICU should have control over which parts of the ICU
+-dnl namespace they want to use.
+-AC_DEFINE(U_USING_ICU_NAMESPACE,0)
+-
++AC_SUBST(MOZ_ICU_LIBS)
++AC_SUBST(MOZ_NATIVE_ICU)
+
+ dnl Settings for ICU
+-if test -n "$ENABLE_INTL_API" ; then
++if test -n "$ENABLE_INTL_API" -a -z "$MOZ_NATIVE_ICU"; then
++ dnl We build ICU as a static library.
++ AC_DEFINE(U_STATIC_IMPLEMENTATION)
++
++ dnl Source files that use ICU should have control over which parts of the ICU
++ dnl namespace they want to use.
++ AC_DEFINE(U_USING_ICU_NAMESPACE,0)
++
+ # Set ICU compile options
+ ICU_CPPFLAGS=""
+ # don't use icu namespace automatically in client code
+ ICU_CPPFLAGS="$ICU_CPPFLAGS -DU_USING_ICU_NAMESPACE=0"
+ # don't include obsolete header files
+ ICU_CPPFLAGS="$ICU_CPPFLAGS -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1"
+ # remove chunks of the library that we don't need (yet)
+ ICU_CPPFLAGS="$ICU_CPPFLAGS -DUCONFIG_NO_LEGACY_CONVERSION"
+diff --git a/js/src/gdb/Makefile.in b/js/src/gdb/Makefile.in
+--- mozilla/js/src/gdb/Makefile.in
++++ mozilla/js/src/gdb/Makefile.in
+@@ -14,16 +14,20 @@ include $(DEPTH)/config/autoconf.mk
+ # Building against js_static requires that we declare mfbt sybols "exported"
+ # on its behalf.
+ DEFINES += -DEXPORT_JS_API -DIMPL_MFBT
+
+ LIBS = $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS) $(MOZ_ZLIB_LIBS)
+
+ LOCAL_INCLUDES += -I$(topsrcdir) -I..
+
++ifdef MOZ_NATIVE_ICU
++EXTRA_LIBS += $(MOZ_ICU_LIBS)
++endif
++
+ EXTRA_LIBS += $(MOZ_FFI_LIBS)
+
+ # Place a GDB Python auto-load file next to the gdb-tests executable, both
+ # in the build directory and in the dist/bin directory.
+ PP_TARGETS += GDB_AUTOLOAD
+ GDB_AUTOLOAD := gdb-tests-gdb.py.in
+ GDB_AUTOLOAD_FLAGS := -Dtopsrcdir=$(abspath $(topsrcdir))
+
+diff --git a/js/src/jsapi-tests/Makefile.in b/js/src/jsapi-tests/Makefile.in
+--- mozilla/js/src/jsapi-tests/Makefile.in
++++ mozilla/js/src/jsapi-tests/Makefile.in
+@@ -15,16 +15,20 @@ DEFINES += -DEXPORT_JS_API
+ # Building against js_static requires that we declare mfbt sybols "exported"
+ # on its behalf.
+ DEFINES += -DIMPL_MFBT
+
+ LIBS = $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS) $(MOZ_ZLIB_LIBS)
+
+ LOCAL_INCLUDES += -I$(topsrcdir) -I..
+
++ifdef MOZ_NATIVE_ICU
++EXTRA_LIBS += $(MOZ_ICU_LIBS)
++endif
++
+ EXTRA_LIBS += $(MOZ_FFI_LIBS)
+
+ ifdef QEMU_EXE
+ MOZ_POST_PROGRAM_COMMAND = $(topsrcdir)/build/qemu-wrap --qemu $(QEMU_EXE) --libdir $(CROSS_LIB)
+ endif
+
+ # Place a GDB Python auto-load file next to the jsapi-tests executable in
+ # the build directory.
+diff --git a/js/src/shell/Makefile.in b/js/src/shell/Makefile.in
+--- mozilla/js/src/shell/Makefile.in
++++ mozilla/js/src/shell/Makefile.in
+@@ -22,16 +22,19 @@ DEFINES += -DEXPORT_JS_API
+ # Building against js_static requires that we declare mfbt sybols "exported"
+ # on its behalf.
+ DEFINES += -DIMPL_MFBT
+
+ LIBS = $(NSPR_LIBS) $(EDITLINE_LIBS) $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(MOZ_ZLIB_LIBS)
+ ifdef MOZ_NATIVE_FFI
+ EXTRA_LIBS += $(MOZ_FFI_LIBS)
+ endif
++ifdef MOZ_NATIVE_ICU
++EXTRA_LIBS += $(MOZ_ICU_LIBS)
++endif
+
+ LOCAL_INCLUDES += -I$(topsrcdir) -I..
+
+ ifeq ($(OS_ARCH),Darwin)
+ ifeq ($(TARGET_CPU),x86_64)
+ DARWIN_EXE_LDFLAGS += -pagezero_size 10000 -image_base 100000000
+ endif
+ endif
diff --git a/www/seamonkey/files/patch-bug862759 b/www/seamonkey/files/patch-bug862759
new file mode 100644
index 000000000000..8381b0503791
--- /dev/null
+++ b/www/seamonkey/files/patch-bug862759
@@ -0,0 +1,10 @@
+--- mozilla/js/src/frontend/ParseMaps.cpp~
++++ mozilla/js/src/frontend/ParseMaps.cpp
+@@ -134,5 +134,5 @@ frontend::InitAtomMap(JSContext *cx, frontend::AtomIndexMap *indices, HeapPtrAto
+ }
+ }
+
+-template class AtomDecls<FullParseHandler>;
+-template class AtomDecls<SyntaxParseHandler>;
++template class frontend::AtomDecls<FullParseHandler>;
++template class frontend::AtomDecls<SyntaxParseHandler>;
diff --git a/www/seamonkey/files/patch-toolkit-components-osfile-osfile_unix_allthreads.jsm b/www/seamonkey/files/patch-bug878791
index aa22938269e3..aa22938269e3 100644
--- a/www/seamonkey/files/patch-toolkit-components-osfile-osfile_unix_allthreads.jsm
+++ b/www/seamonkey/files/patch-bug878791
diff --git a/www/seamonkey/files/patch-bug893397 b/www/seamonkey/files/patch-bug893397
new file mode 100644
index 000000000000..28e82aba2a7c
--- /dev/null
+++ b/www/seamonkey/files/patch-bug893397
@@ -0,0 +1,205 @@
+diff --git configure.in configure.in
+index 549ad06..2878d9f 100644
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -8491,7 +8491,7 @@ case "$OS_TARGET" in
+ NECKO_WIFI=1
+ fi
+ ;;
+- Darwin|SunOS|WINNT)
++ Darwin|FreeBSD|SunOS|WINNT)
+ NECKO_WIFI=1
+ ;;
+ Linux)
+diff --git netwerk/wifi/Makefile.in netwerk/wifi/Makefile.in
+index 07b01de..11706af 100644
+--- mozilla/netwerk/wifi/Makefile.in
++++ mozilla/netwerk/wifi/Makefile.in
+@@ -32,6 +32,10 @@ CPPSRCS += nsWifiScannerMac.cpp
+ CMMSRCS = osx_corewlan.mm
+ endif
+
++ifeq ($(OS_ARCH),FreeBSD)
++CPPSRCS += nsWifiScannerFreeBSD.cpp
++endif
++
+ ifneq (,$(filter WINNT,$(OS_ARCH)))
+ CPPSRCS += nsWifiScannerWin.cpp
+ endif
+diff --git netwerk/wifi/nsWifiScannerFreeBSD.cpp netwerk/wifi/nsWifiScannerFreeBSD.cpp
+new file mode 100644
+index 0000000..80d4cb6
+--- /dev/null
++++ mozilla/netwerk/wifi/nsWifiScannerFreeBSD.cpp
+@@ -0,0 +1,171 @@
++/* This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this
++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
++
++// Developed by J.R. Oldroyd <fbsd@opal.com>, December 2012.
++
++// For FreeBSD we use the getifaddrs(3) to obtain the list of interfaces
++// and then check for those with an 802.11 media type and able to return
++// a list of stations. This is similar to ifconfig(8).
++
++#include <sys/types.h>
++#include <sys/ioctl.h>
++#include <sys/socket.h>
++#include <net/if.h>
++#include <net/if_media.h>
++#include <net80211/ieee80211_ioctl.h>
++
++#include <ifaddrs.h>
++#include <string.h>
++#include <unistd.h>
++
++#include "nsWifiAccessPoint.h"
++
++using namespace mozilla;
++
++static nsresult
++FreeBSDGetAccessPointData(nsCOMArray<nsWifiAccessPoint> &accessPoints)
++{
++ bool res = false;
++ char *dupn = NULL;
++ struct ifaddrs *ifal, *ifa;
++ unsigned len;
++
++ // get list of interfaces
++ if (getifaddrs(&ifal) < 0)
++ return NS_ERROR_FAILURE;
++
++ accessPoints.Clear();
++
++ // loop through the interfaces
++ for (ifa = ifal; ifa; ifa = ifa->ifa_next) {
++ int s;
++ struct ifreq ifr;
++ struct ifmediareq ifmr;
++ struct ieee80211req i802r;
++ char iscanbuf[32*1024], *vsr;
++
++ memset(&ifr, 0, sizeof(ifr));
++
++ // list can contain duplicates, so ignore those
++ if (dupn != NULL && strcmp(dupn, ifa->ifa_name) == 0)
++ continue;
++ dupn = ifa->ifa_name;
++
++ // store interface name in socket structure
++ strncpy(ifr.ifr_name, ifa->ifa_name, sizeof(ifr.ifr_name));
++ ifr.ifr_addr.sa_family = AF_LOCAL;
++
++ // open socket to interface
++ if ((s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0)) < 0)
++ continue;
++
++ // clear interface media structure
++ (void) memset(&ifmr, 0, sizeof(ifmr));
++ (void) strncpy(ifmr.ifm_name, ifa->ifa_name, sizeof(ifmr.ifm_name));
++
++ // get interface media information
++ if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) {
++ close(s);
++ continue;
++ }
++
++ // check interface is a WiFi interface
++ if (IFM_TYPE(ifmr.ifm_active) != IFM_IEEE80211) {
++ close(s);
++ continue;
++ }
++
++ // perform WiFi scan
++ (void) memset(&i802r, 0, sizeof(i802r));
++ (void) strncpy(i802r.i_name, ifa->ifa_name, sizeof(i802r.i_name));
++ i802r.i_type = IEEE80211_IOC_SCAN_RESULTS;
++ i802r.i_data = iscanbuf;
++ i802r.i_len = sizeof(iscanbuf);
++ if (ioctl(s, SIOCG80211, &i802r) < 0) {
++ close(s);
++ continue;
++ }
++
++ // close socket
++ close(s);
++
++ // loop through WiFi networks and build geoloc-lookup structure
++ vsr = (char *) i802r.i_data;
++ len = i802r.i_len;
++ while (len >= sizeof(struct ieee80211req_scan_result)) {
++ struct ieee80211req_scan_result *isr;
++ char *id;
++ int idlen;
++ char ssid[IEEE80211_NWID_LEN+1];
++ nsWifiAccessPoint *ap;
++
++ isr = (struct ieee80211req_scan_result *) vsr;
++
++ // determine size of this entry
++ if (isr->isr_meshid_len) {
++ id = vsr + isr->isr_ie_off + isr->isr_ssid_len;
++ idlen = isr->isr_meshid_len;
++ }
++ else {
++ id = vsr + isr->isr_ie_off;
++ idlen = isr->isr_ssid_len;
++ }
++
++ // copy network data
++ strncpy(ssid, id, idlen);
++ ssid[idlen] = '\0';
++ ap = new nsWifiAccessPoint();
++ ap->setSSID(ssid, strlen(ssid));
++ ap->setMac(isr->isr_bssid);
++ ap->setSignal(isr->isr_rssi);
++ accessPoints.AppendObject(ap);
++ res = true;
++
++ // log the data
++ LOG(( "FreeBSD access point: "
++ << "SSID: " << ssid << ", "
++ << "MAC: " << isr->isr_bssid << ", "
++ << "Strength: " << isr->isr_rssi ", "
++ << "Channel: " << isr->isr_freq << "MHz" ));
++
++ // increment pointers
++ len -= isr->isr_len;
++ vsr += isr->isr_len;
++ }
++ }
++
++ freeifaddrs(ifal);
++
++ return res ? NS_OK : NS_ERROR_FAILURE;
++}
++
++nsresult
++nsWifiMonitor::DoScan()
++{
++ // Regularly get the access point data.
++
++ nsCOMArray<nsWifiAccessPoint> lastAccessPoints;
++ nsCOMArray<nsWifiAccessPoint> accessPoints;
++
++ do {
++ nsresult rv = FreeBSDGetAccessPointData(accessPoints);
++ if (NS_FAILED(rv))
++ return rv;
++
++ bool accessPointsChanged = !AccessPointsEqual(accessPoints, lastAccessPoints);
++ ReplaceArray(lastAccessPoints, accessPoints);
++
++ rv = CallWifiListeners(lastAccessPoints, accessPointsChanged);
++ NS_ENSURE_SUCCESS(rv, rv);
++
++ // wait for some reasonable amount of time. pref?
++ LOG(("waiting on monitor\n"));
++
++ ReentrantMonitorAutoEnter mon(mReentrantMonitor);
++ mon.Wait(PR_SecondsToInterval(60));
++ }
++ while (mKeepGoing);
++
++ return NS_OK;
++}
diff --git a/www/seamonkey/files/patch-clang32-libc++-visibility-hack b/www/seamonkey/files/patch-clang32-libc++-visibility-hack
index 9b920f63be0f..881e4ed94b5a 100644
--- a/www/seamonkey/files/patch-clang32-libc++-visibility-hack
+++ b/www/seamonkey/files/patch-clang32-libc++-visibility-hack
@@ -1,22 +1,3 @@
---- configure.in~
-+++ configure.in
-@@ -2855,6 +2855,7 @@ EOF
- #pragma GCC visibility push(hidden)
- #pragma GCC visibility push(default)
- #include <string.h>
-+#include <iterator>
- #pragma GCC visibility pop
-
- __attribute__ ((visibility ("default"))) void Func() {
-@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() {
- }
- EOF
- ac_cv_have_visibility_builtin_bug=no
-- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
-+ if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
- ac_cv_have_visibility_builtin_bug=yes
- else
- if test `grep -c "@PLT" conftest.S` = 0; then
--- mozilla/configure.in~
+++ mozilla/configure.in
@@ -2855,6 +2855,7 @@ EOF
diff --git a/www/seamonkey/files/patch-configure.in b/www/seamonkey/files/patch-configure.in
deleted file mode 100644
index c03ce706001e..000000000000
--- a/www/seamonkey/files/patch-configure.in
+++ /dev/null
@@ -1,49 +0,0 @@
---- configure.in.orig 2012-07-14 00:40:08.000000000 +0200
-+++ configure.in 2012-08-18 18:16:06.000000000 +0200
-@@ -3101,6 +3118,8 @@
-
- AC_SUBST(VISIBILITY_FLAGS)
-
-+MOZ_COMPILER_OPTS
-+
- dnl Checks for header files.
- dnl ========================================================
- AC_HEADER_DIRENT
-@@ -4067,29 +4086,29 @@
-
- AC_CACHE_CHECK(for __attribute__((always_inline)),
- ac_cv_attribute_always_inline,
-- [AC_TRY_COMPILE([],
-- [inline void f(void) __attribute__((always_inline));],
-+ [AC_TRY_COMPILE([inline void f(void) __attribute__((always_inline));],
-+ [],
- ac_cv_attribute_always_inline=yes,
- ac_cv_attribute_always_inline=no)])
-
- AC_CACHE_CHECK(for __attribute__((malloc)),
- ac_cv_attribute_malloc,
-- [AC_TRY_COMPILE([],
-- [void* f(int) __attribute__((malloc));],
-+ [AC_TRY_COMPILE([void* f(int) __attribute__((malloc));],
-+ [],
- ac_cv_attribute_malloc=yes,
- ac_cv_attribute_malloc=no)])
-
- AC_CACHE_CHECK(for __attribute__((warn_unused_result)),
- ac_cv_attribute_warn_unused,
-- [AC_TRY_COMPILE([],
-- [int f(void) __attribute__((warn_unused_result));],
-+ [AC_TRY_COMPILE([int f(void) __attribute__((warn_unused_result));],
-+ [],
- ac_cv_attribute_warn_unused=yes,
- ac_cv_attribute_warn_unused=no)])
-
- AC_CACHE_CHECK(for __attribute__((noreturn)),
- ac_cv_attribute_noreturn,
-- [AC_TRY_COMPILE([],
-- [void f(void) __attribute__((noreturn));],
-+ [AC_TRY_COMPILE([void f(void) __attribute__((noreturn));],
-+ [],
- ac_cv_attribute_noreturn=yes,
- ac_cv_attribute_noreturn=no)])
-