Deploy USE_GNOMENG infrastructure

PR:		42345
Submitted by:	Edwin Groothuis <edwin@mavetju.org>

59 files changed, 180 insertions, 130 deletions

diff --git a/dns/staticcharge/Makefile b/dns/staticcharge/Makefile
index dceee9375ce5..d160c9e9bc63 100644
--- a/dns/staticcharge/Makefile
+++ b/dns/staticcharge/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	mahlon@martini.nu
 BUILD_DEPENDS=	lynx:${PORTSDIR}/www/lynx
 
 WRKSRC=		${WRKDIR}/staticcharge
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index ff51086cf298..6672b81e01cc 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -16,8 +16,9 @@ LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile \
 		iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
-WANT_ESOUND=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
+USE_GNOME=	gtk12
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
@@ -31,8 +32,9 @@ MAN1=		everybuddy.1
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_ESOUND)
-USE_ESOUND=	yes
+.if ${HAVE_GNOME:Mesound}!=""
+USE_GNOME+=	esound
+PKGNAMESUFFIX=	-esound
 .else
 CONFIGURE_ARGS+=	--disable-esd
 .endif
diff --git a/net-im/gicq/Makefile b/net-im/gicq/Makefile
index 916dc6132b4c..c2cb375c46c2 100644
--- a/net-im/gicq/Makefile
+++ b/net-im/gicq/Makefile
@@ -18,15 +18,16 @@ LIB_DEPENDS=	icq.0:${PORTSDIR}/net/libicq
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
 WANT_GNOME=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.pre.mk>
 
-.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/net-im/gtkyahoo/Makefile b/net-im/gtkyahoo/Makefile
index 8186a9c6d412..8f2f6dacc453 100644
--- a/net-im/gtkyahoo/Makefile
+++ b/net-im/gtkyahoo/Makefile
@@ -14,7 +14,8 @@ MASTER_SITE_SUBDIR=	gtkyahoo
 MAINTAINER=	anders@hack.org
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_BISON=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/net-im/ickle/Makefile b/net-im/ickle/Makefile
index dfb0386799f0..410eabe3971f 100644
--- a/net-im/ickle/Makefile
+++ b/net-im/ickle/Makefile
@@ -19,8 +19,9 @@ LIB_DEPENDS=	gtkmm:${PORTSDIR}/x11-toolkits/gtk-- \
 		icq2000.5:${PORTSDIR}/net/libicq2000
 
 USE_X_PREFIX=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 WANT_GNOME=	yes
-USE_GTK=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
@@ -35,9 +36,9 @@ post-patch:
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GNOME) || defined(WITH_GNOME)
-USE_GNOME=	yes
-
+.if ${HAVE_GNOME:Mlibcapplet}!="" || defined(WITH_GNOME)
+USE_GNOME+=	libcapplet
+PKGNAMESUFFIX=	-gnome
 PLIST_SUB+=	ICKLEDATADIR="share/gnome/" GNOME="" NOGNOME="@comment "
 .else
 CONFIGURE_ARGS+=	--with-gnome=no
@@ -54,7 +55,7 @@ PLIST_SUB+=	ICKLECONTROL="@comment "
 .endif
 
 pre-everything::
-.if !defined(HAVE_GNOME) && !defined(WITH_GNOME)
+.if ${HAVE_GNOME:Mlibcapplet}=="" && !defined(WITH_GNOME)
 	@${ECHO_MSG} "===> Define WITH_GNOME		to enable GNOME support"
 .endif
 .if !defined(WITH_ICKLE_CONTROL)
diff --git a/net-im/linpopup/Makefile b/net-im/linpopup/Makefile
index 26b212efcfd4..df223ca19bd4 100644
--- a/net-im/linpopup/Makefile
+++ b/net-im/linpopup/Makefile
@@ -19,7 +19,8 @@ WRKSRC=		${WRKDIR}/LinPopUp-${PORTVERSION}/src
 ALL_TARGET=
 MAN1=		linpopup.1 LinPopUp.1
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 
 post-install:
diff --git a/net-im/ymessenger/Makefile b/net-im/ymessenger/Makefile
index b0f630918016..49ec02a79ce3 100644
--- a/net-im/ymessenger/Makefile
+++ b/net-im/ymessenger/Makefile
@@ -11,17 +11,18 @@ PORTVERSION=	0.99.19-1
 CATEGORIES=	net
 MASTER_SITES=	http://download.yahoo.com/dl/unix/fbsd45/
 EXTRACT_SUFX=	.tgz
-NO_WRKSUBDIR=	yes
 
 MAINTAINER=	sethk@meowfishies.com
 
-ONLY_FOR_ARCHS=	i386
-
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
-USE_GTK=	yes
+ONLY_FOR_ARCHS=	i386
+
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_REINPLACE=	yes
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/bin/ymessenger ${PREFIX}/bin
diff --git a/net-mgmt/driftnet/Makefile b/net-mgmt/driftnet/Makefile
index 19e116a878ab..76e7789036c4 100644
--- a/net-mgmt/driftnet/Makefile
+++ b/net-mgmt/driftnet/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	corecode@corecode.ath.cx
 LIB_DEPENDS=	ungif.5:${PORTSDIR}/graphics/libungif \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 
diff --git a/net-mgmt/mbrowse/Makefile b/net-mgmt/mbrowse/Makefile
index 03a0c9e6f10c..74519cc3bcf8 100644
--- a/net-mgmt/mbrowse/Makefile
+++ b/net-mgmt/mbrowse/Makefile
@@ -15,7 +15,8 @@ MAINTAINER=	markp@FreeBSD.org
 LIB_DEPENDS=	snmp.4:${PORTSDIR}/net/net-snmp4
 
 GNU_CONFIGURE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 CONFIGURE_ARGS+=	--with-ucdsnmp-prefix=${LOCALBASE}
 
 post-patch:
diff --git a/net-p2p/dctc-gui/Makefile b/net-p2p/dctc-gui/Makefile
index b3742a752453..cc2eddf960f3 100644
--- a/net-p2p/dctc-gui/Makefile
+++ b/net-p2p/dctc-gui/Makefile
@@ -16,12 +16,11 @@ DISTNAME=	dc_gui-${PORTVERSION}
 MAINTAINER=	lioux@FreeBSD.org
 
 BUILD_DEPENDS=	dctc:${PORTSDIR}/net/dctc
-LIB_DEPENDS=	ORBit.2:${PORTSDIR}/devel/ORBit \
-		db4.0:${PORTSDIR}/databases/db4 \
+LIB_DEPENDS=	db4.0:${PORTSDIR}/databases/db4 \
 		intl.4:${PORTSDIR}/devel/gettext
 
-USE_GNOMELIBS=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomelibs
 USE_XLIB=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
diff --git a/net-p2p/edonkey-gui-gtk/Makefile b/net-p2p/edonkey-gui-gtk/Makefile
index e57e116b2910..8fad5a1014fe 100644
--- a/net-p2p/edonkey-gui-gtk/Makefile
+++ b/net-p2p/edonkey-gui-gtk/Makefile
@@ -21,7 +21,8 @@ RUN_DEPENDS=	donkey:${PORTSDIR}/net/edonkey-core
 
 ONLY_FOR_ARCHS=	i386
 XFREE86_VERSION=	4
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index 02504235a968..a7864f5df78c 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -19,7 +19,8 @@ LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm
 
 USE_BZIP2=	yes
 USE_OPENSSL=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/net-p2p/gtk-gnutella/Makefile b/net-p2p/gtk-gnutella/Makefile
index 03a57d63eeb2..175aa3d8efe6 100644
--- a/net-p2p/gtk-gnutella/Makefile
+++ b/net-p2p/gtk-gnutella/Makefile
@@ -21,7 +21,8 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--enable-no-rfc1918
diff --git a/net-p2p/gtkhx/Makefile b/net-p2p/gtkhx/Makefile
index dd15e04c759c..63da4859d6f2 100644
--- a/net-p2p/gtkhx/Makefile
+++ b/net-p2p/gtkhx/Makefile
@@ -14,11 +14,11 @@ MASTER_SITE_SUBDIR=	gtkhx
 
 MAINTAINER=	jre@vineyard.net
 
-LIB_DEPENDS=	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
-		intl.4:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
 USE_XLIB=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gdkpixbuf
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-libiconv-prefix=${PREFIX}
diff --git a/net-p2p/napshare/Makefile b/net-p2p/napshare/Makefile
index 50dc4556dc24..b78fb2ac69c0 100644
--- a/net-p2p/napshare/Makefile
+++ b/net-p2p/napshare/Makefile
@@ -17,7 +17,8 @@ WRKSRC=		${WRKDIR}/napshare
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/net/amcl/Makefile b/net/amcl/Makefile
index 3e5877aa6a94..616231715225 100644
--- a/net/amcl/Makefile
+++ b/net/amcl/Makefile
@@ -15,7 +15,8 @@ MAINTAINER=	ports@FreeBSD.org
 
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/net/ayttm/Makefile b/net/ayttm/Makefile
index ff51086cf298..6672b81e01cc 100644
--- a/net/ayttm/Makefile
+++ b/net/ayttm/Makefile
@@ -16,8 +16,9 @@ LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile \
 		iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
-WANT_ESOUND=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
+USE_GNOME=	gtk12
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
@@ -31,8 +32,9 @@ MAN1=		everybuddy.1
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_ESOUND)
-USE_ESOUND=	yes
+.if ${HAVE_GNOME:Mesound}!=""
+USE_GNOME+=	esound
+PKGNAMESUFFIX=	-esound
 .else
 CONFIGURE_ARGS+=	--disable-esd
 .endif
diff --git a/net/dctc-gui/Makefile b/net/dctc-gui/Makefile
index b3742a752453..cc2eddf960f3 100644
--- a/net/dctc-gui/Makefile
+++ b/net/dctc-gui/Makefile
@@ -16,12 +16,11 @@ DISTNAME=	dc_gui-${PORTVERSION}
 MAINTAINER=	lioux@FreeBSD.org
 
 BUILD_DEPENDS=	dctc:${PORTSDIR}/net/dctc
-LIB_DEPENDS=	ORBit.2:${PORTSDIR}/devel/ORBit \
-		db4.0:${PORTSDIR}/databases/db4 \
+LIB_DEPENDS=	db4.0:${PORTSDIR}/databases/db4 \
 		intl.4:${PORTSDIR}/devel/gettext
 
-USE_GNOMELIBS=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomelibs
 USE_XLIB=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/driftnet/Makefile b/net/driftnet/Makefile
index 19e116a878ab..76e7789036c4 100644
--- a/net/driftnet/Makefile
+++ b/net/driftnet/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	corecode@corecode.ath.cx
 LIB_DEPENDS=	ungif.5:${PORTSDIR}/graphics/libungif \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 
diff --git a/net/edonkey-gui-gtk/Makefile b/net/edonkey-gui-gtk/Makefile
index e57e116b2910..8fad5a1014fe 100644
--- a/net/edonkey-gui-gtk/Makefile
+++ b/net/edonkey-gui-gtk/Makefile
@@ -21,7 +21,8 @@ RUN_DEPENDS=	donkey:${PORTSDIR}/net/edonkey-core
 
 ONLY_FOR_ARCHS=	i386
 XFREE86_VERSION=	4
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index 0f4620375d78..5f454e364e84 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -14,9 +14,7 @@ DISTNAME=	GnomeMeeting-0.85.1
 
 MAINTAINER=	roger@FreeBSD.org
 
-LIB_DEPENDS=	ldap.1:${PORTSDIR}/net/openldap \
-		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf/
-
+LIB_DEPENDS=	ldap.1:${PORTSDIR}/net/openldap
 BUILD_DEPENDS=  ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
 
 # note, we do not want to clean openh323, otherwise it has to build
@@ -24,15 +22,15 @@ BUILD_DEPENDS=  ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
 NOCLEANDEPENDS= yes
 
 USE_BISON=	yes
-USE_GNOME=	yes
 USE_AUTOCONF=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gdkpixbuf
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	 --with-ptlib-includes=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib/include/ptlib \
 		 --with-ptlib-libs=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib/lib \
 		 --with-openh323-includes=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323/include \
 		 --with-openh323-libs=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323/lib \
-		--with-ldap=/usr/local
+		--with-ldap=${PREFIX}
 CONFIGURE_ENV=	OSTYPE=${OPSYS} \
 		LIBS=-L${PREFIX}/lib \
 		PTLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib \
diff --git a/net/everybuddy/Makefile b/net/everybuddy/Makefile
index ff51086cf298..6672b81e01cc 100644
--- a/net/everybuddy/Makefile
+++ b/net/everybuddy/Makefile
@@ -16,8 +16,9 @@ LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile \
 		iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
-WANT_ESOUND=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
+USE_GNOME=	gtk12
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
@@ -31,8 +32,9 @@ MAN1=		everybuddy.1
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_ESOUND)
-USE_ESOUND=	yes
+.if ${HAVE_GNOME:Mesound}!=""
+USE_GNOME+=	esound
+PKGNAMESUFFIX=	-esound
 .else
 CONFIGURE_ARGS+=	--disable-esd
 .endif
diff --git a/net/geotrace/Makefile b/net/geotrace/Makefile
index df6642efd568..677eb8d9d3bf 100644
--- a/net/geotrace/Makefile
+++ b/net/geotrace/Makefile
@@ -15,7 +15,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ijliao@FreeBSD.org
 
-USE_GNOMECTRL=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	libcapplet
 
 post-patch:
 	@${PERL} -pi -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/prefs.h
diff --git a/net/ggsd/Makefile b/net/ggsd/Makefile
index 4c25bc5bfe76..fc83cb77382d 100644
--- a/net/ggsd/Makefile
+++ b/net/ggsd/Makefile
@@ -22,7 +22,8 @@ EXTRACT_AFTER_ARGS=	# empty
 
 WRKSRC=		${WRKDIR}/GGSD
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ggsd ${PREFIX}/bin
diff --git a/net/gicq/Makefile b/net/gicq/Makefile
index 916dc6132b4c..c2cb375c46c2 100644
--- a/net/gicq/Makefile
+++ b/net/gicq/Makefile
@@ -18,15 +18,16 @@ LIB_DEPENDS=	icq.0:${PORTSDIR}/net/libicq
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
 WANT_GNOME=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.pre.mk>
 
-.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/net/gkrellm_snmp/Makefile b/net/gkrellm_snmp/Makefile
index 18fb0568aa7c..edb790946ea2 100644
--- a/net/gkrellm_snmp/Makefile
+++ b/net/gkrellm_snmp/Makefile
@@ -17,7 +17,8 @@ BUILD_DEPENDS=	${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
 
 USE_X_PREFIX=   yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 MAKE_ENV=	GKRELLM_INCLUDE="-I${X11BASE}/include/gkrellm/" \
 		PLUGIN_DIR="${X11BASE}/libexec/gkrellm/plugins/"
 
diff --git a/net/gkrellmqst/Makefile b/net/gkrellmqst/Makefile
index b5416d297995..5abd1a95df1a 100644
--- a/net/gkrellmqst/Makefile
+++ b/net/gkrellmqst/Makefile
@@ -20,8 +20,8 @@ RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm \
 
 WRKSRC=		${WRKDIR}/${PORTNAME:S/mq/m_q/}
 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=	qst.so
diff --git a/net/gkrellmwireless/Makefile b/net/gkrellmwireless/Makefile
index de9e3dfa40c5..ea37d797dd69 100644
--- a/net/gkrellmwireless/Makefile
+++ b/net/gkrellmwireless/Makefile
@@ -17,6 +17,7 @@ BUILD_DEPENDS=	${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
 
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 
 .include <bsd.port.mk>
diff --git a/net/gnomba/Makefile b/net/gnomba/Makefile
index c3e81c4aad3b..3a57e8f17d25 100644
--- a/net/gnomba/Makefile
+++ b/net/gnomba/Makefile
@@ -14,7 +14,8 @@ MASTER_SITE_SUBDIR=	gnomba
 MAINTAINER=	demon@FreeBSD.org
 
 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/net/gnome-mud/Makefile b/net/gnome-mud/Makefile
index 3e5877aa6a94..616231715225 100644
--- a/net/gnome-mud/Makefile
+++ b/net/gnome-mud/Makefile
@@ -15,7 +15,8 @@ MAINTAINER=	ports@FreeBSD.org
 
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/net/gnome-vnc/Makefile b/net/gnome-vnc/Makefile
index c7a2695051ce..68e7370e9d83 100644
--- a/net/gnome-vnc/Makefile
+++ b/net/gnome-vnc/Makefile
@@ -13,7 +13,8 @@ MASTER_SITES=	ftp://ftp.daa.com.au/pub/james/gnome/
 
 MAINTAINER=	domi@saargate.de
 
-USE_GNOMELIBS=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomelibs
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/net/gnomemeeting/Makefile b/net/gnomemeeting/Makefile
index 0f4620375d78..5f454e364e84 100644
--- a/net/gnomemeeting/Makefile
+++ b/net/gnomemeeting/Makefile
@@ -14,9 +14,7 @@ DISTNAME=	GnomeMeeting-0.85.1
 
 MAINTAINER=	roger@FreeBSD.org
 
-LIB_DEPENDS=	ldap.1:${PORTSDIR}/net/openldap \
-		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf/
-
+LIB_DEPENDS=	ldap.1:${PORTSDIR}/net/openldap
 BUILD_DEPENDS=  ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
 
 # note, we do not want to clean openh323, otherwise it has to build
@@ -24,15 +22,15 @@ BUILD_DEPENDS=  ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
 NOCLEANDEPENDS= yes
 
 USE_BISON=	yes
-USE_GNOME=	yes
 USE_AUTOCONF=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gdkpixbuf
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	 --with-ptlib-includes=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib/include/ptlib \
 		 --with-ptlib-libs=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib/lib \
 		 --with-openh323-includes=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323/include \
 		 --with-openh323-libs=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323/lib \
-		--with-ldap=/usr/local
+		--with-ldap=${PREFIX}
 CONFIGURE_ENV=	OSTYPE=${OPSYS} \
 		LIBS=-L${PREFIX}/lib \
 		PTLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib \
diff --git a/net/gnomemeeting2/Makefile b/net/gnomemeeting2/Makefile
index 0f4620375d78..5f454e364e84 100644
--- a/net/gnomemeeting2/Makefile
+++ b/net/gnomemeeting2/Makefile
@@ -14,9 +14,7 @@ DISTNAME=	GnomeMeeting-0.85.1
 
 MAINTAINER=	roger@FreeBSD.org
 
-LIB_DEPENDS=	ldap.1:${PORTSDIR}/net/openldap \
-		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf/
-
+LIB_DEPENDS=	ldap.1:${PORTSDIR}/net/openldap
 BUILD_DEPENDS=  ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
 
 # note, we do not want to clean openh323, otherwise it has to build
@@ -24,15 +22,15 @@ BUILD_DEPENDS=  ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
 NOCLEANDEPENDS= yes
 
 USE_BISON=	yes
-USE_GNOME=	yes
 USE_AUTOCONF=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gdkpixbuf
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	 --with-ptlib-includes=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib/include/ptlib \
 		 --with-ptlib-libs=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib/lib \
 		 --with-openh323-includes=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323/include \
 		 --with-openh323-libs=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323/lib \
-		--with-ldap=/usr/local
+		--with-ldap=${PREFIX}
 CONFIGURE_ENV=	OSTYPE=${OPSYS} \
 		LIBS=-L${PREFIX}/lib \
 		PTLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib \
diff --git a/net/gnugadu/Makefile b/net/gnugadu/Makefile
index 199d054d9a3d..deeeba08fcda 100644
--- a/net/gnugadu/Makefile
+++ b/net/gnugadu/Makefile
@@ -16,13 +16,15 @@ MAINTAINER=	doc@lublin.t1.pl
 WRKSRC=	${WRKDIR}/gg-${PORTVERSION}
 
 USE_GMAKE=	yes
-USE_GTK=	yes
-WANT_ESOUND=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
+WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.pre.mk>
-.if defined(HAVE_ESOUND)
-USE_ESOUND=	yes
+.if ${HAVE_GNOME:Mesound}!=""
+USE_GNOME+=	esound
+PKGNAMESUFFIX=	-esound
 .else
 CONFIGURE_ARGS+=	--disable-esd
 .endif
diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile
index 02504235a968..a7864f5df78c 100644
--- a/net/gnunet/Makefile
+++ b/net/gnunet/Makefile
@@ -19,7 +19,8 @@ LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm
 
 USE_BZIP2=	yes
 USE_OPENSSL=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/gq/Makefile b/net/gq/Makefile
index e17c60919439..642d657f1c47 100644
--- a/net/gq/Makefile
+++ b/net/gq/Makefile
@@ -19,7 +19,8 @@ LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap
 .endif
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ldap=${LOCALBASE}
 
diff --git a/net/gtk+licq/Makefile b/net/gtk+licq/Makefile
index 068bb00ef1b1..2e4ed207c712 100644
--- a/net/gtk+licq/Makefile
+++ b/net/gtk+licq/Makefile
@@ -21,7 +21,8 @@ RUN_DEPENDS=	licq:${PORTSDIR}/net/licq
 # It breaks the build for some reason
 #USE_LIBTOOL=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -29,8 +30,9 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GNOME)
-USE_GNOME=	yes
+.if ${HAVE_GNOME:Mlibcapplet}!=""
+USE_GNOME+=	libcapplet
+PKGNAMESUFFIX=	-gnome
 CONFIGURE_ARGS+=	--enable-gnome
 .else
 CONFIGURE_ARGS+=	--disable-gnome
diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile
index 03a57d63eeb2..175aa3d8efe6 100644
--- a/net/gtk-gnutella/Makefile
+++ b/net/gtk-gnutella/Makefile
@@ -21,7 +21,8 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--enable-no-rfc1918
diff --git a/net/gtkhx/Makefile b/net/gtkhx/Makefile
index dd15e04c759c..63da4859d6f2 100644
--- a/net/gtkhx/Makefile
+++ b/net/gtkhx/Makefile
@@ -14,11 +14,11 @@ MASTER_SITE_SUBDIR=	gtkhx
 
 MAINTAINER=	jre@vineyard.net
 
-LIB_DEPENDS=	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
-		intl.4:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
 USE_XLIB=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gdkpixbuf
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-libiconv-prefix=${PREFIX}
diff --git a/net/gtkyahoo/Makefile b/net/gtkyahoo/Makefile
index 8186a9c6d412..8f2f6dacc453 100644
--- a/net/gtkyahoo/Makefile
+++ b/net/gtkyahoo/Makefile
@@ -14,7 +14,8 @@ MASTER_SITE_SUBDIR=	gtkyahoo
 MAINTAINER=	anders@hack.org
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_BISON=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/net/ickle/Makefile b/net/ickle/Makefile
index dfb0386799f0..410eabe3971f 100644
--- a/net/ickle/Makefile
+++ b/net/ickle/Makefile
@@ -19,8 +19,9 @@ LIB_DEPENDS=	gtkmm:${PORTSDIR}/x11-toolkits/gtk-- \
 		icq2000.5:${PORTSDIR}/net/libicq2000
 
 USE_X_PREFIX=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 WANT_GNOME=	yes
-USE_GTK=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
@@ -35,9 +36,9 @@ post-patch:
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GNOME) || defined(WITH_GNOME)
-USE_GNOME=	yes
-
+.if ${HAVE_GNOME:Mlibcapplet}!="" || defined(WITH_GNOME)
+USE_GNOME+=	libcapplet
+PKGNAMESUFFIX=	-gnome
 PLIST_SUB+=	ICKLEDATADIR="share/gnome/" GNOME="" NOGNOME="@comment "
 .else
 CONFIGURE_ARGS+=	--with-gnome=no
@@ -54,7 +55,7 @@ PLIST_SUB+=	ICKLECONTROL="@comment "
 .endif
 
 pre-everything::
-.if !defined(HAVE_GNOME) && !defined(WITH_GNOME)
+.if ${HAVE_GNOME:Mlibcapplet}=="" && !defined(WITH_GNOME)
 	@${ECHO_MSG} "===> Define WITH_GNOME		to enable GNOME support"
 .endif
 .if !defined(WITH_ICKLE_CONTROL)
diff --git a/net/icukrell/Makefile b/net/icukrell/Makefile
index 174d7c8ccae6..cea8a3f15141 100644
--- a/net/icukrell/Makefile
+++ b/net/icukrell/Makefile
@@ -18,8 +18,8 @@ RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm \
 		gnomeicu:${PORTSDIR}/net/gnomeicu
 
 USE_X_PREFIX=	yes
-USE_GNOMELIBS=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomelibs
 
 post-patch:
 	@${PERL} -pi -ne "s!/usr/local/!${PREFIX}/!" ${WRKSRC}/config.h
diff --git a/net/ipsorc/Makefile b/net/ipsorc/Makefile
index 07479d00d6d9..580baf9f3731 100644
--- a/net/ipsorc/Makefile
+++ b/net/ipsorc/Makefile
@@ -13,7 +13,8 @@ MASTER_SITE_SUBDIR=     ${PORTNAME}
 
 MAINTAINER=     Nicolas.Jombart@hsc-labs.com
 
-USE_GTK=        yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 post-patch:
 	@${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.old
diff --git a/net/jags/Makefile b/net/jags/Makefile
index 30d11158752a..194610db4123 100644
--- a/net/jags/Makefile
+++ b/net/jags/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	pat@FreeBSD.org
 
 USE_GMAKE=	yes
 USE_XPM=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
 pre-patch:
diff --git a/net/linpopup/Makefile b/net/linpopup/Makefile
index 26b212efcfd4..df223ca19bd4 100644
--- a/net/linpopup/Makefile
+++ b/net/linpopup/Makefile
@@ -19,7 +19,8 @@ WRKSRC=		${WRKDIR}/LinPopUp-${PORTVERSION}/src
 ALL_TARGET=
 MAN1=		linpopup.1 LinPopUp.1
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 
 post-install:
diff --git a/net/mbrowse/Makefile b/net/mbrowse/Makefile
index 03a0c9e6f10c..74519cc3bcf8 100644
--- a/net/mbrowse/Makefile
+++ b/net/mbrowse/Makefile
@@ -15,7 +15,8 @@ MAINTAINER=	markp@FreeBSD.org
 LIB_DEPENDS=	snmp.4:${PORTSDIR}/net/net-snmp4
 
 GNU_CONFIGURE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 CONFIGURE_ARGS+=	--with-ucdsnmp-prefix=${LOCALBASE}
 
 post-patch:
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 4ff7897c11bc..341e6541fd4a 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	billf@FreeBSD.org
 
 USE_AUTOCONF=	yes
 USE_GMAKE=	yes
-WANT_GTK=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
 WANT_IPV6=	yes
 
 MAN8=	mtr.8
@@ -34,9 +35,10 @@ CONFIGURE_ARGS+=--enable-ipv6
 CONFIGURE_ARGS+=--disable-ipv6
 .endif
 
-.if defined(HAVE_GTK)
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOME+=	gtk12
+PKGNAMESUFFIX=	-gtk
 USE_XLIB=	yes
-USE_GTK=	yes
 .else
 CONFIGURE_ARGS+=--without-gtk
 .endif
diff --git a/net/napshare/Makefile b/net/napshare/Makefile
index 50dc4556dc24..b78fb2ac69c0 100644
--- a/net/napshare/Makefile
+++ b/net/napshare/Makefile
@@ -17,7 +17,8 @@ WRKSRC=		${WRKDIR}/napshare
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/net/netscript/Makefile b/net/netscript/Makefile
index 7a4db8f96a6e..bfac79f4d1c3 100644
--- a/net/netscript/Makefile
+++ b/net/netscript/Makefile
@@ -18,12 +18,14 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 
 USE_REINPLACE=	yes
-WANT_GTK=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GTK)
-USE_GTK=	yes
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOME+=	gtk12
+PKGNAMESUFFIX=	-gtk
 ALL_TARGET=	gbsd
 .else
 ALL_TARGET=	bsd
diff --git a/net/pfinger/Makefile b/net/pfinger/Makefile
index b9e4d14511bb..a644d4374a5d 100644
--- a/net/pfinger/Makefile
+++ b/net/pfinger/Makefile
@@ -14,7 +14,8 @@ MASTER_SITES=	ftp://ftp.xelia.ch/pub/unix/ \
 
 MAINTAINER=	ijliao@FreeBSD.org
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
 MAN1=	finger.1 pfinger.1
diff --git a/net/sambasentinel/Makefile b/net/sambasentinel/Makefile
index fb0caf484478..5eb518ed1aa4 100644
--- a/net/sambasentinel/Makefile
+++ b/net/sambasentinel/Makefile
@@ -18,7 +18,8 @@ RUN_DEPENDS=	jags:${PORTSDIR}/net/jags
 WRKSRC=		${WRKDIR}/SambaSentinel
 USE_GMAKE=	yes
 USE_XPM=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 ALL_TARGET=	SambaSentinel
 
 do-install:
diff --git a/net/staticcharge/Makefile b/net/staticcharge/Makefile
index dceee9375ce5..d160c9e9bc63 100644
--- a/net/staticcharge/Makefile
+++ b/net/staticcharge/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	mahlon@martini.nu
 BUILD_DEPENDS=	lynx:${PORTSDIR}/www/lynx
 
 WRKSRC=		${WRKDIR}/staticcharge
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/net/tvark/Makefile b/net/tvark/Makefile
index 01d694be0461..39bbcfd02f81 100644
--- a/net/tvark/Makefile
+++ b/net/tvark/Makefile
@@ -15,7 +15,8 @@ MAINTAINER=	mwest@uct.ac.za
 LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 post-patch:
 	@${PERL} -pi -e "s|/usr/local/bin|${PREFIX}/bin|" ${WRKSRC}/Makefile
diff --git a/net/wmlj/Makefile b/net/wmlj/Makefile
index 929d3c051460..1fcc9beaf838 100644
--- a/net/wmlj/Makefile
+++ b/net/wmlj/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	sgt@outline.ru
 LIB_DEPENDS=	curl.2:${PORTSDIR}/ftp/curl
 
 GNU_CONFIGURE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 MAN1=		wmlj.1
 
diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile
index 8a97add6995d..fc39d9b75567 100644
--- a/net/xtraceroute/Makefile
+++ b/net/xtraceroute/Makefile
@@ -15,13 +15,13 @@ MAINTAINER=	sobomax@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/host:${PORTSDIR}/net/host \
 		msgfmt-old:${PORTSDIR}/devel/gettext-old
-LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea \
-		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
+LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
 RUN_DEPENDS=	${LOCALBASE}/bin/host:${PORTSDIR}/net/host
 
 USE_X_PREFIX=	yes
 USE_MESA=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gdkpixbuf
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-GL-prefix=${X11BASE}/lib \
 		--with-lib-GL \
diff --git a/net/xwhois/Makefile b/net/xwhois/Makefile
index a9fd8142d7b5..8ef5eca4b7c1 100644
--- a/net/xwhois/Makefile
+++ b/net/xwhois/Makefile
@@ -15,7 +15,8 @@ MASTER_SITES=	http://c64.org/~nr/ \
 MAINTAINER=	billf@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
 do-install:
diff --git a/net/ymessenger/Makefile b/net/ymessenger/Makefile
index b0f630918016..49ec02a79ce3 100644
--- a/net/ymessenger/Makefile
+++ b/net/ymessenger/Makefile
@@ -11,17 +11,18 @@ PORTVERSION=	0.99.19-1
 CATEGORIES=	net
 MASTER_SITES=	http://download.yahoo.com/dl/unix/fbsd45/
 EXTRACT_SUFX=	.tgz
-NO_WRKSUBDIR=	yes
 
 MAINTAINER=	sethk@meowfishies.com
 
-ONLY_FOR_ARCHS=	i386
-
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
-USE_GTK=	yes
+ONLY_FOR_ARCHS=	i386
+
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_REINPLACE=	yes
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/bin/ymessenger ${PREFIX}/bin
diff --git a/polish/gnugadu/Makefile b/polish/gnugadu/Makefile
index 199d054d9a3d..deeeba08fcda 100644
--- a/polish/gnugadu/Makefile
+++ b/polish/gnugadu/Makefile
@@ -16,13 +16,15 @@ MAINTAINER=	doc@lublin.t1.pl
 WRKSRC=	${WRKDIR}/gg-${PORTVERSION}
 
 USE_GMAKE=	yes
-USE_GTK=	yes
-WANT_ESOUND=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
+WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.pre.mk>
-.if defined(HAVE_ESOUND)
-USE_ESOUND=	yes
+.if ${HAVE_GNOME:Mesound}!=""
+USE_GNOME+=	esound
+PKGNAMESUFFIX=	-esound
 .else
 CONFIGURE_ARGS+=	--disable-esd
 .endif
diff --git a/polish/gnugadu2/Makefile b/polish/gnugadu2/Makefile
index 199d054d9a3d..deeeba08fcda 100644
--- a/polish/gnugadu2/Makefile
+++ b/polish/gnugadu2/Makefile
@@ -16,13 +16,15 @@ MAINTAINER=	doc@lublin.t1.pl
 WRKSRC=	${WRKDIR}/gg-${PORTVERSION}
 
 USE_GMAKE=	yes
-USE_GTK=	yes
-WANT_ESOUND=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
+WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.pre.mk>
-.if defined(HAVE_ESOUND)
-USE_ESOUND=	yes
+.if ${HAVE_GNOME:Mesound}!=""
+USE_GNOME+=	esound
+PKGNAMESUFFIX=	-esound
 .else
 CONFIGURE_ARGS+=	--disable-esd
 .endif