Use USE_GNOMENG.

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

53 files changed, 154 insertions, 107 deletions

diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index d59f6c605070..f7942cc4dd95 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -18,7 +18,8 @@ MAINTAINER=	cpiazza@FreeBSD.org
 
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
-WANT_GTK=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--includedir="${LOCALBASE}/include" \
 		--enable-own-labels \
@@ -30,8 +31,9 @@ MAN1=		aumix.1 xaumix.1
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GTK)
-USE_GTK=	yes
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOME=	gtk12
+PKGNAMESUFFIX=	-gtk
 .else
 CONFIGURE_ARGS+=--without-gtk
 .endif
diff --git a/audio/autozen/Makefile b/audio/autozen/Makefile
index c1008fd65939..89e865c7de4d 100644
--- a/audio/autozen/Makefile
+++ b/audio/autozen/Makefile
@@ -18,7 +18,8 @@ WRKSRC=		${WRKDIR}/AutoZen-${PORTVERSION}
 MAKE_ENV+=	PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 DOC_FILES=	CHANGES COPYING
 DATA_FILES=	deep-relax.seq deep_delta_slide.seq delta_slide.seq \
diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile
index 457545eebace..27de52fabcec 100644
--- a/audio/denemo/Makefile
+++ b/audio/denemo/Makefile
@@ -22,7 +22,8 @@ PLIST=		${WRKDIR}/pkg-plist
 SHARED=		denemo.conf denemo.keymaprc english.keymaprc french.keymaprc
 DOCS=		AUTHORS ChangeLog DESIGN GOALS NEWS README TODO
 DOCDIR=		share/doc/${PORTNAME}
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 
 post-configure:
diff --git a/audio/easytag-devel/Makefile b/audio/easytag-devel/Makefile
index dc3b3e51a485..f27df6992802 100644
--- a/audio/easytag-devel/Makefile
+++ b/audio/easytag-devel/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	dominic_marks@btinternet.com
 LIB_DEPENDS=	id3-3.7.13:${PORTSDIR}/audio/id3lib \
 		vorbis.2:${PORTSDIR}/audio/libvorbis
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CONFIG_SHELL="${SH}" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index dc3b3e51a485..f27df6992802 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	dominic_marks@btinternet.com
 LIB_DEPENDS=	id3-3.7.13:${PORTSDIR}/audio/id3lib \
 		vorbis.2:${PORTSDIR}/audio/libvorbis
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CONFIG_SHELL="${SH}" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/gkrellmms/Makefile b/audio/gkrellmms/Makefile
index 9b19901dec68..14fcd4251b25 100644
--- a/audio/gkrellmms/Makefile
+++ b/audio/gkrellmms/Makefile
@@ -22,6 +22,7 @@ RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 
 .include <bsd.port.mk>
diff --git a/audio/gkrellmms2/Makefile b/audio/gkrellmms2/Makefile
index 9b19901dec68..14fcd4251b25 100644
--- a/audio/gkrellmms2/Makefile
+++ b/audio/gkrellmms2/Makefile
@@ -22,6 +22,7 @@ RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 
 .include <bsd.port.mk>
diff --git a/audio/gkrellmss/Makefile b/audio/gkrellmss/Makefile
index a5bf75472bcf..fd8058934819 100644
--- a/audio/gkrellmss/Makefile
+++ b/audio/gkrellmss/Makefile
@@ -19,9 +19,8 @@ RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_ESOUND=	yes
-USE_GTK=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	esound imlib
 USE_XPM=	yes
 
 DOC_FILES=	Changelog README Themes
diff --git a/audio/gkrellmvolume/Makefile b/audio/gkrellmvolume/Makefile
index f649555c1483..2831f8a80619 100644
--- a/audio/gkrellmvolume/Makefile
+++ b/audio/gkrellmvolume/Makefile
@@ -19,6 +19,7 @@ RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
 WRKSRC=		${WRKDIR}/volume
 
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 
 .include <bsd.port.mk>
diff --git a/audio/gkrellmvolume2/Makefile b/audio/gkrellmvolume2/Makefile
index f649555c1483..2831f8a80619 100644
--- a/audio/gkrellmvolume2/Makefile
+++ b/audio/gkrellmvolume2/Makefile
@@ -19,6 +19,7 @@ RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
 WRKSRC=		${WRKDIR}/volume
 
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 
 .include <bsd.port.mk>
diff --git a/audio/gmixer/Makefile b/audio/gmixer/Makefile
index ffea2e4c3282..8622b22221c8 100644
--- a/audio/gmixer/Makefile
+++ b/audio/gmixer/Makefile
@@ -15,7 +15,8 @@ MAINTAINER=	cpiazza@FreeBSD.org
 
 ALL_TARGET=	gmixer
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gmixer ${PREFIX}/bin
diff --git a/audio/gnapster/Makefile b/audio/gnapster/Makefile
index a19a91828c8f..6e7ed57a3d54 100644
--- a/audio/gnapster/Makefile
+++ b/audio/gnapster/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	cpiazza@FreeBSD.org
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
 WANT_GNOME=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -22,9 +22,10 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GNOME)
-USE_GNOME=	yes
+.if ${HAVE_GNOME:Mimlib}!=""
+USE_GNOME=	imlib
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share
+PKGNAMESUFFIX=	-imlib
 .else
 CONFIGURE_ARGS+=--disable-gnome --disable-gdk-pixbuf
 .endif
diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile
index 5adf428ddc93..0794b69cdb9c 100644
--- a/audio/gqmpeg-devel/Makefile
+++ b/audio/gqmpeg-devel/Makefile
@@ -23,10 +23,10 @@ RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
 
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gdkpixbuf
 USE_LIBTOOL=	yes
 USE_AUTOCONF=	yes
-WANT_GNOME=	yes
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
@@ -36,10 +36,6 @@ MAN1=		gqmpeg.1
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GNOME)
-USE_GNOME=	yes
-.endif
-
 .if !defined(WITH_MPG321)
 pre-everything::
 	@${ECHO_MSG}
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index 5adf428ddc93..0794b69cdb9c 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -23,10 +23,10 @@ RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
 
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gdkpixbuf
 USE_LIBTOOL=	yes
 USE_AUTOCONF=	yes
-WANT_GNOME=	yes
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
@@ -36,10 +36,6 @@ MAN1=		gqmpeg.1
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GNOME)
-USE_GNOME=	yes
-.endif
-
 .if !defined(WITH_MPG321)
 pre-everything::
 	@${ECHO_MSG}
diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index facf86ee73e4..f71555c3d03d 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -22,20 +22,20 @@ USE_AUTOCONF_VER=	213
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_GTK=	yes
-USE_GNOMELIBS=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomelibs
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share
 
 CFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib 
+LDFLAGS=	-L${LOCALBASE}/lib
 
 .if defined(WITH_DEBUG)
 CFLAGS+=	-g
 LDFLAGS+=	-g
 .endif
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" 
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}"
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"
 CONFIGURE_ENV+=	CXXFLAGS="${CXXFLAGS}"
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
diff --git a/audio/lame-devel/Makefile b/audio/lame-devel/Makefile
index e8e92a74d0df..063b6fb85ff4 100644
--- a/audio/lame-devel/Makefile
+++ b/audio/lame-devel/Makefile
@@ -41,7 +41,8 @@ CONFIGURE_ARGS=	--enable-nasm \
 		--enable-mp3rtp
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-WANT_GTK=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
 
 MAN1=		lame.1
 
@@ -49,10 +50,11 @@ NO_LATEST_LINK=	yes
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GTK)
-USE_GTK=	yes
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOME+=	gtk12
 CONFIGURE_ARGS+=	--enable-mp3x
 PLIST_SUB+=		GTK=
+PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-gtk
 .else
 CONFIGURE_ARGS+=	--disable-gtktest
 PLIST_SUB+=		GTK="@comment "
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 82d372de18e0..3291babf0548 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -20,14 +20,16 @@ BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-WANT_GTK=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
 CONFIGURE_ARGS=	--enable-nasm
 
 .include <bsd.port.pre.mk>
 
