Use ${PORTNAME} in MASTER_SITE_SUBDIR.

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

8 files changed, 11 insertions, 11 deletions

diff --git a/mail/evolution-devel/Makefile b/mail/evolution-devel/Makefile
index cb90e19b3..75f32dcdd 100644
--- a/mail/evolution-devel/Makefile
+++ b/mail/evolution-devel/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.1.2
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		http://people.FreeBSD.org/~sobomax/:local
-MASTER_SITE_SUBDIR=	sources/evolution/1.1 \
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.1 \
 			sobomax/:local
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 		db-3.1.17${EXTRACT_SUFX}:local
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index a5b43fa29..503d55325 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gtkhtml
 PORTVERSION=	1.1.4
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gtkhtml/1.1
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.1
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile
index 22787296c..d31edb4a0 100644
--- a/x11-toolkits/gal/Makefile
+++ b/x11-toolkits/gal/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gal
 PORTVERSION=	0.20.1
 CATEGORIES?=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gal/0.20
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.20
 DIST_SUBDIR=	gnome
 
 MAINTAINER?=	gnome@FreeBSD.org
diff --git a/x11-toolkits/gtk-engines2/Makefile b/x11-toolkits/gtk-engines2/Makefile
index cb41f8c20..4e391d8fa 100644
--- a/x11-toolkits/gtk-engines2/Makefile
+++ b/x11-toolkits/gtk-engines2/Makefile
@@ -10,8 +10,8 @@ PORTVERSION=	1.9.0
 PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gtk-engines/1.9
-DISTNAME=	gtk-engines-${PORTVERSION}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/1.9
+DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index a57919c97..7278e0457 100644
--- a/x11-toolkits/rep-gtk2/Makefile
+++ b/x11-toolkits/rep-gtk2/Makefile
@@ -11,8 +11,8 @@ PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/rep-gtk/0.16
-DISTNAME=	rep-gtk-${PORTVERSION}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/0.16
+DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-wm/metacity-setup/Makefile b/x11-wm/metacity-setup/Makefile
index ae1db7771..8566ecace 100644
--- a/x11-wm/metacity-setup/Makefile
+++ b/x11-wm/metacity-setup/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.7.1
 PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	metacity-setup
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	marcus@FreeBSD.org
 
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 081a05367..0e1b423f5 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.4.2
 PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/metacity/2.4
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.4
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish2/Makefile
index 46ba114f0..a5d93f40a 100644
--- a/x11-wm/sawfish2/Makefile
+++ b/x11-wm/sawfish2/Makefile
@@ -11,8 +11,8 @@ PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/sawfish/2.0
-DISTNAME=	sawfish-${PORTVERSION}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.0
+DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org