53 files changed, 73 insertions, 248 deletions

diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 0d59a2460b5e..29311c0e02f3 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -15,20 +15,17 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	High-performance CORBA ORB with support for the C language
 
-LIB_DEPENDS=	IDL-2.0:${PORTSDIR}/devel/libIDL \
-		popt.0:${PORTSDIR}/devel/popt \
-		linc.1:${PORTSDIR}/net/linc
+LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
-USE_GNOME=	gnomehack
+USE_GNOME=	gnomehack libidl linc
 CONFIGURE_ARGS= --disable-indent
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 post-patch:
 	@find ${WRKSRC} -type f | xargs ${GREP} -l LINC_THREADSAFE | \
diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile
index e449646633f8..ca74ed428eb0 100644
--- a/devel/bonobo-activation/Makefile
+++ b/devel/bonobo-activation/Makefile
@@ -16,13 +16,10 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An object activation framework for GNOME 2.0
 
-LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
-		ORBit-2.0:${PORTSDIR}/devel/ORBit2
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
-USE_GNOME=	gnomehack
+USE_GNOME=	gnomehack libxml2 orrbit2
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 USE_PERL5=	yes
@@ -30,7 +27,6 @@ CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=	bonobo-activation-server.1
 
diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile
index 1ece029b7abc..634be9a08431 100644
--- a/devel/bugbuddy2/Makefile
+++ b/devel/bugbuddy2/Makefile
@@ -16,17 +16,15 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A bug reporting tool for GNOME 2.0
 
-LIB_DEPENDS=	gnome-desktop-2.3:${PORTSDIR}/x11/gnomedesktop
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-USE_GNOME=	gnomeprefix gnomehack
+USE_GNOME=	gnomeprefix gnomehack gnomedesktop
+GNOME_DESKTOP_VERSION=2
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=	bug-buddy.1
 
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 9ae49dc6d813..141c365305f6 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -16,21 +16,16 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A configuration database system for GNOME
 
-LIB_DEPENDS=	ORBit-2.0:${PORTSDIR}/devel/ORBit2 \
-		xml2.5:${PORTSDIR}/textproc/libxml2 \
-		gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomehack gnomehier
+USE_GNOME=	gnomehack gnomehier orbit2 libxml2 gtk20
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 8cb0cbbe90b1..6e19919658f2 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -30,7 +30,7 @@ USE_BZIP2=	yes
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomehack
+USE_GNOME=	gnomehack gnometarget
 USE_GMAKE=	yes
 USE_PERL5=	yes
 CONFIGURE_ARGS=	--enable-static --with-libiconv=gnu
@@ -38,7 +38,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lintl" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=		glib-genmarshal.1 glib-mkenums.1
 
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 76e842858d42..323a1cfc5c1d 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -16,13 +16,10 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME Virtual File System
 
-LIB_DEPENDS=	gconf-2.5:${PORTSDIR}/devel/gconf2 \
-		bonobo-2.0:${PORTSDIR}/devel/libbonobo
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier gnomemimedata
+USE_GNOME=	gnomeprefix gnomehack gnomehier gnomemimedata gconf2 libbonobo
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
@@ -30,7 +27,6 @@ CONFIGURE_ARGS=	--with-gconf-source=xml::${PREFIX}/etc/gconf/gconf.xml.defaults
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 76e842858d42..323a1cfc5c1d 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -16,13 +16,10 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME Virtual File System
 
-LIB_DEPENDS=	gconf-2.5:${PORTSDIR}/devel/gconf2 \
-		bonobo-2.0:${PORTSDIR}/devel/libbonobo
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier gnomemimedata
+USE_GNOME=	gnomeprefix gnomehack gnomehier gnomemimedata gconf2 libbonobo
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
@@ -30,7 +27,6 @@ CONFIGURE_ARGS=	--with-gconf-source=xml::${PREFIX}/etc/gconf/gconf.xml.defaults
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/gob2/Makefile b/devel/gob2/Makefile
index 9409d9bd514f..93ff3e171a5c 100644
--- a/devel/gob2/Makefile
+++ b/devel/gob2/Makefile
@@ -16,13 +16,11 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A preprocessor for making GObjects with inline C
 
-LIB_DEPENDS=	glib-2.0.200:${PORTSDIR}/devel/glib20
-
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+USE_GNOME=	glib20
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=		gob2.1
 
diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index 67be3d1b3065..fb92ed572620 100644
--- a/devel/libIDL/Makefile
+++ b/devel/libIDL/Makefile
@@ -16,18 +16,16 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A library for creating trees of CORBA Interface Definition Language files
 
-LIB_DEPENDS=	glib-2.0.200:${PORTSDIR}/devel/glib20
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
 USE_GNOME=	gnomehack
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
+USE_GNOME=	glib20
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 .include <bsd.port.mk>
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 1d4279a66c22..38faede2cbdc 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -15,20 +15,17 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A component and compound document system for GNOME2
 
-LIB_DEPENDS=	bonobo-activation.4:${PORTSDIR}/devel/bonobo-activation
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
-USE_GNOME=	gnomehack
+USE_GNOME=	gnomehack bonoboactivation
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 MAKE_ENV=	gnomelocaledir=${PREFIX}/share/locale
 
 .include <bsd.port.mk>
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index d5e22445ff79..fcadc845bb6f 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -18,8 +18,6 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME glade library
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/pyexpat.so:${PORTSDIR}/textproc/py-expat
-LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
-		gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pyexpat.so:${PORTSDIR}/textproc/py-expat
 
 USE_BZIP2=	yes
@@ -28,10 +26,9 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_LIBTOOL=	yes
-USE_GNOME=	gnomehack
+USE_GNOME=	gnomehack libxml2 gtk20
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 .include <bsd.port.mk>
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index 4ae662aa0d55..7a7a74212d2d 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -15,18 +15,14 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An extensible i/o abstraction for dealing with structured file formats
 
-LIB_DEPENDS=	bonobo-2.0:${PORTSDIR}/devel/libbonobo \
-		gnomevfs-2.0:${PORTSDIR}/devel/gnomevfs2
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomehack
+USE_GNOME=	gnomehack libbonobo gnomevfs2
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc/gsf \
 		--disable-gtk-doc --with-gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 .include <bsd.port.mk>
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index cc1225598093..f10e573820b9 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -17,18 +17,15 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2.0 top library
 
-LIB_DEPENDS=	glib-2.0.200:${PORTSDIR}/devel/glib20
-
 USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack
+USE_GNOME=	gnomehack glib20
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 post-install:
 	install-info --section="Programming \& development tools" \
diff --git a/devel/py-orbit2/Makefile b/devel/py-orbit2/Makefile
index c8e7f0020ad1..69ae981ce0bc 100644
--- a/devel/py-orbit2/Makefile
+++ b/devel/py-orbit2/Makefile
@@ -16,11 +16,9 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python bindings for ORBit2
 
-LIB_DEPENDS=	ORBit-2.0:${PORTSDIR}/devel/ORBit2
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack
+USE_GNOME=	gnomehack orbit2
 USE_PYTHON=	yes
 USE_LIBTOOL=	yes
 
diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile
index 479a64335fc6..73de69fe174b 100644
--- a/editors/gedit2/Makefile
+++ b/editors/gedit2/Makefile
@@ -16,10 +16,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A small but powerful text editor for Gnome 2.0 Desktop Environment
 
-LIB_DEPENDS=	gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \
-		gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
-		eel-2.4:${PORTSDIR}/x11-toolkits/eel2 \
-		pspell.15:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS=	pspell.15:${PORTSDIR}/textproc/aspell
 
 WRKSRC=	${WRKDIR}/gedit-${PORTVERSION}
 
@@ -28,10 +25,9 @@ USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier
+USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeprintui eel2
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=	gedit.1
 
diff --git a/editors/ghex2/Makefile b/editors/ghex2/Makefile
index 7b1a273669d5..859c66ef4aec 100644
--- a/editors/ghex2/Makefile
+++ b/editors/ghex2/Makefile
@@ -16,14 +16,10 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 hex editor
 
-LIB_DEPENDS=	gailutil.17:${PORTSDIR}/x11-toolkits/gail \
-		gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \
-		gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack
+USE_GNOME=	gnomeprefix gnomehack gail libgnomeprintui libgnomeui
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index d63b1dd68b54..e6fb4598a768 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -16,19 +16,17 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The game applications package for the Gnome 2.0 Desktop Environment
 
-LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
-		guile.10:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	guile.10:${PORTSDIR}/lang/guile
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier
+USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeui
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index d63b1dd68b54..e6fb4598a768 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -16,19 +16,17 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The game applications package for the Gnome 2.0 Desktop Environment
 
-LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
-		guile.10:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	guile.10:${PORTSDIR}/lang/guile
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier
+USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeui
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index 431ca1a2fdf2..416c2c69ad88 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -16,19 +16,15 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The Eye Of Gnome image viewer
 
-LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
-		gnomeprint-2-2.0:${PORTSDIR}/print/libgnomeprint \
-		rsvg-2.4:${PORTSDIR}/graphics/librsvg2
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier
+USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeui libgnomeprintui \
+	   	librsvg2
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/graphics/frontline/Makefile b/graphics/frontline/Makefile
index 71dd5cffb4c1..233f98c477b0 100644
--- a/graphics/frontline/Makefile
+++ b/graphics/frontline/Makefile
@@ -15,12 +15,11 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An autotrace GUI FRONTend like streamLINE(TM)
 
 LIB_DEPENDS=	autotrace.3:${PORTSDIR}/graphics/autotrace \
-		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
 		popt.0:${PORTSDIR}/devel/popt
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomelibs imlib
+USE_GNOME=	gnomeprefix gnomehack gnomelibs imlib libartlgpl2
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/libart_lgpl/Makefile b/graphics/libart_lgpl/Makefile
index 2c0f4090384d..4481dc84076c 100644
--- a/graphics/libart_lgpl/Makefile
+++ b/graphics/libart_lgpl/Makefile
@@ -22,11 +22,7 @@ RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
+USE_GNOME=	gnomehack gnometarget
 USE_LIBTOOL=	yes
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
-
-pre-patch:
-	@find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \
-		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
 
 .include <bsd.port.mk>
diff --git a/graphics/libart_lgpl2/Makefile b/graphics/libart_lgpl2/Makefile
index 2c0f4090384d..4481dc84076c 100644
--- a/graphics/libart_lgpl2/Makefile
+++ b/graphics/libart_lgpl2/Makefile
@@ -22,11 +22,7 @@ RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
+USE_GNOME=	gnomehack gnometarget
 USE_LIBTOOL=	yes
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
-
-pre-patch:
-	@find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \
-		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
 
 .include <bsd.port.mk>
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 3aa42ae2073c..0211e533d311 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -15,20 +15,16 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A graphics library for GNOME
 
-LIB_DEPENDS=	glade-2.0.0:${PORTSDIR}/devel/libglade2 \
-		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
-USE_GNOME=	gnomehack
+USE_GNOME=	gnomehack libglade2 libartlgpl2
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 .include <bsd.port.mk>
diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index bae2e9ab3110..6f9e5bc64ec5 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -15,18 +15,15 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A small vector based drawing program with GNOME libraries
 
 BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/frontline.pc:${PORTSDIR}/graphics/frontline
