34 files changed, 34 insertions, 63 deletions

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