--- emulators/basiliskII/Makefile.old	Fri Aug 30 21:05:53 2002
+++ emulators/basiliskII/Makefile	Fri Aug 30 21:06:45 2002
@@ -19,8 +19,8 @@
 WRKSRC=		${WRKDIR}/BasiliskII-${PORTVERSION}/src/Unix
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
-USE_ESOUND=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	esound gtk12
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--disable-fbdev-dga
--- emulators/uae/Makefile.old	Fri Aug 30 21:07:34 2002
+++ emulators/uae/Makefile	Fri Aug 30 21:07:45 2002
@@ -16,7 +16,8 @@
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-sound --enable-vidmode --enable-dga
 USE_XLIB=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 CFLAGS+=	${PTHREAD_CFLAGS}
 
--- emulators/xmame/Makefile.old	Fri Aug 30 21:08:00 2002
+++ emulators/xmame/Makefile	Fri Aug 30 21:11:56 2002
@@ -19,6 +19,7 @@
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GNOMENG=	yes
 
 MAN6=		x${MAMEMESS}.6
 
@@ -208,7 +209,7 @@
 
 .if ${WITH_ESOUND:L} == "yes"
 ESOUNDCOMMENT=
-USE_ESOUND=	yes
+USE_GNOME=	esound
 .else
 ESOUNDCOMMENT=\#\ 
 .endif
--- emulators/xsystem35/Makefile.old	Fri Aug 30 21:12:02 2002
+++ emulators/xsystem35/Makefile	Fri Aug 30 21:13:47 2002
@@ -15,8 +15,9 @@
 
 USE_AUTOCONF=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
-WANT_ESOUND=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
+WANT_GNOME=	yes
 
 PKGMESSAGE=	${WRKSRC}/MESSAGE
 
@@ -50,8 +51,8 @@
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-.if defined(HAVE_ESOUND)
-USE_ESOUND=	yes
+.if ${HAVE_GNOME:Mesound}!=""
+USE_GNOME+=	esound
 CONFIGURE_ARGS+=	--enable-audio=oss,esd --with-default-output=esd
 .else
 CONFIGURE_ARGS+=	--enable-audio=oss --with-default-output=oss
--- emulators/vx68k/Makefile.old	Fri Aug 30 21:19:04 2002
+++ emulators/vx68k/Makefile	Fri Aug 30 21:19:16 2002
@@ -17,7 +17,8 @@
 LIB_DEPENDS=	vm68k.4:${PORTSDIR}/emulators/libvm68k
 
 USE_MESA=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 LIBTOOLFILES=	configure vx68k-gtk/configure
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
--- emulators/grustibus/Makefile.old	Fri Aug 30 21:19:25 2002
+++ emulators/grustibus/Makefile	Fri Aug 30 21:20:42 2002
@@ -16,15 +16,16 @@
 RUN_DEPENDS=	xmame:${PORTSDIR}/emulators/xmame
 LIB_DEPENDS=	gnomecanvaspixbuf.1:${PORTSDIR}/graphics/gnomecanvas
 
-USE_GNOMELIBS=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--sysconfdir=`${GNOME_CONFIG} --sysconfdir`
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GNOME)
-USE_GNOME=	yes
+.if ${HAVE_GNOME:Mgnomelibs}!=""
+USE_GNOME=	gnomelibs libcapplet
 .endif
 
 .include <bsd.port.post.mk>