--- x11/erun/Makefile.old	Sat Aug 31 21:04:21 2002
+++ x11/erun/Makefile	Sat Aug 31 21:05:12 2002
@@ -9,7 +9,7 @@
 PORTVERSION=	1.2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR = kbyanc
+MASTER_SITE_SUBDIR= kbyanc
 
 MAINTAINER=	kbyanc@posi.net
 
@@ -18,6 +18,7 @@
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 
 .include <bsd.port.mk>
--- x11/gdkxft/Makefile.old	Sat Aug 31 21:05:26 2002
+++ x11/gdkxft/Makefile	Sat Aug 31 21:18:06 2002
@@ -17,9 +17,9 @@
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
-USE_REINPLACE=	yes
+USE_GNOMENG=	yes
 WANT_GNOME=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lgnuregex -liconv"
@@ -34,8 +34,9 @@
 IGNORE=		"requires XFree86-4.x or later to run"
 .endif
 
-.if defined(HAVE_GNOME)
-USE_GNOME=	yes
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOME+=	gtk12
+PKGNAMESUFFIX=	-gtk
 .else
 CONFIGURE_ARGS+=	--without-gnome
 .endif
--- x11/gmessage/Makefile.old	Sat Aug 31 21:18:52 2002
+++ x11/gmessage/Makefile	Sat Aug 31 21:19:03 2002
@@ -13,6 +13,7 @@
 MAINTAINER=	domi@saargate.de
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 .include <bsd.port.mk>
--- x11/gtk-theme-switch/Makefile.old	Sat Aug 31 21:19:16 2002
+++ x11/gtk-theme-switch/Makefile	Sat Aug 31 21:19:26 2002
@@ -14,7 +14,8 @@
 MAINTAINER=	sobomax@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 
 MAN1=		gtk-theme-switch.1
--- x11/gxset/Makefile.old	Sat Aug 31 21:19:38 2002
+++ x11/gxset/Makefile	Sat Aug 31 21:19:46 2002
@@ -17,7 +17,8 @@
 LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_XPM=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
--- x11/gyroscope/Makefile.old	Sat Aug 31 21:20:00 2002
+++ x11/gyroscope/Makefile	Sat Aug 31 21:20:08 2002
@@ -15,7 +15,8 @@
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 ALL_TARGET=	# empty
 
--- x11/mgapdesk/Makefile.old	Sat Aug 31 21:20:21 2002
+++ x11/mgapdesk/Makefile	Sat Aug 31 21:20:32 2002
@@ -17,7 +17,8 @@
 BUILD_DEPENDS=	XFree86:${PORTSDIR}/x11/XFree86-4
 
 USE_X_PREFIX=	YES
-USE_GTK=	YES
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 USE_GMAKE=	YES
 
--- x11/mlterm/Makefile.old	Sat Aug 31 21:20:47 2002
+++ x11/mlterm/Makefile	Sat Aug 31 21:20:58 2002
@@ -14,8 +14,8 @@
 MAINTAINER=	nobutaka@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--enable-imlib --enable-utmp
--- x11/portoseguro/Makefile.old	Sat Aug 31 21:21:25 2002
+++ x11/portoseguro/Makefile	Sat Aug 31 21:21:33 2002
@@ -17,7 +17,8 @@
 CONFIGURE_ENV=	GTKCONFIG=${GTK_CONFIG}
 USE_AUTOCONF=	yes
 GNU_CONFIGURE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
--- x11/wmcliphist/Makefile.old	Sat Aug 31 21:21:51 2002
+++ x11/wmcliphist/Makefile	Sat Aug 31 21:21:58 2002
@@ -15,7 +15,8 @@
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
--- x11/wmmenu/Makefile.old	Sat Aug 31 21:22:13 2002
+++ x11/wmmenu/Makefile	Sat Aug 31 21:22:53 2002
@@ -16,8 +16,9 @@
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_X_PREFIX=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	libcapplet
 USE_GMAKE=	yes
-USE_GNOMECTRL=	yes
 
 MAN1=		wmmenu.1
 
--- x11/xdialog/Makefile.old	Sat Aug 31 21:24:04 2002
+++ x11/xdialog/Makefile	Sat Aug 31 21:24:13 2002
@@ -15,7 +15,8 @@
 MAINTAINER=	ports@FreeBSD.Org
 
 USE_BZIP2=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
--- x11/xscreensaver/Makefile.old	Sat Aug 31 21:24:23 2002
+++ x11/xscreensaver/Makefile	Sat Aug 31 21:24:48 2002
@@ -25,7 +25,8 @@
 USE_XPM=	yes
 USE_MESA=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-pam --with-gl --with-gle --with-xpm --with-xml \
 		--with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ \
--- x11/xbindkeys_config/Makefile.old	Sat Aug 31 21:23:15 2002
+++ x11/xbindkeys_config/Makefile	Sat Aug 31 21:23:23 2002
@@ -13,7 +13,8 @@
 
 MAINTAINER=	obraun@FreeBSD.org
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_REINPLACE=	yes
 MAKE_ENV=	CC="${CC} ${CFLAGS}"
 
--- x11/decurs/Makefile.old	Sat Aug 31 21:04:02 2002
+++ x11/decurs/Makefile	Sat Aug 31 21:04:09 2002
@@ -15,7 +15,8 @@
 LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk--
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
 # The Makefile doesn't provide a install target