-.if (defined(HAVE_GTK) || defined(WITH_GTK)) && !defined(WITHOUT_GTK)
-USE_GTK=	yes
+.if (${HAVE_GNOME:Mgtk12}!="" || defined(WITH_GTK)) && !defined(WITHOUT_GTK)
+USE_GNOME+=	gtk12
 PLIST_SUB+=	WITH_GTK=''
+PKGNAMESUFFIX=	-gtk
 .else
 PLIST_SUB+=	WITH_GTK='@comment '
 .endif
@@ -35,12 +37,12 @@ PLIST_SUB+=	WITH_GTK='@comment '
 MAN1=		lame.1
 
 post-build:
-.if defined(HAVE_GTK) && !defined(WITHOUT_GTK)
+.if ${HAVE_GNOME:Mgtk12}!="" && !defined(WITHOUT_GTK)
 	cd ${WRKSRC}/frontend && make mp3x
 .endif
 
 post-install:
-.if defined(HAVE_GTK) && !defined(WITHOUT_GTK)
+.if ${HAVE_GNOME:Mgtk12}!="" && !defined(WITHOUT_GTK)
 	${INSTALL_PROGRAM} ${WRKSRC}/frontend/mp3x ${PREFIX}/bin/
 .endif
 
diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index 42a7e0803632..c880d8d4a41b 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -32,7 +32,7 @@ MAN5=		libao.conf.5
 
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mesound}
+.if ${HAVE_GNOME:Mesound}!=""
 USE_GNOME+=	esound
 PLIST_SUB+=	ESOUND=""
 PKGNAMESUFFIX=	-esound
diff --git a/audio/lopster/Makefile b/audio/lopster/Makefile
index 19d9e68a91fa..37eb4a6d2c0b 100644
--- a/audio/lopster/Makefile
+++ b/audio/lopster/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/audio/mad/Makefile b/audio/mad/Makefile
index ee0e48b428e1..52092a50a46c 100644
--- a/audio/mad/Makefile
+++ b/audio/mad/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	jason@mastaler.com
 
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
-WANT_ESOUND=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
 
 USE_AUTOCONF=	yes
 USE_LIBTOOL=	yes
@@ -35,8 +36,9 @@ MAN1=		abxtest.1 madplay.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+= --without-esd
 .endif
diff --git a/audio/mhwaveedit/Makefile b/audio/mhwaveedit/Makefile
index 16934fee9984..75a0aca57663 100644
--- a/audio/mhwaveedit/Makefile
+++ b/audio/mhwaveedit/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	ports@FreeBSD.org
 LIB_DEPENDS=	sndfile.0:${PORTSDIR}/audio/libsndfile
 
 USE_REINPLACE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/midimountain/Makefile b/audio/midimountain/Makefile
index 78d57ff15db9..c0c9ed274524 100644
--- a/audio/midimountain/Makefile
+++ b/audio/midimountain/Makefile
@@ -16,7 +16,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 
 USE_REINPLACE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
diff --git a/audio/mp3info/Makefile b/audio/mp3info/Makefile
index 71cbd55ca401..c674092edfe9 100644
--- a/audio/mp3info/Makefile
+++ b/audio/mp3info/Makefile
@@ -14,7 +14,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	petef@FreeBSD.org
 
-WANT_GTK=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
 
 MAN1=		mp3info.1
 
@@ -22,9 +23,11 @@ MAN1=		mp3info.1
 
 ALL_TARGET=	doc mp3info
 
-.if defined(HAVE_GTK)
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOME+=	gtk12
 ALL_TARGET+=	gmp3info
 PLIST_SUB+=	WITH_GTK=""
+PKGNAMESUFFIX=	-gtk
 .else
 PLIST_SUB+=	WITH_GTK="@comment "
 .endif
diff --git a/audio/mp3stat/Makefile b/audio/mp3stat/Makefile
index d8c2f78174df..5505a4d75d48 100644
--- a/audio/mp3stat/Makefile
+++ b/audio/mp3stat/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 MAKE_ENV=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
 
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index caab42c60d4f..889d2c606e60 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -25,7 +25,8 @@ PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	des@FreeBSD.org
 
-WANT_ESOUND=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
 
 .if defined(WITH_ICONV)
 MAKE_ARGS+=	WITH_ICONV=yes
@@ -49,9 +50,10 @@ MAN1=		mpg123.1
 MAKE_ENV+=	USE_INET6=yes
 .endif
 