-LIB_DEPENDS=	glade-2.0.0:${PORTSDIR}/devel/libglade2
-#		gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui20
 RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/frontline.pc:${PORTSDIR}/graphics/frontline
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack
+USE_GNOME=	gnomeprefix gnomehack libglade2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-gnome-print
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I${X11BASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=		sodipodi.1
 
diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
index a832de800be9..911b4c9cdf6d 100644
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@@ -15,13 +15,11 @@ DISTNAME=	xchat-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An X11 IRC client using the GTK+ 2 toolkit
 
-LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
-
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_GNOME=	gnomeprefix gnomehack
+USE_GNOME=	gnomeprefix gnomehack gtk20
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
diff --git a/irc/xchat2/Makefile b/irc/xchat2/Makefile
index a832de800be9..911b4c9cdf6d 100644
--- a/irc/xchat2/Makefile
+++ b/irc/xchat2/Makefile
@@ -15,13 +15,11 @@ DISTNAME=	xchat-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An X11 IRC client using the GTK+ 2 toolkit
 
-LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
-
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_GNOME=	gnomeprefix gnomehack
+USE_GNOME=	gnomeprefix gnomehack gtk20
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 4741696e8eff..07cd6b2c1efd 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -14,18 +14,16 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An open source implementation of .NET Development Framework
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS=	glib-2.0.200:${PORTSDIR}/devel/glib20 \
-		gc.1:${PORTSDIR}/devel/boehm-gc
+LIB_DEPENDS=	gc.1:${PORTSDIR}/devel/boehm-gc
 
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
 USE_BISON=	yes
-USE_GNOME=	gnomehack
+USE_GNOME=	gnomehack glib20
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--program-transform-name=\'\'
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=		mcs.1 mint.1 mono.1 monoburg.1 monodis.1 monostyle.1 \
        		sqlsharp.1
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index a211cdf1d7fb..b2f70ad6c3af 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -15,17 +15,14 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNOME 2 calculator tool based on the old calctool for OpenWindows
 
-LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack
+USE_GNOME=	gnomeprefix gnomehack libgnomeui
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/multimedia/acme/Makefile b/multimedia/acme/Makefile
index 19eaa19485a2..f4446fdec1bd 100644
--- a/multimedia/acme/Makefile
+++ b/multimedia/acme/Makefile
@@ -16,18 +16,15 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Tool to make multimedia keys work on laptops
 
 BUILD_DEPENDS=	gob2:${PORTSDIR}/devel/gob2
-LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
-		wnck-1.9:${PORTSDIR}/x11-toolkits/libwnck	
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack
+USE_GNOME=	gnomeprefix gnomehack libgnomeui libwnck
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/net-im/gnomeicu/Makefile b/net-im/gnomeicu/Makefile
index 54fa8af979d5..b7b8d81008c1 100644
--- a/net-im/gnomeicu/Makefile
+++ b/net-im/gnomeicu/Makefile
@@ -15,15 +15,12 @@ DISTNAME=	gnomeicu-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME2 ICQ client
 
-LIB_DEPENDS+=	glade-2.0.0:${PORTSDIR}/devel/libglade2 \
-		panel-applet-2.0:${PORTSDIR}/x11/gnomepanel \
-		xml2.5:${PORTSDIR}/textproc/libxml2 \
-		gnet-glib2.7:${PORTSDIR}/net/gnet-glib2 \
+LIB_DEPENDS+=	gnet-glib2.7:${PORTSDIR}/net/gnet-glib2 \
 		gdbm.3:${PORTSDIR}/databases/gdbm
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack
+USE_GNOME=	gnomeprefix gnomehack libglade2 gnomepanel libxml2
 USE_GMAKE=		yes
 USE_LIBTOOL=	yes
 .if defined(WITH_DANTE)
@@ -47,7 +44,6 @@ CONFIGURE_ARGS=	--with-statusmenu
 CONFIGURE_ENV=	CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS} -lintl" \
 		CFLAGS="${CFLAGS}"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/net-im/gnomeicu2/Makefile b/net-im/gnomeicu2/Makefile
index 54fa8af979d5..b7b8d81008c1 100644
--- a/net-im/gnomeicu2/Makefile
+++ b/net-im/gnomeicu2/Makefile
@@ -15,15 +15,12 @@ DISTNAME=	gnomeicu-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME2 ICQ client
 
-LIB_DEPENDS+=	glade-2.0.0:${PORTSDIR}/devel/libglade2 \
-		panel-applet-2.0:${PORTSDIR}/x11/gnomepanel \
-		xml2.5:${PORTSDIR}/textproc/libxml2 \
-		gnet-glib2.7:${PORTSDIR}/net/gnet-glib2 \
+LIB_DEPENDS+=	gnet-glib2.7:${PORTSDIR}/net/gnet-glib2 \
 		gdbm.3:${PORTSDIR}/databases/gdbm
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack
+USE_GNOME=	gnomeprefix gnomehack libglade2 gnomepanel libxml2
 USE_GMAKE=		yes
 USE_LIBTOOL=	yes
 .if defined(WITH_DANTE)
@@ -47,7 +44,6 @@ CONFIGURE_ARGS=	--with-statusmenu
 CONFIGURE_ENV=	CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS} -lintl" \
 		CFLAGS="${CFLAGS}"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/net/gnet-glib2/Makefile b/net/gnet-glib2/Makefile
index b44d0139dd91..2ccdb23ae2eb 100644
--- a/net/gnet-glib2/Makefile
+++ b/net/gnet-glib2/Makefile
@@ -13,11 +13,9 @@ MASTER_SITES=	http://www.gnetlibrary.org/src/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A simple network library built upon Glib
 
-LIB_DEPENDS=	glib-2.0.200:${PORTSDIR}/devel/glib20
-
 LATEST_LINK=	gnet-glib2
 USE_REINPLACE=	yes
-USE_GNOME=	gnomehack
+USE_GNOME=	gnomehack glib20
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-glib2
diff --git a/net/gnet2/Makefile b/net/gnet2/Makefile
index b44d0139dd91..2ccdb23ae2eb 100644
--- a/net/gnet2/Makefile
+++ b/net/gnet2/Makefile
@@ -13,11 +13,9 @@ MASTER_SITES=	http://www.gnetlibrary.org/src/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A simple network library built upon Glib
 
-LIB_DEPENDS=	glib-2.0.200:${PORTSDIR}/devel/glib20
-
 LATEST_LINK=	gnet-glib2
 USE_REINPLACE=	yes
-USE_GNOME=	gnomehack
+USE_GNOME=	gnomehack glib20
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-glib2
diff --git a/net/gnomeicu/gnomeicu/Makefile b/net/gnomeicu/gnomeicu/Makefile
index 54fa8af979d5..b7b8d81008c1 100644
--- a/net/gnomeicu/gnomeicu/Makefile
+++ b/net/gnomeicu/gnomeicu/Makefile
@@ -15,15 +15,12 @@ DISTNAME=	gnomeicu-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME2 ICQ client
 
-LIB_DEPENDS+=	glade-2.0.0:${PORTSDIR}/devel/libglade2 \
-		panel-applet-2.0:${PORTSDIR}/x11/gnomepanel \
-		xml2.5:${PORTSDIR}/textproc/libxml2 \
-		gnet-glib2.7:${PORTSDIR}/net/gnet-glib2 \
+LIB_DEPENDS+=	gnet-glib2.7:${PORTSDIR}/net/gnet-glib2 \
 		gdbm.3:${PORTSDIR}/databases/gdbm
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack
+USE_GNOME=	gnomeprefix gnomehack libglade2 gnomepanel libxml2
 USE_GMAKE=		yes
 USE_LIBTOOL=	yes
 .if defined(WITH_DANTE)
@@ -47,7 +44,6 @@ CONFIGURE_ARGS=	--with-statusmenu
 CONFIGURE_ENV=	CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS} -lintl" \
 		CFLAGS="${CFLAGS}"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/net/gnomeicu2/Makefile b/net/gnomeicu2/Makefile
index 54fa8af979d5..b7b8d81008c1 100644
--- a/net/gnomeicu2/Makefile
+++ b/net/gnomeicu2/Makefile
@@ -15,15 +15,12 @@ DISTNAME=	gnomeicu-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME2 ICQ client
 
-LIB_DEPENDS+=	glade-2.0.0:${PORTSDIR}/devel/libglade2 \
-		panel-applet-2.0:${PORTSDIR}/x11/gnomepanel \
-		xml2.5:${PORTSDIR}/textproc/libxml2 \
-		gnet-glib2.7:${PORTSDIR}/net/gnet-glib2 \
+LIB_DEPENDS+=	gnet-glib2.7:${PORTSDIR}/net/gnet-glib2 \
 		gdbm.3:${PORTSDIR}/databases/gdbm
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack
+USE_GNOME=	gnomeprefix gnomehack libglade2 gnomepanel libxml2
 USE_GMAKE=		yes
 USE_LIBTOOL=	yes
 .if defined(WITH_DANTE)
@@ -47,7 +44,6 @@ CONFIGURE_ARGS=	--with-statusmenu
 CONFIGURE_ENV=	CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS} -lintl" \
 		CFLAGS="${CFLAGS}"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/net/linc/Makefile b/net/linc/Makefile
index c2bb5afb17d9..036ae2eb4381 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -15,17 +15,14 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A library for writing networked servers & clients
 
-LIB_DEPENDS=	glib-2.0.200:${PORTSDIR}/devel/glib20
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack
+USE_GNOME=	gnomehack glib20
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 .include <bsd.port.mk>
diff --git a/net/netspeed_applet/Makefile b/net/netspeed_applet/Makefile
index 86594663a2b5..9210c825aeae 100644
--- a/net/netspeed_applet/Makefile
+++ b/net/netspeed_applet/Makefile
@@ -13,17 +13,15 @@ MASTER_SITES=	http://mfcn.ilo.de/netspeed_applet/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Applet that shows how much network traffic occurs on an interface
 
-LIB_DEPENDS=	panel-applet-2.0:${PORTSDIR}/x11/gnomepanel \
-		gtop-2.0:${PORTSDIR}/devel/libgtop2
+LIB_DEPENDS=	gtop-2.0:${PORTSDIR}/devel/libgtop2
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomehier gnomeprefix gnomehack
+USE_GNOME=	gnomehier gnomeprefix gnomehack gnomepanel
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 2b0569b0a235..da80e11d6d9e 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -15,20 +15,15 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome print support library
 
-LIB_DEPENDS=	bonobo-2.0:${PORTSDIR}/devel/libbonobo \
-		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
-		gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier
+USE_GNOME=	gnomeprefix gnomehack gnomehier libbonobo libartlgpl2 gtk20
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
diff --git a/print/libgnomeprint20/Makefile b/print/libgnomeprint20/Makefile
index 31862a3d8fe6..56d0fbf1f042 100644
--- a/print/libgnomeprint20/Makefile
+++ b/print/libgnomeprint20/Makefile
@@ -15,21 +15,16 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome print support library
 
-LIB_DEPENDS=	bonobo-2.0:${PORTSDIR}/devel/libbonobo \
-		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
-		gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
-
 LATEST_LINK=	libgnomeprint20
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier
+USE_GNOME=	gnomeprefix gnomehack gnomehier libbonobo libartlgpl2 gtk20
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index 6453d1c0b4cd..9d33b2cc07a3 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -15,17 +15,14 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A gconf database editor for the GNOME 2.0 environment
 
-LIB_DEPENDS=	gconf-2.5:${PORTSDIR}/devel/gconf2
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack
+USE_GNOME=	gnomeprefix gnomehack gconf2
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile
index 6e1087952239..1b1b816abdd3 100644
--- a/sysutils/gnome-pkgview/Makefile
+++ b/sysutils/gnome-pkgview/Makefile
@@ -13,17 +13,14 @@ MASTER_SITES=	http://www.gtnorthern.demon.co.uk/packages/gnome-pkgview/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Displays the version of GNOME 2 components installed
 
-LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier
+USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeui
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 3e3331e67a45..c2b7b88af750 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -17,19 +17,16 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2.0 system monitor program
 
-LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
-		gtop-2.0.2:${PORTSDIR}/devel/libgtop2 \
-		wnck-1.9:${PORTSDIR}/x11-toolkits/libwnck
+LIB_DEPENDS=	gtop-2.0.2:${PORTSDIR}/devel/libgtop2
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack
+USE_GNOME=	gnomeprefix gnomehack libgnomeui libwnck
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lutil"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile
index 3e3331e67a45..c2b7b88af750 100644
--- a/sysutils/gnomesystemmonitor/Makefile
+++ b/sysutils/gnomesystemmonitor/Makefile
@@ -17,19 +17,16 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2.0 system monitor program
 
-LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
-		gtop-2.0.2:${PORTSDIR}/devel/libgtop2 \
-		wnck-1.9:${PORTSDIR}/x11-toolkits/libwnck
+LIB_DEPENDS=	gtop-2.0.2:${PORTSDIR}/devel/libgtop2
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack
+USE_GNOME=	gnomeprefix gnomehack libgnomeui libwnck
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lutil"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index 669e0307dc58..2251c7dfb1b1 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -15,13 +15,12 @@ DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GTK+ 2 spell checking component
 
-LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
-		pspell.15:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS=	pspell.15:${PORTSDIR}/textproc/aspell
 
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack
+USE_GNOME=	gnomeprefix gnomehack gtk20
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/gtkspell2/Makefile b/textproc/gtkspell2/Makefile
index 669e0307dc58..2251c7dfb1b1 100644
--- a/textproc/gtkspell2/Makefile
+++ b/textproc/gtkspell2/Makefile
@@ -15,13 +15,12 @@ DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GTK+ 2 spell checking component
 
-LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
-		pspell.15:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS=	pspell.15:${PORTSDIR}/textproc/aspell
 
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack
+USE_GNOME=	gnomeprefix gnomehack gtk20
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index a02d4b587353..cf7e463536af 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -15,13 +15,11 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The XSLT C library for GNOME
 
-LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomehack
+USE_GNOME=	gnomehack libxml2
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
 
diff --git a/www/nautilus-gtkhtml/Makefile b/www/nautilus-gtkhtml/Makefile
index 495f789232ce..125b987eeed1 100644
--- a/www/nautilus-gtkhtml/Makefile
+++ b/www/nautilus-gtkhtml/Makefile
@@ -16,26 +16,17 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A simple NautilusView component for displaying html files in Nautilus
 
-LIB_DEPENDS=	gtkhtml-2.0:${PORTSDIR}/www/libgtkhtml \
-		nautilus.2:${PORTSDIR}/x11-fm/nautilus2
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
+USE_GNOME=	gnomeprefix gnomehack libgtkhtml nautilus2
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-pre-patch:
+post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
-		's|[(]datadir[)]/gnome/|(datadir)/|g ; \
-		 s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g ; \
-		 s|[(]datadir[)]/locale|(prefix)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index 3658c94d69a1..0ab83718b4cd 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -17,18 +17,14 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2.0 version of xdm display manager
 
-LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
-		rsvg-2.4:${PORTSDIR}/graphics/librsvg2
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier
+USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeui librsvg2
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 GDMDIR?=	${PREFIX}/etc/gdm
 
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index f10ca6b89e40..79f92858a828 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -16,17 +16,14 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Session component for the GNOME 2.0 desktop
 
-LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier
+USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeui
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=	gnome-session.1 gnome-smproxy.1 gnome-wm.1 session-properties.1 \
 	gnome-session-save.1
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index e26ec86e2acc..7cf761552c45 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -16,34 +16,25 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Terminal component for the GNOME 2.0 Desktop
 
-LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
-
-.if defined(WITH_ZVT)
-LIB_DEPENDS+=	zvt-2.0.0:${PORTSDIR}/x11-toolkits/libzvt
-.else
-LIB_DEPENDS+=	vte.4:${PORTSDIR}/x11-toolkits/vte
-.endif
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier
+USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeui
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 .if defined(WITH_ZVT)
 CONFIGURE_ARGS=	--with-widget=zvt
+USE_GNOME+=	libzvt
 .else
 CONFIGURE_ARGS=	--with-widget=vte
+USE_GNOME+=	vte
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \
-		${WRKSRC}/po/Makefile.in.in
 
 .include <bsd.port.mk>
diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile
index f10ca6b89e40..79f92858a828 100644
--- a/x11/gnomesession/Makefile
+++ b/x11/gnomesession/Makefile
@@ -16,17 +16,14 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Session component for the GNOME 2.0 desktop
 
-LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier
+USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeui
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=	gnome-session.1 gnome-smproxy.1 gnome-wm.1 session-properties.1 \
 	gnome-session-save.1
diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile
index e26ec86e2acc..7cf761552c45 100644
--- a/x11/gnometerminal/Makefile
+++ b/x11/gnometerminal/Makefile
@@ -16,34 +16,25 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Terminal component for the GNOME 2.0 Desktop
 
-LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
-
-.if defined(WITH_ZVT)
-LIB_DEPENDS+=	zvt-2.0.0:${PORTSDIR}/x11-toolkits/libzvt
-.else
-LIB_DEPENDS+=	vte.4:${PORTSDIR}/x11-toolkits/vte
-.endif
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier
+USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeui
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 .if defined(WITH_ZVT)
 CONFIGURE_ARGS=	--with-widget=zvt
+USE_GNOME+=	libzvt
 .else
 CONFIGURE_ARGS=	--with-widget=vte
+USE_GNOME+=	vte
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \
-		${WRKSRC}/po/Makefile.in.in
 
 .include <bsd.port.mk>
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 582678f8db7c..8d880b96d4bf 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -23,7 +23,6 @@ USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
 
 post-patch: