80 files changed, 211 insertions, 130 deletions

diff --git a/graphics/avidemux/Makefile b/graphics/avidemux/Makefile
index ab2f961931e0..18c517a92b28 100644
--- a/graphics/avidemux/Makefile
+++ b/graphics/avidemux/Makefile
@@ -24,7 +24,8 @@ BUILD_DEPENDS=	\
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_XLIB=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
 		-I${LINUXBASE}/usr/include/divx" \
diff --git a/graphics/bbrb/Makefile b/graphics/bbrb/Makefile
index 2c866e1920ac..f3a9bac6c73b 100644
--- a/graphics/bbrb/Makefile
+++ b/graphics/bbrb/Makefile
@@ -17,8 +17,8 @@ RUN_DEPENDS=	xv:${PORTSDIR}/graphics/xv \
 		blackbox:${PORTSDIR}/x11-wm/blackbox
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/chbg/Makefile b/graphics/chbg/Makefile
index 1c14218372ff..0b41e07e3348 100644
--- a/graphics/chbg/Makefile
+++ b/graphics/chbg/Makefile
@@ -15,11 +15,10 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	netchild@FreeBSD.org
 
-LIB_DEPENDS=	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf/
-
 # GNOME parts aren't prefix safe, they install into "gnome-config --prefix"
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
+USE_GNOME=	gdkpixbuf
 WANT_GNOME=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
@@ -33,7 +32,7 @@ CONFIGURE_ENV=	CFLAGS="${CFLAGS}" CPPFLAGS="-I${LOCALBASE}/include" \
 USE_GNOME+= gnomeprefix gnomehack libcapplet
 PKGNAMESUFFIX=	-gnome
 .else
-USE_GTK=	yes
+USE_GNOME+=	gtk12
 .endif
 
 MAN1=		chbg.1
diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile
index a2df1b43bf5d..ba036a50589b 100644
--- a/graphics/cqcam/Makefile
+++ b/graphics/cqcam/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 ONLY_FOR_ARCHS=	i386
 
 USE_XLIB=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/divxcalc/Makefile b/graphics/divxcalc/Makefile
index 7be436717912..0806f62ecfcc 100644
--- a/graphics/divxcalc/Makefile
+++ b/graphics/divxcalc/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	ports@FreeBSD.org
 BUILD_DEPENDS=	${LOCALBASE}/share/automake14/automake/install-sh:${PORTSDIR}/devel/automake14
 
 USE_REINPLACE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index ca73b8d95370..85f6caddb93e 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -15,7 +15,8 @@ MAINTAINER=	ports@FreeBSD.org
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/g3dviewer/Makefile b/graphics/g3dviewer/Makefile
index 75b2233e4db3..28a7fa432bd3 100644
--- a/graphics/g3dviewer/Makefile
+++ b/graphics/g3dviewer/Makefile
@@ -15,7 +15,8 @@ MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	gtkgl:${PORTSDIR}/x11-toolkits/gtkglarea
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_MESA=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	\
diff --git a/graphics/gcolor/Makefile b/graphics/gcolor/Makefile
index 820cb7678544..b1c25e69e2ec 100644
--- a/graphics/gcolor/Makefile
+++ b/graphics/gcolor/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/graphics/geist/Makefile b/graphics/geist/Makefile
index 7021dafd1732..38fca4958549 100644
--- a/graphics/geist/Makefile
+++ b/graphics/geist/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS=	Imlib2.1:${PORTSDIR}/graphics/imlib2 \
 XML_CONFIG?=	${LOCALBASE}/bin/xml2-config
 GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
 		LIBS="-L${X11BASE}/lib" \
 		XML_CONFIG="${XML_CONFIG}"
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index d867f1f2b5ee..327db712b3be 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -17,16 +17,18 @@ LIB_DEPENDS=	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
+WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
-WANT_IMLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_IMLIB)
-USE_IMLIB=	yes
+.if ${HAVE_GNOME:Mimlib}!=""
+USE_GNOME+=	imlib
+PKGNAMESUFFIX=	-imlib
 .endif
 
 post-patch:
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index 64ddeb302b50..fcfc3ddf2c0d 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -19,7 +19,8 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_MESA=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gl=${X11BASE}
@@ -28,8 +29,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
 .else
 CONFIGURE_ARGS+=--disable-gnome
 .endif
diff --git a/graphics/gkrellkam/Makefile b/graphics/gkrellkam/Makefile
index febe33770f46..096b2fe366c8 100644
--- a/graphics/gkrellkam/Makefile
+++ b/graphics/gkrellkam/Makefile
@@ -19,8 +19,8 @@ RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
 USE_X_PREFIX=	yes
-USE_GTK=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 USE_GMAKE=	yes
 
 MAN5=		gkrellkam-list.5