-.if defined(HAVE_ESOUND)
-USE_ESOUND=	yes
+.if ${HAVE_GNOME:Mesound}!=""
+USE_GNOME+=	esound
 ALL_TARGET=	freebsd-esd
+PKGNAMESUFFIX=	-esound
 .elif defined(HAVE_NAS)
 PKGNAMESUFFIX=	-nas
 ALL_TARGET=	freebsd-nas
diff --git a/audio/replay/Makefile b/audio/replay/Makefile
index 775c24392991..1c675c7b5dca 100644
--- a/audio/replay/Makefile
+++ b/audio/replay/Makefile
@@ -15,8 +15,8 @@ DISTNAME=	${PORTNAME}-source-dgtk_${PORTVERSION}
 MAINTAINER=	nakai@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
-USE_ESOUND=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12 esound
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index bd62b9d56426..98fb19708439 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -72,7 +72,8 @@ MAKEFILE=	makefile
 PLIST=		${WRKDIR}/pkg-plist
 .if !defined(WITHOUT_X11)
 PREFIX=		${X11BASE}
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_XLIB=	yes
 .endif
 WRKSRC=		${WRKDIR}/snd-5
diff --git a/audio/soribada/Makefile b/audio/soribada/Makefile
index 9d515ed3bcad..a824b5c1d483 100644
--- a/audio/soribada/Makefile
+++ b/audio/soribada/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	cjh@FreeBSD.org
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile
index 1f58530a1a14..73dfd15439fd 100644
--- a/audio/soundtracker/Makefile
+++ b/audio/soundtracker/Makefile
@@ -13,8 +13,7 @@ MASTER_SITES=	ftp://ftp.soundtracker.org/pub/soundtracker/v0.6/
 MAINTAINER=	kzentner@u.washington.edu
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
-USE_ESOUND=	yes
+USE_GNOMENG=	yes
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -22,9 +21,10 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GNOME)
-USE_GNOME=	yes
+.if ${HAVE_GNOME:Mgnomelibs}!=""
+USE_GNOME=	gtk12 esound
 CONFIGURE_ARGS+=--enable-gnome
+PKGNAMESUFFIX=	-gnome
 .else
 CONFIGURE_ARGS+=--disable-gnome
 .endif
diff --git a/audio/teknap/Makefile b/audio/teknap/Makefile
index 457360e1ed83..c29c2e6c7ff0 100644
--- a/audio/teknap/Makefile
+++ b/audio/teknap/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	TekNap
 PORTVERSION=	1.2
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ukug.uk.freebsd.org/pub/lord_cj/	
+MASTER_SITES=	ftp://ukug.uk.freebsd.org/pub/lord_cj/
 
 MAINTAINER=	calle.madestrand@norrgarden.se
 
@@ -24,16 +24,18 @@ WRKSRC=		${WRKDIR}/TekNap
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 USE_GMAKE=	yes
-WANT_GTK=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GTK)
-USE_GTK=	yes
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOME+=	gtk12
 CONFIGURE_ARGS+=--with-gtk
+PKGNAMESUFFIX=	-gtk
 .else
 CONFIGURE_ARGS+=--without-gtk
 .endif
diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile
index 5b44a509dfe1..38f530907fe0 100644
--- a/audio/terminatorx/Makefile
+++ b/audio/terminatorx/Makefile
@@ -20,7 +20,8 @@ BUILD_DEPENDS+=	sox:${PORTSDIR}/audio/sox
 BUILD_DEPENDS+=	oggenc:${PORTSDIR}/audio/vorbis-tools
 .endif
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
 pre-everything:
diff --git a/audio/timidity++-emacs/Makefile b/audio/timidity++-emacs/Makefile
index 64576ce74495..c888b2c582e8 100644
--- a/audio/timidity++-emacs/Makefile
+++ b/audio/timidity++-emacs/Makefile
@@ -44,7 +44,8 @@ TIMID_LIBDIR=	${PREFIX}/lib/timidity
 ELISPDIR=	${PREFIX}/share/emacs/site-lisp
 .elif ${INTERFACE} == "gtk"
 LINK=		gtkmidi
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 CONFIGURE_ENV=	SHLD="gcc -shared"
 .elif ${INTERFACE} == "motif"
 LINK=		xmmidi
diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
index 74ac746a571f..ad178e8d21ce 100644
--- a/audio/timidity++/Makefile
+++ b/audio/timidity++/Makefile
@@ -23,7 +23,8 @@ SLAVEDIRS+=	audio/timidity++-gtk audio/timidity++-motif \
 		audio/timidity++-xaw audio/timidity++-xskin \
 		japanese/timidity++-slang japanese/timidity++-tcltk
 USE_BZIP2=	yes
-WANT_ESOUND=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 .if !defined(WITHOUT_X11)
 USE_XLIB=	yes
@@ -52,9 +53,10 @@ DOCLANG=	C ja_JP.ujis
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_ESOUND)
-USE_ESOUND=	yes
+.if ${HAVE_GNOME:Mesound}!=""
+USE_GNOME=	esound
 CONFIGURE_ARGS+=--enable-audio=oss,esd
+PKGNAMESUFFIX=	-esound
 .else
 CONFIGURE_ARGS+=--enable-audio=oss
 .endif
diff --git a/audio/wmusic/Makefile b/audio/wmusic/Makefile
index ae70f9254d19..71adfc2b9312 100644
--- a/audio/wmusic/Makefile
+++ b/audio/wmusic/Makefile
@@ -20,7 +20,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PATH_GTKCONFIG=${PREFIX}/bin/gtk12-config
 
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index 0b456486f781..dbece68c6248 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -20,7 +20,8 @@ LIB_DEPENDS=	PropList.2:${PORTSDIR}/devel/libPropList \
 RUN_DEPENDS=	wmaker:${PORTSDIR}/x11-wm/windowmaker
 
 USE_X_PREFIX=	yes
-WANT_ESOUND=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include/WINGs"
@@ -36,9 +37,10 @@ post-install:
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_ESOUND)
-USE_ESOUND=	yes
+.if ${HAVE_GNOME:Mesound}
+USE_GNOME+=	esound
 CONFIGURE_ARGS+=--enable-esd
+PKGNAMESUFFIX=	-esound
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/audio/x11amp/Makefile b/audio/x11amp/Makefile
index 48ad164f5561..a1c3333bbe56 100644
--- a/audio/x11amp/Makefile
+++ b/audio/x11amp/Makefile
@@ -14,10 +14,9 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/-beta/}
 
 MAINTAINER=	dburr@FreeBSD.org
 
-
 USE_XLIB=	yes
-USE_GTK=	yes
-USE_ESOUND=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12 esound
 USE_LIBTOOL=	yes
 LIBTOOLFILES=	configure libx11amp/configure
 CONFIGURE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/audio/xhippo/Makefile b/audio/xhippo/Makefile
index 7dd4b811d79a..80a7e5e8ad67 100644
--- a/audio/xhippo/Makefile
+++ b/audio/xhippo/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	kevlo@FreeBSD.org
 RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
 
 USE_XLIB=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 MAKE_ARGS=	CFLAGS="${CFLAGS}"
@@ -26,8 +26,9 @@ DOCS=		ChangeLog gnu-xhippo.html screenshot.jpeg xhippo.html.gz \
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GNOME)
-USE_GNOME=	yes
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOME=	gtk12
+PKGNAMESUFFIX=	-gtk
 .endif
 
 post-install:
diff --git a/audio/xmixer/Makefile b/audio/xmixer/Makefile
index 51ede2523cde..a63c098973fb 100644
--- a/audio/xmixer/Makefile
+++ b/audio/xmixer/Makefile
@@ -15,7 +15,8 @@ MAINTAINER=	ports@FreeBSD.org
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_REINPLACE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_AUTOCONF=	yes
 
 MAN1=		xmixer.1
