GTK2 mozilla is now the default, and GTK1 support will be built only if explicitly

requested.

This means that mozilla-gtk2 and mozilla-devel-gtk2 are now mozilla and
mozilla-devel, respectively; and the old mozilla and mozilla-devel are now
mozilla-gtk1 and mozilla-devel-gtk1.

This is done for a whole plethora of reasons, and should please everybody
except galeon1 fanatics and uhm... anybody else who it doesn't please.

If you have WITH_MOZILLA set in your /etc/make.conf, you'll need to update
the value accordingly. GTK2 ports will automatically install GTK2 mozilla,
and GTK1 ports will automatically install GTK1 ports, so WITH_MOZILLA need
be defined only if you want the development version... which are dormant
right now anyway.

For now, all ports that honoured WITH_MOZILLA=mozilla-{,-devel}-gtk2 will
still honour those values as well as WITH_MOZILLA=mozilla{,-devel}, but
future ports reserve the right to ignore the *-gtk2 values.

3 files changed, 12 insertions, 9 deletions

diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index b7d2deda463d..63b38a9403a2 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -32,11 +32,11 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 MOZILLA?=	mozilla
 
-.if defined(WITH_GTK2)
-PKGNAMESUFFIX=	-gtk2
-USE_GNOME=	gtk20 libidl
-.else
+.if defined(WITH_GTK1)
+PKGNAMESUFFIX=	-gtk1
 USE_GNOME=	gtk12 orbit
+.else
+USE_GNOME=	gtk20 libidl
 .endif
 
 .if !defined(WITHOUT_XFT)
@@ -136,10 +136,10 @@ CONFIGURE_ARGS+=	--enable-calendar
 CONFIGURE_ARGS+=	--disable-composer
 .endif
 
-.if defined(WITH_GTK2)
-CONFIGURE_ARGS+=	--enable-default-toolkit=gtk2
-.else
+.if defined(WITH_GTK1)
 CONFIGURE_ARGS+=	--enable-default-toolkit=gtk
+.else
+CONFIGURE_ARGS+=	--enable-default-toolkit=gtk2
 .endif
 
 .if !defined(WITHOUT_XFT)
diff --git a/www/mozilla/pkg-descr b/www/mozilla/pkg-descr
index 37a7a64039b1..d91ac6c1d832 100644
--- a/www/mozilla/pkg-descr
+++ b/www/mozilla/pkg-descr
@@ -7,4 +7,7 @@ This is the latest release of the Mozilla browser.  It contains all the
 bugfixes and security enhancements from the mozilla port as well as
 new new features.
 
+This version has been built with GTK+-2 bindings for use with applications
+such as Galeon 2.
+
 WWW: http://www.mozilla.org/
diff --git a/www/mozilla/pkg-descr.gtk2 b/www/mozilla/pkg-descr.gtk1
index d91ac6c1d832..25311e1399fc 100644
--- a/www/mozilla/pkg-descr.gtk2
+++ b/www/mozilla/pkg-descr.gtk1
@@ -7,7 +7,7 @@ This is the latest release of the Mozilla browser.  It contains all the
 bugfixes and security enhancements from the mozilla port as well as
 new new features.
 
-This version has been built with GTK+-2 bindings for use with applications
-such as Galeon 2.
+This version has been built with GTK+-1 bindings for use with older
+applications such as Galeon 1.
 
 WWW: http://www.mozilla.org/