Clean up dependency chains after moving gtkhtml/gal inside the

USE_GNOME knob

30 files changed, 48 insertions, 84 deletions

diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index ad198f6a406d..f33a6ef0c2c9 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtranslator
 PORTVERSION=	0.38
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://www.gtranslator.org/download/releases/${PORTVERSION}/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -15,8 +15,6 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gal.7:${PORTSDIR}/x11-toolkits/gal
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/finance/gnomepm/Makefile b/finance/gnomepm/Makefile
index 581379ff5acf..17be00364d4c 100644
--- a/finance/gnomepm/Makefile
+++ b/finance/gnomepm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomepm
 PORTVERSION=	0.9.3
+PORTREVISION=	1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		ftp://ftp.one.net/pub/users/dobez/
@@ -15,8 +16,6 @@ DISTNAME=	${PORTNAME:S/gnome/gnome-/}-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	ghttp.1:${PORTSDIR}/www/libghttp
-
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
 GNU_CONFIGURE=	yes
diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index a9b69218fc74..90494c43fdac 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -7,14 +7,13 @@
 
 PORTNAME=	sodipodi
 PORTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gal.7:${PORTSDIR}/x11-toolkits/gal
-
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 0216686d20c9..f322d0ff2655 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -7,15 +7,14 @@
 
 PORTNAME=	balsa
 PORTVERSION=	1.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/ \
 		ftp://ftp.newton.cx/pub/balsa/
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	PropList.2:${PORTSDIR}/devel/libPropList \
-		gtkhtml.10:${PORTSDIR}/www/gtkhtml
+LIB_DEPENDS=	PropList.2:${PORTSDIR}/devel/libPropList
 
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index 0216686d20c9..f322d0ff2655 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -7,15 +7,14 @@
 
 PORTNAME=	balsa
 PORTVERSION=	1.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/ \
 		ftp://ftp.newton.cx/pub/balsa/
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	PropList.2:${PORTSDIR}/devel/libPropList \
-		gtkhtml.10:${PORTSDIR}/www/gtkhtml
+LIB_DEPENDS=	PropList.2:${PORTSDIR}/devel/libPropList
 
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
diff --git a/mail/evolution-devel/Makefile b/mail/evolution-devel/Makefile
index 0a00ae1b69b6..94adf1464c75 100644
--- a/mail/evolution-devel/Makefile
+++ b/mail/evolution-devel/Makefile
@@ -7,15 +7,15 @@
 
 PORTNAME=	evolution
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/evolution
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gtkhtml.10:${PORTSDIR}/www/gtkhtml
-#		ldap.1:${PORTSDIR}/net/openldap <- avoid extra dependency until
-#						   it doesn't work
+#LIB_DEPENDS=	ldap.1:${PORTSDIR}/net/openldap <- avoid extra dependency until
+#						   it actually works
 
 USE_GMAKE=	yes
 USE_BISON=	yes
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 0a00ae1b69b6..94adf1464c75 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -7,15 +7,15 @@
 
 PORTNAME=	evolution
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/evolution
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gtkhtml.10:${PORTSDIR}/www/gtkhtml
-#		ldap.1:${PORTSDIR}/net/openldap <- avoid extra dependency until
-#						   it doesn't work
+#LIB_DEPENDS=	ldap.1:${PORTSDIR}/net/openldap <- avoid extra dependency until
+#						   it actually works
 
 USE_GMAKE=	yes
 USE_BISON=	yes
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 02a5b478af05..48594de41f57 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnumeric
 PORTVERSION=	0.65
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnumeric
@@ -16,7 +16,6 @@ MAINTAINER?=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	guile.9:${PORTSDIR}/lang/guile \
 		gnomeole2.0:${PORTSDIR}/devel/libole2 \
-		gal.7:${PORTSDIR}/x11-toolkits/gal \
 		gb.0:${PORTSDIR}/lang/gnomebasic
 
 USE_X_PREFIX=	yes
diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index 02a5b478af05..48594de41f57 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnumeric
 PORTVERSION=	0.65
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnumeric
@@ -16,7 +16,6 @@ MAINTAINER?=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	guile.9:${PORTSDIR}/lang/guile \
 		gnomeole2.0:${PORTSDIR}/devel/libole2 \
