7 files changed, 10 insertions, 19 deletions

diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile
index 361ee339ade7..e667f039641b 100644
--- a/deskutils/glabels/Makefile
+++ b/deskutils/glabels/Makefile
@@ -14,11 +14,10 @@ MASTER_SITES=	http://snaught.com/glabels/source/
 MAINTAINER=	ports@freebsd.org
 COMMENT=	A programm to create labels and business cards
 
-LIB_DEPENDS=	gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui20 \
-		gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
+LIB_DEPENDS=	gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui20
 
 USE_GETOPT_LONG=yes
-USE_GNOME=	gnomehack gnomeprefix gnomelibs
+USE_GNOME=	gnomehack gnomeprefix gnomelibs libgnomeui
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/deskutils/gnotime/Makefile b/deskutils/gnotime/Makefile
index 0ef8a71d4a89..7f619f12c78a 100644
--- a/deskutils/gnotime/Makefile
+++ b/deskutils/gnotime/Makefile
@@ -14,11 +14,9 @@ MASTER_SITE_SUBDIR=	gttr
 MAINTAINER=	ports@freebsd.org
 COMMENT=	GnoTime is a time tracker for gnome2
 
-LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
-		gtkhtml-2.0:${PORTSDIR}/www/libgtkhtml \
-		guile.15:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	guile.15:${PORTSDIR}/lang/guile
 
-USE_GNOME=	gnomehack gnomeprefix
+USE_GNOME=	gnomehack gnomeprefix libgtkhtml libgnomeui
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/graphics/osgedit/Makefile b/graphics/osgedit/Makefile
index 6efe236ef4ae..e185cee8795e 100644
--- a/graphics/osgedit/Makefile
+++ b/graphics/osgedit/Makefile
@@ -16,14 +16,14 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An open editor for an open scenegraph
 
 BUILD_DEPENDS=	${X11BASE}/lib/libosg.so:${PORTSDIR}/graphics/osg
-LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
-		gtkgl-2.0.1:${PORTSDIR}/x11-toolkits/gtkglarea2 \
+LIB_DEPENDS=	gtkgl-2.0.1:${PORTSDIR}/x11-toolkits/gtkglarea2 \
 		intl.5:${PORTSDIR}/devel/gettext \
 		iconv.3:${PORTSDIR}/converters/libiconv
 RUN_DEPENDS=	${X11BASE}/lib/libosg.so:${PORTSDIR}/graphics/osg
 
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
+USE_GNOME=	libgnomeui
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/ruby-gnomecanvas2/Makefile b/graphics/ruby-gnomecanvas2/Makefile
index e09ce17ed41a..31cdd123a986 100644
--- a/graphics/ruby-gnomecanvas2/Makefile
+++ b/graphics/ruby-gnomecanvas2/Makefile
@@ -17,12 +17,12 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Ruby binding for GnomeCanvas2
 
-LIB_DEPENDS=    gnomecanvas-2.200:${PORTSDIR}/graphics/libgnomecanvas
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2 \
 		${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2 \
 		${RUBY_SITEARCHLIBDIR}/libart2.so:${PORTSDIR}/graphics/ruby-libart2
 
 USE_RUBY=	yes
+USE_GNOME=	libgnomecanvas
 USE_RUBY_EXTCONF=	yes
 USE_XLIB=	yes
 
diff --git a/misc/metatheme2/Makefile b/misc/metatheme2/Makefile
index 55c6810441dd..b5fcb9006d97 100644
--- a/misc/metatheme2/Makefile
+++ b/misc/metatheme2/Makefile
@@ -17,12 +17,10 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An utility for managing "theme sets" that accomodate gtk, window manager, etc
 
-LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack
+USE_GNOME=	gnomehack libgnomeui
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile
index 7b72724f6baa..a83eb58ef9a1 100644
--- a/net/linphone-base/Makefile
+++ b/net/linphone-base/Makefile
@@ -15,15 +15,13 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A web phone that supports SIP protocol
 
 LIB_DEPENDS=	osip.9:${PORTSDIR}/net/libosip \
-		panel-applet-2.0:${PORTSDIR}/x11/gnomepanel \
-		gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
 		ogg.4:${PORTSDIR}/audio/libogg
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFILES=	configure oRTP/configure speex/configure osipua/configure
-USE_GNOME=	gnomehack gnomeprefix
+USE_GNOME=	gnomehack gnomeprefix libgnomeui gnomepanel
 CONFIGURE_ARGS=	--disable-ipv6
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net/linphone/Makefile b/net/linphone/Makefile
index 7b72724f6baa..a83eb58ef9a1 100644
--- a/net/linphone/Makefile
+++ b/net/linphone/Makefile
@@ -15,15 +15,13 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A web phone that supports SIP protocol
 
 LIB_DEPENDS=	osip.9:${PORTSDIR}/net/libosip \
-		panel-applet-2.0:${PORTSDIR}/x11/gnomepanel \
-		gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
 		ogg.4:${PORTSDIR}/audio/libogg
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFILES=	configure oRTP/configure speex/configure osipua/configure
-USE_GNOME=	gnomehack gnomeprefix
+USE_GNOME=	gnomehack gnomeprefix libgnomeui gnomepanel
 CONFIGURE_ARGS=	--disable-ipv6
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"