Both sanitize MASTER_SITES and reorder them to achieve better

throughput

Submitted by:   Patrick Li <pat@databits.net> (maintainer of most hlserver-* ports)

9 files changed, 25 insertions, 33 deletions

diff --git a/games/halflifeserver/Makefile b/games/halflifeserver/Makefile
index a61c25cab004..676edda4d916 100644
--- a/games/halflifeserver/Makefile
+++ b/games/halflifeserver/Makefile
@@ -9,13 +9,12 @@ PORTNAME=	hlds
 PORTVERSION=	3.1.0.6
 PORTREVISION=	2
 CATEGORIES=	games linux
-MASTER_SITES=	http://ftp1download.gamespy.com/fileplanet/fpnew/action/half-life/official/ \
-		ftp://ftp.fasta.fh-dortmund.de/gdi/halflife/server/linux/ \
-		http://fileplanet.games-world.net/dl/ftp1.gamespy.com/fpnew/action/half-life/official/ \
-		ftp://fileplanet.blueyonder.co.uk/ftp1.gamespy.com/fpnew/action/half-life/official/ \
+MASTER_SITES=	http://games.velocity.net/files/Halflife/ \
 		ftp://ftp.gmd.de/people/cla/hl/hl-newest/linux/ \
-		ftp://ftp.fh-rosenheim.de/pub/games/halflife/servers/ \
-		ftp://ftp.icsmedia.de/pub/games/halflife/hl_server/
+		ftp://ftp.icsmedia.de/pub/games/halflife/hl_server/ \
+		http://ftp1download.gamespy.com/fileplanet/fpnew/action/half-life/official/ \
+		http://fileplanet.games-world.net/dl/ftp1.gamespy.com/fpnew/action/half-life/official/ \
+		ftp://ftp.fh-rosenheim.de/pub/games/halflife/servers/
 DISTNAME=	hlds_l3106
 
 MAINTAINER=	pat@databits.net
diff --git a/games/hlserver-action/Makefile b/games/hlserver-action/Makefile
index 07563f3ff3de..f70b737b63f4 100644
--- a/games/hlserver-action/Makefile
+++ b/games/hlserver-action/Makefile
@@ -7,14 +7,12 @@
 
 PORTNAME=	action
 PORTVERSION=	0.4
-MASTER_SITES=	http://ftp1download.gamespy.com/fileplanet/fpnew/action/half-life/modifications/ahl/ \
-		http://fileplanet.games-world.net/dl/ftp1.gamespy.com/fpnew/action/half-life/modifications/ahl/ \
-		ftp://ftp.barrysworld.com/pub/games/halflife/mods/actionhl/official_patches/linux/ \
-		ftp://fileplanet.blueyonder.co.uk/ftp1.gamespy.com/fpnew/action/half-life/modifications/ahl/ \
-		ftp://ftp2.3ddownloads.com/90380/telefragged/ahl/ \
+MASTER_SITES=	ftp://ftp2.3ddownloads.com/90380/telefragged/ahl/ \
 		ftp://ftp.3ddownloads.com/90380/telefragged/ahl/ \
-		ftp://ftp.gamesurf.de/pub/gamesurf/halflife/mods/actionhl/beta4/ \
+		ftp://ftp.barrysworld.com/pub/games/halflife/mods/actionhl/official_patches/linux/ \
 		ftp://ftp.wireplay.net/pub/downloads/fps/halflife/mods/action/linux/ \
+		http://ftp1download.gamespy.com/fileplanet/fpnew/action/half-life/modifications/ahl/ \
+		http://fileplanet.games-world.net/dl/ftp1.gamespy.com/fpnew/action/half-life/modifications/ahl/ \
 		ftp://ftp.blackmesa.de/mods/ahl/
 DISTNAME=	action
 EXTRACT_SUFX=	.tgz
diff --git a/games/hlserver-cs/Makefile b/games/hlserver-cs/Makefile
index 34b70d1a7221..80cf262fe6ec 100644
--- a/games/hlserver-cs/Makefile
+++ b/games/hlserver-cs/Makefile
@@ -8,16 +8,13 @@
 PORTNAME?=	cs
 PORTVERSION?=	1.1c
 CATEGORIES=	games linux
-MASTER_SITES?=	ftp://ftp.pipex.net/uunet/games/counterstrike/linux/ \
+MASTER_SITES?=	http://games.velocity.net/files/Counter-Strike/ \
+		ftp://ftp.pipex.net/uunet/games/counterstrike/linux/ \
 		ftp://ftp.icsmedia.de/pub/games/halflife/counter_strike/linux_server/ \
 		ftp://ftp.phil.uni-erlangen.de/pub/hl/mods/ \
-		http://www.databits.net/~pat/ \
-		http://ftp2.gamespy.com/pub/cdrom/counter-strike/ \
-		ftp://fileplanet.ngi.it/fileplanet2/counter-strike/ \
+		http://fileplanet.games-world.net/dl/ftp1.gamespy.com/fpnew/action/half-life/modifications/cstrike/ \
 		ftp://ftp.fasta.fh-dortmund.de/gdi/halflife/counterstrike/ \
-		http://ftp1download.gamespy.com/fileplanet/fpnew/action/half-life/modifications/cstrike/ \
-		http://fileplanet.games-world.net/dl/ftp1.gamespy.com/fpnew/action/half-life/modifications/cstrike/
-
+		http://ftp2.gamespy.com/pub/cdrom/counter-strike/
 PKGNAMEPREFIX=	hlserver-
 .ifndef(DISTNAME)
 DISTFILES?=	cs_11b_full.tar.gz cs_11c_up.tar.gz
diff --git a/games/hlserver-dod/Makefile b/games/hlserver-dod/Makefile
index d04fa7110b3a..61b716b00cd2 100644
--- a/games/hlserver-dod/Makefile
+++ b/games/hlserver-dod/Makefile
@@ -7,9 +7,11 @@
 
 PORTNAME=	dodbeta
 PORTVERSION=	1.1
-MASTER_SITES=	http://ftp1download.gamespy.com/fileplanet/fpnew/action/half-life/modifications/dod/
+MASTER_SITES=	ftp://ftp.gigabell.net/pub/exp/hl/mod/dod/ \
+		ftp://ftp.task.gda.pl/vol/d33/ftp.extreme-players.de/exp/hl/mod/dod/ \
+		http://www.thekillinggrounds.com/downloads/
 DISTNAME=	dod_linux_beta11_full
-EXTRACT_SUFX=	.tgz
+EXTRACT_SUFX=	.tar
 
 WRKSRC=		${WRKDIR}/dod
 
diff --git a/games/hlserver-dod/distinfo b/games/hlserver-dod/distinfo
index bfe31b4f3127..b57ece1fc3dd 100644
--- a/games/hlserver-dod/distinfo
+++ b/games/hlserver-dod/distinfo
@@ -1 +1 @@
-MD5 (dod_linux_beta11_full.tgz) = 6aa25b542658f42d6a942e175efc816a
+MD5 (dod_linux_beta11_full.tar) = 6aa25b542658f42d6a942e175efc816a
diff --git a/games/hlserver-fa/Makefile b/games/hlserver-fa/Makefile
index a70ca8e11e8a..3bd436cea9dc 100644
--- a/games/hlserver-fa/Makefile
+++ b/games/hlserver-fa/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	firearms
 PORTVERSION=	2.5
 MASTER_SITES=	http://absurd.ranney.com/fa/ \
+		http://fileplanet.games-world.net/dl/ftp1.gamespy.com/action/half-life/modifications/firearms/ \
 		http://ftp1download.gamespy.com/fileplanet/action/half-life/modifications/firearms/
 DISTNAME=	fa_rc25_linux_full
 
diff --git a/games/hlserver-opfor/Makefile b/games/hlserver-opfor/Makefile
index bf57777e8cdb..d44d8f08dc5d 100644
--- a/games/hlserver-opfor/Makefile
+++ b/games/hlserver-opfor/Makefile
@@ -7,14 +7,8 @@
 
 PORTNAME=	opfor
 PORTVERSION=	1.1.0.6
-MASTER_SITES=	http://ftp1download.gamespy.com/fileplanet/fpnew/action/half-life/official/ \
-		ftp://fileplanet.games-world.net/ftp1.gamespy.com/fpnew/action/half-life/official/ \
-		ftp://fileplanet.blueyonder.co.uk/ftp1.gamespy.com/fpnew/action/half-life/official/ \
-		ftp://fileplanet.gil.com.au/fpnew/action/half-life/official/ \
-		ftp://fileplanet.ngi.it/fileplanet/fpnew/action/half-life/official/ \
-		http://www.jetstreamgames.co.nz/files/pub/gamespyftp1/fpnew/action/half-life/official/ \
-		ftp://ftp1.terian.net/mirrors/fileplanet/fpnew/action/half-life/official/ \
-		ftp://ftp2.terian.net/mirrors/fileplanet/fpnew/action/half-life/official/
+MASTER_SITES=	http://fileplanet.games-world.net/dl/ftp1.gamespy.com/fpnew/action/half-life/official/ \
+		http://ftp1download.gamespy.com/fileplanet/fpnew/action/half-life/official/
 DISTNAME=	op4-linux-${PORTVERSION:S/.//g}
 
 MAINTAINER=	lioux@FreeBSD.org
diff --git a/games/hlserver-wasteland/Makefile b/games/hlserver-wasteland/Makefile
index 46889d1a4a66..a363178b1540 100644
--- a/games/hlserver-wasteland/Makefile
+++ b/games/hlserver-wasteland/Makefile
@@ -7,9 +7,9 @@
 
 PORTNAME=	wasteland
 PORTVERSION=	0.2b
-MASTER_SITES=	http://194.195.228.180/exp/hl/mod/wastelandhl/ \
-		ftp://ftp.gigabell.net/pub/exp/hl/mod/wastelandhl/ \
+MASTER_SITES=	ftp://ftp.gigabell.net/pub/exp/hl/mod/wastelandhl/ \
 		ftp://ftp.task.gda.pl/mirror/ftp.extreme-players.de/exp/hl/mod/wastelandhl/ \
+		http://194.195.228.180/exp/hl/mod/wastelandhl/ \
 		http://ftp2.extreme-players.de/exp/hl/mod/wastelandhl/
 DISTNAME=	whlbeta2_linux
 
diff --git a/games/hlserver-wizwars/Makefile b/games/hlserver-wizwars/Makefile
index 98ca62797c44..80aa5b957368 100644
--- a/games/hlserver-wizwars/Makefile
+++ b/games/hlserver-wizwars/Makefile
@@ -7,7 +7,8 @@
 
 PORTNAME=	wizardwars
 PORTVERSION=	2.8.0
-MASTER_SITES=	http://194.195.228.180/exp/hl/mod/wizardwars/ \
+MASTER_SITES=	http://pm.gamesmania.de/gamesmania/planet-mods/mods/hl/wizardwars/ \
+		http://194.195.228.180/exp/hl/mod/wizardwars/ \
 		ftp://ftp.gigabell.net/pub/exp/hl/mod/wizardwars/ \
 		http://ftp2.extreme-players.de/exp/hl/mod/wizardwars/
 DISTNAME=	wizwars_b2_8