32 files changed, 35 insertions, 55 deletions

diff --git a/x11/3ddesktop/Makefile b/x11/3ddesktop/Makefile
index 393687cf0a18..b3b56c8021e2 100644
--- a/x11/3ddesktop/Makefile
+++ b/x11/3ddesktop/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	3ddesktop
 PORTVERSION=	0.2.9
 PORTREVISION=	6
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	desk3d
+MASTER_SITES=	SF/desk3d/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	3D Virtual Desktop Switcher
diff --git a/x11/bbappconf/Makefile b/x11/bbappconf/Makefile
index cd7c760b11c2..e7f2355d2493 100644
--- a/x11/bbappconf/Makefile
+++ b/x11/bbappconf/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	bbappconf
 PORTVERSION=	0.0.2
 PORTREVISION=	2
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	bbtools
+MASTER_SITES=	SF/bbtools/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	gerrit.beine@gmx.de
 COMMENT=	Application configuring tool for the blackbox window manager
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index fae71f217b95..335fc46c71eb 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	eterm
 PORTVERSION=	0.9.5
 PORTREVISION=	1
 CATEGORIES+=	x11
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Eterm-${PORTVERSION}
 DISTNAME=	Eterm-${PORTVERSION}
 
 MAINTAINER?=	olgeni@FreeBSD.org
diff --git a/x11/fluxbg/Makefile b/x11/fluxbg/Makefile
index d37f61106d29..c654e03a938d 100644
--- a/x11/fluxbg/Makefile
+++ b/x11/fluxbg/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	fluxbg
 PORTVERSION=	0.7
 PORTREVISION=	9
 CATEGORIES=	x11
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Background changer for fluxbox/blackbox
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index 35cdcfb0ece9..cea6941a7f59 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gdkxft
 PORTVERSION=	1.5
 PORTREVISION=	6
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An anti-aliased font support for gtk+
diff --git a/x11/ggiterm/Makefile b/x11/ggiterm/Makefile
index 800f269c2517..82aeb8851d01 100644
--- a/x11/ggiterm/Makefile
+++ b/x11/ggiterm/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	ggiterm
 PORTVERSION=	0.7.1
 PORTREVISION=	3
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	ggiterm
+MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	antoine.brodin@laposte.net
diff --git a/x11/gmrun/Makefile b/x11/gmrun/Makefile
index 3507b68e0178..0aeb7b5b6c55 100644
--- a/x11/gmrun/Makefile
+++ b/x11/gmrun/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gmrun
 PORTVERSION=	0.9.2
 PORTREVISION=	6
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	A customizable program to run programs, with tab-completion
diff --git a/x11/idesk/Makefile b/x11/idesk/Makefile
index 650aed68a5fa..01bd95c17543 100644
--- a/x11/idesk/Makefile
+++ b/x11/idesk/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	idesk
 PORTVERSION=	0.7.5
 PORTREVISION=	6
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}/
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Place launch icons and background directly on your desktop
diff --git a/x11/imwheel/Makefile b/x11/imwheel/Makefile
index 66e7e149222d..0cc55478310c 100644
--- a/x11/imwheel/Makefile
+++ b/x11/imwheel/Makefile
@@ -10,8 +10,8 @@ PORTVERSION=	1.0.0.p12
 PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	ftp://jcatki.no-ip.org/pub/imwheel/ \
-		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+		SF/${PORTNAME}/${PORTNAME}-source/1.0.0pre12		
+
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p12/pre12/}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11/libgnomemm/Makefile b/x11/libgnomemm/Makefile
index 54fb81d32e5c..6e0b48a433a8 100644
--- a/x11/libgnomemm/Makefile
+++ b/x11/libgnomemm/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	libgnomemm
 PORTVERSION=	2.0.1
 PORTREVISION=	10
 CATEGORIES=	x11 gnome
-MASTER_SITES=	SF/gtkmm
+MASTER_SITES=	SF/gtkmm/OldFiles
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	bland@FreeBSD.org
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 39f476385a79..c09671f32c05 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	libxklavier
 PORTVERSION=	3.9
 PORTEPOCH=	1
 CATEGORIES=	x11 gnome
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	gswitchit
+MASTER_SITES=	SF/gswitchit/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An utility library to make XKB stuff easier
diff --git a/x11/lxpanel/Makefile b/x11/lxpanel/Makefile
index b50d9f26fa4a..c6ba7dfb2f44 100644
--- a/x11/lxpanel/Makefile
+++ b/x11/lxpanel/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	lxpanel
 PORTVERSION=	0.3.7
 PORTREVISION=	1
 CATEGORIES=	x11
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	lxde
+MASTER_SITES=	SF/lxde/LXPanel%20%28desktop%20panel%29/LXPanel%20${PORTVERSION}
 
 MAINTAINER=	b89605222@ntu.edu.tw
 COMMENT=	LXPanel is a lightweight X11 desktop panel
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 501bdafc12a3..739f0a798aa9 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	mlterm
 PORTVERSION=	2.9.4
 PORTREVISION=	4
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/01%20release/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Multilingual X11 terminal emulator
diff --git a/x11/mrxvt-devel/Makefile b/x11/mrxvt-devel/Makefile
index fe06dc570f0c..d7a8ba1dc1ed 100644
--- a/x11/mrxvt-devel/Makefile
+++ b/x11/mrxvt-devel/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	mrxvt-devel
 PORTVERSION=	0.5.4
 PORTREVISION=	1
 CATEGORIES=	x11
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	materm
+MASTER_SITES=	SF/materm/mrxvt%20source/${PORTVERSION}
 DISTNAME=	mrxvt-${PORTVERSION}
 
 MAINTAINER=	lme@FreeBSD.org
diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile
index 36c614c00cec..56ae041ac06e 100644
--- a/x11/mrxvt/Makefile
+++ b/x11/mrxvt/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	mrxvt
 PORTVERSION=	0.4.2
 PORTREVISION=	3
 CATEGORIES=	x11
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	materm
+MASTER_SITES=	SF/materm/${PORTNAME}%20source/${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11/p5-X11-GUITest/Makefile b/x11/p5-X11-GUITest/Makefile
index 3ea01d572f12..c494af14331b 100644
--- a/x11/p5-X11-GUITest/Makefile
+++ b/x11/p5-X11-GUITest/Makefile
@@ -10,12 +10,9 @@ PORTNAME=	X11-GUITest
 PORTVERSION=	0.21
 PORTREVISION=	2
 CATEGORIES=	x11 perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S/$/:cpan/} \
-		${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
-MASTER_SITE_SUBDIR=	X11/:cpan \
-			x11guitest/:sf
+MASTER_SITES=	CPAN/X11 \
+		SF/x11guitest/x11guitest/${PORTVERSION}
 PKGNAMEPREFIX=	p5-
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:cpan,sf
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Provides GUI testing/interaction facilities
diff --git a/x11/powershell/Makefile b/x11/powershell/Makefile
index 5f75cf863a3c..38d8fc3d1dbf 100644
--- a/x11/powershell/Makefile
+++ b/x11/powershell/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	powershell
 PORTVERSION=	0.8
 PORTREVISION=	7
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A terminal emulator for the X11
diff --git a/x11/qimageblitz/Makefile b/x11/qimageblitz/Makefile
index 8644a9e4621f..2be96d6eeb62 100644
--- a/x11/qimageblitz/Makefile
+++ b/x11/qimageblitz/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	qimageblitz
 PORTVERSION=	0.0.4
 PORTREVISION=	3
 CATEGORIES=	x11
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/QImageBlitz%20${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Graphical effects and filters library for KDE4
diff --git a/x11/rox-wallpaper/Makefile b/x11/rox-wallpaper/Makefile
index 0cba659b546f..7d463b128565 100644
--- a/x11/rox-wallpaper/Makefile
+++ b/x11/rox-wallpaper/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	rox-wallpaper
 PORTVERSION=	2.1
 PORTREVISION=	2
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	rox
+MASTER_SITES=	SF/rox/Wallpaper/${PORTVERSION}
 DISTNAME=	wallpaper-${PORTVERSION}
 
 MAINTAINER=	olgeni@FreeBSD.org
diff --git a/x11/ruby-gtktrayicon/Makefile b/x11/ruby-gtktrayicon/Makefile
index e5b218d37a55..4c7d64b2bb31 100644
--- a/x11/ruby-gtktrayicon/Makefile
+++ b/x11/ruby-gtktrayicon/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gtktrayicon
 PORTVERSION=	0.1.0
 PORTREVISION=	6
 CATEGORIES=	x11 gnome ruby
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	ruby-gnome2
+MASTER_SITES=	SF/ruby-gnome2/OldFiles
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-gtktrayicon-${PORTVERSION}
 DIST_SUBDIR=	ruby
diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile
index e9830c055a55..abd9da67ce3b 100644
--- a/x11/rxvt-devel/Makefile
+++ b/x11/rxvt-devel/Makefile
@@ -11,7 +11,7 @@ PORTNAME=	rxvt
 PORTVERSION=	2.7.10
 PORTREVISION=	5
 CATEGORIES+=	x11
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-dev/${PORTVERSION}
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	akosela@andykosela.com
diff --git a/x11/stalonetray/Makefile b/x11/stalonetray/Makefile
index 2badf10301e9..dcc31438c594 100644
--- a/x11/stalonetray/Makefile
+++ b/x11/stalonetray/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	stalonetray
 PORTVERSION=	0.7.6
 CATEGORIES=	x11
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	STAnd-aLONE system tray
diff --git a/x11/tilda/Makefile b/x11/tilda/Makefile
index 35144a9635bb..1180817f3d0f 100644
--- a/x11/tilda/Makefile
+++ b/x11/tilda/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	tilda
 PORTVERSION=	0.9.6
 PORTREVISION=	1
 CATEGORIES=	x11
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	vlad@vlad.uz.ua
 COMMENT=	Drop down x11 terminal with transparency support
diff --git a/x11/wmappl/Makefile b/x11/wmappl/Makefile
index 6ae7a9e61ed1..a5d3f1a985f5 100644
--- a/x11/wmappl/Makefile
+++ b/x11/wmappl/Makefile
@@ -8,9 +8,8 @@
 PORTNAME=	wmappl
 PORTVERSION=	0.71
 CATEGORIES=	x11 windowmaker
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:main/} \
+MASTER_SITES=	SF/wmappl/wmappl/wmappl-${PORTVERSION}:main \
 		http://www.upl.cs.wisc.edu/~charkins/wmappl/:icons
-MASTER_SITE_SUBDIR=${PORTNAME}/:main
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:main \
 		16x16xpms.tar.gz:icons icons_16x16.tar.gz:icons smallicons.tar.gz:icons
 
diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile
index 99da6bc15452..7ac064f6b20d 100644
--- a/x11/wterm/Makefile
+++ b/x11/wterm/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	wterm
 PORTVERSION=	6.2.9
 PORTREVISION=	4
 CATEGORIES=	x11
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}.tar.gz
 
 MAINTAINER=	adam-ports@blacktabby.org
 COMMENT=	A color vt102 terminal emulator with transparency support
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index c18fbc0b6104..13b8ba6c427c 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	x3270
 PORTVERSION=	3.3.7
 PORTREVISION=	2
 CATEGORIES=	x11 net
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/OldFiles
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11/xcut/Makefile b/x11/xcut/Makefile
index 8879cd65ddde..629c750a6326 100644
--- a/x11/xcut/Makefile
+++ b/x11/xcut/Makefile
@@ -9,9 +9,9 @@ PORTNAME=	xcut
 PORTVERSION=	0.2
 PORTREVISION=	3
 CATEGORIES=	x11
-MASTER_SITES=	SF \
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION} \
 		http://acsys.anu.edu.au/~tpot/%SUBDIR%/
-MASTER_SITE_SUBDIR=	${PORTNAME}
+
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Manipulate X cut buffers from the commandline
diff --git a/x11/xfree86_xkb_xml/Makefile b/x11/xfree86_xkb_xml/Makefile
index 56ac5d454bc6..4984f6943f35 100644
--- a/x11/xfree86_xkb_xml/Makefile
+++ b/x11/xfree86_xkb_xml/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	xfree86_xkb_xml
 PORTVERSION=	0.4
 PORTREVISION=	4
 CATEGORIES=	x11
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	gswitchit
+MASTER_SITES=	SF/gswitchit/OldFiles
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A little set of XML files useful for dealing with XKB rules
diff --git a/x11/xrsi/Makefile b/x11/xrsi/Makefile
index a1cdc5bacd1b..de013e7897ce 100644
--- a/x11/xrsi/Makefile
+++ b/x11/xrsi/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	xrsi
 PORTVERSION=	0.9
 PORTREVISION=	2
 CATEGORIES=	x11
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A minimalist break enforcer for linux/unix for the prevention of RSI
diff --git a/x11/xscreensaver.app/Makefile b/x11/xscreensaver.app/Makefile
index adafe25c0968..3c40f9dc374e 100644
--- a/x11/xscreensaver.app/Makefile
+++ b/x11/xscreensaver.app/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	XScreenSaver.App
 PORTVERSION=	2.3
 PORTREVISION=	3
 CATEGORIES=	x11 windowmaker
-MASTER_SITES=	SF/xscreensaverapp
+MASTER_SITES=	SF/xscreensaverapp/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	hemi@puresimplicity.net
 COMMENT=	WindowMaker dockapp to control XScreenSaver
diff --git a/x11/xtermset/Makefile b/x11/xtermset/Makefile
index b22443d03c48..6e2a74df68ed 100644
--- a/x11/xtermset/Makefile
+++ b/x11/xtermset/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	xtermset
 PORTVERSION=	0.5.2
 PORTREVISION=	2
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	clts
+MASTER_SITES=	SF/clts/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dynamically change some settings of an xterm
diff --git a/x11/xxkb/Makefile b/x11/xxkb/Makefile
index f5b2d6e3ba76..b5b7ce99ddf8 100644
--- a/x11/xxkb/Makefile
+++ b/x11/xxkb/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=		xxkb
 PORTVERSION=		1.11
 CATEGORIES=		x11
-MASTER_SITES=		SF/xxkb
+MASTER_SITES=		SF
 DISTNAME=		${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=		alexander.pohoyda@gmx.net