ports/125243: GNOME Macro (178 Ports)

Philip Gollucci pgollucci at p6m7g8.com
Thu Jul 3 19:30:10 UTC 2008


>Number:         125243
>Category:       ports
>Synopsis:       GNOME Macro (178 Ports)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 03 19:30:10 UTC 2008
>Closed-Date:
>Last-Modified:
>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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at FreeBSD.org
--- gnome3.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list