-		gal.7:${PORTSDIR}/x11-toolkits/gal \
 		gb.0:${PORTSDIR}/lang/gnomebasic
 
 USE_X_PREFIX=	yes
diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index f07f1a29fe44..abe309f9dc1f 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	guppi
 PORTVERSION=	0.35.5
+PORTREVISION=	1
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/Guppi
@@ -14,10 +15,7 @@ DISTNAME=	Guppi-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	bonobo.2:${PORTSDIR}/devel/bonobo \
-		glade.4:${PORTSDIR}/devel/libglade \
-		guile.9:${PORTSDIR}/lang/guile \
-		oaf.0:${PORTSDIR}/devel/oaf
+LIB_DEPENDS=	guile.9:${PORTSDIR}/lang/guile
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/misc/gnomepm/Makefile b/misc/gnomepm/Makefile
index 581379ff5acf..17be00364d4c 100644
--- a/misc/gnomepm/Makefile
+++ b/misc/gnomepm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomepm
 PORTVERSION=	0.9.3
+PORTREVISION=	1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		ftp://ftp.one.net/pub/users/dobez/
@@ -15,8 +16,6 @@ DISTNAME=	${PORTNAME:S/gnome/gnome-/}-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	ghttp.1:${PORTSDIR}/www/libghttp
-
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
 GNU_CONFIGURE=	yes
diff --git a/misc/metatheme/Makefile b/misc/metatheme/Makefile
index cbaafb7e2a2a..d203b8175c83 100644
--- a/misc/metatheme/Makefile
+++ b/misc/metatheme/Makefile
@@ -7,15 +7,13 @@
 
 PORTNAME=	metatheme
 PORTVERSION=	0.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc gnome
 MASTER_SITES=	ftp://ftp.helixcode.com/pub/obsolete/metatheme/
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gtkhtml.10:${PORTSDIR}/www/gtkhtml \
-		gal.7:${PORTSDIR}/x11-toolkits/gal \
-		gnet.0:${PORTSDIR}/net/gnet
+LIB_DEPENDS=	gnet.0:${PORTSDIR}/net/gnet
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/misc/metatheme2/Makefile b/misc/metatheme2/Makefile
index cbaafb7e2a2a..d203b8175c83 100644
--- a/misc/metatheme2/Makefile
+++ b/misc/metatheme2/Makefile
@@ -7,15 +7,13 @@
 
 PORTNAME=	metatheme
 PORTVERSION=	0.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc gnome
 MASTER_SITES=	ftp://ftp.helixcode.com/pub/obsolete/metatheme/
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gtkhtml.10:${PORTSDIR}/www/gtkhtml \
-		gal.7:${PORTSDIR}/x11-toolkits/gal \
-		gnet.0:${PORTSDIR}/net/gnet
+LIB_DEPENDS=	gnet.0:${PORTSDIR}/net/gnet
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/net/gabber/Makefile b/net/gabber/Makefile
index fb02242f03b6..754e6048d58f 100644
--- a/net/gabber/Makefile
+++ b/net/gabber/Makefile
@@ -7,15 +7,14 @@
 
 PORTNAME=	gabber
 PORTVERSION=	0.8.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gnomemm.6:${PORTSDIR}/x11-toolkits/gnome-- \
-		gal.7:${PORTSDIR}/x11-toolkits/gal
+LIB_DEPENDS=	gnomemm.6:${PORTSDIR}/x11-toolkits/gnome--
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/news/pan/Makefile b/news/pan/Makefile
index bfee1907c0fe..3d6d6853c001 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -7,13 +7,12 @@
 
 PORTNAME=	pan
 PORTVERSION=	0.9.7
+PORTREVISION=	1
 CATEGORIES=	news gnome
 MASTER_SITES=	http://pan.rebelbase.com/download/${PORTVERSION}/
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gtkhtml.10:${PORTSDIR}/www/gtkhtml
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/news/pan2/Makefile b/news/pan2/Makefile
index bfee1907c0fe..3d6d6853c001 100644
--- a/news/pan2/Makefile
+++ b/news/pan2/Makefile
@@ -7,13 +7,12 @@
 
 PORTNAME=	pan
 PORTVERSION=	0.9.7
+PORTREVISION=	1
 CATEGORIES=	news gnome
 MASTER_SITES=	http://pan.rebelbase.com/download/${PORTVERSION}/
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gtkhtml.10:${PORTSDIR}/www/gtkhtml
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/www/barque/Makefile b/www/barque/Makefile
index c46fc8d8c3f5..91f67ee8f3f7 100644
--- a/www/barque/Makefile
+++ b/www/barque/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	barque
 PORTVERSION=	0.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,9 +15,6 @@ DISTFILES=	${PORTNAME}-0.1-2.tar.gz
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	gtkhtml.10:${PORTSDIR}/www/gtkhtml \
-		ghttp.1:${PORTSDIR}/www/libghttp
-
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.1-2
 
 USE_GMAKE=	yes
diff --git a/www/encompass/Makefile b/www/encompass/Makefile
index cae573db180f..8798df6b8891 100644
--- a/www/encompass/Makefile
+++ b/www/encompass/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	encompass
 PORTVERSION=	0.4.2
+PORTREVISION=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gtkhtml.10:${PORTSDIR}/www/gtkhtml \
-		neon.15:${PORTSDIR}/www/neon
+LIB_DEPENDS=	neon.15:${PORTSDIR}/www/neon
 
 USE_GNOME=	yes
 USE_X_PREFIX=	yes
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 9914412327e0..7536b5c16ff4 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	galeon
 PORTVERSION=	0.10.6
