Add an additional mirror.

2006-06-01 12:13:54 +00:00
parent d3d9fcffc4
commit 7be606cdf6
84 changed files with 198 additions and 75 deletions
--- a/archivers/deb2targz/Makefile
+++ b/archivers/deb2targz/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	deb2targz
 PORTVERSION=	20021217
 CATEGORIES=	archivers perl5
-MASTER_SITES=	http://critical.ch/distfiles/
+MASTER_SITES=	http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A command-line utility for converting a Debian .deb file to a .tar.gz
--- a/archivers/ecm/Makefile
+++ b/archivers/ecm/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	ecm
 PORTVERSION=	1.0
 CATEGORIES=	archivers
-MASTER_SITES=	http://critical.ch/distfiles/
+MASTER_SITES=	http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Compresses CD images by stripping unnecessary EDC/ECC data
--- a/archivers/gzrecover/Makefile
+++ b/archivers/gzrecover/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	gzrecover
 PORTVERSION=	0.4
 CATEGORIES=	archivers
-MASTER_SITES=	http://www.urbanophile.com/arenn/hacking/gzrt/
+MASTER_SITES=	http://www.urbanophile.com/arenn/hacking/gzrt/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/
 DISTNAME=	gzrt-${PORTVERSION}

 MAINTAINER=	ehaupt@FreeBSD.org
--- a/archivers/mar/Makefile
+++ b/archivers/mar/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	mar
 DISTVERSION=	0.5
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.emantic.co.uk/mark/files/ \
-		http://critical.ch/distfiles/
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-src

 MAINTAINER=	ehaupt@FreeBSD.org
--- a/archivers/ppmd/Makefile
+++ b/archivers/ppmd/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	ppmd
 PORTVERSION=	20050811
 CATEGORIES=	archivers
-MASTER_SITES=	http://critical.ch/distfiles/
+MASTER_SITES=	http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A fast archiver with a good compression ratio
--- a/archivers/tardy/Makefile
+++ b/archivers/tardy/Makefile
@@ -9,7 +9,9 @@
 PORTNAME=	tardy
 PORTVERSION=	1.12
 CATEGORIES=	archivers
-MASTER_SITES=	http://tardy.sourceforge.net/
+MASTER_SITES=	http://tardy.sourceforge.net/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Manipulate the file headers in tar archive files in various ways
--- a/archivers/unlzx/Makefile
+++ b/archivers/unlzx/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	unlzx
 PORTVERSION=	1.1
 CATEGORIES=	archivers
-MASTER_SITES=	http://critical.ch/distfiles/
+MASTER_SITES=	http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/
 DISTNAME=	${PORTNAME}.c
 EXTRACT_SUFX=	.gz

--- a/archivers/unzoo/Makefile
+++ b/archivers/unzoo/Makefile
@@ -9,6 +9,7 @@ PORTNAME=	unzoo
 DISTVERSION=	4.4
 CATEGORIES=	archivers
 MASTER_SITES=	http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ehaupt

--- a/audio/aylet/Makefile
+++ b/audio/aylet/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	aylet
 PORTVERSION=	0.5
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.ibiblio.org/pub/Linux/apps/sound/players/ \
-		http://critical.ch/
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/
 PKGNAMEPREFIX?=

 MAINTAINER=	ehaupt@FreeBSD.org
--- a/audio/checkmate/Makefile
+++ b/audio/checkmate/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	mpck
 PORTVERSION=	0.12
 CATEGORIES=	audio
-MASTER_SITES=	http://checkmate.linuxonly.nl/
+MASTER_SITES=	http://checkmate.linuxonly.nl/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/
 DISTNAME=	checkmate-${PORTVERSION}

 MAINTAINER=	ehaupt@FreeBSD.org
--- a/audio/festalon/Makefile
+++ b/audio/festalon/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	festalon
 PORTVERSION=	0.5.5
 CATEGORIES=	audio
 MASTER_SITES=	http://projects.raphnet.net/festalon/ \
-		http://critical.ch/distfiles/
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/
 PKGNAMEPREFIX?=

 MAINTAINER=	ehaupt@FreeBSD.org
--- a/audio/gbsplay/Makefile
+++ b/audio/gbsplay/Makefile
@@ -11,6 +11,7 @@ PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.cgarbs.de/stuff/ \
 		http://download.berlios.de/gbsplay/ \
+		http://energy.critical.ch/distfiles/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ehaupt
 PKGNAMEPREFIX?=
--- a/audio/malint/Makefile
+++ b/audio/malint/Makefile
@@ -9,7 +9,9 @@ PORTNAME=	malint
 DISTVERSION=	0.2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.nih.at/malint/ \
-		ftp://sunsite.univie.ac.at/pub/nih/malint/
+		ftp://sunsite.univie.ac.at/pub/nih/malint/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	MPEG Audio stream validator
--- a/audio/modplugplay/Makefile
+++ b/audio/modplugplay/Makefile
@@ -9,7 +9,9 @@ PORTNAME=	modplugplay
 PORTVERSION=	1.0
 PORTREVISION=	1
 CATEGORIES=	audio
-MASTER_SITES=	http://www.linuks.mine.nu/modplugplay/
+MASTER_SITES=	http://www.linuks.mine.nu/modplugplay/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A commandline music mod player using libmodplug
--- a/audio/mp-player/Makefile
+++ b/audio/mp-player/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	mp-player
 PORTVERSION=	0.6
 CATEGORIES=	audio
 MASTER_SITES=	http://mp.waw.cx/ \
-		http://critical.ch/distfiles/
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/
 DISTNAME=	mp-current
 EXTRACT_SUFX=	.tgz

--- a/audio/mp3guessenc/Makefile
+++ b/audio/mp3guessenc/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	mp3guessenc
 PORTVERSION=	0.21
 CATEGORIES=	audio
-MASTER_SITES=	http://shibatch.sourceforge.net/download/
+MASTER_SITES=	http://shibatch.sourceforge.net/download/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Utility for guessing which encoder was used to encode an mp3 file
--- a/audio/mpck/Makefile
+++ b/audio/mpck/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	mpck
 PORTVERSION=	0.12
 CATEGORIES=	audio
-MASTER_SITES=	http://checkmate.linuxonly.nl/
+MASTER_SITES=	http://checkmate.linuxonly.nl/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/
 DISTNAME=	checkmate-${PORTVERSION}

 MAINTAINER=	ehaupt@FreeBSD.org
--- a/audio/ocp/Makefile
+++ b/audio/ocp/Makefile
@@ -10,7 +10,8 @@ PORTVERSION=	0.1.9
 PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://labs.nixia.no/ \
-		http://critical.ch/distfiles/
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	The legendary Open Cubic Player
--- a/audio/openspc/Makefile
+++ b/audio/openspc/Makefile
@@ -9,7 +9,9 @@ PORTNAME=	openspc
 PORTVERSION=	0.3.1
 PORTREVISION=	1
 CATEGORIES=	audio
-MASTER_SITES=	http://membres.lycos.fr/pixels/
+MASTER_SITES=	http://membres.lycos.fr/pixels/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/
 DISTNAME=	OpenSPC-${PORTVERSION}

 MAINTAINER=	ehaupt@FreeBSD.org
--- a/audio/penguinsap/Makefile
+++ b/audio/penguinsap/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	penguinsap
 PORTVERSION=	0.1
 CATEGORIES=	audio
-MASTER_SITES=	http://critical.ch/distfiles/
+MASTER_SITES=	http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A command line Atari(TM) .sap player
--- a/audio/resid/Makefile
+++ b/audio/resid/Makefile
@@ -9,7 +9,9 @@ PORTNAME=	resid
 PORTVERSION=	0.16
 PORTREVISION=	1
 CATEGORIES=	audio emulators
-MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITES=	http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/ \
+		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ehaupt

 MAINTAINER=	ehaupt@FreeBSD.org
--- a/audio/schism/Makefile
+++ b/audio/schism/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	schism
 DISTVERSION=	0.2a
 CATEGORIES=	audio
-MASTER_SITES=	http://rigelseven.com/schism/dl/
+MASTER_SITES=	http://rigelseven.com/schism/dl/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A module tracker editor/player resembling impulse tracker
--- a/audio/sfront/Makefile
+++ b/audio/sfront/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	sfront
 PORTVERSION=	0.89
 CATEGORIES=	audio
-MASTER_SITES=	http://critical.ch/distfiles/
+MASTER_SITES=	http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A translator that converts MP4-SA files into efficient C programs
--- a/audio/sidplayer/Makefile
+++ b/audio/sidplayer/Makefile
@@ -9,6 +9,8 @@ PORTNAME=	sidplayer
 PORTVERSION=	4.4
 CATEGORIES=	audio
 MASTER_SITES=	http://wwwthep.physik.uni-mainz.de/~cbauer/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ehaupt
 DISTNAME=	SIDPlayer-${PORTVERSION}
--- a/audio/wav2cdr/Makefile
+++ b/audio/wav2cdr/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	wav2cdr
 PORTVERSION=	2.3.3
 CATEGORIES=	audio converters
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITES=	http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/ \
+		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/sound/convert

 MAINTAINER=	ehaupt@FreeBSD.org
--- a/audio/xmms-nsf/Makefile
+++ b/audio/xmms-nsf/Makefile
@@ -10,7 +10,8 @@ PORTVERSION=	0.0.3
 PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://optronic.sourceforge.net/files/ \
-		http://critical.ch/distfiles/
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	XMMS input-plugin for playing Nintendo(TM) NSF audio files
--- a/audio/xmms-openspc/Makefile
+++ b/audio/xmms-openspc/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	0.0.3
 PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/ \
 		http://staff.xmms.org/zinx/misc/tmp/
 PKGNAMEPREFIX=	xmms-
 DISTNAME=	xmms-OpenSPC-${PORTVERSION}
--- a/audio/xmms-sexypsf/Makefile
+++ b/audio/xmms-sexypsf/Makefile
@@ -10,7 +10,8 @@ PORTVERSION=	0.4.8
 PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://projects.raphnet.net/sexypsf/ \
-		http://critical.ch/distfiles/
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/
 DISTNAME=	sexypsf-${PORTVERSION}

 MAINTAINER=	ehaupt@FreeBSD.org
--- a/audio/yell/Makefile
+++ b/audio/yell/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	yell
 PORTVERSION=	1.0
 CATEGORIES=	audio
-MASTER_SITES=	http://www.critical.ch/yell/
+MASTER_SITES=	http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A command line speaker bell using machine/speaker.h
--- a/devel/cvsspam/Makefile
+++ b/devel/cvsspam/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	cvsspam
 PORTVERSION=	0.2.12
 CATEGORIES=	devel
-MASTER_SITES=	http://www.badgers-in-foil.co.uk/projects/cvsspam/releases/
+MASTER_SITES=	http://www.badgers-in-foil.co.uk/projects/cvsspam/releases/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Sends diffs when a change is committed to your CVS repository
--- a/dns/nslint/Makefile
+++ b/dns/nslint/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	nslint
 PORTVERSION=	2.1.a6
 CATEGORIES=	dns
 MASTER_SITES=	ftp://ftp.ee.lbl.gov/ \
-		http://critical.ch/distfiles/
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.a/a/}

 MAINTAINER=	ehaupt@FreeBSD.org
--- a/dns/zonenotify/Makefile
+++ b/dns/zonenotify/Makefile
@@ -9,7 +9,9 @@ PORTNAME=	zonenotify
 PORTVERSION=	0.1
 CATEGORIES=	dns
 MASTER_SITES=	http://morettoni.net/bsd/ \
-		http://cvs.delink.net/mirrors/morettoni.net/
+		http://cvs.delink.net/mirrors/morettoni.net/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A dns notify sender written in C
--- a/finance/ccard/Makefile
+++ b/finance/ccard/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	ccard
 PORTVERSION=	1.1
 CATEGORIES=	finance
-MASTER_SITES=	http://www.canb.auug.org.au/~millerp/
+MASTER_SITES=	http://www.canb.auug.org.au/~millerp/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/
 DISTNAME=	${PORTNAME}.${PORTVERSION}

 MAINTAINER=	ehaupt@FreeBSD.org
--- a/games/filters/Makefile
+++ b/games/filters/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	filters
 PORTVERSION=	2.34
 CATEGORIES=	games perl5
-MASTER_SITES=	http://ftp.debian.org/debian/pool/main/f/filters/
+MASTER_SITES=	http://ftp.debian.org/debian/pool/main/f/filters/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/
 DISTNAME=	${PORTNAME}_${PORTVERSION}

 MAINTAINER=	ehaupt@FreeBSD.org
--- a/games/textmaze/Makefile
+++ b/games/textmaze/Makefile
@@ -9,7 +9,9 @@
 PORTNAME=	textmaze
 PORTVERSION=	1.2
 CATEGORIES=	games perl5
-MASTER_SITES=	http://www.robobunny.com/projects/textmaze/
+MASTER_SITES=	http://www.robobunny.com/projects/textmaze/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/
 DISTNAME=	${PORTNAME}_v${PORTVERSION}

 MAINTAINER=	ehaupt@FreeBSD.org
--- a/games/typespeed/Makefile
+++ b/games/typespeed/Makefile
@@ -10,7 +10,8 @@ PORTVERSION=	0.4.4
 PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://tobias.eyedacor.org/typespeed/ \
-		http://critical.ch/distfiles/
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/
 DISTNAME=	typespeed-${PORTVERSION}

 MAINTAINER=	ehaupt@FreeBSD.org
--- a/german/schwobifyer/Makefile
+++ b/german/schwobifyer/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	schwobifyer
 PORTVERSION=	20050730
 CATEGORIES=	german
-MASTER_SITES=	http://critical.ch/distfiles/
+MASTER_SITES=	http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/
 PKGNAMEPREFIX=	de-

 MAINTAINER=	ehaupt@FreeBSD.org
--- a/graphics/bmp2html/Makefile
+++ b/graphics/bmp2html/Makefile
@@ -8,8 +8,9 @@
 PORTNAME=	bmp2html
 PORTVERSION=	0.1
 CATEGORIES=	graphics
-MASTER_SITES=	http://critical.ch/distfiles/
-MASTER_SITES+=	http://www.dasfisk.dk/bmp2html/
+MASTER_SITES=	http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/ \
+		http://www.dasfisk.dk/bmp2html/
 DISTNAME=	${PORTNAME}

 MAINTAINER=	ehaupt@FreeBSD.org
--- a/graphics/exrtools/Makefile
+++ b/graphics/exrtools/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	exrtools
 PORTVERSION=	0.4
 CATEGORIES=	graphics
 MASTER_SITES=	http://scanline.ca/exrtools/ \
-		http://critical.ch/distfiles/
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Utilities for manipulating with HDR images in OpenEXR format
--- a/graphics/metacam/Makefile
+++ b/graphics/metacam/Makefile
@@ -9,6 +9,7 @@ PORTNAME=	metacam
 PORTVERSION=	1.2
 CATEGORIES=	graphics
 MASTER_SITES=	http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ehaupt

--- a/graphics/recoverjpeg/Makefile
+++ b/graphics/recoverjpeg/Makefile
@@ -9,7 +9,9 @@ PORTNAME=	recoverjpeg
 PORTVERSION=	1.1.1
 PORTREVISION=	1
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.rfc1149.net/download/recoverjpeg/
+MASTER_SITES=	http://www.rfc1149.net/download/recoverjpeg/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Recoverjpeg tries to recover JFIF (JPEG) pictures from a peripheral
--- a/graphics/telak/Makefile
+++ b/graphics/telak/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	telak
 PORTVERSION=	0.4
 CATEGORIES=	graphics
-MASTER_SITES=	http://critical.ch/distfiles/
+MASTER_SITES=	http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A tool to draw pictures on your root window
--- a/irc/netwalker-ircc/Makefile
+++ b/irc/netwalker-ircc/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	netwalker-ircc
 PORTVERSION=	0.5.0
 CATEGORIES=	irc
 MASTER_SITES=	http://www.bind.ch/software/netwalker/src/ \
-		http://critical.ch/distfiles/
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/
 EXTRACT_SUFX=	.tgz

 MAINTAINER=	ehaupt@FreeBSD.org
--- a/mail/cyrus2courier/Makefile
+++ b/mail/cyrus2courier/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	cyrus2courier
 DISTVERSION=	1.4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.madness.at/~mad/projects/ \
-		http://critical.ch/distfiles/
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/
 EXTRACT_SUFX=	.tgz

 MAINTAINER=	ehaupt@FreeBSD.org
--- a/mail/delatt/Makefile
+++ b/mail/delatt/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	delatt
 DISTVERSION=	1.1.3
 CATEGORIES=	mail
-MASTER_SITES=	http://danborn.net/delatt/
+MASTER_SITES=	http://danborn.net/delatt/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Strip attachments from email
--- a/mail/nbsmtp/Makefile
+++ b/mail/nbsmtp/Makefile
@@ -10,7 +10,8 @@
 PORTNAME=	nbsmtp
 PORTVERSION=	1.00
 CATEGORIES=	mail
-MASTER_SITES=	http://critical.ch/distfiles/
+MASTER_SITES=	http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Simple program for outgoing SMTP delivery
--- a/mail/qmail-rblchk/Makefile
+++ b/mail/qmail-rblchk/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	qmail-rblchk
 PORTVERSION=	2.4.1
 CATEGORIES=	mail
-MASTER_SITES=	http://morettoni.net/qmail/
+MASTER_SITES=	http://morettoni.net/qmail/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A qmail RBL filter
--- a/mail/spfval/Makefile
+++ b/mail/spfval/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	spfval
 PORTVERSION=	0.0.1
 CATEGORIES=	mail
-MASTER_SITES=	http://critical.ch/distfiles/
+MASTER_SITES=	http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A SPF validator
--- a/math/mathomatic/Makefile
+++ b/math/mathomatic/Makefile
@@ -9,7 +9,9 @@
 PORTNAME=	mathomatic
 PORTVERSION=	12.5.16
 CATEGORIES=	math
-MASTER_SITES=	http://www.panix.com/~gesslein/
+MASTER_SITES=	http://www.panix.com/~gesslein/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Highly portable, general purpose CAS (Computer Algebra System)
--- a/misc/bestfit/Makefile
+++ b/misc/bestfit/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	bestfit
 PORTVERSION=	0.2.0
 CATEGORIES=	misc
 MASTER_SITES=	http://oskarsapps.mine.nu/src/ \
-		http://critical.ch/distfiles/
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Optimally choose files to be put on a CD (or other media)
--- a/misc/countrycodes/Makefile
+++ b/misc/countrycodes/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	countrycodes
 PORTVERSION=	1.0.5
 CATEGORIES=	misc
-MASTER_SITES=	http://www.grigna.com/diego/linux/countrycodes/
+MASTER_SITES=	http://www.grigna.com/diego/linux/countrycodes/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	An ISO 3166 country code finder
--- a/misc/ddate/Makefile
+++ b/misc/ddate/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	ddate
 PORTVERSION=	2.12q
 CATEGORIES=	misc
-MASTER_SITES=	http://www.kernel.org/pub/linux/utils/util-linux/
+MASTER_SITES=	http://www.kernel.org/pub/linux/utils/util-linux/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/
 DISTNAME=	util-linux-${PORTVERSION}

 MAINTAINER=	ehaupt@FreeBSD.org
--- a/misc/gnu-watch/Makefile
+++ b/misc/gnu-watch/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	watch
 DISTVERSION=	3.2.5
 CATEGORIES=	misc
-MASTER_SITES=	http://procps.sourceforge.net/
+MASTER_SITES=	http://procps.sourceforge.net/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/
 PKGNAMEPREFIX=	gnu-
 DISTNAME=	procps-${DISTVERSION}

--- a/misc/gopod/Makefile
+++ b/misc/gopod/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	gopod
 PORTVERSION=	1.4
 CATEGORIES=	misc
 MASTER_SITES=	http://gopod.free-go.net/gopod/ \
-		http://critical.ch/distfiles/
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/
 PKGNAMEPREFIX?=
 DISTNAME=	goPod-${PORTVERSION}_linux_bsd

--- a/misc/ree/Makefile
+++ b/misc/ree/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	ree
 PORTVERSION=	1.3
 CATEGORIES=	misc
 MASTER_SITES=	http://www.linuks.mine.nu/ree/ \
-		http://critical.ch/distfiles/
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A tool to dump your ROM extensions
--- a/net/httping/Makefile
+++ b/net/httping/Makefile
@@ -9,6 +9,8 @@ PORTNAME=	httping
 PORTVERSION=	1.0.10
 CATEGORIES=	net
 MASTER_SITES=	http://www.vanheusden.com/httping/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ehaupt
 EXTRACT_SUFX=	.tgz
--- a/net/micro_proxy/Makefile
+++ b/net/micro_proxy/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	micro_proxy
 PORTVERSION=	20021030
 CATEGORIES=	net
 MASTER_SITES=	http://www.acme.com/software/micro_proxy/ \
-		http://critical.ch/distfiles/
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/
 DISTNAME=	${PORTNAME}_30oct2002

 MAINTAINER=	ehaupt@FreeBSD.org
--- a/net/recvnet/Makefile
+++ b/net/recvnet/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	recvnet
 PORTVERSION=	0.0.1
 CATEGORIES=	net
 MASTER_SITES=	http://www.vanheusden.com/Linux/ \
-		http://critical.ch/distfiles/
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/
 EXTRACT_SUFX=	.tgz

 MAINTAINER=	ehaupt@FreeBSD.org
--- a/news/brag/Makefile
+++ b/news/brag/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	brag
 PORTVERSION=	1.4.1
 CATEGORIES=	news tcl84
-MASTER_SITES=	http://brag.sourceforge.net/
+MASTER_SITES=	http://brag.sourceforge.net/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Download and assemble multipart binaries from newsgroups
--- a/security/bcrypt/Makefile
+++ b/security/bcrypt/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	bcrypt
 PORTVERSION=	1.1
 CATEGORIES=	security
-MASTER_SITES=	http://bcrypt.sourceforge.net/
+MASTER_SITES=	http://bcrypt.sourceforge.net/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A cross-plattform blowfish encryption utility
--- a/security/cksfv/Makefile
+++ b/security/cksfv/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	cksfv
 PORTVERSION=	1.3.9
 CATEGORIES=	security
 MASTER_SITES=	http://zakalwe.virtuaalipalvelin.net/~shd/foss/cksfv/files/ \
-		http://critical.ch/distfiles/
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Create or manipulate Simple File Verification (SFV) checksum files
--- a/security/pkcrack/Makefile
+++ b/security/pkcrack/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	pkcrack
 PORTVERSION=	1.2.2
 CATEGORIES=	security
-MASTER_SITES=	http://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack/
+MASTER_SITES=	http://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A utility for breaking pkzip encryption
--- a/security/tthsum/Makefile
+++ b/security/tthsum/Makefile
@@ -9,6 +9,7 @@ PORTNAME=	tthsum
 PORTVERSION=	1.1.0
 CATEGORIES=	security
 MASTER_SITES=	http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ehaupt

--- a/sysutils/cdircmp/Makefile
+++ b/sysutils/cdircmp/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	cdircmp
 PORTVERSION=	0.3
 CATEGORIES=	sysutils
-MASTER_SITES=	http://critical.ch/distfiles/
+MASTER_SITES=	http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Compare directories and select files to copy
--- a/sysutils/cmospwd/Makefile
+++ b/sysutils/cmospwd/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	cmospwd
 PORTVERSION=	4.8
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.cgsecurity.org/ \
-		http://critical.ch/distfiles/
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A BIOS password recovery tool
--- a/sysutils/fdupes/Makefile
+++ b/sysutils/fdupes/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	fdupes
 PORTVERSION=	1.40
 CATEGORIES=	sysutils
-MASTER_SITES=	http://netdial.caribe.net/~adrian2/programs/
+MASTER_SITES=	http://netdial.caribe.net/~adrian2/programs/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Fdupes is a program for identifying or deleting duplicate files
--- a/sysutils/highlnk/Makefile
+++ b/sysutils/highlnk/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	highlnk
 DISTVERSION=	0.2
 CATEGORIES=	sysutils
-MASTER_SITES=	http://perli.net/projekte/highlnk/
+MASTER_SITES=	http://perli.net/projekte/highlnk/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A tool to save disk space on hard disks by using hardlinks
--- a/sysutils/magicrescue/Makefile
+++ b/sysutils/magicrescue/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	magicrescue
 PORTVERSION=	1.1.4
 CATEGORIES=	sysutils
-MASTER_SITES=	http://jbj.rapanden.dk/magicrescue/release/
+MASTER_SITES=	http://jbj.rapanden.dk/magicrescue/release/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A file recovery tool which recovers deleted files from a block device
--- a/sysutils/most/Makefile
+++ b/sysutils/most/Makefile
@@ -11,7 +11,9 @@ PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://space.mit.edu/pub/davis/most/ \
 		ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/most/ \
-		http://gd.tuwien.ac.at/editors/davis/most/
+		http://gd.tuwien.ac.at/editors/davis/most/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A pager (like less) which has support for windows and binary files
--- a/sysutils/rej/Makefile
+++ b/sysutils/rej/Makefile
@@ -9,6 +9,7 @@ PORTNAME=	rej
 PORTVERSION=	0.16
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/ \
 		http://ftp.suse.com/pub/people/mason/rej/

 MAINTAINER=	ehaupt@FreeBSD.org
--- a/sysutils/vii/Makefile
+++ b/sysutils/vii/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	vii
 PORTVERSION=	4.0
 CATEGORIES=	sysutils
-MASTER_SITES=	http://vii.sourceforge.net/
+MASTER_SITES=	http://vii.sourceforge.net/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Execute a command repeatedly and scroll the output
--- a/sysutils/watchfolder/Makefile
+++ b/sysutils/watchfolder/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	watchfolder
 PORTVERSION=	0.3.3
 CATEGORIES=	sysutils
-MASTER_SITES=	http://dstunrea.sdf-eu.org/files/
+MASTER_SITES=	http://dstunrea.sdf-eu.org/files/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Watch folders for new files and process them
--- a/sysutils/wuzzah/Makefile
+++ b/sysutils/wuzzah/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	wuzzah
 PORTVERSION=	0.53
 CATEGORIES=	sysutils
-MASTER_SITES=	http://critical.ch/distfiles/
+MASTER_SITES=	http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A command line utility for stalking users
--- a/sysutils/zeroer/Makefile
+++ b/sysutils/zeroer/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	zeroer
 PORTVERSION=	0.1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://critical.ch/${PORTNAME}/
+MASTER_SITES=	http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A command line utility for wiping unallocated space on a filesystem
--- a/textproc/fldiff/Makefile
+++ b/textproc/fldiff/Makefile
@@ -9,6 +9,7 @@ PORTNAME=	fldiff
 PORTVERSION=	1.0
 CATEGORIES=	textproc
 MASTER_SITES=	http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/ \
 		http://www.easysw.com/~mike/fldiff/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source

--- a/textproc/htmlise/Makefile
+++ b/textproc/htmlise/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	htmlise
 PORTVERSION=	0.2
 CATEGORIES=	textproc
-MASTER_SITES=	http://www.ex-parrot.com/~chris/stuff/
+MASTER_SITES=	http://www.ex-parrot.com/~chris/stuff/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Formats plain text as HTML
--- a/textproc/rtf2html/Makefile
+++ b/textproc/rtf2html/Makefile
@@ -9,6 +9,7 @@ PORTNAME=	rtf2html
 DISTVERSION=	1.1b
 CATEGORIES=	textproc
 MASTER_SITES=	http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ehaupt
 DISTNAME=	${PORTNAME}
--- a/textproc/uni2ascii/Makefile
+++ b/textproc/uni2ascii/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	uni2ascii
 PORTVERSION=	3.9
 CATEGORIES=	textproc
 MASTER_SITES=	http://billposer.org/Software/Downloads/ \
-		http://critical.ch/distfiles/
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Convert between UTF-8 Unicode and 7-bit ASCII equivalents
--- a/textproc/xlreader/Makefile
+++ b/textproc/xlreader/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	xlreader
 PORTVERSION=	0.9.0
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.giffin.org/download/ \
-		http://critical.ch/distfiles/
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/
 EXTRACT_SUFX=	.tgz

 MAINTAINER=	ehaupt@FreeBSD.org
--- a/www/bannerfilter/Makefile
+++ b/www/bannerfilter/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	bannerfilter
 PORTVERSION=	1.31
 CATEGORIES=	www
-MASTER_SITES=	http://phroggy.com/files/unix/
+MASTER_SITES=	http://phroggy.com/files/unix/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A squid redirect script for filtering web banners
--- a/www/linklint/Makefile
+++ b/www/linklint/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	linklint
 PORTVERSION=	2.3.5
 CATEGORIES=	www
-MASTER_SITES=	http://www.linklint.org/download/
+MASTER_SITES=	http://www.linklint.org/download/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Perl script that checks links on web sites
--- a/x11-clocks/lmclock/Makefile
+++ b/x11-clocks/lmclock/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	lmclock
 PORTVERSION=	1.2
 CATEGORIES=	x11-clocks
-MASTER_SITES=	http://pantransit.reptiles.org/prog/
+MASTER_SITES=	http://pantransit.reptiles.org/prog/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A Xerox Lisp machine clock clone
--- a/x11/gtk-launch/Makefile
+++ b/x11/gtk-launch/Makefile
@@ -9,7 +9,9 @@ PORTNAME=	gtk-launch
 DISTVERSION=	1.1b
 PORTREVISION=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://pierric.descamps.free.fr/pierric/downloads/
+MASTER_SITES=	http://pierric.descamps.free.fr/pierric/downloads/ \
+		http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A fast GTK+ program launcher
--- a/x11/thinglaunch/Makefile
+++ b/x11/thinglaunch/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	thinglaunch
 PORTVERSION=	1.03
 CATEGORIES=	x11
-MASTER_SITES=	http://critical.ch/distfiles/
+MASTER_SITES=	http://critical.ch/distfiles/ \
+		http://energy.critical.ch/distfiles/

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A very fast launcher program for X