16 files changed, 35 insertions, 25 deletions

diff --git a/sysutils/bubblemon-dockapp/Makefile b/sysutils/bubblemon-dockapp/Makefile
index 6b65d974cfea..c0e68ed939eb 100644
--- a/sysutils/bubblemon-dockapp/Makefile
+++ b/sysutils/bubblemon-dockapp/Makefile
@@ -15,7 +15,8 @@ MAINTAINER=	markp@FreeBSD.org
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 MAKE_ARGS+=	PREFIX="${PREFIX}"
 EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}
 
diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
index faf505ac0c2a..f88c966a686b 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -19,7 +19,8 @@ RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools \
 		cdlabelgen:${PORTSDIR}/print/cdlabelgen
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--without-included-gettext --datadir=${PREFIX}/share
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/sysutils/gkrellflynn/Makefile b/sysutils/gkrellflynn/Makefile
index 320094866382..afca36a706ab 100644
--- a/sysutils/gkrellflynn/Makefile
+++ b/sysutils/gkrellflynn/Makefile
@@ -15,9 +15,9 @@ MAINTAINER=	pat@FreeBSD.org
 BUILD_DEPENDS=	${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
 
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 USE_X_PREFIX=	yes
-USE_GTK=	yes
-USE_IMLIB=	yes
 ALL_TARGET=	${PORTNAME}.so
 
 do-install:
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index 2b5122c07c65..292b33169d28 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	ume@FreeBSD.org
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 USE_GMAKE=	yes
 
 INCLUDES=	gkrellm.h gkrellm_public_proto.h
diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 2b5122c07c65..292b33169d28 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	ume@FreeBSD.org
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 USE_GMAKE=	yes
 
 INCLUDES=	gkrellm.h gkrellm_public_proto.h
diff --git a/sysutils/gkrellmouse/Makefile b/sysutils/gkrellmouse/Makefile
index b1dd5512983e..a2be3d03468b 100644
--- a/sysutils/gkrellmouse/Makefile
+++ b/sysutils/gkrellmouse/Makefile
@@ -18,8 +18,8 @@ RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
 USE_X_PREFIX=	yes
-USE_GTK=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 USE_GMAKE=	yes
 
 do-install:
diff --git a/sysutils/gkrellmwho/Makefile b/sysutils/gkrellmwho/Makefile
index 68a242ebad32..e8d2cec235ff 100644
--- a/sysutils/gkrellmwho/Makefile
+++ b/sysutils/gkrellmwho/Makefile
@@ -17,8 +17,8 @@ RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
 USE_X_PREFIX=	yes
-USE_GTK=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 USE_GMAKE=	yes
 ALL_TARGET=	#empty
 
diff --git a/sysutils/gtoaster/Makefile b/sysutils/gtoaster/Makefile
index 29d83025e2c5..4372a82bfbaf 100644
--- a/sysutils/gtoaster/Makefile
+++ b/sysutils/gtoaster/Makefile
@@ -23,7 +23,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${X11BASE}
 CONFIGURE_ENV=	GTK_CONFIG=${X11BASE}/bin/gtk12-config
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 
diff --git a/sysutils/guitar/Makefile b/sysutils/guitar/Makefile
index f0e181c22c7d..7fb02205b709 100644
--- a/sysutils/guitar/Makefile
+++ b/sysutils/guitar/Makefile
@@ -15,14 +15,15 @@ MAINTAINER=	domi@saargate.de
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 
 .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
diff --git a/sysutils/gupsc/Makefile b/sysutils/gupsc/Makefile
index cac26ca3434a..7da74e434a37 100644
--- a/sysutils/gupsc/Makefile
+++ b/sysutils/gupsc/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	demon@FreeBSD.org
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOMELIBS=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomelibs
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/sysutils/thefish/Makefile b/sysutils/thefish/Makefile
index 34a3b79da9b0..4a0bccfe3075 100644
--- a/sysutils/thefish/Makefile
+++ b/sysutils/thefish/Makefile
@@ -19,7 +19,9 @@ LIB_DEPENDS=	gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20
 USE_X_PREFIX=	yes
 .endif
 .if !defined(NO_GUI) && !defined(WITH_GTK2)
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
+PKGNAMESUFFIX=	-gtk
 .endif
 
 MAN1=		thefish.1
diff --git a/sysutils/wmcube-gdk/Makefile b/sysutils/wmcube-gdk/Makefile
index 70bab75ab4ef..886f5fbece5f 100644
--- a/sysutils/wmcube-gdk/Makefile
+++ b/sysutils/wmcube-gdk/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	pat@FreeBSD.org
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 MAKEFILE=	Makefile.FREEBSD
 
 do-install:
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index 709be68dc9fc..835b2efb739c 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -13,15 +13,13 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.a./alpha/}
 
 MAINTAINER=	lehmann@ans-netz.de
 
-LIB_DEPENDS=	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
-
 RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools \
 		mkisofs:${PORTSDIR}/sysutils/mkisofs
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib gdkpixbuf
 
 MAKE_ENV+=	GTK_CONFIG="${GTK_CONFIG}" \
 		GLIB_CONFIG="${GLIB_CONFIG}" \
diff --git a/sysutils/xlogmaster/Makefile b/sysutils/xlogmaster/Makefile
index 91660dd8dbf4..9ef9652f7799 100644
--- a/sysutils/xlogmaster/Makefile
+++ b/sysutils/xlogmaster/Makefile
@@ -15,7 +15,8 @@ MAINTAINER=	aw1@stade.co.uk
 
 USE_XLIB=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
 MAN1=		xlogmaster.1
diff --git a/sysutils/xw/Makefile b/sysutils/xw/Makefile
index 826b679473ab..56b933a989e0 100644
--- a/sysutils/xw/Makefile
+++ b/sysutils/xw/Makefile
@@ -14,8 +14,8 @@ MAINTAINER=	ports@FreeBSD.Org
 
 GTK_CONFIG=${X11BASE}/bin/gtk12-config
 
-USE_GTK=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 USE_X_PREFIX=	yes
 
 .include <bsd.port.mk>
diff --git a/sysutils/xwatch/Makefile b/sysutils/xwatch/Makefile
index 193d199f9cff..616bb336acba 100644
--- a/sysutils/xwatch/Makefile
+++ b/sysutils/xwatch/Makefile
@@ -13,7 +13,8 @@ MASTER_SITES=	http://www.student.lu.se/~nbi98oli/src/obsolete/
 MAINTAINER=	mph@freebsd.org
 
 USE_XLIB=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
 post-install: