Change the MASTER_SITE_SUBDIR from:

	sources/${PORTNAME}/[0-9]

To:

	sources/${PORTNAME}/${PORTVERSION:R}

Lazy way is nice. ;-) Those have been tested.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5897 df743ca5-7f9a-e211-a948-0013205c9059

29 files changed, 60 insertions, 60 deletions

diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index 0a8be0c1b..c130bbc01 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/bugbuddy/Makefile,v 1.25 2006/03/02 20:31:34 mezz Exp $
+#   $MCom: ports/devel/bugbuddy/Makefile,v 1.26 2006/03/12 22:32:27 mezz Exp $
 #
 
 PORTNAME=	bugbuddy
 PORTVERSION=	2.14.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/bug-buddy/2.14
+MASTER_SITE_SUBDIR=	sources/bug-buddy/${PORTVERSION:R}
 DISTNAME=	bug-buddy-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/bugbuddy/Makefile b/devel/bugbuddy/Makefile
index 0a8be0c1b..c130bbc01 100644
--- a/devel/bugbuddy/Makefile
+++ b/devel/bugbuddy/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/bugbuddy/Makefile,v 1.25 2006/03/02 20:31:34 mezz Exp $
+#   $MCom: ports/devel/bugbuddy/Makefile,v 1.26 2006/03/12 22:32:27 mezz Exp $
 #
 
 PORTNAME=	bugbuddy
 PORTVERSION=	2.14.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/bug-buddy/2.14
+MASTER_SITE_SUBDIR=	sources/bug-buddy/${PORTVERSION:R}
 DISTNAME=	bug-buddy-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 2237a18a8..14d128f36 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gconf2/Makefile,v 1.67 2006/02/24 20:43:27 marcus Exp $
+#   $MCom: ports/devel/gconf2/Makefile,v 1.68 2006/03/02 20:31:34 mezz Exp $
 #
 
 PORTNAME=	gconf2
@@ -11,7 +11,7 @@ PORTVERSION=	2.13.5
 PORTREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/GConf/2.13
+MASTER_SITE_SUBDIR=	sources/GConf/${PORTVERSION:R}
 DISTNAME=	GConf-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index d72bcbba0..b0a71cd8f 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/glade3/Makefile,v 1.6 2006/02/24 18:14:28 marcus Exp $
+#   $MCom: ports/devel/glade3/Makefile,v 1.7 2006/03/02 20:31:34 mezz Exp $
 #
 
 PORTNAME=	glade3
@@ -11,7 +11,7 @@ PORTVERSION=	2.91.0
 PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/glade-3/2.91
+MASTER_SITE_SUBDIR=	sources/glade-3/${PORTVERSION:R}
 DISTNAME=	glade-3-${PORTVERSION}
 
 MAINTAINER=	kwm@FreeBSD.org
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index bdf50f57d..a3e77b23c 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,14 +3,14 @@
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/glib20/Makefile,v 1.70 2006/02/25 09:34:17 marcus Exp $
+#   $MCom: ports/devel/glib20/Makefile,v 1.71 2006/03/07 20:08:51 marcus Exp $
 #
 
 PORTNAME=	glib
 PORTVERSION=	2.10.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.10,} \
-		ftp://ftp.gtk.org/pub/gtk/v2.10/ \
+		ftp://ftp.gtk.org/pub/gtk/v${PORTVERSION:R}/ \
 		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
 		http://www.ameth.org/gimp/%SUBDIR%/ \
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index baa7ec1d7..719947718 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gnomevfs2/Makefile,v 1.131 2006/02/27 17:01:55 marcus Exp $
+#   $MCom: ports/devel/gnomevfs2/Makefile,v 1.132 2006/03/02 20:31:34 mezz Exp $
 #
 
 PORTNAME=	gnomevfs2
 PORTVERSION=	2.13.92
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.13
+MASTER_SITE_SUBDIR=	sources/gnome-vfs/${PORTVERSION:R}
 DISTNAME=	gnome-vfs-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index baa7ec1d7..719947718 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gnomevfs2/Makefile,v 1.131 2006/02/27 17:01:55 marcus Exp $
+#   $MCom: ports/devel/gnomevfs2/Makefile,v 1.132 2006/03/02 20:31:34 mezz Exp $
 #
 
 PORTNAME=	gnomevfs2
 PORTVERSION=	2.13.92
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.13
+MASTER_SITE_SUBDIR=	sources/gnome-vfs/${PORTVERSION:R}
 DISTNAME=	gnome-vfs-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 79277b48c..ac657dbd0 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -3,14 +3,14 @@
 # Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/devel/libbonobo/Makefile,v 1.40 2006/03/02 20:31:34 mezz Exp $
+#    $MCom: ports/devel/libbonobo/Makefile,v 1.41 2006/03/07 20:04:33 marcus Exp $
 #
 
 PORTNAME=	libbonobo
 PORTVERSION=	2.13.93
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.13
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 6cedda26f..3e095b391 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -3,14 +3,14 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/libgtop2/Makefile,v 1.62 2006/02/28 05:11:17 marcus Exp $
+#   $MCom: ports/devel/libgtop2/Makefile,v 1.63 2006/03/02 20:31:35 mezz Exp $
 #
 
 PORTNAME=	libgtop2
 PORTVERSION=	2.13.92
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.13
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:R}
 DISTNAME=	libgtop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index bc802932f..42182d343 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -2,15 +2,15 @@
 # Date created:				12 March 2003
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
-# $FreeBSD: ports/devel/libsoup/Makefile,v 1.38 2006/02/23 10:36:00 ade Exp $
-#   $MCom: ports/devel/libsoup/Makefile,v 1.30 2005/08/29 03:22:33 marcus Exp $
+# $FreeBSD$
+#   $MCom: ports/devel/libsoup/Makefile,v 1.32 2006/03/04 20:29:39 marcus Exp $
 #
 
 PORTNAME=	libsoup
 PORTVERSION=	2.2.91
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/libsoup22/Makefile b/devel/libsoup22/Makefile
index bc802932f..42182d343 100644
--- a/devel/libsoup22/Makefile
+++ b/devel/libsoup22/Makefile
@@ -2,15 +2,15 @@
 # Date created:				12 March 2003
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
-# $FreeBSD: ports/devel/libsoup/Makefile,v 1.38 2006/02/23 10:36:00 ade Exp $
-#   $MCom: ports/devel/libsoup/Makefile,v 1.30 2005/08/29 03:22:33 marcus Exp $
+# $FreeBSD$
+#   $MCom: ports/devel/libsoup/Makefile,v 1.32 2006/03/04 20:29:39 marcus Exp $
 #
 
 PORTNAME=	libsoup
 PORTVERSION=	2.2.91
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index 2de029858..6a7840548 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/py-gobject/Makefile,v 1.1 2006/01/17 05:47:32 marcus Exp $
+#   $MCom: ports/devel/py-gobject/Makefile,v 1.2 2006/02/24 18:33:38 marcus Exp $
 
 PORTNAME=	gobject
 PORTVERSION=	2.9.1
 PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/pygobject/2.9
+MASTER_SITE_SUBDIR=	sources/pygobject/${PORTVERSION:R}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pygobject-${PORTVERSION}
 DIST_SUBDIR=	gnome2
diff --git a/devel/py-orbit2/Makefile b/devel/py-orbit2/Makefile
index 31bd8eb86..93464f5d2 100644
--- a/devel/py-orbit2/Makefile
+++ b/devel/py-orbit2/Makefile
@@ -3,13 +3,13 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/devel/py-orbit2/Makefile,v 1.8 2006/03/12 23:37:44 marcus Exp $
 
 PORTNAME=	orbit
 PORTVERSION=	2.14.0
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/pyorbit/2.14
+MASTER_SITE_SUBDIR=	sources/pyorbit/${PORTVERSION:R}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pyorbit-${PORTVERSION}
 DIST_SUBDIR=	gnome2
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index f0875d7c9..4bb277967 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/editors/gedit/Makefile,v 1.27 2006/03/06 18:48:09 marcus Exp $
+#   $MCom$
 #
 
 PORTNAME=	gedit
 PORTVERSION=	2.14.0
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.14
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 5e3ce18a2..d486eb9ca 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/games/gnomegames2/Makefile,v 1.103 2006/02/25 20:05:40 marcus Exp $
+#   $MCom: ports/games/gnomegames2/Makefile,v 1.104 2006/03/02 20:36:47 mezz Exp $
 #
 
 PORTNAME=	gnomegames2
 PORTVERSION=	2.13.8
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-games/2.13
+MASTER_SITE_SUBDIR=	sources/gnome-games/${PORTVERSION:R}
 DISTNAME=	gnome-games-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index 5e3ce18a2..d486eb9ca 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/games/gnomegames2/Makefile,v 1.103 2006/02/25 20:05:40 marcus Exp $
+#   $MCom: ports/games/gnomegames2/Makefile,v 1.104 2006/03/02 20:36:47 mezz Exp $
 #
 
 PORTNAME=	gnomegames2
 PORTVERSION=	2.13.8
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-games/2.13
+MASTER_SITE_SUBDIR=	sources/gnome-games/${PORTVERSION:R}
 DISTNAME=	gnome-games-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index c823468f6..f9781509b 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -3,14 +3,14 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/eog/Makefile,v 1.23 2006/03/02 20:43:04 mezz Exp $
+#   $MCom: ports/graphics/eog/Makefile,v 1.24 2006/03/04 18:01:59 mezz Exp $
 #
 
 PORTNAME=	eog
 PORTVERSION=	2.13.92
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.13
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:R}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 838f0f05b..426120dfc 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/libgnomecanvas/Makefile,v 1.52 2006/02/24 20:43:28 marcus Exp $
+#   $MCom: ports/graphics/libgnomecanvas/Makefile,v 1.53 2006/03/02 20:43:05 mezz Exp $
 #
 
 PORTNAME=	libgnomecanvas
@@ -11,7 +11,7 @@ PORTVERSION=	2.13.0
 PORTREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.13
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index e9950ba0a..f37b1a8eb 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -3,14 +3,14 @@
 # Whom:                 		Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/graphics/librsvg2/Makefile,v 1.92 2006/02/28 21:08:12 marcus Exp $
+#    $MCom: ports/graphics/librsvg2/Makefile,v 1.93 2006/03/11 18:41:56 marcus Exp $
 #
 
 PORTNAME=	librsvg2
 PORTVERSION=	2.14.2
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.14
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:R}
 DISTNAME=	librsvg-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index 3de8c984a..7c812db19 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Adam Weinberger, based off kiesel's ximian-exchange port
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution-exchange/Makefile,v 1.52 2006/02/28 02:18:27 marcus Exp $
+#   $MCom: ports/mail/evolution-exchange/Makefile,v 1.53 2006/03/02 20:44:15 mezz Exp $
 #
 
 PORTNAME=	evolution-exchange
 PORTVERSION=	2.5.92
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/2.5
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:R}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	kiesel@schlund.de
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 0f5a718ce..2715b1c5e 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution/Makefile,v 1.92 2006/02/26 15:40:09 marcus Exp $
+#   $MCom: ports/mail/evolution/Makefile,v 1.93 2006/02/28 02:13:22 marcus Exp $
 #
 
 PORTNAME=	evolution
 PORTVERSION=	2.5.92
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.5
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile
index 7a0dfa5bf..eaa30ad49 100644
--- a/misc/gnome-icon-theme/Makefile
+++ b/misc/gnome-icon-theme/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.69 2006/02/25 22:23:54 marcus Exp $
+#   $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.70 2006/02/25 22:24:40 marcus Exp $
 #
 
 PORTNAME=	gnome-icon-theme
 PORTVERSION=	2.14.1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.14
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile
index d4f104f58..25a24cf62 100644
--- a/misc/gnome-user-docs/Makefile
+++ b/misc/gnome-user-docs/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/misc/gnomeuserdocs2/Makefile,v 1.18 2006/02/21 05:02:12 marcus Exp $
+#   $MCom: ports/misc/gnomeuserdocs2/Makefile,v 1.19 2006/02/21 19:39:50 marcus Exp $
 #
 
 PORTNAME=	gnomeuserdocs2
 PORTVERSION=	2.13.1.1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-user-docs/2.13
+MASTER_SITE_SUBDIR=	sources/gnome-user-docs/${PORTVERSION:R:R}
 DISTNAME=	gnome-user-docs-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/misc/gnomeuserdocs2/Makefile b/misc/gnomeuserdocs2/Makefile
index d4f104f58..25a24cf62 100644
--- a/misc/gnomeuserdocs2/Makefile
+++ b/misc/gnomeuserdocs2/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/misc/gnomeuserdocs2/Makefile,v 1.18 2006/02/21 05:02:12 marcus Exp $
+#   $MCom: ports/misc/gnomeuserdocs2/Makefile,v 1.19 2006/02/21 19:39:50 marcus Exp $
 #
 
 PORTNAME=	gnomeuserdocs2
 PORTVERSION=	2.13.1.1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-user-docs/2.13
+MASTER_SITE_SUBDIR=	sources/gnome-user-docs/${PORTVERSION:R:R}
 DISTNAME=	gnome-user-docs-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index 29d51d0d3..089857d7c 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/gnomenettool/Makefile,v 1.16 2006/02/28 04:27:16 marcus Exp $
+#   $MCom: ports/net/gnomenettool/Makefile,v 1.17 2006/03/02 20:53:10 mezz Exp $
 #
 
 PORTNAME=	gnomenettool
@@ -11,7 +11,7 @@ PORTVERSION=	2.13.91
 PORTEPOCH=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-nettool/2.13
+MASTER_SITE_SUBDIR=	sources/gnome-nettool/${PORTVERSION:R}
 DISTNAME=	gnome-nettool-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/net/gnomenettool/Makefile b/net/gnomenettool/Makefile
index 29d51d0d3..089857d7c 100644
--- a/net/gnomenettool/Makefile
+++ b/net/gnomenettool/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/gnomenettool/Makefile,v 1.16 2006/02/28 04:27:16 marcus Exp $
+#   $MCom: ports/net/gnomenettool/Makefile,v 1.17 2006/03/02 20:53:10 mezz Exp $
 #
 
 PORTNAME=	gnomenettool
@@ -11,7 +11,7 @@ PORTVERSION=	2.13.91
 PORTEPOCH=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-nettool/2.13
+MASTER_SITE_SUBDIR=	sources/gnome-nettool/${PORTVERSION:R}
 DISTNAME=	gnome-nettool-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 3ae6fb4c5..4200abad5 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Tom McLaughlin <tmclaugh@sdf.lonestar.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/vino/Makefile,v 1.24 2006/02/25 00:12:31 marcus Exp $
+#   $MCom: ports/net/vino/Makefile,v 1.25 2006/03/02 20:53:10 mezz Exp $
 #
 
 PORTNAME=	vino
 PORTVERSION=	2.13.5
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.13
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	VNC server that allows for remote access to your GNOME desktop
diff --git a/security/gnome-keyring-manager/Makefile b/security/gnome-keyring-manager/Makefile
index 5f03a2327..2501c2a5f 100644
--- a/security/gnome-keyring-manager/Makefile
+++ b/security/gnome-keyring-manager/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/gnomekeyringmanager/Makefile,v 1.14 2005/09/07 14:54:53 adamw Exp $
+#   $MCom: ports/security/gnomekeyringmanager/Makefile,v 1.16 2006/03/12 22:47:39 marcus Exp $
 #
 
 PORTNAME=	gnomekeyringmanager
 PORTVERSION=	2.14.0
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-keyring-manager/2.14
+MASTER_SITE_SUBDIR=	sources/gnome-keyring-manager/${PORTVERSION:R}
 DISTNAME=	gnome-keyring-manager-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/security/gnomekeyringmanager/Makefile b/security/gnomekeyringmanager/Makefile
index 5f03a2327..2501c2a5f 100644
--- a/security/gnomekeyringmanager/Makefile
+++ b/security/gnomekeyringmanager/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/gnomekeyringmanager/Makefile,v 1.14 2005/09/07 14:54:53 adamw Exp $
+#   $MCom: ports/security/gnomekeyringmanager/Makefile,v 1.16 2006/03/12 22:47:39 marcus Exp $
 #
 
 PORTNAME=	gnomekeyringmanager
 PORTVERSION=	2.14.0
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-keyring-manager/2.14
+MASTER_SITE_SUBDIR=	sources/gnome-keyring-manager/${PORTVERSION:R}
 DISTNAME=	gnome-keyring-manager-${PORTVERSION}
 DIST_SUBDIR=	gnome2