8 files changed, 12 insertions, 32 deletions

diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 6ec37b13dd12..fe2201f3621e 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -18,9 +18,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Multimedia applications for the GNOME 2.0 desktop
 
 RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
-LIB_DEPENDS=	gnome-desktop-2.3:${PORTSDIR}/x11/gnomedesktop \
-		gailutil.17:${PORTSDIR}/x11-toolkits/gail \
-		gstplay-0.6.0:${PORTSDIR}/multimedia/gstreamer-plugins
+LIB_DEPENDS=	gstplay-0.6.0:${PORTSDIR}/multimedia/gstreamer-plugins
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -28,10 +26,9 @@ USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier
+USE_GNOME=	gnomeprefix gnomehack gnomehier gail gnomedesktop
 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/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index 6ec37b13dd12..fe2201f3621e 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -18,9 +18,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Multimedia applications for the GNOME 2.0 desktop
 
 RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
-LIB_DEPENDS=	gnome-desktop-2.3:${PORTSDIR}/x11/gnomedesktop \
-		gailutil.17:${PORTSDIR}/x11-toolkits/gail \
-		gstplay-0.6.0:${PORTSDIR}/multimedia/gstreamer-plugins
+LIB_DEPENDS=	gstplay-0.6.0:${PORTSDIR}/multimedia/gstreamer-plugins
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -28,10 +26,9 @@ USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier
+USE_GNOME=	gnomeprefix gnomehack gnomehier gail gnomedesktop
 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/databases/libgda2/Makefile b/databases/libgda2/Makefile
index 5fccc79bb33d..ca53911e8933 100644
--- a/databases/libgda2/Makefile
+++ b/databases/libgda2/Makefile
@@ -18,8 +18,6 @@ COMMENT=	Provides uniform access to different kinds of data sources
 
 BUILD_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm \
-		glib-2.0.200:${PORTSDIR}/devel/glib20 \
-		xslt.1:${PORTSDIR}/textproc/libxslt \
 		popt.0:${PORTSDIR}/devel/popt
 RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 
@@ -27,12 +25,11 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier
+USE_GNOME=	gnomeprefix gnomehack gnomehier glib20 libxslt
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl -lgdbm"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=		gda-config-tool.1
 MAN5=		gda-config.5
diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile
index 5fccc79bb33d..ca53911e8933 100644
--- a/databases/libgda3/Makefile
+++ b/databases/libgda3/Makefile
@@ -18,8 +18,6 @@ COMMENT=	Provides uniform access to different kinds of data sources
 
 BUILD_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm \
-		glib-2.0.200:${PORTSDIR}/devel/glib20 \
-		xslt.1:${PORTSDIR}/textproc/libxslt \
 		popt.0:${PORTSDIR}/devel/popt
 RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 
@@ -27,12 +25,11 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier
+USE_GNOME=	gnomeprefix gnomehack gnomehier glib20 libxslt
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl -lgdbm"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=		gda-config-tool.1
 MAN5=		gda-config.5
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index f0eee69981be..d38a98a59b3b 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -15,19 +15,15 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Provide uniform access to data sources for the GNOME 2.0 environment
 
-LIB_DEPENDS=	gnomedb-2.2:${PORTSDIR}/databases/libgnomedb \
-		gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack
+USE_GNOME=	gnomeprefix gnomehack libgnomedb libgnomeprintui
 USE_PERL5=	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/deskutils/libmrproject/Makefile b/deskutils/libmrproject/Makefile
index 38aad9f23969..160c80294d1c 100644
--- a/deskutils/libmrproject/Makefile
+++ b/deskutils/libmrproject/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	gsf-1.8:${PORTSDIR}/devel/libgsf
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack
+USE_GNOME=	gnomeprefix gnomehack gnometarget
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
diff --git a/deskutils/mrproject/Makefile b/deskutils/mrproject/Makefile
index cbf86330b09c..0705a34a899d 100644
--- a/deskutils/mrproject/Makefile
+++ b/deskutils/mrproject/Makefile
@@ -14,13 +14,11 @@ MASTER_SITES=	ftp://ftp.codefactory.se/pub/software/mrproject/source/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Project management application for Gnome 2
 
-LIB_DEPENDS=	mrproject.0:${PORTSDIR}/deskutils/libmrproject \
-		gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
-		gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui
+LIB_DEPENDS=	mrproject.0:${PORTSDIR}/deskutils/libmrproject
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack
+USE_GNOME=	gnomeprefix gnomehack libgnomeui libgnomeprintui
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
diff --git a/deskutils/planner/Makefile b/deskutils/planner/Makefile
index cbf86330b09c..0705a34a899d 100644
--- a/deskutils/planner/Makefile
+++ b/deskutils/planner/Makefile
@@ -14,13 +14,11 @@ MASTER_SITES=	ftp://ftp.codefactory.se/pub/software/mrproject/source/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Project management application for Gnome 2
 
-LIB_DEPENDS=	mrproject.0:${PORTSDIR}/deskutils/libmrproject \
-		gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
-		gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui
+LIB_DEPENDS=	mrproject.0:${PORTSDIR}/deskutils/libmrproject
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack
+USE_GNOME=	gnomeprefix gnomehack libgnomeui libgnomeprintui
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \