46 files changed, 46 insertions, 46 deletions

diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index ea1f3f368e1e..f60c64028502 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	ORBit
 PORTVERSION=	0.5.17
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/ORBit
+MASTER_SITE_SUBDIR=	sources/ORBit/0.5
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 1f65d277bd02..9770432af0f2 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	ORBit2
 PORTVERSION=	2.4.3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.1/sources/${PORTNAME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.4
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index ddb0531d6709..5b20ed3bce09 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.0.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		ftp://ftp.gtk.org/pub/gtk/v2.0/
-MASTER_SITE_SUBDIR=	2.0.0/sources/${PORTNAME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.0
 #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 3634da3890f2..6268f00cdf66 100644
--- a/devel/bonobo-activation/Makefile
+++ b/devel/bonobo-activation/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	bonobo-activation
 PORTVERSION=	1.0.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.0/sources/${PORTNAME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.0
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile
index 4a12cacb8699..9bd0bb5b8091 100644
--- a/devel/bonobo-conf/Makefile
+++ b/devel/bonobo-conf/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	bonobo-conf
 PORTVERSION=	0.16
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	unstable/sources/bonobo-conf
+MASTER_SITE_SUBDIR=	sources/bonobo-conf/0.16
 
 MAINTAINER=	gnome@FreeBSD.org
 
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 26d4cac04bb5..97f2b293c02a 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.0.20
 PORTREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/bonobo
+MASTER_SITE_SUBDIR=	sources/bonobo/1.0
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index a8e735ce5689..5fda917dfbd4 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.0.8
 PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/bug-buddy
+MASTER_SITE_SUBDIR=	sources/bug-buddy/2.0
 DISTNAME=	bug-buddy-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/bugbuddy/Makefile b/devel/bugbuddy/Makefile
index a8e735ce5689..5fda917dfbd4 100644
--- a/devel/bugbuddy/Makefile
+++ b/devel/bugbuddy/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.0.8
 PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/bug-buddy
+MASTER_SITE_SUBDIR=	sources/bug-buddy/2.0
 DISTNAME=	bug-buddy-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile
index 0196df9bf043..e6fa91c605b1 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=	2.0.0/releases/gnome-2.0-desktop-final
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.2
 DISTNAME=	bug-buddy-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile
index fcae2b963b2c..dc939a08d2b9 100644
--- a/devel/gconf/Makefile
+++ b/devel/gconf/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.0.9
 PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/GConf
+MASTER_SITE_SUBDIR=	sources/GConf/1.0
 DISTNAME=	GConf-${PORTVERSION}
 DIST_SUBDIR=	gnome
 
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 64dee0863f2a..bb54a6c674af 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gconf2
 PORTVERSION=	1.2.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.0/sources/GConf
+MASTER_SITE_SUBDIR=	sources/GConf/1.2
 DISTNAME=	GConf-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/gide/Makefile b/devel/gide/Makefile
index b1c331a5d16c..181c9b5d5e1d 100644
--- a/devel/gide/Makefile
+++ b/devel/gide/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gide
 PORTVERSION=	0.3.5
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	unstable/sources/gIDE
+MASTER_SITE_SUBDIR=	sources/gIDE/0.3
 
 MAINTAINER=	gnome@FreeBSD.org
 
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index 95c8238942b7..c1ad1ea417ab 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	glade
 PORTVERSION=	0.6.4
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/glade
+MASTER_SITE_SUBDIR=	sources/glade/0.6
 
 MAINTAINER=	gnome@FreeBSD.org
 
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index eb777aad1977..268e34cb5188 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	glade2
 PORTVERSION=	1.1.2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.2/sources/${PORTNAME:S/2$//}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/1.1
 DISTNAME=	glade-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile
index cad2fb74b69b..e460a19bbc6f 100644
--- a/devel/glib12/Makefile
+++ b/devel/glib12/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.2.10
 PORTREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/glib
+MASTER_SITE_SUBDIR=	sources/glib/1.2
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 0343d43516c0..0fc85aff239a 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	glib
 PORTVERSION=	2.0.6
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,2.0.0/sources/${PORTNAME},} \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.0,} \
 		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-build/Makefile b/devel/gnome-build/Makefile
index d8280e1edbc5..c4239485e4b3 100644
--- a/devel/gnome-build/Makefile
+++ b/devel/gnome-build/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomebuild
 PORTVERSION=	0.0.2
 CATEGORIES?=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	unstable/sources/${PORTNAME:S/gnome/gnome-/}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/gnome/gnome-/}/0.0
 DISTNAME=	${PORTNAME:S/gnome/gnome-/}-${PORTVERSION}
 
 MAINTAINER?=	gnome@FreeBSD.org
diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile
index c9203fd5dfe8..44f6a5959f40 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=	2.0.0/releases/gnome-2.0-desktop-final
+MASTER_SITE_SUBDIR=	sources/gnome-common/1.2
 DISTNAME=	gnome-common-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/gnome-crash/Makefile b/devel/gnome-crash/Makefile
index 636758d701f9..3619a710d050 100644
--- a/devel/gnome-crash/Makefile
+++ b/devel/gnome-crash/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomecrash
 PORTVERSION=	0.0.5
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/gnome-crash
+MASTER_SITE_SUBDIR=	sources/gnome-crash/0.0
 DISTNAME=	gnome-crash-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 6c72def67ed5..bf053c61c7fb 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomevfs2
 PORTVERSION=	2.0.4
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.1/sources/gnome-vfs
+MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.0
 DISTNAME=	gnome-vfs-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile
index 1775fc998cf0..b67b29d2a034 100644
--- a/devel/gnome-vfs1/Makefile
+++ b/devel/gnome-vfs1/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.0.5
 PORTREVISION=	4
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/gnome-vfs
+MASTER_SITE_SUBDIR=	sources/gnome-vfs/1.0
 DISTNAME=	gnome-vfs-${PORTVERSION}
 DIST_SUBDIR=	gnome
 
diff --git a/devel/gnomebuild/Makefile b/devel/gnomebuild/Makefile
index d8280e1edbc5..c4239485e4b3 100644
--- a/devel/gnomebuild/Makefile
+++ b/devel/gnomebuild/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomebuild
 PORTVERSION=	0.0.2
 CATEGORIES?=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	unstable/sources/${PORTNAME:S/gnome/gnome-/}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/gnome/gnome-/}/0.0
 DISTNAME=	${PORTNAME:S/gnome/gnome-/}-${PORTVERSION}
 
 MAINTAINER?=	gnome@FreeBSD.org
diff --git a/devel/gnomecommon/Makefile b/devel/gnomecommon/Makefile
index c9203fd5dfe8..44f6a5959f40 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=	2.0.0/releases/gnome-2.0-desktop-final
+MASTER_SITE_SUBDIR=	sources/gnome-common/1.2
 DISTNAME=	gnome-common-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/gnomecrash/Makefile b/devel/gnomecrash/Makefile
index 636758d701f9..3619a710d050 100644
--- a/devel/gnomecrash/Makefile
+++ b/devel/gnomecrash/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomecrash
 PORTVERSION=	0.0.5
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/gnome-crash
+MASTER_SITE_SUBDIR=	sources/gnome-crash/0.0
 DISTNAME=	gnome-crash-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/gnomedebug/Makefile b/devel/gnomedebug/Makefile
index 0486d94959a2..39ba802787e9 100644
--- a/devel/gnomedebug/Makefile
+++ b/devel/gnomedebug/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomedebug
 PORTVERSION=	0.1.6
 CATEGORIES?=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	unstable/sources/${PORTNAME:S/gnome/gnome-/}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/gnome/gnome-/}/0.1
 DISTNAME=	${PORTNAME:S/gnome/gnome-/}-${PORTVERSION}
 
 MAINTAINER?=	gnome@FreeBSD.org
diff --git a/devel/gnomevfs/Makefile b/devel/gnomevfs/Makefile
index 1775fc998cf0..b67b29d2a034 100644
--- a/devel/gnomevfs/Makefile
+++ b/devel/gnomevfs/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.0.5
 PORTREVISION=	4
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/gnome-vfs
+MASTER_SITE_SUBDIR=	sources/gnome-vfs/1.0
 DISTNAME=	gnome-vfs-${PORTVERSION}
 DIST_SUBDIR=	gnome
 
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 6c72def67ed5..bf053c61c7fb 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomevfs2
 PORTVERSION=	2.0.4
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.1/sources/gnome-vfs
+MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.0
 DISTNAME=	gnome-vfs-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/gob2/Makefile b/devel/gob2/Makefile
index 886a3fb5e019..45fea36688a0 100644
--- a/devel/gob2/Makefile
+++ b/devel/gob2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gob
 PORTVERSION=	1.0.12
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/gob
+MASTER_SITE_SUBDIR=	sources/gob/1.0
 
 MAINTAINER=	gnome@FreeBSD.org
 
diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index 157fce16aced..ef24d0667882 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=	2.0.0/releases/gnome-2.0-desktop-final
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.8
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 6cb2d3f670cd..aae523cb2b7f 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=	2.0.0/releases/gnome-2.0-desktop-final
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.0
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index 8ce5faacf802..494458708dae 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.17
 PORTREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/libglade
+MASTER_SITE_SUBDIR=	sources/libglade/0.17
 
 MAINTAINER=	gnome@FreeBSD.org
 
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 201dc63de781..98deb4a32749 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	libglade2
 PORTVERSION=	2.0.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.1/sources/${PORTNAME:S/2$//}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.0
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index d19054d11488..21a0dc90e469 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	libgsf
 PORTVERSION=	1.3.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	unstable/sources/${PORTNAME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.3
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 60429bd9fdeb..05587a5aba4b 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.0.13
 PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/libgtop
+MASTER_SITE_SUBDIR=	sources/libgtop/1.0
 
 MAINTAINER=	gnome@FreeBSD.org
 
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index de49486f2550..75a33e782f4d 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.0.0
 PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.0
 DISTNAME=	libgtop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/libole2/Makefile b/devel/libole2/Makefile
index 4b05983a7d7e..c62b8b155450 100644
--- a/devel/libole2/Makefile
+++ b/devel/libole2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	libole2
 PORTVERSION=	0.2.4
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	unstable/sources/libole2
+MASTER_SITE_SUBDIR=	sources/libole2/0.2
 
 MAINTAINER=	gnome@FreeBSD.org
 
diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile
index 19c2eb155165..0dea6325e097 100644
--- a/devel/libsigc++/Makefile
+++ b/devel/libsigc++/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	libsigc \
-			stable/sources/libsigc++
+			sources/libsigc++/1.0
 			
 #DIST_SUBDIR=	gnome
 
diff --git a/devel/libsigc++12/Makefile b/devel/libsigc++12/Makefile
index 19c2eb155165..0dea6325e097 100644
--- a/devel/libsigc++12/Makefile
+++ b/devel/libsigc++12/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	libsigc \
-			stable/sources/libsigc++
+			sources/libsigc++/1.0
 			
 #DIST_SUBDIR=	gnome
 
diff --git a/devel/libsigc++20/Makefile b/devel/libsigc++20/Makefile
index 19c2eb155165..0dea6325e097 100644
--- a/devel/libsigc++20/Makefile
+++ b/devel/libsigc++20/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	libsigc \
-			stable/sources/libsigc++
+			sources/libsigc++/1.0
 			
 #DIST_SUBDIR=	gnome
 
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index 484eea545a01..4154af8c6a4e 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	soup
 PORTVERSION=	0.7.4
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	unstable/sources/soup
+MASTER_SITE_SUBDIR=	sources/soup/0.7
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/libsoup22/Makefile b/devel/libsoup22/Makefile
index 484eea545a01..4154af8c6a4e 100644
--- a/devel/libsoup22/Makefile
+++ b/devel/libsoup22/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	soup
 PORTVERSION=	0.7.4
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	unstable/sources/soup
+MASTER_SITE_SUBDIR=	sources/soup/0.7
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/libunicode/Makefile b/devel/libunicode/Makefile
index 6b35f1cdad10..6729b90844db 100644
--- a/devel/libunicode/Makefile
+++ b/devel/libunicode/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.4
 PORTREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	unstable/sources/libunicode
+MASTER_SITE_SUBDIR=	sources/libunicode/0.4
 DISTNAME=	${PORTNAME}-${PORTVERSION}.gnome
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index 7f6472c36f6b..d225d41a1f9d 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	oaf
 PORTVERSION=	0.6.10
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/oaf
+MASTER_SITE_SUBDIR=	sources/oaf/0.6
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
index 44c141557f91..ed5065b293d9 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=	2.0.0/releases/gnome-2.0-desktop-final
+MASTER_SITE_SUBDIR=	sources/pkg-config/0.12
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile
index 44c141557f91..ed5065b293d9 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=	2.0.0/releases/gnome-2.0-desktop-final
+MASTER_SITE_SUBDIR=	sources/pkg-config/0.12
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/soup/Makefile b/devel/soup/Makefile
index 484eea545a01..4154af8c6a4e 100644
--- a/devel/soup/Makefile
+++ b/devel/soup/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	soup
 PORTVERSION=	0.7.4
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	unstable/sources/soup
+MASTER_SITE_SUBDIR=	sources/soup/0.7
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org