diff --git a/graphics/gliv/Makefile b/graphics/gliv/Makefile
index f66f5f5cfc2f..8743c254088a 100644
--- a/graphics/gliv/Makefile
+++ b/graphics/gliv/Makefile
@@ -20,7 +20,8 @@ RUN_DEPENDS=	${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
diff --git a/graphics/gopchop/Makefile b/graphics/gopchop/Makefile
index fc9911ea4124..be0d1144609f 100644
--- a/graphics/gopchop/Makefile
+++ b/graphics/gopchop/Makefile
@@ -21,13 +21,14 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libvo.a:${PORTSDIR}/graphics/libmpeg2
 LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
 		mpeg2.0:${PORTSDIR}/graphics/libmpeg2
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-CPPFLAGS=	-I${LOCALBASE}/include -D__GNU_LIBRARY__ ${PTHREAD_CFLAGS} 
+CPPFLAGS=	-I${LOCALBASE}/include -D__GNU_LIBRARY__ ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib -lgnugetopt ${PTHREAD_LIBS}
 
 post-patch:
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index 2ca3ebdf2726..2d03e3b04e02 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -25,7 +25,8 @@ RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
-USE_GLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	glib12
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index a137d682d235..d40744ea4895 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -13,10 +13,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
-
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gdkpixbuf
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -24,8 +23,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
 .endif
 
 MAN1=		gqview.1
diff --git a/graphics/gsculpt/Makefile b/graphics/gsculpt/Makefile
index 7c7b4ab63f0f..066d59a841e9 100644
--- a/graphics/gsculpt/Makefile
+++ b/graphics/gsculpt/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/gSculpt-${PORTVERSION}
 USE_REINPLACE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 
 post-patch:
diff --git a/graphics/gstreamer-plugins/Makefile b/graphics/gstreamer-plugins/Makefile
index 2e0b1d950ef9..b11bb2c3d377 100644
--- a/graphics/gstreamer-plugins/Makefile
+++ b/graphics/gstreamer-plugins/Makefile
@@ -41,7 +41,8 @@ INSTALLS_SHLIB=	yes
 PLIST_SUB=	LOCALBASE="${LOCALBASE}"
 
 # for esound detection
-WANT_ESOUND=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
 
 MAN1=	gst-launch-ext.1 gst-visualise.1
 
@@ -138,7 +139,8 @@ WITH_AVIFILE=yes
 
 # esound
 .if exists(${LOCALBASE}/lib/libesd.a)
-WITH_ESOUND=yes
+USE_GNOME+=	esound
+PKGNAMESUFFIX=	-esound
 .endif
 
 # flac
@@ -263,12 +265,13 @@ PLIST_SUB+=	AVIFILE=""
 .endif
 
 # esound
-.if !(defined(HAVE_ESOUND) || defined(WITH_ESOUND))
+.if !(${HAVE_GNOME:Mesound}!="" || defined(WITH_ESOUND))
 CONFIGURE_ARGS+=	--disable-esd \
 			--disable-esdtest
 PLIST_SUB+=	ESOUND="@comment "
 .else
-USE_ESOUND=	yes
+USE_GNOME+=	esound
+PKGNAMESUFFIX=	-esound
 CONFIGURE_ARGS+=	--with-esd-prefix=${LOCALBASE}  \
 			--with-esd-exec-prefix=${LOCALBASE}
 PLIST_SUB+=	ESOUND=""
@@ -465,7 +468,7 @@ pre-everything::
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_AVIFILE to enable avifile Video plugin'
 .endif
-.if !(defined(HAVE_ESOUND) || defined(WITH_ESOUND))
+.if !(${HAVE_GNOME:Mesound}!="" || defined(WITH_ESOUND))
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_ESOUND to enable esound Audio plugin'
 .endif
diff --git a/graphics/gtkdps/Makefile b/graphics/gtkdps/Makefile
index feeb40880a3a..5af47f305f52 100644
--- a/graphics/gtkdps/Makefile
+++ b/graphics/gtkdps/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	nakai@FreeBSD.org
 BUILD_DEPENDS=	pswrap:${PORTSDIR}/x11/dgs
 RUN_DEPENDS=	pswrap:${PORTSDIR}/x11/dgs
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-dps-includes=${X11BASE}/include \
diff --git a/graphics/gtkfig/Makefile b/graphics/gtkfig/Makefile
index d407433db7d4..26583c63b2ed 100644
--- a/graphics/gtkfig/Makefile
+++ b/graphics/gtkfig/Makefile
@@ -14,7 +14,8 @@ MASTER_SITES=	ftp://k332.feld.cvut.cz/pub/local/lemming/gtkfig/ \
 MAINTAINER=	dirk@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/graphics/gtkgraph/Makefile b/graphics/gtkgraph/Makefile
index efcfe18bf891..d70f722bdf55 100644
--- a/graphics/gtkgraph/Makefile
+++ b/graphics/gtkgraph/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/gtksee/Makefile b/graphics/gtksee/Makefile
index 9d6931f6125c..0b96488c5977 100644
--- a/graphics/gtksee/Makefile
+++ b/graphics/gtksee/Makefile
@@ -23,7 +23,8 @@ RUN_DEPENDS=	bzip:${PORTSDIR}/archivers/bzip
 RUN_DEPENDS+=	bzip2:${PORTSDIR}/archivers/bzip2
 .endif
 
-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/graphics/gview/Makefile b/graphics/gview/Makefile
index 3887947ae027..16a0bf7aae9a 100644
--- a/graphics/gview/Makefile
+++ b/graphics/gview/Makefile
@@ -15,7 +15,8 @@ MASTER_SITES=	http://netpedia.net/hosting/gview/ \
 MAINTAINER=	cpiazza@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/gxanim/Makefile b/graphics/gxanim/Makefile
index 0c6ec203a9fe..e8515686b65d 100644
--- a/graphics/gxanim/Makefile
+++ b/graphics/gxanim/Makefile
@@ -20,6 +20,7 @@ WRKSRC=	${WRKDIR}/gxanim-${PORTVERSION}
 
 USE_BZIP2=	yes
 USE_XLIB=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 .include <bsd.port.mk>
diff --git a/graphics/imagesort/Makefile b/graphics/imagesort/Makefile
index 2604fea672b7..1c0cadf66bb6 100644
--- a/graphics/imagesort/Makefile
+++ b/graphics/imagesort/Makefile
@@ -15,7 +15,8 @@ MASTER_SITE_SUBDIR=	apps/graphics/viewers/X
 MAINTAINER=	markp@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/imagesort ${PREFIX}/bin
diff --git a/graphics/isreal/Makefile b/graphics/isreal/Makefile
index d181de502c0d..844f88289d3b 100644
--- a/graphics/isreal/Makefile
+++ b/graphics/isreal/Makefile
@@ -15,7 +15,8 @@ EXTRACT_SUFX=	.tar
 MAINTAINER=	markp@FreeBSD.org
 
 USE_XLIB=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/isreal ${PREFIX}/bin
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 2e777b110569..261d902fb6e2 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -21,7 +21,8 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
 .if defined(WITH_IMLIB) || defined(KDE_WITH_IMLIB)
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 PLIST_SUB+=	IMLIB=""
 CONFIGURE_ARGS+=	--with-imlib-config=${X11BASE}/bin
 .else
diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index 2e777b110569..261d902fb6e2 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -21,7 +21,8 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
 .if defined(WITH_IMLIB) || defined(KDE_WITH_IMLIB)
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 PLIST_SUB+=	IMLIB=""
 CONFIGURE_ARGS+=	--with-imlib-config=${X11BASE}/bin
 .else
diff --git a/graphics/kludge3d/Makefile b/graphics/kludge3d/Makefile
index 0b40395db007..d530509170be 100644
--- a/graphics/kludge3d/Makefile
+++ b/graphics/kludge3d/Makefile
@@ -19,7 +19,8 @@ LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_MESA=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
diff --git a/graphics/kuickshow-kde4/Makefile b/graphics/kuickshow-kde4/Makefile
index fe7c3678eaf8..04216c2dc9d0 100644
--- a/graphics/kuickshow-kde4/Makefile
+++ b/graphics/kuickshow-kde4/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	ports@FreeBSD.org
 GNU_CONFIGURE=	yes
 
 USE_REINPLACE=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 USE_KDELIBS_VER=	2
 USE_GMAKE=	yes
 
diff --git a/graphics/kuickshow/Makefile b/graphics/kuickshow/Makefile
index fe7c3678eaf8..04216c2dc9d0 100644
--- a/graphics/kuickshow/Makefile
+++ b/graphics/kuickshow/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	ports@FreeBSD.org
 GNU_CONFIGURE=	yes
 
 USE_REINPLACE=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 USE_KDELIBS_VER=	2
 USE_GMAKE=	yes
 
diff --git a/graphics/libmovtar/Makefile b/graphics/libmovtar/Makefile
index 8a99d2497a14..d61bf2fb33b9 100644
--- a/graphics/libmovtar/Makefile
+++ b/graphics/libmovtar/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	lioux@FreeBSD.org
 LIB_DEPENDS=	SDL-1.1.4:${PORTSDIR}/devel/sdl12 \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
diff --git a/graphics/libxine/Makefile b/graphics/libxine/Makefile
index fc4c81913032..486efc0ae404 100644
--- a/graphics/libxine/Makefile
+++ b/graphics/libxine/Makefile
@@ -28,7 +28,8 @@ LIB_DEPENDS=	a52.0:${PORTSDIR}/audio/liba52 \
 WRKSRC=		${WRKDIR}/${PORTNAME}-lib-${PORTVERSION}
 
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 USE_GMAKE=	yes
 USE_AUTOMAKE=	yes
 USE_MESA=	yes
diff --git a/graphics/maverik/Makefile b/graphics/maverik/Makefile
index 34e01c0e4d46..01b20fe74571 100644
--- a/graphics/maverik/Makefile
+++ b/graphics/maverik/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
 USE_REINPLACE=	yes
 USE_SUBMAKE=	yes
 USE_MESA=	yes
-WANT_GTK=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		REALCURDIR="${.CURDIR}" \
 		DISTNAME="${DISTNAME}"
@@ -37,8 +38,9 @@ CONFIGURE_ARGS+=	--PNGLIBS="-L${LOCALBASE}/lib -lpng" \
 			--PNGINCL="-I${LOCALBASE}/include"
 .endif
 
-.if defined(HAVE_GTK)
-USE_GTK=	yes
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOME+=	gtk12
+PKGNAMESUFFIX=	-gtk
 CONFIGURE_ARGS+=	--GTK
 PLIST_SUB+=	GTK=""
 .else
diff --git a/graphics/mplayer/Makefile b/graphics/mplayer/Makefile
index fbc0e1ee748a..2877ffdd2726 100644
--- a/graphics/mplayer/Makefile
+++ b/graphics/mplayer/Makefile
@@ -34,7 +34,8 @@ CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 CONFIGURE_ARGS= --with-extralibdir=${LOCALBASE}/lib \
 		--with-extraincdir=${LOCALBASE}/include
 
-WANT_GTK=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
 MAN1=		mplayer.1
 MLINKS=		mplayer.1 mencoder.1
 MANCOMPRESSED=	no
@@ -76,12 +77,13 @@ WITH_XANIM=	yes
 CFLAGS+=       -O3 -ffast-math -fomit-frame-pointer
 .endif
 
-.if defined(HAVE_GTK)
+.if ${HAVE_GNOME:Mgtk12}!=""
 WITH_GUI=	yes
 .endif
 
 .if defined(WITH_GUI)
-USE_GTK=	yes
+USE_GNOME+=	gtk12
+PKGNAMESUFFIX=	-gtk
 CONFIGURE_ARGS+=	--enable-gui
 .endif
 
@@ -160,7 +162,7 @@ pre-everything::
 	@${ECHO_MSG} "You can enable additional compilation optimizations"
 	@${ECHO_MSG} "by defining WITH_OPTIMIZED_CFLAGS"
 .endif
-.if !defined(WITH_GUI) && !defined(HAVE_GTK)
+.if !defined(WITH_GUI) && ${HAVE_GNOME:Mgtk12}==""
 	@${ECHO_MSG} "You can enable GTK GUI by defining WITH_GUI."
 .endif
 .if !defined(WITH_DVD)
diff --git a/graphics/ogle-gui/Makefile b/graphics/ogle-gui/Makefile
index a604ed7101b6..3bc12ed7166d 100644
--- a/graphics/ogle-gui/Makefile
+++ b/graphics/ogle-gui/Makefile
@@ -21,10 +21,11 @@ LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext \
 RUN_DEPENDS=	ogle:${PORTSDIR}/graphics/ogle
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
+WANT_GNOME=	yes
 USE_XPM=	yes
 USE_REINPLACE=	yes
-WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-dvd-includes=${LOCALBASE}/include \
@@ -38,8 +39,9 @@ CONFIGURE_ARGS=	--with-dvd-includes=${LOCALBASE}/include \
 
 .include <bsd.port.pre.mk>
 
-.ifdef(HAVE_GNOME)
-USE_GNOME=	yes
+.if ${HAVE_GNOME:Mlibcapplet}!=""
+USE_GNOME+=	libcapplet
+PKGNAMESUFFIX=	-gnome
 SHARE_DATADIR=	share/gnome
 .else
 SHARE_DATADIR=	share
diff --git a/graphics/openquicktime/Makefile b/graphics/openquicktime/Makefile
index 5cca414867ef..e8abad0e6806 100644
--- a/graphics/openquicktime/Makefile
+++ b/graphics/openquicktime/Makefile
@@ -18,7 +18,8 @@ MAINTAINER=	lioux@FreeBSD.org
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
 GNU_CONFIGURE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 INSTALL_SHLIBS=	yes
diff --git a/graphics/p5-Gimp/Makefile b/graphics/p5-Gimp/Makefile
index 4281df958c47..c692f337afe9 100644
--- a/graphics/p5-Gimp/Makefile
+++ b/graphics/p5-Gimp/Makefile
@@ -21,7 +21,8 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:
 LIB_DEPENDS=	gimp.2:${PORTSDIR}/graphics/gimp1
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lintl"
diff --git a/graphics/picturebook/Makefile b/graphics/picturebook/Makefile
index d2ad63de4ad3..24e4e0191dac 100644
--- a/graphics/picturebook/Makefile
+++ b/graphics/picturebook/Makefile
@@ -16,7 +16,8 @@ EXTRACT_SUFX=  .tgz
 MAINTAINER=	alan@clegg.com
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 
 post-build:
 	cd ${WRKSRC}; \
diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile
index 86784e0dce76..91e1dfe9b0c4 100644
--- a/graphics/qiv/Makefile
+++ b/graphics/qiv/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 MAN1=		qiv.1
diff --git a/graphics/ruby-gdk_imlib/Makefile b/graphics/ruby-gdk_imlib/Makefile
index 76f29faff8b5..099c1a416e05 100644
--- a/graphics/ruby-gdk_imlib/Makefile
+++ b/graphics/ruby-gdk_imlib/Makefile
@@ -21,8 +21,8 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/gtk.so:${PORTSDIR}/x11-toolkits/ruby-gtk
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 USE_XLIB=	yes
-USE_GTK=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 
 .include "${.CURDIR}/../../x11/ruby-gnome/Makefile.common"
 
diff --git a/graphics/ruby-gdk_pixbuf/Makefile b/graphics/ruby-gdk_pixbuf/Makefile
index f25cea3b9c59..3c55342bb656 100644
--- a/graphics/ruby-gdk_pixbuf/Makefile
+++ b/graphics/ruby-gdk_pixbuf/Makefile
@@ -16,15 +16,13 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-LIB_DEPENDS=	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/gtk.so:${PORTSDIR}/x11-toolkits/ruby-gtk
 
-USE_GNOMECTRL=	yes
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 USE_XLIB=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	glib12
+USE_GNOME=	glib12 libcapplet gdkpixbuf
 
 .include "${.CURDIR}/../../x11/ruby-gnome/Makefile.common"
 
diff --git a/graphics/ruby-gdk_pixbuf2/Makefile b/graphics/ruby-gdk_pixbuf2/Makefile
index f25cea3b9c59..3c55342bb656 100644
--- a/graphics/ruby-gdk_pixbuf2/Makefile
+++ b/graphics/ruby-gdk_pixbuf2/Makefile
@@ -16,15 +16,13 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-LIB_DEPENDS=	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/gtk.so:${PORTSDIR}/x11-toolkits/ruby-gtk
 
-USE_GNOMECTRL=	yes
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 USE_XLIB=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	glib12
+USE_GNOME=	glib12 libcapplet gdkpixbuf
 
 .include "${.CURDIR}/../../x11/ruby-gnome/Makefile.common"
 
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index 83677b519b4a..8b19180583b2 100644
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -17,7 +17,8 @@ MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	sane.1:${PORTSDIR}/graphics/sane-backends
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/smpeg-xmms/Makefile b/graphics/smpeg-xmms/Makefile
index 12bb040ecdaf..ae1e67b6adb9 100644
--- a/graphics/smpeg-xmms/Makefile
+++ b/graphics/smpeg-xmms/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS=	smpeg.1:${PORTSDIR}/graphics/smpeg \
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/smpeg/Makefile b/graphics/smpeg/Makefile
index 931ff2345d89..dc625362b0ce 100644
--- a/graphics/smpeg/Makefile
+++ b/graphics/smpeg/Makefile
@@ -21,7 +21,8 @@ LIB_DEPENDS=  	SDL-1.1.4:${PORTSDIR}/devel/sdl12
 SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
 
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
diff --git a/graphics/vertex/Makefile b/graphics/vertex/Makefile
index e65b62d1538f..adf61ec25207 100644
--- a/graphics/vertex/Makefile
+++ b/graphics/vertex/Makefile
@@ -13,7 +13,6 @@ MASTER_SITES=	ftp://wolfpack.twu.net/users/wolfpack/
 MAINTAINER=	sobomax@FreeBSD.org
 
 LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea \
-		Imlib.5:${PORTSDIR}/graphics/imlib \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/vertex
@@ -23,7 +22,8 @@ IMLIB_CONFIG?=	${X11BASE}/bin/imlib-config
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_MESA=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		IMLIB_CONFIG="${IMLIB_CONFIG}"
 INSTALL_TARGET=	vertex_install
diff --git a/graphics/vlc/Makefile b/graphics/vlc/Makefile
index 3ec5be732b31..3c0a9671e7f9 100644
--- a/graphics/vlc/Makefile
+++ b/graphics/vlc/Makefile
@@ -24,7 +24,8 @@ CONFIGURE_ARGS+=--with-dvdcss=${LOCALBASE} \
 		--includedir="${LOCALBASE}/include" \
 		--libdir="${LOCALBASE}/lib"
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/xine/Makefile b/graphics/xine/Makefile
index ee559aec5b19..8d2014f04fbd 100644
--- a/graphics/xine/Makefile
+++ b/graphics/xine/Makefile
@@ -21,7 +21,8 @@ LIB_DEPENDS=	xine.2:${PORTSDIR}/graphics/libxine \
 		intl.4:${PORTSDIR}/devel/gettext
 
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
diff --git a/graphics/xmms-avi/Makefile b/graphics/xmms-avi/Makefile
index 10a3aa1715e2..4f59f238b581 100644
--- a/graphics/xmms-avi/Makefile
+++ b/graphics/xmms-avi/Makefile
@@ -25,7 +25,8 @@ SDL_CONFIG?=    ${LOCALBASE}/bin/sdl11-config
 
 ONLY_FOR_ARCHS=	i386
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
 
diff --git a/graphics/xmms-goom/Makefile b/graphics/xmms-goom/Makefile
index 7d0405197b4b..7a19a87db98f 100644
--- a/graphics/xmms-goom/Makefile
+++ b/graphics/xmms-goom/Makefile
@@ -21,7 +21,8 @@ LIB_DEPENDS=	xmms.3:${PORTSDIR}/audio/xmms
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 pre-patch:
 	@${PERL} -pi -e 's|gtk-config|${GTK_CONFIG}|g;' \
diff --git a/graphics/xmms-infinity/Makefile b/graphics/xmms-infinity/Makefile
index 1ef96bda7b0e..b94f55e93015 100644
--- a/graphics/xmms-infinity/Makefile
+++ b/graphics/xmms-infinity/Makefile
@@ -24,7 +24,8 @@ CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 
 pre-patch:
diff --git a/graphics/xmms-iris/Makefile b/graphics/xmms-iris/Makefile
index c94f56d2f39a..57cd06fe7be8 100644
--- a/graphics/xmms-iris/Makefile
+++ b/graphics/xmms-iris/Makefile
@@ -17,7 +17,8 @@ BUILD_DEPENDS=	xmms-config:${PORTSDIR}/audio/xmms
 RUN_DEPENDS=	xmms:${PORTSDIR}/audio/xmms
 
 GNU_CONFIGURE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 USE_MESA=	yes
 USE_X_PREFIX=	yes
diff --git a/graphics/xmms-paranormal/Makefile b/graphics/xmms-paranormal/Makefile
index 76aeb7273fa8..ff9255389126 100644
--- a/graphics/xmms-paranormal/Makefile
+++ b/graphics/xmms-paranormal/Makefile
@@ -24,7 +24,8 @@ CONFIGURE_ENV+=	CFLAGS="-I${LOCALBASE}/include/libxml2/libxml" SDL_CONFIG="${SDL
 
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 USE_MESA=	yes
 USE_X_PREFIX=	yes
diff --git a/graphics/xmms-xvs/Makefile b/graphics/xmms-xvs/Makefile
index 47f821c81c86..7d3e3e2bb206 100644
--- a/graphics/xmms-xvs/Makefile
+++ b/graphics/xmms-xvs/Makefile
@@ -18,7 +18,8 @@ BUILD_DEPENDS=	xmms-config:${PORTSDIR}/audio/xmms
 RUN_DEPENDS=	xmms:${PORTSDIR}/audio/xmms
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	XML2_CONFIG="${LOCALBASE}/bin/xml2-config" \
 		XMMS_CONFIG="${X11BASE}/bin/xmms-config"
diff --git a/graphics/xmps-opendivx-plugin/Makefile b/graphics/xmps-opendivx-plugin/Makefile
index 0dd427b9326c..715329c3c267 100644
--- a/graphics/xmps-opendivx-plugin/Makefile
+++ b/graphics/xmps-opendivx-plugin/Makefile
@@ -20,7 +20,8 @@ LIB_DEPENDS=	divxdecore.0:${PORTSDIR}/graphics/libdivxdecore \
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.0.2
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 PLIST_SUB=	LIB_VERSION="${LIB_VERSION}"
diff --git a/graphics/xmps-win32-plugin/Makefile b/graphics/xmps-win32-plugin/Makefile
index 8b3f005b6f21..bc835054bf49 100644
--- a/graphics/xmps-win32-plugin/Makefile
+++ b/graphics/xmps-win32-plugin/Makefile
@@ -19,7 +19,8 @@ RUN_DEPENDS=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index a70332790a11..77a62d90da3a 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -21,7 +21,8 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 
 USE_GMAKE=	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 -lintl"
diff --git a/graphics/xtheater/Makefile b/graphics/xtheater/Makefile
index 5dbca4ad4f17..7f143cf57c32 100644
--- a/graphics/xtheater/Makefile
+++ b/graphics/xtheater/Makefile
@@ -22,7 +22,8 @@ LIB_DEPENDS=	SDL-1.1.4:${PORTSDIR}/devel/sdl12 \
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 
 USE_BZIP2=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_MESA=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile
index 0f45747a6d10..9fbc44828819 100644
--- a/graphics/xzgv/Makefile
+++ b/graphics/xzgv/Makefile
@@ -15,7 +15,8 @@ MASTER_SITE_SUBDIR=	apps/graphics/viewers/X
 MAINTAINER=	nosuzuki@e-mail.ne.jp
 
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 USE_GMAKE=	yes
 
 MAN1=		xzgv.1
diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index ab2f961931e0..18c517a92b28 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -24,7 +24,8 @@ BUILD_DEPENDS=	\
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_XLIB=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
 		-I${LINUXBASE}/usr/include/divx" \
diff --git a/multimedia/gopchop/Makefile b/multimedia/gopchop/Makefile
index fc9911ea4124..be0d1144609f 100644
--- a/multimedia/gopchop/Makefile
+++ b/multimedia/gopchop/Makefile
@@ -21,13 +21,14 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libvo.a:${PORTSDIR}/graphics/libmpeg2
 LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
 		mpeg2.0:${PORTSDIR}/graphics/libmpeg2
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-CPPFLAGS=	-I${LOCALBASE}/include -D__GNU_LIBRARY__ ${PTHREAD_CFLAGS} 
+CPPFLAGS=	-I${LOCALBASE}/include -D__GNU_LIBRARY__ ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib -lgnugetopt ${PTHREAD_LIBS}
 
 post-patch:
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 2e0b1d950ef9..b11bb2c3d377 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -41,7 +41,8 @@ INSTALLS_SHLIB=	yes
 PLIST_SUB=	LOCALBASE="${LOCALBASE}"
 
 # for esound detection
-WANT_ESOUND=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
 
 MAN1=	gst-launch-ext.1 gst-visualise.1
 
@@ -138,7 +139,8 @@ WITH_AVIFILE=yes
 
 # esound
 .if exists(${LOCALBASE}/lib/libesd.a)
-WITH_ESOUND=yes
+USE_GNOME+=	esound
+PKGNAMESUFFIX=	-esound
 .endif
 
 # flac
@@ -263,12 +265,13 @@ PLIST_SUB+=	AVIFILE=""
 .endif
 
 # esound
-.if !(defined(HAVE_ESOUND) || defined(WITH_ESOUND))
+.if !(${HAVE_GNOME:Mesound}!="" || defined(WITH_ESOUND))
 CONFIGURE_ARGS+=	--disable-esd \
 			--disable-esdtest
 PLIST_SUB+=	ESOUND="@comment "
 .else
-USE_ESOUND=	yes
+USE_GNOME+=	esound
+PKGNAMESUFFIX=	-esound
 CONFIGURE_ARGS+=	--with-esd-prefix=${LOCALBASE}  \
 			--with-esd-exec-prefix=${LOCALBASE}
 PLIST_SUB+=	ESOUND=""
@@ -465,7 +468,7 @@ pre-everything::
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_AVIFILE to enable avifile Video plugin'
 .endif
-.if !(defined(HAVE_ESOUND) || defined(WITH_ESOUND))
+.if !(${HAVE_GNOME:Mesound}!="" || defined(WITH_ESOUND))
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_ESOUND to enable esound Audio plugin'
 .endif
diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile
index 2e0b1d950ef9..b11bb2c3d377 100644
--- a/multimedia/gstreamer-plugins80/Makefile
+++ b/multimedia/gstreamer-plugins80/Makefile
@@ -41,7 +41,8 @@ INSTALLS_SHLIB=	yes
 PLIST_SUB=	LOCALBASE="${LOCALBASE}"
 
 # for esound detection
-WANT_ESOUND=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
 
 MAN1=	gst-launch-ext.1 gst-visualise.1
 
@@ -138,7 +139,8 @@ WITH_AVIFILE=yes
 
 # esound
 .if exists(${LOCALBASE}/lib/libesd.a)
-WITH_ESOUND=yes
+USE_GNOME+=	esound
+PKGNAMESUFFIX=	-esound
 .endif
 
 # flac
@@ -263,12 +265,13 @@ PLIST_SUB+=	AVIFILE=""
 .endif
 
 # esound
-.if !(defined(HAVE_ESOUND) || defined(WITH_ESOUND))
+.if !(${HAVE_GNOME:Mesound}!="" || defined(WITH_ESOUND))
 CONFIGURE_ARGS+=	--disable-esd \
 			--disable-esdtest
 PLIST_SUB+=	ESOUND="@comment "
 .else
-USE_ESOUND=	yes
+USE_GNOME+=	esound
+PKGNAMESUFFIX=	-esound
 CONFIGURE_ARGS+=	--with-esd-prefix=${LOCALBASE}  \
 			--with-esd-exec-prefix=${LOCALBASE}
 PLIST_SUB+=	ESOUND=""
@@ -465,7 +468,7 @@ pre-everything::
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_AVIFILE to enable avifile Video plugin'
 .endif
-.if !(defined(HAVE_ESOUND) || defined(WITH_ESOUND))
+.if !(${HAVE_GNOME:Mesound}!="" || defined(WITH_ESOUND))
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_ESOUND to enable esound Audio plugin'
 .endif
diff --git a/multimedia/gxanim/Makefile b/multimedia/gxanim/Makefile
index 0c6ec203a9fe..e8515686b65d 100644
--- a/multimedia/gxanim/Makefile
+++ b/multimedia/gxanim/Makefile
@@ -20,6 +20,7 @@ WRKSRC=	${WRKDIR}/gxanim-${PORTVERSION}
 
 USE_BZIP2=	yes
 USE_XLIB=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 
 .include <bsd.port.mk>
diff --git a/multimedia/libmovtar/Makefile b/multimedia/libmovtar/Makefile
index 8a99d2497a14..d61bf2fb33b9 100644
--- a/multimedia/libmovtar/Makefile
+++ b/multimedia/libmovtar/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	lioux@FreeBSD.org
 LIB_DEPENDS=	SDL-1.1.4:${PORTSDIR}/devel/sdl12 \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index fc4c81913032..486efc0ae404 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -28,7 +28,8 @@ LIB_DEPENDS=	a52.0:${PORTSDIR}/audio/liba52 \
 WRKSRC=		${WRKDIR}/${PORTNAME}-lib-${PORTVERSION}
 
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 USE_GMAKE=	yes
 USE_AUTOMAKE=	yes
 USE_MESA=	yes
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index fbc0e1ee748a..2877ffdd2726 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -34,7 +34,8 @@ CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 CONFIGURE_ARGS= --with-extralibdir=${LOCALBASE}/lib \
 		--with-extraincdir=${LOCALBASE}/include
 
-WANT_GTK=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
 MAN1=		mplayer.1
 MLINKS=		mplayer.1 mencoder.1
 MANCOMPRESSED=	no
@@ -76,12 +77,13 @@ WITH_XANIM=	yes
 CFLAGS+=       -O3 -ffast-math -fomit-frame-pointer
 .endif
 
-.if defined(HAVE_GTK)
+.if ${HAVE_GNOME:Mgtk12}!=""
 WITH_GUI=	yes
 .endif
 
 .if defined(WITH_GUI)
-USE_GTK=	yes
+USE_GNOME+=	gtk12
+PKGNAMESUFFIX=	-gtk
 CONFIGURE_ARGS+=	--enable-gui
 .endif
 
@@ -160,7 +162,7 @@ pre-everything::
 	@${ECHO_MSG} "You can enable additional compilation optimizations"
 	@${ECHO_MSG} "by defining WITH_OPTIMIZED_CFLAGS"
 .endif
-.if !defined(WITH_GUI) && !defined(HAVE_GTK)
+.if !defined(WITH_GUI) && ${HAVE_GNOME:Mgtk12}==""
 	@${ECHO_MSG} "You can enable GTK GUI by defining WITH_GUI."
 .endif
 .if !defined(WITH_DVD)
diff --git a/multimedia/mplayerxp/Makefile b/multimedia/mplayerxp/Makefile
index fbc0e1ee748a..2877ffdd2726 100644
--- a/multimedia/mplayerxp/Makefile
+++ b/multimedia/mplayerxp/Makefile
@@ -34,7 +34,8 @@ CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 CONFIGURE_ARGS= --with-extralibdir=${LOCALBASE}/lib \
 		--with-extraincdir=${LOCALBASE}/include
 
-WANT_GTK=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
 MAN1=		mplayer.1
 MLINKS=		mplayer.1 mencoder.1
 MANCOMPRESSED=	no
@@ -76,12 +77,13 @@ WITH_XANIM=	yes
 CFLAGS+=       -O3 -ffast-math -fomit-frame-pointer
 .endif
 
-.if defined(HAVE_GTK)
+.if ${HAVE_GNOME:Mgtk12}!=""
 WITH_GUI=	yes
 .endif
 
 .if defined(WITH_GUI)
-USE_GTK=	yes
+USE_GNOME+=	gtk12
+PKGNAMESUFFIX=	-gtk
 CONFIGURE_ARGS+=	--enable-gui
 .endif
 
@@ -160,7 +162,7 @@ pre-everything::
 	@${ECHO_MSG} "You can enable additional compilation optimizations"
 	@${ECHO_MSG} "by defining WITH_OPTIMIZED_CFLAGS"
 .endif
-.if !defined(WITH_GUI) && !defined(HAVE_GTK)
+.if !defined(WITH_GUI) && ${HAVE_GNOME:Mgtk12}==""
 	@${ECHO_MSG} "You can enable GTK GUI by defining WITH_GUI."
 .endif
 .if !defined(WITH_DVD)
diff --git a/multimedia/ogle-gui/Makefile b/multimedia/ogle-gui/Makefile
index a604ed7101b6..3bc12ed7166d 100644
--- a/multimedia/ogle-gui/Makefile
+++ b/multimedia/ogle-gui/Makefile
@@ -21,10 +21,11 @@ LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext \
 RUN_DEPENDS=	ogle:${PORTSDIR}/graphics/ogle
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
+WANT_GNOME=	yes
 USE_XPM=	yes
 USE_REINPLACE=	yes
-WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-dvd-includes=${LOCALBASE}/include \
@@ -38,8 +39,9 @@ CONFIGURE_ARGS=	--with-dvd-includes=${LOCALBASE}/include \
 
 .include <bsd.port.pre.mk>
 
-.ifdef(HAVE_GNOME)
-USE_GNOME=	yes
+.if ${HAVE_GNOME:Mlibcapplet}!=""
+USE_GNOME+=	libcapplet
+PKGNAMESUFFIX=	-gnome
 SHARE_DATADIR=	share/gnome
 .else
 SHARE_DATADIR=	share
diff --git a/multimedia/openquicktime/Makefile b/multimedia/openquicktime/Makefile
index 5cca414867ef..e8abad0e6806 100644
--- a/multimedia/openquicktime/Makefile
+++ b/multimedia/openquicktime/Makefile
@@ -18,7 +18,8 @@ MAINTAINER=	lioux@FreeBSD.org
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
 GNU_CONFIGURE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 INSTALL_SHLIBS=	yes
diff --git a/multimedia/smpeg-xmms/Makefile b/multimedia/smpeg-xmms/Makefile
index 12bb040ecdaf..ae1e67b6adb9 100644
--- a/multimedia/smpeg-xmms/Makefile
+++ b/multimedia/smpeg-xmms/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS=	smpeg.1:${PORTSDIR}/graphics/smpeg \
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile
index 931ff2345d89..dc625362b0ce 100644
--- a/multimedia/smpeg/Makefile
+++ b/multimedia/smpeg/Makefile
@@ -21,7 +21,8 @@ LIB_DEPENDS=  	SDL-1.1.4:${PORTSDIR}/devel/sdl12
 SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
 
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index 3ec5be732b31..3c0a9671e7f9 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -24,7 +24,8 @@ CONFIGURE_ARGS+=--with-dvdcss=${LOCALBASE} \
 		--includedir="${LOCALBASE}/include" \
 		--libdir="${LOCALBASE}/lib"
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 3ec5be732b31..3c0a9671e7f9 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -24,7 +24,8 @@ CONFIGURE_ARGS+=--with-dvdcss=${LOCALBASE} \
 		--includedir="${LOCALBASE}/include" \
 		--libdir="${LOCALBASE}/lib"
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index ee559aec5b19..8d2014f04fbd 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -21,7 +21,8 @@ LIB_DEPENDS=	xine.2:${PORTSDIR}/graphics/libxine \
 		intl.4:${PORTSDIR}/devel/gettext
 
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
diff --git a/multimedia/xmms-avi/Makefile b/multimedia/xmms-avi/Makefile
index 10a3aa1715e2..4f59f238b581 100644
--- a/multimedia/xmms-avi/Makefile
+++ b/multimedia/xmms-avi/Makefile
@@ -25,7 +25,8 @@ SDL_CONFIG?=    ${LOCALBASE}/bin/sdl11-config
 
 ONLY_FOR_ARCHS=	i386
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
 
diff --git a/multimedia/xmps-opendivx-plugin/Makefile b/multimedia/xmps-opendivx-plugin/Makefile
index 0dd427b9326c..715329c3c267 100644
--- a/multimedia/xmps-opendivx-plugin/Makefile
+++ b/multimedia/xmps-opendivx-plugin/Makefile
@@ -20,7 +20,8 @@ LIB_DEPENDS=	divxdecore.0:${PORTSDIR}/graphics/libdivxdecore \
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.0.2
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 PLIST_SUB=	LIB_VERSION="${LIB_VERSION}"
diff --git a/multimedia/xmps-win32-plugin/Makefile b/multimedia/xmps-win32-plugin/Makefile
index 8b3f005b6f21..bc835054bf49 100644
--- a/multimedia/xmps-win32-plugin/Makefile
+++ b/multimedia/xmps-win32-plugin/Makefile
@@ -19,7 +19,8 @@ RUN_DEPENDS=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
diff --git a/multimedia/xtheater/Makefile b/multimedia/xtheater/Makefile
index 5dbca4ad4f17..7f143cf57c32 100644
--- a/multimedia/xtheater/Makefile
+++ b/multimedia/xtheater/Makefile
@@ -22,7 +22,8 @@ LIB_DEPENDS=	SDL-1.1.4:${PORTSDIR}/devel/sdl12 \
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 
 USE_BZIP2=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_MESA=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes