--- misc/biblereader/Makefile.old	Sat Aug 31 19:18:09 2002
+++ misc/biblereader/Makefile	Sat Aug 31 19:18:28 2002
@@ -23,7 +23,8 @@
 MAINTAINER=	patseal@hyperhost.net
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 PLIST=		${WRKDIR}/PLIST
 
 DATAFILES=	${WRKDIR}/kjv/kjv
--- misc/bidwatcher/Makefile.old	Sat Aug 31 19:18:39 2002
+++ misc/bidwatcher/Makefile	Sat Aug 31 19:19:51 2002
@@ -12,11 +12,13 @@
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=		bidwatcher-1.3.4-fix
-WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=		mph@FreeBSD.org
 
-USE_GTK=		YES
+WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+USE_GNOMENG=		yes
+USE_GNOME=		gtk12
 GNU_CONFIGURE=		YES
 
 .include <bsd.port.mk>
--- misc/cheatah/Makefile.old	Sat Aug 31 19:20:09 2002
+++ misc/cheatah/Makefile	Sat Aug 31 19:20:19 2002
@@ -20,7 +20,8 @@
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 MAINDIR=	${.CURDIR}/../sword
 PORTVERSION!=	${PORTVERSION}
--- misc/gkrellm-reminder/Makefile.old	Sat Aug 31 19:20:35 2002
+++ misc/gkrellm-reminder/Makefile	Sat Aug 31 19:20:43 2002
@@ -17,8 +17,8 @@
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 
 do-install:
 	@${INSTALL_DATA} ${WRKSRC}/reminder.so \
--- misc/gkrellmaflag/Makefile.old	Sat Aug 31 19:20:56 2002
+++ misc/gkrellmaflag/Makefile	Sat Aug 31 19:21:05 2002
@@ -19,8 +19,8 @@
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_X_PREFIX=	yes
-USE_GTK=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
 ALL_TARGET=	${PORTNAME}_anim.so
--- misc/gkrellmlaunch/Makefile.old	Sat Aug 31 19:21:19 2002
+++ misc/gkrellmlaunch/Makefile	Sat Aug 31 19:21:29 2002
@@ -17,8 +17,8 @@
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 ALL_TARGET=	${PORTNAME}.so
 
 do-install:
--- misc/gkrellscore/Makefile.old	Sat Aug 31 19:21:38 2002
+++ misc/gkrellscore/Makefile	Sat Aug 31 19:21:48 2002
@@ -19,8 +19,8 @@
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
 USE_X_PREFIX=	yes
-USE_GTK=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 USE_GMAKE=	yes
 
 pre-patch:
--- misc/gkrellweather/Makefile.old	Sat Aug 31 19:21:58 2002
+++ misc/gkrellweather/Makefile	Sat Aug 31 19:22:05 2002
@@ -19,8 +19,8 @@
 		${X11BASE}/bin/GrabWeather:${PORTSDIR}/misc/wmweather
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
 ALL_TARGET=	${PORTNAME}.so
--- misc/gman/Makefile.old	Sat Aug 31 19:22:14 2002
+++ misc/gman/Makefile	Sat Aug 31 19:22:23 2002
@@ -16,7 +16,8 @@
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 RUN_DEPENDS=	ghostview:${PORTSDIR}/print/ghostview
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 MAN1=	gman.1x
 
--- misc/gplbp/Makefile.old	Sat Aug 31 19:22:47 2002
+++ misc/gplbp/Makefile	Sat Aug 31 19:22:56 2002
@@ -14,7 +14,8 @@
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
--- misc/grdb/Makefile.old	Sat Aug 31 19:23:12 2002
+++ misc/grdb/Makefile	Sat Aug 31 19:24:50 2002
@@ -15,7 +15,7 @@
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
 WANT_GNOME=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -24,8 +24,9 @@
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GNOME)
-USE_GNOME=	yes
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOME+=	gtk12
+PKGNAMESUFFIX=	-gtk
 .else
 CONFIGURE_ARGS=	--disable-gnome
 .endif
--- misc/grun/Makefile.old	Sat Aug 31 19:25:01 2002
+++ misc/grun/Makefile	Sat Aug 31 19:25:12 2002
@@ -13,7 +13,8 @@
 MAINTAINER=	domi@saargate.de
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
 MAN1=		grun.1x
--- misc/gtkfind/Makefile.old	Sat Aug 31 19:25:26 2002
+++ misc/gtkfind/Makefile	Sat Aug 31 19:25:33 2002
@@ -19,7 +19,8 @@
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
 MAN1=		gtkfind.1 mktmp.1
--- misc/gtktalog/Makefile.old	Sat Aug 31 19:27:33 2002
+++ misc/gtktalog/Makefile	Sat Aug 31 19:27:41 2002
@@ -12,7 +12,8 @@
 
 MAINTAINER=	rael@vectorstar.net
 
-USE_GNOMELIBS=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomelibs
 GNU_CONFIGURE=	yes
 
 MAN1=		gtktalog.1
--- misc/snowflake/Makefile.old	Sat Aug 31 19:27:48 2002
+++ misc/snowflake/Makefile	Sat Aug 31 19:27:55 2002
@@ -14,7 +14,8 @@
 MAINTAINER=	nakai@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/snowflake ${PREFIX}/bin
--- misc/wmpal/Makefile.old	Sat Aug 31 19:28:01 2002
+++ misc/wmpal/Makefile	Sat Aug 31 19:28:10 2002
@@ -15,7 +15,8 @@
 LIB_DEPENDS=	dockapp.1:${PORTSDIR}/x11-wm/libdockapp
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib"
--- misc/xosd/Makefile.old	Sat Aug 31 19:28:19 2002
+++ misc/xosd/Makefile	Sat Aug 31 19:28:31 2002
@@ -18,7 +18,8 @@
 XMMS_CONFIG?=	${X11BASE}/bin/xmms-config
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_AUTOMAKE_VER=	15
 AUTOMAKE_ARGS=	--add-missing
--- misc/demoniac/Makefile.old	Sat Aug 31 19:29:10 2002
+++ misc/demoniac/Makefile	Sat Aug 31 19:29:33 2002
@@ -17,7 +17,8 @@
 
 USE_REINPLACE=	yes
 USE_MESA=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
--- misc/gkrellshoot/Makefile.old	Sat Aug 31 19:29:52 2002
+++ misc/gkrellshoot/Makefile	Sat Aug 31 19:30:00 2002
@@ -18,6 +18,7 @@
 
 WRKSRC=		${WRKDIR}/gkrellShoot-${PORTVERSION}
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 
 .include <bsd.port.mk>
--- misc/gretl/Makefile.old	Sat Aug 31 19:30:34 2002
+++ misc/gretl/Makefile	Sat Aug 31 19:31:34 2002
@@ -23,7 +23,7 @@
 
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
 WANT_GNOME=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
@@ -37,8 +37,9 @@
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GNOME)
-USE_GNOME=	yes
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOME+=	gtk12
+PKGNAMESUFFIX=	gtk
 .else
 CONFIGURE_ARGS+=	--without-gnome
 .endif
--- misc/gkrellmbgchg/Makefile.old	Sat Aug 31 19:30:19 2002
+++ misc/gkrellmbgchg/Makefile	Sat Aug 31 19:30:26 2002
@@ -17,6 +17,7 @@
 
 WRKSRC=		${WRKDIR}/gkrellmbgchg-${PORTVERSION}
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 
 .include <bsd.port.mk>