73 files changed, 84 insertions, 82 deletions

diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index 2500911e8f30..15221b3fee1c 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	at-spi
 PORTVERSION=	1.0.1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index 18ed1def595c..7df004b08553 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.0.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		ftp://ftp.gtk.org/pub/gtk/v2.0/
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 #MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 #		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
 #		http://www.ameth.org/gimp/%SUBDIR%/ \
diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile
index ebdefe2cf538..ca5f670e30eb 100644
--- a/accessibility/gail/Makefile
+++ b/accessibility/gail/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gail
 PORTVERSION=	0.16
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 21c17c9b2806..6f1df4e9fdd1 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomemedia2
 PORTVERSION=	2.0.0
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	gnome-media-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index 21c17c9b2806..6f1df4e9fdd1 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomemedia2
 PORTVERSION=	2.0.0
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	gnome-media-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 45c9d0239d71..dbf9f3fc0822 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.0.0
 PORTEPOCH=	1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	gnome-utils-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
index 45c9d0239d71..dbf9f3fc0822 100644
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/gnomeutils2/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.0.0
 PORTEPOCH=	1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	gnome-utils-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 36e557269cb8..93eef1803a0c 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	ORBit2
 PORTVERSION=	2.4.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index 18ed1def595c..7df004b08553 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.0.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		ftp://ftp.gtk.org/pub/gtk/v2.0/
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 #MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 #		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
 #		http://www.ameth.org/gimp/%SUBDIR%/ \
diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile
index 8f979ef47e05..55c87c58fbea 100644
--- a/devel/bonobo-activation/Makefile
+++ b/devel/bonobo-activation/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	bonobo-activation
 PORTVERSION=	1.0.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile
index 10c9b8519ded..0196df9bf043 100644
--- a/devel/bugbuddy2/Makefile
+++ b/devel/bugbuddy2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	bugbuddy2
 PORTVERSION=	2.2.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	bug-buddy-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 6c73f7b3288f..2506a83c51ea 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gconf2
 PORTVERSION=	1.2.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	GConf-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index ed840516700a..17fbc8235184 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	glib
 PORTVERSION=	2.0.4
 PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-rc2,} \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,2.0.0/releases/gnome-2.0-desktop-final,} \
 		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
 		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile
index e665920e587b..c9203fd5dfe8 100644
--- a/devel/gnome-common/Makefile
+++ b/devel/gnome-common/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomecommon
 PORTVERSION=	1.2.4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	gnome-common-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 178900592686..a4aef0aa3004 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomevfs2
 PORTVERSION=	2.0.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	gnome-vfs-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/gnomecommon/Makefile b/devel/gnomecommon/Makefile
index e665920e587b..c9203fd5dfe8 100644
--- a/devel/gnomecommon/Makefile
+++ b/devel/gnomecommon/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomecommon
 PORTVERSION=	1.2.4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	gnome-common-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 178900592686..a4aef0aa3004 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomevfs2
 PORTVERSION=	2.0.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	gnome-vfs-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index d243f0ad1f1b..712ac8ced9fb 100644
--- a/devel/libIDL/Makefile
+++ b/devel/libIDL/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	libIDL
 PORTVERSION=	0.8.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index b054896ccc81..7d9a7cd7ed70 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	libbonobo
 PORTVERSION=	2.0.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index b5c694b316f3..09394f337a3a 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	libglade2
 PORTVERSION=	2.0.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index f903949441d6..ad3f83de3e69 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	libgtop2
 PORTVERSION=	2.0.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	libgtop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
index 936984258f80..44c141557f91 100644
--- a/devel/pkg-config/Makefile
+++ b/devel/pkg-config/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	pkgconfig
 PORTVERSION=	0.12.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile
index 936984258f80..44c141557f91 100644
--- a/devel/pkgconfig/Makefile
+++ b/devel/pkgconfig/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	pkgconfig
 PORTVERSION=	0.12.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile
index a6548ab67d3e..ca48486a8115 100644
--- a/editors/gedit2/Makefile
+++ b/editors/gedit2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gedit2
 PORTVERSION=	2.0.0
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	gedit-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 626866f69559..542ba6e5d5ad 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomegames2
 PORTVERSION=	2.0.1
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	gnome-games-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index 626866f69559..542ba6e5d5ad 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomegames2
 PORTVERSION=	2.0.1
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	gnome-games-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index d5c25d37c53e..b535ea9a1eb1 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	eog2
 PORTVERSION=	1.0.1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	eog-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/graphics/libart_lgpl/Makefile b/graphics/libart_lgpl/Makefile
index a5dea57150df..6aedf503ccbc 100644
--- a/graphics/libart_lgpl/Makefile
+++ b/graphics/libart_lgpl/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libart_lgpl2
-PORTVERSION=	2.3.8
+PORTVERSION=	2.3.9
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -19,12 +19,13 @@ BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
 USE_BZIP2=	yes
+USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 pre-patch:
-	@find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
-		's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g'
+	@find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \
+		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
 
 .include <bsd.port.mk>
diff --git a/graphics/libart_lgpl/distinfo b/graphics/libart_lgpl/distinfo
index b95c1dad9834..fa36953f2d21 100644
--- a/graphics/libart_lgpl/distinfo
+++ b/graphics/libart_lgpl/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libart_lgpl-2.3.8.tar.bz2) = b3dba62f026ed6b30c61f572f6d65631
+MD5 (gnome2/libart_lgpl-2.3.9.tar.bz2) = 0453ceffd05e6a528455de8ac7890ab3
diff --git a/graphics/libart_lgpl2/Makefile b/graphics/libart_lgpl2/Makefile
index a5dea57150df..6aedf503ccbc 100644
--- a/graphics/libart_lgpl2/Makefile
+++ b/graphics/libart_lgpl2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libart_lgpl2
-PORTVERSION=	2.3.8
+PORTVERSION=	2.3.9
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -19,12 +19,13 @@ BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
 USE_BZIP2=	yes
+USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 pre-patch:
-	@find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
-		's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g'
+	@find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \
+		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
 
 .include <bsd.port.mk>
diff --git a/graphics/libart_lgpl2/distinfo b/graphics/libart_lgpl2/distinfo
index b95c1dad9834..fa36953f2d21 100644
--- a/graphics/libart_lgpl2/distinfo
+++ b/graphics/libart_lgpl2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libart_lgpl-2.3.8.tar.bz2) = b3dba62f026ed6b30c61f572f6d65631
+MD5 (gnome2/libart_lgpl-2.3.9.tar.bz2) = 0453ceffd05e6a528455de8ac7890ab3
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index f7548057fac6..4fbf4d1f26ce 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	libgnomecanvas
 PORTVERSION=	2.0.1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index e7a40cfc65bb..745ce064f6bc 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	librsvg2
 PORTVERSION=	1.1.6
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DIST_SUBDIR=	gnome2
 DISTNAME=	librsvg-${PORTVERSION}
 
diff --git a/misc/gnomeutils2/Makefile b/misc/gnomeutils2/Makefile
index 45c9d0239d71..dbf9f3fc0822 100644
--- a/misc/gnomeutils2/Makefile
+++ b/misc/gnomeutils2/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.0.0
 PORTEPOCH=	1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	gnome-utils-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/net/linc/Makefile b/net/linc/Makefile
index 50ed9374b625..4db086d00869 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	linc
 PORTVERSION=	0.5.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 5f8da493d5f0..11c1a99445d6 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	libgnomeprint
 PORTVERSION=	1.115.0
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index 90836daed2d4..f89ff14546ca 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gconf-editor
 PORTVERSION=	0.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 76895641ff3c..5ebca05347ce 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomecontrolcenter2
 PORTVERSION=	2.0.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	control-center-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 3abf9fdc8b4c..506a5f24bbe7 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomesystemmonitor
 PORTVERSION=	2.0.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	gnome-system-monitor-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 76895641ff3c..5ebca05347ce 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomecontrolcenter2
 PORTVERSION=	2.0.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	control-center-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile
index 3abf9fdc8b4c..506a5f24bbe7 100644
--- a/sysutils/gnomesystemmonitor/Makefile
+++ b/sysutils/gnomesystemmonitor/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomesystemmonitor
 PORTVERSION=	2.0.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	gnome-system-monitor-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index 1b4b17d31799..bcb3366ba4fc 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.0.0
 PORTREVISION=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index 89b573b65b44..f2efcddc2144 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	nautilus2
 PORTVERSION=	2.0.0
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DIST_SUBDIR=	gnome2
 DISTNAME=	nautilus-${PORTVERSION}
 
diff --git a/x11-toolkits/at-spi/Makefile b/x11-toolkits/at-spi/Makefile
index 2500911e8f30..15221b3fee1c 100644
--- a/x11-toolkits/at-spi/Makefile
+++ b/x11-toolkits/at-spi/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	at-spi
 PORTVERSION=	1.0.1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/eel2/Makefile b/x11-toolkits/eel2/Makefile
index 09fe9995841e..84eeb5558cab 100644
--- a/x11-toolkits/eel2/Makefile
+++ b/x11-toolkits/eel2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	eel2
 PORTVERSION=	2.0.0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DIST_SUBDIR=	gnome2
 DISTNAME=	eel-${PORTVERSION}
 
diff --git a/x11-toolkits/gail/Makefile b/x11-toolkits/gail/Makefile
index ebdefe2cf538..ca5f670e30eb 100644
--- a/x11-toolkits/gail/Makefile
+++ b/x11-toolkits/gail/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gail
 PORTVERSION=	0.16
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index f982490bc45d..8e344f387d45 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	gtk
 PORTVERSION=	2.0.5
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-rc2,} \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,2.0.0/releases/gnome-2.0-desktop-final,} \
 		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
 		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index f982490bc45d..8e344f387d45 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	gtk
 PORTVERSION=	2.0.5
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-rc2,} \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,2.0.0/releases/gnome-2.0-desktop-final,} \
 		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
 		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index 1bd92f7f9daa..c1393c63777c 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	libbonoboui
 PORTVERSION=	2.0.0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile
index 6a64bbba3375..cdbd99c0f8a2 100644
--- a/x11-toolkits/libgail-gnome/Makefile
+++ b/x11-toolkits/libgail-gnome/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	libgail-gnome
 PORTVERSION=	1.0.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index da0b70b373b0..d7fddb89270f 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	libgnomeprintui
 PORTVERSION=	1.115.0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 99b2e8016207..f4f9375acaea 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	libgnomeui
 PORTVERSION=	2.0.1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index 9a95202db77a..977be242ee13 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	libwnck
 PORTVERSION=	0.14
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile
index 25b3bd25bc13..a3105cfe13b2 100644
--- a/x11-toolkits/libzvt/Makefile
+++ b/x11-toolkits/libzvt/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libzvt
-PORTVERSION=	2.0.0
+PORTVERSION=	2.0.1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/libzvt/distinfo b/x11-toolkits/libzvt/distinfo
index d83be6ed1fc1..387205917fcd 100644
--- a/x11-toolkits/libzvt/distinfo
+++ b/x11-toolkits/libzvt/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libzvt-2.0.0.tar.bz2) = 6c94cf3cb82299cd51c0b9e855103674
+MD5 (gnome2/libzvt-2.0.1.tar.bz2) = 4bbea49495a341650fa1f89908e6554e
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 50db21e21218..3e77e1ebe754 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	pango
 PORTVERSION=	1.0.3
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-rc2,} \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,2.0.0/releases/gnome-2.0-desktop-final,} \
 		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/
diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index 16fbfcbd064f..bb232a2f914f 100644
--- a/x11-toolkits/rep-gtk2/Makefile
+++ b/x11-toolkits/rep-gtk2/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.16
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	rep-gtk-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish2/Makefile
index 9972f3b16897..4a8c640c908a 100644
--- a/x11-wm/sawfish2/Makefile
+++ b/x11-wm/sawfish2/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.0
 PORTEPOCH=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	sawfish-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index 8583d49022d1..25cee665e0ec 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gdm2
 PORTVERSION=	2.4.0.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=		pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=		2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	gdm-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index db8d56510920..b7cf32a653d5 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomeapplets2
 PORTVERSION=	2.0.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	gnome-applets-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index bc8a7e7ea304..f6ea354bff40 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	2.0.1
+PORTVERSION=	2.0.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	gnome-desktop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index c3afec440332..c396c1a34490 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-2.0.1.tar.bz2) = cd4bda0134eea261b0034d1bc275a228
+MD5 (gnome2/gnome-desktop-2.0.2.tar.bz2) = 01e9cfbcac6314643a403c7a04343842
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 3efc10ab837d..5906fa0fec01 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomepanel
 PORTVERSION=	2.0.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	gnome-panel-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index f3f76b1a5238..dbf2bca190f7 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomesession
 PORTVERSION=	2.0.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	gnome-session-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 8818e1e3c187..9b1a82ae7343 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.0.0
 PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	gnome-terminal-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index db8d56510920..b7cf32a653d5 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomeapplets2
 PORTVERSION=	2.0.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	gnome-applets-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile
index bc8a7e7ea304..f6ea354bff40 100644
--- a/x11/gnomedesktop/Makefile
+++ b/x11/gnomedesktop/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	2.0.1
+PORTVERSION=	2.0.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	gnome-desktop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnomedesktop/distinfo b/x11/gnomedesktop/distinfo
index c3afec440332..c396c1a34490 100644
--- a/x11/gnomedesktop/distinfo
+++ b/x11/gnomedesktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-2.0.1.tar.bz2) = cd4bda0134eea261b0034d1bc275a228
+MD5 (gnome2/gnome-desktop-2.0.2.tar.bz2) = 01e9cfbcac6314643a403c7a04343842
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index 3efc10ab837d..5906fa0fec01 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomepanel
 PORTVERSION=	2.0.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	gnome-panel-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile
index f3f76b1a5238..dbf2bca190f7 100644
--- a/x11/gnomesession/Makefile
+++ b/x11/gnomesession/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomesession
 PORTVERSION=	2.0.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	gnome-session-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile
index 8818e1e3c187..9b1a82ae7343 100644
--- a/x11/gnometerminal/Makefile
+++ b/x11/gnometerminal/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.0.0
 PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DISTNAME=	gnome-terminal-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 954414c7cd3b..09211d5ab037 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	libgnome
 PORTVERSION=	2.0.1
 CATEGORIES?=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DIST_SUBDIR=	gnome2
 
 MAINTAINER?=	gnome@FreeBSD.org
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 74d4c2655725..5351694a3bb0 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	yelp
 PORTVERSION=	1.0.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
+MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org