5 files changed, 31 insertions, 38 deletions

diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 927201375ee5..f2c38d146298 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	firefox
-DISTVERSION=	60.3.0
-PORTREVISION=	5
+DISTVERSION=	60.4.0
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
-		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build1/source
+		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build2/source
 PKGNAMESUFFIX=	-esr
 DISTFILES=	${DISTNAME}esr.source${EXTRACT_SUFX}
 
diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo
index 8dded042fed8..efff0e8edbe0 100644
--- a/www/firefox-esr/distinfo
+++ b/www/firefox-esr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1539808809
-SHA256 (firefox-60.3.0esr.source.tar.xz) = 5566f3181aba169cae4b026cf1ea5e6b477d3e91b575fb3a42b5a33eeb2b5361
-SIZE (firefox-60.3.0esr.source.tar.xz) = 268340600
+TIMESTAMP = 1543878683
+SHA256 (firefox-60.4.0esr.source.tar.xz) = 205258548c3f245d42377b338f0db1272df39489d61305c39b83e52750ebff85
+SIZE (firefox-60.4.0esr.source.tar.xz) = 268425148
diff --git a/www/firefox-esr/files/patch-bug1500484 b/www/firefox-esr/files/patch-bug1500484
deleted file mode 100644
index f69ae8ed266b..000000000000
--- a/www/firefox-esr/files/patch-bug1500484
+++ /dev/null
@@ -1,12 +0,0 @@
-Drop unused header breaking build on non-Linux
-
---- widget/gtk/nsClipboardWayland.cpp
-+++ widget/gtk/nsClipboardWayland.cpp
-@@ -29,7 +29,6 @@
- 
- #include <gtk/gtk.h>
- #include <poll.h>
--#include <sys/epoll.h>
- #include <stdlib.h>
- #include <string.h>
- #include <fcntl.h>
diff --git a/www/firefox-esr/files/patch-bug1500850 b/www/firefox-esr/files/patch-bug1500850
new file mode 100644
index 000000000000..906d91a5d8ab
--- /dev/null
+++ b/www/firefox-esr/files/patch-bug1500850
@@ -0,0 +1,26 @@
+commit 4425b9140c4c
+Author: Martin Stransky <stransky@redhat.com>
+Date:   Mon Oct 22 09:14:07 2018 +0000
+
+    Bug 1500850 - [Wayland] Add missing dbus header dbus-glib-lowlevel.h. r=jhorak, a=RyanVM
+    
+    Differential Revision: https://phabricator.services.mozilla.com/D9365
+    
+    --HG--
+    extra : source : 5203edd6ea29e4b73681674d2a5268dd6a310102
+---
+ widget/xremoteclient/DBusRemoteClient.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git widget/xremoteclient/DBusRemoteClient.cpp widget/xremoteclient/DBusRemoteClient.cpp
+index ba5bda06201d..b2f03dccc133 100644
+--- widget/xremoteclient/DBusRemoteClient.cpp
++++ widget/xremoteclient/DBusRemoteClient.cpp
+@@ -13,6 +13,7 @@
+ #include "nsPrintfCString.h"
+ 
+ #include <dlfcn.h>
++#include <dbus/dbus-glib-lowlevel.h>
+ 
+ using mozilla::LogLevel;
+ static mozilla::LazyLogModule sRemoteLm("DBusRemoteClient");
diff --git a/www/firefox-esr/files/patch-bug1509757 b/www/firefox-esr/files/patch-bug1509757
deleted file mode 100644
index 9260fc5d5f81..000000000000
--- a/www/firefox-esr/files/patch-bug1509757
+++ /dev/null
@@ -1,20 +0,0 @@
-Don't rely on GNU regex extension for character classes.
-
-$ echo --with-system-nspr --with-system-nss | gsed -e 's/--with-system-nspr\S* *//'
---with-system-nss
-$ echo --with-system-nspr --with-system-nss | sed -e 's/--with-system-nspr\S* *//'
-sed: 1: "s/--with-system-nspr\S* ...": RE error: trailing backslash (\)
-
-diff --git old-configure.in old-configure.in
-index 7722587fadac..acf5d8d67a60 100644
---- old-configure.in
-+++ old-configure.in
-@@ -4405,7 +4405,7 @@ ac_configure_args="$_SUBDIR_CONFIG_ARGS"
- 
- # --with-system-nspr will have been converted into the relevant $NSPR_CFLAGS
- # and $NSPR_LIBS.
--ac_configure_args="`echo $ac_configure_args | sed -e 's/--with-system-nspr\S* *//'`"
-+ac_configure_args="`echo $ac_configure_args | sed -e 's/--with-system-nspr[[^[:space:]]]* *//'`"
- 
- if test "$_INTL_API" = no; then
-     ac_configure_args="$ac_configure_args --without-intl-api"