Various patches (mainly shared library revision changes) for those

ports that depend on GNOME and need to change for 1.4

6 files changed, 13 insertions, 25 deletions

diff --git a/x11/gbackground/Makefile b/x11/gbackground/Makefile
index b3985d6b136e..9e9dda5805ee 100644
--- a/x11/gbackground/Makefile
+++ b/x11/gbackground/Makefile
@@ -7,15 +7,14 @@
 
 PORTNAME=	gbackground
 PORTVERSION=	1.0.0.b2
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://ringer.cs.utsa.edu/~gsalinas/gBackGround/
 DISTNAME=	gBackGround-1.0.0-beta2
 
 MAINTAINER=	smoberly@xavier.dyndns.org
 
-LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore \
-		gnome.4:${PORTSDIR}/x11/gnomelibs
-
+USE_GNOME=	yes
 ALL_TARGET=	gBackGround_applet
 USE_X_PREFIX=	YES
 USE_AUTOCONF=	YES
diff --git a/x11/gswitchit/Makefile b/x11/gswitchit/Makefile
index 59ec3003b5ec..c7f7059728c1 100644
--- a/x11/gswitchit/Makefile
+++ b/x11/gswitchit/Makefile
@@ -7,15 +7,13 @@
 
 PORTNAME=	gswitchit_applet
 PORTVERSION=	0.70
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gswitchit
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
-		gconf-1.1:${PORTSDIR}/devel/gconf
-
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
 USE_LIBTOOL=	yes
diff --git a/x11/gswitchit_applet/Makefile b/x11/gswitchit_applet/Makefile
index 59ec3003b5ec..c7f7059728c1 100644
--- a/x11/gswitchit_applet/Makefile
+++ b/x11/gswitchit_applet/Makefile
@@ -7,15 +7,13 @@
 
 PORTNAME=	gswitchit_applet
 PORTVERSION=	0.70
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gswitchit
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
-		gconf-1.1:${PORTSDIR}/devel/gconf
-
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
 USE_LIBTOOL=	yes
diff --git a/x11/gvid/Makefile b/x11/gvid/Makefile
index cd4a377a7cfb..f9c347ed3e12 100644
--- a/x11/gvid/Makefile
+++ b/x11/gvid/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gvid
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://kvand.mit.edu/kvand/gVid/ \
 		ftp://ftp.proxad.net/mirrors/ftp.linuxberg.com/files/gnome/xwin/ \
@@ -16,10 +17,8 @@ MASTER_SITES=	http://kvand.mit.edu/kvand/gVid/ \
 
 MAINTAINER=	smoberly@xavier.dyndns.org
 
-LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore \
-		gnome.4:${PORTSDIR}/x11/gnomelibs
-
 USE_X_PREFIX=	yes
+USE_GNOME=	yes
 
 MAKE_ENV=	MKDIR="${MKDIR}"
 
diff --git a/x11/stockticker_applet/Makefile b/x11/stockticker_applet/Makefile
index ac463070e39a..711a0d363ba1 100644
--- a/x11/stockticker_applet/Makefile
+++ b/x11/stockticker_applet/Makefile
@@ -7,26 +7,19 @@
 
 PORTNAME=	stockticker_applet
 PORTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:S/_applet//}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore \
-		gnome.4:${PORTSDIR}/x11/gnomelibs \
-		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
-		ghttp.1:${PORTSDIR}/www/libghttp
-RUN_DEPENDS=	gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
+LIB_DEPENDS=	ghttp.1:${PORTSDIR}/www/libghttp
 
+USE_GNOME=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
 
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
 pre-patch:
 	@${PERL} -pi -e 's|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@find ${WRKSRC} \( -name "Makefile.in" -or -name "*.make" \) | xargs ${PERL} -pi -e \
diff --git a/x11/wmmenu/Makefile b/x11/wmmenu/Makefile
index 242b90038119..eca1f03dc50f 100644
--- a/x11/wmmenu/Makefile
+++ b/x11/wmmenu/Makefile
@@ -7,17 +7,18 @@
 
 PORTNAME=	wmmenu
 PORTVERSION=	0.4
-CATEGORIES=	x11
+PORTREVISION=	1
+CATEGORIES=	x11 gnome
 MASTER_SITES=	http://www.fcoutant.freesurf.fr/download/
 
 MAINTAINER=	karlj000@unbc.ca
 
-LIB_DEPENDS=	dockapp.1:${PORTSDIR}/x11-wm/libdockapp:install \
-		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
+LIB_DEPENDS=	dockapp.1:${PORTSDIR}/x11-wm/libdockapp:install
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOMECTRL=	yes
 
 post-patch:
 	@ ${MV} ${WRKSRC}/example/defaults ${WRKSRC}/example/defaults.presed