14 files changed, 13 insertions, 29 deletions

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