From pgollucci@riderwayinc.com  Thu Jul  3 19:27:19 2008
Return-Path: <pgollucci@riderwayinc.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 55B9F1065670;
	Thu,  3 Jul 2008 19:27:19 +0000 (UTC)
	(envelope-from pgollucci@riderwayinc.com)
Received: from riderwayinc.com (riderwayinc.com [74.93.213.161])
	by mx1.freebsd.org (Postfix) with ESMTP id 530318FC15;
	Thu,  3 Jul 2008 19:27:18 +0000 (UTC)
	(envelope-from pgollucci@riderwayinc.com)
Received: from riderwayinc.com (localhost [127.0.0.1])
	by riderwayinc.com (8.14.2/8.14.2) with ESMTP id m63JRADX018205
	(version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO);
	Thu, 3 Jul 2008 19:27:10 GMT
	(envelope-from pgollucci@riderwayinc.com)
Received: (from pgollucci@localhost)
	by riderwayinc.com (8.14.2/8.14.2/Submit) id m63JR5uE018204;
	Thu, 3 Jul 2008 19:27:05 GMT
	(envelope-from pgollucci)
Message-Id: <200807031927.m63JR5uE018204@riderwayinc.com>
Date: Thu, 3 Jul 2008 19:27:05 GMT
From: Philip Gollucci <pgollucci@p6m7g8.com>
Reply-To: Philip Gollucci <pgollucci@p6m7g8.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: araujo@freebsd.org
Subject: GNOME Macro (178 Ports)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         125243
>Category:       ports
>Synopsis:       GNOME Macro (178 Ports)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    araujo
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 03 19:30:10 UTC 2008
>Closed-Date:    Mon Feb 02 01:37:50 UTC 2009
>Last-Modified:  Mon Feb  2 01:40:08 UTC 2009
>Originator:     Philip Gollucci
>Release:        FreeBSD 7.0-RELEASE amd64
>Organization:
Riderway Inc.
>Environment:
System: FreeBSD riderwayinc.com 7.0-RELEASE FreeBSD 7.0-RELEASE #2: Thu Feb 28 21:20:48 UTC 2008 root@elektra.rws:/x1-local/obj/usr/src/sys/MAGNETO amd64
>Description:
- use GNOME macro nearly everywhere
- convert places that still need MASTER_SITE_SUBDIR to use the PORTVERSION replacement magic if possible
>How-To-Repeat:
>Fix:

--- gnome3.diff begins here ---
Index: accessibility/at-poke/Makefile
===================================================================
RCS file: /home/ncvs/ports/accessibility/at-poke/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- accessibility/at-poke/Makefile	6 Jun 2008 12:59:51 -0000	1.5
+++ accessibility/at-poke/Makefile	3 Jul 2008 19:21:25 -0000
@@ -9,8 +9,7 @@
 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
Index: accessibility/at-spi/Makefile
===================================================================
RCS file: /home/ncvs/ports/accessibility/at-spi/Makefile,v
retrieving revision 1.65
diff -u -r1.65 Makefile
--- accessibility/at-spi/Makefile	6 Jun 2008 14:33:35 -0000	1.65
+++ accessibility/at-spi/Makefile	3 Jul 2008 19:21:26 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	1.22.1
 PORTREVISION?=	2
 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
Index: accessibility/atk/Makefile
===================================================================
RCS file: /home/ncvs/ports/accessibility/atk/Makefile,v
retrieving revision 1.54
diff -u -r1.54 Makefile
--- accessibility/atk/Makefile	6 Jun 2008 12:59:51 -0000	1.54
+++ accessibility/atk/Makefile	3 Jul 2008 19:21:28 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	1.22.0
 PORTREVISION?=	1
 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
Index: accessibility/dasher/Makefile
===================================================================
RCS file: /home/ncvs/ports/accessibility/dasher/Makefile,v
retrieving revision 1.44
diff -u -r1.44 Makefile
--- accessibility/dasher/Makefile	6 Jun 2008 12:59:51 -0000	1.44
+++ accessibility/dasher/Makefile	3 Jul 2008 19:21:29 -0000
@@ -11,8 +11,7 @@
 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
Index: accessibility/gail/Makefile
===================================================================
RCS file: /home/ncvs/ports/accessibility/gail/Makefile,v
retrieving revision 1.67
diff -u -r1.67 Makefile
--- accessibility/gail/Makefile	1 Jul 2008 00:50:02 -0000	1.67
+++ accessibility/gail/Makefile	3 Jul 2008 19:21:30 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	1.22.3
 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
Index: accessibility/gnome-mag/Makefile
===================================================================
RCS file: /home/ncvs/ports/accessibility/gnome-mag/Makefile,v
retrieving revision 1.45
diff -u -r1.45 Makefile
--- accessibility/gnome-mag/Makefile	6 Jun 2008 12:59:52 -0000	1.45
+++ accessibility/gnome-mag/Makefile	3 Jul 2008 19:21:31 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	0.14.10
 PORTREVISION=	2
 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=	gnome@FreeBSD.org
Index: accessibility/gnome-speech/Makefile
===================================================================
RCS file: /home/ncvs/ports/accessibility/gnome-speech/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- accessibility/gnome-speech/Makefile	17 Jun 2008 22:13:03 -0000	1.37
+++ accessibility/gnome-speech/Makefile	3 Jul 2008 19:21:33 -0000
@@ -9,8 +9,7 @@
 PORTNAME=	gnome-speech
 PORTVERSION=	0.4.20
 CATEGORIES=	accessibility 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
Index: accessibility/gnopernicus/Makefile
===================================================================
RCS file: /home/ncvs/ports/accessibility/gnopernicus/Makefile,v
retrieving revision 1.38
diff -u -r1.38 Makefile
--- accessibility/gnopernicus/Makefile	6 Jun 2008 12:59:52 -0000	1.38
+++ accessibility/gnopernicus/Makefile	3 Jul 2008 19:21:34 -0000
@@ -10,8 +10,7 @@
 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
Index: accessibility/gok/Makefile
===================================================================
RCS file: /home/ncvs/ports/accessibility/gok/Makefile,v
retrieving revision 1.39
diff -u -r1.39 Makefile
--- accessibility/gok/Makefile	6 Jun 2008 12:59:52 -0000	1.39
+++ accessibility/gok/Makefile	3 Jul 2008 19:21:35 -0000
@@ -11,8 +11,7 @@
 PORTREVISION=	2
 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
Index: audio/esound/Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/esound/Makefile,v
retrieving revision 1.69
diff -u -r1.69 Makefile
--- audio/esound/Makefile	20 Mar 2008 09:19:34 -0000	1.69
+++ audio/esound/Makefile	3 Jul 2008 19:21:36 -0000
@@ -9,8 +9,7 @@
 PORTVERSION=	0.2.38
 PORTREVISION=	0
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.2
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
Index: audio/goobox/Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/goobox/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- audio/goobox/Makefile	6 Jun 2008 13:06:41 -0000	1.32
+++ audio/goobox/Makefile	3 Jul 2008 19:21:37 -0000
@@ -10,8 +10,7 @@
 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
Index: audio/rhythmbox/Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/rhythmbox/Makefile,v
retrieving revision 1.107
diff -u -r1.107 Makefile
--- audio/rhythmbox/Makefile	6 Jun 2008 13:07:00 -0000	1.107
+++ audio/rhythmbox/Makefile	3 Jul 2008 19:21:40 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	0.10.1
 PORTREVISION=	9
 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
Index: audio/rhythmbox-devel/Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/rhythmbox-devel/Makefile,v
retrieving revision 1.108
diff -u -r1.108 Makefile
--- audio/rhythmbox-devel/Makefile	6 Jun 2008 13:07:01 -0000	1.108
+++ audio/rhythmbox-devel/Makefile	3 Jul 2008 19:21:41 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	0.11.5
 PORTREVISION=	2
 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
Index: databases/glom/Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/glom/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- databases/glom/Makefile	6 Jun 2008 13:16:47 -0000	1.15
+++ databases/glom/Makefile	3 Jul 2008 19:21:42 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	1.6.17
 PORTREVISION=	1
 CATEGORIES=	databases gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	GNOME database designer and user interface
Index: databases/gnome-db/Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/gnome-db/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- databases/gnome-db/Makefile	6 Jun 2008 13:16:47 -0000	1.42
+++ databases/gnome-db/Makefile	3 Jul 2008 19:21:43 -0000
@@ -10,8 +10,7 @@
 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
Index: databases/libgda/Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/libgda/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- databases/libgda/Makefile	6 Jun 2008 13:16:51 -0000	1.42
+++ databases/libgda/Makefile	3 Jul 2008 19:21:44 -0000
@@ -10,8 +10,7 @@
 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
Index: databases/libgda2/Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/libgda2/Makefile,v
retrieving revision 1.85
diff -u -r1.85 Makefile
--- databases/libgda2/Makefile	10 Jun 2008 04:57:45 -0000	1.85
+++ databases/libgda2/Makefile	3 Jul 2008 19:21:46 -0000
@@ -11,7 +11,7 @@
 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
Index: databases/libgda3/Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/libgda3/Makefile,v
retrieving revision 1.87
diff -u -r1.87 Makefile
--- databases/libgda3/Makefile	6 Jun 2008 13:16:51 -0000	1.87
+++ databases/libgda3/Makefile	3 Jul 2008 19:21:47 -0000
@@ -10,8 +10,8 @@
 PORTVERSION?=	3.0.4
 PORTREVISION?=	1
 CATEGORIES=	databases gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:R}
+MASTER_SITES=	GNOME
+MASTER_SITE_SUBDIR=    sources/${PORTNAME:S/3$//}/${PORTVERSION:R}
 DISTNAME=	libgda-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
Index: databases/libgdamm/Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/libgdamm/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- databases/libgdamm/Makefile	6 Jun 2008 13:16:52 -0000	1.24
+++ databases/libgdamm/Makefile	3 Jul 2008 19:21:48 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	3.0.0
 PORTREVISION=	1
 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
Index: databases/libgnomedb/Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/libgnomedb/Makefile,v
retrieving revision 1.55
diff -u -r1.55 Makefile
--- databases/libgnomedb/Makefile	10 Jun 2008 04:57:45 -0000	1.55
+++ databases/libgnomedb/Makefile	3 Jul 2008 19:21:49 -0000
@@ -10,8 +10,7 @@
 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
Index: deskutils/gnome-utils/Makefile
===================================================================
RCS file: /home/ncvs/ports/deskutils/gnome-utils/Makefile,v
retrieving revision 1.96
diff -u -r1.96 Makefile
--- deskutils/gnome-utils/Makefile	6 Jun 2008 13:18:16 -0000	1.96
+++ deskutils/gnome-utils/Makefile	3 Jul 2008 19:21:50 -0000
@@ -11,8 +11,7 @@
 PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	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
Index: deskutils/ontv/Makefile
===================================================================
RCS file: /home/ncvs/ports/deskutils/ontv/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- deskutils/ontv/Makefile	6 Jun 2008 13:18:27 -0000	1.6
+++ deskutils/ontv/Makefile	3 Jul 2008 19:21:52 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	2.4.0
 PORTREVISION=	3
 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
Index: deskutils/planner/Makefile
===================================================================
RCS file: /home/ncvs/ports/deskutils/planner/Makefile,v
retrieving revision 1.49
diff -u -r1.49 Makefile
--- deskutils/planner/Makefile	25 Jun 2008 05:32:57 -0000	1.49
+++ deskutils/planner/Makefile	3 Jul 2008 19:21:53 -0000
@@ -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
Index: devel/ORBit/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/ORBit/Makefile,v
retrieving revision 1.85
diff -u -r1.85 Makefile
--- devel/ORBit/Makefile	6 Jun 2008 13:20:58 -0000	1.85
+++ devel/ORBit/Makefile	3 Jul 2008 19:21:54 -0000
@@ -9,8 +9,7 @@
 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
Index: devel/ORBit2/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/ORBit2/Makefile,v
retrieving revision 1.134
diff -u -r1.134 Makefile
--- devel/ORBit2/Makefile	6 Jun 2008 13:20:58 -0000	1.134
+++ devel/ORBit2/Makefile	3 Jul 2008 19:21:55 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	2.14.13
 PORTREVISION?=	1
 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
Index: devel/bonobo/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/bonobo/Makefile,v
retrieving revision 1.73
diff -u -r1.73 Makefile
--- devel/bonobo/Makefile	6 Jun 2008 13:21:01 -0000	1.73
+++ devel/bonobo/Makefile	3 Jul 2008 19:21:57 -0000
@@ -10,8 +10,7 @@
 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
Index: devel/bonobo-conf/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/bonobo-conf/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- devel/bonobo-conf/Makefile	6 Jun 2008 13:21:01 -0000	1.31
+++ devel/bonobo-conf/Makefile	3 Jul 2008 19:21:58 -0000
@@ -9,8 +9,7 @@
 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
Index: devel/gconf/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/gconf/Makefile,v
retrieving revision 1.54
diff -u -r1.54 Makefile
--- devel/gconf/Makefile	6 Jun 2008 13:21:11 -0000	1.54
+++ devel/gconf/Makefile	3 Jul 2008 19:21:59 -0000
@@ -10,8 +10,8 @@
 PORTVERSION=	1.0.9
 PORTREVISION=	14
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/GConf/1.0
+MASTER_SITES=	GNOME
+MASTER_SITE_SUBDIR=	sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	GConf-${PORTVERSION}
 DIST_SUBDIR=	gnome
 
Index: devel/gconf2/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/gconf2/Makefile,v
retrieving revision 1.81
diff -u -r1.81 Makefile
--- devel/gconf2/Makefile	6 Jun 2008 13:21:12 -0000	1.81
+++ devel/gconf2/Makefile	3 Jul 2008 19:22:00 -0000
@@ -10,7 +10,7 @@
 PORTVERSION=	2.22.0
 PORTREVISION?=	1
 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
Index: devel/gconfmm/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/gconfmm/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- devel/gconfmm/Makefile	6 Jun 2008 13:21:12 -0000	1.17
+++ devel/gconfmm/Makefile	3 Jul 2008 19:22:01 -0000
@@ -9,8 +9,7 @@
 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
Index: devel/gconfmm26/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/gconfmm26/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- devel/gconfmm26/Makefile	6 Jun 2008 13:21:12 -0000	1.28
+++ devel/gconfmm26/Makefile	3 Jul 2008 19:22:03 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	2.22.0
 PORTREVISION=	2
 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
Index: devel/glade2/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/glade2/Makefile,v
retrieving revision 1.77
diff -u -r1.77 Makefile
--- devel/glade2/Makefile	6 Jun 2008 13:21:13 -0000	1.77
+++ devel/glade2/Makefile	3 Jul 2008 19:22:04 -0000
@@ -10,8 +10,7 @@
 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
 
Index: devel/glib12/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/glib12/Makefile,v
retrieving revision 1.63
diff -u -r1.63 Makefile
--- devel/glib12/Makefile	29 Jan 2007 23:51:51 -0000	1.63
+++ devel/glib12/Makefile	3 Jul 2008 19:22:05 -0000
@@ -9,8 +9,7 @@
 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)
Index: devel/glib20/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/glib20/Makefile,v
retrieving revision 1.151
diff -u -r1.151 Makefile
--- devel/glib20/Makefile	2 Jul 2008 03:26:32 -0000	1.151
+++ devel/glib20/Makefile	3 Jul 2008 19:22:06 -0000
@@ -10,13 +10,7 @@
 PORTVERSION=	2.16.4
 PORTREVISION?=	0
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
-		ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \
-		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
-		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
-		http://www.ameth.org/gimp/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
-MASTER_SITE_SUBDIR=	gtk/v${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME 
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
Index: devel/glibmm/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/glibmm/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- devel/glibmm/Makefile	17 Jun 2008 22:28:25 -0000	1.41
+++ devel/glibmm/Makefile	3 Jul 2008 19:22:08 -0000
@@ -11,8 +11,7 @@
 PORTREVISION?=	0
 PORTEPOCH=	1
 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
Index: devel/gnome-common/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/gnome-common/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- devel/gnome-common/Makefile	24 Oct 2007 23:35:15 -0000	1.22
+++ devel/gnome-common/Makefile	3 Jul 2008 19:22:09 -0000
@@ -9,8 +9,7 @@
 PORTNAME=	gnome-common
 PORTVERSION=	2.20.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
Index: devel/gnome-crash/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/gnome-crash/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- devel/gnome-crash/Makefile	6 Jun 2008 13:21:14 -0000	1.21
+++ devel/gnome-crash/Makefile	3 Jul 2008 19:22:10 -0000
@@ -9,8 +9,7 @@
 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
Index: devel/gnome-vfs/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/gnome-vfs/Makefile,v
retrieving revision 1.134
diff -u -r1.134 Makefile
--- devel/gnome-vfs/Makefile	6 Jun 2008 14:33:36 -0000	1.134
+++ devel/gnome-vfs/Makefile	3 Jul 2008 19:22:11 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	2.22.0
 PORTREVISION?=	2
 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
Index: devel/gnome-vfs-monikers/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/gnome-vfs-monikers/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- devel/gnome-vfs-monikers/Makefile	6 Jun 2008 13:21:14 -0000	1.4
+++ devel/gnome-vfs-monikers/Makefile	3 Jul 2008 19:22:12 -0000
@@ -9,8 +9,7 @@
 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
Index: devel/gnome-vfs1/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/gnome-vfs1/Makefile,v
retrieving revision 1.58
diff -u -r1.58 Makefile
--- devel/gnome-vfs1/Makefile	6 Jun 2008 13:21:15 -0000	1.58
+++ devel/gnome-vfs1/Makefile	3 Jul 2008 19:22:13 -0000
@@ -9,8 +9,7 @@
 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
 
Index: devel/gnome-vfsmm/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/gnome-vfsmm/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- devel/gnome-vfsmm/Makefile	6 Jun 2008 13:21:15 -0000	1.31
+++ devel/gnome-vfsmm/Makefile	3 Jul 2008 19:22:15 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	2.22.0
 PORTREVISION=	1
 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
Index: devel/gob2/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/gob2/Makefile,v
retrieving revision 1.46
diff -u -r1.46 Makefile
--- devel/gob2/Makefile	6 Jun 2008 13:21:15 -0000	1.46
+++ devel/gob2/Makefile	3 Jul 2008 19:22:16 -0000
@@ -9,8 +9,7 @@
 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
Index: devel/goffice04/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/goffice04/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- devel/goffice04/Makefile	6 Jun 2008 13:21:16 -0000	1.23
+++ devel/goffice04/Makefile	3 Jul 2008 19:22:17 -0000
@@ -11,8 +11,7 @@
 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
Index: devel/goffice1/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/goffice1/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- devel/goffice1/Makefile	6 Jun 2008 13:21:16 -0000	1.16
+++ devel/goffice1/Makefile	3 Jul 2008 19:22:18 -0000
@@ -10,8 +10,7 @@
 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
Index: devel/gtkmozedit/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/gtkmozedit/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- devel/gtkmozedit/Makefile	6 Jun 2008 13:21:17 -0000	1.14
+++ devel/gtkmozedit/Makefile	3 Jul 2008 19:22:20 -0000
@@ -9,8 +9,7 @@
 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
Index: devel/gtranslator/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/gtranslator/Makefile,v
retrieving revision 1.57
diff -u -r1.57 Makefile
--- devel/gtranslator/Makefile	6 Jun 2008 13:21:17 -0000	1.57
+++ devel/gtranslator/Makefile	3 Jul 2008 19:22:21 -0000
@@ -10,8 +10,7 @@
 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
Index: devel/libIDL/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/libIDL/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- devel/libIDL/Makefile	6 Jun 2008 13:21:24 -0000	1.47
+++ devel/libIDL/Makefile	3 Jul 2008 19:22:22 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	0.8.10
 PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.8
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
Index: devel/libbonobo/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/libbonobo/Makefile,v
retrieving revision 1.63
diff -u -r1.63 Makefile
--- devel/libbonobo/Makefile	6 Jun 2008 13:21:25 -0000	1.63
+++ devel/libbonobo/Makefile	3 Jul 2008 19:22:23 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	2.22.0
 PORTREVISION?=	1
 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
Index: devel/libbonobomm/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/libbonobomm/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- devel/libbonobomm/Makefile	6 Jun 2008 13:21:25 -0000	1.23
+++ devel/libbonobomm/Makefile	3 Jul 2008 19:22:24 -0000
@@ -9,8 +9,7 @@
 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
Index: devel/libglade/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/libglade/Makefile,v
retrieving revision 1.43
diff -u -r1.43 Makefile
--- devel/libglade/Makefile	6 Jun 2008 13:21:26 -0000	1.43
+++ devel/libglade/Makefile	3 Jul 2008 19:22:26 -0000
@@ -9,8 +9,7 @@
 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
Index: devel/libglade-java/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/libglade-java/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- devel/libglade-java/Makefile	6 Jun 2008 13:21:26 -0000	1.19
+++ devel/libglade-java/Makefile	3 Jul 2008 19:22:27 -0000
@@ -10,8 +10,7 @@
 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
Index: devel/libglade2/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/libglade2/Makefile,v
retrieving revision 1.76
diff -u -r1.76 Makefile
--- devel/libglade2/Makefile	6 Jun 2008 13:21:26 -0000	1.76
+++ devel/libglade2/Makefile	3 Jul 2008 19:22:28 -0000
@@ -10,7 +10,7 @@
 PORTVERSION=	2.6.2
 PORTREVISION?=	1
 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
Index: devel/libglademm24/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/libglademm24/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- devel/libglademm24/Makefile	6 Jun 2008 13:21:26 -0000	1.29
+++ devel/libglademm24/Makefile	3 Jul 2008 19:22:29 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	2.6.6
 PORTREVISION=	1
 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
Index: devel/libole2/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/libole2/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- devel/libole2/Makefile	1 Feb 2007 02:41:28 -0000	1.21
+++ devel/libole2/Makefile	3 Jul 2008 19:22:31 -0000
@@ -9,8 +9,7 @@
 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
Index: devel/libsoup22/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/libsoup22/Makefile,v
retrieving revision 1.60
diff -u -r1.60 Makefile
--- devel/libsoup22/Makefile	6 Jun 2008 13:21:29 -0000	1.60
+++ devel/libsoup22/Makefile	3 Jul 2008 19:22:32 -0000
@@ -10,8 +10,7 @@
 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
Index: devel/orbitcpp/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/orbitcpp/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- devel/orbitcpp/Makefile	6 Jun 2008 13:21:36 -0000	1.34
+++ devel/orbitcpp/Makefile	3 Jul 2008 19:22:33 -0000
@@ -9,8 +9,7 @@
 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
Index: devel/present/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/present/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- devel/present/Makefile	6 Jun 2008 13:21:43 -0000	1.9
+++ devel/present/Makefile	3 Jul 2008 19:22:34 -0000
@@ -10,8 +10,7 @@
 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
Index: devel/py-gobject/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/py-gobject/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- devel/py-gobject/Makefile	29 Jun 2008 23:23:32 -0000	1.10
+++ devel/py-gobject/Makefile	3 Jul 2008 19:22:35 -0000
@@ -10,7 +10,7 @@
 PORTVERSION=	2.14.2
 PORTREVISION=	2
 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}
Index: devel/py-orbit/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/py-orbit/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- devel/py-orbit/Makefile	6 Jun 2008 13:21:45 -0000	1.21
+++ devel/py-orbit/Makefile	3 Jul 2008 19:22:37 -0000
@@ -9,7 +9,7 @@
 PORTVERSION=	2.14.3
 PORTREVISION=	1
 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}
Index: devel/soup/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/soup/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- devel/soup/Makefile	6 Jun 2008 13:21:55 -0000	1.21
+++ devel/soup/Makefile	3 Jul 2008 19:22:38 -0000
@@ -9,8 +9,7 @@
 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
Index: editors/gedit/Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/gedit/Makefile,v
retrieving revision 1.72
diff -u -r1.72 Makefile
--- editors/gedit/Makefile	6 Jun 2008 13:25:47 -0000	1.72
+++ editors/gedit/Makefile	3 Jul 2008 19:22:39 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	2.22.3
 PORTREVISION=	1
 CATEGORIES=	editors 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
Index: editors/mlview/Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/mlview/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- editors/mlview/Makefile	6 Jun 2008 13:25:51 -0000	1.29
+++ editors/mlview/Makefile	3 Jul 2008 19:22:40 -0000
@@ -9,8 +9,7 @@
 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
Index: games/atomix/Makefile
===================================================================
RCS file: /home/ncvs/ports/games/atomix/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- games/atomix/Makefile	6 Jun 2008 13:31:16 -0000	1.31
+++ games/atomix/Makefile	3 Jul 2008 19:22:41 -0000
@@ -10,8 +10,7 @@
 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
Index: games/gnome-games-extra-data/Makefile
===================================================================
RCS file: /home/ncvs/ports/games/gnome-games-extra-data/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- games/gnome-games-extra-data/Makefile	6 Jun 2008 13:31:26 -0000	1.15
+++ games/gnome-games-extra-data/Makefile	3 Jul 2008 19:22:43 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	2.22.0
 PORTREVISION=	2
 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
Index: games/gnomechess/Makefile
===================================================================
RCS file: /home/ncvs/ports/games/gnomechess/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- games/gnomechess/Makefile	6 Jun 2008 13:31:27 -0000	1.21
+++ games/gnomechess/Makefile	3 Jul 2008 19:22:44 -0000
@@ -9,7 +9,7 @@
 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}
 
Index: games/gtetrinet/Makefile
===================================================================
RCS file: /home/ncvs/ports/games/gtetrinet/Makefile,v
retrieving revision 1.46
diff -u -r1.46 Makefile
--- games/gtetrinet/Makefile	6 Jun 2008 13:31:29 -0000	1.46
+++ games/gtetrinet/Makefile	3 Jul 2008 19:22:45 -0000
@@ -8,8 +8,7 @@
 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
Index: graphics/dia/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/dia/Makefile,v
retrieving revision 1.69
diff -u -r1.69 Makefile
--- graphics/dia/Makefile	6 Jun 2008 13:34:17 -0000	1.69
+++ graphics/dia/Makefile	3 Jul 2008 19:22:46 -0000
@@ -11,8 +11,7 @@
 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
Index: graphics/electriceyes/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/electriceyes/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- graphics/electriceyes/Makefile	6 Jun 2008 13:34:19 -0000	1.41
+++ graphics/electriceyes/Makefile	3 Jul 2008 19:22:48 -0000
@@ -9,8 +9,8 @@
 PORTVERSION=	0.3.12
 PORTREVISION=	6
 CATEGORIES=	graphics gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/ee/0.3
+MASTER_SITES=	GNOME
+MASTER_SITE_SUBDIR=	sources/ee/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	ee-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
Index: graphics/eog/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/eog/Makefile,v
retrieving revision 1.62
diff -u -r1.62 Makefile
--- graphics/eog/Makefile	1 Jul 2008 17:05:45 -0000	1.62
+++ graphics/eog/Makefile	3 Jul 2008 19:22:49 -0000
@@ -9,8 +9,7 @@
 PORTNAME=	eog
 PORTVERSION=	2.22.3
 CATEGORIES=	graphics gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
Index: graphics/f-spot/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/f-spot/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- graphics/f-spot/Makefile	6 Jun 2008 13:34:21 -0000	1.29
+++ graphics/f-spot/Makefile	3 Jul 2008 19:22:50 -0000
@@ -11,8 +11,7 @@
 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-list@forge.novell.com
 COMMENT=	Personal photo management to the GNOME desktop
Index: graphics/gdk-pixbuf/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/gdk-pixbuf/Makefile,v
retrieving revision 1.52
diff -u -r1.52 Makefile
--- graphics/gdk-pixbuf/Makefile	6 Jun 2008 13:34:24 -0000	1.52
+++ graphics/gdk-pixbuf/Makefile	3 Jul 2008 19:22:51 -0000
@@ -9,8 +9,7 @@
 PORTVERSION=	0.22.0
 PORTREVISION=	8
 CATEGORIES?=	graphics
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gdk-pixbuf/0.22
+MASTER_SITES=	GNOME
 DISTNAME=	gdk-pixbuf-${PORTVERSION}
 DIST_SUBDIR=	gnome
 
Index: graphics/gthumb/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/gthumb/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- graphics/gthumb/Makefile	6 Jun 2008 13:34:32 -0000	1.41
+++ graphics/gthumb/Makefile	3 Jul 2008 19:22:52 -0000
@@ -9,8 +9,7 @@
 PORTVERSION=	2.10.8
 PORTREVISION=	2
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.10
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	pav@FreeBSD.org
Index: graphics/imlib/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/imlib/Makefile,v
retrieving revision 1.103
diff -u -r1.103 Makefile
--- graphics/imlib/Makefile	6 Jun 2008 13:34:35 -0000	1.103
+++ graphics/imlib/Makefile	3 Jul 2008 19:22:54 -0000
@@ -10,8 +10,7 @@
 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
Index: graphics/libart_lgpl/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/libart_lgpl/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- graphics/libart_lgpl/Makefile	1 Feb 2008 04:27:17 -0000	1.41
+++ graphics/libart_lgpl/Makefile	3 Jul 2008 19:22:55 -0000
@@ -9,7 +9,7 @@
 PORTVERSION=	2.3.20
 PORTEPOCH=	1
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.3
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
Index: graphics/libgnomecanvasmm26/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/libgnomecanvasmm26/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- graphics/libgnomecanvasmm26/Makefile	6 Jun 2008 13:34:40 -0000	1.27
+++ graphics/libgnomecanvasmm26/Makefile	3 Jul 2008 19:22:56 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	2.22.0
 PORTREVISION=	2
 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
Index: graphics/librsvg2/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/librsvg2/Makefile,v
retrieving revision 1.67
diff -u -r1.67 Makefile
--- graphics/librsvg2/Makefile	6 Jun 2008 13:34:42 -0000	1.67
+++ graphics/librsvg2/Makefile	3 Jul 2008 19:22:57 -0000
@@ -10,7 +10,7 @@
 PORTVERSION=	2.22.2
 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
Index: graphics/passepartout/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/passepartout/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- graphics/passepartout/Makefile	6 Jun 2008 13:34:46 -0000	1.26
+++ graphics/passepartout/Makefile	3 Jul 2008 19:22:59 -0000
@@ -10,8 +10,7 @@
 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
Index: math/gcalctool/Makefile
===================================================================
RCS file: /home/ncvs/ports/math/gcalctool/Makefile,v
retrieving revision 1.71
diff -u -r1.71 Makefile
--- math/gcalctool/Makefile	29 Jun 2008 23:31:43 -0000	1.71
+++ math/gcalctool/Makefile	3 Jul 2008 19:23:00 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	5.22.3
 PORTEPOCH=	2
 CATEGORIES=	math gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
Index: math/gnumeric/Makefile
===================================================================
RCS file: /home/ncvs/ports/math/gnumeric/Makefile,v
retrieving revision 1.142
diff -u -r1.142 Makefile
--- math/gnumeric/Makefile	6 Jun 2008 13:43:58 -0000	1.142
+++ math/gnumeric/Makefile	3 Jul 2008 19:23:01 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	1.8.3
 PORTREVISION=	1
 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
Index: math/guppi/Makefile
===================================================================
RCS file: /home/ncvs/ports/math/guppi/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- math/guppi/Makefile	6 Jun 2008 13:43:58 -0000	1.34
+++ math/guppi/Makefile	3 Jul 2008 19:23:02 -0000
@@ -9,8 +9,8 @@
 PORTVERSION=	0.40.3
 PORTREVISION=	11
 CATEGORIES=	math gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/Guppi/0.40
+MASTER_SITES=	GNOME
+MASTER_SITE_SUBDIR=	sources/Guppi/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	Guppi-${PORTVERSION}
 
 MAINTAINER=	gahr@FreeBSD.org
Index: misc/bigboard/Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/bigboard/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- misc/bigboard/Makefile	6 Jun 2008 13:45:18 -0000	1.2
+++ misc/bigboard/Makefile	3 Jul 2008 19:23:03 -0000
@@ -9,8 +9,7 @@
 PORTVERSION=	0.5.34
 PORTREVISION=	1
 CATEGORIES=	misc
-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
Index: misc/gnome-mime-data/Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/gnome-mime-data/Makefile,v
retrieving revision 1.40
diff -u -r1.40 Makefile
--- misc/gnome-mime-data/Makefile	6 Jun 2008 13:45:24 -0000	1.40
+++ misc/gnome-mime-data/Makefile	3 Jul 2008 19:23:05 -0000
@@ -9,8 +9,7 @@
 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
 
Index: misc/gnome-user-docs/Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/gnome-user-docs/Makefile,v
retrieving revision 1.36
diff -u -r1.36 Makefile
--- misc/gnome-user-docs/Makefile	6 Jun 2008 13:45:24 -0000	1.36
+++ misc/gnome-user-docs/Makefile	3 Jul 2008 19:23:06 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	2.22.1
 PORTREVISION=	1
 CATEGORIES=	misc 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
Index: misc/pybliographer/Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/pybliographer/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- misc/pybliographer/Makefile	6 Jun 2008 13:45:36 -0000	1.34
+++ misc/pybliographer/Makefile	3 Jul 2008 19:23:07 -0000
@@ -9,8 +9,7 @@
 PORTVERSION=	1.0.11
 PORTREVISION=	6
 CATEGORIES=	misc python gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/pybliographer/1.0
+MASTER_SITES=	GNOME
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GUI and command-line tools for editing and searching bibliographic databases
Index: misc/quick-lounge-applet/Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/quick-lounge-applet/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- misc/quick-lounge-applet/Makefile	6 Jun 2008 13:45:37 -0000	1.28
+++ misc/quick-lounge-applet/Makefile	3 Jul 2008 19:23:08 -0000
@@ -10,8 +10,7 @@
 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
Index: net/desktop-data-model/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/desktop-data-model/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- net/desktop-data-model/Makefile	6 Jun 2008 13:49:57 -0000	1.2
+++ net/desktop-data-model/Makefile	3 Jul 2008 19:23:10 -0000
@@ -9,8 +9,7 @@
 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
Index: net/ekiga/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/ekiga/Makefile,v
retrieving revision 1.78
diff -u -r1.78 Makefile
--- net/ekiga/Makefile	6 Jun 2008 13:49:57 -0000	1.78
+++ net/ekiga/Makefile	3 Jul 2008 19:23:11 -0000
@@ -9,8 +9,7 @@
 PORTVERSION=	2.0.11
 PORTREVISION=	4
 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
Index: net/gnome-mud/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/gnome-mud/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- net/gnome-mud/Makefile	6 Jun 2008 13:50:01 -0000	1.34
+++ net/gnome-mud/Makefile	3 Jul 2008 19:23:12 -0000
@@ -9,8 +9,7 @@
 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
Index: net/gnome-netstatus/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/gnome-netstatus/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- net/gnome-netstatus/Makefile	6 Jun 2008 13:50:01 -0000	1.31
+++ net/gnome-netstatus/Makefile	3 Jul 2008 19:23:13 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	2.12.1
 PORTREVISION=	7
 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
Index: net/libgnetwork/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/libgnetwork/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- net/libgnetwork/Makefile	6 Jun 2008 13:50:07 -0000	1.25
+++ net/libgnetwork/Makefile	3 Jul 2008 19:23:14 -0000
@@ -9,8 +9,7 @@
 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
Index: net/linc/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/linc/Makefile,v
retrieving revision 1.43
diff -u -r1.43 Makefile
--- net/linc/Makefile	6 Jun 2008 22:01:01 -0000	1.43
+++ net/linc/Makefile	3 Jul 2008 19:23:16 -0000
@@ -9,8 +9,7 @@
 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
Index: net/online-desktop/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/online-desktop/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- net/online-desktop/Makefile	9 Jun 2008 09:31:19 -0000	1.3
+++ net/online-desktop/Makefile	3 Jul 2008 19:23:17 -0000
@@ -9,8 +9,7 @@
 PORTVERSION=	0.2.28
 PORTREVISION=	2
 CATEGORIES=	net
-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
Index: net/straw/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/straw/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- net/straw/Makefile	6 Jun 2008 13:50:27 -0000	1.26
+++ net/straw/Makefile	3 Jul 2008 19:23:18 -0000
@@ -9,8 +9,7 @@
 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
Index: net/vinagre/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/vinagre/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- net/vinagre/Makefile	6 Jun 2008 13:50:29 -0000	1.9
+++ net/vinagre/Makefile	3 Jul 2008 19:23:19 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	0.5.1
 PORTREVISION=	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
Index: net-im/gossip/Makefile
===================================================================
RCS file: /home/ncvs/ports/net-im/gossip/Makefile,v
retrieving revision 1.54
diff -u -r1.54 Makefile
--- net-im/gossip/Makefile	6 Jun 2008 13:51:45 -0000	1.54
+++ net-im/gossip/Makefile	3 Jul 2008 19:23:21 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	0.26
 PORTREVISION=	4
 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
Index: net-im/loudmouth/Makefile
===================================================================
RCS file: /home/ncvs/ports/net-im/loudmouth/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- net-im/loudmouth/Makefile	6 Jun 2008 13:51:48 -0000	1.42
+++ net-im/loudmouth/Makefile	3 Jul 2008 19:23:22 -0000
@@ -9,10 +9,7 @@
 PORTVERSION=	1.2.3
 PORTREVISION=	4
 CATEGORIES=	net-im gnome
-MASTER_SITES=	http://ftp.imendio.com/pub/imendio/loudmouth/src/ \
-		${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.0
-
+MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Lightweight Jabber client library
 
Index: palm/gnome-pilot/Makefile
===================================================================
RCS file: /home/ncvs/ports/palm/gnome-pilot/Makefile,v
retrieving revision 1.78
diff -u -r1.78 Makefile
--- palm/gnome-pilot/Makefile	6 Jun 2008 13:55:20 -0000	1.78
+++ palm/gnome-pilot/Makefile	3 Jul 2008 19:23:23 -0000
@@ -9,8 +9,7 @@
 PORTVERSION=	2.0.15
 PORTREVISION=	4
 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
Index: print/ggv/Makefile
===================================================================
RCS file: /home/ncvs/ports/print/ggv/Makefile,v
retrieving revision 1.53
diff -u -r1.53 Makefile
--- print/ggv/Makefile	6 Jun 2008 13:57:46 -0000	1.53
+++ print/ggv/Makefile	3 Jul 2008 19:23:24 -0000
@@ -10,8 +10,7 @@
 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
Index: print/gnome-cups-manager/Makefile
===================================================================
RCS file: /home/ncvs/ports/print/gnome-cups-manager/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- print/gnome-cups-manager/Makefile	6 Jun 2008 13:57:46 -0000	1.33
+++ print/gnome-cups-manager/Makefile	3 Jul 2008 19:23:25 -0000
@@ -11,8 +11,7 @@
 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
Index: print/gnome-print/Makefile
===================================================================
RCS file: /home/ncvs/ports/print/gnome-print/Makefile,v
retrieving revision 1.70
diff -u -r1.70 Makefile
--- print/gnome-print/Makefile	6 Jun 2008 13:57:46 -0000	1.70
+++ print/gnome-print/Makefile	3 Jul 2008 19:23:27 -0000
@@ -10,8 +10,7 @@
 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
 
Index: print/libgnomecups/Makefile
===================================================================
RCS file: /home/ncvs/ports/print/libgnomecups/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- print/libgnomecups/Makefile	6 Jun 2008 13:57:49 -0000	1.24
+++ print/libgnomecups/Makefile	3 Jul 2008 19:23:28 -0000
@@ -10,8 +10,7 @@
 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
Index: print/libgnomeprint/Makefile
===================================================================
RCS file: /home/ncvs/ports/print/libgnomeprint/Makefile,v
retrieving revision 1.112
diff -u -r1.112 Makefile
--- print/libgnomeprint/Makefile	6 Jun 2008 14:33:38 -0000	1.112
+++ print/libgnomeprint/Makefile	3 Jul 2008 19:23:29 -0000
@@ -11,8 +11,7 @@
 PORTVERSION=	2.18.4
 PORTREVISION?=	2
 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
Index: print/libgnomeprintmm/Makefile
===================================================================
RCS file: /home/ncvs/ports/print/libgnomeprintmm/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- print/libgnomeprintmm/Makefile	6 Jun 2008 13:57:50 -0000	1.12
+++ print/libgnomeprintmm/Makefile	3 Jul 2008 19:23:30 -0000
@@ -9,8 +9,7 @@
 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
Index: security/gnome-gpg/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/gnome-gpg/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- security/gnome-gpg/Makefile	6 Jun 2008 14:00:49 -0000	1.6
+++ security/gnome-gpg/Makefile	3 Jul 2008 19:23:32 -0000
@@ -9,8 +9,7 @@
 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
Index: sysutils/battfink/Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/battfink/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- sysutils/battfink/Makefile	6 Jun 2008 14:02:51 -0000	1.14
+++ sysutils/battfink/Makefile	3 Jul 2008 19:23:33 -0000
@@ -9,8 +9,7 @@
 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
Index: sysutils/brasero/Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/brasero/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- sysutils/brasero/Makefile	6 Jun 2008 14:02:52 -0000	1.11
+++ sysutils/brasero/Makefile	3 Jul 2008 19:23:34 -0000
@@ -9,8 +9,7 @@
 PORTVERSION=	0.7.1
 PORTREVISION=	4
 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
Index: sysutils/gnome-control-center1/Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/gnome-control-center1/Makefile,v
retrieving revision 1.56
diff -u -r1.56 Makefile
--- sysutils/gnome-control-center1/Makefile	6 Jun 2008 14:03:04 -0000	1.56
+++ sysutils/gnome-control-center1/Makefile	3 Jul 2008 19:23:35 -0000
@@ -10,8 +10,8 @@
 PORTVERSION=	1.4.0.5
 PORTREVISION=	8
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/control-center/1.4
+MASTER_SITES=	GNOME
+MASTER_SITE_SUBDIR=	sources/control-center/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	control-center-${PORTVERSION}
 DIST_SUBDIR=	gnome
 
Index: sysutils/gnome-power-manager/Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/gnome-power-manager/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- sysutils/gnome-power-manager/Makefile	6 Jun 2008 14:03:05 -0000	1.18
+++ sysutils/gnome-power-manager/Makefile	3 Jul 2008 19:23:36 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	2.22.1
 PORTREVISION=	2
 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
Index: sysutils/pessulus/Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/pessulus/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- sysutils/pessulus/Makefile	6 Jun 2008 14:03:16 -0000	1.11
+++ sysutils/pessulus/Makefile	3 Jul 2008 19:23:38 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	2.16.4
 PORTREVISION=	2
 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
Index: textproc/gnome-spell/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/gnome-spell/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- textproc/gnome-spell/Makefile	6 Jun 2008 14:04:41 -0000	1.32
+++ textproc/gnome-spell/Makefile	3 Jul 2008 19:23:39 -0000
@@ -10,8 +10,7 @@
 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
Index: textproc/gtk-doc/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/gtk-doc/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- textproc/gtk-doc/Makefile	6 Jun 2008 14:04:41 -0000	1.27
+++ textproc/gtk-doc/Makefile	3 Jul 2008 19:23:40 -0000
@@ -9,8 +9,7 @@
 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+
Index: textproc/libcroco/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/libcroco/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- textproc/libcroco/Makefile	6 Jun 2008 14:04:47 -0000	1.18
+++ textproc/libcroco/Makefile	3 Jul 2008 19:23:41 -0000
@@ -9,8 +9,7 @@
 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
Index: textproc/libxml/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/libxml/Makefile,v
retrieving revision 1.57
diff -u -r1.57 Makefile
--- textproc/libxml/Makefile	28 Jan 2007 09:07:45 -0000	1.57
+++ textproc/libxml/Makefile	3 Jul 2008 19:23:42 -0000
@@ -9,8 +9,7 @@
 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
Index: textproc/libxml++/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/libxml++/Makefile,v
retrieving revision 1.38
diff -u -r1.38 Makefile
--- textproc/libxml++/Makefile	19 Apr 2008 17:53:57 -0000	1.38
+++ textproc/libxml++/Makefile	3 Jul 2008 19:23:44 -0000
@@ -10,8 +10,7 @@
 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++
Index: textproc/libxml++26/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/libxml++26/Makefile,v
retrieving revision 1.44
diff -u -r1.44 Makefile
--- textproc/libxml++26/Makefile	6 Jun 2008 14:04:48 -0000	1.44
+++ textproc/libxml++26/Makefile	3 Jul 2008 19:23:45 -0000
@@ -11,8 +11,7 @@
 PORTVERSION=	2.22.0
 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=	bland@FreeBSD.org
 COMMENT=	XML API for C++
Index: textproc/meld/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/meld/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- textproc/meld/Makefile	6 Jun 2008 14:04:49 -0000	1.23
+++ textproc/meld/Makefile	3 Jul 2008 19:23:46 -0000
@@ -9,8 +9,7 @@
 PORTVERSION=	1.1.5.1
 PORTREVISION=	2
 CATEGORIES=	textproc devel python
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R:R}
+MASTER_SITES=	GNOME
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNOME 2 visual diff and merge tool
Index: textproc/scrollkeeper/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/scrollkeeper/Makefile,v
retrieving revision 1.58
diff -u -r1.58 Makefile
--- textproc/scrollkeeper/Makefile	6 Jun 2008 14:05:00 -0000	1.58
+++ textproc/scrollkeeper/Makefile	3 Jul 2008 19:23:47 -0000
@@ -10,8 +10,7 @@
 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
Index: textproc/xml-i18n-tools/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/xml-i18n-tools/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- textproc/xml-i18n-tools/Makefile	16 May 2006 05:30:32 -0000	1.17
+++ textproc/xml-i18n-tools/Makefile	3 Jul 2008 19:23:49 -0000
@@ -9,8 +9,7 @@
 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
Index: www/evolution-webcal/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/evolution-webcal/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- www/evolution-webcal/Makefile	6 Jun 2008 14:06:52 -0000	1.20
+++ www/evolution-webcal/Makefile	3 Jul 2008 19:23:50 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	2.21.92
 PORTREVISION=	2
 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
Index: www/glibwww/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/glibwww/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- www/glibwww/Makefile	6 Jun 2008 14:06:54 -0000	1.18
+++ www/glibwww/Makefile	3 Jul 2008 19:23:51 -0000
@@ -9,8 +9,7 @@
 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
Index: www/gnome-user-share/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/gnome-user-share/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- www/gnome-user-share/Makefile	6 Jun 2008 14:06:54 -0000	1.24
+++ www/gnome-user-share/Makefile	3 Jul 2008 19:23:52 -0000
@@ -10,8 +10,7 @@
 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
Index: www/gnome-web-photo/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/gnome-web-photo/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- www/gnome-web-photo/Makefile	6 Jun 2008 14:06:54 -0000	1.12
+++ www/gnome-web-photo/Makefile	3 Jul 2008 19:23:53 -0000
@@ -11,8 +11,7 @@
 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
Index: www/gtkhtml/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/gtkhtml/Makefile,v
retrieving revision 1.77
diff -u -r1.77 Makefile
--- www/gtkhtml/Makefile	6 Jun 2008 14:06:55 -0000	1.77
+++ www/gtkhtml/Makefile	3 Jul 2008 19:23:55 -0000
@@ -9,8 +9,7 @@
 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
Index: www/gtkhtml3/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/gtkhtml3/Makefile,v
retrieving revision 1.100
diff -u -r1.100 Makefile
--- www/gtkhtml3/Makefile	1 Jul 2008 02:44:26 -0000	1.100
+++ www/gtkhtml3/Makefile	3 Jul 2008 19:23:56 -0000
@@ -9,7 +9,7 @@
 PORTNAME=	gtkhtml3
 PORTVERSION=	3.18.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
Index: www/gtkhtml38/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/gtkhtml38/Makefile,v
retrieving revision 1.96
diff -u -r1.96 Makefile
--- www/gtkhtml38/Makefile	6 Jun 2008 14:06:55 -0000	1.96
+++ www/gtkhtml38/Makefile	3 Jul 2008 19:23:57 -0000
@@ -10,7 +10,7 @@
 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
Index: www/libghttp/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/libghttp/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- www/libghttp/Makefile	1 Feb 2007 02:42:00 -0000	1.33
+++ www/libghttp/Makefile	3 Jul 2008 19:23:58 -0000
@@ -9,8 +9,7 @@
 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
Index: www/libgtkhtml/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/libgtkhtml/Makefile,v
retrieving revision 1.84
diff -u -r1.84 Makefile
--- www/libgtkhtml/Makefile	6 Jun 2008 14:06:59 -0000	1.84
+++ www/libgtkhtml/Makefile	3 Jul 2008 19:24:00 -0000
@@ -10,8 +10,7 @@
 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
Index: x11/gnome-libs/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11/gnome-libs/Makefile,v
retrieving revision 1.126
diff -u -r1.126 Makefile
--- x11/gnome-libs/Makefile	6 Jun 2008 14:08:58 -0000	1.126
+++ x11/gnome-libs/Makefile	3 Jul 2008 19:24:01 -0000
@@ -10,8 +10,7 @@
 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
Index: x11/libgnome/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11/libgnome/Makefile,v
retrieving revision 1.161
diff -u -r1.161 Makefile
--- x11/libgnome/Makefile	6 Jun 2008 14:09:03 -0000	1.161
+++ x11/libgnome/Makefile	3 Jul 2008 19:24:02 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	2.22.0
 PORTREVISION?=	1
 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
Index: x11/libgnome-java/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11/libgnome-java/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- x11/libgnome-java/Makefile	6 Jun 2008 14:09:04 -0000	1.20
+++ x11/libgnome-java/Makefile	3 Jul 2008 19:24:03 -0000
@@ -10,8 +10,7 @@
 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
Index: x11/libgnomemm26/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11/libgnomemm26/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- x11/libgnomemm26/Makefile	6 Jun 2008 14:09:04 -0000	1.29
+++ x11/libgnomemm26/Makefile	3 Jul 2008 19:24:04 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	2.22.0
 PORTREVISION=	2
 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
Index: x11/startup-notification/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11/startup-notification/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- x11/startup-notification/Makefile	19 Apr 2008 17:54:34 -0000	1.25
+++ x11/startup-notification/Makefile	3 Jul 2008 19:24:06 -0000
@@ -9,9 +9,7 @@
 PORTVERSION=	0.9
 PORTREVISION=	2
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME} \
-		http://www.freedesktop.org/software/startup-notification/releases/
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
Index: x11-fm/gnome-commander/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-fm/gnome-commander/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- x11-fm/gnome-commander/Makefile	6 Jun 2008 14:12:20 -0000	1.23
+++ x11-fm/gnome-commander/Makefile	3 Jul 2008 19:24:07 -0000
@@ -9,8 +9,7 @@
 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
Index: x11-fm/gnome-commander2/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-fm/gnome-commander2/Makefile,v
retrieving revision 1.40
diff -u -r1.40 Makefile
--- x11-fm/gnome-commander2/Makefile	18 Jun 2008 17:57:03 -0000	1.40
+++ x11-fm/gnome-commander2/Makefile	3 Jul 2008 19:24:08 -0000
@@ -10,8 +10,7 @@
 PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	x11-fm gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-commander/1.2
+MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	2
 DIST_SUBDIR=	gnome2
 
Index: x11-fm/py-nautilus/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-fm/py-nautilus/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- x11-fm/py-nautilus/Makefile	6 Jun 2008 14:12:22 -0000	1.9
+++ x11-fm/py-nautilus/Makefile	3 Jul 2008 19:24:09 -0000
@@ -10,7 +10,7 @@
 PORTVERSION=	0.5.0
 PORTREVISION=	1
 CATEGORIES=	x11-fm gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/nautilus-python/${PORTVERSION:R}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	nautilus-python-${PORTVERSION}
Index: x11-fonts/bitstream-vera/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-fonts/bitstream-vera/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- x11-fonts/bitstream-vera/Makefile	19 Apr 2008 17:55:03 -0000	1.17
+++ x11-fonts/bitstream-vera/Makefile	3 Jul 2008 19:24:10 -0000
@@ -10,7 +10,7 @@
 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
Index: x11-themes/gnome-icons-aqua-fusion/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-themes/gnome-icons-aqua-fusion/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- x11-themes/gnome-icons-aqua-fusion/Makefile	13 Sep 2006 19:15:55 -0000	1.8
+++ x11-themes/gnome-icons-aqua-fusion/Makefile	3 Jul 2008 19:24:12 -0000
@@ -13,7 +13,7 @@
 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
 
Index: x11-themes/gnome-icons-gentoo-test/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-themes/gnome-icons-gentoo-test/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- x11-themes/gnome-icons-gentoo-test/Makefile	13 Sep 2006 19:15:56 -0000	1.8
+++ x11-themes/gnome-icons-gentoo-test/Makefile	3 Jul 2008 19:24:13 -0000
@@ -13,7 +13,7 @@
 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
 
Index: x11-themes/gnome-icons-iris/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-themes/gnome-icons-iris/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- x11-themes/gnome-icons-iris/Makefile	13 Sep 2006 19:15:56 -0000	1.7
+++ x11-themes/gnome-icons-iris/Makefile	3 Jul 2008 19:24:14 -0000
@@ -13,7 +13,7 @@
 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
 
Index: x11-themes/gnome-icons-noia-full/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-themes/gnome-icons-noia-full/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- x11-themes/gnome-icons-noia-full/Makefile	13 Sep 2006 19:15:56 -0000	1.9
+++ x11-themes/gnome-icons-noia-full/Makefile	3 Jul 2008 19:24:15 -0000
@@ -13,7 +13,7 @@
 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
 
Index: x11-themes/gnome-icons-noia-warm/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-themes/gnome-icons-noia-warm/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- x11-themes/gnome-icons-noia-warm/Makefile	13 Sep 2006 19:15:56 -0000	1.9
+++ x11-themes/gnome-icons-noia-warm/Makefile	3 Jul 2008 19:24:17 -0000
@@ -13,7 +13,7 @@
 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
 
Index: x11-themes/gnome-icons-refined/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-themes/gnome-icons-refined/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- x11-themes/gnome-icons-refined/Makefile	13 Sep 2006 19:15:57 -0000	1.8
+++ x11-themes/gnome-icons-refined/Makefile	3 Jul 2008 19:24:18 -0000
@@ -13,7 +13,7 @@
 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
 
Index: x11-themes/gnome-icons-slick/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-themes/gnome-icons-slick/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- x11-themes/gnome-icons-slick/Makefile	13 Sep 2006 19:15:57 -0000	1.8
+++ x11-themes/gnome-icons-slick/Makefile	3 Jul 2008 19:24:19 -0000
@@ -13,7 +13,7 @@
 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
 
Index: x11-themes/gnome-icons-snow-apple/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-themes/gnome-icons-snow-apple/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- x11-themes/gnome-icons-snow-apple/Makefile	13 Sep 2006 19:15:57 -0000	1.8
+++ x11-themes/gnome-icons-snow-apple/Makefile	3 Jul 2008 19:24:20 -0000
@@ -13,7 +13,7 @@
 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
 
Index: x11-themes/gnome-icons-stylish/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-themes/gnome-icons-stylish/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- x11-themes/gnome-icons-stylish/Makefile	13 Sep 2006 19:15:57 -0000	1.8
+++ x11-themes/gnome-icons-stylish/Makefile	3 Jul 2008 19:24:21 -0000
@@ -13,7 +13,7 @@
 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
 
Index: x11-themes/gnome-icons-ximian-south/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-themes/gnome-icons-ximian-south/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- x11-themes/gnome-icons-ximian-south/Makefile	13 Sep 2006 19:15:57 -0000	1.8
+++ x11-themes/gnome-icons-ximian-south/Makefile	3 Jul 2008 19:24:23 -0000
@@ -13,7 +13,7 @@
 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}
 
Index: x11-themes/gtk-engines/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-themes/gtk-engines/Makefile,v
retrieving revision 1.44
diff -u -r1.44 Makefile
--- x11-themes/gtk-engines/Makefile	6 Jun 2008 14:14:21 -0000	1.44
+++ x11-themes/gtk-engines/Makefile	3 Jul 2008 19:24:24 -0000
@@ -9,8 +9,7 @@
 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
Index: x11-themes/gtk-engines2/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-themes/gtk-engines2/Makefile,v
retrieving revision 1.73
diff -u -r1.73 Makefile
--- x11-themes/gtk-engines2/Makefile	1 Jul 2008 02:00:25 -0000	1.73
+++ x11-themes/gtk-engines2/Makefile	3 Jul 2008 19:24:25 -0000
@@ -9,7 +9,7 @@
 PORTNAME=	gtk-engines2
 PORTVERSION=	2.14.3
 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
Index: x11-toolkits/gal/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/gal/Makefile,v
retrieving revision 1.57
diff -u -r1.57 Makefile
--- x11-toolkits/gal/Makefile	6 Jun 2008 14:16:10 -0000	1.57
+++ x11-toolkits/gal/Makefile	3 Jul 2008 19:24:26 -0000
@@ -9,8 +9,7 @@
 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
Index: x11-toolkits/gal2/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/gal2/Makefile,v
retrieving revision 1.76
diff -u -r1.76 Makefile
--- x11-toolkits/gal2/Makefile	10 Jun 2008 04:57:46 -0000	1.76
+++ x11-toolkits/gal2/Makefile	3 Jul 2008 19:24:27 -0000
@@ -10,7 +10,7 @@
 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
Index: x11-toolkits/gnome-sharp20/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/gnome-sharp20/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- x11-toolkits/gnome-sharp20/Makefile	6 Jun 2008 14:16:10 -0000	1.5
+++ x11-toolkits/gnome-sharp20/Makefile	3 Jul 2008 19:24:29 -0000
@@ -10,8 +10,7 @@
 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-list@forge.novell.com
 COMMENT=	GNOME interfaces for the .NET runtime
Index: x11-toolkits/gob/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/gob/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- x11-toolkits/gob/Makefile	6 Jun 2008 14:16:12 -0000	1.33
+++ x11-toolkits/gob/Makefile	3 Jul 2008 19:24:30 -0000
@@ -9,8 +9,7 @@
 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
Index: x11-toolkits/gtk12/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/gtk12/Makefile,v
retrieving revision 1.108
diff -u -r1.108 Makefile
--- x11-toolkits/gtk12/Makefile	6 Jun 2008 14:16:12 -0000	1.108
+++ x11-toolkits/gtk12/Makefile	3 Jul 2008 19:24:31 -0000
@@ -9,8 +9,8 @@
 PORTVERSION=	1.2.10
 PORTREVISION=	20
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gtk+/1.2
+MASTER_SITES=	GNOME
+MASTER_SITE_SUBDIR=	sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	gtk+-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
Index: x11-toolkits/gtkglarea2/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/gtkglarea2/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- x11-toolkits/gtkglarea2/Makefile	6 Jun 2008 14:16:14 -0000	1.35
+++ x11-toolkits/gtkglarea2/Makefile	3 Jul 2008 19:24:32 -0000
@@ -9,8 +9,7 @@
 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
 
Index: x11-toolkits/gtkmm12/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/gtkmm12/Makefile,v
retrieving revision 1.53
diff -u -r1.53 Makefile
--- x11-toolkits/gtkmm12/Makefile	6 Jun 2008 14:16:15 -0000	1.53
+++ x11-toolkits/gtkmm12/Makefile	3 Jul 2008 19:24:34 -0000
@@ -9,8 +9,8 @@
 PORTVERSION=	1.2.8
 PORTREVISION=	8
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gtkmm/1.2
+MASTER_SITES=	GNOME
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 #DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
Index: x11-toolkits/gtkmm24/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/gtkmm24/Makefile,v
retrieving revision 1.120
diff -u -r1.120 Makefile
--- x11-toolkits/gtkmm24/Makefile	6 Jun 2008 14:16:15 -0000	1.120
+++ x11-toolkits/gtkmm24/Makefile	3 Jul 2008 19:24:35 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	2.12.7
 PORTREVISION?=	1
 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
Index: x11-toolkits/gtksourceview/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/gtksourceview/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- x11-toolkits/gtksourceview/Makefile	10 Jun 2008 04:57:46 -0000	1.42
+++ x11-toolkits/gtksourceview/Makefile	3 Jul 2008 19:24:36 -0000
@@ -10,8 +10,7 @@
 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
Index: x11-toolkits/gtksourceview2/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/gtksourceview2/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- x11-toolkits/gtksourceview2/Makefile	1 Jul 2008 03:38:46 -0000	1.7
+++ x11-toolkits/gtksourceview2/Makefile	3 Jul 2008 19:24:37 -0000
@@ -10,7 +10,7 @@
 PORTVERSION=	2.2.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
Index: x11-toolkits/hippo-canvas/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/hippo-canvas/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- x11-toolkits/hippo-canvas/Makefile	6 Jun 2008 14:16:17 -0000	1.2
+++ x11-toolkits/hippo-canvas/Makefile	3 Jul 2008 19:24:38 -0000
@@ -9,8 +9,7 @@
 PORTVERSION=	0.2.31
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits
-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
Index: x11-toolkits/libbonoboui/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/libbonoboui/Makefile,v
retrieving revision 1.62
diff -u -r1.62 Makefile
--- x11-toolkits/libbonoboui/Makefile	6 Jun 2008 14:33:40 -0000	1.62
+++ x11-toolkits/libbonoboui/Makefile	3 Jul 2008 19:24:40 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	2.22.0
 PORTREVISION?=	2
 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
Index: x11-toolkits/libbonobouimm/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/libbonobouimm/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- x11-toolkits/libbonobouimm/Makefile	6 Jun 2008 14:16:19 -0000	1.18
+++ x11-toolkits/libbonobouimm/Makefile	3 Jul 2008 19:24:41 -0000
@@ -9,8 +9,7 @@
 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
Index: x11-toolkits/libgnomeprintui/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/libgnomeprintui/Makefile,v
retrieving revision 1.53
diff -u -r1.53 Makefile
--- x11-toolkits/libgnomeprintui/Makefile	6 Jun 2008 14:16:20 -0000	1.53
+++ x11-toolkits/libgnomeprintui/Makefile	3 Jul 2008 19:24:42 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	2.18.2
 PORTREVISION=	2
 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
Index: x11-toolkits/libgnomeprintuimm/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/libgnomeprintuimm/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- x11-toolkits/libgnomeprintuimm/Makefile	6 Jun 2008 14:16:21 -0000	1.12
+++ x11-toolkits/libgnomeprintuimm/Makefile	3 Jul 2008 19:24:43 -0000
@@ -9,8 +9,7 @@
 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
Index: x11-toolkits/libgnomeui/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/libgnomeui/Makefile,v
retrieving revision 1.61
diff -u -r1.61 Makefile
--- x11-toolkits/libgnomeui/Makefile	6 Jun 2008 14:33:40 -0000	1.61
+++ x11-toolkits/libgnomeui/Makefile	3 Jul 2008 19:24:45 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	2.22.1
 PORTREVISION?=	2
 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
Index: x11-toolkits/libgnomeuimm26/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/libgnomeuimm26/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- x11-toolkits/libgnomeuimm26/Makefile	6 Jun 2008 14:16:21 -0000	1.30
+++ x11-toolkits/libgnomeuimm26/Makefile	3 Jul 2008 19:24:46 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	2.22.0
 PORTREVISION=	2
 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
Index: x11-toolkits/libpanelappletmm/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/libpanelappletmm/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- x11-toolkits/libpanelappletmm/Makefile	6 Jun 2008 14:16:22 -0000	1.21
+++ x11-toolkits/libpanelappletmm/Makefile	3 Jul 2008 19:24:47 -0000
@@ -9,8 +9,7 @@
 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
Index: x11-toolkits/libwnck/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/libwnck/Makefile,v
retrieving revision 1.61
diff -u -r1.61 Makefile
--- x11-toolkits/libwnck/Makefile	1 Jul 2008 00:57:40 -0000	1.61
+++ x11-toolkits/libwnck/Makefile	3 Jul 2008 19:24:48 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	2.22.3
 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
Index: x11-toolkits/libzvt/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/libzvt/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- x11-toolkits/libzvt/Makefile	6 Jun 2008 14:16:23 -0000	1.34
+++ x11-toolkits/libzvt/Makefile	3 Jul 2008 19:24:49 -0000
@@ -9,8 +9,7 @@
 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
Index: x11-toolkits/py-gnome/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/py-gnome/Makefile,v
retrieving revision 1.75
diff -u -r1.75 Makefile
--- x11-toolkits/py-gnome/Makefile	6 Jun 2008 14:16:27 -0000	1.75
+++ x11-toolkits/py-gnome/Makefile	3 Jul 2008 19:24:51 -0000
@@ -9,8 +9,8 @@
 PORTVERSION=	1.4.4
 PORTREVISION=	7
 CATEGORIES=	x11-toolkits python gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-python/1.4
+MASTER_SITES=	GNOME
+MASTER_SITE_SUBDIR=	sources/gnome-python/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	gnome-python-${PORTVERSION}
 DIST_SUBDIR=	gnome
 
Index: x11-toolkits/py-gnome-desktop/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/py-gnome-desktop/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- x11-toolkits/py-gnome-desktop/Makefile	6 Jun 2008 14:16:28 -0000	1.10
+++ x11-toolkits/py-gnome-desktop/Makefile	3 Jul 2008 19:24:52 -0000
@@ -10,7 +10,7 @@
 PORTVERSION=	2.22.0
 PORTREVISION=	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
Index: x11-toolkits/py-gnome-extras/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/py-gnome-extras/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- x11-toolkits/py-gnome-extras/Makefile	6 Jun 2008 14:16:28 -0000	1.25
+++ x11-toolkits/py-gnome-extras/Makefile	3 Jul 2008 19:24:53 -0000
@@ -10,7 +10,7 @@
 PORTVERSION=	2.19.1
 PORTREVISION=	4
 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
Index: x11-toolkits/py-gnome2/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/py-gnome2/Makefile,v
retrieving revision 1.98
diff -u -r1.98 Makefile
--- x11-toolkits/py-gnome2/Makefile	15 Jun 2008 18:08:30 -0000	1.98
+++ x11-toolkits/py-gnome2/Makefile	3 Jul 2008 19:24:54 -0000
@@ -9,7 +9,7 @@
 PORTNAME=	gnome
 PORTVERSION=	2.22.1
 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}
Index: x11-toolkits/py-gtk/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/py-gtk/Makefile,v
retrieving revision 1.72
diff -u -r1.72 Makefile
--- x11-toolkits/py-gtk/Makefile	6 Jun 2008 14:16:28 -0000	1.72
+++ x11-toolkits/py-gtk/Makefile	3 Jul 2008 19:24:55 -0000
@@ -9,7 +9,7 @@
 PORTVERSION=	0.6.11
 PORTREVISION=	5
 CATEGORIES=	x11-toolkits python
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/gnome-python/1.4
 DISTNAME=	gnome-python-1.4.4
 DIST_SUBDIR=	gnome
Index: x11-toolkits/py-gtk2/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/py-gtk2/Makefile,v
retrieving revision 1.97
diff -u -r1.97 Makefile
--- x11-toolkits/py-gtk2/Makefile	6 Jun 2008 14:16:28 -0000	1.97
+++ x11-toolkits/py-gtk2/Makefile	3 Jul 2008 19:24:57 -0000
@@ -10,7 +10,7 @@
 PORTVERSION=	2.12.1
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits python
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/pygtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pygtk-${PORTVERSION}
Index: x11-toolkits/py-gtksourceview/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/py-gtksourceview/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- x11-toolkits/py-gtksourceview/Makefile	6 Jun 2008 14:16:29 -0000	1.3
+++ x11-toolkits/py-gtksourceview/Makefile	3 Jul 2008 19:24:58 -0000
@@ -10,7 +10,7 @@
 PORTVERSION=	2.2.0
 PORTREVISION=	1
 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}
Index: x11-toolkits/rep-gtk/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/rep-gtk/Makefile,v
retrieving revision 1.44
diff -u -r1.44 Makefile
--- x11-toolkits/rep-gtk/Makefile	6 Jun 2008 14:16:33 -0000	1.44
+++ x11-toolkits/rep-gtk/Makefile	3 Jul 2008 19:24:59 -0000
@@ -9,8 +9,7 @@
 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
Index: x11-toolkits/vte/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/vte/Makefile,v
retrieving revision 1.82
diff -u -r1.82 Makefile
--- x11-toolkits/vte/Makefile	6 Jun 2008 14:16:36 -0000	1.82
+++ x11-toolkits/vte/Makefile	3 Jul 2008 19:25:00 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	0.16.14
 PORTREVISION?=	1
 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
Index: x11-wm/metacity/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-wm/metacity/Makefile,v
retrieving revision 1.63
diff -u -r1.63 Makefile
--- x11-wm/metacity/Makefile	6 Jun 2008 14:17:18 -0000	1.63
+++ x11-wm/metacity/Makefile	3 Jul 2008 19:25:02 -0000
@@ -10,8 +10,7 @@
 PORTVERSION=	2.22.0
 PORTREVISION=	2
 CATEGORIES=	x11-wm
-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
--- gnome3.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->araujo 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Jul 3 21:36:19 UTC 2008 
Responsible-Changed-Why:  
raujo is related to this PR 

http://www.freebsd.org/cgi/query-pr.cgi?pr=125243 
State-Changed-From-To: open->feedback 
State-Changed-By: pav 
State-Changed-When: Fri Aug 22 07:25:57 UTC 2008 
State-Changed-Why:  
Generating INDEX-7 - please wait.."Makefile", line 14: Unassociated shell command "libsigc/:sf" 
make: fatal errors encountered -- cannot continue 
===> devel/libsigc++ failed 
*** Error code 1 


http://www.freebsd.org/cgi/query-pr.cgi?pr=125243 

From: "Philip M. Gollucci" <pgollucci@ridecharge.com>
To: bug-followup@FreeBSD.org, pgollucci@p6m7g8.com
Cc:  
Subject: Re: ports/125243: GNOME Macro (178 Ports)
Date: Fri, 22 Aug 2008 08:12:10 -0400

 --------------050203040102010005060107
 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Further patching from araujo@ with these comments via e-mail.
 
 Hey Pav,
 
 I remove the gnome-commander2, that was updated some time ago AND the
 libsigc++ was fixed.
 
 Patch: http://people.freebsd.org/~araujo/logs/ports.diff
 
 Br,
 -- 
 ------------------------------------------------------------------------
 Philip M. Gollucci (philip@ridecharge.com)
 o:703.549.2050x206
 Senior System Admin - Riderway, Inc.
 http://riderway.com / http://ridecharge.com
 1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70  3F8C 75B8 8FFB DB9B 8C1C
 
 Work like you don't need the money,
 love like you'll never get hurt,
 and dance like nobody's watching.
 
 
 --------------050203040102010005060107
 Content-Type: text/plain; name="ports.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline; filename="ports.diff"
 
 Index: accessibility/at-poke/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/accessibility/at-poke/Makefile,v
 retrieving revision 1.5
 diff -u -r1.5 Makefile
 --- accessibility/at-poke/Makefile	6 Jun 2008 12:59:51 -0000	1.5
 +++ accessibility/at-poke/Makefile	22 Aug 2008 11:43:40 -0000
 @@ -9,8 +9,7 @@
  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
 Index: accessibility/at-spi/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/accessibility/at-spi/Makefile,v
 retrieving revision 1.65
 diff -u -r1.65 Makefile
 --- accessibility/at-spi/Makefile	6 Jun 2008 14:33:35 -0000	1.65
 +++ accessibility/at-spi/Makefile	22 Aug 2008 11:43:40 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	1.22.1
  PORTREVISION?=	2
  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
 Index: accessibility/atk/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/accessibility/atk/Makefile,v
 retrieving revision 1.54
 diff -u -r1.54 Makefile
 --- accessibility/atk/Makefile	6 Jun 2008 12:59:51 -0000	1.54
 +++ accessibility/atk/Makefile	22 Aug 2008 11:43:40 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	1.22.0
  PORTREVISION?=	1
  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
 Index: accessibility/dasher/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/accessibility/dasher/Makefile,v
 retrieving revision 1.44
 diff -u -r1.44 Makefile
 --- accessibility/dasher/Makefile	6 Jun 2008 12:59:51 -0000	1.44
 +++ accessibility/dasher/Makefile	22 Aug 2008 11:43:42 -0000
 @@ -11,8 +11,7 @@
  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
 Index: accessibility/gail/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/accessibility/gail/Makefile,v
 retrieving revision 1.67
 diff -u -r1.67 Makefile
 --- accessibility/gail/Makefile	1 Jul 2008 00:50:02 -0000	1.67
 +++ accessibility/gail/Makefile	22 Aug 2008 11:43:42 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	1.22.3
  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
 Index: accessibility/gnome-mag/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/accessibility/gnome-mag/Makefile,v
 retrieving revision 1.45
 diff -u -r1.45 Makefile
 --- accessibility/gnome-mag/Makefile	6 Jun 2008 12:59:52 -0000	1.45
 +++ accessibility/gnome-mag/Makefile	22 Aug 2008 11:43:42 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	0.14.10
  PORTREVISION=	2
  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=	gnome@FreeBSD.org
 Index: accessibility/gnome-speech/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/accessibility/gnome-speech/Makefile,v
 retrieving revision 1.38
 diff -u -r1.38 Makefile
 --- accessibility/gnome-speech/Makefile	4 Aug 2008 17:19:13 -0000	1.38
 +++ accessibility/gnome-speech/Makefile	22 Aug 2008 11:43:42 -0000
 @@ -9,8 +9,7 @@
  PORTNAME=	gnome-speech
  PORTVERSION=	0.4.21
  CATEGORIES=	accessibility 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
 Index: accessibility/gnopernicus/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/accessibility/gnopernicus/Makefile,v
 retrieving revision 1.38
 diff -u -r1.38 Makefile
 --- accessibility/gnopernicus/Makefile	6 Jun 2008 12:59:52 -0000	1.38
 +++ accessibility/gnopernicus/Makefile	22 Aug 2008 11:43:42 -0000
 @@ -10,8 +10,7 @@
  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
 Index: accessibility/gok/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/accessibility/gok/Makefile,v
 retrieving revision 1.39
 diff -u -r1.39 Makefile
 --- accessibility/gok/Makefile	6 Jun 2008 12:59:52 -0000	1.39
 +++ accessibility/gok/Makefile	22 Aug 2008 11:43:43 -0000
 @@ -11,8 +11,7 @@
  PORTREVISION=	2
  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
 Index: audio/esound/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/audio/esound/Makefile,v
 retrieving revision 1.71
 diff -u -r1.71 Makefile
 --- audio/esound/Makefile	18 Jul 2008 04:35:19 -0000	1.71
 +++ audio/esound/Makefile	22 Aug 2008 11:43:43 -0000
 @@ -9,8 +9,7 @@
  PORTVERSION=	0.2.39
  PORTREVISION=	1
  CATEGORIES=	audio
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.2
 +MASTER_SITES=	GNOME
  DIST_SUBDIR=	gnome
  
  MAINTAINER=	gnome@FreeBSD.org
 Index: audio/goobox/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/audio/goobox/Makefile,v
 retrieving revision 1.32
 diff -u -r1.32 Makefile
 --- audio/goobox/Makefile	6 Jun 2008 13:06:41 -0000	1.32
 +++ audio/goobox/Makefile	22 Aug 2008 11:43:45 -0000
 @@ -10,8 +10,7 @@
  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
 Index: audio/libaudiofile/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/audio/libaudiofile/Makefile,v
 retrieving revision 1.40
 diff -u -r1.40 Makefile
 --- audio/libaudiofile/Makefile	28 Jan 2007 09:07:34 -0000	1.40
 +++ audio/libaudiofile/Makefile	22 Aug 2008 11:43:45 -0000
 @@ -10,8 +10,7 @@
  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
 Index: audio/rhythmbox/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/audio/rhythmbox/Makefile,v
 retrieving revision 1.108
 diff -u -r1.108 Makefile
 --- audio/rhythmbox/Makefile	13 Jul 2008 17:44:06 -0000	1.108
 +++ audio/rhythmbox/Makefile	22 Aug 2008 11:43:45 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	0.10.1
  PORTREVISION=	9
  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
 Index: audio/rhythmbox-devel/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/audio/rhythmbox-devel/Makefile,v
 retrieving revision 1.111
 diff -u -r1.111 Makefile
 --- audio/rhythmbox-devel/Makefile	13 Jul 2008 17:44:06 -0000	1.111
 +++ audio/rhythmbox-devel/Makefile	22 Aug 2008 11:43:46 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	0.11.6
  PORTREVISION=	1
  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
 Index: databases/glom/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/databases/glom/Makefile,v
 retrieving revision 1.15
 diff -u -r1.15 Makefile
 --- databases/glom/Makefile	6 Jun 2008 13:16:47 -0000	1.15
 +++ databases/glom/Makefile	22 Aug 2008 11:43:46 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	1.6.17
  PORTREVISION=	1
  CATEGORIES=	databases gnome
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 +MASTER_SITES=	GNOME
  
  MAINTAINER=	kwm@FreeBSD.org
  COMMENT=	GNOME database designer and user interface
 Index: databases/gnome-db/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/databases/gnome-db/Makefile,v
 retrieving revision 1.43
 diff -u -r1.43 Makefile
 --- databases/gnome-db/Makefile	21 Aug 2008 06:16:27 -0000	1.43
 +++ databases/gnome-db/Makefile	22 Aug 2008 11:43:46 -0000
 @@ -10,8 +10,7 @@
  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
 Index: databases/libgda/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/databases/libgda/Makefile,v
 retrieving revision 1.43
 diff -u -r1.43 Makefile
 --- databases/libgda/Makefile	21 Aug 2008 06:16:27 -0000	1.43
 +++ databases/libgda/Makefile	22 Aug 2008 11:43:47 -0000
 @@ -10,8 +10,7 @@
  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
 Index: databases/libgda2/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/databases/libgda2/Makefile,v
 retrieving revision 1.85
 diff -u -r1.85 Makefile
 --- databases/libgda2/Makefile	10 Jun 2008 04:57:45 -0000	1.85
 +++ databases/libgda2/Makefile	22 Aug 2008 11:43:49 -0000
 @@ -11,8 +11,7 @@
  PORTREVISION?=	5
  PORTEPOCH?=	1
  CATEGORIES=	databases gnome
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/1.2
 +MASTER_SITES=	GNOME
  DISTNAME=	libgda-${PORTVERSION}
  DIST_SUBDIR=	gnome2
  
 Index: databases/libgda3/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/databases/libgda3/Makefile,v
 retrieving revision 1.87
 diff -u -r1.87 Makefile
 --- databases/libgda3/Makefile	6 Jun 2008 13:16:51 -0000	1.87
 +++ databases/libgda3/Makefile	22 Aug 2008 11:43:49 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION?=	3.0.4
  PORTREVISION?=	1
  CATEGORIES=	databases gnome
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:R}
 +MASTER_SITES=	GNOME
  DISTNAME=	libgda-${PORTVERSION}
  DIST_SUBDIR=	gnome2
  
 Index: databases/libgdamm/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/databases/libgdamm/Makefile,v
 retrieving revision 1.25
 diff -u -r1.25 Makefile
 --- databases/libgdamm/Makefile	25 Jul 2008 14:34:12 -0000	1.25
 +++ databases/libgdamm/Makefile	22 Aug 2008 11:43:49 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	3.0.0
  PORTREVISION=	1
  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
 Index: databases/libgnomedb/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/databases/libgnomedb/Makefile,v
 retrieving revision 1.55
 diff -u -r1.55 Makefile
 --- databases/libgnomedb/Makefile	10 Jun 2008 04:57:45 -0000	1.55
 +++ databases/libgnomedb/Makefile	22 Aug 2008 11:43:49 -0000
 @@ -10,8 +10,7 @@
  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
 Index: deskutils/gnome-utils/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/deskutils/gnome-utils/Makefile,v
 retrieving revision 1.96
 diff -u -r1.96 Makefile
 --- deskutils/gnome-utils/Makefile	6 Jun 2008 13:18:16 -0000	1.96
 +++ deskutils/gnome-utils/Makefile	22 Aug 2008 11:43:51 -0000
 @@ -11,8 +11,7 @@
  PORTREVISION=	2
  PORTEPOCH=	1
  CATEGORIES=	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
 Index: deskutils/ontv/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/deskutils/ontv/Makefile,v
 retrieving revision 1.6
 diff -u -r1.6 Makefile
 --- deskutils/ontv/Makefile	6 Jun 2008 13:18:27 -0000	1.6
 +++ deskutils/ontv/Makefile	22 Aug 2008 11:43:51 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	2.4.0
  PORTREVISION=	3
  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
 Index: deskutils/planner/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/deskutils/planner/Makefile,v
 retrieving revision 1.49
 diff -u -r1.49 Makefile
 --- deskutils/planner/Makefile	25 Jun 2008 05:32:57 -0000	1.49
 +++ deskutils/planner/Makefile	22 Aug 2008 11:43:51 -0000
 @@ -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
 Index: devel/ORBit/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/ORBit/Makefile,v
 retrieving revision 1.85
 diff -u -r1.85 Makefile
 --- devel/ORBit/Makefile	6 Jun 2008 13:20:58 -0000	1.85
 +++ devel/ORBit/Makefile	22 Aug 2008 11:43:51 -0000
 @@ -9,8 +9,7 @@
  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
 Index: devel/ORBit2/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/ORBit2/Makefile,v
 retrieving revision 1.135
 diff -u -r1.135 Makefile
 --- devel/ORBit2/Makefile	19 Aug 2008 12:11:35 -0000	1.135
 +++ devel/ORBit2/Makefile	22 Aug 2008 11:43:53 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	2.14.14
  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
 Index: devel/bonobo/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/bonobo/Makefile,v
 retrieving revision 1.74
 diff -u -r1.74 Makefile
 --- devel/bonobo/Makefile	21 Aug 2008 06:16:35 -0000	1.74
 +++ devel/bonobo/Makefile	22 Aug 2008 11:43:53 -0000
 @@ -10,8 +10,7 @@
  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
 Index: devel/bonobo-conf/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/bonobo-conf/Makefile,v
 retrieving revision 1.31
 diff -u -r1.31 Makefile
 --- devel/bonobo-conf/Makefile	6 Jun 2008 13:21:01 -0000	1.31
 +++ devel/bonobo-conf/Makefile	22 Aug 2008 11:43:53 -0000
 @@ -9,8 +9,7 @@
  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
 Index: devel/gconf/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/gconf/Makefile,v
 retrieving revision 1.55
 diff -u -r1.55 Makefile
 --- devel/gconf/Makefile	21 Jul 2008 04:49:05 -0000	1.55
 +++ devel/gconf/Makefile	22 Aug 2008 11:43:53 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	1.0.9
  PORTREVISION=	15
  CATEGORIES=	devel gnome
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/GConf/1.0
 +MASTER_SITES=	GNOME
  DISTNAME=	GConf-${PORTVERSION}
  DIST_SUBDIR=	gnome
  
 Index: devel/gconf2/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/gconf2/Makefile,v
 retrieving revision 1.81
 diff -u -r1.81 Makefile
 --- devel/gconf2/Makefile	6 Jun 2008 13:21:12 -0000	1.81
 +++ devel/gconf2/Makefile	22 Aug 2008 11:43:53 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	2.22.0
  PORTREVISION?=	1
  CATEGORIES=	devel gnome
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 +MASTER_SITES=	GNOME
  DISTNAME=	GConf-${PORTVERSION}
  DIST_SUBDIR=	gnome2
  
 Index: devel/gconfmm/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/gconfmm/Makefile,v
 retrieving revision 1.17
 diff -u -r1.17 Makefile
 --- devel/gconfmm/Makefile	6 Jun 2008 13:21:12 -0000	1.17
 +++ devel/gconfmm/Makefile	22 Aug 2008 11:43:53 -0000
 @@ -9,8 +9,7 @@
  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
 Index: devel/gconfmm26/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/gconfmm26/Makefile,v
 retrieving revision 1.28
 diff -u -r1.28 Makefile
 --- devel/gconfmm26/Makefile	6 Jun 2008 13:21:12 -0000	1.28
 +++ devel/gconfmm26/Makefile	22 Aug 2008 11:43:55 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	2.22.0
  PORTREVISION=	2
  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
 Index: devel/gio-fam-backend/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/gio-fam-backend/Makefile,v
 retrieving revision 1.6
 diff -u -r1.6 Makefile
 --- devel/gio-fam-backend/Makefile	20 Jul 2008 17:34:16 -0000	1.6
 +++ devel/gio-fam-backend/Makefile	22 Aug 2008 11:43:55 -0000
 @@ -9,13 +9,12 @@
  PORTNAME=	gio-fam-backend
  PORTVERSION=	2.16.5
  CATEGORIES=	devel
 -MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
 +MASTER_SITES=	${GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
  		ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \
  		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
  		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
  		http://www.ameth.org/gimp/%SUBDIR%/ \
  		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
 -MASTER_SITE_SUBDIR=	gtk/v${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
  DISTNAME=	glib-${PORTVERSION}
  DIST_SUBDIR=	gnome2
  
 Index: devel/glade2/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/glade2/Makefile,v
 retrieving revision 1.77
 diff -u -r1.77 Makefile
 --- devel/glade2/Makefile	6 Jun 2008 13:21:13 -0000	1.77
 +++ devel/glade2/Makefile	22 Aug 2008 11:43:55 -0000
 @@ -10,8 +10,7 @@
  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
  
 Index: devel/glib12/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/glib12/Makefile,v
 retrieving revision 1.63
 diff -u -r1.63 Makefile
 --- devel/glib12/Makefile	29 Jan 2007 23:51:51 -0000	1.63
 +++ devel/glib12/Makefile	22 Aug 2008 11:43:55 -0000
 @@ -9,8 +9,7 @@
  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)
 Index: devel/glib20/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/glib20/Makefile,v
 retrieving revision 1.153
 diff -u -r1.153 Makefile
 --- devel/glib20/Makefile	21 Aug 2008 06:16:39 -0000	1.153
 +++ devel/glib20/Makefile	22 Aug 2008 11:43:56 -0000
 @@ -10,13 +10,12 @@
  PORTVERSION=	2.16.5
  PORTREVISION?=	0
  CATEGORIES=	devel
 -MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
 +MASTER_SITES=	${GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
  		ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \
  		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
  		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
  		http://www.ameth.org/gimp/%SUBDIR%/ \
  		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
 -MASTER_SITE_SUBDIR=	gtk/v${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
  DIST_SUBDIR=	gnome2
  
  MAINTAINER=	gnome@FreeBSD.org
 Index: devel/glibmm/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/glibmm/Makefile,v
 retrieving revision 1.43
 diff -u -r1.43 Makefile
 --- devel/glibmm/Makefile	25 Jul 2008 14:34:13 -0000	1.43
 +++ devel/glibmm/Makefile	22 Aug 2008 11:43:56 -0000
 @@ -11,8 +11,7 @@
  PORTREVISION?=	0
  PORTEPOCH=	1
  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
 Index: devel/gnome-common/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/gnome-common/Makefile,v
 retrieving revision 1.22
 diff -u -r1.22 Makefile
 --- devel/gnome-common/Makefile	24 Oct 2007 23:35:15 -0000	1.22
 +++ devel/gnome-common/Makefile	22 Aug 2008 11:43:56 -0000
 @@ -9,8 +9,7 @@
  PORTNAME=	gnome-common
  PORTVERSION=	2.20.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
 Index: devel/gnome-crash/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/gnome-crash/Makefile,v
 retrieving revision 1.21
 diff -u -r1.21 Makefile
 --- devel/gnome-crash/Makefile	6 Jun 2008 13:21:14 -0000	1.21
 +++ devel/gnome-crash/Makefile	22 Aug 2008 11:43:56 -0000
 @@ -9,8 +9,7 @@
  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
 Index: devel/gnome-vfs/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/gnome-vfs/Makefile,v
 retrieving revision 1.134
 diff -u -r1.134 Makefile
 --- devel/gnome-vfs/Makefile	6 Jun 2008 14:33:36 -0000	1.134
 +++ devel/gnome-vfs/Makefile	22 Aug 2008 11:43:59 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	2.22.0
  PORTREVISION?=	2
  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
 Index: devel/gnome-vfs-monikers/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/gnome-vfs-monikers/Makefile,v
 retrieving revision 1.4
 diff -u -r1.4 Makefile
 --- devel/gnome-vfs-monikers/Makefile	6 Jun 2008 13:21:14 -0000	1.4
 +++ devel/gnome-vfs-monikers/Makefile	22 Aug 2008 11:43:59 -0000
 @@ -9,8 +9,7 @@
  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
 Index: devel/gnome-vfs1/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/gnome-vfs1/Makefile,v
 retrieving revision 1.58
 diff -u -r1.58 Makefile
 --- devel/gnome-vfs1/Makefile	6 Jun 2008 13:21:15 -0000	1.58
 +++ devel/gnome-vfs1/Makefile	22 Aug 2008 11:43:59 -0000
 @@ -9,8 +9,7 @@
  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
  
 Index: devel/gnome-vfsmm/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/gnome-vfsmm/Makefile,v
 retrieving revision 1.32
 diff -u -r1.32 Makefile
 --- devel/gnome-vfsmm/Makefile	25 Jul 2008 14:34:14 -0000	1.32
 +++ devel/gnome-vfsmm/Makefile	22 Aug 2008 11:43:59 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	2.22.0
  PORTREVISION=	1
  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
 Index: devel/gob2/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/gob2/Makefile,v
 retrieving revision 1.46
 diff -u -r1.46 Makefile
 --- devel/gob2/Makefile	6 Jun 2008 13:21:15 -0000	1.46
 +++ devel/gob2/Makefile	22 Aug 2008 11:43:59 -0000
 @@ -9,8 +9,7 @@
  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
 Index: devel/goffice04/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/goffice04/Makefile,v
 retrieving revision 1.23
 diff -u -r1.23 Makefile
 --- devel/goffice04/Makefile	6 Jun 2008 13:21:16 -0000	1.23
 +++ devel/goffice04/Makefile	22 Aug 2008 11:43:59 -0000
 @@ -11,8 +11,7 @@
  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
 Index: devel/goffice1/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/goffice1/Makefile,v
 retrieving revision 1.16
 diff -u -r1.16 Makefile
 --- devel/goffice1/Makefile	6 Jun 2008 13:21:16 -0000	1.16
 +++ devel/goffice1/Makefile	22 Aug 2008 11:43:59 -0000
 @@ -10,8 +10,7 @@
  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
 Index: devel/gtkmozedit/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/gtkmozedit/Makefile,v
 retrieving revision 1.14
 diff -u -r1.14 Makefile
 --- devel/gtkmozedit/Makefile	6 Jun 2008 13:21:17 -0000	1.14
 +++ devel/gtkmozedit/Makefile	22 Aug 2008 11:43:59 -0000
 @@ -9,8 +9,7 @@
  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
 Index: devel/gtranslator/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/gtranslator/Makefile,v
 retrieving revision 1.57
 diff -u -r1.57 Makefile
 --- devel/gtranslator/Makefile	6 Jun 2008 13:21:17 -0000	1.57
 +++ devel/gtranslator/Makefile	22 Aug 2008 11:44:01 -0000
 @@ -10,8 +10,7 @@
  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
 Index: devel/libIDL/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/libIDL/Makefile,v
 retrieving revision 1.48
 diff -u -r1.48 Makefile
 --- devel/libIDL/Makefile	19 Aug 2008 12:14:07 -0000	1.48
 +++ devel/libIDL/Makefile	22 Aug 2008 11:44:01 -0000
 @@ -9,8 +9,7 @@
  PORTNAME=	libIDL
  PORTVERSION=	0.8.11
  CATEGORIES=	devel
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.8
 +MASTER_SITES=	GNOME
  DIST_SUBDIR=	gnome2
  
  MAINTAINER=	gnome@FreeBSD.org
 Index: devel/libbonobo/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/libbonobo/Makefile,v
 retrieving revision 1.63
 diff -u -r1.63 Makefile
 --- devel/libbonobo/Makefile	6 Jun 2008 13:21:25 -0000	1.63
 +++ devel/libbonobo/Makefile	22 Aug 2008 11:44:02 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	2.22.0
  PORTREVISION?=	1
  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
 Index: devel/libbonobomm/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/libbonobomm/Makefile,v
 retrieving revision 1.23
 diff -u -r1.23 Makefile
 --- devel/libbonobomm/Makefile	6 Jun 2008 13:21:25 -0000	1.23
 +++ devel/libbonobomm/Makefile	22 Aug 2008 11:44:02 -0000
 @@ -9,8 +9,7 @@
  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
 Index: devel/libglade/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/libglade/Makefile,v
 retrieving revision 1.44
 diff -u -r1.44 Makefile
 --- devel/libglade/Makefile	21 Aug 2008 06:16:42 -0000	1.44
 +++ devel/libglade/Makefile	22 Aug 2008 11:44:02 -0000
 @@ -9,8 +9,7 @@
  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
 Index: devel/libglade-java/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/libglade-java/Makefile,v
 retrieving revision 1.20
 diff -u -r1.20 Makefile
 --- devel/libglade-java/Makefile	25 Jul 2008 14:34:15 -0000	1.20
 +++ devel/libglade-java/Makefile	22 Aug 2008 11:44:03 -0000
 @@ -10,8 +10,7 @@
  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
 Index: devel/libglade2/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/libglade2/Makefile,v
 retrieving revision 1.77
 diff -u -r1.77 Makefile
 --- devel/libglade2/Makefile	18 Aug 2008 22:12:07 -0000	1.77
 +++ devel/libglade2/Makefile	22 Aug 2008 11:44:03 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	2.6.3
  PORTREVISION?=	0
  CATEGORIES=	devel gnome
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/..$//}
 +MASTER_SITES=	GNOME
  DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
  DIST_SUBDIR=	gnome2
  
 Index: devel/libglademm24/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/libglademm24/Makefile,v
 retrieving revision 1.29
 diff -u -r1.29 Makefile
 --- devel/libglademm24/Makefile	6 Jun 2008 13:21:26 -0000	1.29
 +++ devel/libglademm24/Makefile	22 Aug 2008 11:44:03 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	2.6.6
  PORTREVISION=	1
  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
 Index: devel/libole2/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/libole2/Makefile,v
 retrieving revision 1.22
 diff -u -r1.22 Makefile
 --- devel/libole2/Makefile	21 Aug 2008 06:16:43 -0000	1.22
 +++ devel/libole2/Makefile	22 Aug 2008 11:44:03 -0000
 @@ -9,8 +9,7 @@
  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
 Index: devel/libsigc++12/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/libsigc++12/Makefile,v
 retrieving revision 1.34
 diff -u -r1.34 Makefile
 --- devel/libsigc++12/Makefile	28 Jan 2007 09:07:38 -0000	1.34
 +++ devel/libsigc++12/Makefile	22 Aug 2008 11:44:05 -0000
 @@ -9,9 +9,8 @@
  PORTVERSION=	1.2.7
  PORTREVISION=	1
  CATEGORIES=	devel
 -MASTER_SITES=	${MASTER_SITE_GNOME:S/$/:gnome/} \
 +MASTER_SITES=	${GNOME:S/$/:gnome/} \
  		${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
 -MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.2/:gnome \
  		libsigc/:sf
  DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:sf,gnome
  DIST_SUBDIR=	gnome2
 Index: devel/libsigc++20/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/libsigc++20/Makefile,v
 retrieving revision 1.48
 diff -u -r1.48 Makefile
 --- devel/libsigc++20/Makefile	25 Jul 2008 14:34:15 -0000	1.48
 +++ devel/libsigc++20/Makefile	22 Aug 2008 11:44:05 -0000
 @@ -9,8 +9,7 @@
  PORTNAME=	libsigc++
  PORTVERSION=	2.2.2
  CATEGORIES=	devel
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/libsigc++/${PORTVERSION:R}
 +MASTER_SITES=	GNOME
  
  MAINTAINER=	gnome@FreeBSD.org
  COMMENT=	Callback Framework for C++
 Index: devel/libsoup22/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/libsoup22/Makefile,v
 retrieving revision 1.60
 diff -u -r1.60 Makefile
 --- devel/libsoup22/Makefile	6 Jun 2008 13:21:29 -0000	1.60
 +++ devel/libsoup22/Makefile	22 Aug 2008 11:44:05 -0000
 @@ -10,8 +10,7 @@
  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
 Index: devel/orbitcpp/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/orbitcpp/Makefile,v
 retrieving revision 1.34
 diff -u -r1.34 Makefile
 --- devel/orbitcpp/Makefile	6 Jun 2008 13:21:36 -0000	1.34
 +++ devel/orbitcpp/Makefile	22 Aug 2008 11:44:05 -0000
 @@ -9,8 +9,7 @@
  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
 Index: devel/present/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/present/Makefile,v
 retrieving revision 1.9
 diff -u -r1.9 Makefile
 --- devel/present/Makefile	6 Jun 2008 13:21:43 -0000	1.9
 +++ devel/present/Makefile	22 Aug 2008 11:44:05 -0000
 @@ -10,8 +10,7 @@
  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
 Index: devel/py-gobject/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/py-gobject/Makefile,v
 retrieving revision 1.10
 diff -u -r1.10 Makefile
 --- devel/py-gobject/Makefile	29 Jun 2008 23:23:32 -0000	1.10
 +++ devel/py-gobject/Makefile	22 Aug 2008 11:44:05 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	2.14.2
  PORTREVISION=	2
  CATEGORIES=	devel python
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 +MASTER_SITES=	GNOME
  PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
  DISTNAME=	pygobject-${PORTVERSION}
  DIST_SUBDIR=	gnome2
 Index: devel/py-orbit/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/py-orbit/Makefile,v
 retrieving revision 1.21
 diff -u -r1.21 Makefile
 --- devel/py-orbit/Makefile	6 Jun 2008 13:21:45 -0000	1.21
 +++ devel/py-orbit/Makefile	22 Aug 2008 11:44:05 -0000
 @@ -9,8 +9,7 @@
  PORTVERSION=	2.14.3
  PORTREVISION=	1
  CATEGORIES=	devel python
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/pyorbit/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 +MASTER_SITES=	GNOME
  PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
  DISTNAME=	pyorbit-${PORTVERSION}
  DIST_SUBDIR=	gnome2
 Index: devel/soup/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/devel/soup/Makefile,v
 retrieving revision 1.21
 diff -u -r1.21 Makefile
 --- devel/soup/Makefile	6 Jun 2008 13:21:55 -0000	1.21
 +++ devel/soup/Makefile	22 Aug 2008 11:44:08 -0000
 @@ -9,8 +9,7 @@
  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
 Index: editors/gedit/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/editors/gedit/Makefile,v
 retrieving revision 1.72
 diff -u -r1.72 Makefile
 --- editors/gedit/Makefile	6 Jun 2008 13:25:47 -0000	1.72
 +++ editors/gedit/Makefile	22 Aug 2008 11:44:08 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	2.22.3
  PORTREVISION=	1
  CATEGORIES=	editors 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
 Index: editors/mlview/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/editors/mlview/Makefile,v
 retrieving revision 1.30
 diff -u -r1.30 Makefile
 --- editors/mlview/Makefile	20 Aug 2008 00:56:40 -0000	1.30
 +++ editors/mlview/Makefile	22 Aug 2008 11:44:08 -0000
 @@ -9,8 +9,7 @@
  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
 Index: games/atomix/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/games/atomix/Makefile,v
 retrieving revision 1.31
 diff -u -r1.31 Makefile
 --- games/atomix/Makefile	6 Jun 2008 13:31:16 -0000	1.31
 +++ games/atomix/Makefile	22 Aug 2008 11:44:08 -0000
 @@ -10,8 +10,7 @@
  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
 Index: games/gnome-games-extra-data/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/games/gnome-games-extra-data/Makefile,v
 retrieving revision 1.15
 diff -u -r1.15 Makefile
 --- games/gnome-games-extra-data/Makefile	6 Jun 2008 13:31:26 -0000	1.15
 +++ games/gnome-games-extra-data/Makefile	22 Aug 2008 11:44:08 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	2.22.0
  PORTREVISION=	2
  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
 Index: games/gnomechess/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/games/gnomechess/Makefile,v
 retrieving revision 1.21
 diff -u -r1.21 Makefile
 --- games/gnomechess/Makefile	6 Jun 2008 13:31:27 -0000	1.21
 +++ games/gnomechess/Makefile	22 Aug 2008 11:44:08 -0000
 @@ -9,8 +9,7 @@
  PORTVERSION=	0.3.3
  PORTREVISION=	7
  CATEGORIES=	games gnome
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/gnome-chess/0.3
 +MASTER_SITES=	GNOME
  DISTNAME=	gnome-chess-${PORTVERSION}
  
  MAINTAINER=	ports@FreeBSD.org
 Index: games/gtetrinet/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/games/gtetrinet/Makefile,v
 retrieving revision 1.46
 diff -u -r1.46 Makefile
 --- games/gtetrinet/Makefile	6 Jun 2008 13:31:29 -0000	1.46
 +++ games/gtetrinet/Makefile	22 Aug 2008 11:44:08 -0000
 @@ -8,8 +8,7 @@
  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
 Index: graphics/dia/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/graphics/dia/Makefile,v
 retrieving revision 1.69
 diff -u -r1.69 Makefile
 --- graphics/dia/Makefile	6 Jun 2008 13:34:17 -0000	1.69
 +++ graphics/dia/Makefile	22 Aug 2008 11:44:08 -0000
 @@ -11,8 +11,7 @@
  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
 Index: graphics/electriceyes/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/graphics/electriceyes/Makefile,v
 retrieving revision 1.41
 diff -u -r1.41 Makefile
 --- graphics/electriceyes/Makefile	6 Jun 2008 13:34:19 -0000	1.41
 +++ graphics/electriceyes/Makefile	22 Aug 2008 11:44:08 -0000
 @@ -9,8 +9,7 @@
  PORTVERSION=	0.3.12
  PORTREVISION=	6
  CATEGORIES=	graphics gnome
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/ee/0.3
 +MASTER_SITES=	GNOME
  DISTNAME=	ee-${PORTVERSION}
  
  MAINTAINER=	gnome@FreeBSD.org
 Index: graphics/eog/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/graphics/eog/Makefile,v
 retrieving revision 1.62
 diff -u -r1.62 Makefile
 --- graphics/eog/Makefile	1 Jul 2008 17:05:45 -0000	1.62
 +++ graphics/eog/Makefile	22 Aug 2008 11:44:10 -0000
 @@ -9,8 +9,7 @@
  PORTNAME=	eog
  PORTVERSION=	2.22.3
  CATEGORIES=	graphics gnome
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 +MASTER_SITES=	GNOME
  DIST_SUBDIR=	gnome2
  
  MAINTAINER=	gnome@FreeBSD.org
 Index: graphics/f-spot/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/graphics/f-spot/Makefile,v
 retrieving revision 1.30
 diff -u -r1.30 Makefile
 --- graphics/f-spot/Makefile	25 Jul 2008 22:46:14 -0000	1.30
 +++ graphics/f-spot/Makefile	22 Aug 2008 11:44:10 -0000
 @@ -11,8 +11,7 @@
  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
 Index: graphics/gdk-pixbuf/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/graphics/gdk-pixbuf/Makefile,v
 retrieving revision 1.53
 diff -u -r1.53 Makefile
 --- graphics/gdk-pixbuf/Makefile	21 Aug 2008 06:17:18 -0000	1.53
 +++ graphics/gdk-pixbuf/Makefile	22 Aug 2008 11:44:10 -0000
 @@ -9,8 +9,7 @@
  PORTVERSION=	0.22.0
  PORTREVISION=	8
  CATEGORIES?=	graphics
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/gdk-pixbuf/0.22
 +MASTER_SITES=	GNOME
  DISTNAME=	gdk-pixbuf-${PORTVERSION}
  DIST_SUBDIR=	gnome
  
 Index: graphics/gthumb/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/graphics/gthumb/Makefile,v
 retrieving revision 1.42
 diff -u -r1.42 Makefile
 --- graphics/gthumb/Makefile	6 Aug 2008 12:19:47 -0000	1.42
 +++ graphics/gthumb/Makefile	22 Aug 2008 11:44:13 -0000
 @@ -8,8 +8,7 @@
  PORTNAME=	gthumb
  PORTVERSION=	2.10.9
  CATEGORIES=	graphics
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.10
 +MASTER_SITES=	GNOME
  DIST_SUBDIR=	gnome2
  
  MAINTAINER=	pav@FreeBSD.org
 Index: graphics/imlib/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/graphics/imlib/Makefile,v
 retrieving revision 1.103
 diff -u -r1.103 Makefile
 --- graphics/imlib/Makefile	6 Jun 2008 13:34:35 -0000	1.103
 +++ graphics/imlib/Makefile	22 Aug 2008 11:44:13 -0000
 @@ -10,8 +10,7 @@
  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
 Index: graphics/libart_lgpl/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/graphics/libart_lgpl/Makefile,v
 retrieving revision 1.41
 diff -u -r1.41 Makefile
 --- graphics/libart_lgpl/Makefile	1 Feb 2008 04:27:17 -0000	1.41
 +++ graphics/libart_lgpl/Makefile	22 Aug 2008 11:44:13 -0000
 @@ -9,8 +9,7 @@
  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
  
 Index: graphics/libgnomecanvasmm26/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/graphics/libgnomecanvasmm26/Makefile,v
 retrieving revision 1.27
 diff -u -r1.27 Makefile
 --- graphics/libgnomecanvasmm26/Makefile	6 Jun 2008 13:34:40 -0000	1.27
 +++ graphics/libgnomecanvasmm26/Makefile	22 Aug 2008 11:44:13 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	2.22.0
  PORTREVISION=	2
  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
 Index: graphics/librsvg2/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/graphics/librsvg2/Makefile,v
 retrieving revision 1.67
 diff -u -r1.67 Makefile
 --- graphics/librsvg2/Makefile	6 Jun 2008 13:34:42 -0000	1.67
 +++ graphics/librsvg2/Makefile	22 Aug 2008 11:44:13 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	2.22.2
  PORTREVISION=	2
  CATEGORIES=	graphics gnome
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 +MASTER_SITES=	GNOME
  DISTNAME=	librsvg-${PORTVERSION}
  DIST_SUBDIR=	gnome2
  
 Index: graphics/passepartout/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/graphics/passepartout/Makefile,v
 retrieving revision 1.26
 diff -u -r1.26 Makefile
 --- graphics/passepartout/Makefile	6 Jun 2008 13:34:46 -0000	1.26
 +++ graphics/passepartout/Makefile	22 Aug 2008 11:44:13 -0000
 @@ -10,8 +10,7 @@
  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
 Index: math/gcalctool/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/math/gcalctool/Makefile,v
 retrieving revision 1.71
 diff -u -r1.71 Makefile
 --- math/gcalctool/Makefile	29 Jun 2008 23:31:43 -0000	1.71
 +++ math/gcalctool/Makefile	22 Aug 2008 11:44:13 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	5.22.3
  PORTEPOCH=	2
  CATEGORIES=	math gnome
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
 +MASTER_SITES=	GNOME
  DIST_SUBDIR=	gnome2
  
  MAINTAINER=	gnome@FreeBSD.org
 Index: math/gnumeric/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/math/gnumeric/Makefile,v
 retrieving revision 1.142
 diff -u -r1.142 Makefile
 --- math/gnumeric/Makefile	6 Jun 2008 13:43:58 -0000	1.142
 +++ math/gnumeric/Makefile	22 Aug 2008 11:44:13 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	1.8.3
  PORTREVISION=	1
  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
 Index: math/guppi/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/math/guppi/Makefile,v
 retrieving revision 1.36
 diff -u -r1.36 Makefile
 --- math/guppi/Makefile	21 Aug 2008 06:17:42 -0000	1.36
 +++ math/guppi/Makefile	22 Aug 2008 11:44:13 -0000
 @@ -9,8 +9,7 @@
  PORTVERSION=	0.40.3
  PORTREVISION=	12
  CATEGORIES=	math gnome
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/Guppi/0.40
 +MASTER_SITES=	GNOME
  DISTNAME=	Guppi-${PORTVERSION}
  
  MAINTAINER=	gahr@FreeBSD.org
 Index: misc/bigboard/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/misc/bigboard/Makefile,v
 retrieving revision 1.3
 diff -u -r1.3 Makefile
 --- misc/bigboard/Makefile	9 Jul 2008 01:39:48 -0000	1.3
 +++ misc/bigboard/Makefile	22 Aug 2008 11:44:17 -0000
 @@ -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
 Index: misc/gnome-mime-data/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/misc/gnome-mime-data/Makefile,v
 retrieving revision 1.40
 diff -u -r1.40 Makefile
 --- misc/gnome-mime-data/Makefile	6 Jun 2008 13:45:24 -0000	1.40
 +++ misc/gnome-mime-data/Makefile	22 Aug 2008 11:44:17 -0000
 @@ -9,8 +9,7 @@
  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
  
 Index: misc/gnome-user-docs/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/misc/gnome-user-docs/Makefile,v
 retrieving revision 1.36
 diff -u -r1.36 Makefile
 --- misc/gnome-user-docs/Makefile	6 Jun 2008 13:45:24 -0000	1.36
 +++ misc/gnome-user-docs/Makefile	22 Aug 2008 11:44:17 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	2.22.1
  PORTREVISION=	1
  CATEGORIES=	misc 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
 Index: misc/pybliographer/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/misc/pybliographer/Makefile,v
 retrieving revision 1.34
 diff -u -r1.34 Makefile
 --- misc/pybliographer/Makefile	6 Jun 2008 13:45:36 -0000	1.34
 +++ misc/pybliographer/Makefile	22 Aug 2008 11:44:17 -0000
 @@ -9,8 +9,7 @@
  PORTVERSION=	1.0.11
  PORTREVISION=	6
  CATEGORIES=	misc python gnome
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/pybliographer/1.0
 +MASTER_SITES=	GNOME
  
  MAINTAINER=	ports@FreeBSD.org
  COMMENT=	GUI and command-line tools for editing and searching bibliographic databases
 Index: misc/quick-lounge-applet/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/misc/quick-lounge-applet/Makefile,v
 retrieving revision 1.28
 diff -u -r1.28 Makefile
 --- misc/quick-lounge-applet/Makefile	6 Jun 2008 13:45:37 -0000	1.28
 +++ misc/quick-lounge-applet/Makefile	22 Aug 2008 11:44:17 -0000
 @@ -10,8 +10,7 @@
  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
 Index: net/desktop-data-model/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/net/desktop-data-model/Makefile,v
 retrieving revision 1.2
 diff -u -r1.2 Makefile
 --- net/desktop-data-model/Makefile	6 Jun 2008 13:49:57 -0000	1.2
 +++ net/desktop-data-model/Makefile	22 Aug 2008 11:44:17 -0000
 @@ -9,8 +9,7 @@
  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
 Index: net/ekiga/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/net/ekiga/Makefile,v
 retrieving revision 1.78
 diff -u -r1.78 Makefile
 --- net/ekiga/Makefile	6 Jun 2008 13:49:57 -0000	1.78
 +++ net/ekiga/Makefile	22 Aug 2008 11:44:17 -0000
 @@ -9,8 +9,7 @@
  PORTVERSION=	2.0.11
  PORTREVISION=	4
  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
 Index: net/gnome-mud/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/net/gnome-mud/Makefile,v
 retrieving revision 1.34
 diff -u -r1.34 Makefile
 --- net/gnome-mud/Makefile	6 Jun 2008 13:50:01 -0000	1.34
 +++ net/gnome-mud/Makefile	22 Aug 2008 11:44:17 -0000
 @@ -9,8 +9,7 @@
  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
 Index: net/gnome-netstatus/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/net/gnome-netstatus/Makefile,v
 retrieving revision 1.31
 diff -u -r1.31 Makefile
 --- net/gnome-netstatus/Makefile	6 Jun 2008 13:50:01 -0000	1.31
 +++ net/gnome-netstatus/Makefile	22 Aug 2008 11:44:17 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	2.12.1
  PORTREVISION=	7
  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
 Index: net/libgnetwork/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/net/libgnetwork/Makefile,v
 retrieving revision 1.25
 diff -u -r1.25 Makefile
 --- net/libgnetwork/Makefile	6 Jun 2008 13:50:07 -0000	1.25
 +++ net/libgnetwork/Makefile	22 Aug 2008 11:44:17 -0000
 @@ -9,8 +9,7 @@
  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
 Index: net/linc/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/net/linc/Makefile,v
 retrieving revision 1.43
 diff -u -r1.43 Makefile
 --- net/linc/Makefile	6 Jun 2008 22:01:01 -0000	1.43
 +++ net/linc/Makefile	22 Aug 2008 11:44:23 -0000
 @@ -9,8 +9,7 @@
  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
 Index: net/online-desktop/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/net/online-desktop/Makefile,v
 retrieving revision 1.4
 diff -u -r1.4 Makefile
 --- net/online-desktop/Makefile	10 Jul 2008 01:37:45 -0000	1.4
 +++ net/online-desktop/Makefile	22 Aug 2008 11:44:23 -0000
 @@ -8,8 +8,7 @@
  PORTNAME=	online-desktop
  PORTVERSION=	0.2.29
  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
 Index: net/straw/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/net/straw/Makefile,v
 retrieving revision 1.26
 diff -u -r1.26 Makefile
 --- net/straw/Makefile	6 Jun 2008 13:50:27 -0000	1.26
 +++ net/straw/Makefile	22 Aug 2008 11:44:23 -0000
 @@ -9,8 +9,7 @@
  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
 Index: net/vinagre/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/net/vinagre/Makefile,v
 retrieving revision 1.9
 diff -u -r1.9 Makefile
 --- net/vinagre/Makefile	6 Jun 2008 13:50:29 -0000	1.9
 +++ net/vinagre/Makefile	22 Aug 2008 11:44:23 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	0.5.1
  PORTREVISION=	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
 Index: net-im/gossip/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/net-im/gossip/Makefile,v
 retrieving revision 1.55
 diff -u -r1.55 Makefile
 --- net-im/gossip/Makefile	3 Aug 2008 23:15:55 -0000	1.55
 +++ net-im/gossip/Makefile	22 Aug 2008 11:44:23 -0000
 @@ -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
 Index: net-im/loudmouth/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/net-im/loudmouth/Makefile,v
 retrieving revision 1.44
 diff -u -r1.44 Makefile
 --- net-im/loudmouth/Makefile	3 Aug 2008 23:15:28 -0000	1.44
 +++ net-im/loudmouth/Makefile	22 Aug 2008 11:44:23 -0000
 @@ -9,8 +9,7 @@
  PORTVERSION=	1.4.1
  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
 Index: palm/gnome-pilot/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/palm/gnome-pilot/Makefile,v
 retrieving revision 1.79
 diff -u -r1.79 Makefile
 --- palm/gnome-pilot/Makefile	5 Jul 2008 05:31:31 -0000	1.79
 +++ palm/gnome-pilot/Makefile	22 Aug 2008 11:44:24 -0000
 @@ -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
 Index: print/ggv/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/print/ggv/Makefile,v
 retrieving revision 1.53
 diff -u -r1.53 Makefile
 --- print/ggv/Makefile	6 Jun 2008 13:57:46 -0000	1.53
 +++ print/ggv/Makefile	22 Aug 2008 11:44:24 -0000
 @@ -10,8 +10,7 @@
  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
 Index: print/gnome-cups-manager/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/print/gnome-cups-manager/Makefile,v
 retrieving revision 1.33
 diff -u -r1.33 Makefile
 --- print/gnome-cups-manager/Makefile	6 Jun 2008 13:57:46 -0000	1.33
 +++ print/gnome-cups-manager/Makefile	22 Aug 2008 11:44:24 -0000
 @@ -11,8 +11,7 @@
  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
 Index: print/gnome-print/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/print/gnome-print/Makefile,v
 retrieving revision 1.70
 diff -u -r1.70 Makefile
 --- print/gnome-print/Makefile	6 Jun 2008 13:57:46 -0000	1.70
 +++ print/gnome-print/Makefile	22 Aug 2008 11:44:28 -0000
 @@ -10,8 +10,7 @@
  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
  
 Index: print/libgnomecups/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/print/libgnomecups/Makefile,v
 retrieving revision 1.24
 diff -u -r1.24 Makefile
 --- print/libgnomecups/Makefile	6 Jun 2008 13:57:49 -0000	1.24
 +++ print/libgnomecups/Makefile	22 Aug 2008 11:44:28 -0000
 @@ -10,8 +10,7 @@
  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
 Index: print/libgnomeprint/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/print/libgnomeprint/Makefile,v
 retrieving revision 1.112
 diff -u -r1.112 Makefile
 --- print/libgnomeprint/Makefile	6 Jun 2008 14:33:38 -0000	1.112
 +++ print/libgnomeprint/Makefile	22 Aug 2008 11:44:28 -0000
 @@ -11,8 +11,7 @@
  PORTVERSION=	2.18.4
  PORTREVISION?=	2
  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
 Index: print/libgnomeprintmm/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/print/libgnomeprintmm/Makefile,v
 retrieving revision 1.12
 diff -u -r1.12 Makefile
 --- print/libgnomeprintmm/Makefile	6 Jun 2008 13:57:50 -0000	1.12
 +++ print/libgnomeprintmm/Makefile	22 Aug 2008 11:44:28 -0000
 @@ -9,8 +9,7 @@
  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
 Index: security/gnome-gpg/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/security/gnome-gpg/Makefile,v
 retrieving revision 1.6
 diff -u -r1.6 Makefile
 --- security/gnome-gpg/Makefile	6 Jun 2008 14:00:49 -0000	1.6
 +++ security/gnome-gpg/Makefile	22 Aug 2008 11:44:28 -0000
 @@ -9,8 +9,7 @@
  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
 Index: sysutils/battfink/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/sysutils/battfink/Makefile,v
 retrieving revision 1.14
 diff -u -r1.14 Makefile
 --- sysutils/battfink/Makefile	6 Jun 2008 14:02:51 -0000	1.14
 +++ sysutils/battfink/Makefile	22 Aug 2008 11:44:28 -0000
 @@ -9,8 +9,7 @@
  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
 Index: sysutils/brasero/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/sysutils/brasero/Makefile,v
 retrieving revision 1.11
 diff -u -r1.11 Makefile
 --- sysutils/brasero/Makefile	6 Jun 2008 14:02:52 -0000	1.11
 +++ sysutils/brasero/Makefile	22 Aug 2008 11:44:28 -0000
 @@ -9,8 +9,7 @@
  PORTVERSION=	0.7.1
  PORTREVISION=	4
  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
 Index: sysutils/gnome-control-center1/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/sysutils/gnome-control-center1/Makefile,v
 retrieving revision 1.56
 diff -u -r1.56 Makefile
 --- sysutils/gnome-control-center1/Makefile	6 Jun 2008 14:03:04 -0000	1.56
 +++ sysutils/gnome-control-center1/Makefile	22 Aug 2008 11:44:28 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	1.4.0.5
  PORTREVISION=	8
  CATEGORIES=	sysutils gnome
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/control-center/1.4
 +MASTER_SITES=	GNOME
  DISTNAME=	control-center-${PORTVERSION}
  DIST_SUBDIR=	gnome
  
 Index: sysutils/gnome-power-manager/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/sysutils/gnome-power-manager/Makefile,v
 retrieving revision 1.18
 diff -u -r1.18 Makefile
 --- sysutils/gnome-power-manager/Makefile	6 Jun 2008 14:03:05 -0000	1.18
 +++ sysutils/gnome-power-manager/Makefile	22 Aug 2008 11:44:28 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	2.22.1
  PORTREVISION=	2
  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
 Index: sysutils/pessulus/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/sysutils/pessulus/Makefile,v
 retrieving revision 1.11
 diff -u -r1.11 Makefile
 --- sysutils/pessulus/Makefile	6 Jun 2008 14:03:16 -0000	1.11
 +++ sysutils/pessulus/Makefile	22 Aug 2008 11:44:32 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	2.16.4
  PORTREVISION=	2
  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
 Index: textproc/gnome-spell/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/textproc/gnome-spell/Makefile,v
 retrieving revision 1.32
 diff -u -r1.32 Makefile
 --- textproc/gnome-spell/Makefile	6 Jun 2008 14:04:41 -0000	1.32
 +++ textproc/gnome-spell/Makefile	22 Aug 2008 11:44:32 -0000
 @@ -10,8 +10,7 @@
  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
 Index: textproc/gtk-doc/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/textproc/gtk-doc/Makefile,v
 retrieving revision 1.27
 diff -u -r1.27 Makefile
 --- textproc/gtk-doc/Makefile	6 Jun 2008 14:04:41 -0000	1.27
 +++ textproc/gtk-doc/Makefile	22 Aug 2008 11:44:32 -0000
 @@ -9,8 +9,7 @@
  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+
 Index: textproc/libcroco/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/textproc/libcroco/Makefile,v
 retrieving revision 1.18
 diff -u -r1.18 Makefile
 --- textproc/libcroco/Makefile	6 Jun 2008 14:04:47 -0000	1.18
 +++ textproc/libcroco/Makefile	22 Aug 2008 11:44:32 -0000
 @@ -9,8 +9,7 @@
  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
 Index: textproc/libxml/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/textproc/libxml/Makefile,v
 retrieving revision 1.57
 diff -u -r1.57 Makefile
 --- textproc/libxml/Makefile	28 Jan 2007 09:07:45 -0000	1.57
 +++ textproc/libxml/Makefile	22 Aug 2008 11:44:32 -0000
 @@ -9,8 +9,7 @@
  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
 Index: textproc/libxml++/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/textproc/libxml++/Makefile,v
 retrieving revision 1.38
 diff -u -r1.38 Makefile
 --- textproc/libxml++/Makefile	19 Apr 2008 17:53:57 -0000	1.38
 +++ textproc/libxml++/Makefile	22 Aug 2008 11:44:32 -0000
 @@ -10,8 +10,7 @@
  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++
 Index: textproc/libxml++26/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/textproc/libxml++26/Makefile,v
 retrieving revision 1.45
 diff -u -r1.45 Makefile
 --- textproc/libxml++26/Makefile	25 Jul 2008 14:34:44 -0000	1.45
 +++ textproc/libxml++26/Makefile	22 Aug 2008 11:44:32 -0000
 @@ -11,8 +11,7 @@
  PORTVERSION=	2.22.0
  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=	bland@FreeBSD.org
  COMMENT=	XML API for C++
 Index: textproc/meld/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/textproc/meld/Makefile,v
 retrieving revision 1.23
 diff -u -r1.23 Makefile
 --- textproc/meld/Makefile	6 Jun 2008 14:04:49 -0000	1.23
 +++ textproc/meld/Makefile	22 Aug 2008 11:44:32 -0000
 @@ -9,8 +9,7 @@
  PORTVERSION=	1.1.5.1
  PORTREVISION=	2
  CATEGORIES=	textproc devel python
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R:R}
 +MASTER_SITES=	GNOME
  
  MAINTAINER=	ports@FreeBSD.org
  COMMENT=	GNOME 2 visual diff and merge tool
 Index: textproc/scrollkeeper/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/textproc/scrollkeeper/Makefile,v
 retrieving revision 1.58
 diff -u -r1.58 Makefile
 --- textproc/scrollkeeper/Makefile	6 Jun 2008 14:05:00 -0000	1.58
 +++ textproc/scrollkeeper/Makefile	22 Aug 2008 11:44:32 -0000
 @@ -10,8 +10,7 @@
  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
 Index: textproc/xml-i18n-tools/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/textproc/xml-i18n-tools/Makefile,v
 retrieving revision 1.17
 diff -u -r1.17 Makefile
 --- textproc/xml-i18n-tools/Makefile	16 May 2006 05:30:32 -0000	1.17
 +++ textproc/xml-i18n-tools/Makefile	22 Aug 2008 11:44:32 -0000
 @@ -9,8 +9,7 @@
  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
 Index: www/evolution-webcal/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/www/evolution-webcal/Makefile,v
 retrieving revision 1.20
 diff -u -r1.20 Makefile
 --- www/evolution-webcal/Makefile	6 Jun 2008 14:06:52 -0000	1.20
 +++ www/evolution-webcal/Makefile	22 Aug 2008 11:44:32 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	2.21.92
  PORTREVISION=	2
  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
 Index: www/glibwww/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/www/glibwww/Makefile,v
 retrieving revision 1.18
 diff -u -r1.18 Makefile
 --- www/glibwww/Makefile	6 Jun 2008 14:06:54 -0000	1.18
 +++ www/glibwww/Makefile	22 Aug 2008 11:44:32 -0000
 @@ -9,8 +9,7 @@
  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
 Index: www/gnome-user-share/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/www/gnome-user-share/Makefile,v
 retrieving revision 1.24
 diff -u -r1.24 Makefile
 --- www/gnome-user-share/Makefile	6 Jun 2008 14:06:54 -0000	1.24
 +++ www/gnome-user-share/Makefile	22 Aug 2008 11:44:35 -0000
 @@ -10,8 +10,7 @@
  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
 Index: www/gnome-web-photo/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/www/gnome-web-photo/Makefile,v
 retrieving revision 1.12
 diff -u -r1.12 Makefile
 --- www/gnome-web-photo/Makefile	6 Jun 2008 14:06:54 -0000	1.12
 +++ www/gnome-web-photo/Makefile	22 Aug 2008 11:44:35 -0000
 @@ -11,8 +11,7 @@
  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
 Index: www/gtkhtml/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/www/gtkhtml/Makefile,v
 retrieving revision 1.77
 diff -u -r1.77 Makefile
 --- www/gtkhtml/Makefile	6 Jun 2008 14:06:55 -0000	1.77
 +++ www/gtkhtml/Makefile	22 Aug 2008 11:44:35 -0000
 @@ -9,8 +9,7 @@
  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
 Index: www/gtkhtml3/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/www/gtkhtml3/Makefile,v
 retrieving revision 1.100
 diff -u -r1.100 Makefile
 --- www/gtkhtml3/Makefile	1 Jul 2008 02:44:26 -0000	1.100
 +++ www/gtkhtml3/Makefile	22 Aug 2008 11:44:35 -0000
 @@ -9,8 +9,7 @@
  PORTNAME=	gtkhtml3
  PORTVERSION=	3.18.3
  CATEGORIES=	www gnome
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 +MASTER_SITES=	GNOME
  DISTNAME=	${PORTNAME:S/3$//}-${PORTVERSION}
  DIST_SUBDIR=	gnome2
  
 Index: www/gtkhtml38/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/www/gtkhtml38/Makefile,v
 retrieving revision 1.96
 diff -u -r1.96 Makefile
 --- www/gtkhtml38/Makefile	6 Jun 2008 14:06:55 -0000	1.96
 +++ www/gtkhtml38/Makefile	22 Aug 2008 11:44:35 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	3.12.3
  PORTREVISION=	5
  CATEGORIES=	www gnome
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 +MASTER_SITES=	GNOME
  DISTNAME=	${PORTNAME:S/3$//}-${PORTVERSION}
  DIST_SUBDIR=	gnome2
  
 Index: www/libghttp/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/www/libghttp/Makefile,v
 retrieving revision 1.33
 diff -u -r1.33 Makefile
 --- www/libghttp/Makefile	1 Feb 2007 02:42:00 -0000	1.33
 +++ www/libghttp/Makefile	22 Aug 2008 11:44:35 -0000
 @@ -9,8 +9,7 @@
  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
 Index: www/libgtkhtml/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/www/libgtkhtml/Makefile,v
 retrieving revision 1.84
 diff -u -r1.84 Makefile
 --- www/libgtkhtml/Makefile	6 Jun 2008 14:06:59 -0000	1.84
 +++ www/libgtkhtml/Makefile	22 Aug 2008 11:44:35 -0000
 @@ -10,8 +10,7 @@
  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
 Index: x11/gnome-libs/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11/gnome-libs/Makefile,v
 retrieving revision 1.126
 diff -u -r1.126 Makefile
 --- x11/gnome-libs/Makefile	6 Jun 2008 14:08:58 -0000	1.126
 +++ x11/gnome-libs/Makefile	22 Aug 2008 11:44:35 -0000
 @@ -10,8 +10,7 @@
  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
 Index: x11/libgnome/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11/libgnome/Makefile,v
 retrieving revision 1.161
 diff -u -r1.161 Makefile
 --- x11/libgnome/Makefile	6 Jun 2008 14:09:03 -0000	1.161
 +++ x11/libgnome/Makefile	22 Aug 2008 11:44:35 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	2.22.0
  PORTREVISION?=	1
  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
 Index: x11/libgnome-java/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11/libgnome-java/Makefile,v
 retrieving revision 1.21
 diff -u -r1.21 Makefile
 --- x11/libgnome-java/Makefile	25 Jul 2008 14:34:50 -0000	1.21
 +++ x11/libgnome-java/Makefile	22 Aug 2008 11:44:38 -0000
 @@ -10,8 +10,7 @@
  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
 Index: x11/libgnomemm26/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11/libgnomemm26/Makefile,v
 retrieving revision 1.29
 diff -u -r1.29 Makefile
 --- x11/libgnomemm26/Makefile	6 Jun 2008 14:09:04 -0000	1.29
 +++ x11/libgnomemm26/Makefile	22 Aug 2008 11:44:38 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	2.22.0
  PORTREVISION=	2
  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
 Index: x11/startup-notification/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11/startup-notification/Makefile,v
 retrieving revision 1.25
 diff -u -r1.25 Makefile
 --- x11/startup-notification/Makefile	19 Apr 2008 17:54:34 -0000	1.25
 +++ x11/startup-notification/Makefile	22 Aug 2008 11:44:39 -0000
 @@ -9,9 +9,8 @@
  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
 Index: x11-fm/gnome-commander/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-fm/gnome-commander/Makefile,v
 retrieving revision 1.23
 diff -u -r1.23 Makefile
 --- x11-fm/gnome-commander/Makefile	6 Jun 2008 14:12:20 -0000	1.23
 +++ x11-fm/gnome-commander/Makefile	22 Aug 2008 11:44:39 -0000
 @@ -9,8 +9,7 @@
  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
 Index: x11-fm/py-nautilus/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-fm/py-nautilus/Makefile,v
 retrieving revision 1.9
 diff -u -r1.9 Makefile
 --- x11-fm/py-nautilus/Makefile	6 Jun 2008 14:12:22 -0000	1.9
 +++ x11-fm/py-nautilus/Makefile	22 Aug 2008 11:44:39 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	0.5.0
  PORTREVISION=	1
  CATEGORIES=	x11-fm gnome
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/nautilus-python/${PORTVERSION:R}
 +MASTER_SITES=	GNOME
  PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
  DISTNAME=	nautilus-python-${PORTVERSION}
  
 Index: x11-fonts/bitstream-vera/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-fonts/bitstream-vera/Makefile,v
 retrieving revision 1.17
 diff -u -r1.17 Makefile
 --- x11-fonts/bitstream-vera/Makefile	19 Apr 2008 17:55:03 -0000	1.17
 +++ x11-fonts/bitstream-vera/Makefile	22 Aug 2008 11:44:39 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	1.10
  PORTREVISION=	4
  CATEGORIES=	x11-fonts
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/ttf-${PORTNAME}/1.10
 +MASTER_SITES=	GNOME
  DISTNAME=	ttf-${PORTNAME}-${PORTVERSION}
  DIST_SUBDIR=	gnome2
  
 Index: x11-themes/gnome-icons-aqua-fusion/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-themes/gnome-icons-aqua-fusion/Makefile,v
 retrieving revision 1.8
 diff -u -r1.8 Makefile
 --- x11-themes/gnome-icons-aqua-fusion/Makefile	13 Sep 2006 19:15:55 -0000	1.8
 +++ x11-themes/gnome-icons-aqua-fusion/Makefile	22 Aug 2008 11:44:39 -0000
 @@ -13,8 +13,7 @@
  PORTVERSION=	20030216
  PORTREVISION=	3
  CATEGORIES=	x11-themes gnome
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
 +MASTER_SITES=	GNOME
  DISTNAME=	ICON-AquaFusion
  
  MAINTAINER=	tmclaugh@FreeBSD.org
 Index: x11-themes/gnome-icons-gentoo-test/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-themes/gnome-icons-gentoo-test/Makefile,v
 retrieving revision 1.8
 diff -u -r1.8 Makefile
 --- x11-themes/gnome-icons-gentoo-test/Makefile	13 Sep 2006 19:15:56 -0000	1.8
 +++ x11-themes/gnome-icons-gentoo-test/Makefile	22 Aug 2008 11:44:39 -0000
 @@ -13,8 +13,7 @@
  PORTVERSION=	0.1
  PORTREVISION=	3
  CATEGORIES=	x11-themes gnome
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
 +MASTER_SITES=	GNOME
  DISTNAME=	ICON-Gentoo-Test
  
  MAINTAINER=	tmclaugh@FreeBSD.org
 Index: x11-themes/gnome-icons-iris/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-themes/gnome-icons-iris/Makefile,v
 retrieving revision 1.7
 diff -u -r1.7 Makefile
 --- x11-themes/gnome-icons-iris/Makefile	13 Sep 2006 19:15:56 -0000	1.7
 +++ x11-themes/gnome-icons-iris/Makefile	22 Aug 2008 11:44:39 -0000
 @@ -13,8 +13,7 @@
  PORTVERSION=	20050420
  PORTREVISION=	1
  CATEGORIES=	x11-themes gnome
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	teams/art.gnome.org/themes/icon
 +MASTER_SITES=	GNOME
  DISTNAME=	ICON-Iris
  
  MAINTAINER=	tmclaugh@FreeBSD.org
 Index: x11-themes/gnome-icons-noia-full/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-themes/gnome-icons-noia-full/Makefile,v
 retrieving revision 1.9
 diff -u -r1.9 Makefile
 --- x11-themes/gnome-icons-noia-full/Makefile	13 Sep 2006 19:15:56 -0000	1.9
 +++ x11-themes/gnome-icons-noia-full/Makefile	22 Aug 2008 11:44:39 -0000
 @@ -13,8 +13,7 @@
  PORTVERSION=	20041102
  PORTREVISION=	2
  CATEGORIES=	x11-themes gnome
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
 +MASTER_SITES=	GNOME
  DISTNAME=	ICON-Noia
  
  MAINTAINER=	tmclaugh@FreeBSD.org
 Index: x11-themes/gnome-icons-noia-warm/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-themes/gnome-icons-noia-warm/Makefile,v
 retrieving revision 1.9
 diff -u -r1.9 Makefile
 --- x11-themes/gnome-icons-noia-warm/Makefile	13 Sep 2006 19:15:56 -0000	1.9
 +++ x11-themes/gnome-icons-noia-warm/Makefile	22 Aug 2008 11:44:39 -0000
 @@ -13,8 +13,7 @@
  PORTVERSION=	20041102
  PORTREVISION=	2
  CATEGORIES=	x11-themes gnome
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
 +MASTER_SITES=	GNOME
  DISTNAME=	ICON-NoiaWarm
  
  MAINTAINER=	tmclaugh@FreeBSD.org
 Index: x11-themes/gnome-icons-refined/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-themes/gnome-icons-refined/Makefile,v
 retrieving revision 1.8
 diff -u -r1.8 Makefile
 --- x11-themes/gnome-icons-refined/Makefile	13 Sep 2006 19:15:57 -0000	1.8
 +++ x11-themes/gnome-icons-refined/Makefile	22 Aug 2008 11:44:39 -0000
 @@ -13,8 +13,7 @@
  PORTVERSION=	20030203
  PORTREVISION=	3
  CATEGORIES=	x11-themes gnome
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
 +MASTER_SITES=	GNOME
  DISTNAME=	ICON-Gnome-RH8
  
  MAINTAINER=	tmclaugh@FreeBSD.org
 Index: x11-themes/gnome-icons-slick/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-themes/gnome-icons-slick/Makefile,v
 retrieving revision 1.8
 diff -u -r1.8 Makefile
 --- x11-themes/gnome-icons-slick/Makefile	13 Sep 2006 19:15:57 -0000	1.8
 +++ x11-themes/gnome-icons-slick/Makefile	22 Aug 2008 11:44:43 -0000
 @@ -13,8 +13,7 @@
  PORTVERSION=	20030209
  PORTREVISION=	3
  CATEGORIES=	x11-themes gnome
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
 +MASTER_SITES=	GNOME
  DISTNAME=	ICON-Slick
  
  MAINTAINER=	tmclaugh@FreeBSD.org
 Index: x11-themes/gnome-icons-snow-apple/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-themes/gnome-icons-snow-apple/Makefile,v
 retrieving revision 1.8
 diff -u -r1.8 Makefile
 --- x11-themes/gnome-icons-snow-apple/Makefile	13 Sep 2006 19:15:57 -0000	1.8
 +++ x11-themes/gnome-icons-snow-apple/Makefile	22 Aug 2008 11:44:43 -0000
 @@ -13,8 +13,7 @@
  PORTVERSION=	20030202
  PORTREVISION=	3
  CATEGORIES=	x11-themes gnome
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
 +MASTER_SITES=	GNOME
  DISTNAME=	ICON-Snow-Apple
  
  MAINTAINER=	tmclaugh@FreeBSD.org
 Index: x11-themes/gnome-icons-stylish/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-themes/gnome-icons-stylish/Makefile,v
 retrieving revision 1.8
 diff -u -r1.8 Makefile
 --- x11-themes/gnome-icons-stylish/Makefile	13 Sep 2006 19:15:57 -0000	1.8
 +++ x11-themes/gnome-icons-stylish/Makefile	22 Aug 2008 11:44:43 -0000
 @@ -13,8 +13,7 @@
  PORTVERSION=	20030129
  PORTREVISION=	2
  CATEGORIES=	x11-themes gnome
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
 +MASTER_SITES=	GNOME
  DISTNAME=	ICON-Stylish
  
  MAINTAINER=	tmclaugh@FreeBSD.org
 Index: x11-themes/gnome-icons-ximian-south/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-themes/gnome-icons-ximian-south/Makefile,v
 retrieving revision 1.8
 diff -u -r1.8 Makefile
 --- x11-themes/gnome-icons-ximian-south/Makefile	13 Sep 2006 19:15:57 -0000	1.8
 +++ x11-themes/gnome-icons-ximian-south/Makefile	22 Aug 2008 11:44:43 -0000
 @@ -13,8 +13,7 @@
  PORTVERSION=	1.3.6
  PORTREVISION=	3
  CATEGORIES=	x11-themes gnome
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
 +MASTER_SITES=	GNOME
  DISTNAME=	ICON-Ximian-South-${PORTVERSION}
  
  MAINTAINER=	tmclaugh@FreeBSD.org
 Index: x11-themes/gtk-engines/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-themes/gtk-engines/Makefile,v
 retrieving revision 1.44
 diff -u -r1.44 Makefile
 --- x11-themes/gtk-engines/Makefile	6 Jun 2008 14:14:21 -0000	1.44
 +++ x11-themes/gtk-engines/Makefile	22 Aug 2008 11:44:43 -0000
 @@ -9,8 +9,7 @@
  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
 Index: x11-themes/gtk-engines2/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-themes/gtk-engines2/Makefile,v
 retrieving revision 1.73
 diff -u -r1.73 Makefile
 --- x11-themes/gtk-engines2/Makefile	1 Jul 2008 02:00:25 -0000	1.73
 +++ x11-themes/gtk-engines2/Makefile	22 Aug 2008 11:44:43 -0000
 @@ -9,8 +9,7 @@
  PORTNAME=	gtk-engines2
  PORTVERSION=	2.14.3
  CATEGORIES=	x11-themes
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 +MASTER_SITES=	GNOME
  DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
  DIST_SUBDIR=	gnome2
  
 Index: x11-toolkits/gal/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/gal/Makefile,v
 retrieving revision 1.57
 diff -u -r1.57 Makefile
 --- x11-toolkits/gal/Makefile	6 Jun 2008 14:16:10 -0000	1.57
 +++ x11-toolkits/gal/Makefile	22 Aug 2008 11:44:43 -0000
 @@ -9,8 +9,7 @@
  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
 Index: x11-toolkits/gal2/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/gal2/Makefile,v
 retrieving revision 1.76
 diff -u -r1.76 Makefile
 --- x11-toolkits/gal2/Makefile	10 Jun 2008 04:57:46 -0000	1.76
 +++ x11-toolkits/gal2/Makefile	22 Aug 2008 11:44:43 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	2.5.3
  PORTREVISION?=	6
  CATEGORIES=	x11-toolkits gnome
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.5
 +MASTER_SITES=	GNOME
  DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
  DIST_SUBDIR=	gnome2
  
 Index: x11-toolkits/gnome-sharp20/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/gnome-sharp20/Makefile,v
 retrieving revision 1.6
 diff -u -r1.6 Makefile
 --- x11-toolkits/gnome-sharp20/Makefile	25 Jul 2008 22:46:15 -0000	1.6
 +++ x11-toolkits/gnome-sharp20/Makefile	22 Aug 2008 11:44:43 -0000
 @@ -10,8 +10,7 @@
  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
 Index: x11-toolkits/gob/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/gob/Makefile,v
 retrieving revision 1.34
 diff -u -r1.34 Makefile
 --- x11-toolkits/gob/Makefile	21 Aug 2008 06:18:45 -0000	1.34
 +++ x11-toolkits/gob/Makefile	22 Aug 2008 11:44:43 -0000
 @@ -9,8 +9,7 @@
  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
 Index: x11-toolkits/gtk12/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/gtk12/Makefile,v
 retrieving revision 1.108
 diff -u -r1.108 Makefile
 --- x11-toolkits/gtk12/Makefile	6 Jun 2008 14:16:12 -0000	1.108
 +++ x11-toolkits/gtk12/Makefile	22 Aug 2008 11:44:43 -0000
 @@ -9,8 +9,7 @@
  PORTVERSION=	1.2.10
  PORTREVISION=	20
  CATEGORIES=	x11-toolkits
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/gtk+/1.2
 +MASTER_SITES=	GNOME
  DISTNAME=	gtk+-${PORTVERSION}
  
  MAINTAINER=	gnome@FreeBSD.org
 Index: x11-toolkits/gtk20/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/gtk20/Makefile,v
 retrieving revision 1.221
 diff -u -r1.221 Makefile
 --- x11-toolkits/gtk20/Makefile	2 Jul 2008 03:05:29 -0000	1.221
 +++ x11-toolkits/gtk20/Makefile	22 Aug 2008 11:44:44 -0000
 @@ -17,7 +17,6 @@
  		http://www.ameth.org/gimp/%SUBDIR%/ \
  		ftp://ftp.mirror.ac.uk/sites/ftp.gimp.org/pub/%SUBDIR%/ \
  		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
 -MASTER_SITE_SUBDIR=	gtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
  DISTNAME=	gtk+-${PORTVERSION}
  DIST_SUBDIR=	gnome2
  
 Index: x11-toolkits/gtkglarea2/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/gtkglarea2/Makefile,v
 retrieving revision 1.35
 diff -u -r1.35 Makefile
 --- x11-toolkits/gtkglarea2/Makefile	6 Jun 2008 14:16:14 -0000	1.35
 +++ x11-toolkits/gtkglarea2/Makefile	22 Aug 2008 11:44:44 -0000
 @@ -9,8 +9,7 @@
  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
  
 Index: x11-toolkits/gtkmm12/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/gtkmm12/Makefile,v
 retrieving revision 1.53
 diff -u -r1.53 Makefile
 --- x11-toolkits/gtkmm12/Makefile	6 Jun 2008 14:16:15 -0000	1.53
 +++ x11-toolkits/gtkmm12/Makefile	22 Aug 2008 11:44:44 -0000
 @@ -9,8 +9,7 @@
  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
 Index: x11-toolkits/gtkmm20/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/gtkmm20/Makefile,v
 retrieving revision 1.86
 diff -u -r1.86 Makefile
 --- x11-toolkits/gtkmm20/Makefile	10 Jun 2008 04:57:46 -0000	1.86
 +++ x11-toolkits/gtkmm20/Makefile	22 Aug 2008 11:44:47 -0000
 @@ -9,8 +9,8 @@
  PORTVERSION=	2.2.12
  PORTREVISION?=	9
  CATEGORIES=	x11-toolkits
 -MASTER_SITES=	${MASTER_SITE_GNOME} \
 -		${MASTER_SITE_SOURCEFORGE}
 +MASTER_SITES=	GNOME \
 +		SF
  MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2 \
  		gtkmm
  DIST_SUBDIR=	gnome2
 Index: x11-toolkits/gtkmm24/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/gtkmm24/Makefile,v
 retrieving revision 1.121
 diff -u -r1.121 Makefile
 --- x11-toolkits/gtkmm24/Makefile	25 Jul 2008 14:34:51 -0000	1.121
 +++ x11-toolkits/gtkmm24/Makefile	22 Aug 2008 11:44:47 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	2.12.7
  PORTREVISION?=	1
  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
 Index: x11-toolkits/gtksourceview/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/gtksourceview/Makefile,v
 retrieving revision 1.42
 diff -u -r1.42 Makefile
 --- x11-toolkits/gtksourceview/Makefile	10 Jun 2008 04:57:46 -0000	1.42
 +++ x11-toolkits/gtksourceview/Makefile	22 Aug 2008 11:44:47 -0000
 @@ -10,8 +10,7 @@
  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
 Index: x11-toolkits/gtksourceview2/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/gtksourceview2/Makefile,v
 retrieving revision 1.7
 diff -u -r1.7 Makefile
 --- x11-toolkits/gtksourceview2/Makefile	1 Jul 2008 03:38:46 -0000	1.7
 +++ x11-toolkits/gtksourceview2/Makefile	22 Aug 2008 11:44:47 -0000
 @@ -10,7 +10,7 @@
  PORTVERSION=	2.2.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
 Index: x11-toolkits/hippo-canvas/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/hippo-canvas/Makefile,v
 retrieving revision 1.4
 diff -u -r1.4 Makefile
 --- x11-toolkits/hippo-canvas/Makefile	9 Jul 2008 23:46:18 -0000	1.4
 +++ x11-toolkits/hippo-canvas/Makefile	22 Aug 2008 11:44:47 -0000
 @@ -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
 Index: x11-toolkits/libbonoboui/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/libbonoboui/Makefile,v
 retrieving revision 1.62
 diff -u -r1.62 Makefile
 --- x11-toolkits/libbonoboui/Makefile	6 Jun 2008 14:33:40 -0000	1.62
 +++ x11-toolkits/libbonoboui/Makefile	22 Aug 2008 11:44:47 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	2.22.0
  PORTREVISION?=	2
  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
 Index: x11-toolkits/libbonobouimm/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/libbonobouimm/Makefile,v
 retrieving revision 1.18
 diff -u -r1.18 Makefile
 --- x11-toolkits/libbonobouimm/Makefile	6 Jun 2008 14:16:19 -0000	1.18
 +++ x11-toolkits/libbonobouimm/Makefile	22 Aug 2008 11:44:47 -0000
 @@ -9,8 +9,7 @@
  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
 Index: x11-toolkits/libgnomeprintui/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/libgnomeprintui/Makefile,v
 retrieving revision 1.53
 diff -u -r1.53 Makefile
 --- x11-toolkits/libgnomeprintui/Makefile	6 Jun 2008 14:16:20 -0000	1.53
 +++ x11-toolkits/libgnomeprintui/Makefile	22 Aug 2008 11:44:48 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	2.18.2
  PORTREVISION=	2
  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
 Index: x11-toolkits/libgnomeprintuimm/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/libgnomeprintuimm/Makefile,v
 retrieving revision 1.12
 diff -u -r1.12 Makefile
 --- x11-toolkits/libgnomeprintuimm/Makefile	6 Jun 2008 14:16:21 -0000	1.12
 +++ x11-toolkits/libgnomeprintuimm/Makefile	22 Aug 2008 11:44:48 -0000
 @@ -9,8 +9,7 @@
  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
 Index: x11-toolkits/libgnomeui/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/libgnomeui/Makefile,v
 retrieving revision 1.61
 diff -u -r1.61 Makefile
 --- x11-toolkits/libgnomeui/Makefile	6 Jun 2008 14:33:40 -0000	1.61
 +++ x11-toolkits/libgnomeui/Makefile	22 Aug 2008 11:44:48 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	2.22.1
  PORTREVISION?=	2
  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
 Index: x11-toolkits/libgnomeuimm26/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/libgnomeuimm26/Makefile,v
 retrieving revision 1.30
 diff -u -r1.30 Makefile
 --- x11-toolkits/libgnomeuimm26/Makefile	6 Jun 2008 14:16:21 -0000	1.30
 +++ x11-toolkits/libgnomeuimm26/Makefile	22 Aug 2008 11:44:48 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	2.22.0
  PORTREVISION=	2
  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
 Index: x11-toolkits/libpanelappletmm/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/libpanelappletmm/Makefile,v
 retrieving revision 1.21
 diff -u -r1.21 Makefile
 --- x11-toolkits/libpanelappletmm/Makefile	6 Jun 2008 14:16:22 -0000	1.21
 +++ x11-toolkits/libpanelappletmm/Makefile	22 Aug 2008 11:44:51 -0000
 @@ -9,8 +9,7 @@
  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
 Index: x11-toolkits/libwnck/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/libwnck/Makefile,v
 retrieving revision 1.61
 diff -u -r1.61 Makefile
 --- x11-toolkits/libwnck/Makefile	1 Jul 2008 00:57:40 -0000	1.61
 +++ x11-toolkits/libwnck/Makefile	22 Aug 2008 11:44:51 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	2.22.3
  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
 Index: x11-toolkits/libzvt/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/libzvt/Makefile,v
 retrieving revision 1.34
 diff -u -r1.34 Makefile
 --- x11-toolkits/libzvt/Makefile	6 Jun 2008 14:16:23 -0000	1.34
 +++ x11-toolkits/libzvt/Makefile	22 Aug 2008 11:44:51 -0000
 @@ -9,8 +9,7 @@
  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
 Index: x11-toolkits/py-gnome/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/py-gnome/Makefile,v
 retrieving revision 1.77
 diff -u -r1.77 Makefile
 --- x11-toolkits/py-gnome/Makefile	13 Jul 2008 16:11:18 -0000	1.77
 +++ x11-toolkits/py-gnome/Makefile	22 Aug 2008 11:44:51 -0000
 @@ -9,7 +9,7 @@
  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
 Index: x11-toolkits/py-gnome-desktop/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/py-gnome-desktop/Makefile,v
 retrieving revision 1.10
 diff -u -r1.10 Makefile
 --- x11-toolkits/py-gnome-desktop/Makefile	6 Jun 2008 14:16:28 -0000	1.10
 +++ x11-toolkits/py-gnome-desktop/Makefile	22 Aug 2008 11:44:51 -0000
 @@ -10,7 +10,7 @@
  PORTVERSION=	2.22.0
  PORTREVISION=	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
 Index: x11-toolkits/py-gnome-extras/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/py-gnome-extras/Makefile,v
 retrieving revision 1.25
 diff -u -r1.25 Makefile
 --- x11-toolkits/py-gnome-extras/Makefile	6 Jun 2008 14:16:28 -0000	1.25
 +++ x11-toolkits/py-gnome-extras/Makefile	22 Aug 2008 11:44:51 -0000
 @@ -10,7 +10,7 @@
  PORTVERSION=	2.19.1
  PORTREVISION=	4
  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
 Index: x11-toolkits/py-gnome2/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/py-gnome2/Makefile,v
 retrieving revision 1.98
 diff -u -r1.98 Makefile
 --- x11-toolkits/py-gnome2/Makefile	15 Jun 2008 18:08:30 -0000	1.98
 +++ x11-toolkits/py-gnome2/Makefile	22 Aug 2008 11:44:51 -0000
 @@ -9,7 +9,7 @@
  PORTNAME=	gnome
  PORTVERSION=	2.22.1
  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}
 Index: x11-toolkits/py-gtk/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/py-gtk/Makefile,v
 retrieving revision 1.73
 diff -u -r1.73 Makefile
 --- x11-toolkits/py-gtk/Makefile	21 Aug 2008 06:18:46 -0000	1.73
 +++ x11-toolkits/py-gtk/Makefile	22 Aug 2008 11:44:51 -0000
 @@ -9,7 +9,7 @@
  PORTVERSION=	0.6.11
  PORTREVISION=	5
  CATEGORIES=	x11-toolkits python
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 +MASTER_SITES=	GNOME
  MASTER_SITE_SUBDIR=	sources/gnome-python/1.4
  DISTNAME=	gnome-python-1.4.4
  DIST_SUBDIR=	gnome
 Index: x11-toolkits/py-gtk2/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/py-gtk2/Makefile,v
 retrieving revision 1.97
 diff -u -r1.97 Makefile
 --- x11-toolkits/py-gtk2/Makefile	6 Jun 2008 14:16:28 -0000	1.97
 +++ x11-toolkits/py-gtk2/Makefile	22 Aug 2008 11:44:51 -0000
 @@ -10,7 +10,7 @@
  PORTVERSION=	2.12.1
  PORTREVISION=	1
  CATEGORIES=	x11-toolkits python
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 +MASTER_SITES=	GNOME
  MASTER_SITE_SUBDIR=	sources/pygtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
  PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
  DISTNAME=	pygtk-${PORTVERSION}
 Index: x11-toolkits/py-gtksourceview/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/py-gtksourceview/Makefile,v
 retrieving revision 1.3
 diff -u -r1.3 Makefile
 --- x11-toolkits/py-gtksourceview/Makefile	6 Jun 2008 14:16:29 -0000	1.3
 +++ x11-toolkits/py-gtksourceview/Makefile	22 Aug 2008 11:44:52 -0000
 @@ -10,7 +10,7 @@
  PORTVERSION=	2.2.0
  PORTREVISION=	1
  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}
 Index: x11-toolkits/rep-gtk/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/rep-gtk/Makefile,v
 retrieving revision 1.44
 diff -u -r1.44 Makefile
 --- x11-toolkits/rep-gtk/Makefile	6 Jun 2008 14:16:33 -0000	1.44
 +++ x11-toolkits/rep-gtk/Makefile	22 Aug 2008 11:44:52 -0000
 @@ -9,8 +9,7 @@
  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
 Index: x11-toolkits/vte/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-toolkits/vte/Makefile,v
 retrieving revision 1.82
 diff -u -r1.82 Makefile
 --- x11-toolkits/vte/Makefile	6 Jun 2008 14:16:36 -0000	1.82
 +++ x11-toolkits/vte/Makefile	22 Aug 2008 11:44:52 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	0.16.14
  PORTREVISION?=	1
  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
 Index: x11-wm/metacity/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/x11-wm/metacity/Makefile,v
 retrieving revision 1.63
 diff -u -r1.63 Makefile
 --- x11-wm/metacity/Makefile	6 Jun 2008 14:17:18 -0000	1.63
 +++ x11-wm/metacity/Makefile	22 Aug 2008 11:44:52 -0000
 @@ -10,8 +10,7 @@
  PORTVERSION=	2.22.0
  PORTREVISION=	2
  CATEGORIES=	x11-wm
 -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
 
 --------------050203040102010005060107--
Responsible-Changed-From-To: araujo->portmgr 
Responsible-Changed-By: pgollucci 
Responsible-Changed-When: Sat Dec 27 17:47:42 UTC 2008 
Responsible-Changed-Why:  
Do either araujo or myself need to do something for this ? 

http://www.freebsd.org/cgi/query-pr.cgi?pr=125243 
State-Changed-From-To: feedback->open 
State-Changed-By: araujo 
State-Changed-When: Tue Dec 30 18:14:32 UTC 2008 
State-Changed-Why:  
Feedback received. AND now I waiting slush be finish. 


Responsible-Changed-From-To: portmgr->araujo 
Responsible-Changed-By: araujo 
Responsible-Changed-When: Tue Dec 30 18:14:32 UTC 2008 
Responsible-Changed-Why:  
Feedback received. AND now I waiting slush be finish. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=125243 

From: Marcelo Araujo <araujobsdport@gmail.com>
To: Erwin Lansing <erwin@FreeBSD.org>
Cc: pgollucci@FreeBSD.org, portmgr@FreeBSD.org, gnome@FreeBSD.org,
	bug-followup@FreeBSD.org
Subject: Re: ports/125243: GNOME Macro (178 Ports)
Date: Fri, 16 Jan 2009 23:34:09 -0200

 --sdtB3X0nJg68CQEu
 Content-Type: text/plain; charset=iso-8859-1
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 On Sat, Dec 27, 2008 at 07:10:55PM +0100, Erwin Lansing wrote:
 >=20
 > I have no problem with this change, except it needs to wait until after
 > the slush is lifted.  When committed, one, or both, of you should be
 > standby to fix potential fallout, so I'd suggest scheduling it at at the
 > start of the day and where you have some time available for the
 > following few days.  Also, as gnome@ maintains most of the affected
 > ports, I'd suggest running it by them, but I don't see a reason why they
 > should have a problem with it.  All in all, handle it with care but I
 > see no reason for action by portmgr.  Go ahead.
 
 Hy guys,
 
 About this PR ports/125243, I'd like to run this patch into the CLUSTER to
 ensure that all are OK before to commit it. I tested this patch, but in
 anyway I need a double check.
 
 PATCH: http://people.freebsd.org/~araujo/logs/gnome.diff
 
 I'll need that portmgr approve these modifications.
 I waiting a reply, thanks.
 
 Best Regards,
 --=20
 Marcelo Araujo
 araujo@FreeBSD.org
 http://www.FreeBSD.org
 Never argue with an artist.
 
 --sdtB3X0nJg68CQEu
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (FreeBSD)
 
 iD8DBQFJcTWQovxJd1Pkz6gRAlN5AJwPn3pTkhEVKwVBz5baQqU33S108gCfYyNZ
 tWb54sI7YnfYakt/wRkAEWY=
 =d7Uk
 -----END PGP SIGNATURE-----
 
 --sdtB3X0nJg68CQEu--

From: Pav Lucistnik <pav@FreeBSD.org>
To: Marcelo Araujo <araujobsdport@gmail.com>
Cc: Erwin Lansing <erwin@FreeBSD.org>, pgollucci@FreeBSD.org,
        portmgr@FreeBSD.org, gnome@FreeBSD.org, bug-followup@FreeBSD.org
Subject: Re: ports/125243: GNOME Macro (178 Ports)
Date: Sat, 17 Jan 2009 20:43:57 +0100

 --=-kTT6Kqa9kGNosEgj5iwX
 Content-Type: text/plain; charset="ISO-8859-2"
 Content-Transfer-Encoding: quoted-printable
 
 Marcelo Araujo p=ED=B9e v p=E1 16. 01. 2009 v 23:34 -0200:
 
 > About this PR ports/125243, I'd like to run this patch into the CLUSTER t=
 o
 > ensure that all are OK before to commit it. I tested this patch, but in
 > anyway I need a double check.
 >=20
 > PATCH: http://people.freebsd.org/~araujo/logs/gnome.diff
 
 I will run it on pointyhat tomorrow morning (european time). You should
 have results back on Monday.
 
 --=20
 Pav Lucistnik <pav@oook.cz>
               <pav@FreeBSD.org>
 ... the obese drugged penguin used by Linux. -- Scott Long
 
 --=-kTT6Kqa9kGNosEgj5iwX
 Content-Type: application/pgp-signature; name="signature.asc"
 Content-Description: Toto je =?UTF-8?Q?digit=C3=A1ln=C4=9B?=
  =?ISO-8859-1?Q?_podepsan=E1?= =?UTF-8?Q?_=C4=8D=C3=A1st?=
  =?ISO-8859-1?Q?_zpr=E1vy?=
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (FreeBSD)
 
 iEYEABECAAYFAklyNP0ACgkQntdYP8FOsoLF9ACfdYZhw2PxaTVfJwdr2tMNlJeH
 ieAAnA6MQhkJdfFIGiYyIc02fg7AWxYr
 =Y2lU
 -----END PGP SIGNATURE-----
 
 --=-kTT6Kqa9kGNosEgj5iwX--
 
State-Changed-From-To: open->closed 
State-Changed-By: araujo 
State-Changed-When: Mon Feb 2 01:37:49 UTC 2009 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=125243 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/125243: commit references a PR
Date: Mon,  2 Feb 2009 01:36:30 +0000 (UTC)

 araujo      2009-02-02 01:36:16 UTC
 
   FreeBSD ports repository
 
   Modified files:
     accessibility/at-poke Makefile 
     accessibility/at-spi Makefile 
     accessibility/atk    Makefile 
     accessibility/dasher Makefile 
     accessibility/gnopernicus Makefile 
     accessibility/gok    Makefile 
     audio/esound         Makefile 
     audio/goobox         Makefile 
     audio/libaudiofile   Makefile 
     audio/rhythmbox      Makefile 
     audio/rhythmbox-devel Makefile 
     databases/gnome-db   Makefile 
     databases/libgda     Makefile 
     databases/libgda2    Makefile 
     databases/libgda3    Makefile 
     databases/libgdamm   Makefile 
     databases/libgnomedb Makefile 
     deskutils/ontv       Makefile 
     deskutils/planner    Makefile 
     devel/ORBit          Makefile 
     devel/bonobo         Makefile 
     devel/bonobo-conf    Makefile 
     devel/gconf          Makefile 
     devel/gconf2         Makefile 
     devel/gconfmm        Makefile 
     devel/gconfmm26      Makefile 
     devel/glade2         Makefile 
     devel/glib12         Makefile 
     devel/gnome-common   Makefile 
     devel/gnome-crash    Makefile 
     devel/gnome-vfs      Makefile 
     devel/gnome-vfs-monikers Makefile 
     devel/gnome-vfs1     Makefile 
     devel/gnome-vfsmm    Makefile 
     devel/gob2           Makefile 
     devel/goffice04      Makefile 
     devel/goffice1       Makefile 
     devel/gtkmozedit     Makefile 
     devel/gtranslator    Makefile 
     devel/libIDL         Makefile 
     devel/libbonobo      Makefile 
     devel/libbonobomm    Makefile 
     devel/libglade       Makefile 
     devel/libglade-java  Makefile 
     devel/libglade2      Makefile 
     devel/libglademm24   Makefile 
     devel/libole2        Makefile 
     devel/libsoup22      Makefile 
     devel/orbitcpp       Makefile 
     devel/present        Makefile 
     devel/py-gobject     Makefile 
     devel/py-orbit       Makefile 
     devel/soup           Makefile 
     editors/mlview       Makefile 
     games/atomix         Makefile 
     games/gnome-games-extra-data Makefile 
     games/gnomechess     Makefile 
     games/gtetrinet      Makefile 
     graphics/dia         Makefile 
     graphics/electriceyes Makefile 
     graphics/f-spot      Makefile 
     graphics/gdk-pixbuf  Makefile 
     graphics/imlib       Makefile 
     graphics/libart_lgpl Makefile 
     graphics/libgnomecanvasmm26 Makefile 
     graphics/librsvg2    Makefile 
     graphics/passepartout Makefile 
     math/gnumeric        Makefile 
     math/guppi           Makefile 
     misc/bigboard        Makefile 
     misc/gnome-mime-data Makefile 
     misc/pybliographer   Makefile 
     misc/quick-lounge-applet Makefile 
     net/desktop-data-model Makefile 
     net/ekiga            Makefile 
     net/gnome-mud        Makefile 
     net/gnome-netstatus  Makefile 
     net/libgnetwork      Makefile 
     net/linc             Makefile 
     net/online-desktop   Makefile 
     net/straw            Makefile 
     net-im/gossip        Makefile 
     net-im/loudmouth     Makefile 
     palm/gnome-pilot     Makefile 
     print/ggv            Makefile 
     print/gnome-cups-manager Makefile 
     print/gnome-print    Makefile 
     print/libgnomecups   Makefile 
     print/libgnomeprint  Makefile 
     print/libgnomeprintmm Makefile 
     security/gnome-gpg   Makefile 
     sysutils/battfink    Makefile 
     sysutils/brasero     Makefile 
     sysutils/gnome-control-center1 Makefile 
     sysutils/pessulus    Makefile 
     textproc/gnome-spell Makefile 
     textproc/gtk-doc     Makefile 
     textproc/libcroco    Makefile 
     textproc/libxml      Makefile 
     textproc/libxml++    Makefile 
     textproc/meld        Makefile 
     textproc/scrollkeeper Makefile 
     textproc/xml-i18n-tools Makefile 
     www/evolution-webcal Makefile 
     www/glibwww          Makefile 
     www/gnome-user-share Makefile 
     www/gnome-web-photo  Makefile 
     www/gtkhtml          Makefile 
     www/gtkhtml3         Makefile 
     www/gtkhtml38        Makefile 
     www/libghttp         Makefile 
     www/libgtkhtml       Makefile 
     x11/gnome-libs       Makefile 
     x11/libgnome         Makefile 
     x11/libgnome-java    Makefile 
     x11/libgnomemm26     Makefile 
     x11/startup-notification Makefile 
     x11-fm/gnome-commander Makefile 
     x11-fm/py-nautilus   Makefile 
     x11-fonts/bitstream-vera Makefile 
     x11-themes/gnome-icons-aqua-fusion Makefile 
     x11-themes/gnome-icons-gentoo-test Makefile 
     x11-themes/gnome-icons-iris Makefile 
     x11-themes/gnome-icons-noia-full Makefile 
     x11-themes/gnome-icons-noia-warm Makefile 
     x11-themes/gnome-icons-refined Makefile 
     x11-themes/gnome-icons-slick Makefile 
     x11-themes/gnome-icons-snow-apple Makefile 
     x11-themes/gnome-icons-stylish Makefile 
     x11-themes/gnome-icons-ximian-south Makefile 
     x11-themes/gtk-engines Makefile 
     x11-themes/gtk-engines2 Makefile 
     x11-toolkits/gal     Makefile 
     x11-toolkits/gal2    Makefile 
     x11-toolkits/gnome-sharp20 Makefile 
     x11-toolkits/gob     Makefile 
     x11-toolkits/gtk12   Makefile 
     x11-toolkits/gtkglarea2 Makefile 
     x11-toolkits/gtkmm12 Makefile 
     x11-toolkits/gtkmm20 Makefile 
     x11-toolkits/gtksourceview Makefile 
     x11-toolkits/gtksourceview2 Makefile 
     x11-toolkits/hippo-canvas Makefile 
     x11-toolkits/libbonoboui Makefile 
     x11-toolkits/libbonobouimm Makefile 
     x11-toolkits/libgnomeprintui Makefile 
     x11-toolkits/libgnomeprintuimm Makefile 
     x11-toolkits/libgnomeui Makefile 
     x11-toolkits/libgnomeuimm26 Makefile 
     x11-toolkits/libpanelappletmm Makefile 
     x11-toolkits/libzvt  Makefile 
     x11-toolkits/pangomm Makefile 
     x11-toolkits/py-gnome Makefile 
     x11-toolkits/py-gnome-desktop Makefile 
     x11-toolkits/py-gnome-extras Makefile 
     x11-toolkits/py-gnome2 Makefile 
     x11-toolkits/py-gtk  Makefile 
     x11-toolkits/py-gtksourceview Makefile 
     x11-toolkits/rep-gtk Makefile 
   Log:
   - 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)
   
   Revision  Changes    Path
   1.6       +1 -2      ports/accessibility/at-poke/Makefile
   1.67      +1 -2      ports/accessibility/at-spi/Makefile
   1.56      +1 -2      ports/accessibility/atk/Makefile
   1.46      +1 -2      ports/accessibility/dasher/Makefile
   1.39      +1 -2      ports/accessibility/gnopernicus/Makefile
   1.41      +1 -2      ports/accessibility/gok/Makefile
   1.74      +1 -2      ports/audio/esound/Makefile
   1.33      +1 -2      ports/audio/goobox/Makefile
   1.41      +1 -2      ports/audio/libaudiofile/Makefile
   1.115     +1 -2      ports/audio/rhythmbox-devel/Makefile
   1.111     +1 -2      ports/audio/rhythmbox/Makefile
   1.44      +1 -2      ports/databases/gnome-db/Makefile
   1.44      +1 -2      ports/databases/libgda/Makefile
   1.86      +1 -1      ports/databases/libgda2/Makefile
   1.89      +1 -1      ports/databases/libgda3/Makefile
   1.27      +1 -2      ports/databases/libgdamm/Makefile
   1.56      +1 -2      ports/databases/libgnomedb/Makefile
   1.8       +1 -2      ports/deskutils/ontv/Makefile
   1.50      +1 -2      ports/deskutils/planner/Makefile
   1.86      +1 -2      ports/devel/ORBit/Makefile
   1.32      +1 -2      ports/devel/bonobo-conf/Makefile
   1.75      +1 -2      ports/devel/bonobo/Makefile
   1.57      +1 -1      ports/devel/gconf/Makefile
   1.83      +1 -1      ports/devel/gconf2/Makefile
   1.18      +1 -2      ports/devel/gconfmm/Makefile
   1.30      +1 -2      ports/devel/gconfmm26/Makefile
   1.78      +1 -2      ports/devel/glade2/Makefile
   1.64      +1 -2      ports/devel/glib12/Makefile
   1.24      +1 -2      ports/devel/gnome-common/Makefile
   1.22      +1 -2      ports/devel/gnome-crash/Makefile
   1.5       +1 -2      ports/devel/gnome-vfs-monikers/Makefile
   1.136     +1 -2      ports/devel/gnome-vfs/Makefile
   1.59      +1 -2      ports/devel/gnome-vfs1/Makefile
   1.34      +1 -2      ports/devel/gnome-vfsmm/Makefile
   1.47      +1 -2      ports/devel/gob2/Makefile
   1.25      +1 -2      ports/devel/goffice04/Makefile
   1.17      +1 -2      ports/devel/goffice1/Makefile
   1.15      +1 -2      ports/devel/gtkmozedit/Makefile
   1.58      +1 -2      ports/devel/gtranslator/Makefile
   1.50      +1 -2      ports/devel/libIDL/Makefile
   1.65      +1 -2      ports/devel/libbonobo/Makefile
   1.24      +1 -2      ports/devel/libbonobomm/Makefile
   1.21      +1 -2      ports/devel/libglade-java/Makefile
   1.45      +1 -2      ports/devel/libglade/Makefile
   1.78      +1 -1      ports/devel/libglade2/Makefile
   1.31      +1 -2      ports/devel/libglademm24/Makefile
   1.23      +1 -2      ports/devel/libole2/Makefile
   1.61      +1 -2      ports/devel/libsoup22/Makefile
   1.35      +1 -2      ports/devel/orbitcpp/Makefile
   1.10      +1 -2      ports/devel/present/Makefile
   1.12      +1 -1      ports/devel/py-gobject/Makefile
   1.23      +1 -1      ports/devel/py-orbit/Makefile
   1.22      +1 -2      ports/devel/soup/Makefile
   1.31      +1 -2      ports/editors/mlview/Makefile
   1.32      +1 -2      ports/games/atomix/Makefile
   1.18      +1 -2      ports/games/gnome-games-extra-data/Makefile
   1.22      +1 -1      ports/games/gnomechess/Makefile
   1.47      +1 -2      ports/games/gtetrinet/Makefile
   1.70      +1 -2      ports/graphics/dia/Makefile
   1.42      +1 -1      ports/graphics/electriceyes/Makefile
   1.32      +1 -2      ports/graphics/f-spot/Makefile
   1.54      +1 -1      ports/graphics/gdk-pixbuf/Makefile
   1.104     +1 -2      ports/graphics/imlib/Makefile
   1.42      +1 -2      ports/graphics/libart_lgpl/Makefile
   1.29      +1 -2      ports/graphics/libgnomecanvasmm26/Makefile
   1.71      +1 -1      ports/graphics/librsvg2/Makefile
   1.27      +1 -2      ports/graphics/passepartout/Makefile
   1.146     +1 -2      ports/math/gnumeric/Makefile
   1.38      +1 -1      ports/math/guppi/Makefile
   1.4       +1 -2      ports/misc/bigboard/Makefile
   1.41      +1 -2      ports/misc/gnome-mime-data/Makefile
   1.36      +1 -1      ports/misc/pybliographer/Makefile
   1.29      +1 -2      ports/misc/quick-lounge-applet/Makefile
   1.56      +1 -2      ports/net-im/gossip/Makefile
   1.47      +1 -2      ports/net-im/loudmouth/Makefile
   1.3       +1 -2      ports/net/desktop-data-model/Makefile
   1.80      +1 -2      ports/net/ekiga/Makefile
   1.35      +1 -2      ports/net/gnome-mud/Makefile
   1.33      +1 -2      ports/net/gnome-netstatus/Makefile
   1.26      +1 -2      ports/net/libgnetwork/Makefile
   1.44      +1 -2      ports/net/linc/Makefile
   1.6       +1 -2      ports/net/online-desktop/Makefile
   1.27      +1 -2      ports/net/straw/Makefile
   1.80      +1 -2      ports/palm/gnome-pilot/Makefile
   1.54      +1 -2      ports/print/ggv/Makefile
   1.34      +1 -2      ports/print/gnome-cups-manager/Makefile
   1.71      +1 -2      ports/print/gnome-print/Makefile
   1.25      +1 -2      ports/print/libgnomecups/Makefile
   1.114     +1 -2      ports/print/libgnomeprint/Makefile
   1.13      +1 -2      ports/print/libgnomeprintmm/Makefile
   1.7       +1 -2      ports/security/gnome-gpg/Makefile
   1.15      +1 -2      ports/sysutils/battfink/Makefile
   1.17      +1 -2      ports/sysutils/brasero/Makefile
   1.57      +1 -1      ports/sysutils/gnome-control-center1/Makefile
   1.14      +1 -2      ports/sysutils/pessulus/Makefile
   1.33      +1 -2      ports/textproc/gnome-spell/Makefile
   1.28      +1 -2      ports/textproc/gtk-doc/Makefile
   1.19      +1 -2      ports/textproc/libcroco/Makefile
   1.39      +1 -2      ports/textproc/libxml++/Makefile
   1.58      +1 -2      ports/textproc/libxml/Makefile
   1.25      +1 -2      ports/textproc/meld/Makefile
   1.59      +1 -2      ports/textproc/scrollkeeper/Makefile
   1.18      +1 -2      ports/textproc/xml-i18n-tools/Makefile
   1.23      +1 -2      ports/www/evolution-webcal/Makefile
   1.19      +1 -2      ports/www/glibwww/Makefile
   1.25      +1 -2      ports/www/gnome-user-share/Makefile
   1.13      +1 -2      ports/www/gnome-web-photo/Makefile
   1.78      +1 -2      ports/www/gtkhtml/Makefile
   1.103     +1 -1      ports/www/gtkhtml3/Makefile
   1.99      +1 -1      ports/www/gtkhtml38/Makefile
   1.34      +1 -2      ports/www/libghttp/Makefile
   1.86      +1 -2      ports/www/libgtkhtml/Makefile
   1.24      +1 -2      ports/x11-fm/gnome-commander/Makefile
   1.12      +1 -1      ports/x11-fm/py-nautilus/Makefile
   1.18      +1 -1      ports/x11-fonts/bitstream-vera/Makefile
   1.9       +1 -1      ports/x11-themes/gnome-icons-aqua-fusion/Makefile
   1.9       +1 -1      ports/x11-themes/gnome-icons-gentoo-test/Makefile
   1.8       +1 -1      ports/x11-themes/gnome-icons-iris/Makefile
   1.10      +1 -1      ports/x11-themes/gnome-icons-noia-full/Makefile
   1.10      +1 -1      ports/x11-themes/gnome-icons-noia-warm/Makefile
   1.9       +1 -1      ports/x11-themes/gnome-icons-refined/Makefile
   1.9       +1 -1      ports/x11-themes/gnome-icons-slick/Makefile
   1.9       +1 -1      ports/x11-themes/gnome-icons-snow-apple/Makefile
   1.9       +1 -1      ports/x11-themes/gnome-icons-stylish/Makefile
   1.9       +1 -1      ports/x11-themes/gnome-icons-ximian-south/Makefile
   1.45      +1 -2      ports/x11-themes/gtk-engines/Makefile
   1.76      +1 -1      ports/x11-themes/gtk-engines2/Makefile
   1.58      +1 -2      ports/x11-toolkits/gal/Makefile
   1.78      +1 -1      ports/x11-toolkits/gal2/Makefile
   1.7       +1 -2      ports/x11-toolkits/gnome-sharp20/Makefile
   1.35      +1 -2      ports/x11-toolkits/gob/Makefile
   1.109     +1 -1      ports/x11-toolkits/gtk12/Makefile
   1.36      +1 -2      ports/x11-toolkits/gtkglarea2/Makefile
   1.54      +1 -2      ports/x11-toolkits/gtkmm12/Makefile
   1.87      +1 -1      ports/x11-toolkits/gtkmm20/Makefile
   1.43      +1 -2      ports/x11-toolkits/gtksourceview/Makefile
   1.10      +1 -1      ports/x11-toolkits/gtksourceview2/Makefile
   1.5       +1 -2      ports/x11-toolkits/hippo-canvas/Makefile
   1.64      +1 -2      ports/x11-toolkits/libbonoboui/Makefile
   1.19      +1 -2      ports/x11-toolkits/libbonobouimm/Makefile
   1.55      +1 -2      ports/x11-toolkits/libgnomeprintui/Makefile
   1.13      +1 -2      ports/x11-toolkits/libgnomeprintuimm/Makefile
   1.63      +1 -2      ports/x11-toolkits/libgnomeui/Makefile
   1.32      +1 -2      ports/x11-toolkits/libgnomeuimm26/Makefile
   1.22      +1 -2      ports/x11-toolkits/libpanelappletmm/Makefile
   1.37      +1 -2      ports/x11-toolkits/libzvt/Makefile
   1.2       +1 -2      ports/x11-toolkits/pangomm/Makefile
   1.13      +1 -1      ports/x11-toolkits/py-gnome-desktop/Makefile
   1.27      +1 -1      ports/x11-toolkits/py-gnome-extras/Makefile
   1.78      +1 -1      ports/x11-toolkits/py-gnome/Makefile
   1.100     +1 -1      ports/x11-toolkits/py-gnome2/Makefile
   1.74      +1 -2      ports/x11-toolkits/py-gtk/Makefile
   1.6       +1 -1      ports/x11-toolkits/py-gtksourceview/Makefile
   1.45      +1 -2      ports/x11-toolkits/rep-gtk/Makefile
   1.127     +1 -2      ports/x11/gnome-libs/Makefile
   1.22      +1 -2      ports/x11/libgnome-java/Makefile
   1.163     +1 -2      ports/x11/libgnome/Makefile
   1.31      +1 -2      ports/x11/libgnomemm26/Makefile
   1.26      +1 -2      ports/x11/startup-notification/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
