--- x11-toolkits/buffy/Makefile	Mon Sep  2 11:20:38 2002
+++ x11-toolkits/buffy/Makefile	Mon Sep  2 11:20:50 2002
@@ -17,7 +17,8 @@ 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 
 .include <bsd.port.mk>
--- x11-toolkits/clean-theme-gtk/Makefile	Mon Sep  2 11:21:19 2002
+++ x11-toolkits/clean-theme-gtk/Makefile	Mon Sep  2 11:23:16 2002
@@ -18,7 +18,8 @@ 
 
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
--- x11-toolkits/colorstep/Makefile	Mon Sep  2 11:23:37 2002
+++ x11-toolkits/colorstep/Makefile	Mon Sep  2 11:23:44 2002
@@ -17,7 +17,8 @@ 
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.6
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 
 .include <bsd.port.mk>
--- x11-toolkits/easygtk/Makefile	Mon Sep  2 11:24:05 2002
+++ x11-toolkits/easygtk/Makefile	Mon Sep  2 11:24:17 2002
@@ -22,7 +22,8 @@ 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_X_PREFIX=	yes
-USE_GNOMELIBS=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomelibs
 INSTALLS_SHLIB=	yes
 MAKE_ENV=	MKDIR="${MKDIR}" \
 		LN="${LN}"
--- x11-toolkits/eazel-themes/Makefile	Mon Sep  2 11:24:48 2002
+++ x11-toolkits/eazel-themes/Makefile	Mon Sep  2 11:25:40 2002
@@ -19,7 +19,8 @@ 
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/gtk+/eazel-engine
 
-USE_GNOMECTRL=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	libcapplet
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
@@ -28,7 +29,7 @@ 
 		--datadir=${X11BASE}/share
 
 post-extract:
-	@find ${WRKSRC}/../.. -type f | grep -v eazel-engine | xargs ${CHMOD} 644
+	@find ${WRKSRC}/../.. -type f | ${GREP} -v eazel-engine | xargs ${CHMOD} 644
 	@find ${WRKSRC}/../.. -type d | xargs ${CHMOD} 755
 
 post-install:
--- x11-toolkits/engradient/Makefile	Mon Sep  2 11:26:03 2002
+++ x11-toolkits/engradient/Makefile	Mon Sep  2 11:26:08 2002
@@ -17,7 +17,8 @@ 
 WRKSRC=		${WRKDIR}/gtk-${PORTNAME}-0.5
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
--- x11-toolkits/gevas/Makefile	Mon Sep  2 11:26:17 2002
+++ x11-toolkits/gevas/Makefile	Mon Sep  2 11:26:20 2002
@@ -15,7 +15,8 @@ 
 
 LIB_DEPENDS=	evas.6:${PORTSDIR}/graphics/evas
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 
--- x11-toolkits/gnome-look/Makefile	Mon Sep  2 11:26:35 2002
+++ x11-toolkits/gnome-look/Makefile	Mon Sep  2 11:26:38 2002
@@ -14,7 +14,8 @@ 
 MAINTAINER=	sobomax@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
--- x11-toolkits/gtk-Mac2-theme/Makefile	Mon Sep  2 11:26:47 2002
+++ x11-toolkits/gtk-Mac2-theme/Makefile	Mon Sep  2 11:26:50 2002
@@ -17,7 +17,8 @@ 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
--- x11-toolkits/gtk-engines/Makefile	Mon Sep  2 11:27:00 2002
+++ x11-toolkits/gtk-engines/Makefile	Mon Sep  2 11:27:08 2002
@@ -15,7 +15,8 @@ 
 MAINTAINER=	gnome@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 USE_LIBTOOL=	yes
 
 THEMES=		metal notif pixmap raleigh redmond95
--- x11-toolkits/gtk-flat-theme/Makefile	Mon Sep  2 11:27:19 2002
+++ x11-toolkits/gtk-flat-theme/Makefile	Mon Sep  2 11:27:24 2002
@@ -17,7 +17,8 @@ 
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.1
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
--- x11-toolkits/gtk-qn-x11-theme/Makefile	Mon Sep  2 11:27:35 2002
+++ x11-toolkits/gtk-qn-x11-theme/Makefile	Mon Sep  2 11:27:39 2002
@@ -17,7 +17,8 @@ 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
--- x11-toolkits/gtk-zenith-theme/Makefile	Mon Sep  2 11:27:44 2002
+++ x11-toolkits/gtk-zenith-theme/Makefile	Mon Sep  2 11:27:48 2002
@@ -17,7 +17,8 @@ 
 WRKSRC=		${WRKDIR}/zenith-1.0
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
--- x11-toolkits/gtkada/Makefile	Mon Sep  2 11:27:55 2002
+++ x11-toolkits/gtkada/Makefile	Mon Sep  2 11:28:35 2002
@@ -17,13 +17,13 @@ 
 MAINTAINER=	sam@inf.enst.fr
 
 BUILD_DEPENDS=	adagcc:${PORTSDIR}/lang/gnat
-LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade
 
 SHLIB_VERSION=	${PORTVERSION:S/1.2.//}
 
 USE_MESA=	yes
 USE_X_PREFIX=	yes
-USE_GNOMECTRL=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	libcapplet libglade
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
--- x11-toolkits/gtkbe/Makefile	Mon Sep  2 11:28:45 2002
+++ x11-toolkits/gtkbe/Makefile	Mon Sep  2 11:28:49 2002
@@ -17,7 +17,8 @@ 
 WRKSRC=		${WRKDIR}/GTKBeEngine
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
--- x11-toolkits/gtkextra/Makefile	Mon Sep  2 11:29:35 2002
+++ x11-toolkits/gtkextra/Makefile	Mon Sep  2 11:29:41 2002
@@ -17,8 +17,9 @@ 
 MAINTAINER=	gnome@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
 USE_LIBTOOL=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
--- x11-toolkits/gtkextra--/Makefile	Mon Sep  2 11:29:07 2002
+++ x11-toolkits/gtkextra--/Makefile	Mon Sep  2 11:29:12 2002
@@ -19,7 +19,8 @@ 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GTK=	yes
-USE_LIBTOOL=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	PERL="${PERL}"
 
--- x11-toolkits/gtkglarea--/Makefile	Mon Sep  2 11:29:52 2002
+++ x11-toolkits/gtkglarea--/Makefile	Mon Sep  2 11:29:56 2002
@@ -16,7 +16,8 @@ 
 LIB_DEPENDS=	gtkmm:${PORTSDIR}/x11-toolkits/gtk-- \
 		gtkgl:${PORTSDIR}/x11-toolkits/gtkglarea
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_MESA=	yes
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
--- x11-toolkits/gtkscintilla/Makefile	Mon Sep  2 11:30:03 2002
+++ x11-toolkits/gtkscintilla/Makefile	Mon Sep  2 11:30:10 2002
@@ -18,7 +18,8 @@ 
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 INSTALLS_SHLIB=	yes
 
 do-install:
--- x11-toolkits/gtkstep/Makefile	Mon Sep  2 11:30:42 2002
+++ x11-toolkits/gtkstep/Makefile	Mon Sep  2 11:30:49 2002
@@ -14,7 +14,8 @@ 
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 
 .include <bsd.port.mk>
--- x11-toolkits/gtkstep-pastel/Makefile	Mon Sep  2 11:30:25 2002
+++ x11-toolkits/gtkstep-pastel/Makefile	Mon Sep  2 11:30:28 2002
@@ -17,7 +17,8 @@ 
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.10.1
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 
 .include <bsd.port.mk>
--- x11-toolkits/icegradient/Makefile	Mon Sep  2 11:31:24 2002
+++ x11-toolkits/icegradient/Makefile	Mon Sep  2 11:31:28 2002
@@ -18,7 +18,8 @@ 
 WRKSRC=		${WRKDIR}/gtk-${PORTNAME}-0.0.5
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
--- x11-toolkits/libgtkeditor/Makefile	Mon Sep  2 11:31:49 2002
+++ x11-toolkits/libgtkeditor/Makefile	Mon Sep  2 11:31:53 2002
@@ -18,7 +18,8 @@ 
 LIB_DEPENDS=	unicode.0:${PORTSDIR}/devel/libunicode
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
--- x11-toolkits/notif2/Makefile	Mon Sep  2 11:31:58 2002
+++ x11-toolkits/notif2/Makefile	Mon Sep  2 11:32:02 2002
@@ -17,7 +17,8 @@ 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
--- x11-toolkits/gtoolkit/Makefile	Mon Sep  2 11:30:58 2002
+++ x11-toolkits/gtoolkit/Makefile	Mon Sep  2 11:31:06 2002
@@ -17,7 +17,8 @@ 
 
 PREFIX=		${LOCALBASE}/GNUstep
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 NO_MTREE=	yes
 
--- x11-toolkits/p5-GdkImlib/Makefile	Mon Sep  2 11:32:26 2002
+++ x11-toolkits/p5-GdkImlib/Makefile	Mon Sep  2 11:32:36 2002
@@ -18,8 +18,9 @@ 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_IMLIB=	yes
 PERL_CONFIGURE=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
 
 MAN3PREFIX=	${LOCALBASE}/lib/perl5/${PERL_VERSION}
--- x11-toolkits/p5-Gnome/Makefile	Mon Sep  2 11:32:45 2002
+++ x11-toolkits/p5-Gnome/Makefile	Mon Sep  2 11:32:55 2002
@@ -19,7 +19,8 @@ 
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_GNOMELIBS=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomelibs
 PERL_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
 
--- x11-toolkits/p5-Gtk/Makefile	Mon Sep  2 11:33:00 2002
+++ x11-toolkits/p5-Gtk/Makefile	Mon Sep  2 11:33:17 2002
@@ -17,7 +17,8 @@ 
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Writer.pm:${PORTSDIR}/textproc/p5-XML-Writer
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 PERL_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-guessing --lazy-load
 
--- x11-toolkits/p5-GtkGLArea/Makefile	Mon Sep  2 11:33:24 2002
+++ x11-toolkits/p5-GtkGLArea/Makefile	Mon Sep  2 11:33:27 2002
@@ -21,7 +21,8 @@ 
 BROKEN=		"It need p5-OpenGL, I will commit p5-OpenGl soon!"
 
 USE_MESA=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 PERL_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
 
--- x11-toolkits/p5-GtkXmHTML/Makefile	Mon Sep  2 11:33:35 2002
+++ x11-toolkits/p5-GtkXmHTML/Makefile	Mon Sep  2 11:33:41 2002
@@ -18,7 +18,8 @@ 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gnome.pm:${PORTSDIR}/x11-toolkits/p5-Gnome
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_GNOMELIBS=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomelibs
 PERL_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
 
--- x11-toolkits/pike-gtk/Makefile	Mon Sep  2 11:33:57 2002
+++ x11-toolkits/pike-gtk/Makefile	Mon Sep  2 11:34:00 2002
@@ -16,7 +16,8 @@ 
 BUILD_DEPENDS=	pike:${PORTSDIR}/lang/pike
 
 USE_XLIB=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
--- x11-toolkits/py-gtkscintilla/Makefile	Mon Sep  2 11:34:10 2002
+++ x11-toolkits/py-gtkscintilla/Makefile	Mon Sep  2 11:34:14 2002
@@ -17,7 +17,8 @@ 
 LIB_DEPENDS=	gtkscintilla.0:${PORTSDIR}/x11-toolkits/gtkscintilla
 
 USE_PYTHON=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 MAKE_ENV=	PYTHON_INCLUDE="${PYTHON_INCLUDEDIR}"
 
 INST_DIR=	${PREFIX}/lib/${PYTHON_VERSION}/site-packages
--- x11-toolkits/py-wxPython/Makefile	Mon Sep  2 11:34:23 2002
+++ x11-toolkits/py-wxPython/Makefile	Mon Sep  2 11:34:30 2002
@@ -22,7 +22,8 @@ 
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 MAKE_ENV=	WX_CONFIG="${WX_CONFIG}"
 DEMO_DIR=	${PYTHONPREFIX_SITELIBDIR}/wxPython/demo
 
--- x11-toolkits/ruby-gtk/Makefile	Mon Sep  2 11:34:36 2002
+++ x11-toolkits/ruby-gtk/Makefile	Mon Sep  2 11:34:44 2002
@@ -19,7 +19,8 @@ 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 USE_XLIB=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 .include "${.CURDIR}/../../x11/ruby-gnome/Makefile.common"
 
--- x11-toolkits/scintilla/Makefile	Mon Sep  2 11:34:48 2002
+++ x11-toolkits/scintilla/Makefile	Mon Sep  2 11:34:52 2002
@@ -20,7 +20,8 @@ 
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 INSTALLS_SHLIB=	yes
 MAKEFILE=	makefile
 
--- x11-toolkits/thinice/Makefile	Mon Sep  2 11:34:57 2002
+++ x11-toolkits/thinice/Makefile	Mon Sep  2 11:35:00 2002
@@ -19,7 +19,8 @@ 
 WRKSRC=		${WRKDIR}/gtk-${PORTNAME}-theme-${PORTVERSION}
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 
 .include <bsd.port.mk>
--- x11-toolkits/vdk/Makefile	Mon Sep  2 11:35:07 2002
+++ x11-toolkits/vdk/Makefile	Mon Sep  2 11:41:54 2002
@@ -14,7 +14,7 @@ 
 MAINTAINER=	nakai@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
 WANT_GNOME=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
@@ -25,8 +25,9 @@ 
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GNOME)
-USE_GNOME=	yes
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOME=	gtk12
+PKGNAMESUFFIX=	-gtk
 CONFIGURE_ARGS+=	--enable-gnome
 .endif
 
