Index: head/www/firefox/Makefile
===================================================================
--- head/www/firefox/Makefile	(revision 426547)
+++ head/www/firefox/Makefile	(revision 426548)
@@ -1,90 +1,90 @@
 # Created by: Alan Eldridge <alane@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	firefox
 DISTVERSION=	50.0
 DISTVERSIONSUFFIX=.source
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
 BUILD_DEPENDS=	nspr>=4.12:devel/nspr \
 		nss>=3.26.2:security/nss \
 		libevent2>=2.0.21_2:devel/libevent2 \
 		soundtouch>=1.9.0:audio/soundtouch \
 		harfbuzz>=1.2.6:print/harfbuzz \
 		graphite2>=1.3.8:graphics/graphite2 \
 		png>=1.6.23:graphics/png \
 		libvorbis>=1.3.5,3:audio/libvorbis \
 		libvpx>=1.5.0:multimedia/libvpx \
 		sqlite3>=3.13:databases/sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf-2.13:devel/autoconf213 \
 		yasm:devel/yasm \
 		zip:archivers/zip
 
 LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 
 USE_GECKO=	gecko
 CONFLICTS_INSTALL=	firefox-esr-45.* firefox-esr-3[18].* firefox-esr-24.*
 MOZ_PKGCONFIG_FILES=	# empty
 USE_MOZILLA=	# empty
 MOZILLA_NAME=	Firefox
 
 USE_GL=		gl
 USES=		tar:xz
 
 BROKEN_aarch64=		Fails to link: error adding symbols: File in wrong format
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
 MOZ_OPTIONS=	--enable-application=browser \
 		--enable-official-branding
 
 OPTIONS_DEFINE=		RUST
 OPTIONS_DEFAULT=	BUNDLED_CAIRO GTK3 ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}_${ARCH}}
 
 # XXX lang/rust currently builds only on these platforms
 OPTIONS_DEFAULT_DragonFly_4_x86_64=	RUST
 OPTIONS_DEFAULT_FreeBSD_10_amd64=	RUST
 OPTIONS_DEFAULT_FreeBSD_10_i386=	RUST
 OPTIONS_DEFAULT_FreeBSD_11_amd64=	RUST
 OPTIONS_DEFAULT_FreeBSD_11_i386=	RUST
 OPTIONS_DEFAULT_FreeBSD_12_amd64=	RUST
 OPTIONS_DEFAULT_FreeBSD_12_i386=	RUST
 
 OPTIONS_SINGLE+=	TOOLKIT
 OPTIONS_SINGLE_TOOLKIT=	GTK2 GTK3
 
 TEST_BROKEN=		No rule to make target '../../../dist/bin/libnspr4.so', needed by \
 			'../../../_tests/xpcshell/modules/libmar/tests/unit/libnspr4.so'
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
 WRKSRC:=	${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 post-extract:
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
 		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
 		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/browser/app/nsBrowserApp.cpp
 
 pre-configure:
 	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13)
 	(cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13)
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${STAGEDIR}${PREFIX}/share/applications/
 	${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON}
 
 .include <bsd.port.mk>
Index: head/www/firefox/files/patch-bug1315986
===================================================================
--- head/www/firefox/files/patch-bug1315986	(nonexistent)
+++ head/www/firefox/files/patch-bug1315986	(revision 426548)
@@ -0,0 +1,49 @@
+commit c0d2685148b5
+Author: Jonathan Kew <jkew@mozilla.com>
+Date:   Wed Nov 9 15:07:54 2016 +0000
+
+    Bug 1315986 - Update line-break class mapping in nsJISx4051LineBreaker to handle new classes in ICU58/Unicode 9, and add assertions to detect any future additions that will require further updates. r=masayuki
+---
+ intl/lwbrk/nsJISx4051LineBreaker.cpp | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git intl/lwbrk/nsJISx4051LineBreaker.cpp intl/lwbrk/nsJISx4051LineBreaker.cpp
+index 0d89e91..1b262fa 100644
+--- intl/lwbrk/nsJISx4051LineBreaker.cpp
++++ intl/lwbrk/nsJISx4051LineBreaker.cpp
+@@ -12,6 +12,10 @@
+ #include "nsTArray.h"
+ #include "nsUnicodeProperties.h"
+ 
++#if ENABLE_INTL_API
++#include "unicode/uchar.h"  // for U_LB_COUNT until bug 1305700
++#endif
++
+ /* 
+ 
+    Simplification of Pair Table in JIS X 4051
+@@ -547,10 +551,22 @@ GetClass(uint32_t u)
+     /* CLOSE_PARENTHESIS = 36,            [CP] */ CLASS_CLOSE_LIKE_CHARACTER,
+     /* CONDITIONAL_JAPANESE_STARTER = 37, [CJ] */ CLASS_CLOSE,
+     /* HEBREW_LETTER = 38,                [HL] */ CLASS_CHARACTER,
+-    /* REGIONAL_INDICATOR = 39,           [RI] */ CLASS_CHARACTER
++    /* REGIONAL_INDICATOR = 39,           [RI] */ CLASS_CHARACTER,
++#if U_ICU_VERSION_MAJOR_NUM > 57
++    /* E_BASE = 40,                       [EB] */ CLASS_BREAKABLE,
++    /* E_MODIFIER = 41,                   [EM] */ CLASS_CHARACTER,
++    /* ZWJ = 42,                          [ZWJ]*/ CLASS_CHARACTER,
++#endif
+   };
+ 
+-  return sUnicodeLineBreakToClass[mozilla::unicode::GetLineBreakClass(u)];
++#if ENABLE_INTL_API
++  static_assert(U_LB_COUNT == mozilla::ArrayLength(sUnicodeLineBreakToClass),
++                "Gecko vs ICU LineBreak class mismatch");
++#endif
++
++  auto cls = mozilla::unicode::GetLineBreakClass(u);
++  MOZ_ASSERT(cls < mozilla::ArrayLength(sUnicodeLineBreakToClass));
++  return sUnicodeLineBreakToClass[cls];
+ }
+ 
+ static bool

Property changes on: head/www/firefox/files/patch-bug1315986
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property