Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Jul 2017 06:23:01 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r446510 - in head: Mk/Uses www/linux-seamonkey www/seamonkey www/seamonkey-i18n www/seamonkey/files
Message-ID:  <201707240623.v6O6N1rm035411@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Mon Jul 24 06:23:00 2017
New Revision: 446510
URL: https://svnweb.freebsd.org/changeset/ports/446510

Log:
  www/seamonkey: update to 2.48
  
  Changes:	http://www.seamonkey-project.org/news
  MFH:		2017Q3
  Security:	d1853110-07f4-4645-895b-6fd462ad0589
  Security:	512c0ffd-cd39-4da4-b2dc-81ff4ba8e238
  Security:	e60169c4-aa86-46b0-8ae2-0d81f683df09

Added:
  head/www/seamonkey/files/patch-bug1142056   (contents, props changed)
  head/www/seamonkey/files/patch-bug1316879   (contents, props changed)
  head/www/seamonkey/files/patch-env-api-keys   (contents, props changed)
Deleted:
  head/www/seamonkey/files/patch-bug1130155
  head/www/seamonkey/files/patch-bug1256136
  head/www/seamonkey/files/patch-bug1278861
  head/www/seamonkey/files/patch-bug1290037
  head/www/seamonkey/files/patch-bug1299694
  head/www/seamonkey/files/patch-bug1320621
Modified:
  head/Mk/Uses/gecko.mk   (contents, props changed)
  head/www/linux-seamonkey/Makefile   (contents, props changed)
  head/www/linux-seamonkey/distinfo   (contents, props changed)
  head/www/seamonkey-i18n/Makefile   (contents, props changed)
  head/www/seamonkey-i18n/Makefile.lang   (contents, props changed)
  head/www/seamonkey-i18n/distinfo   (contents, props changed)
  head/www/seamonkey/Makefile   (contents, props changed)
  head/www/seamonkey/distinfo   (contents, props changed)
  head/www/seamonkey/files/patch-bug1021761   (contents, props changed)
  head/www/seamonkey/files/patch-bug826985   (contents, props changed)
  head/www/seamonkey/files/patch-bug847568   (contents, props changed)
  head/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp   (contents, props changed)
  head/www/seamonkey/files/patch-z-bug517422   (contents, props changed)