--- x11-toolkits/vdkbuilder/Makefile	Mon Sep  2 11:42:06 2002
+++ x11-toolkits/vdkbuilder/Makefile	Mon Sep  2 11:42:38 2002
@@ -16,7 +16,7 @@ 
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
 WANT_GNOME=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
@@ -25,9 +25,10 @@ 
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GNOME)
-USE_GNOME=	yes
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOME+=	gtk12
 CONFIGURE_ARGS+=--enable-gnome
+PKGNAMESUFFIX=	-gtk
 .else
 CONFIGURE_ARGS+=--enable-gnome=no
 .endif
--- x11-toolkits/whistlerk/Makefile	Mon Sep  2 11:42:48 2002
+++ x11-toolkits/whistlerk/Makefile	Mon Sep  2 11:42:53 2002
@@ -17,7 +17,8 @@ 
 WRKSRC=		${WRKDIR}/gtk-theme-WhistlerK
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
--- x11-toolkits/wxgtk/Makefile	Mon Sep  2 11:43:20 2002
+++ x11-toolkits/wxgtk/Makefile	Mon Sep  2 11:43:24 2002
@@ -21,7 +21,8 @@ 
 USE_X_PREFIX=	yes
 USE_MESA=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-libpng=sys \
--- x11-toolkits/wxgtk-devel/Makefile	Mon Sep  2 11:43:01 2002
+++ x11-toolkits/wxgtk-devel/Makefile	Mon Sep  2 11:43:08 2002
@@ -25,8 +25,9 @@ 
 USE_X_PREFIX=	yes
 USE_MESA=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
 GNU_CONFIGURE=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-libpng=sys \
 		--with-libjpeg=sys \
--- x11-toolkits/xenophilia/Makefile	Mon Sep  2 11:43:30 2002
+++ x11-toolkits/xenophilia/Makefile	Mon Sep  2 11:43:33 2002
@@ -17,7 +17,8 @@ 
 WRKSRC=		${WRKDIR}/Xenophilia-0.7
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 ALL_TARGET=	# empty
 MAKE_ENV=	GTK-CONFIG="${GTK_CONFIG}"
 
--- x11-toolkits/xenostep/Makefile	Mon Sep  2 11:43:40 2002
+++ x11-toolkits/xenostep/Makefile	Mon Sep  2 11:43:45 2002
@@ -18,7 +18,8 @@ 
 WRKSRC=		${WRKDIR}/XenoStep
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 ALL_TARGET=	# empty
 MAKE_ENV=	MKDIR="${MKDIR}"
 
--- x11-toolkits/gtkdatabox/Makefile	Mon Sep  2 11:28:55 2002
+++ x11-toolkits/gtkdatabox/Makefile	Mon Sep  2 11:28:58 2002
@@ -14,7 +14,8 @@ 
 MAINTAINER=	ports@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>