--- www/amyc/Makefile.old	Sat Aug 31 20:25:01 2002
+++ www/amyc/Makefile	Sat Aug 31 20:31:17 2002
@@ -21,13 +21,15 @@
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
 
-WANT_GTK=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GTK)
+.if ${HAVE_GNOME:Mgtk12}!=""
 PLIST_SUB=	WITH_GTK=""
-USE_GTK=	yes
+USE_GNOME+=	gtk12
+PKGNAMESUFFIX=	-gtk
 .else
 PLIST_SUB=	WITH_GTK="@comment "
 .endif
--- www/aria/Makefile.old	Sat Aug 31 20:26:00 2002
+++ www/aria/Makefile	Sat Aug 31 20:26:10 2002
@@ -16,7 +16,8 @@
 MAINTAINER=	nakai@FreeBSD.org
 
 USE_BZIP2=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
--- www/asp2php/Makefile.old	Sat Aug 31 20:26:18 2002
+++ www/asp2php/Makefile	Sat Aug 31 20:27:02 2002
@@ -14,14 +14,16 @@
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/a//}/src
 
-WANT_GTK=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
 MAKE_ENV=	FLAGS="${CFLAGS}"
 USE_REINPLACE=	yes
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GTK)
-USE_GTK=	yes
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOME+=	gtk12
+PKGNAMESUFFIX=	-gtk
 ALL_TARGET=	default gui
 PLIST_SUB+=	WANT_GTK=""
 .else
--- www/bluefish/Makefile.old	Sat Aug 31 20:27:55 2002
+++ www/bluefish/Makefile	Sat Aug 31 20:28:03 2002
@@ -21,7 +21,8 @@
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-install-location="${X11BASE}/lib/bluefish"
 
--- www/cheetah/Makefile.old	Sat Aug 31 20:30:08 2002
+++ www/cheetah/Makefile	Sat Aug 31 20:30:19 2002
@@ -19,7 +19,8 @@
 
 GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
--- www/comclear/Makefile.old	Sat Aug 31 20:30:30 2002
+++ www/comclear/Makefile	Sat Aug 31 20:31:02 2002
@@ -13,14 +13,16 @@
 
 MAINTAINER=	roam@FreeBSD.org
 
-WANT_GTK=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
 USE_GMAKE=	yes
 USE_AUTOMAKE=	yes
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GTK)
-USE_GTK=	yes
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOME+=	gtk12
+PKGNAMESUFFIX=	-gtk
 .endif
 
 # Do not install docs by default, see the ifdef'd post-install below.
--- www/dillo/Makefile.old	Sat Aug 31 20:31:25 2002
+++ www/dillo/Makefile	Sat Aug 31 20:31:34 2002
@@ -17,7 +17,8 @@
 		png.5:${PORTSDIR}/graphics/png \
 		intl.4:${PORTSDIR}/devel/gettext
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--includedir="${LOCALBASE}/include" \
 			--libdir="${LOCALBASE}/lib" \
--- www/erwn/Makefile.old	Sat Aug 31 20:31:49 2002
+++ www/erwn/Makefile	Sat Aug 31 20:31:59 2002
@@ -15,7 +15,8 @@
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 post-install:
 .if !defined(NOPORTDOCS)
--- www/nscache/Makefile.old	Sat Aug 31 20:38:55 2002
+++ www/nscache/Makefile	Sat Aug 31 20:42:15 2002
@@ -16,18 +16,19 @@
 MAINTAINER=	kris@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
 WANT_GNOME=	yes
 USE_AUTOMAKE=	yes
 AUTOMAKE_ARGS=	--include-deps
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-gtk-config=${GTK_CONFIG}
-  
+
 .include <bsd.port.pre.mk>
-  
+
 .if defined(HAVE_GNOME)
-USE_GNOME=	yes
+USE_GNOME+=	gtk12
+PKGNAMESUFFIX=	gtk
 .else
 CONFIGURE_ARGS+=	--disable-gnome
 .endif
--- www/skipstone/Makefile.old	Sat Aug 31 20:45:14 2002
+++ www/skipstone/Makefile	Sat Aug 31 20:45:23 2002
@@ -20,7 +20,8 @@
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-mozilla-includes=${X11BASE}/include/mozilla --with-mozilla-libs=${X11BASE}/lib/mozilla-embedded
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
--- www/ump/Makefile.old	Sat Aug 31 20:45:37 2002
+++ www/ump/Makefile	Sat Aug 31 20:55:16 2002
@@ -33,7 +33,8 @@
 CONFIGURE_ARGS=	--enable-ump
 USE_GMAKE=	yes
 USE_XLIB=	yes
-WANT_ESOUND=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
 # CONFIGURE_ARGS+=	--enable-motif
 EXTRA_PATCHES=	${.CURDIR}/../../audio/timidity++/files/*
 PKGDIR=		${.CURDIR}
@@ -45,8 +46,9 @@
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_ESOUND)
-USE_ESOUND=	yes
+.if ${HAVE_GNOME:Mesound}!=""
+USE_GNOME=	esound
+PKGNAMESUFFIX=	-esound
 CONFIGURE_ARGS+=	--enable-audio=oss,esd
 .else
 CONFIGURE_ARGS+=	--enable-audio=oss
--- www/viewml/Makefile.old	Sat Aug 31 20:55:38 2002
+++ www/viewml/Makefile	Sat Aug 31 20:55:48 2002
@@ -21,7 +21,8 @@
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 USE_BISON=	yes
 CFLAGS+=	-fpermissive -include /usr/include/sys/types.h \
 		-DPREFIX=\\\"${PREFIX}\\\"
--- www/w3m/Makefile.old	Sat Aug 31 20:55:59 2002
+++ www/w3m/Makefile	Sat Aug 31 20:56:17 2002
@@ -82,7 +82,8 @@
 .endif
 
 .if defined(INLINE_IMAGE)
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 
 DOCS+=		README.img
 DOCS_JP+=	README.img