+PORTREVISION=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		${MASTER_SITE_LOCAL:S/%SUBDIR%/sobomax/}
@@ -17,12 +18,7 @@ MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	${X11BASE}/include/mozilla/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \
 		${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
-LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade \
-		gconf-1.1:${PORTSDIR}/devel/gconf \
-		gnomevfs.0:${PORTSDIR}/devel/gnomevfs \
-		oaf.0:${PORTSDIR}/devel/oaf
-RUN_DEPENDS=	${X11BASE}/share/gnome/sounds/login.wav:${PORTSDIR}/audio/gnomeaudio \
-		${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
+RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
 
 BROKEN=		"b0rken with Mozilla-0.9.1"
 
diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index 9914412327e0..7536b5c16ff4 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	galeon
 PORTVERSION=	0.10.6
+PORTREVISION=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		${MASTER_SITE_LOCAL:S/%SUBDIR%/sobomax/}
@@ -17,12 +18,7 @@ MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	${X11BASE}/include/mozilla/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \
 		${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
-LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade \
-		gconf-1.1:${PORTSDIR}/devel/gconf \
-		gnomevfs.0:${PORTSDIR}/devel/gnomevfs \
-		oaf.0:${PORTSDIR}/devel/oaf
-RUN_DEPENDS=	${X11BASE}/share/gnome/sounds/login.wav:${PORTSDIR}/audio/gnomeaudio \
-		${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
+RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
 
 BROKEN=		"b0rken with Mozilla-0.9.1"
 
diff --git a/www/p5-GtkHTML/Makefile b/www/p5-GtkHTML/Makefile
index 6b1b29ebe9b2..7e902cb1e27b 100644
--- a/www/p5-GtkHTML/Makefile
+++ b/www/p5-GtkHTML/Makefile
@@ -7,7 +7,8 @@
 
 PORTNAME=	GtkHTML
 PORTVERSION=	0.7006
-CATEGORIES=	www lang perl5
+PORTREVISION=	1
+CATEGORIES=	www lang perl5 gnome
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Gtk
 PKGNAMEPREFIX=	p5-
@@ -17,7 +18,6 @@ MAINTAINER=	vanilla@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gnome.pm:${PORTSDIR}/x11-toolkits/p5-Gnome
 RUN_DEPENDS=	${BUILD_DEPENDS}
-LIB_DEPENDS=	gtkhtml.10:${PORTSDIR}/www/gtkhtml
 
 USE_GNOME=	yes
 PERL_CONFIGURE=	yes
diff --git a/www/screem-devel/Makefile b/www/screem-devel/Makefile
index af5acfbee3e4..24eccc2be60d 100644
--- a/www/screem-devel/Makefile
+++ b/www/screem-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	screem
 PORTVERSION=	0.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.screem.org/src/
@@ -15,8 +15,6 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gtkhtml.10:${PORTSDIR}/www/gtkhtml
-
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
diff --git a/www/screem/Makefile b/www/screem/Makefile
index af5acfbee3e4..24eccc2be60d 100644
--- a/www/screem/Makefile
+++ b/www/screem/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	screem
 PORTVERSION=	0.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.screem.org/src/
@@ -15,8 +15,6 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gtkhtml.10:${PORTSDIR}/www/gtkhtml
-
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 06a41534457f..7f32a808cdba 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nautilus
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/nautilus
@@ -20,7 +21,6 @@ BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2	# XXX
 
 LIB_DEPENDS=	medusa.0:${PORTSDIR}/sysutils/medusa \
 		freetype.6:${PORTSDIR}/print/freetype2 \
-		ghttp.1:${PORTSDIR}/www/libghttp \
 		eel.0:${PORTSDIR}/x11-toolkits/eel
 
 .if !defined(WITHOUT_MOZILLA)
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index 06a41534457f..7f32a808cdba 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nautilus
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/nautilus
@@ -20,7 +21,6 @@ BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2	# XXX
 
 LIB_DEPENDS=	medusa.0:${PORTSDIR}/sysutils/medusa \
 		freetype.6:${PORTSDIR}/print/freetype2 \
-		ghttp.1:${PORTSDIR}/www/libghttp \
 		eel.0:${PORTSDIR}/x11-toolkits/eel
 
 .if !defined(WITHOUT_MOZILLA)
diff --git a/x11-toolkits/guile-gnome/Makefile b/x11-toolkits/guile-gnome/Makefile
index fef1014f3402..f71b732db312 100644
--- a/x11-toolkits/guile-gnome/Makefile
+++ b/x11-toolkits/guile-gnome/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	guile-gnome
 PORTVERSION=	0.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/gnome-guile
@@ -15,8 +15,7 @@ DISTNAME=	gnome-guile-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	ghttp.1:${PORTSDIR}/www/libghttp \
-		guilegtk-1.2.0:${PORTSDIR}/x11-toolkits/guile-gtk
+LIB_DEPENDS=	guilegtk-1.2.0:${PORTSDIR}/x11-toolkits/guile-gtk
 
 USE_LIBTOOL=	yes
 USE_GNOME=	yes
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 5dc81be80921..d3e89e0d2d9c 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomeapplets
 PORTVERSION=	1.4.0.1
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/gnome-applets
@@ -14,8 +15,7 @@ DISTNAME=	gnome-applets-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	ghttp.1:${PORTSDIR}/www/libghttp \
-		gtop.1:${PORTSDIR}/devel/libgtop
+LIB_DEPENDS=	gtop.1:${PORTSDIR}/devel/libgtop
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/x11/gnomeapplets/Makefile b/x11/gnomeapplets/Makefile
index 5dc81be80921..d3e89e0d2d9c 100644
--- a/x11/gnomeapplets/Makefile
+++ b/x11/gnomeapplets/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomeapplets
 PORTVERSION=	1.4.0.1
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/gnome-applets
@@ -14,8 +15,7 @@ DISTNAME=	gnome-applets-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	ghttp.1:${PORTSDIR}/www/libghttp \
-		gtop.1:${PORTSDIR}/devel/libgtop
+LIB_DEPENDS=	gtop.1:${PORTSDIR}/devel/libgtop
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index 5dc81be80921..d3e89e0d2d9c 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomeapplets
 PORTVERSION=	1.4.0.1
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/gnome-applets
@@ -14,8 +15,7 @@ DISTNAME=	gnome-applets-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	ghttp.1:${PORTSDIR}/www/libghttp \
-		gtop.1:${PORTSDIR}/devel/libgtop
+LIB_DEPENDS=	gtop.1:${PORTSDIR}/devel/libgtop
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/x11/stockticker_applet/Makefile b/x11/stockticker_applet/Makefile
index 711a0d363ba1..80bda5698af5 100644
--- a/x11/stockticker_applet/Makefile
+++ b/x11/stockticker_applet/Makefile
@@ -7,15 +7,13 @@
 
 PORTNAME=	stockticker_applet
 PORTVERSION=	0.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:S/_applet//}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	ghttp.1:${PORTSDIR}/www/libghttp
-
 USE_GNOME=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes