svn commit: r541007 - in branches/2020Q2: Mk www/firefox

[Jan Beich]

Author: jbeich
Date: Thu Jul  2 02:55:57 2020
New Revision: 541007
URL: https://svnweb.freebsd.org/changeset/ports/541007

Log:
  MFH: r535268
  
  gecko: drop GCONF option after upstream
  
  https://bugzilla.mozilla.org/show_bug.cgi?id=1433685
  
  Approved by:	ports-secteam blanket

Modified:
  branches/2020Q2/Mk/bsd.gecko.mk
  branches/2020Q2/www/firefox/Makefile.options
Directory Properties:
  branches/2020Q2/   (props changed)

Modified: branches/2020Q2/Mk/bsd.gecko.mk
==============================================================================
--- branches/2020Q2/Mk/bsd.gecko.mk	Thu Jul  2 02:23:22 2020	(r541006)
+++ branches/2020Q2/Mk/bsd.gecko.mk	Thu Jul  2 02:55:57 2020	(r541007)
@@ -226,14 +226,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: branches/2020Q2/www/firefox/Makefile.options
==============================================================================
--- branches/2020Q2/www/firefox/Makefile.options	Thu Jul  2 02:23:22 2020	(r541006)
+++ branches/2020Q2/www/firefox/Makefile.options	Thu Jul  2 02:55:57 2020	(r541007)
@@ -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