Fix the GTK+ support. This also enables use of GTK+ 2.0.X.

According to the submitter, "if you have both glib12/gtk12 and
glib20/gtk20 installed, aumix is linked against both [...]"

With just gtk-1.2.x present, the configure script was failing.

I successfully tested this under the following circumstances:
- gtk-1.2.10_8
- WITHOUT_ALL set, gtk-1.2.10_8
- gtk-1.2.10_8 and gtk-2.0.7
- WITHOUT_ALL set, gtk-1.2.10_8 and gtk-2.0.7
- WITH_GTK2 set, gtk-1.2.10_8 and gtk-2.0.7

Submitted by:		Herbert J. Skuhra
Also reported by:	Morten Rodal and Steve O'Hara-Smith

1 files changed, 17 insertions, 2 deletions

diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index d957fd4b3ef1..b2f7545b4047 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -31,11 +31,26 @@ MAN1=		aumix.1 xaumix.1
 
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mgtk12}!=""
+pre-extract:
+.if !defined(WITH_GTK2) && !defined(WITHOUT_ALL)
+	@${ECHO_CMD}
+	@${ECHO_CMD} "****** To enable use of GTK+ 2.0, interrupt the   ******"
+	@${ECHO_CMD} "****** build now, set WITH_GTK2, and start again. ******"
+	@${ECHO_CMD}
+	@sleep 3
+.endif
+
+.if (${HAVE_GNOME:Mgtk12}!="") && !defined(WITHOUT_ALL) && \
+	!defined(WITHOUT_GTK)&& !defined(WITH_GTK2)
 USE_GNOME=	gtk12
 PKGNAMESUFFIX=	-gtk
-.else
 CONFIGURE_ARGS+=--without-gtk
+.elif defined(WITH_GTK2)
+PKGNAMESUFFIX=	-gtk
+LIB_DEPENDS+=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+CONFIGURE_ARGS+=--without-gtk1
+.else
+CONFIGURE_ARGS+=--without-gtk --without-gtk1
 .endif
 
 .include <bsd.port.post.mk>