gecko: drop BUNDLED_CAIRO option

7 files changed, 9 insertions, 19 deletions

diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index dc2f21ca2cda..6bb2d7add7c5 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -149,13 +149,7 @@ RUSTFLAGS+=	${CFLAGS:M-mcpu=*:S/-mcpu=/-C target-cpu=/}
 .endif
 
 # Standard depends
-_ALL_DEPENDS=	cairo event ffi graphite harfbuzz hunspell icu jpeg nspr nss png pixman sqlite vpx
-
-.if ! ${PORT_OPTIONS:MBUNDLED_CAIRO}
-cairo_BUILD_DEPENDS=cairo>=1.12.16_1,2:graphics/cairo
-cairo_LIB_DEPENDS=	libcairo.so:graphics/cairo
-cairo_MOZ_OPTIONS=	--enable-system-cairo
-.endif
+_ALL_DEPENDS=	event ffi graphite harfbuzz hunspell icu jpeg nspr nss png pixman sqlite vpx
 
 event_LIB_DEPENDS=	libevent.so:devel/libevent
 event_MOZ_OPTIONS=	--with-system-libevent
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index d89ed8b1a4ac..73659ab1ae68 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -30,7 +30,7 @@ BUILD_DEPENDS=	nspr>=4.19:devel/nspr \
 
 SSP_UNSAFE=	yes
 USE_GECKO=	gecko
-USE_MOZILLA=	-cairo
+USE_MOZILLA=	# empty
 
 USES=		tar:xz
 
@@ -47,7 +47,6 @@ MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
 
 OPTIONS_DEFINE=	LIGHTNING
 OPTIONS_DEFAULT=CANBERRA LIGHTNING
-OPTIONS_EXCLUDE=BUNDLED_CAIRO
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 .include <bsd.port.pre.mk>
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 45c39313a4f3..927201375ee5 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -34,7 +34,7 @@ USE_GECKO=	gecko
 CPE_PRODUCT=	${PORTNAME}_esr
 CONFLICTS_INSTALL=	firefox
 MOZ_PKGCONFIG_FILES=	# empty
-USE_MOZILLA=	-cairo
+USE_MOZILLA=	# empty
 
 USES=		tar:xz
 
@@ -44,8 +44,6 @@ FIREFOX_DESKTOP=	${MOZSRC}/taskcluster/docker/${MOZILLA}-snap/${MOZILLA}.desktop
 MOZ_OPTIONS=	--enable-application=browser \
 		--enable-official-branding
 
-OPTIONS_EXCLUDE=	BUNDLED_CAIRO
-
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
 post-patch:
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 687aa9546afe..96b489eb0555 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -32,7 +32,7 @@ BUILD_DEPENDS=	nspr>=4.19:devel/nspr \
 USE_GECKO=	gecko
 CONFLICTS_INSTALL=	firefox-esr
 MOZ_PKGCONFIG_FILES=	# empty
-USE_MOZILLA=	-cairo -hunspell
+USE_MOZILLA=	-hunspell
 
 USES=		tar:xz
 
@@ -42,7 +42,7 @@ FIREFOX_DESKTOP=	${MOZSRC}/taskcluster/docker/${MOZILLA}-snap/${MOZILLA}.desktop
 MOZ_OPTIONS=	--enable-application=browser \
 		--enable-official-branding
 
-OPTIONS_EXCLUDE=	BUNDLED_CAIRO DTRACE
+OPTIONS_EXCLUDE=	DTRACE
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
diff --git a/www/firefox/Makefile.options b/www/firefox/Makefile.options
index ae6fc9b7dff1..aebcfc58b17f 100644
--- a/www/firefox/Makefile.options
+++ b/www/firefox/Makefile.options
@@ -1,6 +1,6 @@
 # -*- makefile-bsdmake -*-
 
-OPTIONS_DEFINE+= 	BUNDLED_CAIRO CANBERRA DBUS DEBUG DTRACE FFMPEG GCONF \
+OPTIONS_DEFINE+= 	CANBERRA DBUS DEBUG DTRACE FFMPEG GCONF \
 			LIBPROXY OPTIMIZED_CFLAGS PROFILE TEST WAYLAND
 
 OPTIONS_DEFAULT+=	DBUS FFMPEG GCONF OPTIMIZED_CFLAGS PROFILE WAYLAND \
@@ -23,7 +23,6 @@ OPTIONS_EXCLUDE+=	DTRACE
 OPTIONS_DEFAULT_amd64+=	DTRACE
 OPTIONS_DEFAULT_i386+=	DTRACE
 
-BUNDLED_CAIRO_DESC?=	Use bundled fork of cairo-1.9.5
 CANBERRA_DESC?=		Sound theme alerts
 LIBPROXY_DESC?=		Proxy support via libproxy
 LIGHTNING_DESC?=	Calendar extension
diff --git a/www/palemoon/Makefile b/www/palemoon/Makefile
index 819399b55e53..f34feb2ac257 100644
--- a/www/palemoon/Makefile
+++ b/www/palemoon/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	palemoon
 DISTVERSION=	27.9.4
 DISTVERSIONSUFFIX=_Release
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www ipv6
 
 MAINTAINER=	lichray@gmail.com
@@ -39,7 +39,7 @@ MOZ_OPTIONS=	--enable-application=browser \
 		--enable-jemalloc \
 		--enable-jemalloc-lib
 
-OPTIONS_DEFAULT=	BUNDLED_CAIRO GTK2
+OPTIONS_DEFAULT=	GTK2
 OPTIONS_EXCLUDE=	DTRACE JACK TEST WAYLAND
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 35a0b1b18034..de87699e4b43 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	seamonkey
 DISTVERSION=	2.49.4
-PORTREVISION=	17
+PORTREVISION=	18
 MOZILLA_VER=	52 # above + 3
 CATEGORIES?=	www mail news editors irc ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \