--- astro/fooseti/Makefile	Fri Aug 30 12:16:15 2002
+++ astro/fooseti/Makefile	Fri Aug 30 12:20:04 2002
@@ -16,6 +16,7 @@ 
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
 GNU_CONFIGURE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+uSE_GNOME=	gtk12
 
 .include <bsd.port.mk>
--- astro/gkrellmearth/Makefile	Fri Aug 30 12:20:29 2002
+++ astro/gkrellmearth/Makefile	Fri Aug 30 12:21:40 2002
@@ -20,8 +20,8 @@ 
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_anim
 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
--- astro/gkrellmoon/Makefile	Fri Aug 30 12:21:48 2002
+++ astro/gkrellmoon/Makefile	Fri Aug 30 12:22:08 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
 MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
 ALL_TARGET=	${PORTNAME}.so
--- astro/gkrellmseti/Makefile	Fri Aug 30 12:30:46 2002
+++ astro/gkrellmseti/Makefile	Fri Aug 30 12:31:34 2002
@@ -17,10 +17,10 @@ 
 BUILD_DEPENDS=  ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
 
-USE_BZIP2=      yes
-USE_X_PREFIX=   yes
-USE_GTK=        yes
-USE_IMLIB=      yes
+USE_BZIP2=	yes
+USE_X_PREFIX=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 USE_XPM=	yes
 
 DOC_FILES=	AUTHORS README TODO
--- astro/spacechart/Makefile	Fri Aug 30 12:22:14 2002
+++ astro/spacechart/Makefile	Fri Aug 30 12:22:58 2002
@@ -18,7 +18,8 @@ 
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-USE_GNOMELIBS=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomelibs
 CONFIGURE_ARGS=	--without-included-gettext --datadir=${PREFIX}/share
 
 # trick it into using ports installed gettext
--- astro/starplot/Makefile	Fri Aug 30 12:23:09 2002
+++ astro/starplot/Makefile	Fri Aug 30 12:23:48 2002
@@ -14,7 +14,8 @@ 
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_XPM=	yes
 MAKE_ENV=	DATADIR="${DATADIR}" \
 		DOCSDIR="${DOCSDIR}"
--- astro/celestia/Makefile	Fri Aug 30 12:24:07 2002
+++ astro/celestia/Makefile	Fri Aug 30 12:24:59 2002
@@ -23,8 +23,8 @@ 
 USE_GMAKE=	yes
 USE_MESA=	yes
 USE_X_PREFIX=	yes
-USE_GNOMELIBS=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomelibs
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--includedir="${LOCALBASE}/include" \
--- astro/gpsdrive/Makefile	Fri Aug 30 12:25:16 2002
+++ astro/gpsdrive/Makefile	Fri Aug 30 12:26:15 2002
@@ -17,11 +17,11 @@ 
 MAINTAINER=	molter@gufi.org
 
 LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-BUILD_DEPENDS=	${X11BASE}/bin/gdk-pixbuf-config:${PORTSDIR}/graphics/gdk-pixbuf
 
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gdkpixbuf
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include \
 		LDFLAGS=-L${LOCALBASE}/lib
--- astro/nightfall/Makefile	Fri Aug 30 12:26:28 2002
+++ astro/nightfall/Makefile	Fri Aug 30 12:26:58 2002
@@ -14,7 +14,8 @@ 
 MAINTAINER=	chris@unixpages.org
 
 .if !defined(WITHOUT_GTK)
-USE_GTK=        yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 .endif
 .if !defined(WITHOUT_GNUPLOT)
 BUILD_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot
--- astro/gkrellsun/Makefile	Fri Aug 30 12:27:26 2002
+++ astro/gkrellsun/Makefile	Fri Aug 30 12:27:46 2002
@@ -17,7 +17,8 @@ 
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gkrellsun.so \