Modified: head/Mk/Uses/gecko.mk
==============================================================================
--- head/Mk/Uses/gecko.mk	Mon Jul 24 01:14:25 2017	(r446509)
+++ head/Mk/Uses/gecko.mk	Mon Jul 24 06:23:00 2017	(r446510)
@@ -51,8 +51,8 @@ _GECKO_INSTALLED_VER:=	${_GECKO_INSTALLED_VER:M[0-9][0
 
 .elif ${gecko_ARGS:Mseamonkey}
 
-_GECKO_DEFAULT_VERSION=	46
-_GECKO_VERSIONS=		46
+_GECKO_DEFAULT_VERSION=	48
+_GECKO_VERSIONS=		48
 _GECKO_TYPE=	seamonkey
 
 .if exists(${LOCALBASE}/bin/seamonkey)
@@ -61,7 +61,7 @@ _GECKO_INSTALLED_VER:=	${_GECKO_INSTALLED_VER:M[0-9]*:
 .endif
 
 # Dependence lines for different Seamonkey versions
-46_DEPENDS=		${LOCALBASE}/lib/seamonkey/seamonkey:www/seamonkey
+48_DEPENDS=		${LOCALBASE}/lib/seamonkey/seamonkey:www/seamonkey
 
 .elif ${gecko_ARGS:Mthunderbird}
 

Modified: head/www/linux-seamonkey/Makefile
==============================================================================
--- head/www/linux-seamonkey/Makefile	Mon Jul 24 01:14:25 2017	(r446509)
+++ head/www/linux-seamonkey/Makefile	Mon Jul 24 06:23:00 2017	(r446510)
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	seamonkey
-DISTVERSION=	2.46
-PORTREVISION=	1
+DISTVERSION=	2.48
 CATEGORIES=	www mail news editors irc ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US \
-		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build9/linux-i686/en-US
+		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/linux-i686/en-US
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	The open source, standards compliant web browser

Modified: head/www/linux-seamonkey/distinfo
==============================================================================
--- head/www/linux-seamonkey/distinfo	Mon Jul 24 01:14:25 2017	(r446509)
+++ head/www/linux-seamonkey/distinfo	Mon Jul 24 06:23:00 2017	(r446510)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481682190
-SHA256 (seamonkey-2.46.tar.bz2) = 096a1a8e229eaa05c2db5ae0661f856aceae58f1cae406cf52d2b270ca8a9957
-SIZE (seamonkey-2.46.tar.bz2) = 48816262
+TIMESTAMP = 1499406030
+SHA256 (seamonkey-2.48.tar.bz2) = b5294430a517a2e988c3abcf31cdddb41f96b8e17a075247b8bad68dfa0df91b
+SIZE (seamonkey-2.48.tar.bz2) = 50679912

Modified: head/www/seamonkey-i18n/Makefile
==============================================================================
--- head/www/seamonkey-i18n/Makefile	Mon Jul 24 01:14:25 2017	(r446509)
+++ head/www/seamonkey-i18n/Makefile	Mon Jul 24 06:23:00 2017	(r446510)
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	seamonkey-i18n
-PORTVERSION=	2.46
-PORTREVISION=	1
+PORTVERSION=	2.48
 CATEGORIES=	www mail news editors irc
 MASTER_SITES=	MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/langpack \
-		MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build9/langpack
+		MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/langpack
 PKGNAMEPREFIX=
 DISTFILES=	${SEAMONKEY_I18N_:S/$/.langpack.xpi/:S/^/seamonkey-${PORTVERSION}./}
 DIST_SUBDIR=	xpi/${DISTNAME}

Modified: head/www/seamonkey-i18n/Makefile.lang
==============================================================================
--- head/www/seamonkey-i18n/Makefile.lang	Mon Jul 24 01:14:25 2017	(r446509)
+++ head/www/seamonkey-i18n/Makefile.lang	Mon Jul 24 06:23:00 2017	(r446510)
@@ -1,9 +1,8 @@
 # Created by: Koji Yokota <yokota@res.otaru-uc.ac.jp>
 # $FreeBSD$
 
-SEAMONKEY_I18N_ALL_=	be ca cs de en-GB en-US es-AR es-ES fi fr gl hu it  \
-			ja lt nb-NO nl pl pt-PT ru sk sv-SE tr uk \
-			zh-CN zh-TW
+SEAMONKEY_I18N_ALL_=	cs de en-GB en-US es-AR es-ES fr hu it ja lt nl	\
+			pl pt-PT ru sk sv-SE zh-CN zh-TW
 
 .if defined(SEAMONKEY_I18N_ALL) || (defined(PACKAGE_BUILDING) && !exists(${OPTIONS_FILE})) || make(makesum)
 SEAMONKEY_I18N=   ${SEAMONKEY_I18N_ALL_}

Modified: head/www/seamonkey-i18n/distinfo
==============================================================================
--- head/www/seamonkey-i18n/distinfo	Mon Jul 24 01:14:25 2017	(r446509)
+++ head/www/seamonkey-i18n/distinfo	Mon Jul 24 06:23:00 2017	(r446510)
@@ -1,53 +1,39 @@
-TIMESTAMP = 1481640594
-SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.be.langpack.xpi) = d97376ff92ffcdf04ec08273b60b8750d2c4f65edd71eed734313f72885f45db
-SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.be.langpack.xpi) = 936650
-SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.ca.langpack.xpi) = 11adc88aab13826dbb7dd9374f877b80c87a085d75712c976173f243950292a6
-SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.ca.langpack.xpi) = 937577
-SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.cs.langpack.xpi) = 4fae0f46a8ba83a72e6c7a50b7ba73153f153055b874fa3e857ebf6867a48ff3
-SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.cs.langpack.xpi) = 936101
-SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.de.langpack.xpi) = e6d000492fbb3aa1f7624dbb3a546742bd9badb67a9cee8a95fd8b8ead7ac0eb
-SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.de.langpack.xpi) = 942796
-SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.en-GB.langpack.xpi) = be1e956e11c4e36def6af6ee0c0795f5ec19e4370d811b6f3fdf60ed38f184c4
-SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.en-GB.langpack.xpi) = 900232
-SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.en-US.langpack.xpi) = ff188a86cebac99fa25575b8f8a2eb01d0f6ee009485c826dd9fbf3701839eb4
-SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.en-US.langpack.xpi) = 900829
-SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.es-AR.langpack.xpi) = 5b7a9da73fe69c9004487f844f97f5f18d3db79e49dd151ae9a6229545ef7d2c
-SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.es-AR.langpack.xpi) = 952318
-SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.es-ES.langpack.xpi) = da0c4b4e156965310ad4280c5ab461abd778b89e55d16a1f1ee78f692bbb76cb
-SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.es-ES.langpack.xpi) = 881728
-SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.fi.langpack.xpi) = 9242710c283628b6e9f68eee0425e1f7b81d81be27c1d5c3dc441018751b1511
-SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.fi.langpack.xpi) = 905048
-SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.fr.langpack.xpi) = e8e01037b879fe49e9dc042f27e08737083ac2bd7f9652ec2216d69f3de84ac9
-SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.fr.langpack.xpi) = 945990
-SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.gl.langpack.xpi) = e10ed62becc1e090c1734434d4a48b403dadb75b2231b70b33e2f34666fa42fa
-SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.gl.langpack.xpi) = 915640
-SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.hu.langpack.xpi) = 7366d80af72e1e5c46275b0f3f4efa36290b59ac2c24dc4b2debf06dbdc469fe
-SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.hu.langpack.xpi) = 950137
-SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.it.langpack.xpi) = 939162085a89575988fc44251f6f484bce087433bf06220fe94a3a3ef31a4279
-SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.it.langpack.xpi) = 788290
-SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.ja.langpack.xpi) = b3f8a0e23cbd3e235d33d1fb083ff6b5b4d0abdd4697d89be444f90e657afea5
-SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.ja.langpack.xpi) = 1000175
-SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.lt.langpack.xpi) = 32ca1b4668234c96c161512e6e7a444d864229d86efdc89caafff5e1d882bd0d
-SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.lt.langpack.xpi) = 951611
-SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.nb-NO.langpack.xpi) = 20b93b1f9475fc97a9f86f48d2bbcdeca43015c2cfe62a5a7b4d204dee1d7e0f
-SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.nb-NO.langpack.xpi) = 921937
-SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.nl.langpack.xpi) = eb9e84781c9c70411ccc199b8ccd6bf96729763ac09210d67d2dbe9178f9b8c4
-SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.nl.langpack.xpi) = 926891
-SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.pl.langpack.xpi) = 47a18be4d673bc8ef172b358512390d5bcfc6f81d1c2d327669aa135b2aec482
-SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.pl.langpack.xpi) = 918214
-SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.pt-PT.langpack.xpi) = 0ba281071038143950c64a03edaab7a37a4d284ed1583b50633ab58e393c7743
-SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.pt-PT.langpack.xpi) = 934340
-SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.ru.langpack.xpi) = fd50c7fd8f291530f68af88424dffd15e59340cb854a1edc915d2d5dc548ec78
-SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.ru.langpack.xpi) = 960162
-SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.sk.langpack.xpi) = 124d643a414d595941cc5fd72c0529629df8f3ea15c0f16186e7e3d5550dca22
-SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.sk.langpack.xpi) = 962527
-SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.sv-SE.langpack.xpi) = 6cadce5a8b40aaf1cc39157f5a9be3de5890d4b298082c11f9da1bdf43638869
-SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.sv-SE.langpack.xpi) = 935346
-SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.tr.langpack.xpi) = 1ad81e539c119d4bcc9b4c15dc1a54d604ae8d999c3e7dbc112c2633dd914409
-SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.tr.langpack.xpi) = 912742
-SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.uk.langpack.xpi) = 50be5f1fc5bf46133308185fee7f6761eca90550bbbb6d27ded3a0f81e2cfb81
-SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.uk.langpack.xpi) = 995478
-SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.zh-CN.langpack.xpi) = 19e835ebb01e3c7c8bdd3aeee9105f18187fb7c588bf2e329db45c39acb4e5dc
-SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.zh-CN.langpack.xpi) = 942579
-SHA256 (xpi/seamonkey-i18n-2.46/seamonkey-2.46.zh-TW.langpack.xpi) = 2fe7403370d70d4daa6a302fc24fc72a062cb9777acc672faf20f51f2ed73955
-SIZE (xpi/seamonkey-i18n-2.46/seamonkey-2.46.zh-TW.langpack.xpi) = 970970
+TIMESTAMP = 1499406030
+SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.cs.langpack.xpi) = a8b955affee247a1c541bcca68fa383444fcf5db37659da045f47c0f6451d351
+SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.cs.langpack.xpi) = 929570
+SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.de.langpack.xpi) = 66cf0338e5607582824dffbd71dd6d82954275501de50bca3ebe70a2462c2b8a
+SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.de.langpack.xpi) = 937351
+SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.en-GB.langpack.xpi) = 835dbdca2c0d40be3e76045ec04932f0fff8223030febf7533885b9ff9868067
+SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.en-GB.langpack.xpi) = 901731
+SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.en-US.langpack.xpi) = 3f499d126578dc72c2982ac7bb6a47797dc6a520624b0eccaaf313f3de659330
+SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.en-US.langpack.xpi) = 921449
+SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.es-AR.langpack.xpi) = 78680bec36912e021ab35f144bd51c726dc9ce8031dbf7012bf9f2ef685872f4
+SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.es-AR.langpack.xpi) = 941407
+SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.es-ES.langpack.xpi) = 37702e2d54e965c6dffbd5c0c7bde9e4494ddfa9fc984136c826974a9fd253e5
+SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.es-ES.langpack.xpi) = 890255
+SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.fr.langpack.xpi) = f7a7c207878bfc84e9dd53f7111f00b7c297ad9c75c594ef4df4ddac532179a2
+SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.fr.langpack.xpi) = 957402
+SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.hu.langpack.xpi) = 2f1138ca9a9d1321dbe38d24cc0b6994a4a1569eb2bd4baebbcec00ed0e5355e
+SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.hu.langpack.xpi) = 943677
+SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.it.langpack.xpi) = f0084a1ce0681a1e3038597c6a77a2f3436b91166263f50b325a86cf9c708716
+SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.it.langpack.xpi) = 783035
+SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.ja.langpack.xpi) = fb3029513e8fcf9713b5ad565e66ee6842d59822af509336e56b713373fce6bd
+SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.ja.langpack.xpi) = 1027353
+SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.lt.langpack.xpi) = 54ccbd5b07e8260462ec060135f969a10dd94569238958fd96bde55e0cf61056
+SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.lt.langpack.xpi) = 944779
+SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.nl.langpack.xpi) = a2de7dcc53b7d0db496a8f1efab774fa603b4635a200fcf00cb503ebebb3227d
+SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.nl.langpack.xpi) = 946317
+SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.pl.langpack.xpi) = 4083874a25597b833d4b9473f05bdac1f7de92d5f095793597a9fc855cb160b0
+SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.pl.langpack.xpi) = 905621
+SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.pt-PT.langpack.xpi) = 2c22ee0372cebea03737f6b506a0aaf002e67be9ed26662f70204250964dc642
+SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.pt-PT.langpack.xpi) = 928435
+SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.ru.langpack.xpi) = 0ee69e3b81708004bb7c155b68343a80d15c60735a603207a86939ff7b033060
+SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.ru.langpack.xpi) = 986167
+SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.sk.langpack.xpi) = cc176898ef9cb67728f0ed3eae24336cf52582bf0144a894f3fa04fc71140861
+SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.sk.langpack.xpi) = 956279
+SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.sv-SE.langpack.xpi) = 831a4b42faa31f4006984269e2d6d3472a0f1450f92895fb8190c1719e2ff2c8
+SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.sv-SE.langpack.xpi) = 930510
+SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.zh-CN.langpack.xpi) = 991629043056dd722202116ef026aeb86a8615539aabf41a28b6a78da63eab7b
+SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.zh-CN.langpack.xpi) = 934871
+SHA256 (xpi/seamonkey-i18n-2.48/seamonkey-2.48.zh-TW.langpack.xpi) = bb41ee50948baca9e78ae1ba0174046bde21d7bb823c6b365e32d7a8c6a9c50f
+SIZE (xpi/seamonkey-i18n-2.48/seamonkey-2.48.zh-TW.langpack.xpi) = 991735

Modified: head/www/seamonkey/Makefile
==============================================================================
--- head/www/seamonkey/Makefile	Mon Jul 24 01:14:25 2017	(r446509)
+++ head/www/seamonkey/Makefile	Mon Jul 24 06:23:00 2017	(r446510)
@@ -2,27 +2,27 @@
 # $FreeBSD$
 
 PORTNAME=	seamonkey
-DISTVERSION=	2.46
-MOZILLA_VER=	49 # above + 3
-PORTREVISION=	10
+DISTVERSION=	2.48
+MOZILLA_VER=	51 # above + 3
+PORTREVISION=	0
 CATEGORIES?=	www mail news editors irc ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
-		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build9/source
+		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
 DISTFILES=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	The open source, standards compliant web browser
 
-BUILD_DEPENDS=	nspr>=4.12:devel/nspr \
-		nss>=3.25:security/nss \
+BUILD_DEPENDS=	nspr>=4.13.1:devel/nspr \
+		nss>=3.28.1:security/nss \
 		libevent>=2.0.21_2:devel/libevent \
-		harfbuzz>=1.2.6:print/harfbuzz \
+		harfbuzz>=1.3.0:print/harfbuzz \
 		graphite2>=1.3.8:graphics/graphite2 \
-		png>=1.6.21:graphics/png \
+		png>=1.6.25:graphics/png \
 		libvorbis>=1.3.5,3:audio/libvorbis \
 		libvpx>=1.5.0:multimedia/libvpx \
-		sqlite3>=3.13:databases/sqlite3 \
+		sqlite3>=3.14.1:databases/sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf-2.13:devel/autoconf213 \

Modified: head/www/seamonkey/distinfo
==============================================================================
--- head/www/seamonkey/distinfo	Mon Jul 24 01:14:25 2017	(r446509)
+++ head/www/seamonkey/distinfo	Mon Jul 24 06:23:00 2017	(r446510)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481682190
-SHA256 (seamonkey-2.46.source.tar.xz) = 39c84ce6fa1ed7c30152473e0dcd858df07437e84b29e5a18973db437a28a912
-SIZE (seamonkey-2.46.source.tar.xz) = 204913776
+TIMESTAMP = 1499406030
+SHA256 (seamonkey-2.48.source.tar.xz) = 6f9a07c86ba6474b44e5083f9d1315d01778c097937f7da4c5701debffab2631
+SIZE (seamonkey-2.48.source.tar.xz) = 220412744

