16 files changed, 36 insertions, 21 deletions

diff --git a/x11/decurs/Makefile b/x11/decurs/Makefile
index 6ef96bf7d7a3..af1bbb10459f 100644
--- a/x11/decurs/Makefile
+++ b/x11/decurs/Makefile
@@ -15,7 +15,8 @@ MAINTAINER=	adam@vectors.cx
 LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk--
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
 # The Makefile doesn't provide a install target
diff --git a/x11/erun/Makefile b/x11/erun/Makefile
index 118edd952f18..efe336f36253 100644
--- a/x11/erun/Makefile
+++ b/x11/erun/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	E-Run
 PORTVERSION=	1.2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR = kbyanc
+MASTER_SITE_SUBDIR=	kbyanc
 
 MAINTAINER=	kbyanc@posi.net
 
@@ -18,6 +18,7 @@ LIB_DEPENDS=	epplet.1:${PORTSDIR}/x11-wm/libepplet
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 
 .include <bsd.port.mk>
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index ecd3b745404e..b1b63f274c02 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -17,9 +17,9 @@ MAINTAINER=	ports@freebsd.org
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
-USE_REINPLACE=	yes
+USE_GNOMENG=	yes
 WANT_GNOME=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lgnuregex -liconv"
@@ -34,8 +34,9 @@ MAN8=		gdkxft_sysinstall.8
 IGNORE=		"requires XFree86-4.x or later to run"
 .endif
 
-.if defined(HAVE_GNOME)
-USE_GNOME=	yes
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOME+=	gtk12
+PKGNAMESUFFIX=	-gtk
 .else
 CONFIGURE_ARGS+=	--without-gnome
 .endif
diff --git a/x11/gmessage/Makefile b/x11/gmessage/Makefile
index 8c74ecf7acef..66f5c6c49440 100644
--- a/x11/gmessage/Makefile
+++ b/x11/gmessage/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www.brettnacher.org/users/dominik/FreeBSD/
 MAINTAINER=	domi@saargate.de
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 .include <bsd.port.mk>
diff --git a/x11/gtk-theme-switch/Makefile b/x11/gtk-theme-switch/Makefile
index 05596345f00a..66b2c2b39649 100644
--- a/x11/gtk-theme-switch/Makefile
+++ b/x11/gtk-theme-switch/Makefile
@@ -14,7 +14,8 @@ MASTER_SITES=	http://www.muhri.net/
 MAINTAINER=	sobomax@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 
 MAN1=		gtk-theme-switch.1
diff --git a/x11/gtk-theme-switch2/Makefile b/x11/gtk-theme-switch2/Makefile
index 05596345f00a..66b2c2b39649 100644
--- a/x11/gtk-theme-switch2/Makefile
+++ b/x11/gtk-theme-switch2/Makefile
@@ -14,7 +14,8 @@ MASTER_SITES=	http://www.muhri.net/
 MAINTAINER=	sobomax@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 
 MAN1=		gtk-theme-switch.1
diff --git a/x11/gxset/Makefile b/x11/gxset/Makefile
index 978a7f2cb417..c4abff8adb2c 100644
--- a/x11/gxset/Makefile
+++ b/x11/gxset/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	bms@spc.org
 LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_XPM=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/x11/gyroscope/Makefile b/x11/gyroscope/Makefile
index 0dc6b9392586..0e7a00685dc0 100644
--- a/x11/gyroscope/Makefile
+++ b/x11/gyroscope/Makefile
@@ -15,7 +15,8 @@ MAINTAINER=	jim@FreeBSD.org
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 ALL_TARGET=	# empty
 
diff --git a/x11/mgapdesk/Makefile b/x11/mgapdesk/Makefile
index 833dfea45a1d..2de61f01c7f5 100644
--- a/x11/mgapdesk/Makefile
+++ b/x11/mgapdesk/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	nsayer@freebsd.org
 BUILD_DEPENDS=	XFree86:${PORTSDIR}/x11/XFree86-4
 
 USE_X_PREFIX=	YES
-USE_GTK=	YES
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 USE_GMAKE=	YES
 
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index ae193d535825..40748d39df81 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -14,8 +14,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	nobutaka@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--enable-imlib --enable-utmp
diff --git a/x11/portoseguro/Makefile b/x11/portoseguro/Makefile
index 7d9125ae6d9d..39e0829ee08f 100644
--- a/x11/portoseguro/Makefile
+++ b/x11/portoseguro/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	trevor@FreeBSD.org
 CONFIGURE_ENV=	GTKCONFIG=${GTK_CONFIG}
 USE_AUTOCONF=	yes
 GNU_CONFIGURE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/x11/wmcliphist/Makefile b/x11/wmcliphist/Makefile
index d95c966c4c58..2aa3628ba0c9 100644
--- a/x11/wmcliphist/Makefile
+++ b/x11/wmcliphist/Makefile
@@ -15,7 +15,8 @@ MAINTAINER=	pat@FreeBSD.org
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
diff --git a/x11/wmmenu/Makefile b/x11/wmmenu/Makefile
index ae086a460916..5d9c653902a8 100644
--- a/x11/wmmenu/Makefile
+++ b/x11/wmmenu/Makefile
@@ -16,8 +16,9 @@ LIB_DEPENDS=	dockapp.1:${PORTSDIR}/x11-wm/libdockapp:install
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_X_PREFIX=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	libcapplet
 USE_GMAKE=	yes
-USE_GNOMECTRL=	yes
 
 MAN1=		wmmenu.1
 
diff --git a/x11/xbindkeys_config/Makefile b/x11/xbindkeys_config/Makefile
index 907ad9d0ac15..62962eff938f 100644
--- a/x11/xbindkeys_config/Makefile
+++ b/x11/xbindkeys_config/Makefile
@@ -13,7 +13,8 @@ MASTER_SITES=	http://www.netchampagne.com/xbindkeys_config/
 
 MAINTAINER=	obraun@FreeBSD.org
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_REINPLACE=	yes
 MAKE_ENV=	CC="${CC} ${CFLAGS}"
 
diff --git a/x11/xdialog/Makefile b/x11/xdialog/Makefile
index 33640e67ce39..7ecfb6cdfefe 100644
--- a/x11/xdialog/Makefile
+++ b/x11/xdialog/Makefile
@@ -15,7 +15,8 @@ DISTNAME=	${PORTNAME:S/x/X/}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.Org
 
 USE_BZIP2=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index e2abf5d27c23..65f3f363a992 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -25,7 +25,8 @@ USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_MESA=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-pam --with-gl --with-gle --with-xpm --with-xml \
 		--with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ \