18 files changed, 20 insertions, 34 deletions

diff --git a/dns/noip/Makefile b/dns/noip/Makefile
index d5fa83678c2f..347dcc69ba12 100644
--- a/dns/noip/Makefile
+++ b/dns/noip/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	noip
 PORTVERSION=	2.1.7
 PORTREVISION=	2
 CATEGORIES=	dns
-MASTER_SITES=	http://www.no-ip.com/client/linux/ \
-		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
+MASTER_SITES=	http://www.no-ip.com/client/linux/
 
 MAINTAINER=	kay.abendroth@raxion.net
 COMMENT=	No-IP.com's dynamic DNS update client
diff --git a/games/nuclearchess/Makefile b/games/nuclearchess/Makefile
index d3f296fda2e2..24482fad1725 100644
--- a/games/nuclearchess/Makefile
+++ b/games/nuclearchess/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	nuclearchess
 PORTVERSION=	1.0.0
 CATEGORIES=	games
-MASTER_SITES=	http://user.cs.tu-berlin.de/~karlb/${PORTNAME}/ \
-		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
+MASTER_SITES=	http://user.cs.tu-berlin.de/~karlb/${PORTNAME}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A chess variant designed to be short and fun for all players
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 4323fd0f2dd8..007cd27811b8 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	graphviz
 PORTVERSION=	2.24.0
 CATEGORIES=	graphics tk
-MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/ \
-		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
+MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Graph Visualization Software from AT&T and Bell Labs
diff --git a/graphics/sdl_gfx/Makefile b/graphics/sdl_gfx/Makefile
index 96e0c57bc418..279d545d0a41 100644
--- a/graphics/sdl_gfx/Makefile
+++ b/graphics/sdl_gfx/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	sdl_gfx
 PORTVERSION=	2.0.18
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.ferzkopp.net/Software/%SUBDIR%/ \
-		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
+MASTER_SITES=	http://www.ferzkopp.net/Software/%SUBDIR%/
 MASTER_SITE_SUBDIR=	SDL_gfx-${PORTVERSION:R}
 DISTNAME=	SDL_gfx-${PORTVERSION}
 
diff --git a/graphics/timeless/Makefile b/graphics/timeless/Makefile
index 786703c1102d..b2d4d90c4a7f 100644
--- a/graphics/timeless/Makefile
+++ b/graphics/timeless/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	timeless
 PORTVERSION=	1.0
 PORTREVISION=	3
 CATEGORIES=	graphics
-MASTER_SITES=	http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	shaun
 
 MAINTAINER=	nehe@cruzinternet.com
 COMMENT=	FreeBSD/SDL port of Tran's Timeless Demo with Sound
diff --git a/mail/p5-FuzzyOcr-devel/Makefile b/mail/p5-FuzzyOcr-devel/Makefile
index 66449c5be7ae..af74649f4445 100644
--- a/mail/p5-FuzzyOcr-devel/Makefile
+++ b/mail/p5-FuzzyOcr-devel/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	FuzzyOcr
 DISTVERSION=	3.6.0
 CATEGORIES=	mail perl5
-MASTER_SITES=	http://users.own-hero.net/~decoder/${PORTNAME:L}/	\
-		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
+MASTER_SITES=	http://users.own-hero.net/~decoder/${PORTNAME:L}/
 PKGNAMEPREFIX=	p5-
 PKGNAMESUFFIX=	-devel
 DISTNAME=	${PORTNAME:L}-${DISTVERSION}
diff --git a/mail/p5-FuzzyOcr/Makefile b/mail/p5-FuzzyOcr/Makefile
index 1dc238f70bbd..30b367c267e8 100644
--- a/mail/p5-FuzzyOcr/Makefile
+++ b/mail/p5-FuzzyOcr/Makefile
@@ -10,8 +10,7 @@ DISTVERSION=	2.3b
 PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	mail perl5
-MASTER_SITES=	http://users.own-hero.net/~decoder/${PORTNAME:L}/	\
-		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
+MASTER_SITES=	http://users.own-hero.net/~decoder/${PORTNAME:L}/
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME:L}-${DISTVERSION}
 
diff --git a/mail/p5-LMAP-CID2SPF/Makefile b/mail/p5-LMAP-CID2SPF/Makefile
index 198996e3432f..ff2f4da8d66a 100644
--- a/mail/p5-LMAP-CID2SPF/Makefile
+++ b/mail/p5-LMAP-CID2SPF/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	LMAP-CID2SPF
 DISTVERSION=	0.9
 CATEGORIES=	mail perl5
-MASTER_SITES=	http://www.baschny.de/spf/	\
-		http://mirror.inerd.com/FreeBSD/distfiles/p5-LMAP-CID2SPF/
+MASTER_SITES=	http://www.baschny.de/spf/
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/math/tetgen/Makefile b/math/tetgen/Makefile
index 7aa5493a306c..523e0a92e960 100644
--- a/math/tetgen/Makefile
+++ b/math/tetgen/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	tetgen
 PORTVERSION=	1.4.2
 CATEGORIES=	math
-MASTER_SITES=	http://www.wias-berlin.de/people/si/ \
-		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
+MASTER_SITES=	http://www.wias-berlin.de/people/si/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile
index 6b472cfc45ac..12158ff3e4f2 100644
--- a/net-im/ejabberd/Makefile
+++ b/net-im/ejabberd/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	ejabberd
 PORTVERSION=	2.0.5
 CATEGORIES=	net-im
-MASTER_SITES=	http://www.process-one.net/downloads/ejabberd/${PORTVERSION}/ \
-		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
+MASTER_SITES=	http://www.process-one.net/downloads/ejabberd/${PORTVERSION}/
 
 MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Free and Open Source distributed fault-tolerant Jabber server
diff --git a/net/6tunnel/Makefile b/net/6tunnel/Makefile
index 5e6484f9bc55..2cb16dd858af 100644
--- a/net/6tunnel/Makefile
+++ b/net/6tunnel/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	6tunnel
 DISTVERSION=	0.11rc2
 PORTREVISION=	1
 CATEGORIES=	net ipv6
-MASTER_SITES=	http://toxygen.net/6tunnel/ \
-		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
+MASTER_SITES=	http://toxygen.net/6tunnel/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	TCP proxy for applications that don't speak IPv6
diff --git a/security/clamassassin/Makefile b/security/clamassassin/Makefile
index dfbdf46a51f1..03af061e908e 100644
--- a/security/clamassassin/Makefile
+++ b/security/clamassassin/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	clamassassin
 PORTVERSION=	1.2.4
 PORTREVISION=	4
 CATEGORIES=	security
-MASTER_SITES=	http://jameslick.com/clamassassin/ \
-		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
+MASTER_SITES=	http://jameslick.com/clamassassin/
 
 MAINTAINER=	chalpin@cs.wisc.edu
 COMMENT=	A simple virus filter wrapper for ClamAV
diff --git a/security/knock/Makefile b/security/knock/Makefile
index 6a67a3998948..b0b8584bf311 100644
--- a/security/knock/Makefile
+++ b/security/knock/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	knock
 PORTVERSION=	0.5.20051124
 PORTREVISION=	1
 CATEGORIES=	security
-MASTER_SITES=	http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	shaun
 
 MAINTAINER=	sbrabez@gmail.com
 COMMENT=	A flexible port-knocking server and client
diff --git a/shells/wapsh/Makefile b/shells/wapsh/Makefile
index ff8b02438ad0..70660063c805 100644
--- a/shells/wapsh/Makefile
+++ b/shells/wapsh/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	wapsh
 PORTVERSION=	1.0.1
 CATEGORIES=	shells
-MASTER_SITES=	http://www.exolution.de/geschaeft/produkte/wapsh/ \
-		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
+MASTER_SITES=	http://www.exolution.de/geschaeft/produkte/wapsh/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/www/quickie/Makefile b/www/quickie/Makefile
index 1945272300f0..1630c9cd8aea 100644
--- a/www/quickie/Makefile
+++ b/www/quickie/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	quickie
 PORTVERSION=	1.1
 PORTREVISION=	1
 CATEGORIES=	www
-MASTER_SITES=	http://${PORTNAME}.sourceforge.net/ \
-		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
+MASTER_SITES=	http://${PORTNAME}.sourceforge.net/
 
 MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A small footprint, fast Wiki engine written in C++
diff --git a/x11-fm/jaffm/Makefile b/x11-fm/jaffm/Makefile
index b90ce8631efa..271d086806cb 100644
--- a/x11-fm/jaffm/Makefile
+++ b/x11-fm/jaffm/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	jaffm
 PORTVERSION=	1.4
 PORTREVISION=	4
 CATEGORIES=	x11-fm
-MASTER_SITES=	http://binary.is/download/ \
-		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
+MASTER_SITES=	http://binary.is/download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A lightweight file manager inspired by MacOS Finder
diff --git a/x11-toolkits/paragui/Makefile b/x11-toolkits/paragui/Makefile
index 94991478ba88..78f2d5befd90 100644
--- a/x11-toolkits/paragui/Makefile
+++ b/x11-toolkits/paragui/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	paragui
 PORTVERSION=	1.0.4
 PORTREVISION=	10
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SAVANNAH} \
-		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
+MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-toolkits/sdl_gui/Makefile b/x11-toolkits/sdl_gui/Makefile
index 62d77a4cbd42..7e75601aeefc 100644
--- a/x11-toolkits/sdl_gui/Makefile
+++ b/x11-toolkits/sdl_gui/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	sdl_gui
 PORTVERSION=	0.10.3
 PORTREVISION=	7
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://rhk.dataslab.com/SDL_gui/ \
-		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
+MASTER_SITES=	http://rhk.dataslab.com/SDL_gui/
 DISTNAME=	SDL_gui-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org