Teach MASTER_SITES about new MASTER_SITE_SOURCEFORGE.

108 files changed, 225 insertions, 137 deletions

diff --git a/archivers/fastjar/Makefile b/archivers/fastjar/Makefile
index f08d5c5..e626c7c 100644
--- a/archivers/fastjar/Makefile
+++ b/archivers/fastjar/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	fastjar
 PORTVERSION=	0.90
 CATEGORIES=	archivers java
-MASTER_SITES=	http://download.sourceforge.net/fastjar/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	knu@FreeBSD.org
diff --git a/astro/xplanet/Makefile b/astro/xplanet/Makefile
index 06114cb..73ed98cd 100644
--- a/astro/xplanet/Makefile
+++ b/astro/xplanet/Makefile
@@ -8,8 +8,9 @@
 PORTNAME=	xplanet
 PORTVERSION=	0.60
 CATEGORIES=	astro x11
-MASTER_SITES=	ftp://ftp.sourceforge.net/pub/sourceforge/xplanet/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.radcyberzine.com/xglobe/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} depths_800.jpg
 
 MAINTAINER=	will@FreeBSD.org
diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index 7ff01c7..4fa519c 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -8,12 +8,10 @@
 PORTNAME=	aumix
 PORTVERSION=	2.6
 CATEGORIES=	audio
-MASTER_SITES=	http://jpj.net/~trevor/aumix/ \
-		http://download.sourceforge.net/aumix/ \
-		http://jpj.net/~trevor/aumix/old/ \
-		ftp://aumix.sourceforge.net/pub/aumix/stable/ \
-		${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	apps/sound/mixers
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		http://jpj.net/~trevor/aumix/ \
+		http://jpj.net/~trevor/aumix/old/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	cpiazza@FreeBSD.org
 
diff --git a/audio/extace/Makefile b/audio/extace/Makefile
index 996c752..3d65c23 100644
--- a/audio/extace/Makefile
+++ b/audio/extace/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=		extace
 PORTVERSION=		1.2.23
 CATEGORIES=		audio
-MASTER_SITES=		http://download.sourceforge.net/eXtace/
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	eXtace
 
 MAINTAINER=		sobomax@FreeBSD.org
 
diff --git a/audio/knapster/Makefile b/audio/knapster/Makefile
index 0642fc2..de6e785 100644
--- a/audio/knapster/Makefile
+++ b/audio/knapster/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	knapster
 PORTVERSION=	0.10
 CATEGORIES=	audio kde
-MASTER_SITES=	http://download.sourceforge.net/knapster/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jedgar@FreeBSD.org
 
diff --git a/audio/sphinx/Makefile b/audio/sphinx/Makefile
index 19cc5a9..73d3b76 100644
--- a/audio/sphinx/Makefile
+++ b/audio/sphinx/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	sphinx
 PORTVERSION=	2.0.2
 CATEGORIES=	audio
-MASTER_SITES=	http://download.sourceforge.net/cmusphinx/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	cmusphinx
 DISTNAME=	sphinx2-0.2
 
 MAINTAINER=	trevor@jpj.net
diff --git a/audio/yamt/Makefile b/audio/yamt/Makefile
index c7e38a6..e5fc647 100644
--- a/audio/yamt/Makefile
+++ b/audio/yamt/Makefile
@@ -8,8 +8,9 @@
 PORTNAME=	yamt
 PORTVERSION=	0.5
 CATEGORIES=	audio gnome
-MASTER_SITES=	http://download.sourceforge.net/yamt/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.gpad.ac.ru/pub/FreeBSD/distfiles/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	dima@Chg.RU
 
diff --git a/cad/felt/Makefile b/cad/felt/Makefile
index 91cf824..cc584e0 100644
--- a/cad/felt/Makefile
+++ b/cad/felt/Makefile
@@ -8,9 +8,10 @@
 PORTNAME=	felt
 PORTVERSION=	3.05
 CATEGORIES=	cad
-MASTER_SITES=	ftp://felt.sourceforge.net/pub/FElt/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://symphony.clarku.edu/atkinson/felt/Binaries/ \
 		ftp://ftp.isd.uni-stuttgart.de/pub/src/FEM/FElt/
+MASTER_SITE_SUBDIR=	FElt
 EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	giffunip@asme.org
diff --git a/databases/metakit/Makefile b/databases/metakit/Makefile
index fc50a40..dfaa3da 100644
--- a/databases/metakit/Makefile
+++ b/databases/metakit/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	metakit
 PORTVERSION=	2.0
 CATEGORIES=	databases
-MASTER_SITES=	http://download.sourceforge.net/metakit/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	rcarter@pinyon.org
 
diff --git a/deskutils/cbb/Makefile b/deskutils/cbb/Makefile
index c11db06..141b81b 100644
--- a/deskutils/cbb/Makefile
+++ b/deskutils/cbb/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	cbb
 PORTVERSION=	0.8.1
 CATEGORIES=	deskutils
-MASTER_SITES=	http://download.sourceforge.net/cbb/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	kline@thought.org
 
diff --git a/deskutils/gnofin/Makefile b/deskutils/gnofin/Makefile
index fbff497..39d1026 100644
--- a/deskutils/gnofin/Makefile
+++ b/deskutils/gnofin/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	gnofin
 PORTVERSION=	0.8.0
 CATEGORIES=	deskutils gnome
-MASTER_SITES=	http://download.sourceforge.net/gnofin/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jedgar@FreeBSD.org
 
diff --git a/devel/SWIG-devel/Makefile b/devel/SWIG-devel/Makefile
index a5dfd94..b805c6b 100644
--- a/devel/SWIG-devel/Makefile
+++ b/devel/SWIG-devel/Makefile
@@ -8,11 +8,11 @@
 PORTNAME=	swig
 PORTVERSION=	1.3a2
 CATEGORIES=	devel python tcl82
-MASTER_SITES=   ftp://ftp.sourceforge.net/pub/sourceforge/swig/ \
-		http://download.sourceforge.net/swig/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.rge.com/pub/languages/swig/ \
 		ftp://ftp.python.org/pub/python/contrib/System/ \
 		ftp://ftp.mcc.ac.uk/pub/mvc/swig/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/devel/SWIG/Makefile b/devel/SWIG/Makefile
index a5dfd94..b805c6b 100644
--- a/devel/SWIG/Makefile
+++ b/devel/SWIG/Makefile
@@ -8,11 +8,11 @@
 PORTNAME=	swig
 PORTVERSION=	1.3a2
 CATEGORIES=	devel python tcl82
-MASTER_SITES=   ftp://ftp.sourceforge.net/pub/sourceforge/swig/ \
-		http://download.sourceforge.net/swig/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.rge.com/pub/languages/swig/ \
 		ftp://ftp.python.org/pub/python/contrib/System/ \
 		ftp://ftp.mcc.ac.uk/pub/mvc/swig/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/devel/cervisia/Makefile b/devel/cervisia/Makefile
index 7b8afc9..836692c 100644
--- a/devel/cervisia/Makefile
+++ b/devel/cervisia/Makefile
@@ -7,8 +7,8 @@
 PORTNAME=	cervisia
 PORTVERSION=	0.6.0
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.sourceforge.net/pub/sourceforge/cervisia/ \
-		http://download.sourceforge.net/cervisia/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	will@FreeBSD.org
 
diff --git a/devel/cscope/Makefile b/devel/cscope/Makefile
index ad110c2..b9cf559 100644
--- a/devel/cscope/Makefile
+++ b/devel/cscope/Makefile
@@ -9,8 +9,8 @@
 PORTNAME=	cscope
 PORTVERSION=	15.0.bl2
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.sourceforge.net/pub/sourceforge/cscope/  \
-		http://download.sourceforge.net/cscope/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-15.0bl2
 
 MAINTAINER=	obrien@FreeBSD.org
diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile
index c4185fa..d0e0a2c 100644
--- a/devel/libsigc++/Makefile
+++ b/devel/libsigc++/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	libsigc++
 PORTVERSION=	1.0.0
 CATEGORIES=	devel
-MASTER_SITES=	http://download.sourceforge.net/libsigc/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	libsigc
 
 MAINTAINER=	JoeLu@JoeLu.m8.ntu.edu.tw
 
diff --git a/devel/libsigc++12/Makefile b/devel/libsigc++12/Makefile
index c4185fa..d0e0a2c 100644
--- a/devel/libsigc++12/Makefile
+++ b/devel/libsigc++12/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	libsigc++
 PORTVERSION=	1.0.0
 CATEGORIES=	devel
-MASTER_SITES=	http://download.sourceforge.net/libsigc/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	libsigc
 
 MAINTAINER=	JoeLu@JoeLu.m8.ntu.edu.tw
 
diff --git a/devel/libsigc++20/Makefile b/devel/libsigc++20/Makefile
index c4185fa..d0e0a2c 100644
--- a/devel/libsigc++20/Makefile
+++ b/devel/libsigc++20/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	libsigc++
 PORTVERSION=	1.0.0
 CATEGORIES=	devel
-MASTER_SITES=	http://download.sourceforge.net/libsigc/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	libsigc
 
 MAINTAINER=	JoeLu@JoeLu.m8.ntu.edu.tw
 
diff --git a/devel/swig11/Makefile b/devel/swig11/Makefile
index a5dfd94..b805c6b 100644
--- a/devel/swig11/Makefile
+++ b/devel/swig11/Makefile
@@ -8,11 +8,11 @@
 PORTNAME=	swig
 PORTVERSION=	1.3a2
 CATEGORIES=	devel python tcl82
-MASTER_SITES=   ftp://ftp.sourceforge.net/pub/sourceforge/swig/ \
-		http://download.sourceforge.net/swig/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.rge.com/pub/languages/swig/ \
 		ftp://ftp.python.org/pub/python/contrib/System/ \
 		ftp://ftp.mcc.ac.uk/pub/mvc/swig/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/devel/swig13/Makefile b/devel/swig13/Makefile
index a5dfd94..b805c6b 100644
--- a/devel/swig13/Makefile
+++ b/devel/swig13/Makefile
@@ -8,11 +8,11 @@
 PORTNAME=	swig
 PORTVERSION=	1.3a2
 CATEGORIES=	devel python tcl82
-MASTER_SITES=   ftp://ftp.sourceforge.net/pub/sourceforge/swig/ \
-		http://download.sourceforge.net/swig/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.rge.com/pub/languages/swig/ \
 		ftp://ftp.python.org/pub/python/contrib/System/ \
 		ftp://ftp.mcc.ac.uk/pub/mvc/swig/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/devel/swig20/Makefile b/devel/swig20/Makefile
index a5dfd94..b805c6b 100644
--- a/devel/swig20/Makefile
+++ b/devel/swig20/Makefile
@@ -8,11 +8,11 @@
 PORTNAME=	swig
 PORTVERSION=	1.3a2
 CATEGORIES=	devel python tcl82
-MASTER_SITES=   ftp://ftp.sourceforge.net/pub/sourceforge/swig/ \
-		http://download.sourceforge.net/swig/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.rge.com/pub/languages/swig/ \
 		ftp://ftp.python.org/pub/python/contrib/System/ \
 		ftp://ftp.mcc.ac.uk/pub/mvc/swig/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/editors/biew/Makefile b/editors/biew/Makefile
index 51e42ef..a2fcd61 100644
--- a/editors/biew/Makefile
+++ b/editors/biew/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	biew
 PORTVERSION=    5.1.0
 CATEGORIES=	editors
-MASTER_SITES=	ftp://biew.sourceforge.net/pub/biew/5.x/src/ \
-		http://download.sourceforge.net/biew/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=       ${PORTNAME}-510
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/editors/fte/Makefile b/editors/fte/Makefile
index 33e87c5..8289973 100644
--- a/editors/fte/Makefile
+++ b/editors/fte/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=		fte
 PORTVERSION=		46.5
 CATEGORIES=		editors
-MASTER_SITES=		ftp://ftp.sourceforge.net/pub/sourceforge/fte/ \
-			http://download.sourceforge.net/fte/
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=		${PORTNAME}s${PORTVERSION:S/./b/}
 EXTRACT_SUFX=		.zip
 
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 21bb299..7c030b0 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	gedit
 PORTVERSION=	0.7.9
 CATEGORIES=	editors gnome
-MASTER_SITES=	http://download.sourceforge.net/gedit/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ade@FreeBSD.org
 
diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile
index 21bb299..7c030b0 100644
--- a/editors/gedit2/Makefile
+++ b/editors/gedit2/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	gedit
 PORTVERSION=	0.7.9
 CATEGORIES=	editors gnome
-MASTER_SITES=	http://download.sourceforge.net/gedit/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ade@FreeBSD.org
 
diff --git a/editors/gnotepad+/Makefile b/editors/gnotepad+/Makefile
index c09ba26..1addd79 100644
--- a/editors/gnotepad+/Makefile
+++ b/editors/gnotepad+/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	gnotepad+
 PORTVERSION=	1.3.0
 CATEGORIES=	editors www gnome
-MASTER_SITES=	http://download.sourceforge.net/gnotepad/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	gnotepad
 .if !defined(NOPORTDOCS)
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}-help-${DOCVERSION}${EXTRACT_SUFX}
diff --git a/emulators/basiliskII/Makefile b/emulators/basiliskII/Makefile
index cee28fb..a1bd4d0 100644
--- a/emulators/basiliskII/Makefile
+++ b/emulators/basiliskII/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=		basiliskII
 PORTVERSION=		0.8.1
 CATEGORIES=		emulators
-MASTER_SITES=		http://download.sourceforge.net/basilisk/
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	basilisk
 DISTNAME=		BasiliskII_src_30012000
 
 MAINTAINER=		sobomax@FreeBSD.org
diff --git a/finance/cbb/Makefile b/finance/cbb/Makefile
index c11db06..141b81b 100644
--- a/finance/cbb/Makefile
+++ b/finance/cbb/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	cbb
 PORTVERSION=	0.8.1
 CATEGORIES=	deskutils
-MASTER_SITES=	http://download.sourceforge.net/cbb/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	kline@thought.org
 
diff --git a/finance/gnofin/Makefile b/finance/gnofin/Makefile
index fbff497..39d1026 100644
--- a/finance/gnofin/Makefile
+++ b/finance/gnofin/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	gnofin
 PORTVERSION=	0.8.0
 CATEGORIES=	deskutils gnome
-MASTER_SITES=	http://download.sourceforge.net/gnofin/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jedgar@FreeBSD.org
 
diff --git a/games/corewars/Makefile b/games/corewars/Makefile
index 2a280a4..8085793 100644
--- a/games/corewars/Makefile
+++ b/games/corewars/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	corewars
 PORTVERSION=	0.9.11
 CATEGORIES=	games
-MASTER_SITES=	http://download.sourceforge.net/corewars/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jim@FreeBSD.org
 
diff --git a/games/glife/Makefile b/games/glife/Makefile
index 1b8f341..6bbeb80 100644
--- a/games/glife/Makefile
+++ b/games/glife/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	glife
 PORTVERSION=	0.2.1
 CATEGORIES=	games gnome
-MASTER_SITES=	http://download.sourceforge.net/glife/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	gLife-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index 33b5ce6dd..9032f38 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	QuakeForge
 PORTVERSION=	0.1.1
 CATEGORIES=	games
-MASTER_SITES=	http://download.sourceforge.net/quake/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	quake
 DISTNAME=	quakeforge-${PORTVERSION}
 .if !defined(NO_WAD)
 MASTER_SITES+=	http://www.devolution.com/~slouken/SDL/projects/quake/data/
diff --git a/graphics/Mesa3/Makefile b/graphics/Mesa3/Makefile
index b3c652a..a98b34f 100644
--- a/graphics/Mesa3/Makefile
+++ b/graphics/Mesa3/Makefile
@@ -8,9 +8,10 @@
 PORTNAME=	Mesa
 PORTVERSION=	3.2
 CATEGORIES=	graphics
-MASTER_SITES= 	http://download.sourceforge.net/mesa3d/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://iris.ssec.wisc.edu/pub/Mesa/ \
 		ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/
+MASTER_SITE_SUBDIR=	mesa3d
 DISTFILES=	MesaLib-${PORTVERSION}${EXTRACT_SUFX} \
 		MesaDemos-${PORTVERSION}${EXTRACT_SUFX}
 
diff --git a/graphics/gcolor/Makefile b/graphics/gcolor/Makefile
index 58a58cf..9db4c7f 100644
--- a/graphics/gcolor/Makefile
+++ b/graphics/gcolor/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	gcolor
 PORTVERSION=	0.4
 CATEGORIES=	graphics gnome x11
-MASTER_SITES=	http://download.sourceforge.net/gcolor/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	will@FreeBSD.org
 
diff --git a/graphics/gnofract4d/Makefile b/graphics/gnofract4d/Makefile
index c16d949..93bd832 100644
--- a/graphics/gnofract4d/Makefile
+++ b/graphics/gnofract4d/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	gnofract4d
 PORTVERSION=	1.2
 CATEGORIES=	graphics gnome
-MASTER_SITES=	http://download.sourceforge.net/gnofract4d/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	will@FreeBSD.org
 
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index 0bdf740..c8072da 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	gqview
 PORTVERSION=	0.8.1
 CATEGORIES=	graphics
-MASTER_SITES=	http://download.sourceforge.net/gqview/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	nakai@FreeBSD.org
 
diff --git a/graphics/mesagl/Makefile b/graphics/mesagl/Makefile
index b3c652a..a98b34f 100644
--- a/graphics/mesagl/Makefile
+++ b/graphics/mesagl/Makefile
@@ -8,9 +8,10 @@
 PORTNAME=	Mesa
 PORTVERSION=	3.2
 CATEGORIES=	graphics
-MASTER_SITES= 	http://download.sourceforge.net/mesa3d/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://iris.ssec.wisc.edu/pub/Mesa/ \
 		ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/
+MASTER_SITE_SUBDIR=	mesa3d
 DISTFILES=	MesaLib-${PORTVERSION}${EXTRACT_SUFX} \
 		MesaDemos-${PORTVERSION}${EXTRACT_SUFX}
 
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 2bd9b78..5cea854 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	netpbm
 PORTVERSION=	9.4
 CATEGORIES=	graphics
-MASTER_SITES=	http://download.sourceforge.net/netpbm/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/graphics/piddle/Makefile b/graphics/piddle/Makefile
index 34f7ab5..73e82b6 100644
--- a/graphics/piddle/Makefile
+++ b/graphics/piddle/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	piddle
 PORTVERSION=	1.0b1
 CATEGORIES=	graphics python
-MASTER_SITES=	http://download.sourceforge.net/piddle/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-5
 EXTRACT_SUFX=	.tgz
 
diff --git a/graphics/pngcrush/Makefile b/graphics/pngcrush/Makefile
index 2e096e6..afa1f10 100644
--- a/graphics/pngcrush/Makefile
+++ b/graphics/pngcrush/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	pngcrush
 PORTVERSION=	1.4.4
 CATEGORIES=	graphics
-MASTER_SITES=	http://download.sourceforge.net/pmt/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	pmt
 
 MAINTAINER=	jedgar@FreeBSD.org
 
diff --git a/graphics/skencil/Makefile b/graphics/skencil/Makefile
index 46bcb97..f4fc71c 100644
--- a/graphics/skencil/Makefile
+++ b/graphics/skencil/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	sketch
 PORTVERSION=	0.6.7
 CATEGORIES=	graphics
-MASTER_SITES=	http://download.sourceforge.net/sketch/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/graphics/sketch/Makefile b/graphics/sketch/Makefile
index 46bcb97..f4fc71c 100644
--- a/graphics/sketch/Makefile
+++ b/graphics/sketch/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	sketch
 PORTVERSION=	0.6.7
 CATEGORIES=	graphics
-MASTER_SITES=	http://download.sourceforge.net/sketch/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index cf4b79a..66afc61 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	sodipodi
 PORTVERSION=	0.18
 CATEGORIES=	graphics gnome
-MASTER_SITES=	http://download.sourceforge.net/sodipodi/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	nakai@FreeBSD.org
 
diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index 77a104a..f4398dd 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	librep
 PORTVERSION=	0.11.3
 CATEGORIES=	lang
-MASTER_SITES=	ftp://librep.sourceforge.net/pub/librep/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	nakai@FreeBSD.org
 
diff --git a/lang/librep2/Makefile b/lang/librep2/Makefile
index 77a104a..f4398dd 100644
--- a/lang/librep2/Makefile
+++ b/lang/librep2/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	librep
 PORTVERSION=	0.11.3
 CATEGORIES=	lang
-MASTER_SITES=	ftp://librep.sourceforge.net/pub/librep/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	nakai@FreeBSD.org
 
diff --git a/mail/asmail/Makefile b/mail/asmail/Makefile
index d0b4eaa..e44445c 100644
--- a/mail/asmail/Makefile
+++ b/mail/asmail/Makefile
@@ -8,8 +8,9 @@
 PORTNAME=	asmail
 PORTVERSION=	0.56
 CATEGORIES=	mail afterstep
-MASTER_SITES=	http://asmail.sourceforge.net/files/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://gates.enemy.at/pub/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	brett@peloton.runet.edu
 
diff --git a/mail/grepmail/Makefile b/mail/grepmail/Makefile
index 281e70b..fc83ea4 100644
--- a/mail/grepmail/Makefile
+++ b/mail/grepmail/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	grepmail
 PORTVERSION= 	4.40
 CATEGORIES=	mail
-MASTER_SITES=	http://download.sourceforge.net/grepmail/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate
 RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate
diff --git a/mail/mbx2mbox/Makefile b/mail/mbx2mbox/Makefile
index f634c79..938c022 100644
--- a/mail/mbx2mbox/Makefile
+++ b/mail/mbx2mbox/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	mbx2mbox
 PORTVERSION= 	0.33
 CATEGORIES=	mail
-MASTER_SITES=	http://download.sourceforge.net/mbx2mbox/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/mail/rblcheck/Makefile b/mail/rblcheck/Makefile
index 7219a10..126796d 100644
--- a/mail/rblcheck/Makefile
+++ b/mail/rblcheck/Makefile
@@ -8,8 +8,9 @@
 PORTNAME=	rblcheck
 PORTVERSION= 	1.4
 CATEGORIES=	mail
-MASTER_SITES=	http://download.sourceforge.net/rblcheck/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.xnet.com/%7Eemarshal/rblcheck/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	itojun@itojun.org
 HOMEPAGE=	http://rblcheck.sourceforge.net/
diff --git a/math/numpy/Makefile b/math/numpy/Makefile
index 1ccf1c6..e42838ee 100644
--- a/math/numpy/Makefile
+++ b/math/numpy/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	numeric
 PORTVERSION=	15.3
 CATEGORIES=	math python
-MASTER_SITES=	http://download.sourceforge.net/numpy/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	numpy
 PKGNAMEPREFIX=	py-
 DISTNAME=	Numerical-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
diff --git a/math/py-numeric/Makefile b/math/py-numeric/Makefile
index 1ccf1c6..e42838ee 100644
--- a/math/py-numeric/Makefile
+++ b/math/py-numeric/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	numeric
 PORTVERSION=	15.3
 CATEGORIES=	math python
-MASTER_SITES=	http://download.sourceforge.net/numpy/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	numpy
 PKGNAMEPREFIX=	py-
 DISTNAME=	Numerical-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
diff --git a/math/py-numeric17/Makefile b/math/py-numeric17/Makefile
index 1ccf1c6..e42838ee 100644
--- a/math/py-numeric17/Makefile
+++ b/math/py-numeric17/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	numeric
 PORTVERSION=	15.3
 CATEGORIES=	math python
-MASTER_SITES=	http://download.sourceforge.net/numpy/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	numpy
 PKGNAMEPREFIX=	py-
 DISTNAME=	Numerical-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
diff --git a/math/rcalc/Makefile b/math/rcalc/Makefile
index c76b357..1bb2ea0 100644
--- a/math/rcalc/Makefile
+++ b/math/rcalc/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	rcalc
 PORTVERSION=	0.2.1
 CATEGORIES=	math gnome
-MASTER_SITES=	http://download.sourceforge.net/rcalc/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	rCalc-${PORTVERSION}
 
 MAINTAINER=	jedgar@FreeBSD.org
diff --git a/misc/kcd-devel/Makefile b/misc/kcd-devel/Makefile
index 71f2878..a1d616b 100644
--- a/misc/kcd-devel/Makefile
+++ b/misc/kcd-devel/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	kcd
 PORTVERSION=	4.11.2
 CATEGORIES=	misc
-MASTER_SITES=	http://download.sourceforge.net/kcd/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/misc/kcd/Makefile b/misc/kcd/Makefile
index 71f2878..a1d616b 100644
--- a/misc/kcd/Makefile
+++ b/misc/kcd/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	kcd
 PORTVERSION=	4.11.2
 CATEGORIES=	misc
-MASTER_SITES=	http://download.sourceforge.net/kcd/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index 69797c9..c6dc008 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -8,8 +8,9 @@
 PORTNAME=	gaim
 PORTVERSION=	0.9.19
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.marko.net/pub/gaim/ \
-		http://download.sourceforge.net/gaim/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		ftp://ftp.marko.net/pub/gaim/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jim@FreeBSD.org
 
diff --git a/net-im/icqlib/Makefile b/net-im/icqlib/Makefile
index 41ace90..7541eed 100644
--- a/net-im/icqlib/Makefile
+++ b/net-im/icqlib/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	icqlib
 PORTVERSION=	0.1.3
 CATEGORIES=	net
-MASTER_SITES=	http://download.sourceforge.net/icqlib/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	paxvel@iname.com
 
diff --git a/net-im/licq/Makefile b/net-im/licq/Makefile
index 925e5ac..dba522b 100644
--- a/net-im/licq/Makefile
+++ b/net-im/licq/Makefile
@@ -8,11 +8,12 @@
 PORTNAME=	licq
 PORTVERSION=	0.81
 CATEGORIES=	net
-MASTER_SITES=	http://download.sourceforge.net/licq/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.wibble.net/pub/licq/srcs/ \
 		ftp://licq.darkorb.net/srcs/ \
 		ftp://ftp.fanfic.org/pub/licq/srcs/ \
 		ftp://ftp.inter-i.uni-mainz.de/pub/licq/srcs/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATAFILES}
 
 MAINTAINER=	green@FreeBSD.org
diff --git a/net/amcl/Makefile b/net/amcl/Makefile
index fcabb71..bcf2698 100644
--- a/net/amcl/Makefile
+++ b/net/amcl/Makefile
@@ -8,11 +8,10 @@
 PORTNAME=		amcl
 PORTVERSION=		0.7.0
 CATEGORIES=		net
-MASTER_SITES=		ftp://ftp.sourceforge.net/pub/sourceforge/amcl/ \
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE} \
 			http://www.localhost.nu/apps/amcl/tars/ \
-			http://amcl.alliances.org/tars/ \
-			${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	games/muds
+			http://amcl.alliances.org/tars/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=		${PORTNAME}-${PORTVERSION}pl1
 
 MAINTAINER=		will@FreeBSD.org
diff --git a/net/etherboot/Makefile b/net/etherboot/Makefile
index d3598f6..af687f9 100644
--- a/net/etherboot/Makefile
+++ b/net/etherboot/Makefile
@@ -8,9 +8,10 @@
 PORTNAME=	etherboot
 PORTVERSION=	4.6.1
 CATEGORIES=	net
-MASTER_SITES=	http://etherboot.sourceforge.net/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.us.kernel.org/pub/linux/devel/gcc/ \
 		http://www.ambrisko.com/doug/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTFILES=	${DISTNAME}.tar.gz ${BINUTILS_VER}.tar.gz
 
 MAINTAINER=	ambrisko@whistle.com
diff --git a/net/gaim-snapshot/Makefile b/net/gaim-snapshot/Makefile
index 69797c9..c6dc008 100644
--- a/net/gaim-snapshot/Makefile
+++ b/net/gaim-snapshot/Makefile
@@ -8,8 +8,9 @@
 PORTNAME=	gaim
 PORTVERSION=	0.9.19
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.marko.net/pub/gaim/ \
-		http://download.sourceforge.net/gaim/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		ftp://ftp.marko.net/pub/gaim/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jim@FreeBSD.org
 
diff --git a/net/gaim/Makefile b/net/gaim/Makefile
index 69797c9..c6dc008 100644
--- a/net/gaim/Makefile
+++ b/net/gaim/Makefile
@@ -8,8 +8,9 @@
 PORTNAME=	gaim
 PORTVERSION=	0.9.19
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.marko.net/pub/gaim/ \
-		http://download.sourceforge.net/gaim/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		ftp://ftp.marko.net/pub/gaim/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jim@FreeBSD.org
 
diff --git a/net/gatekeeper/Makefile b/net/gatekeeper/Makefile
index 41b3076..6f45362 100644
--- a/net/gatekeeper/Makefile
+++ b/net/gatekeeper/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	gatekeeper
 PORTVERSION=	0.12p
 CATEGORIES=	net
-MASTER_SITES=	http://download.sourceforge.net/openh323gk/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	openh323gk
 DISTNAME=	gk012pre4
 
 MAINTAINER=	roger@FreeBSD.org
diff --git a/net/gnome-mud/Makefile b/net/gnome-mud/Makefile
index fcabb71..bcf2698 100644
--- a/net/gnome-mud/Makefile
+++ b/net/gnome-mud/Makefile
@@ -8,11 +8,10 @@
 PORTNAME=		amcl
 PORTVERSION=		0.7.0
 CATEGORIES=		net
-MASTER_SITES=		ftp://ftp.sourceforge.net/pub/sourceforge/amcl/ \
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE} \
 			http://www.localhost.nu/apps/amcl/tars/ \
-			http://amcl.alliances.org/tars/ \
-			${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	games/muds
+			http://amcl.alliances.org/tars/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=		${PORTNAME}-${PORTVERSION}pl1
 
 MAINTAINER=		will@FreeBSD.org
diff --git a/net/icqlib/Makefile b/net/icqlib/Makefile
index 41ace90..7541eed 100644
--- a/net/icqlib/Makefile
+++ b/net/icqlib/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	icqlib
 PORTVERSION=	0.1.3
 CATEGORIES=	net
-MASTER_SITES=	http://download.sourceforge.net/icqlib/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	paxvel@iname.com
 
diff --git a/net/icqlib0/Makefile b/net/icqlib0/Makefile
index 41ace90..7541eed 100644
--- a/net/icqlib0/Makefile
+++ b/net/icqlib0/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	icqlib
 PORTVERSION=	0.1.3
 CATEGORIES=	net
-MASTER_SITES=	http://download.sourceforge.net/icqlib/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	paxvel@iname.com
 
diff --git a/net/iplog/Makefile b/net/iplog/Makefile
index 9621a1b..587c704 100644
--- a/net/iplog/Makefile
+++ b/net/iplog/Makefile
@@ -8,8 +8,9 @@
 PORTNAME=	iplog
 PORTVERSION=	2.1.1
 CATEGORIES=	security
-MASTER_SITES=	http://download.sourceforge.net/ojnk/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.karlsbakk.net/pub/ojnk/iplog/
+MASTER_SITE_SUBDIR=	ojnk
 
 PATCH_SITES=	http://ojnk.sourceforge.net/stuff/ \
 		ftp://ftp.karlsbakk.net/pub/ojnk/iplog/
diff --git a/net/kicq/Makefile b/net/kicq/Makefile
index fcd6b1d..f551c60 100644
--- a/net/kicq/Makefile
+++ b/net/kicq/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	kicq
 PORTVERSION=	0.3.0
 CATEGORIES=	net kde
-MASTER_SITES=	http://download.sourceforge.net/kicq/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	paxvel@iname.com
 
diff --git a/net/kxicq-devel/Makefile b/net/kxicq-devel/Makefile
index 6ed4dd4..bbfabbf 100644
--- a/net/kxicq-devel/Makefile
+++ b/net/kxicq-devel/Makefile
@@ -7,7 +7,8 @@
 PORTNAME=	kxicq
 PORTVERSION=	0.3.97b
 CATEGORIES=	net kde
-MASTER_SITES=	http://download.sourceforge.net/kxicq/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-03132000
 
 MAINTAINER=	andrey@novikov.com
diff --git a/net/kxicq/Makefile b/net/kxicq/Makefile
index 6ed4dd4..bbfabbf 100644
--- a/net/kxicq/Makefile
+++ b/net/kxicq/Makefile
@@ -7,7 +7,8 @@
 PORTNAME=	kxicq
 PORTVERSION=	0.3.97b
 CATEGORIES=	net kde
-MASTER_SITES=	http://download.sourceforge.net/kxicq/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-03132000
 
 MAINTAINER=	andrey@novikov.com
diff --git a/net/licq-devel/Makefile b/net/licq-devel/Makefile
index 925e5ac..dba522b 100644
--- a/net/licq-devel/Makefile
+++ b/net/licq-devel/Makefile
@@ -8,11 +8,12 @@
 PORTNAME=	licq
 PORTVERSION=	0.81
 CATEGORIES=	net
-MASTER_SITES=	http://download.sourceforge.net/licq/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.wibble.net/pub/licq/srcs/ \
 		ftp://licq.darkorb.net/srcs/ \
 		ftp://ftp.fanfic.org/pub/licq/srcs/ \
 		ftp://ftp.inter-i.uni-mainz.de/pub/licq/srcs/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATAFILES}
 
 MAINTAINER=	green@FreeBSD.org
diff --git a/net/licq/Makefile b/net/licq/Makefile
index 925e5ac..dba522b 100644
--- a/net/licq/Makefile
+++ b/net/licq/Makefile
@@ -8,11 +8,12 @@
 PORTNAME=	licq
 PORTVERSION=	0.81
 CATEGORIES=	net
-MASTER_SITES=	http://download.sourceforge.net/licq/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.wibble.net/pub/licq/srcs/ \
 		ftp://licq.darkorb.net/srcs/ \
 		ftp://ftp.fanfic.org/pub/licq/srcs/ \
 		ftp://ftp.inter-i.uni-mainz.de/pub/licq/srcs/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATAFILES}
 
 MAINTAINER=	green@FreeBSD.org
diff --git a/news/krn/Makefile b/news/krn/Makefile
index a1588ee..7f6c4f9 100644
--- a/news/krn/Makefile
+++ b/news/krn/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	krn
 PORTVERSION=	0.6.11
 CATEGORIES=	news kde
-MASTER_SITES=	ftp://ftp.sourceforge.net/pub/sourceforge/krn/ \
-		http://download.sourceforge.net/krn/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	adsharma@sharmas.dhs.org
 
diff --git a/news/trn4/Makefile b/news/trn4/Makefile
index 91f033f..5fc845f 100644
--- a/news/trn4/Makefile
+++ b/news/trn4/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	trn
 PORTVERSION=	4.0.b74
 CATEGORIES=	news
-MASTER_SITES=	ftp://trn.sourceforge.net/pub/trn/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	trn4-test74
 
 MAINTAINER=	mph@freebsd.org
diff --git a/print/freetype/Makefile b/print/freetype/Makefile
index e8bf083..bcaa0bd 100644
--- a/print/freetype/Makefile
+++ b/print/freetype/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	freetype
 PORTVERSION=	1.3.1
 CATEGORIES=	print
-MASTER_SITES=	http://download.sourceforge.net/freetype/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype1/ \
 		http://www.funet.fi/pub/mirrors/ftp.freetype.org/freetype1/ \
 		http://ftp.sunet.se/pub/text-processing/freetype/freetype1/ \
@@ -16,7 +16,8 @@ MASTER_SITES=	http://download.sourceforge.net/freetype/ \
 		ftp://ring.asahi-net.or.jp/pub/graphics/freetype/ \
 		ftp://ring.nacsis.ac.jp/pub/graphics/freetype/ \
 		ftp://ring.so-net.ne.jp/pub/graphics/freetype/ \
-		ftp://ftp.freetype.org/pub/freetype1/ \
+		ftp://ftp.freetype.org/pub/freetype1/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jseger@FreeBSD.org
 
diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
index e8bf083..bcaa0bd 100644
--- a/print/freetype2/Makefile
+++ b/print/freetype2/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	freetype
 PORTVERSION=	1.3.1
 CATEGORIES=	print
-MASTER_SITES=	http://download.sourceforge.net/freetype/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype1/ \
 		http://www.funet.fi/pub/mirrors/ftp.freetype.org/freetype1/ \
 		http://ftp.sunet.se/pub/text-processing/freetype/freetype1/ \
@@ -16,7 +16,8 @@ MASTER_SITES=	http://download.sourceforge.net/freetype/ \
 		ftp://ring.asahi-net.or.jp/pub/graphics/freetype/ \
 		ftp://ring.nacsis.ac.jp/pub/graphics/freetype/ \
 		ftp://ring.so-net.ne.jp/pub/graphics/freetype/ \
-		ftp://ftp.freetype.org/pub/freetype1/ \
+		ftp://ftp.freetype.org/pub/freetype1/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jseger@FreeBSD.org
 
diff --git a/science/felt/Makefile b/science/felt/Makefile
index 91cf824..cc584e0 100644
--- a/science/felt/Makefile
+++ b/science/felt/Makefile
@@ -8,9 +8,10 @@
 PORTNAME=	felt
 PORTVERSION=	3.05
 CATEGORIES=	cad
-MASTER_SITES=	ftp://felt.sourceforge.net/pub/FElt/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://symphony.clarku.edu/atkinson/felt/Binaries/ \
 		ftp://ftp.isd.uni-stuttgart.de/pub/src/FEM/FElt/
+MASTER_SITE_SUBDIR=	FElt
 EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	giffunip@asme.org
diff --git a/security/oidentd/Makefile b/security/oidentd/Makefile
index b627a63..5a3b945 100644
--- a/security/oidentd/Makefile
+++ b/security/oidentd/Makefile
@@ -8,8 +8,9 @@
 PORTNAME=	oidentd
 PORTVERSION=	1.6.4
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.sourceforge.net/pub/sourceforge/ojnk/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.numb.org/~odin/stuff/
+MASTER_SITE_SUBDIR=	ojnk
 
 MAINTAINER=	trevor@jpj.net
 
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index d7ccfc7..634e664 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -8,8 +8,9 @@
 PORTNAME=	seahorse
 PORTVERSION=	0.4.5
 CATEGORIES=	security
-MASTER_SITES=	http://seahorse.sourceforge.net/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.mu.org/~dave/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	dave@mu.org
 
diff --git a/sysutils/gnomefind/Makefile b/sysutils/gnomefind/Makefile
index a005fc8..b247e88 100644
--- a/sysutils/gnomefind/Makefile
+++ b/sysutils/gnomefind/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	gnomefind
 PORTVERSION= 	0.4
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	http://download.sourceforge.net/gnome-find/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	gnome-find
 DISTNAME=	gnome-find-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
diff --git a/sysutils/wmtop/Makefile b/sysutils/wmtop/Makefile
index f045b66..05f9509 100644
--- a/sysutils/wmtop/Makefile
+++ b/sysutils/wmtop/Makefile
@@ -7,7 +7,8 @@
 PORTNAME=	wmtop
 PORTVERSION=	0.81
 CATEGORIES=	sysutils
-MASTER_SITES=	http://wmtop.sourceforge.net/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	wmtop@tanelorn.demon.co.uk
 
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 507d541..188f011 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	aspell
 PORTVERSION= 	0.31
 CATEGORIES=	textproc
-MASTER_SITES=	http://download.sourceforge.net/aspell/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-.31
 
 MAINTAINER=	ade@FreeBSD.org
diff --git a/textproc/code2html/Makefile b/textproc/code2html/Makefile
index d4a2e24..8688dfc 100644
--- a/textproc/code2html/Makefile
+++ b/textproc/code2html/Makefile
@@ -8,8 +8,9 @@
 PORTNAME=	code2html
 PORTVERSION= 	0.8.9a
 CATEGORIES=	textproc
-MASTER_SITES=	ftp://code2html.sourceforge.net/pub/code2html/all/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.cosy.sbg.ac.at/~ppalfrad/code2html/all/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jedgar@FreeBSD.org
 
diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index f1c1c26..c98f3b3 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	openjade
 PORTVERSION= 	1.3
 CATEGORIES=	textproc
-MASTER_SITES=	http://download.sourceforge.net/openjade/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	kuriyama@FreeBSD.org
 
diff --git a/textproc/pspell/Makefile b/textproc/pspell/Makefile
index a43502d..6312381 100644
--- a/textproc/pspell/Makefile
+++ b/textproc/pspell/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	pspell
 PORTVERSION= 	0.11.0.1
 CATEGORIES=	textproc
-MASTER_SITES=	http://download.sourceforge.net/pspell/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-.11.0.1
 
 MAINTAINER=	ade@FreeBSD.org
diff --git a/www/kdewebdev/Makefile b/www/kdewebdev/Makefile
index 2bceaaf..9171439 100644
--- a/www/kdewebdev/Makefile
+++ b/www/kdewebdev/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	quanta
 PORTVERSION= 	1.0.2
 CATEGORIES=	www kde
-MASTER_SITES=	ftp://ftp.sourceforge.net/pub/sourceforge/quanta/ \
-		http://download.sourceforge.net/quanta/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	will@FreeBSD.org
 
diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile
index 2bceaaf..9171439 100644
--- a/www/kdewebdev4/Makefile
+++ b/www/kdewebdev4/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	quanta
 PORTVERSION= 	1.0.2
 CATEGORIES=	www kde
-MASTER_SITES=	ftp://ftp.sourceforge.net/pub/sourceforge/quanta/ \
-		http://download.sourceforge.net/quanta/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	will@FreeBSD.org
 
diff --git a/www/quanta/Makefile b/www/quanta/Makefile
index 2bceaaf..9171439 100644
--- a/www/quanta/Makefile
+++ b/www/quanta/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	quanta
 PORTVERSION= 	1.0.2
 CATEGORIES=	www kde
-MASTER_SITES=	ftp://ftp.sourceforge.net/pub/sourceforge/quanta/ \
-		http://download.sourceforge.net/quanta/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	will@FreeBSD.org
 
diff --git a/www/screem-devel/Makefile b/www/screem-devel/Makefile
index 123a055..81d6799 100644
--- a/www/screem-devel/Makefile
+++ b/www/screem-devel/Makefile
@@ -8,8 +8,9 @@
 PORTNAME=	screem
 PORTVERSION= 	0.2.1
 CATEGORIES=	www
-MASTER_SITES=	ftp://download.sourceforge.net/pub/sourceforge/screem/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.screem.org/src/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	will@FreeBSD.org
 
diff --git a/www/screem/Makefile b/www/screem/Makefile
index 123a055..81d6799 100644
--- a/www/screem/Makefile
+++ b/www/screem/Makefile
@@ -8,8 +8,9 @@
 PORTNAME=	screem
 PORTVERSION= 	0.2.1
 CATEGORIES=	www
-MASTER_SITES=	ftp://download.sourceforge.net/pub/sourceforge/screem/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.screem.org/src/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	will@FreeBSD.org
 
diff --git a/www/tinyproxy/Makefile b/www/tinyproxy/Makefile
index dfb23e2..8b33bb1 100644
--- a/www/tinyproxy/Makefile
+++ b/www/tinyproxy/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	tinyproxy
 PORTVERSION=	1.3.3
 CATEGORIES=	www
-MASTER_SITES=	http://download.sourceforge.net/tinyproxy/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	mitsuru@riken.go.jp
 
diff --git a/x11-themes/gnome-look/Makefile b/x11-themes/gnome-look/Makefile
index 7783fb8..1c54bbb 100644
--- a/x11-themes/gnome-look/Makefile
+++ b/x11-themes/gnome-look/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	gnome-look
 PORTVERSION=	0.1.3
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://download.sourceforge.net/gnome-look/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
diff --git a/x11-toolkits/gnome-look/Makefile b/x11-toolkits/gnome-look/Makefile
index 7783fb8..1c54bbb 100644
--- a/x11-toolkits/gnome-look/Makefile
+++ b/x11-toolkits/gnome-look/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	gnome-look
 PORTVERSION=	0.1.3
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://download.sourceforge.net/gnome-look/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
diff --git a/x11-toolkits/gtk--/Makefile b/x11-toolkits/gtk--/Makefile
index c51279f..4331c1b 100644
--- a/x11-toolkits/gtk--/Makefile
+++ b/x11-toolkits/gtk--/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	gtkmm
 PORTVERSION=	1.2.0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://download.sourceforge.net/gtkmm/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	nakai@FreeBSD.org
 
diff --git a/x11-toolkits/gtk--2/Makefile b/x11-toolkits/gtk--2/Makefile
index c51279f..4331c1b 100644
--- a/x11-toolkits/gtk--2/Makefile
+++ b/x11-toolkits/gtk--2/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	gtkmm
 PORTVERSION=	1.2.0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://download.sourceforge.net/gtkmm/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	nakai@FreeBSD.org
 
diff --git a/x11-toolkits/gtkmm12/Makefile b/x11-toolkits/gtkmm12/Makefile
index c51279f..4331c1b 100644
--- a/x11-toolkits/gtkmm12/Makefile
+++ b/x11-toolkits/gtkmm12/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	gtkmm
 PORTVERSION=	1.2.0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://download.sourceforge.net/gtkmm/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	nakai@FreeBSD.org
 
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index c51279f..4331c1b 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	gtkmm
 PORTVERSION=	1.2.0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://download.sourceforge.net/gtkmm/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	nakai@FreeBSD.org
 
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index c51279f..4331c1b 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	gtkmm
 PORTVERSION=	1.2.0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://download.sourceforge.net/gtkmm/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	nakai@FreeBSD.org
 
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index c51279f..4331c1b 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	gtkmm
 PORTVERSION=	1.2.0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://download.sourceforge.net/gtkmm/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	nakai@FreeBSD.org
 
diff --git a/x11-toolkits/rep-gtk/Makefile b/x11-toolkits/rep-gtk/Makefile
index 6187300..f7441f3 100644
--- a/x11-toolkits/rep-gtk/Makefile
+++ b/x11-toolkits/rep-gtk/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	rep-gtk
 PORTVERSION=	0.10
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://rep-gtk.sourceforge.net/pub/rep-gtk/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	nakai@FreeBSD.org
 
diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index 6187300..f7441f3 100644
--- a/x11-toolkits/rep-gtk2/Makefile
+++ b/x11-toolkits/rep-gtk2/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	rep-gtk
 PORTVERSION=	0.10
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://rep-gtk.sourceforge.net/pub/rep-gtk/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	nakai@FreeBSD.org
 
diff --git a/x11-wm/icewm-i18n/Makefile b/x11-wm/icewm-i18n/Makefile
index 5f06ff8..5b177eb 100644
--- a/x11-wm/icewm-i18n/Makefile
+++ b/x11-wm/icewm-i18n/Makefile
@@ -8,8 +8,9 @@
 PORTNAME=	icewm-i18n
 PORTVERSION=	1.0.3
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://download.sourceforge.net/icewm/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/icewm/
+MASTER_SITE_SUBDIR=	icewm
 DISTNAME=	icewm-${PORTVERSION}
 EXTRACT_SUFX=	.src.tar.gz
 
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index bdb7a13..159a04f 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -8,8 +8,9 @@
 PORTNAME=	icewm
 PORTVERSION=	1.0.3
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://download.sourceforge.net/icewm/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	nakai@FreeBSD.org
diff --git a/x11-wm/sapphire/Makefile b/x11-wm/sapphire/Makefile
index f10f52a..9715874 100644
--- a/x11-wm/sapphire/Makefile
+++ b/x11-wm/sapphire/Makefile
@@ -8,8 +8,9 @@
 PORTNAME=	sapphire
 PORTVERSION=	0.14.2
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://download.sourceforge.net/sapphire/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://sapphire.sourceforge.net/themes/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${THEMES_SRC}
 
 MAINTAINER=	trevor@jpj.net
diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index e27810b..aa165ee 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	sawfish
 PORTVERSION= 	0.28
 CATEGORIES=	x11-wm
-MASTER_SITES=	ftp://sawmill.sourceforge.net/pub/sawmill/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	sawmill
 
 MAINTAINER=	nakai@FreeBSD.org
 
diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish2/Makefile
index e27810b..aa165ee 100644
--- a/x11-wm/sawfish2/Makefile
+++ b/x11-wm/sawfish2/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	sawfish
 PORTVERSION= 	0.28
 CATEGORIES=	x11-wm
-MASTER_SITES=	ftp://sawmill.sourceforge.net/pub/sawmill/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	sawmill
 
 MAINTAINER=	nakai@FreeBSD.org
 
diff --git a/x11-wm/ude/Makefile b/x11-wm/ude/Makefile
index 4c6433a..0843b98 100644
--- a/x11-wm/ude/Makefile
+++ b/x11-wm/ude/Makefile
@@ -8,8 +8,9 @@
 PORTNAME=	ude
 PORTVERSION= 	0.2.7.1
 CATEGORIES=	x11-wm
-MASTER_SITES=	ftp://download.sourceforge.net/pub/sourceforge/udeproject/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ude.the-coffeeshop.dk/pub/UDE/
+MASTER_SITE_SUBDIR=	udeproject
 DISTNAME=	${PORTNAME}-0.2.7-BETA
 
 MAINTAINER=	will@FreeBSD.org
diff --git a/x11/powershell/Makefile b/x11/powershell/Makefile
index ef2bfc3..00d8d1d 100644
--- a/x11/powershell/Makefile
+++ b/x11/powershell/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	powershell
 PORTVERSION=	0.8
 CATEGORIES=	x11 gnome
-MASTER_SITES=	http://powershell.sourceforge.net/download/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	smoberly@xavier.dyndns.org