73 files changed, 152 insertions, 81 deletions

diff --git a/x11-themes/buffy/Makefile b/x11-themes/buffy/Makefile
index c52ca1e14ba0..3f9f6b8a1282 100644
--- a/x11-themes/buffy/Makefile
+++ b/x11-themes/buffy/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-themes/clean-theme-gtk/Makefile b/x11-themes/clean-theme-gtk/Makefile
index 13df782003b0..29470b931f9f 100644
--- a/x11-themes/clean-theme-gtk/Makefile
+++ b/x11-themes/clean-theme-gtk/Makefile
@@ -18,7 +18,8 @@ WRKSRC=		${WRKDIR}/gtk-clean-theme
 
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-themes/colorstep/Makefile b/x11-themes/colorstep/Makefile
index adb8a5f9d4fd..10c35b7db678 100644
--- a/x11-themes/colorstep/Makefile
+++ b/x11-themes/colorstep/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.6
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-themes/engradient/Makefile b/x11-themes/engradient/Makefile
index 217014e591a7..0bfc40841052 100644
--- a/x11-themes/engradient/Makefile
+++ b/x11-themes/engradient/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 WRKSRC=		${WRKDIR}/gtk-${PORTNAME}-0.5
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
diff --git a/x11-themes/gnome-look/Makefile b/x11-themes/gnome-look/Makefile
index 39d49e0cb69a..db01eab6c030 100644
--- a/x11-themes/gnome-look/Makefile
+++ b/x11-themes/gnome-look/Makefile
@@ -14,7 +14,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	sobomax@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
diff --git a/x11-themes/gtk-Mac2-theme/Makefile b/x11-themes/gtk-Mac2-theme/Makefile
index 5c02284007e0..3f375012e642 100644
--- a/x11-themes/gtk-Mac2-theme/Makefile
+++ b/x11-themes/gtk-Mac2-theme/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
diff --git a/x11-themes/gtk-engines/Makefile b/x11-themes/gtk-engines/Makefile
index 3dcc75125ae7..897caa1f8d33 100644
--- a/x11-themes/gtk-engines/Makefile
+++ b/x11-themes/gtk-engines/Makefile
@@ -15,7 +15,8 @@ MASTER_SITE_SUBDIR=	stable/sources/gtk-engines
 MAINTAINER=	gnome@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 USE_LIBTOOL=	yes
 
 THEMES=		metal notif pixmap raleigh redmond95
