52 files changed, 106 insertions, 75 deletions

diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index b2f7545b4047..efa8daee8012 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -47,7 +47,7 @@ PKGNAMESUFFIX=	-gtk
 CONFIGURE_ARGS+=--without-gtk
 .elif defined(WITH_GTK2)
 PKGNAMESUFFIX=	-gtk
-LIB_DEPENDS+=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+LIB_DEPENDS+=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 CONFIGURE_ARGS+=--without-gtk1
 .else
 CONFIGURE_ARGS+=--without-gtk --without-gtk1
diff --git a/audio/mhwaveedit/Makefile b/audio/mhwaveedit/Makefile
index 5cac45f2979b..23024988b7ee 100644
--- a/audio/mhwaveedit/Makefile
+++ b/audio/mhwaveedit/Makefile
@@ -8,13 +8,14 @@
 
 PORTNAME=	mhwaveedit
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mtek.chalmers.se/~hjormagn/
 
 MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile \
-		gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+		gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
diff --git a/audio/nogger/Makefile b/audio/nogger/Makefile
index 1f5c4d5eadf0..22ff69c7d979 100644
--- a/audio/nogger/Makefile
+++ b/audio/nogger/Makefile
@@ -7,12 +7,13 @@
 
 PORTNAME=	nogger
 PORTVERSION=	0.8.2
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.efd.lth.se/~d00jkr/nogger/
 
 MAINTAINER=	trevor@FreeBSD.org
 
-LIB_DEPENDS=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \
+LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
 		vorbis.2:${PORTSDIR}/audio/libvorbis
 
 PLIST=		${WRKDIR}/plist
diff --git a/ftp/downloader/Makefile b/ftp/downloader/Makefile
index f34e7c384913..0558b87c8b8b 100644
--- a/ftp/downloader/Makefile
+++ b/ftp/downloader/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	downloader
 PORTVERSION=	2.4.1
+PORTREVISION=	1
 CATEGORIES=	ftp
 MASTER_SITES=	http://www.krasu.ru/soft/chuchelo/files/ \
 		ftp://ftp.chg.ru/pub/X11/applications/Xdownloader/ \
@@ -17,7 +18,7 @@ DISTNAME=	d4x-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 
 USE_GNOMENG=	yes
 USE_GNOME=	esound
diff --git a/games/gtkballs/Makefile b/games/gtkballs/Makefile
index cc309440cdd3..c2c58d26e2e6 100644
--- a/games/gtkballs/Makefile
+++ b/games/gtkballs/Makefile
@@ -7,12 +7,13 @@
 
 PORTNAME=	gtkballs
 PORTVERSION=	3.0.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://gtkballs.antex.ru/dist/
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index 69134c109fac..e4ffbd7e7b20 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gimp
 PORTVERSION=	1.3.11
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -21,7 +22,7 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \
+LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
 		gimpprint.1:${PORTSDIR}/print/gimp-print \
 		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
 		aa.1:${PORTSDIR}/graphics/aalib \
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 69134c109fac..e4ffbd7e7b20 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gimp
 PORTVERSION=	1.3.11
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -21,7 +22,7 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \
+LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
 		gimpprint.1:${PORTSDIR}/print/gimp-print \
 		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
 		aa.1:${PORTSDIR}/graphics/aalib \
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index 69134c109fac..e4ffbd7e7b20 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gimp
 PORTVERSION=	1.3.11
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -21,7 +22,7 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \
+LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
 		gimpprint.1:${PORTSDIR}/print/gimp-print \
 		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
 		aa.1:${PORTSDIR}/graphics/aalib \
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 69134c109fac..e4ffbd7e7b20 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gimp
 PORTVERSION=	1.3.11
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -21,7 +22,7 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \
+LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
 		gimpprint.1:${PORTSDIR}/print/gimp-print \
 		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
 		aa.1:${PORTSDIR}/graphics/aalib \
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 69134c109fac..e4ffbd7e7b20 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gimp
 PORTVERSION=	1.3.11
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -21,7 +22,7 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \
+LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
 		gimpprint.1:${PORTSDIR}/print/gimp-print \
 		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
 		aa.1:${PORTSDIR}/graphics/aalib \
