10 files changed, 20 insertions, 17 deletions

diff --git a/devel/SWIG-devel/Makefile b/devel/SWIG-devel/Makefile
index a5dfd947b260..b805c6b27dcb 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 a5dfd947b260..b805c6b27dcb 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 7b8afc967cd8..836692ca9df4 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 ad110c2187ca..b9cf5592ff3c 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 c4185fa77f48..d0e0a2c4f2ad 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 c4185fa77f48..d0e0a2c4f2ad 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 c4185fa77f48..d0e0a2c4f2ad 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 a5dfd947b260..b805c6b27dcb 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 a5dfd947b260..b805c6b27dcb 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 a5dfd947b260..b805c6b27dcb 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