diff --git a/x11-themes/gtk-flat-theme/Makefile b/x11-themes/gtk-flat-theme/Makefile
index 3cfc3b029c6b..cf0683e58479 100644
--- a/x11-themes/gtk-flat-theme/Makefile
+++ b/x11-themes/gtk-flat-theme/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.1
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
diff --git a/x11-themes/gtk-flat-theme2/Makefile b/x11-themes/gtk-flat-theme2/Makefile
index 3cfc3b029c6b..cf0683e58479 100644
--- a/x11-themes/gtk-flat-theme2/Makefile
+++ b/x11-themes/gtk-flat-theme2/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.1
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
diff --git a/x11-themes/gtk-qn-x11-theme/Makefile b/x11-themes/gtk-qn-x11-theme/Makefile
index f85d2930c1bf..64b5da68648e 100644
--- a/x11-themes/gtk-qn-x11-theme/Makefile
+++ b/x11-themes/gtk-qn-x11-theme/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	olgeni@FreeBSD.org
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
diff --git a/x11-themes/gtk-zenith-theme/Makefile b/x11-themes/gtk-zenith-theme/Makefile
index fe4cdd274fb6..11b0b81dc60e 100644
--- a/x11-themes/gtk-zenith-theme/Makefile
+++ b/x11-themes/gtk-zenith-theme/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	olgeni@FreeBSD.org
 WRKSRC=		${WRKDIR}/zenith-1.0
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
diff --git a/x11-themes/gtkbe/Makefile b/x11-themes/gtkbe/Makefile
index 549e305c8948..ac51874a02bb 100644
--- a/x11-themes/gtkbe/Makefile
+++ b/x11-themes/gtkbe/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 WRKSRC=		${WRKDIR}/GTKBeEngine
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
diff --git a/x11-themes/gtkstep-pastel/Makefile b/x11-themes/gtkstep-pastel/Makefile
index 25889757608b..eb85cfa6708c 100644
--- a/x11-themes/gtkstep-pastel/Makefile
+++ b/x11-themes/gtkstep-pastel/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.10.1
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gtkstep/Makefile b/x11-themes/gtkstep/Makefile
index 84bcf8e889ce..c3fb72e14233 100644
--- a/x11-themes/gtkstep/Makefile
+++ b/x11-themes/gtkstep/Makefile
@@ -14,7 +14,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-themes/icegradient/Makefile b/x11-themes/icegradient/Makefile
index bd39cd268e4f..e619efdae166 100644
--- a/x11-themes/icegradient/Makefile
+++ b/x11-themes/icegradient/Makefile
@@ -18,7 +18,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 WRKSRC=		${WRKDIR}/gtk-${PORTNAME}-0.0.5
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
diff --git a/x11-themes/notif2/Makefile b/x11-themes/notif2/Makefile
index 577edf141135..f6c8c69e2c8e 100644
--- a/x11-themes/notif2/Makefile
+++ b/x11-themes/notif2/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	ports@FreeBSD.org
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
diff --git a/x11-themes/thinice/Makefile b/x11-themes/thinice/Makefile
index b389004d47f9..b0f6e3925ee6 100644
--- a/x11-themes/thinice/Makefile
+++ b/x11-themes/thinice/Makefile
@@ -19,7 +19,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 WRKSRC=		${WRKDIR}/gtk-${PORTNAME}-theme-${PORTVERSION}
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-themes/whistlerk/Makefile b/x11-themes/whistlerk/Makefile
index f4726103c11c..a3db26905132 100644
--- a/x11-themes/whistlerk/Makefile
+++ b/x11-themes/whistlerk/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 WRKSRC=		${WRKDIR}/gtk-theme-WhistlerK
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
diff --git a/x11-themes/xenophilia/Makefile b/x11-themes/xenophilia/Makefile
index 7f2a7457d5eb..8a18bba47b51 100644
--- a/x11-themes/xenophilia/Makefile
+++ b/x11-themes/xenophilia/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 WRKSRC=		${WRKDIR}/Xenophilia-0.7
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 ALL_TARGET=	# empty
 MAKE_ENV=	GTK-CONFIG="${GTK_CONFIG}"
 
diff --git a/x11-themes/xenostep/Makefile b/x11-themes/xenostep/Makefile
index 7e625d152164..f836100b54e6 100644
--- a/x11-themes/xenostep/Makefile
+++ b/x11-themes/xenostep/Makefile
@@ -18,7 +18,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 WRKSRC=		${WRKDIR}/XenoStep
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 ALL_TARGET=	# empty
 MAKE_ENV=	MKDIR="${MKDIR}"
 
diff --git a/x11-toolkits/buffy/Makefile b/x11-toolkits/buffy/Makefile
index c52ca1e14ba0..3f9f6b8a1282 100644
--- a/x11-toolkits/buffy/Makefile
+++ b/x11-toolkits/buffy/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/clean-theme-gtk/Makefile b/x11-toolkits/clean-theme-gtk/Makefile
index 13df782003b0..29470b931f9f 100644
--- a/x11-toolkits/clean-theme-gtk/Makefile
+++ b/x11-toolkits/clean-theme-gtk/Makefile
@@ -18,7 +18,8 @@ WRKSRC=		${WRKDIR}/gtk-clean-theme
 
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/colorstep/Makefile b/x11-toolkits/colorstep/Makefile
index adb8a5f9d4fd..10c35b7db678 100644
--- a/x11-toolkits/colorstep/Makefile
+++ b/x11-toolkits/colorstep/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.6
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/easygtk/Makefile b/x11-toolkits/easygtk/Makefile
index 04c0d063a52c..a488cb203da5 100644
--- a/x11-toolkits/easygtk/Makefile
+++ b/x11-toolkits/easygtk/Makefile
@@ -22,7 +22,8 @@ EXTRACT_CMD=	${CAT}	# not quite `extract', but who cares? ;)
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_X_PREFIX=	yes
-USE_GNOMELIBS=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomelibs
 INSTALLS_SHLIB=	yes
 MAKE_ENV=	MKDIR="${MKDIR}" \
 		LN="${LN}"