diff --git a/graphics/libexif-gtk/Makefile b/graphics/libexif-gtk/Makefile
index 348f6b380455..e069aee8f3fb 100644
--- a/graphics/libexif-gtk/Makefile
+++ b/graphics/libexif-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libexif-gtk
 PORTVERSION=	0.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	libexif
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	libexif
 MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	exif.8:${PORTSDIR}/graphics/libexif \
-		gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+		gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
index 34a175d3e3ba..9a273533040f 100644
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xchat2
 PORTVERSION=	1.9.8
+PORTREVISION=	1
 CATEGORIES=	irc gnome ipv6
 MASTER_SITES=	http://xchat.org/files/source/1.9/ \
 		http://xchat.linuxpower.org/files/source/1.9/
@@ -14,7 +15,7 @@ DISTNAME=	xchat-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
diff --git a/irc/xchat2/Makefile b/irc/xchat2/Makefile
index 34a175d3e3ba..9a273533040f 100644
--- a/irc/xchat2/Makefile
+++ b/irc/xchat2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xchat2
 PORTVERSION=	1.9.8
+PORTREVISION=	1
 CATEGORIES=	irc gnome ipv6
 MASTER_SITES=	http://xchat.org/files/source/1.9/ \
 		http://xchat.linuxpower.org/files/source/1.9/
@@ -14,7 +15,7 @@ DISTNAME=	xchat-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 559f2492cb9e..40735cae5bf5 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gcalctool
 PORTVERSION=	4.1.9
+PORTREVISION=	1
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/4.1
@@ -14,7 +15,7 @@ DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/math/gretl/Makefile b/math/gretl/Makefile
index 80d6efb1c83f..37b17ef69b1a 100644
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gretl
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,7 +18,7 @@ MAINTAINER=	ports@FreeBSD.org
 BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4 \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
-		gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+		gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 
 USE_X_PREFIX=	yes
@@ -36,8 +37,9 @@ MAN1=	gretl.1 gretl-config.1
 CONFIGURE_ARGS+=	--without-gnome
 PLIST_SUB+=	GNOME2:="@comment " DATADIR="share"
 .else
-LIB_DEPENDS+=	gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \
-		gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
+BROKEN=		"Needs to be updated for libgnomeprint-2.2"
+LIB_DEPENDS+=	gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \
+		gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
 USE_GNOME=	gnomeprefix
 PLIST_SUB+=	GNOME2:="" DATADIR="share/gnome"
 .endif
diff --git a/misc/gretl/Makefile b/misc/gretl/Makefile
index 80d6efb1c83f..37b17ef69b1a 100644
--- a/misc/gretl/Makefile
+++ b/misc/gretl/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gretl
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,7 +18,7 @@ MAINTAINER=	ports@FreeBSD.org
 BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4 \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
-		gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+		gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 
 USE_X_PREFIX=	yes
@@ -36,8 +37,9 @@ MAN1=	gretl.1 gretl-config.1
 CONFIGURE_ARGS+=	--without-gnome
 PLIST_SUB+=	GNOME2:="@comment " DATADIR="share"
 .else
-LIB_DEPENDS+=	gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \
-		gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
+BROKEN=		"Needs to be updated for libgnomeprint-2.2"
+LIB_DEPENDS+=	gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \
+		gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
 USE_GNOME=	gnomeprefix
 PLIST_SUB+=	GNOME2:="" DATADIR="share/gnome"
 .endif
diff --git a/misc/lingoteach/Makefile b/misc/lingoteach/Makefile
index 10982f40153e..522db31a3215 100644
--- a/misc/lingoteach/Makefile
+++ b/misc/lingoteach/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lingoteach
 PORTVERSION=	0.3.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,7 +19,7 @@ DISTFILES=	${PORTNAME}-sound-${PORTVERSION}.tar.gz \
 MAINTAINER=	mva121@gmx.net
 
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
-		gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+		gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 .if defined(WITH_SOUND)
 RUN_DEPENDS=	ogg123:${PORTSDIR}/audio/vorbis-tools
 .endif
diff --git a/misc/uf-view/Makefile b/misc/uf-view/Makefile
index 3afd2d152f69..ccd927c2552c 100644
--- a/misc/uf-view/Makefile
+++ b/misc/uf-view/Makefile
@@ -7,14 +7,15 @@
 
 PORTNAME=	uf-view
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://www.hadess.net/files/software/uf-view/
 
 MAINTAINER=	mcgee@wam.umd.edu
 
 LIB_DEPENDS=    gnomevfs-2.0:${PORTSDIR}/devel/gnomevfs2 \
-		gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \
-		gnome-desktop-2.0:${PORTSDIR}/x11/gnomedesktop
+		gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
+		gnome-desktop-2.3:${PORTSDIR}/x11/gnomedesktop
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/multimedia/gstreamer-player/Makefile b/multimedia/gstreamer-player/Makefile
index fe29d929ac42..758cbc93fe29 100644
--- a/multimedia/gstreamer-player/Makefile
+++ b/multimedia/gstreamer-player/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gstreamer
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	multimedia audio gnome
 MASTER_SITES=	http://gstreamer.net/releases/0.4.0/src/
 PKGNAMESUFFIX=	-player
@@ -16,9 +17,9 @@ MAINTAINER=	lioux@FreeBSD.org
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 LIB_DEPENDS=	glib-2.0.0:${PORTSDIR}/devel/glib20 \
-		gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
+		gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
 		gstreamer.0:${PORTSDIR}/multimedia/gstreamer \
-		gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \
+		gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
 		popt.0:${PORTSDIR}/devel/popt \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 RUN_DEPENDS=	gst-visualise:${PORTSDIR}/multimedia/gstreamer-plugins
diff --git a/net/gaim-snapshot/Makefile b/net/gaim-snapshot/Makefile
index 73682be01328..1c058c907a94 100644
--- a/net/gaim-snapshot/Makefile
+++ b/net/gaim-snapshot/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	gaim
 PORTVERSION=	20030130
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	marcus/
 
 MAINTAINER=	marcus@FreeBSD.org
 
-LIB_DEPENDS=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 
 NO_LATEST_LINK=	yes
 USE_X_PREFIX=	yes
diff --git a/security/gringotts/Makefile b/security/gringotts/Makefile
index 04172d10b434..ee4870be0477 100644
--- a/security/gringotts/Makefile
+++ b/security/gringotts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gringotts
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://devel.pluto.linux.it/projects/Gringotts/current/ \
 		ftp://ftp.nuug.no/pub/anders/distfiles/
@@ -14,7 +15,7 @@ MASTER_SITES=	http://devel.pluto.linux.it/projects/Gringotts/current/ \
 MAINTAINER=	anders@FreeBSD.org
 
 LIB_DEPENDS=	gringotts.2:${PORTSDIR}/security/libgringotts \
-		gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \
+		gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
 		popt.0:${PORTSDIR}/devel/popt
 
 USE_BZIP2=	yes
diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 716230372f99..824ac219ddcf 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -21,7 +21,7 @@ INSTALL_WRKSRC=	${WRKSRC}/server
 USE_GNOMENG=	yes
 USE_GNOME=	glib12
 .else
-LIB_DEPENDS=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 USE_XLIB=	yes
 .endif
 
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index 05e72234603b..f92e3c8d09b5 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	gtkspell2
 PORTVERSION=	2.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc gnome
 MASTER_SITES=	http://gtkspell.sourceforge.net/download/
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \
+LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
 		pspell.15:${PORTSDIR}/textproc/aspell
 
 USE_X_PREFIX=	yes
diff --git a/textproc/gtkspell2/Makefile b/textproc/gtkspell2/Makefile
index 05e72234603b..f92e3c8d09b5 100644
--- a/textproc/gtkspell2/Makefile
+++ b/textproc/gtkspell2/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	gtkspell2
 PORTVERSION=	2.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc gnome
 MASTER_SITES=	http://gtkspell.sourceforge.net/download/
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \
+LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
 		pspell.15:${PORTSDIR}/textproc/aspell
 
 USE_X_PREFIX=	yes
diff --git a/www/bluefish-devel/Makefile b/www/bluefish-devel/Makefile
index 22269583f33b..e053c56661c2 100644
--- a/www/bluefish-devel/Makefile
+++ b/www/bluefish-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bluefish
 PORTVERSION=	0.8.20030113
+PORTREVISION=	1
 CATEGORIES=	www editors
 MASTER_SITES=	http://pkedu.fbt.eitn.wau.nl/~olivier/snapshots/ \
 		ftp://bluefish.advancecreations.com/pub/bluefish/snapshots/ \
@@ -18,7 +19,7 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	einekoai@chello.nl
 
-LIB_DEPENDS=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \
+LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
 		pcre.0:${PORTSDIR}/devel/pcre
 RUN_DEPENDS=	weblint:${PORTSDIR}/www/weblint
 
diff --git a/www/mozilla-devel-gtk1/Makefile b/www/mozilla-devel-gtk1/Makefile
index adf5a2a10424..f7c73da629ac 100644
--- a/www/mozilla-devel-gtk1/Makefile
+++ b/www/mozilla-devel-gtk1/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mozilla
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	0
 CATEGORIES=	www
 
diff --git a/www/mozilla-devel-gtk2/Makefile b/www/mozilla-devel-gtk2/Makefile
index adf5a2a10424..f7c73da629ac 100644
--- a/www/mozilla-devel-gtk2/Makefile
+++ b/www/mozilla-devel-gtk2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mozilla
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	0
 CATEGORIES=	www
 
diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile
index 4c171ab69c0f..230675cf4737 100644
--- a/www/mozilla-devel/Makefile
+++ b/www/mozilla-devel/Makefile
@@ -33,9 +33,8 @@ MOZILLA?=	mozilla-devel
 WITHOUT_CHATZILLA=	"Contains a buffer overflow reported at http://online.securityfocus.com/archive/1/270249"
 
 .if defined(WITH_GTK2)
-LIB_DEPENDS+=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \
+LIB_DEPENDS+=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
 		ORBit-2.0:${PORTSDIR}/devel/ORBit2
-WITHOUT_XFT=	"Mozilla cannot be built with GTK-2.0 and Xft support"
 .else
 USE_GNOME=	gtk12
 .endif
diff --git a/www/mozilla-gtk1/Makefile b/www/mozilla-gtk1/Makefile
index f12696c810a9..5cb4b389199d 100644
--- a/www/mozilla-gtk1/Makefile
+++ b/www/mozilla-gtk1/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mozilla
-PORTREVISION=	0
+PORTREVISION=	2
 PORTEPOCH=	0
 CATEGORIES=	www
 
diff --git a/www/mozilla-gtk2/Makefile b/www/mozilla-gtk2/Makefile
index f12696c810a9..5cb4b389199d 100644
--- a/www/mozilla-gtk2/Makefile
+++ b/www/mozilla-gtk2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mozilla
-PORTREVISION=	0
+PORTREVISION=	2
 PORTEPOCH=	0
 CATEGORIES=	www
 
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 0bd9502b73e5..c4b04ce74c64 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -33,9 +33,8 @@ MOZILLA?=	mozilla
 WITHOUT_CHATZILLA=	"Contains a buffer overflow reported at http://online.securityfocus.com/archive/1/270249"
 
 .if defined(WITH_GTK2)
-LIB_DEPENDS+=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \
+LIB_DEPENDS+=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
 		ORBit-2.0:${PORTSDIR}/devel/ORBit2
-WITHOUT_XFT=	"Mozilla cannot be built with GTK-2.0 and Xft support"
 .else
 USE_GNOME=	gtk12
 .endif
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 4c171ab69c0f..230675cf4737 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -33,9 +33,8 @@ MOZILLA?=	mozilla-devel
 WITHOUT_CHATZILLA=	"Contains a buffer overflow reported at http://online.securityfocus.com/archive/1/270249"
 
 .if defined(WITH_GTK2)
-LIB_DEPENDS+=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \
+LIB_DEPENDS+=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
 		ORBit-2.0:${PORTSDIR}/devel/ORBit2
-WITHOUT_XFT=	"Mozilla cannot be built with GTK-2.0 and Xft support"
 .else
 USE_GNOME=	gtk12
 .endif
diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
index 4c171ab69c0f..230675cf4737 100644
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@@ -33,9 +33,8 @@ MOZILLA?=	mozilla-devel
 WITHOUT_CHATZILLA=	"Contains a buffer overflow reported at http://online.securityfocus.com/archive/1/270249"
 
 .if defined(WITH_GTK2)
-LIB_DEPENDS+=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \
+LIB_DEPENDS+=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
 		ORBit-2.0:${PORTSDIR}/devel/ORBit2
-WITHOUT_XFT=	"Mozilla cannot be built with GTK-2.0 and Xft support"
 .else
 USE_GNOME=	gtk12
 .endif
diff --git a/x11-fm/rox-filer/Makefile b/x11-fm/rox-filer/Makefile
index 17acff577761..e9b69d8558cf 100644
--- a/x11-fm/rox-filer/Makefile
+++ b/x11-fm/rox-filer/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	rox
 PORTVERSION=	1.3.6
+PORTREVISION=	1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rox
@@ -16,7 +17,7 @@ MAINTAINER=	olgeni@FreeBSD.org
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig \
 		autoconf:${PORTSDIR}/devel/autoconf
-LIB_DEPENDS=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \
+LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		gnomevfs-2.0:${PORTSDIR}/devel/gnomevfs2
 RUN_DEPENDS=	${LOCALBASE}/share/mime/packages/freedesktop.org.xml:${PORTSDIR}/misc/shared-mime-info
diff --git a/x11-fm/rox-session/Makefile b/x11-fm/rox-session/Makefile
index 0adf76067572..f80f40168c70 100644
--- a/x11-fm/rox-session/Makefile
+++ b/x11-fm/rox-session/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	rox-session
 PORTVERSION=	0.1.18
+PORTREVISION=	1
 CATEGORIES=	x11-fm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rox
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	olgeni@FreeBSD.org
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \
+LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 RUN_DEPENDS=	${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer
 
diff --git a/x11-themes/geramik/Makefile b/x11-themes/geramik/Makefile
index 76ea0ecacee1..bf15bb043bb0 100644
--- a/x11-themes/geramik/Makefile
+++ b/x11-themes/geramik/Makefile
@@ -24,8 +24,8 @@ USE_GNOME=	gtk12 imlib
 USE_GMAKE=	yes
 
 .if exists(${X11BASE}/libdata/pkgconfig/gtk+-2.0.pc) || defined(WITH_GTK2)
-LIB_DEPENDS+=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
-PLIST_SUB+=	GTK2="" GTK2_VERSION="2.0.0"
+LIB_DEPENDS+=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
+PLIST_SUB+=	GTK2="" GTK2_VERSION="2.2.0"
 .else
 PLIST_SUB+=	GTK2="@comment "
 .endif
diff --git a/x11-themes/gtk-bluecurve-theme/Makefile b/x11-themes/gtk-bluecurve-theme/Makefile
index e0eaffd9bb3f..a4b308d42eb6 100644
--- a/x11-themes/gtk-bluecurve-theme/Makefile
+++ b/x11-themes/gtk-bluecurve-theme/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk-bluecurve-theme
 PORTVERSION=	0.47
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_REDHAT_LINUX}
 MASTER_SITE_SUBDIR=	8.0/en/os/i386/SRPMS
@@ -28,9 +29,9 @@ RH_SUBVERSION=	3
 THEMES_SUBDIRS= ${WRKSRC}/art/gtk/Bluecurve1
 
 .if defined(WITH_GTK2)
-LIB_DEPENDS+=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+LIB_DEPENDS+=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 THEMES_SUBDIRS+=	${WRKSRC}/art/gtk/Bluecurve
-PLIST_SUB+=	GTK2="" GTKVERSION="2.0.0"
+PLIST_SUB+=	GTK2="" GTKVERSION="2.2.0"
 .else
 PLIST_SUB+=	GTK2="@comment "
 .endif
@@ -65,9 +66,9 @@ do-build:
 do-install:
 	@${MKDIR} ${PREFIX}/share/themes/Bluecurve && ${CHMOD} a+rx ${PREFIX}/share/themes/Bluecurve
 .if defined(WITH_GTK2)
-	@${MKDIR} ${PREFIX}/lib/gtk-2.0/2.0.0/engines && ${CHMOD} a+rx ${PREFIX}/lib/gtk-2.0/2.0.0/engines
+	@${MKDIR} ${PREFIX}/lib/gtk-2.0/2.2.0/engines && ${CHMOD} a+rx ${PREFIX}/lib/gtk-2.0/2.2.0/engines
 	@${MKDIR} ${PREFIX}/share/themes/Bluecurve/gtk-2.0 && ${CHMOD} a+rx ${PREFIX}/share/themes/Bluecurve/gtk-2.0
-	@${INSTALL_PROGRAM} ${WRKSRC}/art/gtk/Bluecurve/.libs/libbluecurve.so ${PREFIX}/lib/gtk-2.0/2.0.0/engines
+	@${INSTALL_PROGRAM} ${WRKSRC}/art/gtk/Bluecurve/.libs/libbluecurve.so ${PREFIX}/lib/gtk-2.0/2.2.0/engines
 	@${INSTALL_DATA} ${WRKSRC}/art/gtk/Bluecurve/gtk-2.0/gtkrc ${PREFIX}/share/themes/Bluecurve/gtk-2.0
 .endif
 	@${MKDIR} ${PREFIX}/lib/gtk/themes/engines && ${CHMOD} a+rx ${PREFIX}/lib/gtk/themes/engines
diff --git a/x11-themes/gtk-qnxtheme/Makefile b/x11-themes/gtk-qnxtheme/Makefile
index c4e7812296fc..3e3d82a3b74f 100644
--- a/x11-themes/gtk-qnxtheme/Makefile
+++ b/x11-themes/gtk-qnxtheme/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk-qnxtheme
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://download.freshmeat.net/themes/qnxtheme/
 DISTNAME=	qnxtheme-default-${PORTVERSION}
@@ -14,7 +15,7 @@ DISTNAME=	qnxtheme-default-${PORTVERSION}
 MAINTAINER=	flynn@energyhq.homeip.net
 
 .if defined(WITH_GTK2)
-LIB_DEPENDS+=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+LIB_DEPENDS+=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 PLIST_SUB+=	GTK2=""
 .else
 PLIST_SUB+=	GTK2="@comment "
diff --git a/x11-themes/gtk-xfce-engine/Makefile b/x11-themes/gtk-xfce-engine/Makefile
index 25546caf6bfd..4a8eebab0b5a 100644
--- a/x11-themes/gtk-xfce-engine/Makefile
+++ b/x11-themes/gtk-xfce-engine/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk-xfce-engine
 PORTVERSION=	2.0.10
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xfce
@@ -14,7 +15,7 @@ DISTNAME=	gtk-xfce-engine-${PORTVERSION}
 
 MAINTAINER=	olgeni@FreeBSD.org
 
-LIB_DEPENDS=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 
 WRKSRC=		${WRKDIR}/gtk-xfce-engine-${PORTVERSION}
 
diff --git a/x11-themes/gtk-xfce-engine/pkg-plist b/x11-themes/gtk-xfce-engine/pkg-plist
index 5c9a44062ae6..838213c81fdc 100644
--- a/x11-themes/gtk-xfce-engine/pkg-plist
+++ b/x11-themes/gtk-xfce-engine/pkg-plist
@@ -1,4 +1,4 @@
-lib/gtk-2.0/2.0.0/engines/libxfce.so
+lib/gtk-2.0/2.2.0/engines/libxfce.so
 share/themes/Xfce-Redmondxp/ICON.png
 share/themes/Xfce-Redmondxp/README.html
 share/themes/Xfce-Redmondxp/gtk-2.0/gtkrc
diff --git a/x11-toolkits/gauche-gtk/Makefile b/x11-toolkits/gauche-gtk/Makefile
index 455766980194..5b1299529f24 100644
--- a/x11-toolkits/gauche-gtk/Makefile
+++ b/x11-toolkits/gauche-gtk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk
 PORTVERSION=	0.2.4
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gauche
@@ -16,7 +17,7 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	fuyuki@hadaly.org
 
