aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/deb2targz/Makefile3
-rw-r--r--archivers/ecm/Makefile3
-rw-r--r--archivers/gzrecover/Makefile4
-rw-r--r--archivers/mar/Makefile3
-rw-r--r--archivers/ppmd/Makefile3
-rw-r--r--archivers/tardy/Makefile4
-rw-r--r--archivers/unlzx/Makefile3
-rw-r--r--archivers/unzoo/Makefile1
-rw-r--r--audio/aylet/Makefile3
-rw-r--r--audio/checkmate/Makefile4
-rw-r--r--audio/festalon/Makefile3
-rw-r--r--audio/gbsplay/Makefile1
-rw-r--r--audio/malint/Makefile4
-rw-r--r--audio/modplugplay/Makefile4
-rw-r--r--audio/mp-player/Makefile3
-rw-r--r--audio/mp3guessenc/Makefile4
-rw-r--r--audio/mpck/Makefile4
-rw-r--r--audio/ocp/Makefile3
-rw-r--r--audio/openspc/Makefile4
-rw-r--r--audio/penguinsap/Makefile3
-rw-r--r--audio/resid/Makefile4
-rw-r--r--audio/schism/Makefile4
-rw-r--r--audio/sfront/Makefile3
-rw-r--r--audio/sidplayer/Makefile2
-rw-r--r--audio/wav2cdr/Makefile4
-rw-r--r--audio/xmms-nsf/Makefile3
-rw-r--r--audio/xmms-openspc/Makefile1
-rw-r--r--audio/xmms-sexypsf/Makefile3
-rw-r--r--audio/yell/Makefile3
-rw-r--r--devel/cvsspam/Makefile4
-rw-r--r--dns/nslint/Makefile3
-rw-r--r--dns/zonenotify/Makefile4
-rw-r--r--finance/ccard/Makefile4
-rw-r--r--games/filters/Makefile4
-rw-r--r--games/textmaze/Makefile4
-rw-r--r--games/typespeed/Makefile3
-rw-r--r--german/schwobifyer/Makefile3
-rw-r--r--graphics/bmp2html/Makefile5
-rw-r--r--graphics/exrtools/Makefile3
-rw-r--r--graphics/metacam/Makefile1
-rw-r--r--graphics/recoverjpeg/Makefile4
-rw-r--r--graphics/telak/Makefile3
-rw-r--r--irc/netwalker-ircc/Makefile3
-rw-r--r--mail/cyrus2courier/Makefile3
-rw-r--r--mail/delatt/Makefile4
-rw-r--r--mail/nbsmtp/Makefile3
-rw-r--r--mail/qmail-rblchk/Makefile4
-rw-r--r--mail/spfval/Makefile3
-rw-r--r--math/mathomatic/Makefile4
-rw-r--r--misc/bestfit/Makefile3
-rw-r--r--misc/countrycodes/Makefile4
-rw-r--r--misc/ddate/Makefile4
-rw-r--r--misc/gnu-watch/Makefile4
-rw-r--r--misc/gopod/Makefile3
-rw-r--r--misc/ree/Makefile3
-rw-r--r--net/httping/Makefile2
-rw-r--r--net/micro_proxy/Makefile3
-rw-r--r--net/recvnet/Makefile3
-rw-r--r--news/brag/Makefile4
-rw-r--r--security/bcrypt/Makefile4
-rw-r--r--security/cksfv/Makefile3
-rw-r--r--security/pkcrack/Makefile4
-rw-r--r--security/tthsum/Makefile1
-rw-r--r--sysutils/cdircmp/Makefile3
-rw-r--r--sysutils/cmospwd/Makefile3
-rw-r--r--sysutils/fdupes/Makefile4
-rw-r--r--sysutils/highlnk/Makefile4
-rw-r--r--sysutils/magicrescue/Makefile4
-rw-r--r--sysutils/most/Makefile4
-rw-r--r--sysutils/rej/Makefile1
-rw-r--r--sysutils/vii/Makefile4
-rw-r--r--sysutils/watchfolder/Makefile4
-rw-r--r--sysutils/wuzzah/Makefile3
-rw-r--r--sysutils/zeroer/Makefile3
-rw-r--r--textproc/fldiff/Makefile1
-rw-r--r--textproc/htmlise/Makefile4
-rw-r--r--textproc/rtf2html/Makefile1
-rw-r--r--textproc/uni2ascii/Makefile3
-rw-r--r--textproc/xlreader/Makefile3
-rw-r--r--www/bannerfilter/Makefile4
-rw-r--r--www/linklint/Makefile4
-rw-r--r--x11-clocks/lmclock/Makefile4
-rw-r--r--x11/gtk-launch/Makefile4
-rw-r--r--x11/thinglaunch/Makefile3
84 files changed, 198 insertions, 75 deletions
diff --git a/archivers/deb2targz/Makefile b/archivers/deb2targz/Makefile
index 7194d5c59e6a..e1a353e93d66 100644
--- 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
diff --git a/archivers/ecm/Makefile b/archivers/ecm/Makefile
index bd7124821332..6302a84af232 100644
--- 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
diff --git a/archivers/gzrecover/Makefile b/archivers/gzrecover/Makefile
index 2e9a0ba33f18..afce335235b8 100644
--- 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
diff --git a/archivers/mar/Makefile b/archivers/mar/Makefile
index acde59edc536..c797ac123ab6 100644
--- 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
diff --git a/archivers/ppmd/Makefile b/archivers/ppmd/Makefile
index dbe0abda746e..65ffa988e846 100644
--- 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
diff --git a/archivers/tardy/Makefile b/archivers/tardy/Makefile
index 5b45be8815d7..ef62d60515ee 100644
--- 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
diff --git a/archivers/unlzx/Makefile b/archivers/unlzx/Makefile
index eefd0f5c66fa..2cfdd418d46a 100644
--- 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
diff --git a/archivers/unzoo/Makefile b/archivers/unzoo/Makefile
index ab9fda48ab97..3007bb036543 100644
--- 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
diff --git a/audio/aylet/Makefile b/audio/aylet/Makefile
index 0ea91ed49b3f..675cc0807627 100644
--- 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
diff --git a/audio/checkmate/Makefile b/audio/checkmate/Makefile
index 5dbe9ff5ca34..de6c7af4fc1c 100644
--- 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
diff --git a/audio/festalon/Makefile b/audio/festalon/Makefile
index 74461b0b8433..fb2521772ee0 100644
--- 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
diff --git a/audio/gbsplay/Makefile b/audio/gbsplay/Makefile
index a0f96c085cf4..a4c9779e8735 100644
--- 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?=
diff --git a/audio/malint/Makefile b/audio/malint/Makefile
index cb45c1c752c1..8c2018958d53 100644
--- 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
diff --git a/audio/modplugplay/Makefile b/audio/modplugplay/Makefile
index a794e8b55731..8db30616b93b 100644
--- 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
diff --git a/audio/mp-player/Makefile b/audio/mp-player/Makefile
index 330707bf32e7..2cb1853a5c68 100644
--- 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
diff --git a/audio/mp3guessenc/Makefile b/audio/mp3guessenc/Makefile
index 94f9f362599e..9c3d30bbd324 100644
--- 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
diff --git a/audio/mpck/Makefile b/audio/mpck/Makefile
index 5dbe9ff5ca34..de6c7af4fc1c 100644
--- 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
diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile
index 9fb20c7bb102..7ff344f37c0b 100644
--- 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
diff --git a/audio/openspc/Makefile b/audio/openspc/Makefile
index 5664472eb59c..4df01ba34992 100644
--- 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
diff --git a/audio/penguinsap/Makefile b/audio/penguinsap/Makefile
index 1ee81247fa32..a7c85f2edb2f 100644
--- 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
diff --git a/audio/resid/Makefile b/audio/resid/Makefile
index fbd84fd09319..3a2e9bd07f80 100644
--- 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
diff --git a/audio/schism/Makefile b/audio/schism/Makefile
index 0ae62b6dbb4d..bf1d1d531e8e 100644
--- 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
diff --git a/audio/sfront/Makefile b/audio/sfront/Makefile
index 9b63faac9355..d3ae67f2d43c 100644
--- 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
diff --git a/audio/sidplayer/Makefile b/audio/sidplayer/Makefile
index a974ee0ace93..09e51b4952f6 100644
--- 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}
diff --git a/audio/wav2cdr/Makefile b/audio/wav2cdr/Makefile
index 3f148cba3e81..4c1edcaa27ab 100644
--- 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
diff --git a/audio/xmms-nsf/Makefile b/audio/xmms-nsf/Makefile
index 0eecbe348a93..3111da8fc2fe 100644
--- 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
diff --git a/audio/xmms-openspc/Makefile b/audio/xmms-openspc/Makefile
index b6831073d74a..bf7436a29fca 100644
--- 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}
diff --git a/audio/xmms-sexypsf/Makefile b/audio/xmms-sexypsf/Makefile
index f316204651ba..db7eebeddd4f 100644
--- 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
diff --git a/audio/yell/Makefile b/audio/yell/Makefile
index 32085c1a58ee..d7f793414e2e 100644
--- 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
diff --git a/devel/cvsspam/Makefile b/devel/cvsspam/Makefile
index 3392d46c2a8c..9e117d12d2c5 100644
--- 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
diff --git a/dns/nslint/Makefile b/dns/nslint/Makefile
index 3782160db054..e3ff39227735 100644
--- 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
diff --git a/dns/zonenotify/Makefile b/dns/zonenotify/Makefile
index 6199719164f6..90c729ef02ff 100644
--- 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
diff --git a/finance/ccard/Makefile b/finance/ccard/Makefile
index 9f90d47915df..d25cd2b5cf18 100644
--- 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
diff --git a/games/filters/Makefile b/games/filters/Makefile
index a0a48935ad4a..4ec6826c71ba 100644
--- 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
diff --git a/games/textmaze/Makefile b/games/textmaze/Makefile
index 49101971f8ce..2a4bb039fffe 100644
--- 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
diff --git a/games/typespeed/Makefile b/games/typespeed/Makefile
index 2f8d962df530..47abea2ef6f8 100644
--- 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
diff --git a/german/schwobifyer/Makefile b/german/schwobifyer/Makefile
index 4c7488057569..f96598c8814f 100644
--- 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
diff --git a/graphics/bmp2html/Makefile b/graphics/bmp2html/Makefile
index 7f0d5cdb3a4f..9fe002e85086 100644
--- 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
diff --git a/graphics/exrtools/Makefile b/graphics/exrtools/Makefile
index 924040c76ded..273aa8f714c3 100644
--- 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
diff --git a/graphics/metacam/Makefile b/graphics/metacam/Makefile
index 13e172ec056c..c5edb953d448 100644
--- 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
diff --git a/graphics/recoverjpeg/Makefile b/graphics/recoverjpeg/Makefile
index 3c130e16124f..e8474acc9910 100644
--- 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
diff --git a/graphics/telak/Makefile b/graphics/telak/Makefile
index 94b5e99e4f7b..91ae45ae7e4a 100644
--- 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
diff --git a/irc/netwalker-ircc/Makefile b/irc/netwalker-ircc/Makefile
index 99593659f159..607c3da659b5 100644
--- 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
diff --git a/mail/cyrus2courier/Makefile b/mail/cyrus2courier/Makefile
index 29717a110153..5d5b74d1dad8 100644
--- 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
diff --git a/mail/delatt/Makefile b/mail/delatt/Makefile
index df88ef0fdb88..03885fc0a2c2 100644
--- 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
diff --git a/mail/nbsmtp/Makefile b/mail/nbsmtp/Makefile
index 5819f22bad88..bf7b813a3c6b 100644
--- 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
diff --git a/mail/qmail-rblchk/Makefile b/mail/qmail-rblchk/Makefile
index 74b6987bf88f..da240b26124a 100644
--- 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
diff --git a/mail/spfval/Makefile b/mail/spfval/Makefile
index dd064327f3fb..91085353d65f 100644
--- 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
diff --git a/math/mathomatic/Makefile b/math/mathomatic/Makefile
index b23a8f196e41..65ddecb95cd7 100644
--- 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)
diff --git a/misc/bestfit/Makefile b/misc/bestfit/Makefile
index 531cd82f6c93..713b5936b20f 100644
--- 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)
diff --git a/misc/countrycodes/Makefile b/misc/countrycodes/Makefile
index d4888d8ecd3d..c45225af12f7 100644
--- 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
diff --git a/misc/ddate/Makefile b/misc/ddate/Makefile
index f34eed1b83d3..7f19172cf174 100644
--- 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
diff --git a/misc/gnu-watch/Makefile b/misc/gnu-watch/Makefile
index 57a7fd201490..ee70ff9f0ea2 100644
--- 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}
diff --git a/misc/gopod/Makefile b/misc/gopod/Makefile
index 5ed617c72b82..07b9483c72d3 100644
--- 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
diff --git a/misc/ree/Makefile b/misc/ree/Makefile
index 68f742bda3ee..14fe3e57e54b 100644
--- 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
diff --git a/net/httping/Makefile b/net/httping/Makefile
index 38104e5cd9fb..6d1ff105f738 100644
--- 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
diff --git a/net/micro_proxy/Makefile b/net/micro_proxy/Makefile
index f07f4974bdf7..8d2b32a6b8c2 100644
--- 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
diff --git a/net/recvnet/Makefile b/net/recvnet/Makefile
index df342f4a437a..95e1ab0ff165 100644
--- 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
diff --git a/news/brag/Makefile b/news/brag/Makefile
index 288dcd0d6091..9144905391cd 100644
--- 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
diff --git a/security/bcrypt/Makefile b/security/bcrypt/Makefile
index 1d308ca503f5..a61c359845cd 100644
--- 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
diff --git a/security/cksfv/Makefile b/security/cksfv/Makefile
index cc4605963c31..826a81c68845 100644
--- 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
diff --git a/security/pkcrack/Makefile b/security/pkcrack/Makefile
index 7ae2e05f0e49..d844b42e3e36 100644
--- 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
diff --git a/security/tthsum/Makefile b/security/tthsum/Makefile
index 8183de3f8ead..8f041348ff17 100644
--- 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
diff --git a/sysutils/cdircmp/Makefile b/sysutils/cdircmp/Makefile
index b7e461ae3e26..d1617dfae85f 100644
--- 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
diff --git a/sysutils/cmospwd/Makefile b/sysutils/cmospwd/Makefile
index 6c79adad1824..cfc1fba67006 100644
--- 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
diff --git a/sysutils/fdupes/Makefile b/sysutils/fdupes/Makefile
index cb6b1ac7e97e..ffa3ada6bd0d 100644
--- 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
diff --git a/sysutils/highlnk/Makefile b/sysutils/highlnk/Makefile
index 213a719a782e..4bdf786cdbf5 100644
--- 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
diff --git a/sysutils/magicrescue/Makefile b/sysutils/magicrescue/Makefile
index aed0d90fa18a..61c1e82604e9 100644
--- 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
diff --git a/sysutils/most/Makefile b/sysutils/most/Makefile
index cbf14aa1e228..032ca04aa2e9 100644
--- 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
diff --git a/sysutils/rej/Makefile b/sysutils/rej/Makefile
index c301836e9126..1310d2d9da5e 100644
--- 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
diff --git a/sysutils/vii/Makefile b/sysutils/vii/Makefile
index f0e3689f635a..0be52e01db93 100644
--- 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
diff --git a/sysutils/watchfolder/Makefile b/sysutils/watchfolder/Makefile
index 8eff79d9e28d..3a68a321ac85 100644
--- 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
diff --git a/sysutils/wuzzah/Makefile b/sysutils/wuzzah/Makefile
index e5c86b2ca321..4f27ee4b9538 100644
--- 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
diff --git a/sysutils/zeroer/Makefile b/sysutils/zeroer/Makefile
index 95a32feb21dc..840af72e80e1 100644
--- 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
diff --git a/textproc/fldiff/Makefile b/textproc/fldiff/Makefile
index 32d6b89447f1..bd134989031c 100644
--- 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
diff --git a/textproc/htmlise/Makefile b/textproc/htmlise/Makefile
index 9a59ad20edf4..15490466a10d 100644
--- 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
diff --git a/textproc/rtf2html/Makefile b/textproc/rtf2html/Makefile
index 186fd7995fca..a2d8ca5da7de 100644
--- 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}
diff --git a/textproc/uni2ascii/Makefile b/textproc/uni2ascii/Makefile
index 44d3bc70d2b0..724b7a4d6e02 100644
--- 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
diff --git a/textproc/xlreader/Makefile b/textproc/xlreader/Makefile
index b09fd42faf05..48ca71550eb8 100644
--- 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
diff --git a/www/bannerfilter/Makefile b/www/bannerfilter/Makefile
index b547d3f2c861..bda772f8e708 100644
--- 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
diff --git a/www/linklint/Makefile b/www/linklint/Makefile
index 3b67ae59df1f..627c825a1b16 100644
--- 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
diff --git a/x11-clocks/lmclock/Makefile b/x11-clocks/lmclock/Makefile
index 1163bd5f5ef3..2742a1e5d92b 100644
--- 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
diff --git a/x11/gtk-launch/Makefile b/x11/gtk-launch/Makefile
index c97519d89eac..20a86506c0fd 100644
--- 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
diff --git a/x11/thinglaunch/Makefile b/x11/thinglaunch/Makefile
index d6299cdb6b3e..e19513fe9e47 100644
--- 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