Implement USE_GNOME, part 2.

10 files changed, 34 insertions, 111 deletions

diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 9ccb4144ae17..ec3cff708396 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -14,10 +14,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		glade.4:${PORTSDIR}/devel/libglade
-RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore \
-		${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
+LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade
+RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
 
 .if !defined(WITH_FULL_MOZILLA)
 MOZILLA=	mozilla-embedded
@@ -33,20 +31,15 @@ MOZLIBS=	${WRKDIRPREFIX}${.CURDIR}/../../www/mozilla/work/mozilla/dist/lib
 
 USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
+USE_GNOME=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-mozilla-includes="${MOZHEADERS}" \
+		--with-mozilla-libs="${MOZLIBS}"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
 
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 CFLAGS+=	-D_REENTRANT -D_THREAD_SAFE -fno-rtti
 
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--with-mozilla-includes="${MOZHEADERS}" \
-		--with-mozilla-libs="${MOZLIBS}"
-CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 
 .if !defined(WITH_FULL_MOZILLA)
 post-extract:
diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index 9ccb4144ae17..ec3cff708396 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -14,10 +14,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		glade.4:${PORTSDIR}/devel/libglade
-RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore \
-		${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
+LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade
+RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
 
 .if !defined(WITH_FULL_MOZILLA)
 MOZILLA=	mozilla-embedded
@@ -33,20 +31,15 @@ MOZLIBS=	${WRKDIRPREFIX}${.CURDIR}/../../www/mozilla/work/mozilla/dist/lib
 
 USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
+USE_GNOME=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-mozilla-includes="${MOZHEADERS}" \
+		--with-mozilla-libs="${MOZLIBS}"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
 
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 CFLAGS+=	-D_REENTRANT -D_THREAD_SAFE -fno-rtti
 
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--with-mozilla-includes="${MOZHEADERS}" \
-		--with-mozilla-libs="${MOZLIBS}"
-CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 
 .if !defined(WITH_FULL_MOZILLA)
 post-extract:
diff --git a/www/glibwww/Makefile b/www/glibwww/Makefile
index 85755fc3873b..ed524a49459c 100644
--- a/www/glibwww/Makefile
+++ b/www/glibwww/Makefile
@@ -13,21 +13,14 @@ MASTER_SITE_SUBDIR=	unstable/sources/glibwww
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		wwwzip.1:${PORTSDIR}/www/libwww
-
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+LIB_DEPENDS=	wwwzip.1:${PORTSDIR}/www/libwww
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index 5ea14ba96d41..f22cebfead84 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -19,18 +19,12 @@ LIB_DEPENDS=	bonobo.2:${PORTSDIR}/devel/bonobo \
 		gconf-1.1:${PORTSDIR}/devel/gconf \
 		pspell.2:${PORTSDIR}/textproc/pspell
 
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 pre-patch:
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 5ea14ba96d41..f22cebfead84 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -19,18 +19,12 @@ LIB_DEPENDS=	bonobo.2:${PORTSDIR}/devel/bonobo \
 		gconf-1.1:${PORTSDIR}/devel/gconf \
 		pspell.2:${PORTSDIR}/textproc/pspell
 
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 pre-patch:
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index 5ea14ba96d41..f22cebfead84 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -19,18 +19,12 @@ LIB_DEPENDS=	bonobo.2:${PORTSDIR}/devel/bonobo \
 		gconf-1.1:${PORTSDIR}/devel/gconf \
 		pspell.2:${PORTSDIR}/textproc/pspell
 
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 pre-patch:
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index 5ea14ba96d41..f22cebfead84 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -19,18 +19,12 @@ LIB_DEPENDS=	bonobo.2:${PORTSDIR}/devel/bonobo \
 		gconf-1.1:${PORTSDIR}/devel/gconf \
 		pspell.2:${PORTSDIR}/textproc/pspell
 
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 pre-patch:
diff --git a/www/peacock/Makefile b/www/peacock/Makefile
index f95c8a72ac39..495e2bd2bef4 100644
--- a/www/peacock/Makefile
+++ b/www/peacock/Makefile
@@ -13,18 +13,12 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib" \
-		GTK_CONFIG="${GTK_CONFIG}"
+		LIBS="-L${LOCALBASE}/lib"
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
diff --git a/www/screem-devel/Makefile b/www/screem-devel/Makefile
index 267ee3063df8..82c94f6f4360 100644
--- a/www/screem-devel/Makefile
+++ b/www/screem-devel/Makefile
@@ -14,34 +14,21 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
-		xml.5:${PORTSDIR}/textproc/libxml \
-		glade.4:${PORTSDIR}/devel/libglade \
+LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade \
 		guile.9:${PORTSDIR}/lang/guile \
 		wwwcore.1:${PORTSDIR}/www/libwww
-RUN_DEPENDS=    panel:${PORTSDIR}/x11/gnomecore
 
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--libdir=${PREFIX}/share/gnome
+USE_GNOME=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
-		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
 		's|\@GNOME_DATA_PREFIX\@/gnome|\@GNOME_DATA_PREFIX\@|g ; \
 		 s|\$\(datadir\)/gnome|\$\(datadir\)|g ; \
diff --git a/www/screem/Makefile b/www/screem/Makefile
index 267ee3063df8..82c94f6f4360 100644
--- a/www/screem/Makefile
+++ b/www/screem/Makefile
@@ -14,34 +14,21 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
-		xml.5:${PORTSDIR}/textproc/libxml \
-		glade.4:${PORTSDIR}/devel/libglade \
+LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade \
 		guile.9:${PORTSDIR}/lang/guile \
 		wwwcore.1:${PORTSDIR}/www/libwww
-RUN_DEPENDS=    panel:${PORTSDIR}/x11/gnomecore
 
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--libdir=${PREFIX}/share/gnome
+USE_GNOME=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
-		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
 		's|\@GNOME_DATA_PREFIX\@/gnome|\@GNOME_DATA_PREFIX\@|g ; \
 		 s|\$\(datadir\)/gnome|\$\(datadir\)|g ; \