-LIB_DEPENDS=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS=	gosh:${PORTSDIR}/lang/gauche
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/x11-toolkits/geramik/Makefile b/x11-toolkits/geramik/Makefile
index 76ea0ecacee1..bf15bb043bb0 100644
--- a/x11-toolkits/geramik/Makefile
+++ b/x11-toolkits/geramik/Makefile
@@ -24,8 +24,8 @@ USE_GNOME=	gtk12 imlib
 USE_GMAKE=	yes
 
 .if exists(${X11BASE}/libdata/pkgconfig/gtk+-2.0.pc) || defined(WITH_GTK2)
-LIB_DEPENDS+=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
-PLIST_SUB+=	GTK2="" GTK2_VERSION="2.0.0"
+LIB_DEPENDS+=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
+PLIST_SUB+=	GTK2="" GTK2_VERSION="2.2.0"
 .else
 PLIST_SUB+=	GTK2="@comment "
 .endif
diff --git a/x11-toolkits/gtk--2/Makefile b/x11-toolkits/gtk--2/Makefile
index 168cd9f5b7e8..daed3b8eed72 100644
--- a/x11-toolkits/gtk--2/Makefile
+++ b/x11-toolkits/gtk--2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtkmm
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		${MASTER_SITE_SOURCEFORGE}
@@ -17,7 +18,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \
-		gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+		gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_X_PREFIX=	yes
diff --git a/x11-toolkits/gtk-bluecurve-theme/Makefile b/x11-toolkits/gtk-bluecurve-theme/Makefile
index e0eaffd9bb3f..a4b308d42eb6 100644
--- a/x11-toolkits/gtk-bluecurve-theme/Makefile
+++ b/x11-toolkits/gtk-bluecurve-theme/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk-bluecurve-theme
 PORTVERSION=	0.47
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_REDHAT_LINUX}
 MASTER_SITE_SUBDIR=	8.0/en/os/i386/SRPMS
@@ -28,9 +29,9 @@ RH_SUBVERSION=	3
 THEMES_SUBDIRS= ${WRKSRC}/art/gtk/Bluecurve1
 
 .if defined(WITH_GTK2)
-LIB_DEPENDS+=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+LIB_DEPENDS+=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 THEMES_SUBDIRS+=	${WRKSRC}/art/gtk/Bluecurve
-PLIST_SUB+=	GTK2="" GTKVERSION="2.0.0"
+PLIST_SUB+=	GTK2="" GTKVERSION="2.2.0"
 .else
 PLIST_SUB+=	GTK2="@comment "
 .endif
@@ -65,9 +66,9 @@ do-build:
 do-install:
 	@${MKDIR} ${PREFIX}/share/themes/Bluecurve && ${CHMOD} a+rx ${PREFIX}/share/themes/Bluecurve
 .if defined(WITH_GTK2)
-	@${MKDIR} ${PREFIX}/lib/gtk-2.0/2.0.0/engines && ${CHMOD} a+rx ${PREFIX}/lib/gtk-2.0/2.0.0/engines
+	@${MKDIR} ${PREFIX}/lib/gtk-2.0/2.2.0/engines && ${CHMOD} a+rx ${PREFIX}/lib/gtk-2.0/2.2.0/engines
 	@${MKDIR} ${PREFIX}/share/themes/Bluecurve/gtk-2.0 && ${CHMOD} a+rx ${PREFIX}/share/themes/Bluecurve/gtk-2.0
-	@${INSTALL_PROGRAM} ${WRKSRC}/art/gtk/Bluecurve/.libs/libbluecurve.so ${PREFIX}/lib/gtk-2.0/2.0.0/engines
+	@${INSTALL_PROGRAM} ${WRKSRC}/art/gtk/Bluecurve/.libs/libbluecurve.so ${PREFIX}/lib/gtk-2.0/2.2.0/engines
 	@${INSTALL_DATA} ${WRKSRC}/art/gtk/Bluecurve/gtk-2.0/gtkrc ${PREFIX}/share/themes/Bluecurve/gtk-2.0
 .endif
 	@${MKDIR} ${PREFIX}/lib/gtk/themes/engines && ${CHMOD} a+rx ${PREFIX}/lib/gtk/themes/engines
diff --git a/x11-toolkits/gtk-qnxtheme/Makefile b/x11-toolkits/gtk-qnxtheme/Makefile
index c4e7812296fc..3e3d82a3b74f 100644
--- a/x11-toolkits/gtk-qnxtheme/Makefile
+++ b/x11-toolkits/gtk-qnxtheme/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk-qnxtheme
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://download.freshmeat.net/themes/qnxtheme/
 DISTNAME=	qnxtheme-default-${PORTVERSION}
@@ -14,7 +15,7 @@ DISTNAME=	qnxtheme-default-${PORTVERSION}
 MAINTAINER=	flynn@energyhq.homeip.net
 
 .if defined(WITH_GTK2)
-LIB_DEPENDS+=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+LIB_DEPENDS+=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 PLIST_SUB+=	GTK2=""
 .else
 PLIST_SUB+=	GTK2="@comment "
diff --git a/x11-toolkits/gtk-xfce-engine/Makefile b/x11-toolkits/gtk-xfce-engine/Makefile
index 25546caf6bfd..4a8eebab0b5a 100644
--- a/x11-toolkits/gtk-xfce-engine/Makefile
+++ b/x11-toolkits/gtk-xfce-engine/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk-xfce-engine
 PORTVERSION=	2.0.10
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xfce
@@ -14,7 +15,7 @@ DISTNAME=	gtk-xfce-engine-${PORTVERSION}
 
 MAINTAINER=	olgeni@FreeBSD.org
 
-LIB_DEPENDS=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 
 WRKSRC=		${WRKDIR}/gtk-xfce-engine-${PORTVERSION}
 
diff --git a/x11-toolkits/gtk-xfce-engine/pkg-plist b/x11-toolkits/gtk-xfce-engine/pkg-plist
index 5c9a44062ae6..838213c81fdc 100644
--- a/x11-toolkits/gtk-xfce-engine/pkg-plist
+++ b/x11-toolkits/gtk-xfce-engine/pkg-plist
@@ -1,4 +1,4 @@
-lib/gtk-2.0/2.0.0/engines/libxfce.so
+lib/gtk-2.0/2.2.0/engines/libxfce.so
 share/themes/Xfce-Redmondxp/ICON.png
 share/themes/Xfce-Redmondxp/README.html
 share/themes/Xfce-Redmondxp/gtk-2.0/gtkrc
diff --git a/x11-toolkits/gtkglarea2/Makefile b/x11-toolkits/gtkglarea2/Makefile
index bbcc9c2b59e2..6aceee1431a6 100644
--- a/x11-toolkits/gtkglarea2/Makefile
+++ b/x11-toolkits/gtkglarea2/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	gtkglarea
 PORTVERSION=	1.99.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gtkglarea/1.99
@@ -15,7 +15,7 @@ DIST_SUBDIR=	gnome2
 
 MAINTAINER=	marc@informatik.uni-bremen.de
 
-LIB_DEPENDS=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index 168cd9f5b7e8..daed3b8eed72 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtkmm
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		${MASTER_SITE_SOURCEFORGE}
@@ -17,7 +18,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \
-		gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+		gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_X_PREFIX=	yes
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index 168cd9f5b7e8..daed3b8eed72 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtkmm
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		${MASTER_SITE_SOURCEFORGE}
@@ -17,7 +18,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \
-		gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+		gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_X_PREFIX=	yes
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index 168cd9f5b7e8..daed3b8eed72 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtkmm
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		${MASTER_SITE_SOURCEFORGE}
@@ -17,7 +18,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \
-		gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+		gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_X_PREFIX=	yes
diff --git a/x11-toolkits/ruby-gtk2/Makefile b/x11-toolkits/ruby-gtk2/Makefile
index 4863ee7f8080..f3d0065a13ce 100644
--- a/x11-toolkits/ruby-gtk2/Makefile
+++ b/x11-toolkits/ruby-gtk2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -16,7 +17,7 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-LIB_DEPENDS=    gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+LIB_DEPENDS=    gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2
 
 USE_RUBY=	yes