aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2016-09-12 00:00:51 +0000
committerJan Beich <jbeich@FreeBSD.org>2016-09-12 00:00:51 +0000
commite342f3467aa17a20ea3a27356fc7a441dd0fea67 (patch)
tree83e7ad33295646df8e9f263f62fb3868d171ce40
parent8eeb9bea60b9a2a308c37db5fc85ea85ac10377b (diff)
downloadports-e342f3467aa17a20ea3a27356fc7a441dd0fea67.tar.gz
ports-e342f3467aa17a20ea3a27356fc7a441dd0fea67.zip
Notes
-rw-r--r--Mk/bsd.gecko.mk6
-rw-r--r--www/firefox/Makefile.options4
2 files changed, 2 insertions, 8 deletions
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index 28e0537938bd..a3a1fba05f61 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -348,12 +348,6 @@ MOZ_OPTIONS+= --enable-gconf
MOZ_OPTIONS+= --disable-gconf
.endif
-.if ${PORT_OPTIONS:MGIO} && ! ${MOZ_TOOLKIT:Mcairo-qt}
-MOZ_OPTIONS+= --enable-gio
-.else
-MOZ_OPTIONS+= --disable-gio
-.endif
-
.if ${PORT_OPTIONS:MGNOMEUI}
BUILD_DEPENDS+= ${libgnomeui_DETECT}:${libgnomeui_LIB_DEPENDS:C/.*://}
USE_GNOME+= libgnomeui:build
diff --git a/www/firefox/Makefile.options b/www/firefox/Makefile.options
index 5470ad32f4c2..901b0be0dfe4 100644
--- a/www/firefox/Makefile.options
+++ b/www/firefox/Makefile.options
@@ -1,10 +1,10 @@
# -*- makefile-bsdmake -*-
-OPTIONS_DEFINE+= BUNDLED_CAIRO CANBERRA DBUS DEBUG DTRACE FFMPEG GCONF GIO \
+OPTIONS_DEFINE+= BUNDLED_CAIRO CANBERRA DBUS DEBUG DTRACE FFMPEG GCONF \
GNOMEUI GSTREAMER INTEGER_SAMPLES LIBPROXY LOGGING \
OPTIMIZED_CFLAGS PGO PROFILE TEST
-OPTIONS_DEFAULT+= DBUS DTRACE FFMPEG GIO GSTREAMER LOGGING OPTIMIZED_CFLAGS \
+OPTIONS_DEFAULT+= DBUS DTRACE FFMPEG GSTREAMER LOGGING OPTIMIZED_CFLAGS \
${OPTIONS_MULTI_AUDIO} \
${MACHINE_CPU:tu:MSOFTFP:S/SOFTFP/INTEGER_SAMPLES/}