diff --git a/x11-toolkits/eazel-themes/Makefile b/x11-toolkits/eazel-themes/Makefile
index cdb22fd8c840..824c25ce7b50 100644
--- a/x11-toolkits/eazel-themes/Makefile
+++ b/x11-toolkits/eazel-themes/Makefile
@@ -19,7 +19,8 @@ RUN_DEPENDS=	sawfish:${PORTSDIR}/x11-wm/sawfish \
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/gtk+/eazel-engine
 
-USE_GNOMECTRL=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	libcapplet
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
@@ -28,8 +29,8 @@ CONFIGURE_ARGS=	--localstatedir=${X11BASE}/share \
 		--datadir=${X11BASE}/share
 
 post-extract:
-	@find ${WRKSRC}/../.. -type f | grep -v eazel-engine | xargs ${CHMOD} 644
-	@find ${WRKSRC}/../.. -type d | xargs ${CHMOD} 755
+	@${FIND} ${WRKSRC}/../.. -type f | ${GREP} -v eazel-engine | ${XARGS} ${CHMOD} 644
+	@${FIND} ${WRKSRC}/../.. -type d | ${XARGS} ${CHMOD} 755
 
 post-install:
 	${MKDIR} ${PREFIX}/share/themes/Eazel
diff --git a/x11-toolkits/engradient/Makefile b/x11-toolkits/engradient/Makefile
index 217014e591a7..0bfc40841052 100644
--- a/x11-toolkits/engradient/Makefile
+++ b/x11-toolkits/engradient/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 WRKSRC=		${WRKDIR}/gtk-${PORTNAME}-0.5
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
diff --git a/x11-toolkits/gevas/Makefile b/x11-toolkits/gevas/Makefile
index 97707612e8aa..7b10d952a44e 100644
--- a/x11-toolkits/gevas/Makefile
+++ b/x11-toolkits/gevas/Makefile
@@ -15,7 +15,8 @@ MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	evas.6:${PORTSDIR}/graphics/evas
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/x11-toolkits/gnome-look/Makefile b/x11-toolkits/gnome-look/Makefile
index 39d49e0cb69a..db01eab6c030 100644
--- a/x11-toolkits/gnome-look/Makefile
+++ b/x11-toolkits/gnome-look/Makefile
@@ -14,7 +14,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	sobomax@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
diff --git a/x11-toolkits/gtk-Mac2-theme/Makefile b/x11-toolkits/gtk-Mac2-theme/Makefile
index 5c02284007e0..3f375012e642 100644
--- a/x11-toolkits/gtk-Mac2-theme/Makefile
+++ b/x11-toolkits/gtk-Mac2-theme/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
diff --git a/x11-toolkits/gtk-engines/Makefile b/x11-toolkits/gtk-engines/Makefile
index 3dcc75125ae7..897caa1f8d33 100644
--- a/x11-toolkits/gtk-engines/Makefile
+++ b/x11-toolkits/gtk-engines/Makefile
@@ -15,7 +15,8 @@ MASTER_SITE_SUBDIR=	stable/sources/gtk-engines
 MAINTAINER=	gnome@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 USE_LIBTOOL=	yes
 
 THEMES=		metal notif pixmap raleigh redmond95
diff --git a/x11-toolkits/gtk-flat-theme/Makefile b/x11-toolkits/gtk-flat-theme/Makefile
index 3cfc3b029c6b..cf0683e58479 100644
--- a/x11-toolkits/gtk-flat-theme/Makefile
+++ b/x11-toolkits/gtk-flat-theme/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.1
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
diff --git a/x11-toolkits/gtk-flat-theme2/Makefile b/x11-toolkits/gtk-flat-theme2/Makefile
index 3cfc3b029c6b..cf0683e58479 100644
--- a/x11-toolkits/gtk-flat-theme2/Makefile
+++ b/x11-toolkits/gtk-flat-theme2/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.1
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
diff --git a/x11-toolkits/gtk-qn-x11-theme/Makefile b/x11-toolkits/gtk-qn-x11-theme/Makefile
index f85d2930c1bf..64b5da68648e 100644
--- a/x11-toolkits/gtk-qn-x11-theme/Makefile
+++ b/x11-toolkits/gtk-qn-x11-theme/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	olgeni@FreeBSD.org
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
diff --git a/x11-toolkits/gtk-zenith-theme/Makefile b/x11-toolkits/gtk-zenith-theme/Makefile
index fe4cdd274fb6..11b0b81dc60e 100644
--- a/x11-toolkits/gtk-zenith-theme/Makefile
+++ b/x11-toolkits/gtk-zenith-theme/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	olgeni@FreeBSD.org
 WRKSRC=		${WRKDIR}/zenith-1.0
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
diff --git a/x11-toolkits/gtkada-devel/Makefile b/x11-toolkits/gtkada-devel/Makefile
index fdf3083a14cc..03c5c2d37bea 100644
--- a/x11-toolkits/gtkada-devel/Makefile
+++ b/x11-toolkits/gtkada-devel/Makefile
@@ -17,13 +17,13 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	sam@inf.enst.fr
 
 BUILD_DEPENDS=	adagcc:${PORTSDIR}/lang/gnat
-LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade
 
 SHLIB_VERSION=	${PORTVERSION:S/1.2.//}
 
 USE_MESA=	yes
 USE_X_PREFIX=	yes
-USE_GNOMECTRL=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	libcapplet libglade
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/gtkada/Makefile b/x11-toolkits/gtkada/Makefile
index fdf3083a14cc..03c5c2d37bea 100644
--- a/x11-toolkits/gtkada/Makefile
+++ b/x11-toolkits/gtkada/Makefile
@@ -17,13 +17,13 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	sam@inf.enst.fr
 
 BUILD_DEPENDS=	adagcc:${PORTSDIR}/lang/gnat
-LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade
 
 SHLIB_VERSION=	${PORTVERSION:S/1.2.//}
 
 USE_MESA=	yes
 USE_X_PREFIX=	yes
-USE_GNOMECTRL=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	libcapplet libglade
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/gtkbe/Makefile b/x11-toolkits/gtkbe/Makefile
index 549e305c8948..ac51874a02bb 100644
--- a/x11-toolkits/gtkbe/Makefile
+++ b/x11-toolkits/gtkbe/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 WRKSRC=		${WRKDIR}/GTKBeEngine
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
diff --git a/x11-toolkits/gtkdatabox/Makefile b/x11-toolkits/gtkdatabox/Makefile
index 6c4442fc704f..69131d93b573 100644
--- a/x11-toolkits/gtkdatabox/Makefile
+++ b/x11-toolkits/gtkdatabox/Makefile
@@ -14,7 +14,8 @@ MASTER_SITES=	http://www.eudoxos.de/gtk/download/gtkdatabox/
 MAINTAINER=	ports@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtkdatabox2/Makefile b/x11-toolkits/gtkdatabox2/Makefile
index 6c4442fc704f..69131d93b573 100644
--- a/x11-toolkits/gtkdatabox2/Makefile
+++ b/x11-toolkits/gtkdatabox2/Makefile
@@ -14,7 +14,8 @@ MASTER_SITES=	http://www.eudoxos.de/gtk/download/gtkdatabox/
 MAINTAINER=	ports@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtkextra--/Makefile b/x11-toolkits/gtkextra--/Makefile
index 6b2b2d3ba5f1..38d982fb909c 100644
--- a/x11-toolkits/gtkextra--/Makefile
+++ b/x11-toolkits/gtkextra--/Makefile
@@ -19,7 +19,8 @@ LIB_DEPENDS=	gtkextra.17:${PORTSDIR}/x11-toolkits/gtkextra \
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GTK=	yes
-USE_LIBTOOL=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	PERL="${PERL}"
 
diff --git a/x11-toolkits/gtkextra/Makefile b/x11-toolkits/gtkextra/Makefile
index 82ec60bd2a5a..c52d866a6038 100644
--- a/x11-toolkits/gtkextra/Makefile
+++ b/x11-toolkits/gtkextra/Makefile
@@ -17,8 +17,9 @@ DISTNAME=	${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
 USE_LIBTOOL=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile
index 82ec60bd2a5a..c52d866a6038 100644
--- a/x11-toolkits/gtkextra2/Makefile
+++ b/x11-toolkits/gtkextra2/Makefile
@@ -17,8 +17,9 @@ DISTNAME=	${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
 USE_LIBTOOL=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/x11-toolkits/gtkglarea--/Makefile b/x11-toolkits/gtkglarea--/Makefile
index d51792bf96f2..f712c51e40d7 100644
--- a/x11-toolkits/gtkglarea--/Makefile
+++ b/x11-toolkits/gtkglarea--/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	ports@FreeBSD.org
 LIB_DEPENDS=	gtkmm:${PORTSDIR}/x11-toolkits/gtk-- \
 		gtkgl:${PORTSDIR}/x11-toolkits/gtkglarea
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_MESA=	yes
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/gtkscintilla/Makefile b/x11-toolkits/gtkscintilla/Makefile
index e4d617588ee4..b32415947885 100644
--- a/x11-toolkits/gtkscintilla/Makefile
+++ b/x11-toolkits/gtkscintilla/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS=	scintilla.1:${PORTSDIR}/x11-toolkits/scintilla
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 INSTALLS_SHLIB=	yes
 
 do-install:
diff --git a/x11-toolkits/gtkstep-pastel/Makefile b/x11-toolkits/gtkstep-pastel/Makefile
index 25889757608b..eb85cfa6708c 100644
--- a/x11-toolkits/gtkstep-pastel/Makefile
+++ b/x11-toolkits/gtkstep-pastel/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.10.1
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtkstep/Makefile b/x11-toolkits/gtkstep/Makefile
index 84bcf8e889ce..c3fb72e14233 100644
--- a/x11-toolkits/gtkstep/Makefile
+++ b/x11-toolkits/gtkstep/Makefile
@@ -14,7 +14,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtoolkit/Makefile b/x11-toolkits/gtoolkit/Makefile
index a99a94337777..fd43ae866b30 100644
--- a/x11-toolkits/gtoolkit/Makefile
+++ b/x11-toolkits/gtoolkit/Makefile
@@ -17,7 +17,8 @@ RUN_DEPENDS=    ${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/lang/gnustep-base
 
 PREFIX=		${LOCALBASE}/GNUstep
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 NO_MTREE=	yes
 
diff --git a/x11-toolkits/icegradient/Makefile b/x11-toolkits/icegradient/Makefile
index bd39cd268e4f..e619efdae166 100644
--- a/x11-toolkits/icegradient/Makefile
+++ b/x11-toolkits/icegradient/Makefile
@@ -18,7 +18,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 WRKSRC=		${WRKDIR}/gtk-${PORTNAME}-0.0.5
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
diff --git a/x11-toolkits/libgtkeditor/Makefile b/x11-toolkits/libgtkeditor/Makefile
index 7f4de9c6bf0c..6f049deeedfd 100644
--- a/x11-toolkits/libgtkeditor/Makefile
+++ b/x11-toolkits/libgtkeditor/Makefile
@@ -18,7 +18,8 @@ BUILD_DEPENDS=	${LOCALBASE}/share/automake/install-sh:${PORTSDIR}/devel/automake
 LIB_DEPENDS=	unicode.0:${PORTSDIR}/devel/libunicode
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
diff --git a/x11-toolkits/notif2/Makefile b/x11-toolkits/notif2/Makefile
index 577edf141135..f6c8c69e2c8e 100644
--- a/x11-toolkits/notif2/Makefile
+++ b/x11-toolkits/notif2/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	ports@FreeBSD.org
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
diff --git a/x11-toolkits/p5-GdkImlib/Makefile b/x11-toolkits/p5-GdkImlib/Makefile
index 20fda2e595bd..fd314ef2540e 100644
--- a/x11-toolkits/p5-GdkImlib/Makefile
+++ b/x11-toolkits/p5-GdkImlib/Makefile
@@ -18,8 +18,9 @@ MAINTAINER=	vanilla@FreeBSD.org
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_IMLIB=	yes
 PERL_CONFIGURE=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
 
 MAN3PREFIX=	${LOCALBASE}/lib/perl5/${PERL_VERSION}
diff --git a/x11-toolkits/p5-Gnome/Makefile b/x11-toolkits/p5-Gnome/Makefile
index 382b3fb462cf..1e76e95dd582 100644
--- a/x11-toolkits/p5-Gnome/Makefile
+++ b/x11-toolkits/p5-Gnome/Makefile
@@ -19,7 +19,8 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk/Gdk
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_GNOMELIBS=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomelibs
 PERL_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
 
diff --git a/x11-toolkits/p5-Gtk/Makefile b/x11-toolkits/p5-Gtk/Makefile
index 7b63a78a987d..b0726065fab3 100644
--- a/x11-toolkits/p5-Gtk/Makefile
+++ b/x11-toolkits/p5-Gtk/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	vanilla@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Writer.pm:${PORTSDIR}/textproc/p5-XML-Writer
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 PERL_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-guessing --lazy-load
 
diff --git a/x11-toolkits/p5-GtkGLArea/Makefile b/x11-toolkits/p5-GtkGLArea/Makefile
index 059dbede9bc9..70cce67e13ff 100644
--- a/x11-toolkits/p5-GtkGLArea/Makefile
+++ b/x11-toolkits/p5-GtkGLArea/Makefile
@@ -21,7 +21,8 @@ LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
 BROKEN=		"It need p5-OpenGL, I will commit p5-OpenGl soon!"
 
 USE_MESA=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 PERL_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
 
diff --git a/x11-toolkits/p5-GtkXmHTML/Makefile b/x11-toolkits/p5-GtkXmHTML/Makefile
index 3fae53e766ef..831fa907deba 100644
--- a/x11-toolkits/p5-GtkXmHTML/Makefile
+++ b/x11-toolkits/p5-GtkXmHTML/Makefile
@@ -18,7 +18,8 @@ MAINTAINER=	vanilla@FreeBSD.org
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gnome.pm:${PORTSDIR}/x11-toolkits/p5-Gnome
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_GNOMELIBS=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomelibs
 PERL_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
 
diff --git a/x11-toolkits/pike-gtk/Makefile b/x11-toolkits/pike-gtk/Makefile
index 77efe8191521..0084669c8ba9 100644
--- a/x11-toolkits/pike-gtk/Makefile
+++ b/x11-toolkits/pike-gtk/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	ijliao@FreeBSD.org
 BUILD_DEPENDS=	pike:${PORTSDIR}/lang/pike
 
 USE_XLIB=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-gtkscintilla/Makefile b/x11-toolkits/py-gtkscintilla/Makefile
index 668fc4de8be7..ae8587169270 100644
--- a/x11-toolkits/py-gtkscintilla/Makefile
+++ b/x11-toolkits/py-gtkscintilla/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 LIB_DEPENDS=	gtkscintilla.0:${PORTSDIR}/x11-toolkits/gtkscintilla
 
 USE_PYTHON=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 MAKE_ENV=	PYTHON_INCLUDE="${PYTHON_INCLUDEDIR}"
 
 INST_DIR=	${PREFIX}/lib/${PYTHON_VERSION}/site-packages
diff --git a/x11-toolkits/py-wxPython/Makefile b/x11-toolkits/py-wxPython/Makefile
index 6943d70fae72..f34edb1df770 100644
--- a/x11-toolkits/py-wxPython/Makefile
+++ b/x11-toolkits/py-wxPython/Makefile
@@ -22,7 +22,8 @@ WX_CONFIG=	${X11BASE}/bin/wx-config
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 MAKE_ENV=	WX_CONFIG="${WX_CONFIG}"
 DEMO_DIR=	${PYTHONPREFIX_SITELIBDIR}/wxPython/demo
 
diff --git a/x11-toolkits/py-wxPython24/Makefile b/x11-toolkits/py-wxPython24/Makefile
index 6943d70fae72..f34edb1df770 100644
--- a/x11-toolkits/py-wxPython24/Makefile
+++ b/x11-toolkits/py-wxPython24/Makefile
@@ -22,7 +22,8 @@ WX_CONFIG=	${X11BASE}/bin/wx-config
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 MAKE_ENV=	WX_CONFIG="${WX_CONFIG}"
 DEMO_DIR=	${PYTHONPREFIX_SITELIBDIR}/wxPython/demo
 
diff --git a/x11-toolkits/py-wxPython26/Makefile b/x11-toolkits/py-wxPython26/Makefile
index 6943d70fae72..f34edb1df770 100644
--- a/x11-toolkits/py-wxPython26/Makefile
+++ b/x11-toolkits/py-wxPython26/Makefile
@@ -22,7 +22,8 @@ WX_CONFIG=	${X11BASE}/bin/wx-config
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 MAKE_ENV=	WX_CONFIG="${WX_CONFIG}"
 DEMO_DIR=	${PYTHONPREFIX_SITELIBDIR}/wxPython/demo
 
diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index 6943d70fae72..f34edb1df770 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@@ -22,7 +22,8 @@ WX_CONFIG=	${X11BASE}/bin/wx-config
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 MAKE_ENV=	WX_CONFIG="${WX_CONFIG}"
 DEMO_DIR=	${PYTHONPREFIX_SITELIBDIR}/wxPython/demo
 
diff --git a/x11-toolkits/ruby-gtk/Makefile b/x11-toolkits/ruby-gtk/Makefile
index 2cf5d8f511bb..14b5c3e68e4c 100644
--- a/x11-toolkits/ruby-gtk/Makefile
+++ b/x11-toolkits/ruby-gtk/Makefile
@@ -19,7 +19,8 @@ MAINTAINER=	knu@FreeBSD.org
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 USE_XLIB=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 .include "${.CURDIR}/../../x11/ruby-gnome/Makefile.common"
 
diff --git a/x11-toolkits/ruby-gtk2/Makefile b/x11-toolkits/ruby-gtk2/Makefile
index 2cf5d8f511bb..14b5c3e68e4c 100644
--- a/x11-toolkits/ruby-gtk2/Makefile
+++ b/x11-toolkits/ruby-gtk2/Makefile
@@ -19,7 +19,8 @@ MAINTAINER=	knu@FreeBSD.org
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 USE_XLIB=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 .include "${.CURDIR}/../../x11/ruby-gnome/Makefile.common"
 
diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile
index d64d7d309f62..8149eae5cca8 100644
--- a/x11-toolkits/scintilla/Makefile
+++ b/x11-toolkits/scintilla/Makefile
@@ -20,7 +20,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 INSTALLS_SHLIB=	yes
 MAKEFILE=	makefile
 
diff --git a/x11-toolkits/thinice/Makefile b/x11-toolkits/thinice/Makefile
index b389004d47f9..b0f6e3925ee6 100644
--- a/x11-toolkits/thinice/Makefile
+++ b/x11-toolkits/thinice/Makefile
@@ -19,7 +19,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 WRKSRC=		${WRKDIR}/gtk-${PORTNAME}-theme-${PORTVERSION}
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile
index b10ef7c00f03..a9aff26de8a1 100644
--- a/x11-toolkits/vdk/Makefile
+++ b/x11-toolkits/vdk/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	vdkbuilder
 MAINTAINER=	nakai@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
 WANT_GNOME=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
@@ -25,8 +25,9 @@ MAN1=		vdk-config.1
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GNOME)
-USE_GNOME=	yes
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOME=	gtk12
+PKGNAMESUFFIX=	-gtk
 CONFIGURE_ARGS+=	--enable-gnome
 .endif
 
diff --git a/x11-toolkits/vdkbuilder/Makefile b/x11-toolkits/vdkbuilder/Makefile
index ea80f3a53f78..bca80bf7b3df 100644
--- a/x11-toolkits/vdkbuilder/Makefile
+++ b/x11-toolkits/vdkbuilder/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	vdk.3:${PORTSDIR}/x11-toolkits/vdk
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
 WANT_GNOME=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
@@ -25,9 +25,10 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GNOME)
-USE_GNOME=	yes
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOME+=	gtk12
 CONFIGURE_ARGS+=--enable-gnome
+PKGNAMESUFFIX=	-gtk
 .else
 CONFIGURE_ARGS+=--enable-gnome=no
 .endif
diff --git a/x11-toolkits/whistlerk/Makefile b/x11-toolkits/whistlerk/Makefile
index f4726103c11c..a3db26905132 100644
--- a/x11-toolkits/whistlerk/Makefile
+++ b/x11-toolkits/whistlerk/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 WRKSRC=		${WRKDIR}/gtk-theme-WhistlerK
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
diff --git a/x11-toolkits/wxgtk-devel/Makefile b/x11-toolkits/wxgtk-devel/Makefile
index 62d1c3b80376..8c54b61b1ce7 100644
--- a/x11-toolkits/wxgtk-devel/Makefile
+++ b/x11-toolkits/wxgtk-devel/Makefile
@@ -25,8 +25,9 @@ NO_LATEST_LINK=	"Unstable, development version."
 USE_X_PREFIX=	yes
 USE_MESA=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
 GNU_CONFIGURE=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-libpng=sys \
 		--with-libjpeg=sys \
diff --git a/x11-toolkits/wxgtk/Makefile b/x11-toolkits/wxgtk/Makefile
index 10871d56721e..06ad2ef54e74 100644
--- a/x11-toolkits/wxgtk/Makefile
+++ b/x11-toolkits/wxgtk/Makefile
@@ -21,7 +21,8 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 USE_X_PREFIX=	yes
 USE_MESA=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-libpng=sys \
diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile
index 10871d56721e..06ad2ef54e74 100644
--- a/x11-toolkits/wxgtk24/Makefile
+++ b/x11-toolkits/wxgtk24/Makefile
@@ -21,7 +21,8 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 USE_X_PREFIX=	yes
 USE_MESA=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-libpng=sys \
diff --git a/x11-toolkits/xenophilia/Makefile b/x11-toolkits/xenophilia/Makefile
index 7f2a7457d5eb..8a18bba47b51 100644
--- a/x11-toolkits/xenophilia/Makefile
+++ b/x11-toolkits/xenophilia/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 WRKSRC=		${WRKDIR}/Xenophilia-0.7
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 ALL_TARGET=	# empty
 MAKE_ENV=	GTK-CONFIG="${GTK_CONFIG}"
 
diff --git a/x11-toolkits/xenostep/Makefile b/x11-toolkits/xenostep/Makefile
index 7e625d152164..f836100b54e6 100644
--- a/x11-toolkits/xenostep/Makefile
+++ b/x11-toolkits/xenostep/Makefile
@@ -18,7 +18,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 WRKSRC=		${WRKDIR}/XenoStep
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 ALL_TARGET=	# empty
 MAKE_ENV=	MKDIR="${MKDIR}"