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

13 files changed, 28 insertions, 28 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