Modified: head/www/seamonkey/files/patch-bug1021761
==============================================================================
--- head/www/seamonkey/files/patch-bug1021761	Mon Jul 24 01:14:25 2017	(r446509)
+++ head/www/seamonkey/files/patch-bug1021761	Mon Jul 24 06:23:00 2017	(r446510)
@@ -187,22 +187,13 @@ index a962553..1f780f4 100644
  };
  
  enum stream_state {
-@@ -262,7 +309,7 @@ alsa_refill_stream(cubeb_stream * stm)
+@@ -260,10 +307,10 @@ alsa_refill_stream(cubeb_stream * stm)
  
    pthread_mutex_lock(&stm->mutex);
  
--  r = snd_pcm_poll_descriptors_revents(stm->pcm, stm->fds, stm->nfds, &revents);
-+  r = WRAP(snd_pcm_poll_descriptors_revents)(stm->pcm, stm->fds, stm->nfds, &revents);
-   if (r < 0 || revents != POLLOUT) {
-     /* This should be a stream error; it makes no sense for poll(2) to wake
-        for this stream and then have the stream report that it's not ready.
-@@ -271,10 +318,10 @@ alsa_refill_stream(cubeb_stream * stm)
-     return RUNNING;
-   }
- 
 -  avail = snd_pcm_avail_update(stm->pcm);
 +  avail = WRAP(snd_pcm_avail_update)(stm->pcm);
-   if (avail == -EPIPE) {
+   if (avail < 0) {
 -    snd_pcm_recover(stm->pcm, avail, 1);
 -    avail = snd_pcm_avail_update(stm->pcm);
 +    WRAP(snd_pcm_recover)(stm->pcm, avail, 1);
@@ -210,19 +201,8 @@ index a962553..1f780f4 100644
    }
  
    /* Failed to recover from an xrun, this stream must be broken. */
-@@ -293,8 +340,8 @@ alsa_refill_stream(cubeb_stream * stm)
-      available to write.  If avail is still zero here, the stream must be in
-      a funky state, so recover and try again. */
-   if (avail == 0) {
--    snd_pcm_recover(stm->pcm, -EPIPE, 1);
--    avail = snd_pcm_avail_update(stm->pcm);
-+    WRAP(snd_pcm_recover)(stm->pcm, -EPIPE, 1);
-+    avail = WRAP(snd_pcm_avail_update)(stm->pcm);
-     if (avail <= 0) {
-       pthread_mutex_unlock(&stm->mutex);
-       stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR);
-@@ -302,7 +349,7 @@ alsa_refill_stream(cubeb_stream * stm)
-     }
+@@ -286,7 +333,7 @@ alsa_refill_stream(cubeb_stream * stm)
+     return RUNNING;
    }
  
 -  p = calloc(1, snd_pcm_frames_to_bytes(stm->pcm, avail));
@@ -230,13 +210,13 @@ index a962553..1f780f4 100644
    assert(p);
  
    pthread_mutex_unlock(&stm->mutex);
-@@ -327,10 +374,10 @@ alsa_refill_stream(cubeb_stream * stm)
+@@ -312,10 +359,10 @@ alsa_refill_stream(cubeb_stream * stm)
          b[i] *= stm->volume;
        }
      }
 -    wrote = snd_pcm_writei(stm->pcm, p, got);
 +    wrote = WRAP(snd_pcm_writei)(stm->pcm, p, got);
