10 files changed, 22 insertions, 17 deletions

diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile
index f8c5d8765f45..f5fef17a14ab 100644
--- a/astro/celestia/Makefile
+++ b/astro/celestia/Makefile
@@ -23,8 +23,8 @@ PLIST=		${WRKDIR}/pkg-plist
 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" \
diff --git a/astro/fooseti/Makefile b/astro/fooseti/Makefile
index 3c1c87df1519..0176212689e4 100644
--- a/astro/fooseti/Makefile
+++ b/astro/fooseti/Makefile
@@ -16,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
 GNU_CONFIGURE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+uSE_GNOME=	gtk12
 
 .include <bsd.port.mk>
diff --git a/astro/gkrellmearth/Makefile b/astro/gkrellmearth/Makefile
index 049b23467810..de73c7d14478 100644
--- a/astro/gkrellmearth/Makefile
+++ b/astro/gkrellmearth/Makefile
@@ -20,8 +20,8 @@ RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
 
 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
diff --git a/astro/gkrellmoon/Makefile b/astro/gkrellmoon/Makefile
index 9852988f90a5..ba12b05b1b69 100644
--- a/astro/gkrellmoon/Makefile
+++ b/astro/gkrellmoon/Makefile
@@ -17,8 +17,8 @@ BUILD_DEPENDS=	${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
 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
diff --git a/astro/gkrellmseti/Makefile b/astro/gkrellmseti/Makefile
index ca267d8d05e9..108c47ae16d8 100644
--- a/astro/gkrellmseti/Makefile
+++ b/astro/gkrellmseti/Makefile
@@ -17,10 +17,10 @@ MAINTAINER=     hmendes@brturbo.com
 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
diff --git a/astro/gkrellsun/Makefile b/astro/gkrellsun/Makefile
index 22bfec320175..731ddb5cb87e 100644
--- a/astro/gkrellsun/Makefile
+++ b/astro/gkrellsun/Makefile
@@ -17,7 +17,8 @@ RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gkrellsun.so \
diff --git a/astro/gpsdrive/Makefile b/astro/gpsdrive/Makefile
index 798a17d27fce..e9e2951b42fb 100644
--- a/astro/gpsdrive/Makefile
+++ b/astro/gpsdrive/Makefile
@@ -17,11 +17,11 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/pre/}
 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
diff --git a/astro/nightfall/Makefile b/astro/nightfall/Makefile
index 317a32856351..52b5c82689e4 100644
--- a/astro/nightfall/Makefile
+++ b/astro/nightfall/Makefile
@@ -14,7 +14,8 @@ MASTER_SITES=	http://www.lsw.uni-heidelberg.de/~rwichman/ \
 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
diff --git a/astro/spacechart/Makefile b/astro/spacechart/Makefile
index cb5fa48a5f24..c18bfcd9b1d0 100644
--- a/astro/spacechart/Makefile
+++ b/astro/spacechart/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
 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
diff --git a/astro/starplot/Makefile b/astro/starplot/Makefile
index 55eab47f58b6..bda519bda9e8 100644
--- a/astro/starplot/Makefile
+++ b/astro/starplot/Makefile
@@ -14,7 +14,8 @@ MAINTAINER=	pat@FreeBSD.org
 
 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}"