20 files changed, 65 insertions, 38 deletions

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