-     if (wrote == -EPIPE) {
+     if (wrote < 0) {
 -      snd_pcm_recover(stm->pcm, wrote, 1);
 -      wrote = snd_pcm_writei(stm->pcm, p, got);
 +      WRAP(snd_pcm_recover)(stm->pcm, wrote, 1);
@@ -514,15 +494,15 @@ index a962553..1f780f4 100644
 +  r = WRAP(snd_pcm_nonblock)(stm->pcm, 1);
    assert(r == 0);
  
-   /* Ugly hack: the PA ALSA plugin allows buffer configurations that can't
-@@ -859,7 +965,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
-     latency = latency < 500 ? 500 : latency;
+   latency_us = latency_frames * 1e6 / stm->params.rate;
+@@ -855,7 +961,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
+     latency_us = latency_us < min_latency ? min_latency: latency_us;
    }
  
 -  r = snd_pcm_set_params(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED,
 +  r = WRAP(snd_pcm_set_params)(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED,
                           stm->params.channels, stm->params.rate, 1,
-                          latency * 1000);
+                          latency_us);
    if (r < 0) {
 @@ -867,15 +973,15 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
      return CUBEB_ERROR_INVALID_FORMAT;
@@ -567,12 +547,12 @@ index a962553..1f780f4 100644
    if (r < 0) {
      return CUBEB_ERROR;
    }
-@@ -963,34 +1069,34 @@ alsa_get_preferred_sample_rate(cubeb * ctx, uint32_t * rate) {
+@@ -969,34 +1075,34 @@ alsa_get_preferred_sample_rate(cubeb * c
  
    /* get a pcm, disabling resampling, so we get a rate the
     * hardware/dmix/pulse/etc. supports. */
--  r = snd_pcm_open(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
-+  r = WRAP(snd_pcm_open)(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
+-  r = snd_pcm_open(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE);
++  r = WRAP(snd_pcm_open)(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE);
    if (r < 0) {
      return CUBEB_ERROR;
    }
@@ -1137,14 +1117,14 @@ diff --git media/libcubeb/update.sh media/libcubeb/upd
 index a96badd..2f9585e 100755
 --- mozilla/media/libcubeb/update.sh
 +++ mozilla/media/libcubeb/update.sh
-@@ -10,6 +10,7 @@ cp $1/src/cubeb_audiounit.c src
- cp $1/src/cubeb_pulse.c src
- cp $1/src/cubeb_sndio.c src
+@@ -16,6 +16,7 @@ cp $1/src/cubeb_audiounit.cpp src
+ cp $1/src/cubeb_osx_run_loop.h src
+ cp $1/src/cubeb_jack.cpp src
  cp $1/src/cubeb_opensl.c src
 +cp $1/src/cubeb_oss.c src
- cp $1/src/cubeb_audiotrack.c src
- cp $1/src/cubeb_wasapi.cpp src
- cp $1/src/cubeb_resampler.h src
+ cp $1/src/cubeb_panner.cpp src
+ cp $1/src/cubeb_panner.h src
+ cp $1/src/cubeb_pulse.c src
 diff --git media/webrtc/signaling/test/common.build media/webrtc/signaling/test/common.build
 index 991f03f..3d99eb5 100644
 --- mozilla/media/webrtc/signaling/test/common.build

Added: head/www/seamonkey/files/patch-bug1142056
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/seamonkey/files/patch-bug1142056	Mon Jul 24 06:23:00 2017	(r446510)
@@ -0,0 +1,64 @@
+commit ef0d953d9e2d
+Author: Makoto Kato <m_kato@ga2.so-net.ne.jp>
+Date:   Tue Aug 23 16:54:06 2016 +0900
+
+    Bug 1142056 - Add aarch64 configuration on Skia's moz.build. r=gw280
+    
+    MozReview-Commit-ID: 60iAZjFg6W6
+    
+    --HG--
+    extra : histedit_source : b3bb5a3e556393ba49f43dc4ab8bdaa9be40fb0c
+---
+ gfx/skia/generate_mozbuild.py |  6 ++++--
+ gfx/skia/moz.build            | 12 ++++++++++--
+ 2 files changed, 14 insertions(+), 4 deletions(-)
+
+diff --git gfx/skia/generate_mozbuild.py gfx/skia/generate_mozbuild.py
+index 2088b729d476..1eb04c1d7f57 100755
+--- mozilla/gfx/skia/generate_mozbuild.py
++++ mozilla/gfx/skia/generate_mozbuild.py
+@@ -429,10 +429,12 @@ def write_mozbuild(sources):
+   f.write("if CONFIG['INTEL_ARCHITECTURE']:\n")
+   write_sources(f, sources['intel'], 4)
+ 
+-  f.write("elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:\n")
++  f.write("elif CONFIG['CPU_ARCH'] in ('arm', 'aarch64') and CONFIG['GNU_CC']:\n")
+   write_sources(f, sources['arm'], 4)
+ 
+-  f.write("    if CONFIG['BUILD_ARM_NEON']:\n")
++  f.write("    if CONFIG['CPU_ARCH'] == 'aarch64':\n")
++  write_sources(f, sources['neon'], 8)
++  f.write("    elif CONFIG['BUILD_ARM_NEON']:\n")
+   write_list(f, 'SOURCES', sources['neon'], 8)
+   write_cflags(f, sources['neon'], 'neon', "CONFIG['NEON_FLAGS']", 8)
+ 
+diff --git gfx/skia/moz.build gfx/skia/moz.build
+index b33f1cdbee54..9dba87978dd3 100644
+--- mozilla/gfx/skia/moz.build
++++ mozilla/gfx/skia/moz.build
+@@ -519,7 +519,7 @@ if CONFIG['INTEL_ARCHITECTURE']:
+         'skia/src/opts/SkOpts_sse41.cpp',
+         'skia/src/opts/SkOpts_ssse3.cpp',
+     ]
+-elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:
++elif CONFIG['CPU_ARCH'] in ('arm', 'aarch64') and CONFIG['GNU_CC']:
+     UNIFIED_SOURCES += [
+         'skia/src/core/SkUtilsArm.cpp',
+         'skia/src/opts/SkBitmapProcState_opts_arm.cpp',
+@@ -528,7 +528,15 @@ elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:
+     SOURCES += [
+         'skia/src/opts/SkBlitRow_opts_arm.cpp',
+     ]
+-    if CONFIG['BUILD_ARM_NEON']:
++    if CONFIG['CPU_ARCH'] == 'aarch64':
++        SOURCES += [
++            'skia/src/opts/SkBitmapProcState_arm_neon.cpp',
++            'skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp',
++            'skia/src/opts/SkBlitMask_opts_arm_neon.cpp',
++            'skia/src/opts/SkBlitRow_opts_arm_neon.cpp',
++            'skia/src/opts/SkOpts_neon.cpp',
++        ]
++    elif CONFIG['BUILD_ARM_NEON']:
+         SOURCES += [
+             'skia/src/opts/SkBitmapProcState_arm_neon.cpp',
+             'skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp',

Added: head/www/seamonkey/files/patch-bug1316879
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/seamonkey/files/patch-bug1316879	Mon Jul 24 06:23:00 2017	(r446510)
@@ -0,0 +1,13 @@
+Don't use CPP/CXXCPP from environment after bug 1299919. r=glandium, a=jcristau
+
+diff --git build/buildconfig.py build/buildconfig.py
+index bb12114b2f4a..e73903a1a981 100644
+--- mozilla/build/buildconfig.py
++++ mozilla/build/buildconfig.py
+@@ -16,5 +16,5 @@ for var in ('topsrcdir', 'topobjdir', 'defines', 'non_global_defines',
+ substs = dict(substs)
+ 
+ for var in os.environ:
+-    if var != 'SHELL' and var in substs:
++    if var not in ('CPP', 'CXXCPP', 'SHELL') and var in substs:
+         substs[var] = os.environ[var]

Modified: head/www/seamonkey/files/patch-bug826985
==============================================================================
--- head/www/seamonkey/files/patch-bug826985	Mon Jul 24 01:14:25 2017	(r446509)
+++ head/www/seamonkey/files/patch-bug826985	Mon Jul 24 06:23:00 2017	(r446510)
@@ -17,14 +17,14 @@ diff --git config/system-headers config/system-headers
 index 55e4cd1..76567b3 100644
 --- mozilla/config/system-headers
 +++ mozilla/config/system-headers
-@@ -629,6 +629,7 @@ libgnome/libgnome.h
+@@ -624,6 +624,7 @@ libgnome/libgnome.h
  libgnomeui/gnome-icon-lookup.h
  libgnomeui/gnome-icon-theme.h
  libgnomeui/gnome-ui-init.h
 +libv4l2.h
- limits
  limits.h
  link.h
+ #ifdef ANDROID
 diff --git old-configure.in configure.in
 index 55e4cd1..76567b3 100644
 --- mozilla/old-configure.in

Modified: head/www/seamonkey/files/patch-bug847568
==============================================================================
--- head/www/seamonkey/files/patch-bug847568	Mon Jul 24 01:14:25 2017	(r446509)
+++ head/www/seamonkey/files/patch-bug847568	Mon Jul 24 06:23:00 2017	(r446510)
@@ -1,20 +1,7 @@
 # Allow building against system-wide graphite2/harfbuzz.
 
-diff --git build/moz.configure/old.configure build/moz.configure/old.configure
-index 4cbefd5..42ab554 100644
---- mozilla/build/moz.configure/old.configure
-+++ mozilla/build/moz.configure/old.configure
-@@ -312,6 +312,8 @@ def old_configure_options(*options):
-     '--with-sixgill',
-     '--with-soft-float',
-     '--with-system-bz2',
-+    '--with-system-graphite2',
-+    '--with-system-harfbuzz',
-     '--with-system-icu',
-     '--with-system-jpeg',
-     '--with-system-libevent',
 diff --git config/Makefile.in config/Makefile.in
-index 14bfc0d..5383399 100644
+index 10807cf..f4b8587 100644
 --- mozilla/config/Makefile.in
 +++ mozilla/config/Makefile.in
 @@ -49,6 +49,8 @@ export:: $(export-preqs)
@@ -23,14 +10,14 @@ index 14bfc0d..5383399 100644
  		-DMOZ_SYSTEM_ICU=$(MOZ_SYSTEM_ICU) \
 +		-DMOZ_SYSTEM_GRAPHITE2=$(MOZ_SYSTEM_GRAPHITE2) \
 +		-DMOZ_SYSTEM_HARFBUZZ=$(MOZ_SYSTEM_HARFBUZZ) \
- 		$(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
+ 		$(srcdir)/system-headers $(srcdir)/stl-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
  	$(INSTALL) system_wrappers $(DIST)
  
 diff --git config/system-headers config/system-headers
-index 18e8703..bdc5f82 100644
+index 48afa0f..61612f6 100644
 --- mozilla/config/system-headers
 +++ mozilla/config/system-headers
-@@ -1344,3 +1344,12 @@ unicode/utypes.h
+@@ -1331,3 +1331,12 @@ unicode/utypes.h
  #endif
  libutil.h
  unwind.h
@@ -43,76 +30,22 @@ index 18e8703..bdc5f82 100644
 +harfbuzz/hb-ot.h
 +harfbuzz/hb.h
 +#endif
-diff --git old-configure.in configure.in
-index ac38f40..87536b7 100644
---- mozilla/old-configure.in
-+++ mozilla/old-configure.in
-@@ -7989,6 +7989,49 @@ if test "$USE_FC_FREETYPE"; then
- fi
- 
- dnl ========================================================
-+dnl Check for harfbuzz
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-harfbuzz,
-+[  --with-system-harfbuzz  Use system harfbuzz (located with pkgconfig)],
-+MOZ_SYSTEM_HARFBUZZ=1,
-+MOZ_SYSTEM_HARFBUZZ=)
-+
-+if test -n "$MOZ_SYSTEM_HARFBUZZ"; then
-+    PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 1.2.6)
-+fi
-+
-+AC_SUBST(MOZ_SYSTEM_HARFBUZZ)
-+
-+dnl ========================================================
-+dnl Check for graphite2
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-graphite2,
-+[  --with-system-graphite2 Use system graphite2 (located with pkgconfig)],
-+MOZ_SYSTEM_GRAPHITE2=1,
-+MOZ_SYSTEM_GRAPHITE2=)
-+
-+if test -n "$MOZ_SYSTEM_GRAPHITE2"; then
-+    PKG_CHECK_MODULES(MOZ_GRAPHITE2, graphite2)
-+
-+    dnl graphite2.pc has bogus version, check manually
-+    AC_TRY_COMPILE([ #include <graphite2/Font.h>
-+                     #define GR2_VERSION_REQUIRE(major,minor,bugfix)  \
-+                             ( GR2_VERSION_MAJOR * 10000 + GR2_VERSION_MINOR \
-+                               * 100 + GR2_VERSION_BUGFIX >= \
-+                               (major) * 10000 + (minor) * 100 + (bugfix) )
-+                   ], [
-+                     #if !GR2_VERSION_REQUIRE(1,3,8)
-+                     #error "Insufficient graphite2 version."
-+                     #endif
-+                   ], [],
-+                   [AC_MSG_ERROR([--with-system-graphite2 requested but no working libgraphite2 found])])
-+fi
-+
-+AC_SUBST(MOZ_SYSTEM_GRAPHITE2)
-+
-+dnl ========================================================
- dnl Check for pixman and cairo
- dnl ========================================================
- 
 diff --git dom/base/moz.build dom/base/moz.build
-index a660ba4..6b2f602 100644
+index 6e0d4f5..0770717 100644
 --- mozilla/dom/base/moz.build
 +++ mozilla/dom/base/moz.build
-@@ -397,6 +397,9 @@ if CONFIG['INTEL_ARCHITECTURE']:
-     SOURCES += ['nsTextFragmentSSE2.cpp']
-     SOURCES['nsTextFragmentSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+@@ -457,6 +457,9 @@ if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']:
+ if CONFIG['MOZ_X11']:
+     CXXFLAGS += CONFIG['TK_CFLAGS']
  
 +if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+    SOURCES['nsContentUtils.cpp'].flags += CONFIG['MOZ_HARFBUZZ_CFLAGS']
++    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
 +
- EXTRA_COMPONENTS += [
-     'ConsoleAPI.manifest',
-     'ConsoleAPIStorage.js',
+ GENERATED_FILES += [
+     'PropertyUseCounterMap.inc',
+     'UseCounterList.h',
 diff --git gfx/graphite2/moz-gr-update.sh gfx/graphite2/moz-gr-update.sh
-index f3d76ea..a9e7fb6 100644
+index faaab1b..04eff5f 100644
 --- mozilla/gfx/graphite2/moz-gr-update.sh
 +++ mozilla/gfx/graphite2/moz-gr-update.sh
 @@ -1,6 +1,7 @@
@@ -123,7 +56,7 @@ index f3d76ea..a9e7fb6 100644
  
  # This script lives in gfx/graphite2, along with the library source,
  # but must be run from the top level of the mozilla-central tree.
-@@ -37,12 +38,16 @@ echo "See" $0 "for update procedure." >>
+@@ -37,12 +38,16 @@ echo "See" $0 "for update procedure." >> gfx/graphite2/README.mozilla
  #find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
  #find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
  
@@ -142,20 +75,20 @@ index f3d76ea..a9e7fb6 100644
  echo
  echo If gfx/graphite2/src/files.mk has changed, please make corresponding
 diff --git gfx/harfbuzz/README-mozilla gfx/harfbuzz/README-mozilla
-index ca57d16..1ce21fe 100644
+index 24e6cbb..0b7a5df 100644
 --- mozilla/gfx/harfbuzz/README-mozilla
 +++ mozilla/gfx/harfbuzz/README-mozilla
-@@ -18,3 +18,8 @@ the mozilla tree.
- In addition, the src/Makefile.in file here is NOT from upstream, nor is it
- generated from src/Makefile.am (the original harfbuzz version); it is a mozilla-
- specific makefile that is maintained by hand.
+@@ -20,3 +20,8 @@ the mozilla tree.
+ 
+ If the collection of source files changes, manual updates to moz.build may be
+ needed, as we don't use the upstream makefiles.
 +
 +The in-tree copy may be omitted during build by --with-system-harfbuzz.
 +Make sure to keep pkg-config version check within old-configure.in in sync
 +with checkout version or increment latest tag by one if it's not based
 +on upstream release.
 diff --git gfx/moz.build gfx/moz.build
-index 519aa46..6929751 100644
+index 2509198..5cc4663 100644
 --- mozilla/gfx/moz.build
 +++ mozilla/gfx/moz.build
 @@ -7,6 +7,12 @@
@@ -181,38 +114,38 @@ index 519aa46..6929751 100644
      'thebes',
      'ipc',
 diff --git gfx/skia/generate_mozbuild.py gfx/skia/generate_mozbuild.py
-index 28fa6b5..240dced 100755
+index ab1365f..8897c27 100755
 --- mozilla/gfx/skia/generate_mozbuild.py
 +++ mozilla/gfx/skia/generate_mozbuild.py
-@@ -134,6 +134,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_
+@@ -140,6 +140,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:
          '-Wno-unused-private-field',
      ]
  
 +if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
 +    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
 +
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'):
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk'):
      CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
      CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
 diff --git gfx/skia/moz.build gfx/skia/moz.build
-index 1d0c2f9..adb8941 100644
+index a2f914b..d3759b0 100644
 --- mozilla/gfx/skia/moz.build
 +++ mozilla/gfx/skia/moz.build
-@@ -752,6 +752,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_
+@@ -664,6 +664,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:
          '-Wno-unused-private-field',
      ]
  
 +if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
 +    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
 +
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'):
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk'):
      CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
      CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
 diff --git gfx/thebes/moz.build gfx/thebes/moz.build
-index d5852fa..aeeab25 100644
+index bbbce6fd..db0ceb1 100644
 --- mozilla/gfx/thebes/moz.build
 +++ mozilla/gfx/thebes/moz.build
-@@ -306,7 +306,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk
+@@ -289,7 +289,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
  
  LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
  
@@ -227,19 +160,55 @@ index d5852fa..aeeab25 100644
  
  if CONFIG['CLANG_CXX']:
      # Suppress warnings from Skia header files.
-index d736943..41a931f 100644
+diff --git intl/unicharutil/util/moz.build intl/unicharutil/util/moz.build
+index 9754753..768cc7d 100644
 --- mozilla/intl/unicharutil/util/moz.build
 +++ mozilla/intl/unicharutil/util/moz.build
-@@ -44,4 +44,7 @@ if CONFIG['ENABLE_INTL_API']:
-     LOCAL_INCLUDES += CONFIG['MOZ_ICU_INCLUDES']
+@@ -42,4 +42,7 @@ if CONFIG['_MSC_VER']:
+ if CONFIG['ENABLE_INTL_API']:
      USE_LIBS += ['icu']
  
 +if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
 +    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
 +
  DIST_INSTALL = True
+diff --git moz.configure moz.configure
+index e762576..196dafd 100644
+--- mozilla/moz.configure
++++ mozilla/moz.configure
+@@ -216,6 +216,30 @@ check_prog('GENISOIMAGE', delayed_getattr(extra_programs, 'GENISOIMAGE'),
+ check_prog('RPMBUILD', delayed_getattr(extra_programs, 'RPMBUILD'),
+            allow_missing=True)
+ 
++option('--with-system-graphite2',
++       help="Use system graphite2 (located with pkgconfig)")
++
++@depends('--with-system-graphite2', compile_environment)
++def check_for_graphite2(value, compile_env):
++    return value and compile_env
++
++system_graphite2 = pkg_check_modules('MOZ_GRAPHITE2', 'graphite2',
++                                    check_for_graphite2)
++
++set_config('MOZ_SYSTEM_GRAPHITE2', system_graphite2)
++
++option('--with-system-harfbuzz',
++       help="Use system harfbuzz (located with pkgconfig)")
++
++@depends('--with-system-harfbuzz', compile_environment)
++def check_for_harfbuzz(value, compile_env):
++    return value and compile_env
++
++system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.3.0',
++                                    check_for_harfbuzz)
++
++set_config('MOZ_SYSTEM_HARFBUZZ', system_harfbuzz)
++
+ option('--enable-system-hunspell',
+        help="Use system hunspell (located with pkgconfig)")
+ 
 diff --git netwerk/dns/moz.build netwerk/dns/moz.build
-index 0b0717a..2e665c9 100644
+index f788d9a..5662301 100644
 --- mozilla/netwerk/dns/moz.build
 +++ mozilla/netwerk/dns/moz.build
 @@ -66,6 +66,9 @@ LOCAL_INCLUDES += [
@@ -249,16 +218,48 @@ index 0b0717a..2e665c9 100644
 +if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
 +    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
 +
- if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] > '19':
-     LOCAL_INCLUDES += ['%' + '%s/bionic/libc/dns/include' % CONFIG['ANDROID_SOURCE']]
+ if CONFIG['ENABLE_INTL_API']:
+     DEFINES['IDNA2008'] = True
+     USE_LIBS += ['icu']
+diff --git old-configure.in old-configure.in
+index 0070d48..9d1129f 100644
+--- mozilla/old-configure.in
++++ mozilla/old-configure.in
+@@ -5764,6 +5764,27 @@ if test "$USE_FC_FREETYPE"; then
+ fi
  
+ dnl ========================================================
++dnl Check for graphite2
++dnl ========================================================
++if test -n "$MOZ_SYSTEM_GRAPHITE2"; then
++    dnl graphite2.pc has bogus version, check manually
++    _SAVE_CFLAGS=$CFLAGS
++    CFLAGS="$CFLAGS $MOZ_GRAPHITE2_CFLAGS"
++    AC_TRY_COMPILE([ #include <graphite2/Font.h>
++                     #define GR2_VERSION_REQUIRE(major,minor,bugfix)  \
++                             ( GR2_VERSION_MAJOR * 10000 + GR2_VERSION_MINOR \
++                               * 100 + GR2_VERSION_BUGFIX >= \
++                               (major) * 10000 + (minor) * 100 + (bugfix) )
++                   ], [
++                     #if !GR2_VERSION_REQUIRE(1,3,8)
++                     #error "Insufficient graphite2 version."
++                     #endif
++                   ], [],
++                   [AC_MSG_ERROR([--with-system-graphite2 requested but no working libgraphite2 found])])
++    CFLAGS=$_SAVE_CFLAGS
++fi
++
++dnl ========================================================
+ dnl Check for pixman and cairo
+ dnl ========================================================
+ 
 diff --git toolkit/library/moz.build toolkit/library/moz.build
-index 67f0db9..d42137a 100644
+index a3d5450..2c684a7e 100644
 --- mozilla/toolkit/library/moz.build
 +++ mozilla/toolkit/library/moz.build
-@@ -231,6 +231,12 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']:
- if not CONFIG['MOZ_TREE_PIXMAN']:
-     OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
+@@ -217,6 +217,12 @@ if CONFIG['MOZ_SYSTEM_JPEG']:
+ if CONFIG['MOZ_SYSTEM_PNG']:
+     OS_LIBS += CONFIG['MOZ_PNG_LIBS']
  
 +if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
 +    OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS']
@@ -266,6 +267,6 @@ index 67f0db9..d42137a 100644
 +if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
 +    OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']
 +
- if CONFIG['MOZ_OSS']:
-     OS_LIBS += CONFIG['MOZ_OSS_LIBS']
+ if CONFIG['MOZ_SYSTEM_HUNSPELL']:
+     OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
  

Added: head/www/seamonkey/files/patch-env-api-keys
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/seamonkey/files/patch-env-api-keys	Mon Jul 24 06:23:00 2017	(r446510)
@@ -0,0 +1,21 @@
+# Accept API keys from environment like before bug 1294585
+
+--- mozilla/build/moz.configure/keyfiles.configure
++++ mozilla/build/moz.configure/keyfiles.configure
+@@ -18,6 +18,7 @@ def keyfile(desc, help=None, callback=lambda x: x):
+     @checking('for the %s key' % desc, lambda x: x and x is not no_key)
+     @imports(_from='__builtin__', _import='open')
+     @imports(_from='__builtin__', _import='IOError')
++    @imports(_from='os', _import='environ')
+     def keyfile(value):
+         if value:
+             try:
+@@ -29,7 +30,7 @@ def keyfile(desc, help=None, callback=lambda x: x):
+                 raise
+             except IOError:
+                 pass
+-        return no_key
++        return environ.get('MOZ_%s_KEY' % desc.upper().replace(' ', '_')) or no_key
+ 
+     return keyfile
+ 

Modified: head/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp
==============================================================================
--- head/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp	Mon Jul 24 01:14:25 2017	(r446509)
+++ head/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp	Mon Jul 24 06:23:00 2017	(r446510)
@@ -1,12 +1,12 @@
---- suite/app/nsSuiteApp.cpp~
+--- suite/app/nsSuiteApp.cpp.orig	2017-07-07 05:15:27 UTC
 +++ suite/app/nsSuiteApp.cpp
-@@ -331,6 +331,9 @@ int main(int argc, char* argv[])
-   TriggerQuirks();
- #endif
+@@ -318,6 +318,9 @@ int main(int argc, char* argv[], char* envp[])
+ {
+   mozilla::TimeStamp start = mozilla::TimeStamp::Now();
  
 +  setenv("MOZ_GMP_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0);
 +  setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0);
-+  
-   int gotCounters;
- #if defined(XP_UNIX)
-   struct rusage initialRUsage;
++
+ #ifdef HAS_DLL_BLOCKLIST
+   DllBlocklist_Initialize();
+ 

Modified: head/www/seamonkey/files/patch-z-bug517422
==============================================================================
--- head/www/seamonkey/files/patch-z-bug517422	Mon Jul 24 01:14:25 2017	(r446509)
+++ head/www/seamonkey/files/patch-z-bug517422	Mon Jul 24 06:23:00 2017	(r446510)
@@ -21,7 +21,7 @@ diff --git config/Makefile.in config/Makefile.in
 index 5383399..0410004 100644
 --- mozilla/config/Makefile.in
 +++ mozilla/config/Makefile.in
-@@ -77,6 +77,11 @@ export:: $(export-preqs)
+@@ -51,6 +51,11 @@ export:: $(export-preqs)
  		-DMOZ_SYSTEM_ICU=$(MOZ_SYSTEM_ICU) \
  		-DMOZ_SYSTEM_GRAPHITE2=$(MOZ_SYSTEM_GRAPHITE2) \
  		-DMOZ_SYSTEM_HARFBUZZ=$(MOZ_SYSTEM_HARFBUZZ) \
@@ -30,7 +30,7 @@ index 5383399..0410004 100644
 +		-DMOZ_SYSTEM_VORBIS=$(MOZ_SYSTEM_VORBIS) \
 +		-DMOZ_SYSTEM_TREMOR=$(MOZ_SYSTEM_TREMOR) \
 +		-DMOZ_SYSTEM_SOUNDTOUCH=$(MOZ_SYSTEM_SOUNDTOUCH) \
- 		$(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
+ 		$(srcdir)/system-headers $(srcdir)/stl-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
  	$(INSTALL) system_wrappers $(DIST)
  
 diff --git config/external/moz.build config/external/moz.build
@@ -238,7 +238,7 @@ index 2127256..1ec09fe 100644
  }
  
  size_t
-@@ -177,7 +181,11 @@ nsresult AudioStream::EnsureTimeStretcherInitializedUnlocked()
+@@ -151,7 +155,11 @@ nsresult AudioStream::EnsureTimeStretche
  {
    mMonitor.AssertCurrentThreadOwns();
    if (!mTimeStretcher) {
@@ -247,7 +247,7 @@ index 2127256..1ec09fe 100644
 +#else
      mTimeStretcher = soundtouch::createSoundTouchObj();
 +#endif
-     mTimeStretcher->setSampleRate(mInRate);
+     mTimeStretcher->setSampleRate(mAudioClock.GetInputRate());
      mTimeStretcher->setChannels(mOutChannels);
      mTimeStretcher->setPitch(1.0);
 diff --git dom/media/AudioStream.h dom/media/AudioStream.h



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707240623.v6O6N1rm035411>