svn commit: r535268 - in head: Mk www/firefox

[Jan Beich]

Author: jbeich
Date: Fri May 15 04:59:00 2020
New Revision: 535268
URL: https://svnweb.freebsd.org/changeset/ports/535268

Log:
  gecko: drop GCONF option after upstream
  
  https://bugzilla.mozilla.org/show_bug.cgi?id=1433685

Modified:
  head/Mk/bsd.gecko.mk   (contents, props changed)
  head/www/firefox/Makefile.options   (contents, props changed)

Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk	Fri May 15 04:58:54 2020	(r535267)
+++ head/Mk/bsd.gecko.mk	Fri May 15 04:59:00 2020	(r535268)
@@ -225,14 +225,6 @@ MOZ_OPTIONS+=	--disable-dbus
 RUN_DEPENDS+=	ffmpeg>=0.8,1:multimedia/ffmpeg
 .endif
 
-.if ${PORT_OPTIONS:MGCONF}
-# XXX USE_GNOME+=gconf2:build is not supported
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libgconf-2.so:devel/gconf2
-MOZ_OPTIONS+=	--enable-gconf
-.else
-MOZ_OPTIONS+=	--disable-gconf
-.endif
-
 .if ${PORT_OPTIONS:MLIBPROXY}
 LIB_DEPENDS+=	libproxy.so:net/libproxy
 MOZ_OPTIONS+=	--enable-libproxy

Modified: head/www/firefox/Makefile.options
==============================================================================
--- head/www/firefox/Makefile.options	Fri May 15 04:58:54 2020	(r535267)
+++ head/www/firefox/Makefile.options	Fri May 15 04:59:00 2020	(r535268)
@@ -1,9 +1,9 @@
 # -*- makefile-bsdmake -*-
 
-OPTIONS_DEFINE+= 	CANBERRA DBUS DEBUG FFMPEG GCONF \
+OPTIONS_DEFINE+= 	CANBERRA DBUS DEBUG FFMPEG \
 			LIBPROXY OPTIMIZED_CFLAGS PROFILE TEST
 
-OPTIONS_DEFAULT+=	DBUS FFMPEG GCONF OPTIMIZED_CFLAGS PROFILE \
+OPTIONS_DEFAULT+=	DBUS FFMPEG OPTIMIZED_CFLAGS PROFILE \
 			${OPTIONS_GROUP_AUDIO}
 
 OPTIONS_GROUP+=		AUDIO