svn commit: r485463 - in head: Mk mail/thunderbird www/firefox www/firefox-esr www/palemoon www/seamonkey
Jan Beich
jbeich at FreeBSD.org
Tue Nov 20 18:58:15 UTC 2018
Author: jbeich
Date: Tue Nov 20 18:58:12 2018
New Revision: 485463
URL: https://svnweb.freebsd.org/changeset/ports/485463
Log:
gecko: drop BUNDLED_CAIRO option
Modified:
head/Mk/bsd.gecko.mk (contents, props changed)
head/mail/thunderbird/Makefile (contents, props changed)
head/www/firefox-esr/Makefile (contents, props changed)
head/www/firefox/Makefile (contents, props changed)
head/www/firefox/Makefile.options (contents, props changed)
head/www/palemoon/Makefile (contents, props changed)
head/www/seamonkey/Makefile (contents, props changed)
Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk Tue Nov 20 18:57:46 2018 (r485462)
+++ head/Mk/bsd.gecko.mk Tue Nov 20 18:58:12 2018 (r485463)
@@ -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
Modified: head/mail/thunderbird/Makefile
==============================================================================
--- head/mail/thunderbird/Makefile Tue Nov 20 18:57:46 2018 (r485462)
+++ head/mail/thunderbird/Makefile Tue Nov 20 18:58:12 2018 (r485463)
@@ -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>
Modified: head/www/firefox-esr/Makefile
==============================================================================
--- head/www/firefox-esr/Makefile Tue Nov 20 18:57:46 2018 (r485462)
+++ head/www/firefox-esr/Makefile Tue Nov 20 18:58:12 2018 (r485463)
@@ -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
@@ -43,8 +43,6 @@ FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chr
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"
Modified: head/www/firefox/Makefile
==============================================================================
--- head/www/firefox/Makefile Tue Nov 20 18:57:46 2018 (r485462)
+++ head/www/firefox/Makefile Tue Nov 20 18:58:12 2018 (r485463)
@@ -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/${MOZILL
MOZ_OPTIONS= --enable-application=browser \
--enable-official-branding
-OPTIONS_EXCLUDE= BUNDLED_CAIRO DTRACE
+OPTIONS_EXCLUDE= DTRACE
.include "${.CURDIR}/../../www/firefox/Makefile.options"
Modified: head/www/firefox/Makefile.options
==============================================================================
--- head/www/firefox/Makefile.options Tue Nov 20 18:57:46 2018 (r485462)
+++ head/www/firefox/Makefile.options Tue Nov 20 18:58:12 2018 (r485463)
@@ -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
Modified: head/www/palemoon/Makefile
==============================================================================
--- head/www/palemoon/Makefile Tue Nov 20 18:57:46 2018 (r485462)
+++ head/www/palemoon/Makefile Tue Nov 20 18:58:12 2018 (r485463)
@@ -4,7 +4,7 @@
PORTNAME= palemoon
DISTVERSION= 27.9.4
DISTVERSIONSUFFIX=_Release
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www ipv6
MAINTAINER= lichray at 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"
Modified: head/www/seamonkey/Makefile
==============================================================================
--- head/www/seamonkey/Makefile Tue Nov 20 18:57:46 2018 (r485462)
+++ head/www/seamonkey/Makefile Tue Nov 20 18:58:12 2018 (r485463)
@@ -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 \
More information about the svn-ports-head
mailing list