Use MASTER_SITE_CRITICAL

72 files changed, 79 insertions, 159 deletions

diff --git a/audio/yell/Makefile b/audio/yell/Makefile
index 9185779bf719..48c44a622c44 100644
--- a/audio/yell/Makefile
+++ b/audio/yell/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	yell
 PORTVERSION=	1.0
 CATEGORIES=	audio
-MASTER_SITES=	http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+MASTER_SITES=	CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A command line pc speaker bell
diff --git a/deskutils/xfce4-notification-daemon/Makefile b/deskutils/xfce4-notification-daemon/Makefile
index 21ad7976e42a..0e28dda682f9 100644
--- a/deskutils/xfce4-notification-daemon/Makefile
+++ b/deskutils/xfce4-notification-daemon/Makefile
@@ -10,8 +10,7 @@ PORTVERSION=	0.3.7
 PORTREVISION=	1
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	http://goodies.xfce.org/releases/notification-daemon-xfce/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 PKGNAMEPREFIX=	xfce4-
 DISTNAME=	${PORTNAME}-xfce-${PORTVERSION}
 DIST_SUBDIR=	xfce4
diff --git a/devel/bunny/Makefile b/devel/bunny/Makefile
index d23251bf4d5b..32b175360907 100644
--- a/devel/bunny/Makefile
+++ b/devel/bunny/Makefile
@@ -8,9 +8,7 @@
 PORTNAME=	bunny
 PORTVERSION=	0.92
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+MASTER_SITES=	GOOGLE_CODE CRITICAL
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/devel/cvsspam/Makefile b/devel/cvsspam/Makefile
index 9e117d12d2c5..b847dff93ffb 100644
--- a/devel/cvsspam/Makefile
+++ b/devel/cvsspam/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	cvsspam
 PORTVERSION=	0.2.12
 CATEGORIES=	devel
 MASTER_SITES=	http://www.badgers-in-foil.co.uk/projects/cvsspam/releases/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Sends diffs when a change is committed to your CVS repository
diff --git a/dns/dnswall/Makefile b/dns/dnswall/Makefile
index 7a0c304164bf..e5f499c518bc 100644
--- a/dns/dnswall/Makefile
+++ b/dns/dnswall/Makefile
@@ -8,9 +8,7 @@
 PORTNAME=	dnswall
 PORTVERSION=	0.1.4
 CATEGORIES=	dns security
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+MASTER_SITES=	GOOGLE_CODE CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A daemon that filters out private IP addresses in DNS responses
diff --git a/dns/nslint/Makefile b/dns/nslint/Makefile
index e3ff39227735..a8da93b87a56 100644
--- a/dns/nslint/Makefile
+++ b/dns/nslint/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	nslint
 PORTVERSION=	2.1.a6
 CATEGORIES=	dns
 MASTER_SITES=	ftp://ftp.ee.lbl.gov/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.a/a/}
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/dns/sshfp/Makefile b/dns/sshfp/Makefile
index e3fbd7150291..cb7a16473f15 100644
--- a/dns/sshfp/Makefile
+++ b/dns/sshfp/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	sshfp
 PORTVERSION=	1.1.3
 CATEGORIES=	dns security
 MASTER_SITES=	ftp://ftp.xelerance.com/sshfp/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Generate SSHFP DNS records from knownhosts files or ssh-keyscan
diff --git a/dns/vizone/Makefile b/dns/vizone/Makefile
index c865ad518667..0f8d58cf58d1 100644
--- a/dns/vizone/Makefile
+++ b/dns/vizone/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	vizone
 PORTVERSION=	0.1
 CATEGORIES=	dns
-MASTER_SITES=	http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+MASTER_SITES=	CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Updates the serialnumber in one or more zonefiles
diff --git a/dns/zonenotify/Makefile b/dns/zonenotify/Makefile
index 8dfbfa239703..9395765497bb 100644
--- a/dns/zonenotify/Makefile
+++ b/dns/zonenotify/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	zonenotify
 PORTVERSION=	0.1
 CATEGORIES=	dns
 MASTER_SITES=	http://morettoni.net/bsd/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A dns notify sender written in C
diff --git a/games/bloboats/Makefile b/games/bloboats/Makefile
index 3f742cb6ad81..31889ab8862e 100644
--- a/games/bloboats/Makefile
+++ b/games/bloboats/Makefile
@@ -12,8 +12,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://mirror.kapsi.fi/bloboats.dy.fi/ \
 		http://koti.mbnet.fi/makegho/c/blobtrox/ \
 		http://shoebox.ath.cx/~make/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A boat racing game in the spirit of Elasto Mania or X-Moto
diff --git a/games/filters/Makefile b/games/filters/Makefile
index 156fdf3c7c91..d50fe13d497e 100644
--- a/games/filters/Makefile
+++ b/games/filters/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	filters
 PORTVERSION=	2.43
 CATEGORIES=	games perl5
 MASTER_SITES=	http://ftp.debian.org/debian/pool/main/f/filters/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/games/textmaze/Makefile b/games/textmaze/Makefile
index 2a4bb039fffe..bb656e8571d3 100644
--- a/games/textmaze/Makefile
+++ b/games/textmaze/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	textmaze
 PORTVERSION=	1.2
 CATEGORIES=	games perl5
 MASTER_SITES=	http://www.robobunny.com/projects/textmaze/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 DISTNAME=	${PORTNAME}_v${PORTVERSION}
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/german/schwobifyer/Makefile b/german/schwobifyer/Makefile
index f96598c8814f..813ea55527ac 100644
--- a/german/schwobifyer/Makefile
+++ b/german/schwobifyer/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	schwobifyer
 PORTVERSION=	20050730
 CATEGORIES=	german
-MASTER_SITES=	http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+MASTER_SITES=	CRITICAL
 PKGNAMEPREFIX=	de-
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/graphics/bmp2html/Makefile b/graphics/bmp2html/Makefile
index 78cdeb61cde3..4ef838653d51 100644
--- a/graphics/bmp2html/Makefile
+++ b/graphics/bmp2html/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	bmp2html
 PORTVERSION=	0.1
 PORTREVISION=	3
 CATEGORIES=	graphics
-MASTER_SITES=	http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+MASTER_SITES=	CRITICAL
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/graphics/exrtools/Makefile b/graphics/exrtools/Makefile
index 0edcc7779bd8..c67747f5635b 100644
--- a/graphics/exrtools/Makefile
+++ b/graphics/exrtools/Makefile
@@ -10,8 +10,7 @@ PORTVERSION=	0.4
 PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://scanline.ca/exrtools/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Utilities for manipulating with HDR images in OpenEXR format
diff --git a/graphics/fractorama/Makefile b/graphics/fractorama/Makefile
index d19e4798c902..209b4cf00b11 100644
--- a/graphics/fractorama/Makefile
+++ b/graphics/fractorama/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	fractorama
 PORTVERSION=	1.6.7
 PORTREVISION=	3
 CATEGORIES=	graphics
-MASTER_SITES=	http://critical.ch/distfiles/${PORTNAME}/${PORTVERSION}/ \
-		http://energy.critical.ch/distfiles/${PORTNAME}/${PORTVERSION}/
+MASTER_SITES=	CRITICAL
+MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION}
 DISTNAME=	${PORTNAME}
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
diff --git a/graphics/metacam/Makefile b/graphics/metacam/Makefile
index 1cdf39368052..085567e30159 100644
--- a/graphics/metacam/Makefile
+++ b/graphics/metacam/Makefile
@@ -8,10 +8,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
+MASTER_SITES=	CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A digital camera EXIF meta-information reader
diff --git a/graphics/pecomato/Makefile b/graphics/pecomato/Makefile
index c8d9eccb054f..c2498466cfda 100644
--- a/graphics/pecomato/Makefile
+++ b/graphics/pecomato/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	pecomato
 PORTVERSION=	0.0.15
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.mollux.org/projects/pecomato/download/sources/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A command-line picture metadata processor
diff --git a/graphics/recoverjpeg/Makefile b/graphics/recoverjpeg/Makefile
index ffc183211d19..52a4511d999e 100644
--- a/graphics/recoverjpeg/Makefile
+++ b/graphics/recoverjpeg/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	recoverjpeg
 PORTVERSION=	1.1.2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.rfc1149.net/download/recoverjpeg/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 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 29bf4961088d..52f7bf668d7b 100644
--- a/graphics/telak/Makefile
+++ b/graphics/telak/Makefile
@@ -10,14 +10,13 @@ PORTVERSION=	0.5
 PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://julien.danjou.info/telak/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A tool to draw pictures on your root window
 
 LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl \
-		gcrypt.15:${PORTSDIR}/security/libgcrypt \
+		gcrypt.15:${PORTSDIR}/security/libgcrypt
 
 USE_GMAKE=	yes
 USE_EFL=	imlib2
diff --git a/irc/netwalker-ircc/Makefile b/irc/netwalker-ircc/Makefile
index 2777c55f3fdb..62245edf14cc 100644
--- a/irc/netwalker-ircc/Makefile
+++ b/irc/netwalker-ircc/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	netwalker-ircc
 PORTVERSION=	0.5.0
 CATEGORIES=	irc
-MASTER_SITES=	http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+MASTER_SITES=	CRITICAL
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/mail/cyrus2courier/Makefile b/mail/cyrus2courier/Makefile
index 8209f27f5467..4a7e4f4fcad9 100644
--- a/mail/cyrus2courier/Makefile
+++ b/mail/cyrus2courier/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	cyrus2courier
 DISTVERSION=	1.4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.madness.at/~mad/projects/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/mail/delatt/Makefile b/mail/delatt/Makefile
index 2c4815b0941d..ac6ca090ed98 100644
--- a/mail/delatt/Makefile
+++ b/mail/delatt/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	delatt
 DISTVERSION=	1.1.3
 CATEGORIES=	mail
 MASTER_SITES=	http://danborn.net/delatt/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Strip attachments from email
diff --git a/mail/nbsmtp/Makefile b/mail/nbsmtp/Makefile
index bf7b813a3c6b..3a32c56161cf 100644
--- a/mail/nbsmtp/Makefile
+++ b/mail/nbsmtp/Makefile
@@ -10,8 +10,7 @@
 PORTNAME=	nbsmtp
 PORTVERSION=	1.00
 CATEGORIES=	mail
-MASTER_SITES=	http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+MASTER_SITES=	CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Simple program for outgoing SMTP delivery
diff --git a/mail/qmail-rblchk/Makefile b/mail/qmail-rblchk/Makefile
index da240b26124a..98ad5a56b203 100644
--- a/mail/qmail-rblchk/Makefile
+++ b/mail/qmail-rblchk/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	qmail-rblchk
 PORTVERSION=	2.4.1
 CATEGORIES=	mail
 MASTER_SITES=	http://morettoni.net/qmail/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A qmail RBL filter
diff --git a/mail/spfval/Makefile b/mail/spfval/Makefile
index 91085353d65f..890a297e7801 100644
--- a/mail/spfval/Makefile
+++ b/mail/spfval/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	spfval
 PORTVERSION=	0.0.1
 CATEGORIES=	mail
-MASTER_SITES=	http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+MASTER_SITES=	CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A SPF validator
diff --git a/math/mathomatic/Makefile b/math/mathomatic/Makefile
index 9f95b7066123..cad9b415c7b7 100644
--- a/math/mathomatic/Makefile
+++ b/math/mathomatic/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	mathomatic
 PORTVERSION=	12.9.0
 CATEGORIES=	math
 MASTER_SITES=	http://www.panix.com/~gesslein/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Highly portable, general purpose CAS (Computer Algebra System)
diff --git a/misc/bestfit/Makefile b/misc/bestfit/Makefile
index d91831906ba6..3a087a245587 100644
--- a/misc/bestfit/Makefile
+++ b/misc/bestfit/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	bestfit
 PORTVERSION=	0.2.0
 CATEGORIES=	misc
-MASTER_SITES=	http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+MASTER_SITES=	CRITICAL
 
 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 c45225af12f7..08e214fdcaad 100644
--- a/misc/countrycodes/Makefile
+++ b/misc/countrycodes/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	countrycodes
 PORTVERSION=	1.0.5
 CATEGORIES=	misc
 MASTER_SITES=	http://www.grigna.com/diego/linux/countrycodes/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	An ISO 3166 country code finder
diff --git a/misc/ddate/Makefile b/misc/ddate/Makefile
index b8ff45fb535d..7da523f5e350 100644
--- a/misc/ddate/Makefile
+++ b/misc/ddate/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	ddate
 PORTVERSION=	2.12r
 CATEGORIES=	misc
 MASTER_SITES=	http://www.kernel.org/pub/linux/utils/util-linux/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 DISTNAME=	util-linux-${PORTVERSION}
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/misc/gnu-watch/Makefile b/misc/gnu-watch/Makefile
index 5e015c158479..0eca046e285a 100644
--- a/misc/gnu-watch/Makefile
+++ b/misc/gnu-watch/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	watch
 DISTVERSION=	3.2.7
 CATEGORIES=	misc
 MASTER_SITES=	http://procps.sourceforge.net/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 PKGNAMEPREFIX=	gnu-
 DISTNAME=	procps-${DISTVERSION}
 
diff --git a/misc/gopod/Makefile b/misc/gopod/Makefile
index fa9fcb503d3b..9a3d79743f02 100644
--- a/misc/gopod/Makefile
+++ b/misc/gopod/Makefile
@@ -10,8 +10,7 @@ PORTVERSION=	1.4
 PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://gopod.free-go.net/gopod/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 PKGNAMEPREFIX?=
 DISTNAME=	goPod-${PORTVERSION}_linux_bsd
 
diff --git a/misc/ree/Makefile b/misc/ree/Makefile
index 14fe3e57e54b..4345cf2351ed 100644
--- a/misc/ree/Makefile
+++ b/misc/ree/Makefile
@@ -8,9 +8,7 @@
 PORTNAME=	ree
 PORTVERSION=	1.3
 CATEGORIES=	misc
-MASTER_SITES=	http://www.linuks.mine.nu/ree/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+MASTER_SITES=	CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A tool to dump your ROM extensions
diff --git a/misc/shc/Makefile b/misc/shc/Makefile
index 05e39f835dc1..c37db997e517 100644
--- a/misc/shc/Makefile
+++ b/misc/shc/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	shc
 PORTVERSION=	3.8.6
 CATEGORIES=	misc
 MASTER_SITES=	http://www.datsi.fi.upm.es/~frosal/sources/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/misc/talkfilters/Makefile b/misc/talkfilters/Makefile
index 7f475bcb76bb..583795682323 100644
--- a/misc/talkfilters/Makefile
+++ b/misc/talkfilters/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	talkfilters
 PORTVERSION=	2.3.8
 CATEGORIES=	misc
 MASTER_SITES=	http://www.hyperrealm.com/talkfilters/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/
+		CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Set of filters to convert English text to various stereotyped dialects
diff --git a/net-mgmt/cidr/Makefile b/net-mgmt/cidr/Makefile
index 3910626b5d49..951cb8790093 100644
--- a/net-mgmt/cidr/Makefile
+++ b/net-mgmt/cidr/Makefile
@@ -8,8 +8,7 @@ PORTNAME=	cidr
 PORTVERSION=	2.3.2
 PORTREVISION=	1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+MASTER_SITES=	CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	RFC 1878 subnet calculator / helper
diff --git a/net-p2p/createtorrent/Makefile b/net-p2p/createtorrent/Makefile
index faaf8acb4047..daa4527e6622 100644
--- a/net-p2p/createtorrent/Makefile
+++ b/net-p2p/createtorrent/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	createtorrent
 PORTVERSION=	1.1.4
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://www.createtorrent.com/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Create BitTorrent files from the command line
diff --git a/net/httping/Makefile b/net/httping/Makefile
index 9b558fa8fcbf..90919be8e4ec 100644
--- a/net/httping/Makefile
+++ b/net/httping/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	httping
 PORTVERSION=	1.2.5
 CATEGORIES=	net
 MASTER_SITES=	http://www.vanheusden.com/httping/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/net/micro_proxy/Makefile b/net/micro_proxy/Makefile
index 8d2b32a6b8c2..faf14e6f3920 100644
--- a/net/micro_proxy/Makefile
+++ b/net/micro_proxy/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	micro_proxy
 PORTVERSION=	20021030
 CATEGORIES=	net
 MASTER_SITES=	http://www.acme.com/software/micro_proxy/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 DISTNAME=	${PORTNAME}_30oct2002
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/net/recvnet/Makefile b/net/recvnet/Makefile
index 95e1ab0ff165..8fbd679ad93e 100644
--- a/net/recvnet/Makefile
+++ b/net/recvnet/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	recvnet
 PORTVERSION=	0.0.1
 CATEGORIES=	net
 MASTER_SITES=	http://www.vanheusden.com/Linux/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/news/brag/Makefile b/news/brag/Makefile
index 9144905391cd..cdfb36490443 100644
--- a/news/brag/Makefile
+++ b/news/brag/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	brag
 PORTVERSION=	1.4.1
 CATEGORIES=	news tcl84
 MASTER_SITES=	http://brag.sourceforge.net/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Download and assemble multipart binaries from newsgroups
diff --git a/security/bcrypt/Makefile b/security/bcrypt/Makefile
index a61c359845cd..71069af225c4 100644
--- a/security/bcrypt/Makefile
+++ b/security/bcrypt/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	bcrypt
 PORTVERSION=	1.1
 CATEGORIES=	security
 MASTER_SITES=	http://bcrypt.sourceforge.net/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A cross-plattform blowfish encryption utility
diff --git a/security/cksfv/Makefile b/security/cksfv/Makefile
index 2cc0cbdfc632..81b93e97cb8f 100644
--- a/security/cksfv/Makefile
+++ b/security/cksfv/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	cksfv
 PORTVERSION=	1.3.12
 CATEGORIES=	security
 MASTER_SITES=	http://zakalwe.virtuaalipalvelin.net/~shd/foss/cksfv/files/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 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 d844b42e3e36..c99d1d81d899 100644
--- a/security/pkcrack/Makefile
+++ b/security/pkcrack/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	pkcrack
 PORTVERSION=	1.2.2
 CATEGORIES=	security
 MASTER_SITES=	http://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A utility for breaking pkzip encryption
diff --git a/security/tthsum/Makefile b/security/tthsum/Makefile
index 8f041348ff17..57b5f08f4c8a 100644
--- a/security/tthsum/Makefile
+++ b/security/tthsum/Makefile
@@ -8,10 +8,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
+MASTER_SITES=	CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A command-line utility for generating and checking TTH message digests
diff --git a/security/vpnc/Makefile b/security/vpnc/Makefile
index 731fcc5219c4..d0aa707dd07c 100644
--- a/security/vpnc/Makefile
+++ b/security/vpnc/Makefile
@@ -10,8 +10,7 @@ PORTVERSION=	0.5.1
 PORTREVISION=	5
 CATEGORIES=	security
 MASTER_SITES=	http://www.unix-ag.uni-kl.de/~massar/vpnc/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Client for Cisco 3000 VPN Concentrator
diff --git a/sysutils/cdircmp/Makefile b/sysutils/cdircmp/Makefile
index d1617dfae85f..8cc3058c50d6 100644
--- a/sysutils/cdircmp/Makefile
+++ b/sysutils/cdircmp/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	cdircmp
 PORTVERSION=	0.3
 CATEGORIES=	sysutils
-MASTER_SITES=	http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+MASTER_SITES=	CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Compare directories and select files to copy
diff --git a/sysutils/cmospwd/Makefile b/sysutils/cmospwd/Makefile
index a451e846580a..d7550fe716fa 100644
--- a/sysutils/cmospwd/Makefile
+++ b/sysutils/cmospwd/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	cmospwd
 PORTVERSION=	5.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.cgsecurity.org/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A BIOS password recovery tool
diff --git a/sysutils/fdupes/Makefile b/sysutils/fdupes/Makefile
index e761084080d6..1b7d69f89cd0 100644
--- a/sysutils/fdupes/Makefile
+++ b/sysutils/fdupes/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	fdupes
 DISTVERSION=	1.50-PR2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://netdial.caribe.net/~adrian2/programs/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 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 4bdf786cdbf5..d59a7322c31f 100644
--- a/sysutils/highlnk/Makefile
+++ b/sysutils/highlnk/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	highlnk
 DISTVERSION=	0.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://perli.net/projekte/highlnk/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 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 2b462661bb30..dadae4dcadc5 100644
--- a/sysutils/magicrescue/Makefile
+++ b/sysutils/magicrescue/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	magicrescue
 PORTVERSION=	1.1.5
 CATEGORIES=	sysutils
 MASTER_SITES=	http://jbj.rapanden.dk/magicrescue/release/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 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 05d1d6ec16ee..e28f4cb916de 100644
--- a/sysutils/most/Makefile
+++ b/sysutils/most/Makefile
@@ -11,8 +11,7 @@ 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://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 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 051964d1fd10..d86f6043d6ce 100644
--- a/sysutils/rej/Makefile
+++ b/sysutils/rej/Makefile
@@ -8,9 +8,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/
+MASTER_SITES=	CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Merges patch-rejects and runs a merge program to verify the changes
diff --git a/sysutils/rej/pkg-descr b/sysutils/rej/pkg-descr
index 54ada8ee1247..52480a644d68 100644
--- a/sysutils/rej/pkg-descr
+++ b/sysutils/rej/pkg-descr
@@ -15,7 +15,5 @@ There are four basic rejects fixable via rej.
 rej also allows you to tag hunks in a reject with special processing
 hints.
 
-WWW: http://ftp.suse.com/pub/people/mason/rej/
-
 - ehaupt
 ehaupt@critical.ch
diff --git a/sysutils/screenie/Makefile b/sysutils/screenie/Makefile
index 82d0bea41f73..bfd6da74f3e1 100644
--- a/sysutils/screenie/Makefile
+++ b/sysutils/screenie/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	screenie
 PORTVERSION=	1.30.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://pubwww.fhzh.ch/~mgloor/data/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A small and lightweight screen(1) wrapper
diff --git a/sysutils/vii/Makefile b/sysutils/vii/Makefile
index 0be52e01db93..5d3bb1724b71 100644
--- a/sysutils/vii/Makefile
+++ b/sysutils/vii/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	vii
 PORTVERSION=	4.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://vii.sourceforge.net/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Execute a command repeatedly and scroll the output
diff --git a/sysutils/watchfolder/Makefile b/sysutils/watchfolder/Makefile
index 3a68a321ac85..58be5691182b 100644
--- a/sysutils/watchfolder/Makefile
+++ b/sysutils/watchfolder/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	watchfolder
 PORTVERSION=	0.3.3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://dstunrea.sdf-eu.org/files/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Watch folders for new files and process them
diff --git a/sysutils/weedit/Makefile b/sysutils/weedit/Makefile
index 66a41bb86d31..c6e000831588 100644
--- a/sysutils/weedit/Makefile
+++ b/sysutils/weedit/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	weedit
 PORTVERSION=	2.0.3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://adm1n.cjb.net/cw/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/sysutils/wuzzah/Makefile b/sysutils/wuzzah/Makefile
index 4f27ee4b9538..0f1f378e64ea 100644
--- a/sysutils/wuzzah/Makefile
+++ b/sysutils/wuzzah/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	wuzzah
 PORTVERSION=	0.53
 CATEGORIES=	sysutils
-MASTER_SITES=	http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+MASTER_SITES=	CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A command line utility for stalking users
diff --git a/sysutils/zeroer/Makefile b/sysutils/zeroer/Makefile
index 840af72e80e1..1aca8bbf01f7 100644
--- a/sysutils/zeroer/Makefile
+++ b/sysutils/zeroer/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	zeroer
 PORTVERSION=	0.1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+MASTER_SITES=	CRITICAL
 
 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 44afa5fb2c14..dbb90905abbc 100644
--- a/textproc/fldiff/Makefile
+++ b/textproc/fldiff/Makefile
@@ -9,9 +9,8 @@ PORTNAME=	fldiff
 PORTVERSION=	1.1
 PORTREVISION=	2
 CATEGORIES=	textproc
-MASTER_SITES=	http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/ \
-		http://www.easysw.com/~mike/fldiff/
+MASTER_SITES=	http://www.easysw.com/~mike/fldiff/ \
+		CRITICAL
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/textproc/htmlise/Makefile b/textproc/htmlise/Makefile
index 15490466a10d..313469b5e63f 100644
--- a/textproc/htmlise/Makefile
+++ b/textproc/htmlise/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	htmlise
 PORTVERSION=	0.2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.ex-parrot.com/~chris/stuff/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Formats plain text as HTML
diff --git a/textproc/rtf2html/Makefile b/textproc/rtf2html/Makefile
index a2d8ca5da7de..608dddf6ef4c 100644
--- a/textproc/rtf2html/Makefile
+++ b/textproc/rtf2html/Makefile
@@ -8,18 +8,15 @@
 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}
+MASTER_SITES=	CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A simple rtf2html converter
 
-CFLAGS+=	-Wall -Werror
 PLIST_FILES=	bin/rtf2html
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
 do-build:
 	${CC} ${CFLAGS} ${WRKSRC}/${PORTNAME}.c -o ${WRKSRC}/${PORTNAME}
 
diff --git a/textproc/rtf2html/distinfo b/textproc/rtf2html/distinfo
index 4ed165bcacb8..4aa692ef9c1f 100644
--- a/textproc/rtf2html/distinfo
+++ b/textproc/rtf2html/distinfo
@@ -1,3 +1,3 @@
-MD5 (rtf2html.tar.gz) = 823949bf2e1a7fc9d090fd2035b2e828
-SHA256 (rtf2html.tar.gz) = 95e0dc3c6da3031dff5e1d628607fe3d0621adf3b1df1a6fa8cf593df85cc56a
-SIZE (rtf2html.tar.gz) = 5548
+MD5 (rtf2html-1.1b.tar.gz) = 823949bf2e1a7fc9d090fd2035b2e828
+SHA256 (rtf2html-1.1b.tar.gz) = 95e0dc3c6da3031dff5e1d628607fe3d0621adf3b1df1a6fa8cf593df85cc56a
+SIZE (rtf2html-1.1b.tar.gz) = 5548
diff --git a/textproc/uni2ascii/Makefile b/textproc/uni2ascii/Makefile
index a7f80f3b23ac..a15f0d1db809 100644
--- a/textproc/uni2ascii/Makefile
+++ b/textproc/uni2ascii/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	uni2ascii
 PORTVERSION=	4.5
 CATEGORIES=	textproc
 MASTER_SITES=	http://billposer.org/Software/Downloads/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Convert between UTF-8 Unicode and 7-bit ASCII equivalents
diff --git a/www/bannerfilter/Makefile b/www/bannerfilter/Makefile
index 7cc9c825a8a0..a1cb00d21eee 100644
--- a/www/bannerfilter/Makefile
+++ b/www/bannerfilter/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	bannerfilter
 PORTVERSION=	1.31
 CATEGORIES=	www
 MASTER_SITES=	http://phroggy.com/files/unix/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A squid redirect script for filtering web banners
diff --git a/www/linklint/Makefile b/www/linklint/Makefile
index e02b091e1c2e..c0f3ce3556b4 100644
--- a/www/linklint/Makefile
+++ b/www/linklint/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	linklint
 DISTVERSION=	2.3.6.d
 CATEGORIES=	www
 MASTER_SITES=	http://www.linklint.org/download/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 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 09d227885c59..5fbc780a7921 100644
--- a/x11-clocks/lmclock/Makefile
+++ b/x11-clocks/lmclock/Makefile
@@ -10,8 +10,7 @@ PORTVERSION=	1.2
 PORTREVISION=	1
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://pantransit.reptiles.org/prog/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A Xerox Lisp machine clock clone
diff --git a/x11-themes/audacious-skins/Makefile b/x11-themes/audacious-skins/Makefile
index eeda534e9c98..f985ba7253e3 100644
--- a/x11-themes/audacious-skins/Makefile
+++ b/x11-themes/audacious-skins/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	audacious-skins
 PORTVERSION=	0.1
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+MASTER_SITES=	CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A collection of audacious skins
diff --git a/x11-themes/irssi-themes/Makefile b/x11-themes/irssi-themes/Makefile
index 21f9b26d077c..c067275340a4 100644
--- a/x11-themes/irssi-themes/Makefile
+++ b/x11-themes/irssi-themes/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	irssi-themes
 PORTVERSION=	20071213
 CATEGORIES=	x11-themes irc
 MASTER_SITES=	http://www.irssi.org/themefiles/ \
-		http://critical.ch/distfiles/${PORTNAME}/ \
-		http://energy.critical.ch/distfiles/${PORTNAME}/
+		CRITICAL
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/x11/gtk-launch/Makefile b/x11/gtk-launch/Makefile
index 115d456aba6a..3aa7190b0fd4 100644
--- a/x11/gtk-launch/Makefile
+++ b/x11/gtk-launch/Makefile
@@ -10,8 +10,7 @@ DISTVERSION=	1.1b
 PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://pierric.descamps.free.fr/pierric/downloads/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+		CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A fast GTK+ program launcher
diff --git a/x11/thinglaunch/Makefile b/x11/thinglaunch/Makefile
index f9bf2386a297..419970315d1f 100644
--- a/x11/thinglaunch/Makefile
+++ b/x11/thinglaunch/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	thinglaunch
 PORTVERSION=	1.03
 PORTREVISION=	2
 CATEGORIES=	x11
-MASTER_SITES=	http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+MASTER_SITES=	CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A very fast launcher program for X