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@5900 df743ca5-7f9a-e211-a948-0013205c9059

17 files changed, 34 insertions, 34 deletions

diff --git a/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile
index d9bf96aab..0a3145d35 100644
--- a/x11/fast-user-switch-applet/Makefile
+++ b/x11/fast-user-switch-applet/Makefile
@@ -3,13 +3,13 @@
 # Whom:			Alexander Nedotsukov <bland@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11/fast-user-switch-applet/Makefile,v 1.6 2006/02/28 05:46:04 marcus Exp $
+#    $MCom: ports/x11/fast-user-switch-applet/Makefile,v 1.7 2006/02/28 09:03:33 bland Exp $
 
 PORTNAME=	fast-user-switch-applet
 PORTVERSION=	2.13.92
 CATEGORIES=	x11 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/x11/gdm/Makefile b/x11/gdm/Makefile
index da9e726fc..027865bfe 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,7 +3,7 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11/gdm/Makefile,v 1.19 2006/03/05 21:58:02 marcus Exp $
+#    $MCom: ports/x11/gdm/Makefile,v 1.20 2006/03/06 02:09:27 marcus Exp $
 #
 
 PORTNAME=	gdm
@@ -11,7 +11,7 @@ PORTVERSION=	2.13.0.10
 PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=		sources/${PORTNAME:S/2$//}/2.13
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:R:R}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 6dab5bfe2..89712170b 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnomeapplets2/Makefile,v 1.106 2006/03/02 21:16:03 mezz Exp $
+#   $MCom: ports/x11/gnomeapplets2/Makefile,v 1.107 2006/03/12 19:31:46 marcus Exp $
 #
 
 PORTNAME=	gnomeapplets2
 PORTVERSION=	2.14.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-applets/2.14
+MASTER_SITE_SUBDIR=	sources/gnome-applets/${PORTVERSION:R}
 DISTNAME=	gnome-applets-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 337dc9e98..fa5d6e0f1 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnomedesktop/Makefile,v 1.83 2006/02/23 21:58:22 ahze Exp $
+#   $MCom: ports/x11/gnomedesktop/Makefile,v 1.84 2006/02/28 05:34:01 marcus Exp $
 #
 
 PORTNAME=	gnomedesktop
 PORTVERSION=	2.13.92
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.13
+MASTER_SITE_SUBDIR=	sources/gnome-desktop/${PORTVERSION:R}
 DISTNAME=	gnome-desktop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index ae38c429b..918b8ebf5 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#	$MCom: ports/x11/gnome-menus/Makefile,v 1.24 2006/02/03 05:42:53 marcus Exp $
+#	$MCom: ports/x11/gnome-menus/Makefile,v 1.25 2006/02/23 21:58:22 ahze Exp $
 #
 
 PORTNAME=	gnome-menus
 PORTVERSION=	2.13.5
 CATEGORIES=	x11 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/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 02cc5ce6b..cd42759cc 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnomepanel/Makefile,v 1.121 2006/02/23 21:58:23 ahze Exp $
+#   $MCom: ports/x11/gnomepanel/Makefile,v 1.122 2006/03/05 21:48:36 mezz Exp $
 #
 
 PORTNAME=	gnomepanel
@@ -11,7 +11,7 @@ PORTVERSION=	2.13.91
 PORTREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-panel/2.13
+MASTER_SITE_SUBDIR=	sources/gnome-panel/${PORTVERSION:R}
 DISTNAME=	gnome-panel-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index df91cc839..710052a5c 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -3,14 +3,14 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-screensaver/Makefile,v 1.29 2006/02/23 21:58:22 ahze Exp $
+#   $MCom: ports/x11/gnome-screensaver/Makefile,v 1.30 2006/02/28 04:38:10 marcus Exp $
 #
 
 PORTNAME=	gnome-screensaver
 PORTVERSION=	2.13.92
 CATEGORIES=	x11 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=	GNOME screen saver and locker
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index b4d25bc18..8fdae505e 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnomesession/Makefile,v 1.74 2006/02/23 21:58:23 ahze Exp $
+#   $MCom: ports/x11/gnomesession/Makefile,v 1.75 2006/02/28 05:39:49 marcus Exp $
 #
 
 PORTNAME=	gnomesession
@@ -12,7 +12,7 @@ CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
 		http://people.FreeBSD.org/~adamw/images/gnome_splashes/2.12/:local
-MASTER_SITE_SUBDIR=	sources/gnome-session/2.13 \
+MASTER_SITE_SUBDIR=	sources/gnome-session/${PORTVERSION:R} \
 		    	adamw/:local
 DISTNAME=	gnome-session-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index c96f929f6..87c53a8b2 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnometerminal/Makefile,v 1.63 2006/03/04 20:09:44 mezz Exp $
+#   $MCom: ports/x11/gnometerminal/Makefile,v 1.64 2006/03/13 01:21:05 mezz Exp $
 #
 
 PORTNAME=	gnometerminal
 PORTVERSION=	2.14.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.14
+MASTER_SITE_SUBDIR=	sources/gnome-terminal/${PORTVERSION:R}
 DISTNAME=	gnome-terminal-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index 6dab5bfe2..89712170b 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnomeapplets2/Makefile,v 1.106 2006/03/02 21:16:03 mezz Exp $
+#   $MCom: ports/x11/gnomeapplets2/Makefile,v 1.107 2006/03/12 19:31:46 marcus Exp $
 #
 
 PORTNAME=	gnomeapplets2
 PORTVERSION=	2.14.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-applets/2.14
+MASTER_SITE_SUBDIR=	sources/gnome-applets/${PORTVERSION:R}
 DISTNAME=	gnome-applets-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile
index 337dc9e98..fa5d6e0f1 100644
--- a/x11/gnomedesktop/Makefile
+++ b/x11/gnomedesktop/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnomedesktop/Makefile,v 1.83 2006/02/23 21:58:22 ahze Exp $
+#   $MCom: ports/x11/gnomedesktop/Makefile,v 1.84 2006/02/28 05:34:01 marcus Exp $
 #
 
 PORTNAME=	gnomedesktop
 PORTVERSION=	2.13.92
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.13
+MASTER_SITE_SUBDIR=	sources/gnome-desktop/${PORTVERSION:R}
 DISTNAME=	gnome-desktop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index 02cc5ce6b..cd42759cc 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnomepanel/Makefile,v 1.121 2006/02/23 21:58:23 ahze Exp $
+#   $MCom: ports/x11/gnomepanel/Makefile,v 1.122 2006/03/05 21:48:36 mezz Exp $
 #
 
 PORTNAME=	gnomepanel
@@ -11,7 +11,7 @@ PORTVERSION=	2.13.91
 PORTREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-panel/2.13
+MASTER_SITE_SUBDIR=	sources/gnome-panel/${PORTVERSION:R}
 DISTNAME=	gnome-panel-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile
index b4d25bc18..8fdae505e 100644
--- a/x11/gnomesession/Makefile
+++ b/x11/gnomesession/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnomesession/Makefile,v 1.74 2006/02/23 21:58:23 ahze Exp $
+#   $MCom: ports/x11/gnomesession/Makefile,v 1.75 2006/02/28 05:39:49 marcus Exp $
 #
 
 PORTNAME=	gnomesession
@@ -12,7 +12,7 @@ CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
 		http://people.FreeBSD.org/~adamw/images/gnome_splashes/2.12/:local
-MASTER_SITE_SUBDIR=	sources/gnome-session/2.13 \
+MASTER_SITE_SUBDIR=	sources/gnome-session/${PORTVERSION:R} \
 		    	adamw/:local
 DISTNAME=	gnome-session-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile
index c96f929f6..87c53a8b2 100644
--- a/x11/gnometerminal/Makefile
+++ b/x11/gnometerminal/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnometerminal/Makefile,v 1.63 2006/03/04 20:09:44 mezz Exp $
+#   $MCom: ports/x11/gnometerminal/Makefile,v 1.64 2006/03/13 01:21:05 mezz Exp $
 #
 
 PORTNAME=	gnometerminal
 PORTVERSION=	2.14.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.14
+MASTER_SITE_SUBDIR=	sources/gnome-terminal/${PORTVERSION:R}
 DISTNAME=	gnome-terminal-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 0d5e25354..547557266 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/libgnome/Makefile,v 1.71 2006/01/31 20:36:55 marcus Exp $
+#   $MCom: ports/x11/libgnome/Makefile,v 1.72 2006/02/23 21:58:23 ahze Exp $
 #
 
 PORTNAME=	libgnome
@@ -11,7 +11,7 @@ PORTVERSION=	2.13.7
 PORTREVISION=	1
 CATEGORIES=	x11 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/x11/yelp/Makefile b/x11/yelp/Makefile
index d0fb977eb..adfbf9da5 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/yelp/Makefile,v 1.82 2006/02/27 13:52:43 ahze Exp $
+#   $MCom: ports/x11/yelp/Makefile,v 1.83 2006/03/13 05:15:07 mezz Exp $
 #
 
 PORTNAME=	yelp
 PORTVERSION=	2.14.0
 CATEGORIES=	x11 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/x11/zenity/Makefile b/x11/zenity/Makefile
index a8f82b563..a8c998eae 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Franz Klammer <klammer@webonaut.com>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/zenity/Makefile,v 1.53 2006/01/29 23:01:07 ahze Exp $
+#   $MCom: ports/x11/zenity/Makefile,v 1.54 2006/03/02 21:16:03 mezz Exp $
 #
 
 PORTNAME=	zenity
 PORTVERSION=	2.13.90
 CATEGORIES=	x11 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