Implement USE_GNOME, part 2.

12 files changed, 21 insertions, 86 deletions

diff --git a/x11/finder/Makefile b/x11/finder/Makefile
index 4e57cac9bb18..e03fdcf00e9e 100644
--- a/x11/finder/Makefile
+++ b/x11/finder/Makefile
@@ -12,12 +12,9 @@ MASTER_SITES=	http://lfh.hkcampus.net/~lfh-lck/programs/finder/
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		panel_applet.4:${PORTSDIR}/x11/gnomecore \
-		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	yes
 
 ALL_TARGET=	default
 
diff --git a/x11/finder/files/patch-ab b/x11/finder/files/patch-ab
index e51b0c5ed9de..8dfaa2d4675d 100644
--- a/x11/finder/files/patch-ab
+++ b/x11/finder/files/patch-ab
@@ -2,7 +2,7 @@
 +++ gwmh/Makefile	Mon Sep  4 16:18:43 2000
 @@ -1,8 +1,8 @@
 -INCLUDEFLAGS=`gnome-config --cflags gnome` `gtk-config --cflags` -I.
-+INCLUDEFLAGS=`$(X11BASE)/bin/gnome-config --cflags gnome` `$(X11BASE)/bin/gtk12-config --cflags` -I.
++INCLUDEFLAGS=`$(X11BASE)/bin/gnome-config --cflags gnome` `$(GTK_CONFIG) --cflags` -I.
  
  OBJS=gwmh.o gstc.o
  
diff --git a/x11/finder/files/patch-ac b/x11/finder/files/patch-ac
index 85bafefcad69..5c049d8d9453 100644
--- a/x11/finder/files/patch-ac
+++ b/x11/finder/files/patch-ac
@@ -2,7 +2,7 @@
 +++ TaskMenu/Makefile	Mon Sep  4 16:18:17 2000
 @@ -1,8 +1,8 @@
 -INCLUDEFLAGS=`gnome-config --cflags gnome` `gtk-config --cflags` -I.
-+INCLUDEFLAGS=`$(X11BASE)/bin/gnome-config --cflags gnome` `$(X11BASE)/bin/gtk12-config --cflags` -I.
++INCLUDEFLAGS=`$(X11BASE)/bin/gnome-config --cflags gnome` `$(GTK_CONFIG) --cflags` -I.
  
  OBJS=task-menu.o task-option.o task-manage.o task-icon.o
  
diff --git a/x11/finder/files/patch-ad b/x11/finder/files/patch-ad
index 3dbd9140d753..3890bad67ae2 100644
--- a/x11/finder/files/patch-ad
+++ b/x11/finder/files/patch-ad
@@ -2,7 +2,7 @@
 +++ AboutDialog/Makefile	2000/09/04 13:19:53
 @@ -1,8 +1,8 @@
 -INCLUDEFLAGS=`gnome-config --cflags gnome` `gtk-config --cflags` -I.
-+INCLUDEFLAGS=`$(X11BASE)/bin/gnome-config --cflags gnome` `$(X11BASE)/bin/gtk12-config --cflags` -I.
++INCLUDEFLAGS=`$(X11BASE)/bin/gnome-config --cflags gnome` `$(GTK_CONFIG) --cflags` -I.
  
  OBJS=about-dialog.o
  
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 7b51bbf77301..2972e943ae11 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -15,20 +15,11 @@ DISTNAME=	${PORTNAME}-2.0beta4
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
-RUN_DEPENDS=	gnome-session:${PORTSDIR}/x11/gnomecore
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 pre-fetch:
diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index 7b51bbf77301..2972e943ae11 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -15,20 +15,11 @@ DISTNAME=	${PORTNAME}-2.0beta4
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
-RUN_DEPENDS=	gnome-session:${PORTSDIR}/x11/gnomecore
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 pre-fetch:
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 40e39c744c05..0fa2e7312898 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -14,21 +14,14 @@ DISTNAME=	gnome-applets-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore \
-		xml.5:${PORTSDIR}/textproc/libxml \
-		ghttp.1:${PORTSDIR}/www/libghttp \
-		esd.2:${PORTSDIR}/audio/esound \
+LIB_DEPENDS=	ghttp.1:${PORTSDIR}/www/libghttp \
 		gtop.1:${PORTSDIR}/devel/libgtop
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 pre-patch:
diff --git a/x11/gnomeapplets/Makefile b/x11/gnomeapplets/Makefile
index 40e39c744c05..0fa2e7312898 100644
--- a/x11/gnomeapplets/Makefile
+++ b/x11/gnomeapplets/Makefile
@@ -14,21 +14,14 @@ DISTNAME=	gnome-applets-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore \
-		xml.5:${PORTSDIR}/textproc/libxml \
-		ghttp.1:${PORTSDIR}/www/libghttp \
-		esd.2:${PORTSDIR}/audio/esound \
+LIB_DEPENDS=	ghttp.1:${PORTSDIR}/www/libghttp \
 		gtop.1:${PORTSDIR}/devel/libgtop
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 pre-patch:
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index 40e39c744c05..0fa2e7312898 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -14,21 +14,14 @@ DISTNAME=	gnome-applets-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore \
-		xml.5:${PORTSDIR}/textproc/libxml \
-		ghttp.1:${PORTSDIR}/www/libghttp \
-		esd.2:${PORTSDIR}/audio/esound \
+LIB_DEPENDS=	ghttp.1:${PORTSDIR}/www/libghttp \
 		gtop.1:${PORTSDIR}/devel/libgtop
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 pre-patch:
diff --git a/x11/gnomecore/Makefile b/x11/gnomecore/Makefile
index fd12850700f2..060b5eb01efd 100644
--- a/x11/gnomecore/Makefile
+++ b/x11/gnomecore/Makefile
@@ -14,22 +14,17 @@ DISTNAME=	gnome-core-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
-		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
-		xml.5:${PORTSDIR}/textproc/libxml \
+LIB_DEPENDS=	xml.5:${PORTSDIR}/textproc/libxml \
 		bz2.1:${PORTSDIR}/archivers/bzip2
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+RUN_DEPENDS=	${X11BASE}/share/gnome/sounds/startup.wav:${PORTSDIR}/audio/gnomeaudio \
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOMECTRL=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--with-kde-datadir=${LOCALBASE}/share
+CONFIGURE_ARGS=	--with-kde-datadir=${LOCALBASE}/share
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 MAN1=		gnome-session.1 gnome-wm.1 save-session.1
diff --git a/x11/gnomeres_applet/Makefile b/x11/gnomeres_applet/Makefile
index 82bdbd1cb950..8239bd47e6a6 100644
--- a/x11/gnomeres_applet/Makefile
+++ b/x11/gnomeres_applet/Makefile
@@ -12,20 +12,11 @@ MASTER_SITES=	http://www.sci.fi/~syrjala/gnomeres/
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
-RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
-
 USE_X_PREFIX=	yes
+USE_GNOME=	yes
 GNU_CONFIGURE=	yes
-
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
-CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
-		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
diff --git a/x11/powershell/Makefile b/x11/powershell/Makefile
index 00d8d1d17329..7950fb51e49e 100644
--- a/x11/powershell/Makefile
+++ b/x11/powershell/Makefile
@@ -13,19 +13,10 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	smoberly@xavier.dyndns.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		gdk_imlib:${PORTSDIR}/graphics/imlib
+ALL_TARGET=	powershell
 
 USE_X_PREFIX=	yes
+USE_GNOME=	yes
 USE_AUTOCONF=	yes
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
-CONFIGURE_ARGS=	--datadir=${PREFIX}/share/gnome
-
-ALL_TARGET=	powershell
-
-MAKE_ENV=	${CONFIGURE_ENV}
-
 .include <bsd.port.mk>