11 files changed, 11 insertions, 19 deletions

diff --git a/x11-themes/baghira/Makefile b/x11-themes/baghira/Makefile
index e53ab5117c65..a6721c76a957 100644
--- a/x11-themes/baghira/Makefile
+++ b/x11-themes/baghira/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	baghira
 PORTVERSION=	0.8
 PORTREVISION=	4
 CATEGORIES=	x11-themes kde
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An Aqua like window decoration and widget style for KDE
diff --git a/x11-themes/clearlooks/Makefile b/x11-themes/clearlooks/Makefile
index e9016264ebeb..9ad54b7a3d4e 100644
--- a/x11-themes/clearlooks/Makefile
+++ b/x11-themes/clearlooks/Makefile
@@ -10,7 +10,7 @@ PORTNAME?=	clearlooks
 PORTVERSION=	0.6.2
 PORTREVISION=	8
 CATEGORIES=	x11-themes
-MASTER_SITES=	SF
+MASTER_SITES=	SF/clearlooks/clearlooks/clearlooks%20${PORTVERSION}
 
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT?=	GTK+ 2.x engine based on Bluecurve
diff --git a/x11-themes/e16-themes/Makefile b/x11-themes/e16-themes/Makefile
index d45cb74b1a3e..b6f6b47cea33 100644
--- a/x11-themes/e16-themes/Makefile
+++ b/x11-themes/e16-themes/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	e16-themes
 PORTVERSION=	1.0.0
 CATEGORIES=	x11-themes
-MASTER_SITES=	SF/enlightenment
+MASTER_SITES=	SF/enlightenment/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	A set of themes for the e16 window manager
diff --git a/x11-themes/fvwm-themes/Makefile b/x11-themes/fvwm-themes/Makefile
index 7a25cfbdc7f8..a16b69fb516a 100644
--- a/x11-themes/fvwm-themes/Makefile
+++ b/x11-themes/fvwm-themes/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	fvwm-themes
 PORTVERSION=	0.7.0
 PORTREVISION=	2
 CATEGORIES=	x11-themes
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}-extra-${PORTVERSION}${EXTRACT_SUFX}
 
diff --git a/x11-themes/gnome-icons-crystal/Makefile b/x11-themes/gnome-icons-crystal/Makefile
index 07e6de01d5a8..5deadb9944fb 100644
--- a/x11-themes/gnome-icons-crystal/Makefile
+++ b/x11-themes/gnome-icons-crystal/Makefile
@@ -13,8 +13,7 @@ PORTNAME=	crystal
 PORTVERSION=	1.2.0
 PORTREVISION=	4
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	crystalforgnome
+MASTER_SITES=	SF/${PORTNAME}forgnome/Crystal%20SVG%20Icons/v${PORTVERSION}
 DISTNAME=	CrystalSVG-${PORTVERSION}
 EXTRACT_SUFX=	.bz2
 
diff --git a/x11-themes/gnome-look/Makefile b/x11-themes/gnome-look/Makefile
index 8b5ffb5ff6a0..af3ba7f1a571 100644
--- a/x11-themes/gnome-look/Makefile
+++ b/x11-themes/gnome-look/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gnome-look
 PORTVERSION=	0.1.3
 PORTREVISION=	5
 CATEGORIES=	x11-themes
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A GTK theme engine designed to look nice with the GNOME desktop
diff --git a/x11-themes/gtk-cleanice-engine/Makefile b/x11-themes/gtk-cleanice-engine/Makefile
index e55d82eaf084..0c8be79c85a7 100644
--- a/x11-themes/gtk-cleanice-engine/Makefile
+++ b/x11-themes/gtk-cleanice-engine/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gtk-cleanice-engine
 PORTVERSION=	2.4.1
 PORTREVISION=	2
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	SF/elysium-project
+MASTER_SITES=	SF/elysium-project/gtk-engines-cleanice/${PORTVERSION}
 DISTNAME=	gtk-engines-cleanice-${PORTVERSION}
 DISTFILES=	${DISTNAME}.tar.gz \
 		${THEME}.tar.gz
diff --git a/x11-themes/kde-icons-graphite-rade8/Makefile b/x11-themes/kde-icons-graphite-rade8/Makefile
index 4d437ac36d76..512a94ecee43 100644
--- a/x11-themes/kde-icons-graphite-rade8/Makefile
+++ b/x11-themes/kde-icons-graphite-rade8/Makefile
@@ -7,8 +7,7 @@
 
 PORTNAME=	graphite-rade8
 PORTVERSION=	1.03
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	graphitekde
+MASTER_SITES=	SF/graphitekde/OldFiles
 DISTNAME=	Graphite-Rade8-${PORTVERSION}
 
 COMMENT=	KDE Mac OS X like iconset, most from rad-e8 design
diff --git a/x11-themes/kde-icons-lime-rade8/Makefile b/x11-themes/kde-icons-lime-rade8/Makefile
index 1ff56e247c39..fc4147d2dd2b 100644
--- a/x11-themes/kde-icons-lime-rade8/Makefile
+++ b/x11-themes/kde-icons-lime-rade8/Makefile
@@ -7,8 +7,7 @@
 
 PORTNAME=	lime-rade8
 PORTVERSION=	1.01
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	graphitekde
+MASTER_SITES=	SF/graphitekde/OldFiles
 DISTNAME=	Lime-Rade8-${PORTVERSION}
 
 COMMENT=	KDE Mac OS X like iconset, most from rad-e8 design
diff --git a/x11-themes/lxappearance/Makefile b/x11-themes/lxappearance/Makefile
index d98c6abaf640..c7dd246b3987 100644
--- a/x11-themes/lxappearance/Makefile
+++ b/x11-themes/lxappearance/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	lxappearance
 PORTVERSION=	0.2
 PORTREVISION=	1
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	lxde
+MASTER_SITES=	SF/lxde/LXAppearance/LXAppearance%20${PORTVERSION}.0
 
 MAINTAINER=	chinsan@FreeBSD.org
 COMMENT=	A desktop-independent theme switcher for GTK+
diff --git a/x11-themes/xmms-eq-skins/Makefile b/x11-themes/xmms-eq-skins/Makefile
index 4050f6c3912d..d4041265389a 100644
--- a/x11-themes/xmms-eq-skins/Makefile
+++ b/x11-themes/xmms-eq-skins/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	xmms-eq-skins
 PORTVERSION=	0.2
 PORTREVISION=	4
 CATEGORIES=	x11-themes
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	equ
+MASTER_SITES=	SF/equ/eq-xmms-skins/${PORTVERSION}
 DISTNAME=	eq-xmms-skins-${PORTVERSION}
 
 MAINTAINER=	alepulver@FreeBSD.org