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.

1 files changed, 7 insertions, 7 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)