65 files changed, 67 insertions, 118 deletions

diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile
index 1907c950fcae..896a88c93a22 100644
--- a/x11-toolkits/blt/Makefile
+++ b/x11-toolkits/blt/Makefile
@@ -9,9 +9,9 @@ PORTNAME=	blt
 PORTVERSION=	2.4z
 PORTREVISION=	2
 CATEGORIES=	x11-toolkits tk
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	SF/${PORTNAME}/BLT/BLT%20${PORTVERSION} \
 		ftp://ftp.csl.sony.co.jp/pub/kjc/ttt-libs/
-MASTER_SITE_SUBDIR=	${PORTNAME}
+
 DISTNAME=	BLT${PORTVERSION}
 
 PATCH_SITES=	${MASTER_SITE_SOURCEFORGE} \
diff --git a/x11-toolkits/bwidget/Makefile b/x11-toolkits/bwidget/Makefile
index bdf79cd9e6f7..2bfc49162dab 100644
--- a/x11-toolkits/bwidget/Makefile
+++ b/x11-toolkits/bwidget/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	bwidget
 PORTVERSION=	1.8.0
 PORTREVISION=	2
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	tcllib
+MASTER_SITES=	SF/tcllib/BWidget/${PORTVERSION}
 DISTNAME=	BWidget-${PORTVERSION}
 
 MAINTAINER=	mm@FreeBSD.org
diff --git a/x11-toolkits/efltk/Makefile b/x11-toolkits/efltk/Makefile
index 7f492046f65c..0816ee8752c5 100644
--- a/x11-toolkits/efltk/Makefile
+++ b/x11-toolkits/efltk/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	efltk
 PORTVERSION=	2.0.7
 PORTREVISION=	3
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	SF/ede
+MASTER_SITES=	SF/ede/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	sem@FreeBSD.org
 COMMENT=	Extended Fast Light Toolkit
diff --git a/x11-toolkits/flvw/Makefile b/x11-toolkits/flvw/Makefile
index 1ffe76a794e9..9ce87a90301c 100644
--- a/x11-toolkits/flvw/Makefile
+++ b/x11-toolkits/flvw/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	flvw
 PORTVERSION=	20000224
 PORTREVISION=	7
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Febrary%20beta
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-toolkits/gai/Makefile b/x11-toolkits/gai/Makefile
index 5dee4ea32d71..c066018b42a5 100644
--- a/x11-toolkits/gai/Makefile
+++ b/x11-toolkits/gai/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	gai
 PORTVERSION=	0.5.10
 PORTREVISION=	8
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/GAI%20-%20Library/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	lx@redundancy.redundancy.org
 COMMENT=	General Applet Interface Library
diff --git a/x11-toolkits/gauche-gtk/Makefile b/x11-toolkits/gauche-gtk/Makefile
index 462058cc9caa..93d3f628c9e4 100644
--- a/x11-toolkits/gauche-gtk/Makefile
+++ b/x11-toolkits/gauche-gtk/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gauche
 PORTVERSION=	0.4.1
 PORTREVISION=	9
 CATEGORIES=	x11-toolkits scheme
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	gauche
+MASTER_SITES=	SF/${PORTNAME}/Gauche-gtk/${PORTVERSION}
 PKGNAMESUFFIX=	-gtk
 DISTNAME=	Gauche${PKGNAMESUFFIX}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
diff --git a/x11-toolkits/gnocl/Makefile b/x11-toolkits/gnocl/Makefile
index 6c64dd76385b..c3fd7d75a39d 100644
--- a/x11-toolkits/gnocl/Makefile
+++ b/x11-toolkits/gnocl/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnocl
 PORTVERSION=	0.9.94
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits devel
-MASTER_SITES=	SF/gnocl
+MASTER_SITES=	SF/${PORTNAME}/Gnocl-Nightly-Build/${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	gahr@FreeBSD.org
diff --git a/x11-toolkits/gtkada-gcc/Makefile b/x11-toolkits/gtkada-gcc/Makefile
index 47ff9baeb728..3eb291124176 100644
--- a/x11-toolkits/gtkada-gcc/Makefile
+++ b/x11-toolkits/gtkada-gcc/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gtkada
 PORTVERSION=	2.8.1
 PORTREVISION=	4
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	gnuada
+MASTER_SITES=	SF/gnuada/GNAT_GCC%20Source/4.1.1%20R6
 PKGNAMESUFFIX=	-gcc
 DISTNAME=	gnat-gcc-gtkada-4.1.1_2.8.1-r6.src
 EXTRACT_SUFX=	.rpm
diff --git a/x11-toolkits/gtkextra/Makefile b/x11-toolkits/gtkextra/Makefile
index d84343a26c9b..da22adc84e2b 100644
--- a/x11-toolkits/gtkextra/Makefile
+++ b/x11-toolkits/gtkextra/Makefile
@@ -10,8 +10,8 @@ PORTVERSION=	0.99.17
 PORTREVISION=	4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://gtkextra.sourceforge.net/src/ \
-		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	scigraphica
+		SF/scigraphica/scigraphica-0.x/0.8.0-source		
+
 DISTNAME=	${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile
index 9191ac9d34bc..a1945f0dbaf1 100644
--- a/x11-toolkits/gtkextra2/Makefile
+++ b/x11-toolkits/gtkextra2/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gtkextra
 PORTVERSION=	2.1.1
 PORTREVISION=	5
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	scigraphica
+MASTER_SITES=	SF/scigraphica/GtkExtra/${PORTVERSION}%20Sources
 DISTNAME=	${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile
index 20b574815d4a..c9ab0e910389 100644
--- a/x11-toolkits/gtkglext/Makefile
+++ b/x11-toolkits/gtkglext/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gtkglext
 PORTVERSION=	1.2.0
 PORTREVISION=	4
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-toolkits/gtkglextmm/Makefile b/x11-toolkits/gtkglextmm/Makefile
index c276ce7c010e..c741a4944a33 100644
--- a/x11-toolkits/gtkglextmm/Makefile
+++ b/x11-toolkits/gtkglextmm/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gtkglextmm
 PORTVERSION=	1.2.0
 PORTREVISION=	3
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	gtkglext
+MASTER_SITES=	SF/gtkglext/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ wrapper for GtkGLExt
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index 00403e7d3e13..e7bd4c5fcec6 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -9,10 +9,7 @@ PORTNAME=	gtkmm
 PORTVERSION=	2.2.12
 PORTREVISION?=	10
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	GNOME \
-		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2 \
-		gtkmm
+MASTER_SITES=	GNOME/sources/${PORTNAME}/2.2 \
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index 00403e7d3e13..e7bd4c5fcec6 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -9,10 +9,7 @@ PORTNAME=	gtkmm
 PORTVERSION=	2.2.12
 PORTREVISION?=	10
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	GNOME \
-		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2 \
-		gtkmm
+MASTER_SITES=	GNOME/sources/${PORTNAME}/2.2 \
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/gtkscintilla/Makefile b/x11-toolkits/gtkscintilla/Makefile
index 15fcfdf8ecf5..8aceddc16f15 100644
--- a/x11-toolkits/gtkscintilla/Makefile
+++ b/x11-toolkits/gtkscintilla/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gtkscintilla
 PORTVERSION=	0.8.2
 PORTREVISION=	6
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	moleskine
+MASTER_SITES=	SF/moleskine/GtkScintilla/${PORTVERSION}
 DISTNAME=	GtkScintilla-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-toolkits/hs-gtk2hs/Makefile b/x11-toolkits/hs-gtk2hs/Makefile
index 61d694e6285f..4dfd5146ebc1 100644
--- a/x11-toolkits/hs-gtk2hs/Makefile
+++ b/x11-toolkits/hs-gtk2hs/Makefile
@@ -10,8 +10,7 @@ PORTVERSION=	0.10.0
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits haskell
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 PKGNAMEPREFIX=	hs-
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/x11-toolkits/irrlicht/Makefile b/x11-toolkits/irrlicht/Makefile
index fd0e55c49276..ae4433eb9ca2 100644
--- a/x11-toolkits/irrlicht/Makefile
+++ b/x11-toolkits/irrlicht/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	irrlicht
 PORTVERSION=	1.5
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/Irrlicht%20SDK/${PORTVERSION}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	High performance realtime 3D engine
diff --git a/x11-toolkits/itk/Makefile b/x11-toolkits/itk/Makefile
index 15557e653240..7acd462715cb 100644
--- a/x11-toolkits/itk/Makefile
+++ b/x11-toolkits/itk/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	itk
 PORTVERSION=	3.3
 PORTREVISION=	2
 CATEGORIES=	x11-toolkits tk
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=incrtcl
+MASTER_SITES=	SF/incrtcl/%5BIncr%20Tcl_Tk%5D-source/${PORTVERSION}-RC
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	erik@smluc.org
diff --git a/x11-toolkits/iwidgets/Makefile b/x11-toolkits/iwidgets/Makefile
index 53e9a42ae33c..3045331fd2bb 100644
--- a/x11-toolkits/iwidgets/Makefile
+++ b/x11-toolkits/iwidgets/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	iwidgets
 PORTVERSION=	4.0.1
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits tk
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=incrtcl
+MASTER_SITES=	SF/incrtcl/%5BIncr%20Widgets%5D/${PORTVERSION}
 DISTNAME=	iwidgets${PORTVERSION}
 
 MAINTAINER=	pauls@utdallas.edu
diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile
index a14fe3616d42..04601b80c83b 100644
--- a/x11-toolkits/lesstif/Makefile
+++ b/x11-toolkits/lesstif/Makefile
@@ -10,8 +10,7 @@ PORTVERSION=	0.95.2
 PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	lesstif
+MASTER_SITES=	SF
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	API compatible clone of the Motif toolkit
diff --git a/x11-toolkits/libgnomeuimm/Makefile b/x11-toolkits/libgnomeuimm/Makefile
index fd939f0846b2..b0419d84f154 100644
--- a/x11-toolkits/libgnomeuimm/Makefile
+++ b/x11-toolkits/libgnomeuimm/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	libgnomeuimm
 PORTVERSION=	2.0.0
 PORTREVISION=	10
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	SF/gtkmm
+MASTER_SITES=	SF/gtkmm/OldFiles
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	bland@FreeBSD.org
diff --git a/x11-toolkits/libgtkeditor/Makefile b/x11-toolkits/libgtkeditor/Makefile
index d1d1d2c23217..1e939b340b4f 100644
--- a/x11-toolkits/libgtkeditor/Makefile
+++ b/x11-toolkits/libgtkeditor/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	libgtkeditor
 PORTVERSION=	0.1.8
 PORTREVISION=	5
 CATEGORIES=	x11-toolkits editors
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME:S/lib//}
+MASTER_SITES=	SF/gtkeditor/gtkeditor/${PORTVERSION}
 DISTNAME=	${PORTNAME:S/lib//}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-toolkits/mesgui/Makefile b/x11-toolkits/mesgui/Makefile
index e6de52a891a6..03ed677a7e31 100644
--- a/x11-toolkits/mesgui/Makefile
+++ b/x11-toolkits/mesgui/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	mesgui
 PORTVERSION=	1.0
 PORTREVISION=	6
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Make a simple GUI under OpenGL
diff --git a/x11-toolkits/movingmotif/Makefile b/x11-toolkits/movingmotif/Makefile
index 60f8f02029d2..fc18dbf97e4b 100644
--- a/x11-toolkits/movingmotif/Makefile
+++ b/x11-toolkits/movingmotif/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	movingmotif
 PORTVERSION=	2.3.0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}_2_1/movingmotiv-2.3.1
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Display scientific data as dynamic plot
diff --git a/x11-toolkits/otk/Makefile b/x11-toolkits/otk/Makefile
index 63a0c5a59521..35390d317678 100644
--- a/x11-toolkits/otk/Makefile
+++ b/x11-toolkits/otk/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	otk
 PORTVERSION=	0.85
 CATEGORIES=	x11-toolkits graphics
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
 DISTNAME=	${PORTNAME}_lib_${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
diff --git a/x11-toolkits/p5-Gnome2-Canvas/Makefile b/x11-toolkits/p5-Gnome2-Canvas/Makefile
index 8bcfc9930703..34e423a41614 100644
--- a/x11-toolkits/p5-Gnome2-Canvas/Makefile
+++ b/x11-toolkits/p5-Gnome2-Canvas/Makefile
@@ -10,13 +10,9 @@ PORTNAME=	Gnome2-Canvas
 PORTVERSION=	1.002
 PORTREVISION=	4
 CATEGORIES=	x11-toolkits gnome perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S/$/:cpan/} \
-		${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
-MASTER_SITE_SUBDIR=	Gnome2/:cpan \
-		gtk2-perl/:sf
+MASTER_SITES=	CPAN/Gnome2 \
+		SF/gtk2-perl/Gnome2_Canvas/${PORTVERSION}
 PKGNAMEPREFIX=	p5-
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:cpan \
-		${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:sf
 
 MAINTAINER=	wxs@FreeBSD.org
 COMMENT=	Allows a perl developer to use the GnomeCanvas widget with Gtk2-Perl
diff --git a/x11-toolkits/p5-Gnome2/Makefile b/x11-toolkits/p5-Gnome2/Makefile
index ab56946de304..d6e64952f049 100644
--- a/x11-toolkits/p5-Gnome2/Makefile
+++ b/x11-toolkits/p5-Gnome2/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	Gnome2
 PORTVERSION=	1.042
 PORTREVISION=	2
 CATEGORIES=	x11-toolkits gnome perl5
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	gtk2-perl
+MASTER_SITES=	SF/gtk2-perl/${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	wxs@FreeBSD.org
diff --git a/x11-toolkits/p5-Gtk2/Makefile b/x11-toolkits/p5-Gtk2/Makefile
index bb4e9cb4681d..cf92b15a66bb 100644
--- a/x11-toolkits/p5-Gtk2/Makefile
+++ b/x11-toolkits/p5-Gtk2/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Gtk2
 PORTVERSION=	1.203
 CATEGORIES=	x11-toolkits lang perl5
-MASTER_SITES=	CPAN SF/gtk2-perl
+MASTER_SITES=	CPAN SF/${PORTNAME:L}-perl/${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/x11-toolkits/pangoxsl/Makefile b/x11-toolkits/pangoxsl/Makefile
index 34cb4f3c870b..d9e132dc74d2 100644
--- a/x11-toolkits/pangoxsl/Makefile
+++ b/x11-toolkits/pangoxsl/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	pangoxsl
 PORTVERSION=	1.6.0.3
 PORTREVISION=	2
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	pangopdf
+MASTER_SITES=	SF/pangopdf/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Implements Pango library with a PDF backend for PDF output
diff --git a/x11-toolkits/py-Pmw/Makefile b/x11-toolkits/py-Pmw/Makefile
index c9091174fc6a..9645ee8254a2 100644
--- a/x11-toolkits/py-Pmw/Makefile
+++ b/x11-toolkits/py-Pmw/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Pmw
 PORTVERSION=	1.3.2
 CATEGORIES=	x11-toolkits python
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}/${PORTNAME}.${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}.${PORTVERSION}
 
diff --git a/x11-toolkits/py-gtkextra/Makefile b/x11-toolkits/py-gtkextra/Makefile
index ddf90a464680..a056c0667943 100644
--- a/x11-toolkits/py-gtkextra/Makefile
+++ b/x11-toolkits/py-gtkextra/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	gtkextra
 PORTVERSION=	0.22
 PORTREVISION=	5
 CATEGORIES=	x11-toolkits python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	python-${PORTNAME}
+MASTER_SITES=	SF/python-${PORTNAME}/python-${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	python-${PORTNAME}-${PORTVERSION}
 
diff --git a/x11-toolkits/py-gtkglext/Makefile b/x11-toolkits/py-gtkglext/Makefile
index cf82d3fde13c..ea0da32fe805 100644
--- a/x11-toolkits/py-gtkglext/Makefile
+++ b/x11-toolkits/py-gtkglext/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gtkglext
 PORTVERSION=	1.1.0
 PORTREVISION=	3
 CATEGORIES=	x11-toolkits python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	gtkglext
+MASTER_SITES=	SF/${PORTNAME}/py${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pygtkglext-${PORTVERSION}
 
diff --git a/x11-toolkits/py-gtkscintilla/Makefile b/x11-toolkits/py-gtkscintilla/Makefile
index b9cbe3ecd8e6..1b32a7dc5ed5 100644
--- a/x11-toolkits/py-gtkscintilla/Makefile
+++ b/x11-toolkits/py-gtkscintilla/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gtkscintilla
 PORTVERSION=	0.8.2
 PORTREVISION=	6
 CATEGORIES=	x11-toolkits python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	moleskine
+MASTER_SITES=	SF/moleskine/PyGtkScintilla/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	PyGtkScintilla-${PORTVERSION}
 
diff --git a/x11-toolkits/py-pyqwt/Makefile b/x11-toolkits/py-pyqwt/Makefile
index 7c8b508cfed0..55a9f2d00b89 100644
--- a/x11-toolkits/py-pyqwt/Makefile
+++ b/x11-toolkits/py-pyqwt/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	pyqwt
 PORTVERSION=	5.1.0
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits python
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}5/PyQwt-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	PyQwt-${PORTVERSION}
 
diff --git a/x11-toolkits/py-wax/Makefile b/x11-toolkits/py-wax/Makefile
index da49ab66295d..c618849d0382 100644
--- a/x11-toolkits/py-wax/Makefile
+++ b/x11-toolkits/py-wax/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	wax
 PORTVERSION=	0.3.33
 PORTREVISION=	2
 CATEGORIES=	x11-toolkits devel python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}gui
+MASTER_SITES=	SF/${PORTNAME}gui/${PORTNAME}gui/${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nivit@FreeBSD.org
diff --git a/x11-toolkits/py-wmdockapps/Makefile b/x11-toolkits/py-wmdockapps/Makefile
index bfe8db0f3e83..bda139f7f02c 100644
--- a/x11-toolkits/py-wmdockapps/Makefile
+++ b/x11-toolkits/py-wmdockapps/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	wmdockapps
 PORTVERSION=	1.21
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits python windowmaker
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	pywmdockapps
+MASTER_SITES=	SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	py${PORTNAME}-${PORTVERSION}
 
diff --git a/x11-toolkits/py-wxPython24/Makefile b/x11-toolkits/py-wxPython24/Makefile
index 212cf99064d8..88c6c37729de 100644
--- a/x11-toolkits/py-wxPython24/Makefile
+++ b/x11-toolkits/py-wxPython24/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	wxPython
 PORTVERSION=	2.4.2.4
 PORTREVISION=	9
 CATEGORIES=	x11-toolkits python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	wxpython
+MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}Src-${PORTVERSION}
 
diff --git a/x11-toolkits/py-wxPython26/Makefile b/x11-toolkits/py-wxPython26/Makefile
index eada8e36f471..5233386d4abf 100644
--- a/x11-toolkits/py-wxPython26/Makefile
+++ b/x11-toolkits/py-wxPython26/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	wxPython
 PORTVERSION=	2.6.3.3
 PORTREVISION?=	2
 CATEGORIES=	x11-toolkits python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	wxpython
+MASTER_SITES=	SF/wxpython/wxPython/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 
diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index 3c7ac3d28c94..671d4f561566 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	wxPython
 PORTVERSION=	2.8.7.1
 PORTREVISION?=	3
 CATEGORIES=	x11-toolkits python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	wxpython
+MASTER_SITES=	SF/wxpython/wxPython/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 
diff --git a/x11-toolkits/py-xlib/Makefile b/x11-toolkits/py-xlib/Makefile
index 89a4137561c2..855dd77393e1 100644
--- a/x11-toolkits/py-xlib/Makefile
+++ b/x11-toolkits/py-xlib/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	xlib
 PORTVERSION=	0.14
 CATEGORIES=	x11-toolkits python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	python-xlib
+MASTER_SITES=	SF/python-${PORTNAME}/python-${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	python-xlib-${PORTVERSION}
 
diff --git a/x11-toolkits/qwt4/Makefile b/x11-toolkits/qwt4/Makefile
index 74cf6f35afc9..52c77f24e418 100644
--- a/x11-toolkits/qwt4/Makefile
+++ b/x11-toolkits/qwt4/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	4.2.0
 PORTREVISION=	6
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=qwt
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Qwt widget library for technical purposes (old version)
diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index 87847188dc92..4b5c76c1e2c7 100644
--- a/x11-toolkits/rep-gtk2/Makefile
+++ b/x11-toolkits/rep-gtk2/Makefile
@@ -10,8 +10,7 @@ PORTVERSION=	0.18.6
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME:S/2$//}
+MASTER_SITES=	SF/rep-gtk/rep-gtk/${PORTVERSION}
 DISTNAME=	rep-gtk-${PORTVERSION}
 
 MAINTAINER=	anray@FreeBSD.org
diff --git a/x11-toolkits/ruby-gtk/Makefile b/x11-toolkits/ruby-gtk/Makefile
index 07f183424b2a..a137610f8c7e 100644
--- a/x11-toolkits/ruby-gtk/Makefile
+++ b/x11-toolkits/ruby-gtk/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	${RUBY_GNOME_PORTVERSION}
 PORTREVISION=	4
 CATEGORIES=	x11-toolkits ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
-MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${RUBY_GNOME_DISTNAME}
 DIST_SUBDIR=	ruby
@@ -30,8 +29,7 @@ RUBY_GNOME_PORTVERSION=		${RUBY_GNOME_VERSION}.${RUBY_GNOME_SNAPSHOTDATE}
 .else
 RUBY_GNOME_PORTVERSION=		${RUBY_GNOME_VERSION}
 .endif
-RUBY_GNOME_MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-RUBY_GNOME_MASTER_SITE_SUBDIR=	ruby-gnome
+RUBY_GNOME_MASTER_SITES=	SF/ruby-gnome/ruby-gnome/${PORTVERSION}
 RUBY_GNOME_DISTNAME=		ruby-gnome-all-${RUBY_GNOME_VERSION}
 
 .if defined(RUBY_GNOME_SNAPSHOTDATE)
diff --git a/x11-toolkits/sdl_pango/Makefile b/x11-toolkits/sdl_pango/Makefile
index 540e34cdde79..0ba91b682f8b 100644
--- a/x11-toolkits/sdl_pango/Makefile
+++ b/x11-toolkits/sdl_pango/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	sdl_pango
 PORTVERSION=	0.1.2
 PORTREVISION=	4
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	sdlpango
+MASTER_SITES=	SF/sdlpango/SDL_Pango/${PORTVERSION}
 DISTNAME=	SDL_Pango-${PORTVERSION}
 
 PATCH_SITES=	http://zarb.org/~gc/t/
diff --git a/x11-toolkits/tile/Makefile b/x11-toolkits/tile/Makefile
index 769e1ecedc46..38d34ce5fc34 100644
--- a/x11-toolkits/tile/Makefile
+++ b/x11-toolkits/tile/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	tile
 PORTVERSION=	0.8.2
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits tk
-MASTER_SITES=	SF/tktable
+MASTER_SITES=	SF/tktable/${PORTNAME}/${PORTNAME}-0-8-2
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Themed widget set for Tk
diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile
index 9dca2daee4e0..9995036468c8 100644
--- a/x11-toolkits/tix/Makefile
+++ b/x11-toolkits/tix/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	tix
 PORTVERSION=	8.1.4
 PORTREVISION=	5
 CATEGORIES=	x11-toolkits tk
-MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tix
+MASTER_SITES=   SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An extension to the Tk toolkit
diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile
index f998b36f4906..d43a0f370b92 100644
--- a/x11-toolkits/tk83/Makefile
+++ b/x11-toolkits/tk83/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	tk
 PORTVERSION=	8.3.5
 PORTREVISION=	9
 CATEGORIES=	x11-toolkits tk
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	tcl
+MASTER_SITES=	SF/tcl/Tcl/${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION}-src
 
 MAINTAINER=	dinoex@FreeBSD.org
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index 0e5caa8b9c02..0812a309276c 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -10,8 +10,7 @@ PORTVERSION=	8.4.19
 PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	x11-toolkits tk
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	tcl
+MASTER_SITES=	SF/tcl/Tcl/${PORTVERSION}
 PKGNAMESUFFIX?=	${THREADS_SUFFIX}
 DISTNAME=	${PORTNAME}${PORTVERSION}-src
 
diff --git a/x11-toolkits/tk85/Makefile b/x11-toolkits/tk85/Makefile
index ceb9672c7d53..c84ecd945b55 100644
--- a/x11-toolkits/tk85/Makefile
+++ b/x11-toolkits/tk85/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	tk
 PORTVERSION=	8.5.7
 #PORTREVISION=	1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	tcl
+MASTER_SITES=	SF/tcl/Tcl/${PORTVERSION}
 PKGNAMESUFFIX?=	${THREADS_SUFFIX}
 DISTNAME=	${PORTNAME}${PORTVERSION}-src
 
diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile
index 0da8cb54fffc..71b11bdf1d6b 100644
--- a/x11-toolkits/tk86/Makefile
+++ b/x11-toolkits/tk86/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	tk
 PORTVERSION=	8.6.b.1
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	tcl
+MASTER_SITES=	SF/tcl/Tcl/8.6b1
 PKGNAMESUFFIX?=	${THREADS_SUFFIX}
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.b.1/b1/}-src
 
diff --git a/x11-toolkits/tktable/Makefile b/x11-toolkits/tktable/Makefile
index fccd7019574d..1f216af251d3 100644
--- a/x11-toolkits/tktable/Makefile
+++ b/x11-toolkits/tktable/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	tktable
 PORTVERSION=	2.10
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits tk
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	${PORTNAME:S/tk/Tk/}${PORTVERSION}
 
 MAINTAINER=	mm@FreeBSD.org
diff --git a/x11-toolkits/tktreectrl/Makefile b/x11-toolkits/tktreectrl/Makefile
index 47a990c3277a..03cb8529fe06 100644
--- a/x11-toolkits/tktreectrl/Makefile
+++ b/x11-toolkits/tktreectrl/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	tktreectrl
 PORTVERSION=	2.2.9
 CATEGORIES=	x11-toolkits tk
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	scjamorim@bsd.com.br
 COMMENT=	Multi-column hierarchical listbox widget
diff --git a/x11-toolkits/v/Makefile b/x11-toolkits/v/Makefile
index 988636d2826c..6f6483062f6e 100644
--- a/x11-toolkits/v/Makefile
+++ b/x11-toolkits/v/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	v
 PORTVERSION=	1.90
 PORTREVISION=	3
 CATEGORIES=	x11-toolkits devel graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	vgui
+MASTER_SITES=	SF/${PORTNAME}gui/V%20GUI/${PORTVERSION}
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}-${PORTVERSION}a-patch${EXTRACT_SUFX}
 
diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile
index 17f632038b3e..6c49f933eb9f 100644
--- a/x11-toolkits/vdk/Makefile
+++ b/x11-toolkits/vdk/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	vdk
 PORTVERSION=	2.4.1
 PORTREVISION=	5
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	vdklib
+MASTER_SITES=	SF/${PORTNAME}lib/VDK%20for%20Linux/${PORTNAME}%20${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ wrapper for GTK+ toolkit
diff --git a/x11-toolkits/vdkbuilder/Makefile b/x11-toolkits/vdkbuilder/Makefile
index 37ee8979742e..6f5f40355bb5 100644
--- a/x11-toolkits/vdkbuilder/Makefile
+++ b/x11-toolkits/vdkbuilder/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	vdkbuilder
 PORTVERSION=	2.4.1
 PORTREVISION=	2
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}2-${PORTVERSION}
 DISTNAME=	${PORTNAME}2-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-toolkits/viewklass/Makefile b/x11-toolkits/viewklass/Makefile
index f15c683e39ef..def86ec1cff7 100644
--- a/x11-toolkits/viewklass/Makefile
+++ b/x11-toolkits/viewklass/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	viewklass
 PORTVERSION=	0.7.2
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/ViewKlass-${PORTVERSION}
 DISTNAME=	ViewKlass-${PORTVERSION}
 
 MAINTAINER=	araujo@FreeBSD.org
diff --git a/x11-toolkits/wxd/Makefile b/x11-toolkits/wxd/Makefile
index 6f7c052195fb..3c8ec4fb1aad 100644
--- a/x11-toolkits/wxd/Makefile
+++ b/x11-toolkits/wxd/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	wxd
 PORTVERSION=	0.14
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits devel
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/wxD/${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jochen@daten-chaos.de
diff --git a/x11-toolkits/wxgtk24-docs/Makefile b/x11-toolkits/wxgtk24-docs/Makefile
index e8849bbec861..42d3cb60d1f9 100644
--- a/x11-toolkits/wxgtk24-docs/Makefile
+++ b/x11-toolkits/wxgtk24-docs/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	wxgtk_doc
 PORTVERSION=	2.4.2
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	wxwindows
+MASTER_SITES=	SF/wxwindows/Documents/${PORTVERSION}
 DISTNAME=	wxWindows-${PORTVERSION}-HTML
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile
index 9a643bb35c8d..90a7ae6a1c1c 100644
--- a/x11-toolkits/wxgtk24/Makefile
+++ b/x11-toolkits/wxgtk24/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.4.2
 PORTREVISION?=	17
 PKGNAMESUFFIX=	${WXGTK_FLAVOR}
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	SF/wxwindows
+MASTER_SITES=	SF/wxwindows/wxGTK/${PORTVERSION}
 DISTNAME=	wxGTK-${PORTVERSION}
 
 MAINTAINER?=	fjoe@FreeBSD.org
diff --git a/x11-toolkits/wxgtk26-docs/Makefile b/x11-toolkits/wxgtk26-docs/Makefile
index 1a02c98e4ff9..7341b9159385 100644
--- a/x11-toolkits/wxgtk26-docs/Makefile
+++ b/x11-toolkits/wxgtk26-docs/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	wxgtk_doc
 PORTVERSION=	2.6.4
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	SF/wxwindows
+MASTER_SITES=	SF/wxwindows/Documents/${PORTVERSION}
 DISTNAME=	wxWidgets-${PORTVERSION}-HTML
 
 MAINTAINER=	m.sund@arcor.de
diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile
index bfa5b7d34be7..8dd258fa30a3 100644
--- a/x11-toolkits/wxgtk26/Makefile
+++ b/x11-toolkits/wxgtk26/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	wx
 PORTVERSION=	2.6.4
 PORTREVISION?=	1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	SF/wxwindows
+MASTER_SITES=	SF/wxwindows/wxGTK/${PORTVERSION}
 PKGNAMESUFFIX=	${WXGTK_FLAVOR}
 DISTNAME=	wxGTK-${PORTVERSION}
 
diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile
index ac5936977525..321c75cc900a 100644
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	wx
 PORTVERSION=	2.8.10
 PORTREVISION?=	1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	SF/wxwindows
+MASTER_SITES=	SF/wxwindows/wxGTK/${PORTVERSION}
 PKGNAMESUFFIX=	${WXGTK_FLAVOR}
 DISTNAME=	wxGTK-${PORTVERSION:rc1=-rc1}
 
diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile
index ac5936977525..321c75cc900a 100644
--- a/x11-toolkits/wxgtk29/Makefile
+++ b/x11-toolkits/wxgtk29/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	wx
 PORTVERSION=	2.8.10
 PORTREVISION?=	1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	SF/wxwindows
+MASTER_SITES=	SF/wxwindows/wxGTK/${PORTVERSION}
 PKGNAMESUFFIX=	${WXGTK_FLAVOR}
 DISTNAME=	wxGTK-${PORTVERSION:rc1=-rc1}
 
diff --git a/x11-toolkits/xbae/Makefile b/x11-toolkits/xbae/Makefile
index d7e3b20e7fdb..d02102e7514b 100644
--- a/x11-toolkits/xbae/Makefile
+++ b/x11-toolkits/xbae/Makefile
@@ -10,8 +10,7 @@
 PORTNAME=	Xbae
 PORTVERSION=	4.60.4
 CATEGORIES=	x11-toolkits math
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	xbae
+MASTER_SITES=	SF
 DISTNAME=	xbae-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-toolkits/xclasses/Makefile b/x11-toolkits/xclasses/Makefile
index 8ea1b34ce0e1..6d26c620b128 100644
--- a/x11-toolkits/xclasses/Makefile
+++ b/x11-toolkits/xclasses/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	xclasses
 PORTVERSION=	1.4.0
 PORTREVISION=	2
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	SF/xcmail
+MASTER_SITES=	SF/xcmail/Xclasses%20lib/${PORTVERSION}
 DISTNAME=	Xclasses-public-${PORTVERSION}.src
 
 MAINTAINER=	ports@FreeBSD.org