--- devel/atk/Makefile.dist	Mon Sep 22 02:09:37 2003
+++ devel/atk/Makefile	Fri Oct  3 21:17:49 2003
@@ -9,7 +9,7 @@
 PORTVERSION=	1.4.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME} \
-		ftp://ftp.gtk.org/pub/gtk/v2.0/
+		ftp://ftp.gtk.org/pub/gtk/v2.2/
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.4
 DIST_SUBDIR=	gnome2
 
--- devel/glib20/Makefile.dist	Sun Aug 31 00:43:09 2003
+++ devel/glib20/Makefile	Fri Oct  3 20:58:28 2003
@@ -1,4 +1,4 @@
-# New ports collection makefile for:   glib13
+# New ports collection makefile for:   glib20
 # Date Created:			28 July 1998
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.org>
 #
@@ -9,7 +9,7 @@
 PORTVERSION=	2.2.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.2,} \
-		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
+		ftp://ftp.gtk.org/pub/gtk/v2.2/ \
 		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
 		http://www.ameth.org/gimp/%SUBDIR%/ \
--- graphics/gimp-devel/Makefile.dist	Sun Sep 28 22:40:39 2003
+++ graphics/gimp-devel/Makefile	Fri Oct  3 20:52:27 2003
@@ -11,7 +11,6 @@
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \
-		ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
 MASTER_SITE_SUBDIR=	gimp/v${PORTVERSION:R}/v${PORTVERSION}
 
--- graphics/gimp1/Makefile.dist	Mon Jul 14 01:56:11 2003
+++ graphics/gimp1/Makefile	Fri Oct  3 20:52:57 2003
@@ -11,7 +11,6 @@
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \
-		ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,} \
 		ftp://ftp.bic.mni.mcgill.ca/pub/mpeg/:mpeg \
 		http://starship.python.net/~gward/mpeglib/:mpeg
--- textproc/gtk-doc/Makefile.dist	Mon Aug 25 21:33:48 2003
+++ textproc/gtk-doc/Makefile	Fri Oct  3 21:09:51 2003
@@ -7,9 +7,9 @@
 
 PORTNAME=	gtk-doc
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
-MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/v1.1/docs/rdp/
+MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk-doc/
 
 MAINTAINER=	gnome@freebsd.org
 COMMENT=	Code documentation system, originally for GTK+
--- x11-toolkits/gtk20/Makefile.dist	Sun Sep 28 22:45:34 2003
+++ x11-toolkits/gtk20/Makefile	Fri Oct  3 20:47:36 2003
@@ -1,4 +1,4 @@
-# New ports collection makefile for:   gtk13
+# New ports collection makefile for:   gtk20
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
@@ -10,10 +10,9 @@
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.2,} \
-		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
+		ftp://ftp.gtk.org/pub/gtk/v2.2/ \
 		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
-		http://www.ameth.org/gimp/%SUBDIR%/ \
 		ftp://ftp.mirror.ac.uk/sites/ftp.gimp.org/pub/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
 MASTER_SITE_SUBDIR=	gtk/v${PORTVERSION:R}
--- x11-toolkits/pango/Makefile.dist	Sun Aug 31 00:47:07 2003
+++ x11-toolkits/pango/Makefile	Fri Oct  3 20:42:45 2003
@@ -9,9 +9,7 @@
 PORTVERSION=	1.2.5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.2,} \
-		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
-		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.3/ \
-		http://www.ameth.org/gimp/gtk/v1.3/
+		ftp://ftp.gtk.org/pub/gtk/v2.2
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org