1 files changed, 7 insertions, 4 deletions

diff --git a/www/firefox-devel/files/mozconfig.in b/www/firefox-devel/files/mozconfig.in
index 50703b5df336..ed139738e9d5 100644
--- a/www/firefox-devel/files/mozconfig.in
+++ b/www/firefox-devel/files/mozconfig.in
@@ -20,10 +20,6 @@ export XP_UNIX=1
 mk_add_options XP_UNIX=1
 export PERL=/usr/local/bin/perl
 mk_add_options PERL=$PERL
-export GTK_CONFIG=@X11BASE@/bin/gtk12-config
-mk_add_options GTK_CONFIG=$GTK_CONFIG
-export GLIB_CONFIG=@LOCALBASE@/bin/glib12-config
-mk_add_options GLIB_CONFIG=$GLIB_CONFIG
 # Configure options for installation
 ac_add_options --prefix=@PREFIX@
 ######################################################################
@@ -46,6 +42,8 @@ ac_add_options --disable-jsd
 ac_add_options --disable-ldap
 ac_add_options --disable-pedantic
 ac_add_options --disable-xinerama
+ac_add_options --enable-extensions=default,-inspector,-irc,-venkman,-content-packs,-help
+ac_add_options --enable-plaintext-editor-only
 ######################################################################
 # conditional from port Makefile
 if test -n "$WITH_DEBUG"; then
@@ -63,4 +61,9 @@ if test -z "$WITHOUT_XFT"; then
 else
     ac_add_options --disable-xft
 fi # test -z "$WITHOUT_XFT"
+if test -n "$WITH_GTK2"; then
+    ac_add_options --enable-default-toolkit=gtk2
+else
+    ac_add_options --enable-default-toolkit=gtk
+fi # test -n "$WITH_GTK2"
 ######################################################################