aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2002-09-20 17:07:51 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2002-09-20 17:07:51 +0000
commit59deb69012e8ee66c43cbd107264d696b9b5d8df (patch)
tree9e8a7e9ae411da9a10495b6f4f6b95ddb93b39dc
parent6f0132a5273f17515a2357e6a47573bd3418d49d (diff)
downloadports-59deb69012e8ee66c43cbd107264d696b9b5d8df.tar.gz
ports-59deb69012e8ee66c43cbd107264d696b9b5d8df.zip
Notes
-rw-r--r--accessibility/at-spi/Makefile2
-rw-r--r--accessibility/atk/Makefile2
-rw-r--r--accessibility/gail/Makefile2
-rw-r--r--audio/esound/Makefile2
-rw-r--r--audio/gnome-audio/Makefile2
-rw-r--r--audio/gnome-media/Makefile2
-rw-r--r--audio/gnomeaudio/Makefile2
-rw-r--r--audio/gnomeaudio2/Makefile2
-rw-r--r--audio/gnomemedia/Makefile2
-rw-r--r--audio/gnomemedia2/Makefile2
-rw-r--r--audio/libaudiofile/Makefile2
-rw-r--r--databases/gnome-db/Makefile2
-rw-r--r--databases/gnomedb/Makefile2
-rw-r--r--databases/gnomedb2/Makefile2
-rw-r--r--databases/libgda/Makefile2
-rw-r--r--databases/libgda2/Makefile2
-rw-r--r--databases/libgda3/Makefile2
-rw-r--r--databases/libgnomedb/Makefile2
-rw-r--r--databases/mergeant/Makefile2
-rw-r--r--deskutils/gnome-pim/Makefile2
-rw-r--r--deskutils/gnome-utils/Makefile2
-rw-r--r--deskutils/gnomepim/Makefile2
-rw-r--r--deskutils/gnomeutils2/Makefile2
-rw-r--r--devel/ORBit/Makefile2
-rw-r--r--devel/ORBit2/Makefile2
-rw-r--r--devel/atk/Makefile2
-rw-r--r--devel/bonobo-activation/Makefile2
-rw-r--r--devel/bonobo-conf/Makefile2
-rw-r--r--devel/bonobo/Makefile2
-rw-r--r--devel/bug-buddy/Makefile2
-rw-r--r--devel/bugbuddy/Makefile2
-rw-r--r--devel/bugbuddy2/Makefile2
-rw-r--r--devel/gconf/Makefile2
-rw-r--r--devel/gconf2/Makefile2
-rw-r--r--devel/gide/Makefile2
-rw-r--r--devel/glade/Makefile2
-rw-r--r--devel/glade2/Makefile2
-rw-r--r--devel/glib12/Makefile2
-rw-r--r--devel/glib20/Makefile2
-rw-r--r--devel/gnome-build/Makefile2
-rw-r--r--devel/gnome-common/Makefile2
-rw-r--r--devel/gnome-crash/Makefile2
-rw-r--r--devel/gnome-vfs/Makefile2
-rw-r--r--devel/gnome-vfs1/Makefile2
-rw-r--r--devel/gnomebuild/Makefile2
-rw-r--r--devel/gnomecommon/Makefile2
-rw-r--r--devel/gnomecrash/Makefile2
-rw-r--r--devel/gnomedebug/Makefile2
-rw-r--r--devel/gnomevfs/Makefile2
-rw-r--r--devel/gnomevfs2/Makefile2
-rw-r--r--devel/gob2/Makefile2
-rw-r--r--devel/libIDL/Makefile2
-rw-r--r--devel/libbonobo/Makefile2
-rw-r--r--devel/libglade/Makefile2
-rw-r--r--devel/libglade2/Makefile2
-rw-r--r--devel/libgsf/Makefile2
-rw-r--r--devel/libgtop/Makefile2
-rw-r--r--devel/libgtop2/Makefile2
-rw-r--r--devel/libole2/Makefile2
-rw-r--r--devel/libsigc++/Makefile2
-rw-r--r--devel/libsigc++12/Makefile2
-rw-r--r--devel/libsigc++20/Makefile2
-rw-r--r--devel/libsoup/Makefile2
-rw-r--r--devel/libsoup22/Makefile2
-rw-r--r--devel/libunicode/Makefile2
-rw-r--r--devel/oaf/Makefile2
-rw-r--r--devel/pkg-config/Makefile2
-rw-r--r--devel/pkgconfig/Makefile2
-rw-r--r--devel/soup/Makefile2
-rw-r--r--editors/gedit/Makefile2
-rw-r--r--editors/gedit2/Makefile2
-rw-r--r--editors/ghex/Makefile2
-rw-r--r--editors/ghex2/Makefile2
-rw-r--r--ftp/gtm/Makefile2
-rw-r--r--games/gnome-games/Makefile2
-rw-r--r--games/gnomechess/Makefile2
-rw-r--r--games/gnomegames/Makefile2
-rw-r--r--games/gnomegames2/Makefile2
-rw-r--r--games/gnomoku/Makefile2
-rw-r--r--graphics/dia/Makefile2
-rw-r--r--graphics/electriceyes/Makefile2
-rw-r--r--graphics/eog/Makefile2
-rw-r--r--graphics/eog2/Makefile2
-rw-r--r--graphics/gdk-pixbuf/Makefile2
-rw-r--r--graphics/imlib/Makefile3
-rw-r--r--graphics/libart_lgpl/Makefile2
-rw-r--r--graphics/libart_lgpl2/Makefile2
-rw-r--r--graphics/libgnomecanvas/Makefile2
-rw-r--r--graphics/librsvg/Makefile2
-rw-r--r--graphics/librsvg2/Makefile2
-rw-r--r--lang/gnomebasic/Makefile2
-rw-r--r--mail/evolution-devel/Makefile2
-rw-r--r--mail/evolution/Makefile2
-rw-r--r--math/gcalctool/Makefile2
-rw-r--r--math/gnumeric/Makefile2
-rw-r--r--math/gnumeric2/Makefile2
-rw-r--r--math/guppi/Makefile2
-rw-r--r--misc/gnome-mime-data/Makefile2
-rw-r--r--misc/gnome-user-docs/Makefile2
-rw-r--r--misc/gnomemimedata/Makefile2
-rw-r--r--misc/gnomeuserdocs/Makefile2
-rw-r--r--misc/gnomeuserdocs2/Makefile2
-rw-r--r--misc/gnomeutils/Makefile2
-rw-r--r--misc/gnomeutils2/Makefile2
-rw-r--r--misc/mc/Makefile2
-rw-r--r--misc/metatheme2/Makefile2
-rw-r--r--misc/pybliographer/Makefile2
-rw-r--r--net/linc/Makefile2
-rw-r--r--news/pan/Makefile2
-rw-r--r--news/pan2/Makefile2
-rw-r--r--palm/gnome-pilot-conduits/Makefile2
-rw-r--r--palm/gnome-pilot/Makefile2
-rw-r--r--palm/gnomepilot-conduits/Makefile2
-rw-r--r--palm/gnomepilot-conduits2/Makefile2
-rw-r--r--palm/gnomepilot/Makefile2
-rw-r--r--palm/gnomepilot2/Makefile2
-rw-r--r--print/ggv/Makefile2
-rw-r--r--print/ggv2/Makefile2
-rw-r--r--print/gnome-print/Makefile2
-rw-r--r--print/gnomeprint/Makefile2
-rw-r--r--print/libgnomeprint/Makefile2
-rw-r--r--sysutils/gconf-editor/Makefile2
-rw-r--r--sysutils/gnome-control-center/Makefile2
-rw-r--r--sysutils/gnome-control-center1/Makefile2
-rw-r--r--sysutils/gnome-system-monitor/Makefile2
-rw-r--r--sysutils/gnomecontrolcenter/Makefile2
-rw-r--r--sysutils/gnomecontrolcenter2/Makefile2
-rw-r--r--sysutils/gnomesystemmonitor/Makefile2
-rw-r--r--sysutils/gtop/Makefile2
-rw-r--r--sysutils/medusa/Makefile2
-rw-r--r--textproc/gnome-spell/Makefile2
-rw-r--r--textproc/gnomespell-devel/Makefile2
-rw-r--r--textproc/gnomespell/Makefile2
-rw-r--r--textproc/intltool/Makefile2
-rw-r--r--textproc/libxml/Makefile2
-rw-r--r--textproc/libxml2/Makefile2
-rw-r--r--textproc/libxslt/Makefile2
-rw-r--r--textproc/scrollkeeper/Makefile2
-rw-r--r--textproc/xml-i18n-tools/Makefile2
-rw-r--r--www/glibwww/Makefile2
-rw-r--r--www/gtkhtml/Makefile2
-rw-r--r--www/gtkhtml3/Makefile2
-rw-r--r--www/gtkhtml38/Makefile2
-rw-r--r--www/libghttp/Makefile2
-rw-r--r--www/libgtkhtml/Makefile2
-rw-r--r--www/nautilus-gtkhtml/Makefile2
-rw-r--r--x11-fm/nautilus/Makefile2
-rw-r--r--x11-fm/nautilus2/Makefile2
-rw-r--r--x11-themes/gtk-engines/Makefile2
-rw-r--r--x11-themes/gtk-engines2/Makefile2
-rw-r--r--x11-toolkits/at-spi/Makefile2
-rw-r--r--x11-toolkits/crux/Makefile2
-rw-r--r--x11-toolkits/eel/Makefile2
-rw-r--r--x11-toolkits/eel2/Makefile2
-rw-r--r--x11-toolkits/gail/Makefile2
-rw-r--r--x11-toolkits/gal/Makefile2
-rw-r--r--x11-toolkits/gal2/Makefile2
-rw-r--r--x11-toolkits/gdl/Makefile2
-rw-r--r--x11-toolkits/gnome--/Makefile2
-rw-r--r--x11-toolkits/gob/Makefile2
-rw-r--r--x11-toolkits/gtk--/Makefile2
-rw-r--r--x11-toolkits/gtk--2/Makefile2
-rw-r--r--x11-toolkits/gtk-engines/Makefile2
-rw-r--r--x11-toolkits/gtk-engines2/Makefile2
-rw-r--r--x11-toolkits/gtk12/Makefile2
-rw-r--r--x11-toolkits/gtk20/Makefile2
-rw-r--r--x11-toolkits/gtk30/Makefile2
-rw-r--r--x11-toolkits/gtkmm12/Makefile2
-rw-r--r--x11-toolkits/gtkmm20/Makefile2
-rw-r--r--x11-toolkits/gtkmm24/Makefile2
-rw-r--r--x11-toolkits/gtkmm30/Makefile2
-rw-r--r--x11-toolkits/guile-gnome/Makefile2
-rw-r--r--x11-toolkits/guile-gtk/Makefile2
-rw-r--r--x11-toolkits/libbonoboui/Makefile2
-rw-r--r--x11-toolkits/libgail-gnome/Makefile2
-rw-r--r--x11-toolkits/libgnomeprintui/Makefile2
-rw-r--r--x11-toolkits/libgnomeui/Makefile2
-rw-r--r--x11-toolkits/libwnck/Makefile2
-rw-r--r--x11-toolkits/libzvt/Makefile2
-rw-r--r--x11-toolkits/panel--/Makefile2
-rw-r--r--x11-toolkits/pango/Makefile2
-rw-r--r--x11-toolkits/py-gnome/Makefile2
-rw-r--r--x11-toolkits/py-gnome2/Makefile2
-rw-r--r--x11-toolkits/py-gtk/Makefile2
-rw-r--r--x11-toolkits/py-gtk2/Makefile2
-rw-r--r--x11-toolkits/rep-gtk/Makefile2
-rw-r--r--x11-toolkits/rep-gtk2/Makefile2
-rw-r--r--x11-wm/sawfish2/Makefile2
-rw-r--r--x11/gdm/Makefile2
-rw-r--r--x11/gdm2/Makefile2
-rw-r--r--x11/gnome-applets/Makefile2
-rw-r--r--x11/gnome-desktop/Makefile2
-rw-r--r--x11/gnome-libs/Makefile2
-rw-r--r--x11/gnome-panel/Makefile2
-rw-r--r--x11/gnome-session/Makefile2
-rw-r--r--x11/gnome-terminal/Makefile2
-rw-r--r--x11/gnomeapplets/Makefile2
-rw-r--r--x11/gnomeapplets2/Makefile2
-rw-r--r--x11/gnomecore/Makefile2
-rw-r--r--x11/gnomedesktop/Makefile2
-rw-r--r--x11/gnomelibs/Makefile2
-rw-r--r--x11/gnomepanel/Makefile2
-rw-r--r--x11/gnomesession/Makefile2
-rw-r--r--x11/gnometerminal/Makefile2
-rw-r--r--x11/libgnome/Makefile2
-rw-r--r--x11/xalf/Makefile2
-rw-r--r--x11/yelp/Makefile2
207 files changed, 207 insertions, 208 deletions
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index 59eb24b14bb3..98d621350f0c 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -9,7 +9,7 @@ PORTNAME= at-spi
PORTVERSION= 1.0.2
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/${PORTNAME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index ddb0531d6709..5b20ed3bce09 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/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/accessibility/gail/Makefile b/accessibility/gail/Makefile
index 8a31c2c43f38..48007940b9a7 100644
--- a/accessibility/gail/Makefile
+++ b/accessibility/gail/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gail
PORTVERSION= 0.17
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.0/sources/${PORTNAME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.17
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index 6cf7e4a41e66..bb01f8b4debc 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.2.29
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_GNOME} \
http://www.marcuscom.com/downloads/
-MASTER_SITE_SUBDIR= 2.0.1/sources/esound
+MASTER_SITE_SUBDIR= sources/esound/0.2
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile
index 064ce401966b..aefc714cc1d1 100644
--- a/audio/gnome-audio/Makefile
+++ b/audio/gnome-audio/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomeaudio
PORTVERSION= 1.4.0
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gnome-audio
+MASTER_SITE_SUBDIR= sources/gnome-audio/1.4
DISTNAME= gnome-audio-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 2bf4e29af159..cdf6bfe8d758 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomemedia2
PORTVERSION= 2.0.2.5
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/gnome-media
+MASTER_SITE_SUBDIR= sources/gnome-media/2.0
DISTNAME= gnome-media-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/audio/gnomeaudio/Makefile b/audio/gnomeaudio/Makefile
index 064ce401966b..aefc714cc1d1 100644
--- a/audio/gnomeaudio/Makefile
+++ b/audio/gnomeaudio/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomeaudio
PORTVERSION= 1.4.0
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gnome-audio
+MASTER_SITE_SUBDIR= sources/gnome-audio/1.4
DISTNAME= gnome-audio-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
diff --git a/audio/gnomeaudio2/Makefile b/audio/gnomeaudio2/Makefile
index 064ce401966b..aefc714cc1d1 100644
--- a/audio/gnomeaudio2/Makefile
+++ b/audio/gnomeaudio2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomeaudio
PORTVERSION= 1.4.0
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gnome-audio
+MASTER_SITE_SUBDIR= sources/gnome-audio/1.4
DISTNAME= gnome-audio-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
diff --git a/audio/gnomemedia/Makefile b/audio/gnomemedia/Makefile
index 48c2772fe4c9..0b8331b07bbf 100644
--- a/audio/gnomemedia/Makefile
+++ b/audio/gnomemedia/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.2.3
PORTREVISION= 1
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gnome-media
+MASTER_SITE_SUBDIR= sources/gnome-media/1.2
DISTNAME= gnome-media-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index 2bf4e29af159..cdf6bfe8d758 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomemedia2
PORTVERSION= 2.0.2.5
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/gnome-media
+MASTER_SITE_SUBDIR= sources/gnome-media/2.0
DISTNAME= gnome-media-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile
index f6383c9d5d1c..13329f22f54f 100644
--- a/audio/libaudiofile/Makefile
+++ b/audio/libaudiofile/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= audio
MASTER_SITES= ftp://ftp.68k.org./pub/michael/ \
ftp://oss.sgi.com/projects/audiofile/download/ \
${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-alpha2
+MASTER_SITE_SUBDIR= sources/libaudiofile/0.2
DISTNAME= audiofile-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
diff --git a/databases/gnome-db/Makefile b/databases/gnome-db/Makefile
index 64f633ab3621..668431e096a6 100644
--- a/databases/gnome-db/Makefile
+++ b/databases/gnome-db/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.2.96
PORTREVISION= 1
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gnome-db
+MASTER_SITE_SUBDIR= sources/gnome-db/0.2
DISTNAME= gnome-db-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/databases/gnomedb/Makefile b/databases/gnomedb/Makefile
index 64f633ab3621..668431e096a6 100644
--- a/databases/gnomedb/Makefile
+++ b/databases/gnomedb/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.2.96
PORTREVISION= 1
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gnome-db
+MASTER_SITE_SUBDIR= sources/gnome-db/0.2
DISTNAME= gnome-db-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/databases/gnomedb2/Makefile b/databases/gnomedb2/Makefile
index d4603dc0bf11..78cbc4b13628 100644
--- a/databases/gnomedb2/Makefile
+++ b/databases/gnomedb2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomedb2
PORTVERSION= 0.8.192
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.0/sources/gnome-db
+MASTER_SITE_SUBDIR= sources/gnome-db/0.8
DISTNAME= gnome-db-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile
index 8c799a3f1655..070703bdf357 100644
--- a/databases/libgda/Makefile
+++ b/databases/libgda/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.2.96
PORTREVISION= 1
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/${PORTNAME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.2
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile
index 74067e5e0850..a162e65d2a83 100644
--- a/databases/libgda2/Makefile
+++ b/databases/libgda2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libgda2
PORTVERSION= 0.8.193
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.2/sources/${PORTNAME:S/2$//}
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.0
DISTNAME= libgda-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile
index 74067e5e0850..a162e65d2a83 100644
--- a/databases/libgda3/Makefile
+++ b/databases/libgda3/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libgda2
PORTVERSION= 0.8.193
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.2/sources/${PORTNAME:S/2$//}
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.0
DISTNAME= libgda-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index ba89f90d5a89..ce903629a131 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libgnomedb
PORTVERSION= 0.8.193
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.2/sources/libgnomedb
+MASTER_SITE_SUBDIR= sources/libgnomedb/0.8
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index 3b77650c7c4b..56f719d6ca1f 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.8.193
PORTREVISION= 1
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.2/sources/mergeant
+MASTER_SITE_SUBDIR= sources/mergeant/0.8
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile
index c01bce1de7b8..61f66adf0330 100644
--- a/deskutils/gnome-pim/Makefile
+++ b/deskutils/gnome-pim/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.4.8
CATEGORIES= deskutils gnome
MASTER_SITES= http://me.in-berlin.de/~jroger/gnome-pim/ \
${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gnome-pim
+MASTER_SITE_SUBDIR= sources/gnome-pim/1.4
DISTNAME= gnome-pim-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index c4b2b1ea980e..78f4ede793be 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 2.0.5
PORTEPOCH= 1
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/gnome-utils
+MASTER_SITE_SUBDIR= sources/gnome-utils/2.0
DISTNAME= gnome-utils-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/deskutils/gnomepim/Makefile b/deskutils/gnomepim/Makefile
index c01bce1de7b8..61f66adf0330 100644
--- a/deskutils/gnomepim/Makefile
+++ b/deskutils/gnomepim/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.4.8
CATEGORIES= deskutils gnome
MASTER_SITES= http://me.in-berlin.de/~jroger/gnome-pim/ \
${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gnome-pim
+MASTER_SITE_SUBDIR= sources/gnome-pim/1.4
DISTNAME= gnome-pim-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
index c4b2b1ea980e..78f4ede793be 100644
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/gnomeutils2/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 2.0.5
PORTEPOCH= 1
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/gnome-utils
+MASTER_SITE_SUBDIR= sources/gnome-utils/2.0
DISTNAME= gnome-utils-${PORTVERSION}
DIST_SUBDIR= gnome2
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
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 9bece1387187..9141098b6868 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.9.7
PORTREVISION= 1
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gedit
+MASTER_SITE_SUBDIR= sources/gedit/0.9
MAINTAINER= gnome@FreeBSD.org
diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile
index fcb4220f59de..7b6eefb74ff7 100644
--- a/editors/gedit2/Makefile
+++ b/editors/gedit2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gedit2
PORTVERSION= 2.0.5
CATEGORIES= editors 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= gedit-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile
index 69c0f7024651..7c21e182e072 100644
--- a/editors/ghex/Makefile
+++ b/editors/ghex/Makefile
@@ -9,7 +9,7 @@ PORTNAME= ghex
PORTVERSION= 1.2.1
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/ghex
+MASTER_SITE_SUBDIR= sources/ghex/1.2
MAINTAINER= gnome@FreeBSD.org
diff --git a/editors/ghex2/Makefile b/editors/ghex2/Makefile
index fe8eaffe73b2..bf209dd14146 100644
--- a/editors/ghex2/Makefile
+++ b/editors/ghex2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= ghex2
PORTVERSION= 1.99.1
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.2/sources/${PORTNAME:S/2$//}
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/1.99
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/ftp/gtm/Makefile b/ftp/gtm/Makefile
index 2e2ce1d0de5b..eb1f025c2999 100644
--- a/ftp/gtm/Makefile
+++ b/ftp/gtm/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= ftp gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= gtm \
- stable/sources/gtm
+ sources/gtm/0.4
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index dc05b086f807..daf5a1cfb4e5 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomegames2
PORTVERSION= 2.0.4
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/gnome-games
+MASTER_SITE_SUBDIR= sources/gnome-games/2.0
DISTNAME= gnome-games-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/games/gnomechess/Makefile b/games/gnomechess/Makefile
index b54acca0d613..69daaf6d438a 100644
--- a/games/gnomechess/Makefile
+++ b/games/gnomechess/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomechess
PORTVERSION= 0.3.3
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gnome-chess
+MASTER_SITE_SUBDIR= sources/gnome-chess/0.3
DISTNAME= gnome-chess-${PORTVERSION}
MAINTAINER= reg@FreeBSD.org
diff --git a/games/gnomegames/Makefile b/games/gnomegames/Makefile
index bd985e6ba49c..81cd848c2c20 100644
--- a/games/gnomegames/Makefile
+++ b/games/gnomegames/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomegames
PORTVERSION= 1.4.0.4
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gnome-games
+MASTER_SITE_SUBDIR= sources/gnome-games/1.4
DISTNAME= gnome-games-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index dc05b086f807..daf5a1cfb4e5 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomegames2
PORTVERSION= 2.0.4
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/gnome-games
+MASTER_SITE_SUBDIR= sources/gnome-games/2.0
DISTNAME= gnome-games-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/games/gnomoku/Makefile b/games/gnomoku/Makefile
index dce271b99dfa..7fead6bbf3d9 100644
--- a/games/gnomoku/Makefile
+++ b/games/gnomoku/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomoku
PORTVERSION= 1.4
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/${PORTNAME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.4
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index bcc12e4bb248..76e7a1a65caf 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -9,7 +9,7 @@ PORTNAME= dia
PORTVERSION= 0.90
CATEGORIES+= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/dia
+MASTER_SITE_SUBDIR= sources/dia/0.90
MAINTAINER?= gnome@FreeBSD.org
diff --git a/graphics/electriceyes/Makefile b/graphics/electriceyes/Makefile
index 1cc997001d11..bb195603d6e4 100644
--- a/graphics/electriceyes/Makefile
+++ b/graphics/electriceyes/Makefile
@@ -9,7 +9,7 @@ PORTNAME= electriceyes
PORTVERSION= 0.3.12
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/ee
+MASTER_SITE_SUBDIR= sources/ee/0.3
DISTNAME= ee-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index a357d3ee2594..d9c836313c91 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.6
PORTREVISION= 1
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= unstable/sources/eog
+MASTER_SITE_SUBDIR= sources/eog/0.6
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index 61717601a7b1..a83eced459ba 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= eog2
PORTVERSION= 1.0.3
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/${PORTNAME:S/2$//}
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/1.0
DISTNAME= eog-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index c5adee6dc3ae..69ea8c732ea8 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -9,7 +9,7 @@ PORTNAME?= gdk-pixbuf
PORTVERSION= 0.18.0
CATEGORIES?= graphics
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= unstable/sources/gdk-pixbuf
+MASTER_SITE_SUBDIR= sources/gdk-pixbuf/0.18
DISTNAME= gdk-pixbuf-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 918b9116a8d4..713facbd1d90 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.9.14
PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/imlib
+MASTER_SITE_SUBDIR= sources/imlib/1.9
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
@@ -24,7 +24,6 @@ USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOMENG= yes
USE_GNOME= gtk12
-USE_REINPLACE= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/imlib --disable-modules \
diff --git a/graphics/libart_lgpl/Makefile b/graphics/libart_lgpl/Makefile
index 3dfcbe18c514..7e472fe7eb43 100644
--- a/graphics/libart_lgpl/Makefile
+++ b/graphics/libart_lgpl/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libart_lgpl2
PORTVERSION= 2.3.10
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.0/sources/${PORTNAME:S/2$//}
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.3
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/graphics/libart_lgpl2/Makefile b/graphics/libart_lgpl2/Makefile
index 3dfcbe18c514..7e472fe7eb43 100644
--- a/graphics/libart_lgpl2/Makefile
+++ b/graphics/libart_lgpl2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libart_lgpl2
PORTVERSION= 2.3.10
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.0/sources/${PORTNAME:S/2$//}
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.3
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 30ded4d286b2..c161b09892be 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libgnomecanvas
PORTVERSION= 2.0.4
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/${PORTNAME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index 613a7f06a474..973285ff1e07 100644
--- a/graphics/librsvg/Makefile
+++ b/graphics/librsvg/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/librsvg
+MASTER_SITE_SUBDIR= sources/librsvg/1.0
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index b6062821d72a..5effe902d47b 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= librsvg2
PORTVERSION= 2.0.1
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.0/sources/${PORTNAME:S/2$//}
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.0
DIST_SUBDIR= gnome2
DISTNAME= librsvg-${PORTVERSION}
diff --git a/lang/gnomebasic/Makefile b/lang/gnomebasic/Makefile
index 02fdae068378..105ab413c2af 100644
--- a/lang/gnomebasic/Makefile
+++ b/lang/gnomebasic/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomebasic
PORTVERSION= 0.0.20
CATEGORIES= lang gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= unstable/sources/gb
+MASTER_SITE_SUBDIR= sources/gb/0.0
DISTNAME= gb-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
diff --git a/mail/evolution-devel/Makefile b/mail/evolution-devel/Makefile
index 3dfd9ba2fed3..6a6295f48dc4 100644
--- a/mail/evolution-devel/Makefile
+++ b/mail/evolution-devel/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= mail gnome
MASTER_SITES= ${MASTER_SITE_GNOME} \
http://people.FreeBSD.org/~sobomax/:local
# ${MASTER_SITE_LOCAL:S,$,:local,}
-MASTER_SITE_SUBDIR= stable/sources/evolution \
+MASTER_SITE_SUBDIR= sources/evolution/1.0 \
sobomax/:local
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
db-3.1.17${EXTRACT_SUFX}:local
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 3dfd9ba2fed3..6a6295f48dc4 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= mail gnome
MASTER_SITES= ${MASTER_SITE_GNOME} \
http://people.FreeBSD.org/~sobomax/:local
# ${MASTER_SITE_LOCAL:S,$,:local,}
-MASTER_SITE_SUBDIR= stable/sources/evolution \
+MASTER_SITE_SUBDIR= sources/evolution/1.0 \
sobomax/:local
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
db-3.1.17${EXTRACT_SUFX}:local
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index e2ae8354759a..0ebe6d009231 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gcalctool
PORTVERSION= 4.1.9
CATEGORIES= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/${PORTNAME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/4.1
DIST_SUBDIR= gnome2
MAINTAINER= marcus@FreeBSD.org
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index ae7ea99e084c..73ae911b242f 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnumeric
PORTVERSION= 1.0.9
CATEGORIES?= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gnumeric
+MASTER_SITE_SUBDIR= sources/gnumeric/1.0
DIST_SUBDIR= gnome
MAINTAINER?= gnome@FreeBSD.org
diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index 0c6b71842a58..8c894e1b587a 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.1.8
PORTREVISION= 1
CATEGORIES= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= unstable/sources/${PORTNAME:S/2$//}
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/1.1
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index 7f40bb5df4d4..40a6e6fbab81 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.40.3
PORTREVISION= 1
CATEGORIES= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/Guppi
+MASTER_SITE_SUBDIR= sources/Guppi/0.40
DISTNAME= Guppi-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
diff --git a/misc/gnome-mime-data/Makefile b/misc/gnome-mime-data/Makefile
index 28a528721714..522c8a3718bc 100644
--- a/misc/gnome-mime-data/Makefile
+++ b/misc/gnome-mime-data/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 2.0.1
PORTREVISION= 1
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/gnome-mime-data
+MASTER_SITE_SUBDIR= sources/gnome-mime-data/2.0
DISTNAME= gnome-mime-data-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile
index e887cc794d4a..307cd64ee591 100644
--- a/misc/gnome-user-docs/Makefile
+++ b/misc/gnome-user-docs/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomeuserdocs2
PORTVERSION= 2.0.1
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.2/sources/gnome2-user-docs
+MASTER_SITE_SUBDIR= sources/gnome2-user-docs/2.0
DISTNAME= gnome2-user-docs-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/misc/gnomemimedata/Makefile b/misc/gnomemimedata/Makefile
index 28a528721714..522c8a3718bc 100644
--- a/misc/gnomemimedata/Makefile
+++ b/misc/gnomemimedata/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 2.0.1
PORTREVISION= 1
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/gnome-mime-data
+MASTER_SITE_SUBDIR= sources/gnome-mime-data/2.0
DISTNAME= gnome-mime-data-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/misc/gnomeuserdocs/Makefile b/misc/gnomeuserdocs/Makefile
index 3273510568c9..f483ef09196e 100644
--- a/misc/gnomeuserdocs/Makefile
+++ b/misc/gnomeuserdocs/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomeuserdocs
PORTVERSION= 1.4.1.1
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gnome-user-docs
+MASTER_SITE_SUBDIR= sources/gnome-user-docs/1.4
DISTNAME= gnome-user-docs-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
diff --git a/misc/gnomeuserdocs2/Makefile b/misc/gnomeuserdocs2/Makefile
index e887cc794d4a..307cd64ee591 100644
--- a/misc/gnomeuserdocs2/Makefile
+++ b/misc/gnomeuserdocs2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomeuserdocs2
PORTVERSION= 2.0.1
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.2/sources/gnome2-user-docs
+MASTER_SITE_SUBDIR= sources/gnome2-user-docs/2.0
DISTNAME= gnome2-user-docs-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/misc/gnomeutils/Makefile b/misc/gnomeutils/Makefile
index 7dba6c8d0ecc..e695a89539fe 100644
--- a/misc/gnomeutils/Makefile
+++ b/misc/gnomeutils/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.4.1.2
PORTREVISION= 1
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gnome-utils
+MASTER_SITE_SUBDIR= sources/gnome-utils/1.4
DISTNAME= gnome-utils-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
diff --git a/misc/gnomeutils2/Makefile b/misc/gnomeutils2/Makefile
index c4b2b1ea980e..78f4ede793be 100644
--- a/misc/gnomeutils2/Makefile
+++ b/misc/gnomeutils2/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 2.0.5
PORTEPOCH= 1
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/gnome-utils
+MASTER_SITE_SUBDIR= sources/gnome-utils/2.0
DISTNAME= gnome-utils-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index f9ce60b870c6..91709324c6c6 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 4.5.55
PORTREVISION?= 3
CATEGORIES?= misc
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/mc
+MASTER_SITE_SUBDIR= sources/mc/4.5
MAINTAINER= fjoe@FreeBSD.org
diff --git a/misc/metatheme2/Makefile b/misc/metatheme2/Makefile
index 8f27bcf10502..a50924661d06 100644
--- a/misc/metatheme2/Makefile
+++ b/misc/metatheme2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= metatheme2
PORTVERSION= 0.9.7
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/0.9
DISTNAME= metatheme-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/misc/pybliographer/Makefile b/misc/pybliographer/Makefile
index a110bb0bdc71..4002dbfc65a5 100644
--- a/misc/pybliographer/Makefile
+++ b/misc/pybliographer/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.0.8
PORTREVISION= 1
CATEGORIES= misc python gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/pyblio
+MASTER_SITE_SUBDIR= sources/pyblio/1.0
MAINTAINER= ports@FreeBSD.org
diff --git a/net/linc/Makefile b/net/linc/Makefile
index 79c2cd425b22..1f33aa075282 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -9,7 +9,7 @@ PORTNAME= linc
PORTVERSION= 0.5.3
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/${PORTNAME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.5
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/news/pan/Makefile b/news/pan/Makefile
index 1410f84fb48c..9213060262cf 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://pan.rebelbase.com/download/releases/${PORTVERSION}/SOURCE/
http://pan.rebelbase.com/download/obsolete/${PORTVERSION}/SOURCE/ \
${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/pan
+MASTER_SITE_SUBDIR= sources/pan/0.11
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/news/pan2/Makefile b/news/pan2/Makefile
index 44052261b2a1..decb8539daef 100644
--- a/news/pan2/Makefile
+++ b/news/pan2/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://pan.rebelbase.com/download/releases/${PORTVERSION}/SOURCE/
http://pan.rebelbase.com/download/obsolete/${PORTVERSION}/SOURCE/ \
${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/pan
+MASTER_SITE_SUBDIR= sources/pan/0.13
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile
index ad5fb693ca13..cc3e2f5ba38f 100644
--- a/palm/gnome-pilot-conduits/Makefile
+++ b/palm/gnome-pilot-conduits/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomepilot-conduits
PORTVERSION= 0.9
CATEGORIES= palm comms gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= unstable/sources/gnome-pilot-conduits
+MASTER_SITE_SUBDIR= sources/gnome-pilot-conduits/0.9
DISTNAME= gnome-pilot-conduits-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index 59bc881d43b8..0afb46981d24 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -11,7 +11,7 @@ PORTREVISION= 1
CATEGORIES= palm comms gnome
MASTER_SITES= ${MASTER_SITE_GNOME} \
http://www.eskil.org/gnome-pilot/download/tarballs/
-MASTER_SITE_SUBDIR= unstable/sources/gnome-pilot
+MASTER_SITE_SUBDIR= sources/gnome-pilot/0.1
DISTNAME= gnome-pilot-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/palm/gnomepilot-conduits/Makefile b/palm/gnomepilot-conduits/Makefile
index ad5fb693ca13..cc3e2f5ba38f 100644
--- a/palm/gnomepilot-conduits/Makefile
+++ b/palm/gnomepilot-conduits/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomepilot-conduits
PORTVERSION= 0.9
CATEGORIES= palm comms gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= unstable/sources/gnome-pilot-conduits
+MASTER_SITE_SUBDIR= sources/gnome-pilot-conduits/0.9
DISTNAME= gnome-pilot-conduits-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/palm/gnomepilot-conduits2/Makefile b/palm/gnomepilot-conduits2/Makefile
index ad5fb693ca13..cc3e2f5ba38f 100644
--- a/palm/gnomepilot-conduits2/Makefile
+++ b/palm/gnomepilot-conduits2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomepilot-conduits
PORTVERSION= 0.9
CATEGORIES= palm comms gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= unstable/sources/gnome-pilot-conduits
+MASTER_SITE_SUBDIR= sources/gnome-pilot-conduits/0.9
DISTNAME= gnome-pilot-conduits-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/palm/gnomepilot/Makefile b/palm/gnomepilot/Makefile
index 59bc881d43b8..0afb46981d24 100644
--- a/palm/gnomepilot/Makefile
+++ b/palm/gnomepilot/Makefile
@@ -11,7 +11,7 @@ PORTREVISION= 1
CATEGORIES= palm comms gnome
MASTER_SITES= ${MASTER_SITE_GNOME} \
http://www.eskil.org/gnome-pilot/download/tarballs/
-MASTER_SITE_SUBDIR= unstable/sources/gnome-pilot
+MASTER_SITE_SUBDIR= sources/gnome-pilot/0.1
DISTNAME= gnome-pilot-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/palm/gnomepilot2/Makefile b/palm/gnomepilot2/Makefile
index 59bc881d43b8..0afb46981d24 100644
--- a/palm/gnomepilot2/Makefile
+++ b/palm/gnomepilot2/Makefile
@@ -11,7 +11,7 @@ PORTREVISION= 1
CATEGORIES= palm comms gnome
MASTER_SITES= ${MASTER_SITE_GNOME} \
http://www.eskil.org/gnome-pilot/download/tarballs/
-MASTER_SITE_SUBDIR= unstable/sources/gnome-pilot
+MASTER_SITE_SUBDIR= sources/gnome-pilot/0.1
DISTNAME= gnome-pilot-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index f1fc6f9b6a23..f9af25704ca8 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.0.2
PORTREVISION= 1
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/ggv
+MASTER_SITE_SUBDIR= sources/ggv/1.0
MAINTAINER= gnome@FreeBSD.org
diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile
index 91479a2d3e22..c8400b1c60c2 100644
--- a/print/ggv2/Makefile
+++ b/print/ggv2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= ggv2
PORTVERSION= 1.99.90
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/${PORTNAME:S/2$//}
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/1.99
DISTNAME= ggv-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 1cd1fc132c48..2ac3c6620065 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomeprint
PORTVERSION= 0.37
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gnome-print
+MASTER_SITE_SUBDIR= sources/gnome-print/0.36
DISTNAME= gnome-print-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/print/gnomeprint/Makefile b/print/gnomeprint/Makefile
index 1cd1fc132c48..2ac3c6620065 100644
--- a/print/gnomeprint/Makefile
+++ b/print/gnomeprint/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomeprint
PORTVERSION= 0.37
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gnome-print
+MASTER_SITE_SUBDIR= sources/gnome-print/0.36
DISTNAME= gnome-print-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index fffbaa69a95b..48f95e7679a4 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libgnomeprint
PORTVERSION= 1.116.1
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.2/sources/${PORTNAME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.116
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index 0a989f602d8d..bcae3f78cfdb 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gconf-editor
PORTVERSION= 0.3.1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/${PORTNAME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.3
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 06219f4e0c13..9720317ff658 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomecontrolcenter2
PORTVERSION= 2.0.1.1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/control-center
+MASTER_SITE_SUBDIR= sources/control-center/2.0
DISTNAME= control-center-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/sysutils/gnome-control-center1/Makefile b/sysutils/gnome-control-center1/Makefile
index a9fc227cff77..f5ddc98225ac 100644
--- a/sysutils/gnome-control-center1/Makefile
+++ b/sysutils/gnome-control-center1/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.4.0.5
PORTREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/control-center
+MASTER_SITE_SUBDIR= sources/control-center/1.4
DISTNAME= control-center-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index d9e114755659..44a29c253ae2 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomesystemmonitor
PORTVERSION= 2.0.2
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/gnome-system-monitor
+MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.0
DISTNAME= gnome-system-monitor-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/sysutils/gnomecontrolcenter/Makefile b/sysutils/gnomecontrolcenter/Makefile
index a9fc227cff77..f5ddc98225ac 100644
--- a/sysutils/gnomecontrolcenter/Makefile
+++ b/sysutils/gnomecontrolcenter/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.4.0.5
PORTREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/control-center
+MASTER_SITE_SUBDIR= sources/control-center/1.4
DISTNAME= control-center-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 06219f4e0c13..9720317ff658 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomecontrolcenter2
PORTVERSION= 2.0.1.1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/control-center
+MASTER_SITE_SUBDIR= sources/control-center/2.0
DISTNAME= control-center-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile
index d9e114755659..44a29c253ae2 100644
--- a/sysutils/gnomesystemmonitor/Makefile
+++ b/sysutils/gnomesystemmonitor/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomesystemmonitor
PORTVERSION= 2.0.2
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/gnome-system-monitor
+MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.0
DISTNAME= gnome-system-monitor-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/sysutils/gtop/Makefile b/sysutils/gtop/Makefile
index 969e85fddd91..a998d5606da0 100644
--- a/sysutils/gtop/Makefile
+++ b/sysutils/gtop/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.0.13
PORTREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gtop
+MASTER_SITE_SUBDIR= sources/gtop/1.0
MAINTAINER= gnome@FreeBSD.org
diff --git a/sysutils/medusa/Makefile b/sysutils/medusa/Makefile
index 8e4865408405..1bad382bf41e 100644
--- a/sysutils/medusa/Makefile
+++ b/sysutils/medusa/Makefile
@@ -9,7 +9,7 @@ PORTNAME= medusa
PORTVERSION= 0.5.1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/medusa
+MASTER_SITE_SUBDIR= sources/medusa/0.5
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index bd5b0e4059a5..f5e7736931a9 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.4.1
PORTREVISION= 1
CATEGORIES= textproc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= unstable/sources/gnome-spell
+MASTER_SITE_SUBDIR= sources/gnome-spell/0.4
DISTNAME= gnome-spell-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/textproc/gnomespell-devel/Makefile b/textproc/gnomespell-devel/Makefile
index bd5b0e4059a5..f5e7736931a9 100644
--- a/textproc/gnomespell-devel/Makefile
+++ b/textproc/gnomespell-devel/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.4.1
PORTREVISION= 1
CATEGORIES= textproc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= unstable/sources/gnome-spell
+MASTER_SITE_SUBDIR= sources/gnome-spell/0.4
DISTNAME= gnome-spell-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/textproc/gnomespell/Makefile b/textproc/gnomespell/Makefile
index bd5b0e4059a5..f5e7736931a9 100644
--- a/textproc/gnomespell/Makefile
+++ b/textproc/gnomespell/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.4.1
PORTREVISION= 1
CATEGORIES= textproc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= unstable/sources/gnome-spell
+MASTER_SITE_SUBDIR= sources/gnome-spell/0.4
DISTNAME= gnome-spell-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile
index b56fcd4e3dea..2efcc2fe7bf9 100644
--- a/textproc/intltool/Makefile
+++ b/textproc/intltool/Makefile
@@ -9,7 +9,7 @@ PORTNAME= intltool
PORTVERSION= 0.22
CATEGORIES= textproc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/${PORTNAME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.22
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index 70fbd7c7d6c5..49305ecb845a 100644
--- a/textproc/libxml/Makefile
+++ b/textproc/libxml/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.8.17
PORTREVISION= 1
CATEGORIES= textproc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/libxml
+MASTER_SITE_SUBDIR= sources/libxml/1.8
MAINTAINER= gnome@FreeBSD.org
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 1246d1745513..d3637d92367d 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libxml2
PORTVERSION= 2.4.24
CATEGORIES= textproc 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/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index f98a8a80293d..67e4717bacd0 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libxslt
PORTVERSION= 1.0.20
CATEGORIES= textproc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/${PORTNAME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 24956167a44b..793bf1309560 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -11,7 +11,7 @@ PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= textproc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.0/sources/${PORTNAME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.3
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/textproc/xml-i18n-tools/Makefile b/textproc/xml-i18n-tools/Makefile
index 82bc52419df3..1a16834c8bd0 100644
--- a/textproc/xml-i18n-tools/Makefile
+++ b/textproc/xml-i18n-tools/Makefile
@@ -9,7 +9,7 @@ PORTNAME= xml-i18n-tools
PORTVERSION= 0.9
CATEGORIES= textproc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/${PORTNAME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.9
MAINTAINER= gnome@FreeBSD.org
diff --git a/www/glibwww/Makefile b/www/glibwww/Makefile
index 59b5948ac8ee..c4acc5f143cb 100644
--- a/www/glibwww/Makefile
+++ b/www/glibwww/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.2
PORTREVISION= 1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= unstable/sources/glibwww
+MASTER_SITE_SUBDIR= sources/glibwww/0.2
MAINTAINER= gnome@FreeBSD.org
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index 4fe5470dce08..69edaa3d3a9c 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.0.4
PORTREVISION= 1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= unstable/sources/gtkhtml
+MASTER_SITE_SUBDIR= sources/gtkhtml/1.0
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 4fe5470dce08..69edaa3d3a9c 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.0.4
PORTREVISION= 1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= unstable/sources/gtkhtml
+MASTER_SITE_SUBDIR= sources/gtkhtml/1.0
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index 4fe5470dce08..69edaa3d3a9c 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.0.4
PORTREVISION= 1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= unstable/sources/gtkhtml
+MASTER_SITE_SUBDIR= sources/gtkhtml/1.0
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/www/libghttp/Makefile b/www/libghttp/Makefile
index f222a59a933a..21a8158ff96a 100644
--- a/www/libghttp/Makefile
+++ b/www/libghttp/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libghttp
PORTVERSION= 1.0.9
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/libghttp
+MASTER_SITE_SUBDIR= sources/libghttp/1.0
MAINTAINER= gnome@FreeBSD.org
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index 378a7cad7ca4..19a38de8dd36 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libgtkhtml
PORTVERSION= 2.0.2
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/${PORTNAME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/www/nautilus-gtkhtml/Makefile b/www/nautilus-gtkhtml/Makefile
index eb474227f987..d26c78e3ad71 100644
--- a/www/nautilus-gtkhtml/Makefile
+++ b/www/nautilus-gtkhtml/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.3.2
PORTREVISION= 1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= sources/nautilus-gtkhtml/0.3
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 0c233dfa870f..c0460110849f 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.0.6
PORTREVISION= 9
CATEGORIES= x11-fm gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/nautilus
+MASTER_SITE_SUBDIR= sources/nautilus/1.0
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index e37572eb4cfd..fcf54019343f 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= nautilus2
PORTVERSION= 2.0.7
CATEGORIES= x11-fm gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.2/sources/${PORTNAME:S/2$//}
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.0
DIST_SUBDIR= gnome2
DISTNAME= nautilus-${PORTVERSION}
diff --git a/x11-themes/gtk-engines/Makefile b/x11-themes/gtk-engines/Makefile
index 897caa1f8d33..b4b73ff4c4af 100644
--- a/x11-themes/gtk-engines/Makefile
+++ b/x11-themes/gtk-engines/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.12
PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gtk-engines
+MASTER_SITE_SUBDIR= sources/gtk-engines/0.12
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index 3a5c1e165335..c0142e498200 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gtk-engines2
PORTVERSION= 1.9.0
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= sources/gtk-engines/1.9
DISTNAME= gtk-engines-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/at-spi/Makefile b/x11-toolkits/at-spi/Makefile
index 59eb24b14bb3..98d621350f0c 100644
--- a/x11-toolkits/at-spi/Makefile
+++ b/x11-toolkits/at-spi/Makefile
@@ -9,7 +9,7 @@ PORTNAME= at-spi
PORTVERSION= 1.0.2
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/${PORTNAME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/crux/Makefile b/x11-toolkits/crux/Makefile
index d2e2b79677dd..cffa5c132fe4 100644
--- a/x11-toolkits/crux/Makefile
+++ b/x11-toolkits/crux/Makefile
@@ -9,7 +9,7 @@ PORTNAME= crux
PORTVERSION= 1.9.3
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.0/latest/sources
+MASTER_SITE_SUBDIR= sources/crux/1.9
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile
index b8ea1e7c1397..f16047b9b270 100644
--- a/x11-toolkits/eel/Makefile
+++ b/x11-toolkits/eel/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.0.2
PORTREVISION= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/eel
+MASTER_SITE_SUBDIR= sources/eel/1.0
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/eel2/Makefile b/x11-toolkits/eel2/Makefile
index e1042fcca98a..207754a195eb 100644
--- a/x11-toolkits/eel2/Makefile
+++ b/x11-toolkits/eel2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= eel2
PORTVERSION= 2.0.7
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.2/sources/${PORTNAME:S/2$//}
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.0
DIST_SUBDIR= gnome2
DISTNAME= eel-${PORTVERSION}
diff --git a/x11-toolkits/gail/Makefile b/x11-toolkits/gail/Makefile
index 8a31c2c43f38..48007940b9a7 100644
--- a/x11-toolkits/gail/Makefile
+++ b/x11-toolkits/gail/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gail
PORTVERSION= 0.17
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.0/sources/${PORTNAME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.17
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile
index 7c76afcf8b45..986a574937a5 100644
--- a/x11-toolkits/gal/Makefile
+++ b/x11-toolkits/gal/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gal
PORTVERSION= 0.19.3
CATEGORIES?= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= unstable/sources/gal
+MASTER_SITE_SUBDIR= sources/gal/0.19
DIST_SUBDIR= gnome
MAINTAINER?= gnome@FreeBSD.org
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index 1fc2a99f8588..e5d2d5e66705 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gal2
PORTVERSION= 0.0.6
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/${PORTNAME}
+MASTER_SITE_SUBDIR= sources/gal2-0/0.0
DISTNAME= ${PORTNAME}-0-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index 109a0a5b6937..541419fd206b 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gdl
PORTVERSION= 0.1.0
CATEGORIES?= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= unstable/sources/${PORTNAME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.1
MAINTAINER?= gnome@FreeBSD.org
diff --git a/x11-toolkits/gnome--/Makefile b/x11-toolkits/gnome--/Makefile
index 88944857a42f..20ea20a1d49b 100644
--- a/x11-toolkits/gnome--/Makefile
+++ b/x11-toolkits/gnome--/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomemm
PORTVERSION= 1.2.2
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gnomemm
+MASTER_SITE_SUBDIR= sources/gnomemm/1.2
#DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/gob/Makefile b/x11-toolkits/gob/Makefile
index 886a3fb5e019..45fea36688a0 100644
--- a/x11-toolkits/gob/Makefile
+++ b/x11-toolkits/gob/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/x11-toolkits/gtk--/Makefile b/x11-toolkits/gtk--/Makefile
index 7f4b4a4ed1db..670c68b22fef 100644
--- a/x11-toolkits/gtk--/Makefile
+++ b/x11-toolkits/gtk--/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.2.8
PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gtkmm
+MASTER_SITE_SUBDIR= sources/gtkmm/1.2
#DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/gtk--2/Makefile b/x11-toolkits/gtk--2/Makefile
index 7f4b4a4ed1db..670c68b22fef 100644
--- a/x11-toolkits/gtk--2/Makefile
+++ b/x11-toolkits/gtk--2/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.2.8
PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gtkmm
+MASTER_SITE_SUBDIR= sources/gtkmm/1.2
#DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/gtk-engines/Makefile b/x11-toolkits/gtk-engines/Makefile
index 897caa1f8d33..b4b73ff4c4af 100644
--- a/x11-toolkits/gtk-engines/Makefile
+++ b/x11-toolkits/gtk-engines/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.12
PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gtk-engines
+MASTER_SITE_SUBDIR= sources/gtk-engines/0.12
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/gtk-engines2/Makefile b/x11-toolkits/gtk-engines2/Makefile
index 3a5c1e165335..c0142e498200 100644
--- a/x11-toolkits/gtk-engines2/Makefile
+++ b/x11-toolkits/gtk-engines2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gtk-engines2
PORTVERSION= 1.9.0
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR= sources/gtk-engines/1.9
DISTNAME= gtk-engines-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index 26e49001e4e1..9badc1c9eb7d 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.2.10
PORTREVISION= 8
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gtk+
+MASTER_SITE_SUBDIR= sources/gtk+/1.2
DISTNAME= gtk+-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index ec067becd177..d221ab6a9972 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtk
PORTVERSION= 2.0.6
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,2.0.0/sources/gtk+,} \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/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/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index ec067becd177..d221ab6a9972 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtk
PORTVERSION= 2.0.6
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,2.0.0/sources/gtk+,} \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/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/x11-toolkits/gtkmm12/Makefile b/x11-toolkits/gtkmm12/Makefile
index 7f4b4a4ed1db..670c68b22fef 100644
--- a/x11-toolkits/gtkmm12/Makefile
+++ b/x11-toolkits/gtkmm12/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.2.8
PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gtkmm
+MASTER_SITE_SUBDIR= sources/gtkmm/1.2
#DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index 7f4b4a4ed1db..670c68b22fef 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.2.8
PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gtkmm
+MASTER_SITE_SUBDIR= sources/gtkmm/1.2
#DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index 7f4b4a4ed1db..670c68b22fef 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.2.8
PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gtkmm
+MASTER_SITE_SUBDIR= sources/gtkmm/1.2
#DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index 7f4b4a4ed1db..670c68b22fef 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.2.8
PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gtkmm
+MASTER_SITE_SUBDIR= sources/gtkmm/1.2
#DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/guile-gnome/Makefile b/x11-toolkits/guile-gnome/Makefile
index 90f82073ce7b..3098fcb13b8d 100644
--- a/x11-toolkits/guile-gnome/Makefile
+++ b/x11-toolkits/guile-gnome/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.20
PORTREVISION= 4
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= unstable/sources/gnome-guile
+MASTER_SITE_SUBDIR= sources/gnome-guile/0.20
DISTNAME= gnome-guile-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/guile-gtk/Makefile b/x11-toolkits/guile-gtk/Makefile
index eb3810280229..5784e4e41667 100644
--- a/x11-toolkits/guile-gtk/Makefile
+++ b/x11-toolkits/guile-gtk/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.20
PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= unstable/sources/gnome-guile
+MASTER_SITE_SUBDIR= sources/gnome-guile/0.20
DISTNAME= gnome-guile-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index 59deee73d928..991b8f03025b 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libbonoboui
PORTVERSION= 2.0.3
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/${PORTNAME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile
index 748e7dc0f6b2..b3216944e244 100644
--- a/x11-toolkits/libgail-gnome/Makefile
+++ b/x11-toolkits/libgail-gnome/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libgail-gnome
PORTVERSION= 1.0.1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/${PORTNAME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index cc9eec6f5478..b590c4fc55cc 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libgnomeprintui
PORTVERSION= 1.116.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.0/sources/${PORTNAME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.116
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 9fc56c51df69..5d29f89fae29 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libgnomeui
PORTVERSION= 2.0.5
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/${PORTNAME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index a6d3d35d104c..5ed246bafba2 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libwnck
PORTVERSION= 0.17
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/${PORTNAME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.17
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile
index a3105cfe13b2..d201a61d9cf9 100644
--- a/x11-toolkits/libzvt/Makefile
+++ b/x11-toolkits/libzvt/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libzvt
PORTVERSION= 2.0.1
CATEGORIES= x11-toolkits gnome
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/x11-toolkits/panel--/Makefile b/x11-toolkits/panel--/Makefile
index 0efe95db3e56..a86db447861f 100644
--- a/x11-toolkits/panel--/Makefile
+++ b/x11-toolkits/panel--/Makefile
@@ -9,7 +9,7 @@ PORTNAME= panelmm
PORTVERSION= 0.3.1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/panelmm
+MASTER_SITE_SUBDIR= sources/panelmm/0.3
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 88168ff81a22..987915598528 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pango
PORTVERSION= 1.0.4
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,2.0.0/sources/${PORTNAME},} \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.0,} \
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/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile
index edd644e9bcb8..c3d1cebcbfda 100644
--- a/x11-toolkits/py-gnome/Makefile
+++ b/x11-toolkits/py-gnome/Makefile
@@ -9,7 +9,7 @@ PORTNAME= py-gnome
PORTVERSION= 1.4.4
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gnome-python
+MASTER_SITE_SUBDIR= sources/gnome-python/1.4
DISTNAME= gnome-python-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index edd644e9bcb8..c3d1cebcbfda 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= py-gnome
PORTVERSION= 1.4.4
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gnome-python
+MASTER_SITE_SUBDIR= sources/gnome-python/1.4
DISTNAME= gnome-python-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile
index 58652515390c..4c5b68e3726d 100644
--- a/x11-toolkits/py-gtk/Makefile
+++ b/x11-toolkits/py-gtk/Makefile
@@ -9,7 +9,7 @@ PORTNAME= py-gtk
PORTVERSION= 0.6.10
CATEGORIES= x11-toolkits python
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gnome-python
+MASTER_SITE_SUBDIR= sources/gnome-python/0.6
DISTNAME= gnome-python-1.4.4
DIST_SUBDIR= gnome
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 58652515390c..4c5b68e3726d 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= py-gtk
PORTVERSION= 0.6.10
CATEGORIES= x11-toolkits python
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gnome-python
+MASTER_SITE_SUBDIR= sources/gnome-python/0.6
DISTNAME= gnome-python-1.4.4
DIST_SUBDIR= gnome
diff --git a/x11-toolkits/rep-gtk/Makefile b/x11-toolkits/rep-gtk/Makefile
index 0a21d91de2c8..69b05a85c079 100644
--- a/x11-toolkits/rep-gtk/Makefile
+++ b/x11-toolkits/rep-gtk/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.15
PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/rep-gtk
+MASTER_SITE_SUBDIR= sources/rep-gtk/0.15
#DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index bb232a2f914f..ffe5f83fb803 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= 2.0.0/releases/gnome-2.0-desktop-final
+MASTER_SITE_SUBDIR= sources/rep-gtk/0.16
DISTNAME= rep-gtk-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish2/Makefile
index 4a8c640c908a..9e72607b4d47 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= 2.0.0/releases/gnome-2.0-desktop-final
+MASTER_SITE_SUBDIR= sources/sawfish/2.0
DISTNAME= sawfish-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 52474e895984..97e984c0b92f 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 2.2.5.5
PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gdm
+MASTER_SITE_SUBDIR= sources/gdm/2.2
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index 5febac00dee0..7ac240f6a3fd 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 2.4.0.11
PORTREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/${PORTNAME:S/2$//}
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4
DISTNAME= gdm-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index c4c224f0cfae..a9f8d0afabd8 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 2.0.3
PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.2/sources/gnome-applets
+MASTER_SITE_SUBDIR= sources/gnome-applets/2.0
DISTNAME= gnome-applets-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index f042a486dcee..b17cd668cede 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomedesktop
PORTVERSION= 2.0.8
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/gnome-desktop
+MASTER_SITE_SUBDIR= sources/gnome-desktop/2.0
DISTNAME= gnome-desktop-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index ce8bf4b979b5..143e8bdfa7ec 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.4.2
PORTREVISION= 1
CATEGORIES?= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gnome-libs
+MASTER_SITE_SUBDIR= sources/gnome-libs/1.4
DISTNAME= gnome-libs-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index b6921d06dcd5..cb7a5f094502 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomepanel
PORTVERSION= 2.0.9
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/gnome-panel
+MASTER_SITE_SUBDIR= sources/gnome-panel/2.0
DISTNAME= gnome-panel-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index b6cd8394b66d..a4337a679f9c 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomesession
PORTVERSION= 2.0.7
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/gnome-session
+MASTER_SITE_SUBDIR= sources/gnome-session/2.0
DISTNAME= gnome-session-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 973a5d66ac5e..4898626e7c79 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnometerminal
PORTVERSION= 2.0.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.0/sources/gnome-terminal
+MASTER_SITE_SUBDIR= sources/gnome-terminal/2.0
DISTNAME= gnome-terminal-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnomeapplets/Makefile b/x11/gnomeapplets/Makefile
index 1e146459387d..5c73ee91a587 100644
--- a/x11/gnomeapplets/Makefile
+++ b/x11/gnomeapplets/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.4.0.5
PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gnome-applets
+MASTER_SITE_SUBDIR= sources/gnome-applets/1.4
DISTNAME= gnome-applets-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index c4c224f0cfae..a9f8d0afabd8 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 2.0.3
PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.2/sources/gnome-applets
+MASTER_SITE_SUBDIR= sources/gnome-applets/2.0
DISTNAME= gnome-applets-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnomecore/Makefile b/x11/gnomecore/Makefile
index 7ddf77b64584..204d7eb5ed0a 100644
--- a/x11/gnomecore/Makefile
+++ b/x11/gnomecore/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomecore
PORTVERSION= 1.4.2
CATEGORIES?= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gnome-core
+MASTER_SITE_SUBDIR= sources/gnome-core/1.4
DISTNAME= gnome-core-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile
index f042a486dcee..b17cd668cede 100644
--- a/x11/gnomedesktop/Makefile
+++ b/x11/gnomedesktop/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomedesktop
PORTVERSION= 2.0.8
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/gnome-desktop
+MASTER_SITE_SUBDIR= sources/gnome-desktop/2.0
DISTNAME= gnome-desktop-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile
index ce8bf4b979b5..143e8bdfa7ec 100644
--- a/x11/gnomelibs/Makefile
+++ b/x11/gnomelibs/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.4.2
PORTREVISION= 1
CATEGORIES?= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gnome-libs
+MASTER_SITE_SUBDIR= sources/gnome-libs/1.4
DISTNAME= gnome-libs-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index b6921d06dcd5..cb7a5f094502 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomepanel
PORTVERSION= 2.0.9
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/gnome-panel
+MASTER_SITE_SUBDIR= sources/gnome-panel/2.0
DISTNAME= gnome-panel-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile
index b6cd8394b66d..a4337a679f9c 100644
--- a/x11/gnomesession/Makefile
+++ b/x11/gnomesession/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomesession
PORTVERSION= 2.0.7
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/gnome-session
+MASTER_SITE_SUBDIR= sources/gnome-session/2.0
DISTNAME= gnome-session-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile
index 973a5d66ac5e..4898626e7c79 100644
--- a/x11/gnometerminal/Makefile
+++ b/x11/gnometerminal/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnometerminal
PORTVERSION= 2.0.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.0/sources/gnome-terminal
+MASTER_SITE_SUBDIR= sources/gnome-terminal/2.0
DISTNAME= gnome-terminal-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 91998f84d347..1562204ec7ed 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libgnome
PORTVERSION= 2.0.5
CATEGORIES?= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/${PORTNAME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0
DIST_SUBDIR= gnome2
MAINTAINER?= gnome@FreeBSD.org
diff --git a/x11/xalf/Makefile b/x11/xalf/Makefile
index 725c3a93afd7..363fd2929d5c 100644
--- a/x11/xalf/Makefile
+++ b/x11/xalf/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME} \
http://www.lysator.liu.se/~astrand/projects/xalf/ \
http://www.lysator.liu.se/~astrand/projects/xalf/old/
-MASTER_SITE_SUBDIR= stable/sources/xalf
+MASTER_SITE_SUBDIR= sources/xalf/0.12
EXTRACT_SUFX= .tgz
#DIST_SUBDIR= gnome
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index a6b783e7e68a..519d345e5683 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -9,7 +9,7 @@ PORTNAME= yelp
PORTVERSION= 1.0.6
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= 2.0.1/sources/${PORTNAME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org