Various patches (mainly shared library revision changes) for those

ports that depend on GNOME and need to change for 1.4

8 files changed, 13 insertions, 35 deletions

diff --git a/devel/gide/Makefile b/devel/gide/Makefile
index 13446a9ca1ee..7b3c8d5b8476 100644
--- a/devel/gide/Makefile
+++ b/devel/gide/Makefile
@@ -7,15 +7,13 @@
 
 PORTNAME=	gide
 PORTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/gIDE
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade \
-		guile.9:${PORTSDIR}/lang/guile
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
diff --git a/devel/gnome-crash/Makefile b/devel/gnome-crash/Makefile
index 70f999a3dabf..c6c2af0a9d77 100644
--- a/devel/gnome-crash/Makefile
+++ b/devel/gnome-crash/Makefile
@@ -14,9 +14,6 @@ DISTNAME=	gnome-crash-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade \
-		gnomeprint.13:${PORTSDIR}/print/gnomeprint
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
diff --git a/devel/gnomecrash/Makefile b/devel/gnomecrash/Makefile
index 70f999a3dabf..c6c2af0a9d77 100644
--- a/devel/gnomecrash/Makefile
+++ b/devel/gnomecrash/Makefile
@@ -14,9 +14,6 @@ DISTNAME=	gnome-crash-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade \
-		gnomeprint.13:${PORTSDIR}/print/gnomeprint
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index 54b3ff546d78..0116f6cf0fff 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtranslator
 PORTVERSION=	0.38
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://www.gtranslator.org/download/releases/${PORTVERSION}/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -14,10 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	oaf.0:${PORTSDIR}/devel/oaf \
-		gconf-1.1:${PORTSDIR}/devel/gconf \
-		gnomevfs.0:${PORTSDIR}/devel/gnomevfs \
-		gal.4:${PORTSDIR}/x11-toolkits/gal
+LIB_DEPENDS=	gal.6:${PORTSDIR}/x11-toolkits/gal
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/devel/ruby-libglade/Makefile b/devel/ruby-libglade/Makefile
index 47bbc13a6a75..f14693afafde 100644
--- a/devel/ruby-libglade/Makefile
+++ b/devel/ruby-libglade/Makefile
@@ -7,7 +7,8 @@
 
 PORTNAME=	libglade
 PORTVERSION=	1.1
-CATEGORIES=	devel ruby
+PORTREVISION=	1
+CATEGORIES=	devel ruby gnome
 MASTER_SITES=	http://beta4.com/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
@@ -15,13 +16,11 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/gtk.so:${PORTSDIR}/x11-toolkits/ruby-gtk
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-WANT_GLIB=	yes
-WANT_GTK=	yes
+USE_GNOME=	yes
 
 WRKSRC=		${WRKDIR}/ruby-${PORTNAME}
 CONFIGURE_ARGS=	--with-glade-include="${LOCALBASE}/include/glade" \
diff --git a/devel/ruby-libglade2/Makefile b/devel/ruby-libglade2/Makefile
index 47bbc13a6a75..f14693afafde 100644
--- a/devel/ruby-libglade2/Makefile
+++ b/devel/ruby-libglade2/Makefile
@@ -7,7 +7,8 @@
 
 PORTNAME=	libglade
 PORTVERSION=	1.1
-CATEGORIES=	devel ruby
+PORTREVISION=	1
+CATEGORIES=	devel ruby gnome
 MASTER_SITES=	http://beta4.com/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
@@ -15,13 +16,11 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/gtk.so:${PORTSDIR}/x11-toolkits/ruby-gtk
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-WANT_GLIB=	yes
-WANT_GTK=	yes
+USE_GNOME=	yes
 
 WRKSRC=		${WRKDIR}/ruby-${PORTNAME}
 CONFIGURE_ARGS=	--with-glade-include="${LOCALBASE}/include/glade" \
diff --git a/devel/titano/Makefile b/devel/titano/Makefile
index a87dbf49cd06..0289e4144a7b 100644
--- a/devel/titano/Makefile
+++ b/devel/titano/Makefile
@@ -14,25 +14,15 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		gtkeditor.0:${PORTSDIR}/x11-toolkits/libgtkeditor
+LIB_DEPENDS=	gtkeditor.0:${PORTSDIR}/x11-toolkits/libgtkeditor
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/b//}
 
+USE_GNOMELIBS=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	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" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
diff --git a/devel/veepee/Makefile b/devel/veepee/Makefile
index 3f6bf91fc2b3..d9a4b4527392 100644
--- a/devel/veepee/Makefile
+++ b/devel/veepee/Makefile
@@ -14,9 +14,9 @@ DISTNAME=	VeePee-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		gd.2:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 
+USE_GNOMELIBS=	yes
 USE_XLIB=	yes
 USE_PYTHON=	yes
 USE_LIBTOOL=	yes