diff --git a/audio/xmms-a52dec/Makefile b/audio/xmms-a52dec/Makefile
index e58b2620a2c6..c42ed061912d 100644
--- a/audio/xmms-a52dec/Makefile
+++ b/audio/xmms-a52dec/Makefile
@@ -19,7 +19,8 @@ RUN_DEPENDS=	${X11BASE}/lib/xmms/Output/libOSSSurround.so:${PORTSDIR}/audio/xmms
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/liba52dec.so ${PREFIX}/lib/xmms/Input/
diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile
index 65cddb86e9d6..3c56271ae0cd 100644
--- a/audio/xmms-crossfade/Makefile
+++ b/audio/xmms-crossfade/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS=	xmms.3:${PORTSDIR}/audio/xmms
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 INSTALLS_SHLIB=	yes
 
 post-install:
diff --git a/audio/xmms-crystality/Makefile b/audio/xmms-crystality/Makefile
index 9cadd700a30a..14b51cd05ce2 100644
--- a/audio/xmms-crystality/Makefile
+++ b/audio/xmms-crystality/Makefile
@@ -17,8 +17,8 @@ MAINTAINER=	pat@FreeBSD.org
 LIB_DEPENDS=	xmms.3:${PORTSDIR}/audio/xmms
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 INSTALLS_SHLIB=	yes
 MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
diff --git a/audio/xmms-fc/Makefile b/audio/xmms-fc/Makefile
index 4c122958f13c..3b1dd006501b 100644
--- a/audio/xmms-fc/Makefile
+++ b/audio/xmms-fc/Makefile
@@ -17,6 +17,7 @@ LIB_DEPENDS=	xmms.3:${PORTSDIR}/audio/xmms
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 .include <bsd.port.mk>
diff --git a/audio/xmms-gdancer/Makefile b/audio/xmms-gdancer/Makefile
index 2f6a0a985dee..78dc35c9b178 100644
--- a/audio/xmms-gdancer/Makefile
+++ b/audio/xmms-gdancer/Makefile
@@ -17,7 +17,8 @@ LIB_DEPENDS=	xmms.3:${PORTSDIR}/audio/xmms \
 		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 INSTALLS_SHLIB=	yes
 
 GNU_CONFIGURE=	yes
diff --git a/audio/xmms-ladspa/Makefile b/audio/xmms-ladspa/Makefile
index 801a7beb377a..138133e6e76e 100644
--- a/audio/xmms-ladspa/Makefile
+++ b/audio/xmms-ladspa/Makefile
@@ -17,7 +17,8 @@ LIB_DEPENDS=	xmms.3:${PORTSDIR}/audio/xmms
 
 WRKSRC=		${WRKDIR}/xmms_ladspa
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 do-install:
 	@${INSTALL_DATA} ${WRKSRC}/ladspa.so ${PREFIX}/lib/xmms/Effect/
diff --git a/audio/xmms-liveice/Makefile b/audio/xmms-liveice/Makefile
index de9ba8e48b0f..26d3a4875be9 100644
--- a/audio/xmms-liveice/Makefile
+++ b/audio/xmms-liveice/Makefile
@@ -19,7 +19,8 @@ RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame
 WRKSRC=		${WRKDIR}/LiveIce-1.0.0
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/xmms-musepack/Makefile b/audio/xmms-musepack/Makefile
index 5593574782ee..e7a99ad12d73 100644
--- a/audio/xmms-musepack/Makefile
+++ b/audio/xmms-musepack/Makefile
@@ -16,7 +16,8 @@ LIB_DEPENDS=	xmms.3:${PORTSDIR}/audio/xmms
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 
 post-install:
diff --git a/audio/xmms-shn/Makefile b/audio/xmms-shn/Makefile
index e87552265f8b..c9e36a4ea908 100644
--- a/audio/xmms-shn/Makefile
+++ b/audio/xmms-shn/Makefile
@@ -16,7 +16,8 @@ BUILD_DEPENDS=	xmms-config:${PORTSDIR}/audio/xmms
 RUN_DEPENDS=	xmms:${PORTSDIR}/audio/xmms
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
diff --git a/audio/xmms-sndfile/Makefile b/audio/xmms-sndfile/Makefile
index ed5ae6740556..d51e9b96e568 100644
--- a/audio/xmms-sndfile/Makefile
+++ b/audio/xmms-sndfile/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS=	sndfile.0:${PORTSDIR}/audio/libsndfile \
 
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
diff --git a/audio/xmms-sndstretch/Makefile b/audio/xmms-sndstretch/Makefile
index 692e33c1d459..f5d7ac19bb41 100644
--- a/audio/xmms-sndstretch/Makefile
+++ b/audio/xmms-sndstretch/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS=	xmms.3:${PORTSDIR}/audio/xmms
 
 WRKSRC=		${WRKDIR}/sndstretch_xmms
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 MAKE_ENV+=	GTK_CONFIG="${GTK_CONFIG}" PTHREAD_LIBS=${PTHREAD_LIBS}
diff --git a/audio/xmms-tfmx/Makefile b/audio/xmms-tfmx/Makefile
index 53a8c762094e..22ec6cb7a393 100644
--- a/audio/xmms-tfmx/Makefile
+++ b/audio/xmms-tfmx/Makefile
@@ -17,7 +17,8 @@ LIB_DEPENDS=	xmms.3:${PORTSDIR}/audio/xmms
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/xmms-volnorm/Makefile b/audio/xmms-volnorm/Makefile
index 10fabde1520f..9e00ed8cd84f 100644
--- a/audio/xmms-volnorm/Makefile
+++ b/audio/xmms-volnorm/Makefile
@@ -18,7 +18,8 @@ MAINTAINER=	pat@FreeBSD.org
 LIB_DEPENDS=	xmms.3:${PORTSDIR}/audio/xmms
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index cf50912084ab..441c3511cc21 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -21,16 +21,19 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-alsa
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" CFLAGS="-I${LOCALBASE}/include"
 USE_AUTOCONF=	yes
-WANT_ESOUND=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} > 500013 || ${MACHINE_ARCH} == "alpha"
-USE_ESOUND=	yes
+USE_GNOME+=	esound
 CONFIGURE_ARGS+=	--disable-oss --enable-esd
-.elif defined(HAVE_ESOUND)
-USE_ESOUND=	yes
+PKGNAMESUFFIX=	-esound
+.elif ${HAVE_GNOME:Mesound}!=""
+USE_GNOME+=	esound
 CONFIGURE_ARGS+=	--enable-esd
+PKGNAMESUFFIX=	-esound
 .endif
 
 MAN1=		xmp.1
diff --git a/audio/zinf/Makefile b/audio/zinf/Makefile
index db98bc63252a..04f66959cabf 100644
--- a/audio/zinf/Makefile
+++ b/audio/zinf/Makefile
@@ -18,8 +18,9 @@ LIB_DEPENDS=	musicbrainz.2:${PORTSDIR}/audio/musicbrainz \
 		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
 		ttf.4:${PORTSDIR}/print/freetype
 
-USE_GTK=	yes
-WANT_ESOUND=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
+WANT_GNOME=	yes
 USE_GMAKE=	yes
 USE_AUTOCONF_VER=213
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
@@ -34,9 +35,10 @@ CFLAGS+=	"-D_M_IX86"
 CFLAGS+=	"-D_M_ALPHA"
 .endif
 
-.if defined(HAVE_ESOUND) || defined(WITH_ALL_PLUGINS)
-USE_ESOUND=	yes
+.if ${HAVE_GNOME:Mesound}!="" || defined(WITH_ALL_PLUGINS)
+USE_GNOME+=	esound
 PLIST_SUB+=	ESOUND=""
+PKGNAMESUFFIX=	-esound
 .else
 CONFIGURE_ARGS+=	--disable-esd
 PLIST_SUB+=	ESOUND="@comment "
@@ -69,11 +71,11 @@ pre-everything::
 	@${ECHO_MSG} "WITH_ALL_PLUGINS=yes  build with all plugins"
 	@${ECHO_MSG}
 
-# Stop a flood of complaints and PRs from people who can't be bothered 
+# Stop a flood of complaints and PRs from people who can't be bothered
 # to keep their ports and packages up to date.
 pre-extract:
 	@test -d ${LOCALBASE}/include/freetype1/freetype && true \
-	  || { echo '===> UPGRADE print/freetype TO CURRENT VERSION!';false; }
+	  || { ${ECHO_MSG} '===> UPGRADE print/freetype TO CURRENT VERSION!';false; }
 
 post-install:
 	@${MKDIR} ${PREFIX}/etc/sdr/plugins