- Use GNOME macro instead of ${MASTER_SITE_GNOME}, remove

  MASTER_SITE_SUBDIR when possible.

PR:		ports/125243
Submitted by:	pgollucci
Reworked by:	myself
Tested on:	pointyhat exp-run (pav)

160 files changed, 160 insertions, 281 deletions

diff --git a/accessibility/at-poke/Makefile b/accessibility/at-poke/Makefile
index e911a0960901..c1426d208f31 100644
--- a/accessibility/at-poke/Makefile
+++ b/accessibility/at-poke/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	at-poke
 PORTVERSION=	0.2.3
 PORTREVISION=	3
 CATEGORIES=	accessibility gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	mva@sysfault.org
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index 01b8e4bcab04..73a30f595b99 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	at-spi
 PORTVERSION=	1.24.1
 PORTREVISION?=	0
 CATEGORIES=	accessibility x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index 9843cf6f3f4f..32193ce1649f 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	atk
 PORTVERSION=	1.24.0
 PORTREVISION?=	0
 CATEGORIES=	accessibility devel
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile
index e13632222c7c..7badcd4ad624 100644
--- a/accessibility/dasher/Makefile
+++ b/accessibility/dasher/Makefile
@@ -11,8 +11,7 @@ PORTVERSION=	4.9.0
 PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	accessibility editors x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	lewiz@compsoc.man.ac.uk
diff --git a/accessibility/gnopernicus/Makefile b/accessibility/gnopernicus/Makefile
index cbbf39c2c11e..858d78764fa0 100644
--- a/accessibility/gnopernicus/Makefile
+++ b/accessibility/gnopernicus/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	gnopernicus
 PORTVERSION=	1.1.2
 PORTREVISION=	5
 CATEGORIES=	accessibility x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile
index e07a14f35075..cb881c7aa911 100644
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	gok
 PORTVERSION=	2.24.0
 PORTEPOCH=	1
 CATEGORIES=	accessibility sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index 71c50a2fd1fd..43e575039e84 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	esound
 PORTVERSION=	0.2.41
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.2
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/audio/goobox/Makefile b/audio/goobox/Makefile
index a359a8ecc73c..c4de5ec6e377 100644
--- a/audio/goobox/Makefile
+++ b/audio/goobox/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	goobox
 PORTVERSION=	1.9.2
 PORTREVISION=	2
 CATEGORIES=	audio gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile
index d4ea974fa8cc..1d640eee7002 100644
--- a/audio/libaudiofile/Makefile
+++ b/audio/libaudiofile/Makefile
@@ -10,8 +10,7 @@ PORTVERSION=	0.2.6
 CATEGORIES=	audio
 MASTER_SITES=	http://www.68k.org/~michael/audiofile/ \
 		ftp://oss.sgi.com/projects/audiofile/download/ \
-		${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/audiofile/0.2
+		GNOME
 DISTNAME=	audiofile-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index 50cc486470de..bf70dfe52fbc 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	rhythmbox
 PORTVERSION=	0.11.6
 PORTREVISION=	3
 CATEGORIES=	audio gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.11
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	marcus@FreeBSD.org
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index c3d9130320e4..190b97cd25bf 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	rhythmbox
 PORTVERSION=	0.10.1
 PORTREVISION=	11
 CATEGORIES=	audio gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.10
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	marcus@FreeBSD.org
diff --git a/databases/gnome-db/Makefile b/databases/gnome-db/Makefile
index 06e5645db19c..3256c25cfa8c 100644
--- a/databases/gnome-db/Makefile
+++ b/databases/gnome-db/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	gnome-db
 PORTVERSION=	0.2.96
 PORTREVISION=	10
 CATEGORIES=	databases gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-db/0.2
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile
index 87eef0e8414a..4abfc81b6eb2 100644
--- a/databases/libgda/Makefile
+++ b/databases/libgda/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	libgda
 PORTVERSION=	0.2.96
 PORTREVISION=	10
 CATEGORIES=	databases gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.2
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile
index 6418b4aa6280..0b38c5601bda 100644
--- a/databases/libgda2/Makefile
+++ b/databases/libgda2/Makefile
@@ -11,7 +11,7 @@ PORTVERSION=	1.2.4
 PORTREVISION?=	5
 PORTEPOCH?=	1
 CATEGORIES=	databases gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/1.2
 DISTNAME=	libgda-${PORTVERSION}
 DIST_SUBDIR=	gnome2
diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile
index 6882049e91ec..39550c651781 100644
--- a/databases/libgda3/Makefile
+++ b/databases/libgda3/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	libgda3
 PORTVERSION?=	3.0.4
 PORTREVISION?=	1
 CATEGORIES=	databases gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:R}
 DISTNAME=	libgda-${PORTVERSION}
 DIST_SUBDIR=	gnome2
diff --git a/databases/libgdamm/Makefile b/databases/libgdamm/Makefile
index b4f78ca9c9cf..709388663e2f 100644
--- a/databases/libgdamm/Makefile
+++ b/databases/libgdamm/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	libgdamm
 PORTVERSION=	3.0.1
 PORTREVISION=	0
 CATEGORIES=	databases gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	bland@FreeBSD.org
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index 2a0b7f3c50df..489e72ff44c0 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	libgnomedb
 PORTVERSION=	3.0.0
 PORTREVISION?=	3
 CATEGORIES=	databases gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/deskutils/ontv/Makefile b/deskutils/ontv/Makefile
index cca83c3f7ecc..a22935a8f154 100644
--- a/deskutils/ontv/Makefile
+++ b/deskutils/ontv/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	ontv
 PORTVERSION=	2.4.0
 PORTREVISION=	4
 CATEGORIES=	deskutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNOME Applet for monitoring current and upcoming TV programs
diff --git a/deskutils/planner/Makefile b/deskutils/planner/Makefile
index eaa5c20a65b6..5b87af18e1a9 100644
--- a/deskutils/planner/Makefile
+++ b/deskutils/planner/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	planner
 PORTVERSION=	0.14.3
 CATEGORIES=	deskutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.14
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index 6d32b78a5433..6cd74644f48f 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	ORBit
 PORTVERSION=	0.5.17
 PORTREVISION=	4
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/ORBit/0.5
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile
index 6d2424ffdbdb..99f4a5a7d75e 100644
--- a/devel/bonobo-conf/Makefile
+++ b/devel/bonobo-conf/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	bonobo-conf
 PORTVERSION=	0.16
 PORTREVISION=	6
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/bonobo-conf/0.16
+MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Bonobo configuration moniker
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 4b22997ace94..db5c59df13b2 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	bonobo
 PORTVERSION=	1.0.22
 PORTREVISION=	7
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.0
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile
index 7a47aaa35e92..4bcf80eb9305 100644
--- a/devel/gconf/Makefile
+++ b/devel/gconf/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	gconf
 PORTVERSION=	1.0.9
 PORTREVISION=	16
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/GConf/1.0
 DISTNAME=	GConf-${PORTVERSION}
 DIST_SUBDIR=	gnome
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index f9127163f048..ed6f8d8cd495 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	gconf2
 PORTVERSION=	2.24.0
 PORTREVISION?=	0
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	GConf-${PORTVERSION}
 DIST_SUBDIR=	gnome2
diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index 130ce1144ffc..7e9e53e0e4ea 100644
--- a/devel/gconfmm/Makefile
+++ b/devel/gconfmm/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gconfmm
 PORTVERSION=	2.0.2
 PORTREVISION=	7
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	bland@FreeBSD.org
diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile
index 45bb0d961ca9..a886969cb574 100644
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	gconfmm
 PORTVERSION=	2.24.0
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	bland@FreeBSD.org
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index 2dc107fdd81c..2d399e7fc617 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	glade
 PORTVERSION=	2.12.2
 PORTREVISION=	2
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	2
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile
index 1d54f118770f..b8cdb4764a3f 100644
--- a/devel/glib12/Makefile
+++ b/devel/glib12/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	glib
 PORTVERSION=	1.2.10
 PORTREVISION=	12
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/glib/1.2
+MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Some useful routines of C programming (previous stable version)
diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile
index 75aa7fa29037..efc81d33d5dc 100644
--- a/devel/gnome-common/Makefile
+++ b/devel/gnome-common/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	gnome-common
 PORTVERSION=	2.24.0
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/gnome-crash/Makefile b/devel/gnome-crash/Makefile
index b626f81b7d20..bde6a82470ff 100644
--- a/devel/gnome-crash/Makefile
+++ b/devel/gnome-crash/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gnome-crash
 PORTVERSION=	0.0.5
 PORTREVISION=	7
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-crash/0.0
+MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A small coredump analysis tool for GNOME
diff --git a/devel/gnome-vfs-monikers/Makefile b/devel/gnome-vfs-monikers/Makefile
index d5f1f0803afb..70dd2f520d43 100644
--- a/devel/gnome-vfs-monikers/Makefile
+++ b/devel/gnome-vfs-monikers/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gnome-vfs-monikers
 PORTVERSION=	2.15.3
 PORTREVISION=	6
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/..$//}
+MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome-vfs monikers module
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index cee963b7593c..1ebf722d112d 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	gnome-vfs
 PORTVERSION=	2.24.0
 PORTREVISION?=	0
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile
index c15c8159496d..660293252192 100644
--- a/devel/gnome-vfs1/Makefile
+++ b/devel/gnome-vfs1/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gnome-vfs
 PORTVERSION=	1.0.5
 PORTREVISION=	12
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-vfs/1.0
+MASTER_SITES=	GNOME
 DISTNAME=	gnome-vfs-${PORTVERSION}
 DIST_SUBDIR=	gnome
 
diff --git a/devel/gnome-vfsmm/Makefile b/devel/gnome-vfsmm/Makefile
index 4a5a2837525b..31a9fc1a89e3 100644
--- a/devel/gnome-vfsmm/Makefile
+++ b/devel/gnome-vfsmm/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	gnome-vfsmm
 PORTVERSION=	2.24.0
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	bland@FreeBSD.org
diff --git a/devel/gob2/Makefile b/devel/gob2/Makefile
index 029b692eb877..d2cbd7390381 100644
--- a/devel/gob2/Makefile
+++ b/devel/gob2/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gob2
 PORTVERSION=	2.0.15
 PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.0
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/goffice04/Makefile b/devel/goffice04/Makefile
index 939b1cb91d04..8bbada4af5a5 100644
--- a/devel/goffice04/Makefile
+++ b/devel/goffice04/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	goffice
 PORTVERSION=	0.4.3
 PORTREVISION=	5
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	 sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GLib/GTK+ set of document centric objects and utilities
diff --git a/devel/goffice1/Makefile b/devel/goffice1/Makefile
index 4f1e56d35abd..89005c261c5b 100644
--- a/devel/goffice1/Makefile
+++ b/devel/goffice1/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	goffice
 PORTVERSION=	0.2.2
 PORTREVISION=	5
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.2
+MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GLib/GTK+ set of document centric objects and utilities
diff --git a/devel/gtkmozedit/Makefile b/devel/gtkmozedit/Makefile
index 9c43ed65c5f2..e2320b8e9247 100644
--- a/devel/gtkmozedit/Makefile
+++ b/devel/gtkmozedit/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gtkmozedit
 PORTVERSION=	0.3.0
 PORTREVISION=	4
 CATEGORIES=	devel editors www
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Text editor widget based on Mozilla's editing functionality
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index c405456bfb5c..c489b96e2ace 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	gtranslator
 PORTVERSION=	1.1.7
 PORTREVISION=	5
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNOME application for creating GNU gettext translation files
diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index bd2f5dce8c3e..94178f72b30f 100644
--- a/devel/libIDL/Makefile
+++ b/devel/libIDL/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	libIDL
 PORTVERSION=	0.8.12
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.8
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index e55b9bb6d1ae..a494728cdbd6 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	libbonobo
 PORTVERSION=	2.24.0
 PORTREVISION?=	0
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/libbonobomm/Makefile b/devel/libbonobomm/Makefile
index 53d899a8e3e4..ac9bd6e088c2 100644
--- a/devel/libbonobomm/Makefile
+++ b/devel/libbonobomm/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	libbonobomm
 PORTVERSION=	1.3.8
 PORTREVISION=	10
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	bland@FreeBSD.org
diff --git a/devel/libglade-java/Makefile b/devel/libglade-java/Makefile
index 2361bd0d9c7e..f9905527cdc5 100644
--- a/devel/libglade-java/Makefile
+++ b/devel/libglade-java/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	libglade-java
 PORTVERSION=	2.12.8
 PORTREVISION=	2
 CATEGORIES=	devel java
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.12
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index 492d203387f2..3e3582e51e5a 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	libglade
 PORTVERSION=	0.17
 PORTREVISION=	9
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/libglade/0.17
+MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME glade library
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 13d0e988b90c..52cae549139c 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	libglade2
 PORTVERSION=	2.6.3
 PORTREVISION?=	0
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/..$//}
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
diff --git a/devel/libglademm24/Makefile b/devel/libglademm24/Makefile
index 9ea87736f49c..72fa42a983b5 100644
--- a/devel/libglademm24/Makefile
+++ b/devel/libglademm24/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	libglademm
 PORTVERSION=	2.6.7
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	bland@FreeBSD.org
diff --git a/devel/libole2/Makefile b/devel/libole2/Makefile
index dc984cc4e1cb..10dc61305b30 100644
--- a/devel/libole2/Makefile
+++ b/devel/libole2/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	libole2
 PORTVERSION=	0.2.4
 PORTREVISION=	2
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/libole2/0.2
+MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Support library for OLE functions (MS-Excel) for gnumeric
diff --git a/devel/libsoup22/Makefile b/devel/libsoup22/Makefile
index 5f40d06c147b..3384aa48080c 100644
--- a/devel/libsoup22/Makefile
+++ b/devel/libsoup22/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	libsoup
 PORTVERSION=	2.2.105
 PORTREVISION=	3
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/orbitcpp/Makefile b/devel/orbitcpp/Makefile
index 5004837fde47..504b51b32389 100644
--- a/devel/orbitcpp/Makefile
+++ b/devel/orbitcpp/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	orbitcpp
 PORTVERSION=	1.3.9
 PORTREVISION=	4
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	C++ bindings for ORBit, a CORBA 2.2-compliant ORB
diff --git a/devel/present/Makefile b/devel/present/Makefile
index 4fd048c2acbb..31f272e3ffe0 100644
--- a/devel/present/Makefile
+++ b/devel/present/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	present
 PORTVERSION=	0.0.3
 PORTREVISION=	6
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.0
+MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A library for reading Microsoft PowerPoint(tm) documents
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index 6c73e2c2eb78..02aae76caba7 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	gobject
 PORTVERSION=	2.16.0
 CATEGORIES=	devel python
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pygobject-${PORTVERSION}
diff --git a/devel/py-orbit/Makefile b/devel/py-orbit/Makefile
index 14328870fc5e..a772e5720d5a 100644
--- a/devel/py-orbit/Makefile
+++ b/devel/py-orbit/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	orbit
 PORTVERSION=	2.24.0
 CATEGORIES=	devel python
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/pyorbit/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pyorbit-${PORTVERSION}
diff --git a/devel/soup/Makefile b/devel/soup/Makefile
index f533b0fc5937..619359d2716a 100644
--- a/devel/soup/Makefile
+++ b/devel/soup/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	soup
 PORTVERSION=	0.7.11
 PORTREVISION=	3
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.7
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index 3d0308291cb3..4ffa25a2e3cd 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	mlview
 PORTVERSION=	0.8
 PORTREVISION=	8
 CATEGORIES=	editors gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	barner@FreeBSD.org
diff --git a/games/atomix/Makefile b/games/atomix/Makefile
index f034d72b5116..509144721675 100644
--- a/games/atomix/Makefile
+++ b/games/atomix/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	atomix
 PORTVERSION=	2.14.0
 PORTREVISION=	5
 CATEGORIES=	games gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/games/gnome-games-extra-data/Makefile b/games/gnome-games-extra-data/Makefile
index 85b510834357..ed3657c41fd2 100644
--- a/games/gnome-games-extra-data/Makefile
+++ b/games/gnome-games-extra-data/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	gnome-games-extra-data
 PORTVERSION=	2.24.0
 CATEGORIES=	games gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-games-extra-data/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/games/gnomechess/Makefile b/games/gnomechess/Makefile
index 28d1cd6d0073..6f38ad858e9c 100644
--- a/games/gnomechess/Makefile
+++ b/games/gnomechess/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomechess
 PORTVERSION=	0.3.3
 PORTREVISION=	7
 CATEGORIES=	games gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/gnome-chess/0.3
 DISTNAME=	gnome-chess-${PORTVERSION}
 
diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index cf106dac6abf..33a8b88cbb01 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -8,8 +8,7 @@ PORTNAME=	gtetrinet
 PORTVERSION=	0.7.11
 PORTREVISION=	4
 CATEGORIES=	games gnome ipv6
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 6987adf17882..9c9be2d54833 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -11,8 +11,7 @@ DISTVERSION=	0.96.1
 PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER?=	gnome@FreeBSD.org
diff --git a/graphics/electriceyes/Makefile b/graphics/electriceyes/Makefile
index a6cbd7c63abb..e6d4a65514be 100644
--- a/graphics/electriceyes/Makefile
+++ b/graphics/electriceyes/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	electriceyes
 PORTVERSION=	0.3.12
 PORTREVISION=	6
 CATEGORIES=	graphics gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/ee/0.3
 DISTNAME=	ee-${PORTVERSION}
 
diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile
index bccb47f6f9cd..d3ac289ae810 100644
--- a/graphics/f-spot/Makefile
+++ b/graphics/f-spot/Makefile
@@ -11,8 +11,7 @@ PORTVERSION=	0.4.0
 PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.4
+MASTER_SITES=	GNOME
 
 MAINTAINER=	bsd-sharp@googlegroups.com
 COMMENT=	Personal photo management to the GNOME desktop
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index a394428423ae..7aa06f32c176 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -9,7 +9,7 @@ PORTNAME?=	gdk-pixbuf
 PORTVERSION=	0.22.0
 PORTREVISION=	8
 CATEGORIES?=	graphics
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/gdk-pixbuf/0.22
 DISTNAME=	gdk-pixbuf-${PORTVERSION}
 DIST_SUBDIR=	gnome
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index ca00a20faed0..247053daeab1 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	imlib
 PORTVERSION=	1.9.15
 PORTREVISION=	7
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/imlib/1.9
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/graphics/libart_lgpl/Makefile b/graphics/libart_lgpl/Makefile
index 2a0de0f75549..6f96a67205de 100644
--- a/graphics/libart_lgpl/Makefile
+++ b/graphics/libart_lgpl/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	libart_lgpl
 PORTVERSION=	2.3.20
 PORTEPOCH=	1
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.3
+MASTER_SITES=	GNOME
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile
index 08da5ae8b8f8..8c28d25b7afa 100644
--- a/graphics/libgnomecanvasmm26/Makefile
+++ b/graphics/libgnomecanvasmm26/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	libgnomecanvasmm
 PORTVERSION=	2.23.1
 CATEGORIES=	graphics gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	bland@FreeBSD.org
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 7cacb2360025..258b607da179 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	librsvg2
 PORTVERSION=	2.22.3
 PORTREVISION=	2
 CATEGORIES=	graphics gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	librsvg-${PORTVERSION}
 DIST_SUBDIR=	gnome2
diff --git a/graphics/passepartout/Makefile b/graphics/passepartout/Makefile
index 832e6a8b29c1..6a88f26e62a4 100644
--- a/graphics/passepartout/Makefile
+++ b/graphics/passepartout/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	passepartout
 PORTVERSION=	0.7.0
 PORTREVISION=	1
 CATEGORIES=	graphics gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index aea1a404977f..d4169f3b8121 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	gnumeric
 PORTVERSION=	1.9.3
 PORTREVISION=	2
 CATEGORIES=	math gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index dfda1205a4f0..f9cc25ac4c72 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	guppi
 PORTVERSION=	0.40.3
 PORTREVISION=	13
 CATEGORIES=	math gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/Guppi/0.40
 DISTNAME=	Guppi-${PORTVERSION}
 
diff --git a/misc/bigboard/Makefile b/misc/bigboard/Makefile
index 4c7139ec840b..6d49539ab3b3 100644
--- a/misc/bigboard/Makefile
+++ b/misc/bigboard/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	bigboard
 PORTVERSION=	0.5.38
 CATEGORIES=	misc gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 
 MAINTAINER=	wahjava@gmail.com
 COMMENT=	Big Board sidebar is an experimental panel for the GNOME Desktop
diff --git a/misc/gnome-mime-data/Makefile b/misc/gnome-mime-data/Makefile
index 549d28a98400..dbed0513e37c 100644
--- a/misc/gnome-mime-data/Makefile
+++ b/misc/gnome-mime-data/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gnome-mime-data
 PORTVERSION=	2.18.0
 PORTREVISION=	3
 CATEGORIES=	misc gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DISTNAME=	gnome-mime-data-${PORTVERSION}
 DIST_SUBDIR=	gnome
 
diff --git a/misc/pybliographer/Makefile b/misc/pybliographer/Makefile
index 89cf1e059f44..0daac1c26b57 100644
--- a/misc/pybliographer/Makefile
+++ b/misc/pybliographer/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	pybliographer
 PORTVERSION=	1.0.11
 PORTREVISION=	6
 CATEGORIES=	misc python gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/pybliographer/1.0
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/misc/quick-lounge-applet/Makefile b/misc/quick-lounge-applet/Makefile
index ab6529780e1c..ecd5c2fd814d 100644
--- a/misc/quick-lounge-applet/Makefile
+++ b/misc/quick-lounge-applet/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	quick-lounge-applet
 PORTVERSION=	2.12.5
 PORTREVISION=	1
 CATEGORIES=	misc gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.12
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	marcus@FreeBSD.org
diff --git a/net-im/gossip/Makefile b/net-im/gossip/Makefile
index 26a9dadc26f4..ce8648b5561e 100644
--- a/net-im/gossip/Makefile
+++ b/net-im/gossip/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	gossip
 PORTVERSION=	0.31
 CATEGORIES=	net-im gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/net-im/loudmouth/Makefile b/net-im/loudmouth/Makefile
index c916dc4a2f5d..6d43e13581a8 100644
--- a/net-im/loudmouth/Makefile
+++ b/net-im/loudmouth/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	loudmouth
 PORTVERSION=	1.4.3
 CATEGORIES=	net-im gnome
 MASTER_SITES=	http://ftp.imendio.com/pub/imendio/loudmouth/src/ \
-		${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.0
+		GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Lightweight Jabber client library
diff --git a/net/desktop-data-model/Makefile b/net/desktop-data-model/Makefile
index 67930c281ca2..9a7ded5d6d17 100644
--- a/net/desktop-data-model/Makefile
+++ b/net/desktop-data-model/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	desktop-data-model
 PORTVERSION=	1.2.4
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+)(\.[0-9]+)*/\1/}
+MASTER_SITES=	GNOME
 
 MAINTAINER=	wahjava@gmail.com
 COMMENT=	Engine providing live updates of online data to the desktop
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index 0571e3bfc61c..144231eac284 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	ekiga
 PORTVERSION=	2.0.11
 PORTREVISION=	5
 CATEGORIES=	net gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.0
+MASTER_SITES=	GNOME
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	VoIP phone for GNOME
diff --git a/net/gnome-mud/Makefile b/net/gnome-mud/Makefile
index fae805af4726..6aafe553007e 100644
--- a/net/gnome-mud/Makefile
+++ b/net/gnome-mud/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gnome-mud
 PORTVERSION=	0.10.7
 PORTREVISION=	5
 CATEGORIES=	net gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	GNOME
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK-based MUD client with triggers, aliases, colors, etc
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index 039d7e6b4df2..0b7b3de5c126 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	gnome-netstatus
 PORTVERSION=	2.12.2
 CATEGORIES=	net gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/net/libgnetwork/Makefile b/net/libgnetwork/Makefile
index d41259268e07..827ad4dd3bba 100644
--- a/net/libgnetwork/Makefile
+++ b/net/libgnetwork/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	libgnetwork
 PORTVERSION=	0.0.9
 PORTREVISION=	3
 CATEGORIES=	net gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.0
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/net/linc/Makefile b/net/linc/Makefile
index f438ce4873f0..28093a582565 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	linc
 PORTVERSION=	1.0.3
 PORTREVISION?=	7
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.0
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/net/online-desktop/Makefile b/net/online-desktop/Makefile
index 0ac2b9e07738..019dc7d94ed8 100644
--- a/net/online-desktop/Makefile
+++ b/net/online-desktop/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	online-desktop
 PORTVERSION=	0.2.29
 PORTREVISION=	1
 CATEGORIES=	net gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 
 MAINTAINER=	wahjava@gmail.com
 COMMENT=	GNOME Online Desktop
diff --git a/net/straw/Makefile b/net/straw/Makefile
index 09825a16170d..fa145bdb0ade 100644
--- a/net/straw/Makefile
+++ b/net/straw/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	straw
 PORTVERSION=	0.27
 PORTREVISION=	3
 CATEGORIES=	net gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=sources/${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	GNOME
 
 MAINTAINER=	R.Mahmatkhanov@SKYLINK.RU
 COMMENT=	A GNOME 2 desktop weblog aggregator written in Python
diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index b274c9a00307..d66cd61ad53b 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	gnome-pilot
 PORTVERSION=	2.0.16
 CATEGORIES=	palm comms gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.0
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index 9062d56feeb4..ead12f199b0f 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	ggv
 PORTVERSION=	2.12.0
 PORTREVISION=	4
 CATEGORIES=	print gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.12
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/print/gnome-cups-manager/Makefile b/print/gnome-cups-manager/Makefile
index e834e8c6ae5d..cd26db17b670 100644
--- a/print/gnome-cups-manager/Makefile
+++ b/print/gnome-cups-manager/Makefile
@@ -11,8 +11,7 @@ PORTVERSION=	0.31
 PORTREVISION=	9
 PORTEPOCH=	1
 CATEGORIES=	print gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index f336f4dceecc..c8babeb7fa16 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	gnome-print
 PORTVERSION=	0.37
 PORTREVISION=	7
 CATEGORIES=	print gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-print/0.37
+MASTER_SITES=	GNOME
 DISTNAME=	gnome-print-${PORTVERSION}
 DIST_SUBDIR=	gnome
 
diff --git a/print/libgnomecups/Makefile b/print/libgnomecups/Makefile
index 483ca0b6b407..0f89725baa7b 100644
--- a/print/libgnomecups/Makefile
+++ b/print/libgnomecups/Makefile
@@ -10,8 +10,7 @@ PORTVERSION=	0.2.3
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	print gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.2
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index b7cfdc813f99..269fa9626483 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -10,8 +10,7 @@
 PORTNAME=	libgnomeprint
 PORTVERSION=	2.18.5
 CATEGORIES=	print gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/print/libgnomeprintmm/Makefile b/print/libgnomeprintmm/Makefile
index 545b3d6199cf..736f0818f3ff 100644
--- a/print/libgnomeprintmm/Makefile
+++ b/print/libgnomeprintmm/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	libgnomeprintmm
 PORTVERSION=	2.5.1
 PORTREVISION=	5
 CATEGORIES=	print gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.5
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	bland@FreeBSD.org
diff --git a/security/gnome-gpg/Makefile b/security/gnome-gpg/Makefile
index e1e994b0e9c8..eb21dd601674 100644
--- a/security/gnome-gpg/Makefile
+++ b/security/gnome-gpg/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gnome-gpg
 PORTVERSION=	0.5.0
 PORTREVISION=	4
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Simple commandline wrapper around gpg for gnome-keyring
diff --git a/sysutils/battfink/Makefile b/sysutils/battfink/Makefile
index d2c55da800ee..1a0b8acd5ea5 100644
--- a/sysutils/battfink/Makefile
+++ b/sysutils/battfink/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	battfink
 PORTVERSION=	0.6.2
 PORTREVISION=	9
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.6
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index 185c34b8ff41..2a40884205d9 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	brasero
 PORTVERSION=	0.8.4
 PORTREVISION=	2
 CATEGORIES=	sysutils audio multimedia gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/sysutils/gnome-control-center1/Makefile b/sysutils/gnome-control-center1/Makefile
index 31ba5ef908c0..78bf90bea241 100644
--- a/sysutils/gnome-control-center1/Makefile
+++ b/sysutils/gnome-control-center1/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	gnome-control-center
 PORTVERSION=	1.4.0.5
 PORTREVISION=	8
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/control-center/1.4
 DISTNAME=	control-center-${PORTVERSION}
 DIST_SUBDIR=	gnome
diff --git a/sysutils/pessulus/Makefile b/sysutils/pessulus/Makefile
index 4e428030428b..d8239b97adc7 100644
--- a/sysutils/pessulus/Makefile
+++ b/sysutils/pessulus/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	pessulus
 PORTVERSION=	2.24.0
 PORTREVISION=	1
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	 sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index 6965bd40e17a..cd2c0503438c 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	gnome-spell
 PORTVERSION=	1.0.8
 PORTREVISION=	2
 CATEGORIES=	textproc gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index 7b57b7028b54..f7ef137beeb5 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gtk-doc
 PORTVERSION=	1.10
 PORTREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Code documentation system, originally for GTK+
diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile
index 56c4e6a5a5f0..14b1e3bc1c97 100644
--- a/textproc/libcroco/Makefile
+++ b/textproc/libcroco/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	libcroco
 PORTVERSION=	0.6.1
 PORTREVISION=	1
 CATEGORIES=	textproc gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.6
+MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	CSS2 parsing library
diff --git a/textproc/libxml++/Makefile b/textproc/libxml++/Makefile
index 24d9c0c7c5c7..1477aae94c7d 100644
--- a/textproc/libxml++/Makefile
+++ b/textproc/libxml++/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	libxml++
 PORTVERSION=	1.0.5
 PORTREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	GNOME
 
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	XML API for C++
diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index 2e5547b3beb4..1c38aa19f851 100644
--- a/textproc/libxml/Makefile
+++ b/textproc/libxml/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	libxml
 PORTVERSION=	1.8.17
 PORTREVISION=	4
 CATEGORIES=	textproc gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/libxml/1.8
+MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	XML parser library for GNOME
diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile
index 19b21438c5e2..5f39d14d1cf5 100644
--- a/textproc/meld/Makefile
+++ b/textproc/meld/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	meld
 PORTVERSION=	1.2.1
 CATEGORIES=	textproc devel python
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	GNOME
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNOME 2 visual diff and merge tool
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index fadbc947d559..a35c505067db 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -10,8 +10,7 @@ PORTVERSION=	0.3.14
 PORTREVISION=	11
 PORTEPOCH=	1
 CATEGORIES=	textproc gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.3
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/textproc/xml-i18n-tools/Makefile b/textproc/xml-i18n-tools/Makefile
index ae84c047e57c..d2c9b568e90d 100644
--- a/textproc/xml-i18n-tools/Makefile
+++ b/textproc/xml-i18n-tools/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	xml-i18n-tools
 PORTVERSION=	0.9
 PORTREVISION=	1
 CATEGORIES=	textproc gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.9
+MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Xml internationalization support for GNOME, and others
diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile
index 55c46799ec61..5f66b838d2fc 100644
--- a/www/evolution-webcal/Makefile
+++ b/www/evolution-webcal/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	evolution-webcal
 PORTVERSION=	2.24.0
 CATEGORIES=	www gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/www/glibwww/Makefile b/www/glibwww/Makefile
index 2e519ce8aa27..183fba54d847 100644
--- a/www/glibwww/Makefile
+++ b/www/glibwww/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	glibwww
 PORTVERSION=	0.2
 PORTREVISION=	6
 CATEGORIES=	www gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/glibwww/0.2
+MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A library for people wanting to use libwww with gtk/gnome
diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile
index c0fb3fd0c168..0d820afb4956 100644
--- a/www/gnome-user-share/Makefile
+++ b/www/gnome-user-share/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	gnome-user-share
 PORTVERSION=	0.31
 PORTREVISION=	2
 CATEGORIES=	www deskutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/www/gnome-web-photo/Makefile b/www/gnome-web-photo/Makefile
index 31fd55273748..63bce06159f8 100644
--- a/www/gnome-web-photo/Makefile
+++ b/www/gnome-web-photo/Makefile
@@ -11,8 +11,7 @@ PORTNAME=	gnome-web-photo
 PORTVERSION=	0.2
 PORTREVISION=	5
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.2
+MASTER_SITES=	GNOME
 
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Tool to generate full-size image files and thumbnails
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index c29ba991b8f1..5bf3aba9673e 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gtkhtml
 PORTVERSION=	1.1.10
 PORTREVISION=	10
 CATEGORIES=	www gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.1
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index f5716c4a3955..40decf4d7658 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	gtkhtml3
 PORTVERSION=	3.24.3
 CATEGORIES=	www gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	${PORTNAME:S/3$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index c023733205a4..1aac9ec6ecde 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	gtkhtml3
 PORTVERSION=	3.12.3
 PORTREVISION=	5
 CATEGORIES=	www gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	${PORTNAME:S/3$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
diff --git a/www/libghttp/Makefile b/www/libghttp/Makefile
index 7c20ea4a4631..305655e055e5 100644
--- a/www/libghttp/Makefile
+++ b/www/libghttp/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	libghttp
 PORTVERSION=	1.0.9
 PORTREVISION=	1
 CATEGORIES=	www gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/libghttp/1.0
+MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME http client library
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index 8eafcfbeaad7..573058ee43e8 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	libgtkhtml
 PORTVERSION=	2.11.1
 PORTREVISION=	2
 CATEGORIES=	www gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.11
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-fm/gnome-commander/Makefile b/x11-fm/gnome-commander/Makefile
index c61e362ca4e5..3b797263230b 100644
--- a/x11-fm/gnome-commander/Makefile
+++ b/x11-fm/gnome-commander/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gnome-commander
 PORTVERSION=	1.0.1
 PORTREVISION=	6
 CATEGORIES=	x11-fm gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-commander/1.0/
+MASTER_SITES=	GNOME
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	File manager for Gnome
diff --git a/x11-fm/py-nautilus/Makefile b/x11-fm/py-nautilus/Makefile
index 43e3a852f4c9..81dcc2879438 100644
--- a/x11-fm/py-nautilus/Makefile
+++ b/x11-fm/py-nautilus/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	nautilus
 PORTVERSION=	0.5.1
 CATEGORIES=	x11-fm gnome python
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/nautilus-python/${PORTVERSION:R}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	nautilus-python-${PORTVERSION}
diff --git a/x11-fonts/bitstream-vera/Makefile b/x11-fonts/bitstream-vera/Makefile
index 68dcfea5cd8e..6c91428f3a1b 100644
--- a/x11-fonts/bitstream-vera/Makefile
+++ b/x11-fonts/bitstream-vera/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	bitstream-vera
 PORTVERSION=	1.10
 PORTREVISION=	4
 CATEGORIES=	x11-fonts
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/ttf-${PORTNAME}/1.10
 DISTNAME=	ttf-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
diff --git a/x11-themes/gnome-icons-aqua-fusion/Makefile b/x11-themes/gnome-icons-aqua-fusion/Makefile
index 6462d997aff5..9013e9103d71 100644
--- a/x11-themes/gnome-icons-aqua-fusion/Makefile
+++ b/x11-themes/gnome-icons-aqua-fusion/Makefile
@@ -13,7 +13,7 @@ PORTNAME=	aqua-fusion
 PORTVERSION=	20030216
 PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
 DISTNAME=	ICON-AquaFusion
 
diff --git a/x11-themes/gnome-icons-gentoo-test/Makefile b/x11-themes/gnome-icons-gentoo-test/Makefile
index 9aea9e9bf4d9..d0a903de581a 100644
--- a/x11-themes/gnome-icons-gentoo-test/Makefile
+++ b/x11-themes/gnome-icons-gentoo-test/Makefile
@@ -13,7 +13,7 @@ PORTNAME=	gentoo-test
 PORTVERSION=	0.1
 PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
 DISTNAME=	ICON-Gentoo-Test
 
diff --git a/x11-themes/gnome-icons-iris/Makefile b/x11-themes/gnome-icons-iris/Makefile
index f3d588a06bd2..7a26a2602251 100644
--- a/x11-themes/gnome-icons-iris/Makefile
+++ b/x11-themes/gnome-icons-iris/Makefile
@@ -13,7 +13,7 @@ PORTNAME=	iris
 PORTVERSION=	20050420
 PORTREVISION=	1
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	teams/art.gnome.org/themes/icon
 DISTNAME=	ICON-Iris
 
diff --git a/x11-themes/gnome-icons-noia-full/Makefile b/x11-themes/gnome-icons-noia-full/Makefile
index 25be80752422..7bb779c8fcac 100644
--- a/x11-themes/gnome-icons-noia-full/Makefile
+++ b/x11-themes/gnome-icons-noia-full/Makefile
@@ -13,7 +13,7 @@ PORTNAME=	noia-full
 PORTVERSION=	20041102
 PORTREVISION=	2
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
 DISTNAME=	ICON-Noia
 
diff --git a/x11-themes/gnome-icons-noia-warm/Makefile b/x11-themes/gnome-icons-noia-warm/Makefile
index d09b194d1c74..d6d8be18a2e0 100644
--- a/x11-themes/gnome-icons-noia-warm/Makefile
+++ b/x11-themes/gnome-icons-noia-warm/Makefile
@@ -13,7 +13,7 @@ PORTNAME=	noia-warm
 PORTVERSION=	20041102
 PORTREVISION=	2
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
 DISTNAME=	ICON-NoiaWarm
 
diff --git a/x11-themes/gnome-icons-refined/Makefile b/x11-themes/gnome-icons-refined/Makefile
index 4d377d88f91e..1222a0e63c4e 100644
--- a/x11-themes/gnome-icons-refined/Makefile
+++ b/x11-themes/gnome-icons-refined/Makefile
@@ -13,7 +13,7 @@ PORTNAME=	refined
 PORTVERSION=	20030203
 PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
 DISTNAME=	ICON-Gnome-RH8
 
diff --git a/x11-themes/gnome-icons-slick/Makefile b/x11-themes/gnome-icons-slick/Makefile
index 5039beda84be..e7de64ce7233 100644
--- a/x11-themes/gnome-icons-slick/Makefile
+++ b/x11-themes/gnome-icons-slick/Makefile
@@ -13,7 +13,7 @@ PORTNAME=	slick
 PORTVERSION=	20030209
 PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
 DISTNAME=	ICON-Slick
 
diff --git a/x11-themes/gnome-icons-snow-apple/Makefile b/x11-themes/gnome-icons-snow-apple/Makefile
index 11d7e4dfab94..fd469d13c286 100644
--- a/x11-themes/gnome-icons-snow-apple/Makefile
+++ b/x11-themes/gnome-icons-snow-apple/Makefile
@@ -13,7 +13,7 @@ PORTNAME=	snow-apple
 PORTVERSION=	20030202
 PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
 DISTNAME=	ICON-Snow-Apple
 
diff --git a/x11-themes/gnome-icons-stylish/Makefile b/x11-themes/gnome-icons-stylish/Makefile
index b8f03c0d5f6b..5a1da70cd79d 100644
--- a/x11-themes/gnome-icons-stylish/Makefile
+++ b/x11-themes/gnome-icons-stylish/Makefile
@@ -13,7 +13,7 @@ PORTNAME=	stylish
 PORTVERSION=	20030129
 PORTREVISION=	2
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
 DISTNAME=	ICON-Stylish
 
diff --git a/x11-themes/gnome-icons-ximian-south/Makefile b/x11-themes/gnome-icons-ximian-south/Makefile
index 2993924b1bca..3895b1803e20 100644
--- a/x11-themes/gnome-icons-ximian-south/Makefile
+++ b/x11-themes/gnome-icons-ximian-south/Makefile
@@ -13,7 +13,7 @@ PORTNAME=	ximian-south
 PORTVERSION=	1.3.6
 PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
 DISTNAME=	ICON-Ximian-South-${PORTVERSION}
 
diff --git a/x11-themes/gtk-engines/Makefile b/x11-themes/gtk-engines/Makefile
index 2dd013f70e1e..4b9bfc30b9c0 100644
--- a/x11-themes/gtk-engines/Makefile
+++ b/x11-themes/gtk-engines/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gtk-engines
 PORTVERSION=	0.12
 PORTREVISION=	8
 CATEGORIES=	x11-themes
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gtk-engines/0.12
+MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Theme engine for gtk+ toolkits
diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index 9c98f0049882..8dc7e4f64b5b 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	gtk-engines2
 PORTVERSION=	2.16.1
 CATEGORIES=	x11-themes
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile
index eabf67f22726..32d12466f41a 100644
--- a/x11-toolkits/gal/Makefile
+++ b/x11-toolkits/gal/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gal
 PORTVERSION=	0.24
 PORTREVISION=	6
 CATEGORIES?=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.24
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER?=	gnome@FreeBSD.org
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index 7adc4706dd12..2e29eed1026c 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	gal2
 PORTVERSION=	2.5.3
 PORTREVISION?=	6
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.5
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
diff --git a/x11-toolkits/gnome-sharp20/Makefile b/x11-toolkits/gnome-sharp20/Makefile
index e06bfd277e11..1a27b7f2bedf 100644
--- a/x11-toolkits/gnome-sharp20/Makefile
+++ b/x11-toolkits/gnome-sharp20/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	gnome-sharp
 PORTVERSION=	2.16.0
 PORTREVISION=	5
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.16
+MASTER_SITES=	GNOME
 
 MAINTAINER=	bsd-sharp@googlegroups.com
 COMMENT=	GNOME interfaces for the .NET runtime
diff --git a/x11-toolkits/gob/Makefile b/x11-toolkits/gob/Makefile
index fd6738881326..e28969ac9ac4 100644
--- a/x11-toolkits/gob/Makefile
+++ b/x11-toolkits/gob/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gob
 PORTVERSION=	1.0.12
 PORTREVISION=	4
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gob/1.0
+MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A preprocessor for making GTK+ objects with inline C
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index 9f57236d6067..267fa076f6a1 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gtk
 PORTVERSION=	1.2.10
 PORTREVISION=	20
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/gtk+/1.2
 DISTNAME=	gtk+-${PORTVERSION}
 
diff --git a/x11-toolkits/gtkglarea2/Makefile b/x11-toolkits/gtkglarea2/Makefile
index 1d4d590b6d7d..f8611fdb5732 100644
--- a/x11-toolkits/gtkglarea2/Makefile
+++ b/x11-toolkits/gtkglarea2/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gtkglarea
 PORTVERSION=	1.99.0
 PORTREVISION=	11
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gtkglarea/1.99
+MASTER_SITES=	GNOME
 DISTNAME=	gtkglarea-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11-toolkits/gtkmm12/Makefile b/x11-toolkits/gtkmm12/Makefile
index 7a91844e0bd2..d9fbaad32ff7 100644
--- a/x11-toolkits/gtkmm12/Makefile
+++ b/x11-toolkits/gtkmm12/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gtkmm
 PORTVERSION=	1.2.8
 PORTREVISION=	8
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gtkmm/1.2
+MASTER_SITES=	GNOME
 #DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index 0e4df50f30ff..df949e7e4f98 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gtkmm
 PORTVERSION=	2.2.12
 PORTREVISION?=	9
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME} \
+MASTER_SITES=	GNOME \
 		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2 \
 		gtkmm
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index 0e4df50f30ff..df949e7e4f98 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gtkmm
 PORTVERSION=	2.2.12
 PORTREVISION?=	9
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME} \
+MASTER_SITES=	GNOME \
 		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2 \
 		gtkmm
diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile
index ce200ca4d53a..d5d98534f877 100644
--- a/x11-toolkits/gtksourceview/Makefile
+++ b/x11-toolkits/gtksourceview/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	gtksourceview
 PORTVERSION=	1.8.5
 PORTREVISION?=	4
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile
index 0b4273c563c1..728749e891c7 100644
--- a/x11-toolkits/gtksourceview2/Makefile
+++ b/x11-toolkits/gtksourceview2/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	gtksourceview2
 PORTVERSION=	2.4.2
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
diff --git a/x11-toolkits/hippo-canvas/Makefile b/x11-toolkits/hippo-canvas/Makefile
index d7b0d21c82e4..a33f775cac8c 100644
--- a/x11-toolkits/hippo-canvas/Makefile
+++ b/x11-toolkits/hippo-canvas/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	hippo-canvas
 PORTVERSION=	0.3.0
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 
 MAINTAINER=	wahjava@gmail.com
 COMMENT=	A client stacker popup widget for GTK+ toolkit
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index 0d2ef1f50b22..9e7cf34c38d6 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	libbonoboui
 PORTVERSION=	2.24.0
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/libbonobouimm/Makefile b/x11-toolkits/libbonobouimm/Makefile
index 55623e746f6f..cb2f6dc0cefc 100644
--- a/x11-toolkits/libbonobouimm/Makefile
+++ b/x11-toolkits/libbonobouimm/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	libbonobouimm
 PORTVERSION=	1.3.7
 PORTREVISION=	10
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	bland@FreeBSD.org
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 4447b49a9ada..ce25a2af6bef 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	libgnomeprintui
 PORTVERSION=	2.18.3
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/libgnomeprintuimm/Makefile b/x11-toolkits/libgnomeprintuimm/Makefile
index 3df2d7c9c87b..e0f4124f3f5c 100644
--- a/x11-toolkits/libgnomeprintuimm/Makefile
+++ b/x11-toolkits/libgnomeprintuimm/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	libgnomeprintuimm
 PORTVERSION=	2.5.2
 PORTREVISION=	5
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.5
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	bland@FreeBSD.org
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 8a23c20c90a8..d4435b4f1f90 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	libgnomeui
 PORTVERSION=	2.24.0
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile
index a04438039e09..2bbc2d76bc11 100644
--- a/x11-toolkits/libgnomeuimm26/Makefile
+++ b/x11-toolkits/libgnomeuimm26/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	libgnomeuimm
 PORTVERSION=	2.24.0
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	bland@FreeBSD.org
diff --git a/x11-toolkits/libpanelappletmm/Makefile b/x11-toolkits/libpanelappletmm/Makefile
index ab6f23e01e51..11c74ea588e4 100644
--- a/x11-toolkits/libpanelappletmm/Makefile
+++ b/x11-toolkits/libpanelappletmm/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	libpanelappletmm
 PORTVERSION=	2.22.0
 PORTREVISION=	2
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	bland@FreeBSD.org
diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile
index d8c55d5f4c72..f5f93bf21723 100644
--- a/x11-toolkits/libzvt/Makefile
+++ b/x11-toolkits/libzvt/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	libzvt
 PORTVERSION=	2.0.1
 PORTREVISION=	17
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.0
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/pangomm/Makefile b/x11-toolkits/pangomm/Makefile
index d1ddb461a5e6..e8c61109ead6 100644
--- a/x11-toolkits/pangomm/Makefile
+++ b/x11-toolkits/pangomm/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	pangomm
 PORTVERSION=	2.14.1
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
index f2de7e8508c8..51ddec0080ba 100644
--- a/x11-toolkits/py-gnome-desktop/Makefile
+++ b/x11-toolkits/py-gnome-desktop/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	gnome
 PORTVERSION=	2.24.1
 CATEGORIES=	x11-toolkits python gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/gnome-python-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	-desktop
diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile
index 655c04591ba7..e494fff56031 100644
--- a/x11-toolkits/py-gnome-extras/Makefile
+++ b/x11-toolkits/py-gnome-extras/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	gnome
 PORTVERSION=	2.19.1
 PORTREVISION=	5
 CATEGORIES=	x11-toolkits python gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/gnome-python-extras/${PORTVERSION:C/..$//}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	-extras
diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile
index eda1d1cdce74..8cf336e32251 100644
--- a/x11-toolkits/py-gnome/Makefile
+++ b/x11-toolkits/py-gnome/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	py-gnome
 PORTVERSION=	1.4.4
 PORTREVISION=	9
 CATEGORIES=	x11-toolkits python gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 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 c65979fa2da9..1b9cd91b4e0c 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	gnome
 PORTVERSION=	2.22.3
 CATEGORIES=	x11-toolkits python gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/gnome-python/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	gnome-python-${PORTVERSION}
diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile
index e848a46f6e25..d31d1347ffc9 100644
--- a/x11-toolkits/py-gtk/Makefile
+++ b/x11-toolkits/py-gtk/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	py-gtk
 PORTVERSION=	0.6.11
 PORTREVISION=	5
 CATEGORIES=	x11-toolkits python
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-python/1.4
+MASTER_SITES=	GNOME
 DISTNAME=	gnome-python-1.4.4
 DIST_SUBDIR=	gnome
 
diff --git a/x11-toolkits/py-gtksourceview/Makefile b/x11-toolkits/py-gtksourceview/Makefile
index 0606876c2ea6..837371f7d625 100644
--- a/x11-toolkits/py-gtksourceview/Makefile
+++ b/x11-toolkits/py-gtksourceview/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	gtksourceview
 PORTVERSION=	2.4.0
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/pygtksourceview/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pygtksourceview-${PORTVERSION}
diff --git a/x11-toolkits/rep-gtk/Makefile b/x11-toolkits/rep-gtk/Makefile
index 3316fd61e708..22521c220d03 100644
--- a/x11-toolkits/rep-gtk/Makefile
+++ b/x11-toolkits/rep-gtk/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	rep-gtk
 PORTVERSION=	0.15
 PORTREVISION=	7
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/rep-gtk/0.15
+MASTER_SITES=	GNOME
 #DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 4bb93dfea0aa..1cfde8801020 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	gnome-libs
 PORTVERSION=	1.4.2
 PORTREVISION=	12
 CATEGORIES?=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-libs/1.4
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER?=	gnome@FreeBSD.org
diff --git a/x11/libgnome-java/Makefile b/x11/libgnome-java/Makefile
index 8f3fb96282b4..313cc32f4dbe 100644
--- a/x11/libgnome-java/Makefile
+++ b/x11/libgnome-java/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	libgnome-java
 PORTVERSION=	2.12.7
 PORTREVISION=	2
 CATEGORIES=	x11 java
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.12
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 71217e722faf..8e3e7dbd5a43 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	libgnome
 PORTVERSION=	2.24.1
 PORTREVISION?=	0
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile
index 869959c7147e..4906549ec1b6 100644
--- a/x11/libgnomemm26/Makefile
+++ b/x11/libgnomemm26/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	libgnomemm
 PORTVERSION=	2.24.0
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	bland@FreeBSD.org
diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile
index 721176f15c72..9e2477e0f068 100644
--- a/x11/startup-notification/Makefile
+++ b/x11/startup-notification/Makefile
@@ -9,9 +9,8 @@ PORTNAME=	startup-notification
 PORTVERSION=	0.9
 PORTREVISION=	2
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME} \
+MASTER_SITES=	GNOME \
 		http://www.freedesktop.org/software/startup-notification/releases/
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org