- Provide additional mirrors where needed

- Convert to "magic" master sites
- Various minor portlint-prodded fixes

59 files changed, 64 insertions, 125 deletions

diff --git a/archivers/linux-unace/Makefile b/archivers/linux-unace/Makefile
index ddf1e9b110d6..32912439288a 100644
--- a/archivers/linux-unace/Makefile
+++ b/archivers/linux-unace/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	unace
 PORTVERSION=	2.5
 PORTEPOCH=	1
 CATEGORIES=	archivers linux
-MASTER_SITES=	http://www.winace.com/files/
+MASTER_SITES=	http://www.winace.com/files/ CSME
 PKGNAMEPREFIX=	linux-
 DISTNAME=	lin${PORTNAME}${PORTVERSION:S/.//}
 EXTRACT_SUFX=	.tgz
@@ -17,7 +17,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Extract, view & test ACE archives
 
-NO_PACKAGE=	"Distribution is permitted within the original package only"
+NO_PACKAGE=	Distribution is permitted within the original package only
 
 NO_BUILD=	yes
 PLIST_FILES=	bin/linunace
diff --git a/archivers/lzma/Makefile b/archivers/lzma/Makefile
index ab01d57e78ae..e6227d681604 100644
--- a/archivers/lzma/Makefile
+++ b/archivers/lzma/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	lzma
 PORTVERSION=	4.43
 CATEGORIES=	archivers
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	sevenzip
 DISTNAME=	lzma${PORTVERSION:S/.//g}
 
diff --git a/audio/bmp-mac/Makefile b/audio/bmp-mac/Makefile
index 8ac11d08a9d5..62d6ba709fb0 100644
--- a/audio/bmp-mac/Makefile
+++ b/audio/bmp-mac/Makefile
@@ -7,7 +7,7 @@
 PORTNAME=	mac
 PORTVERSION=	0.1.1
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
+MASTER_SITES=	SFE
 MASTER_SITE_SUBDIR=	mac-port
 PKGNAMEPREFIX=	bmp-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
diff --git a/audio/bmp-modplug/Makefile b/audio/bmp-modplug/Makefile
index 5b8b51c8ad41..82c88d3d8cf3 100644
--- a/audio/bmp-modplug/Makefile
+++ b/audio/bmp-modplug/Makefile
@@ -12,7 +12,7 @@ CATEGORIES?=	audio
 MASTER_SITES=	ftp://ftp.osuosl.org/pub/FreeBSD/distfiles/ \
 		http://ftp.osuosl.org/pub/FreeBSD/distfiles/ \
 		ftp://ftp.dvo.ru/pub/distfiles/ \
-		ftp://ftp.citkit.ru/pub/FreeBSD/distfiles/ \
+		ftp://ftp.mtu.ru/pub/FreeBSD/distfiles/ \
 		ftp://ftp.chg.ru/pub/FreeBSD/distfiles/
 PKGNAMEPREFIX=	bmp-
 DISTNAME=	${PORTNAME}${PKGNAMEPREFIX}2.05
diff --git a/audio/kexis/Makefile b/audio/kexis/Makefile
index f7c2ab76d2f6..afece7f9762d 100644
--- a/audio/kexis/Makefile
+++ b/audio/kexis/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	kexis
 PORTVERSION=	0.2.2
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	infofarmer@FreeBSD.org
diff --git a/audio/laudio/Makefile b/audio/laudio/Makefile
index 90462eabac32..b4b8935c880d 100644
--- a/audio/laudio/Makefile
+++ b/audio/laudio/Makefile
@@ -7,9 +7,8 @@
 
 PORTNAME=	laudio
 PORTVERSION=	0.4
-CATEGORIES?=	audio linux
-MASTER_SITES=	http://www.lossless-audio.com/ \
-		http://www.csme.ru/filez/
+CATEGORIES=	audio linux
+MASTER_SITES=	http://www.lossless-audio.com/ CSME
 DISTNAME=	la04
 
 MAINTAINER=	infofarmer@FreeBSD.org
diff --git a/audio/lpac/Makefile b/audio/lpac/Makefile
index 650963ffee85..bd0f22534daf 100644
--- a/audio/lpac/Makefile
+++ b/audio/lpac/Makefile
@@ -8,9 +8,7 @@
 PORTNAME=	lpac
 PORTVERSION=	1.40
 CATEGORIES=	audio linux
-MASTER_SITES=	http://bsd1.csme.ru/myports/ \
-		http://bsd2.csme.ru/myports/ \
-		http://bsd3.csme.ru/myports/
+MASTER_SITES=	CSME
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Lossless audio codec
diff --git a/audio/optimfrog/Makefile b/audio/optimfrog/Makefile
index 8153a24b33b0..26057ad3ce21 100644
--- a/audio/optimfrog/Makefile
+++ b/audio/optimfrog/Makefile
@@ -8,9 +8,7 @@
 PORTNAME=	optimfrog
 DISTVERSION=	4.520b1
 CATEGORIES=	audio linux
-MASTER_SITES=	http://bsd1.csme.ru/myports/ \
-		http://bsd2.csme.ru/myports/ \
-		http://bsd3.csme.ru/myports/
+MASTER_SITES=	CSME
 DISTNAME=	OptimFROG_All_Linux_x86_${DISTVERSION:S/.//}
 
 MAINTAINER=	infofarmer@FreeBSD.org
diff --git a/audio/p5-Audio-FLAC-Header/Makefile b/audio/p5-Audio-FLAC-Header/Makefile
index fb96f5e4a53f..99c0f1b300a0 100644
--- a/audio/p5-Audio-FLAC-Header/Makefile
+++ b/audio/p5-Audio-FLAC-Header/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Audio-FLAC-Header
 PORTVERSION=	1.4
 CATEGORIES=	audio perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Audio
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	infofarmer@FreeBSD.org
diff --git a/audio/p5-Audio-Musepack/Makefile b/audio/p5-Audio-Musepack/Makefile
index 33272881e660..20b2f8eec8de 100644
--- a/audio/p5-Audio-Musepack/Makefile
+++ b/audio/p5-Audio-Musepack/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Audio-Musepack
 PORTVERSION=	0.02
 CATEGORIES=	audio perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Audio
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	infofarmer@FreeBSD.org
diff --git a/audio/pacpl/Makefile b/audio/pacpl/Makefile
index ca7da62dda91..2a7ad1f2361b 100644
--- a/audio/pacpl/Makefile
+++ b/audio/pacpl/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	pacpl
 PORTVERSION=	3.2.0
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	pac-${PORTVERSION}
 
 MAINTAINER=	infofarmer@FreeBSD.org
diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile
index 65fd91e5308c..0e26ad32e962 100644
--- a/audio/xmms-crossfade/Makefile
+++ b/audio/xmms-crossfade/Makefile
@@ -8,10 +8,7 @@
 PORTNAME=	crossfade
 PORTVERSION=	0.3.11
 CATEGORIES=	audio
-MASTER_SITES=	http://www.eisenlohr.org/xmms-crossfade/ \
-		http://bsd1.csme.ru/myports/ \
-		http://bsd2.csme.ru/myports/ \
-		http://bsd3.csme.ru/myports/
+MASTER_SITES=	http://www.eisenlohr.org/xmms-crossfade/ CSME
 PKGNAMEPREFIX=	${APP}-
 DISTNAME=	xmms-${PORTNAME}-${PORTVERSION}
 
diff --git a/audio/xmms-modplug/Makefile b/audio/xmms-modplug/Makefile
index 177a54ba1c2c..ca3a1f50c0c9 100644
--- a/audio/xmms-modplug/Makefile
+++ b/audio/xmms-modplug/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	modplug
 PORTVERSION=	2.0.5
 PORTREVISION=	2
 CATEGORIES?=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
+MASTER_SITES=	SFE
 MASTER_SITE_SUBDIR=	${PORTNAME}-${PKGNAMEPREFIX:S/-//}
 PKGNAMEPREFIX=	xmms-
 DISTNAME=	${PORTNAME}${PKGNAMEPREFIX}2.05
diff --git a/converters/htx/Makefile b/converters/htx/Makefile
index 61057da14abf..5ed4df5027b9 100644
--- a/converters/htx/Makefile
+++ b/converters/htx/Makefile
@@ -8,10 +8,7 @@
 PORTNAME=	htx
 DISTVERSION=	0.7.7a
 CATEGORIES=	converters www
-MASTER_SITES=	http://stuff.myrealm.co.uk/htx/ \
-		http://bsd.csme.ru/myports/ \
-		http://bsd2.csme.ru/myports/ \
-		http://bsd3.csme.ru/myports/
+MASTER_SITES=	http://stuff.myrealm.co.uk/htx/ CSME
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	HTML to XHTML converter
diff --git a/databases/p5-DBIx-SQLite-Simple/Makefile b/databases/p5-DBIx-SQLite-Simple/Makefile
index 48dbedecd6c0..6a76a222fe9a 100644
--- a/databases/p5-DBIx-SQLite-Simple/Makefile
+++ b/databases/p5-DBIx-SQLite-Simple/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DBIx-SQLite-Simple
 PORTVERSION=	0.33
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBIx
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	infofarmer@FreeBSD.org
diff --git a/deskutils/bitcollider/Makefile b/deskutils/bitcollider/Makefile
index 11793e73726e..6020fb82d834 100644
--- a/deskutils/bitcollider/Makefile
+++ b/deskutils/bitcollider/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	bitcollider
 PORTVERSION=	0.6.0
 CATEGORIES=	deskutils multimedia
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	A Bitzi metadata generator
diff --git a/deskutils/when/Makefile b/deskutils/when/Makefile
index 38a469b366c3..61b21457ab37 100644
--- a/deskutils/when/Makefile
+++ b/deskutils/when/Makefile
@@ -8,9 +8,7 @@
 PORTNAME=	when
 PORTVERSION=	1.1.0
 CATEGORIES=	deskutils
-MASTER_SITES=	http://bsd1.csme.ru/myports/ \
-		http://bsd2.csme.ru/myports/ \
-		http://bsd3.csme.ru/myports/
+MASTER_SITES=	CSME
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	A very simple personal calendar
diff --git a/devel/p5-Class-Std/Makefile b/devel/p5-Class-Std/Makefile
index 9d3190a73b0f..c223093f728d 100644
--- a/devel/p5-Class-Std/Makefile
+++ b/devel/p5-Class-Std/Makefile
@@ -10,8 +10,7 @@ DISTVERSIONPREFIX=	v
 DISTVERSION=	0.0.8
 PORTREVISION=	1
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Class
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	infofarmer@FreeBSD.org
diff --git a/devel/p5-Config-Std/Makefile b/devel/p5-Config-Std/Makefile
index 06db38153615..2acb48afa5de 100644
--- a/devel/p5-Config-Std/Makefile
+++ b/devel/p5-Config-Std/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Config-Std
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.0.4
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Config
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	infofarmer@FreeBSD.org
diff --git a/devel/py-fusefs/Makefile b/devel/py-fusefs/Makefile
index 28b4066e2044..d076cce9d4f3 100644
--- a/devel/py-fusefs/Makefile
+++ b/devel/py-fusefs/Makefile
@@ -7,10 +7,8 @@
 
 PORTNAME=	fusefs
 DISTVERSION=	0.2pre1-20060720
-CATEGORIES=	audio
-MASTER_SITES=	http://bsd1.csme.ru/myports/ \
-		http://bsd2.csme.ru/myports/ \
-		http://bsd3.csme.ru/myports/
+CATEGORIES=	devel
+MASTER_SITES=	CSME
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	fuse-python-${DISTVERSION}
 
diff --git a/finance/xquote/Makefile b/finance/xquote/Makefile
index eb4654b123f4..003ec20cd187 100644
--- a/finance/xquote/Makefile
+++ b/finance/xquote/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	xquote
 PORTVERSION=	2.6.10
 CATEGORIES=	finance
-MASTER_SITES=	http://xinvest.sunsite.dk/	\
-		${MASTER_SITE_XCONTRIB}
+MASTER_SITES=	http://xinvest.sunsite.dk/ XCONTRIB
 MASTER_SITE_SUBDIR=	applications
 
 MAINTAINER=	infofarmer@FreeBSD.org
diff --git a/ftp/cmdftp/Makefile b/ftp/cmdftp/Makefile
index 3d85506c9df9..6d8d6dba05c4 100644
--- a/ftp/cmdftp/Makefile
+++ b/ftp/cmdftp/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	cmdftp
 PORTVERSION=	0.9.3
 CATEGORIES=	ftp
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Command line shell-like ftp client
diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile
index a28db605b8b5..a07b650b09ae 100644
--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	dopewars
 PORTVERSION=	1.5.12
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	A UNIX rewrite of a game originally based on "Drug Wars"
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index 6e31cc9e5957..433f710f9fa1 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -8,9 +8,7 @@
 PORTNAME=	freeciv
 PORTVERSION=	2.0.8
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable/ \
-		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable/ SF
 
 MAINTAINER?=	infofarmer@FreeBSD.org
 COMMENT?=	A civilisation clone for X11; multiplayer
diff --git a/graphics/dcraw/Makefile b/graphics/dcraw/Makefile
index 74cb8f6ae6ec..03b02767e787 100644
--- a/graphics/dcraw/Makefile
+++ b/graphics/dcraw/Makefile
@@ -8,10 +8,7 @@
 PORTNAME=	dcraw
 PORTVERSION=	8.25
 CATEGORIES=	graphics
-MASTER_SITES=	http://bsd1.csme.ru/myports/ \
-		http://bsd2.csme.ru/myports/ \
-		http://bsd3.csme.ru/myports/ \
-		http://www.piwebs.com/distfiles/${PORTNAME}/
+MASTER_SITES=	CSME
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Decoder for RAW files from digital cameras
diff --git a/graphics/synaesthesia/Makefile b/graphics/synaesthesia/Makefile
index ebf8aa2e305f..eb3253870d99 100644
--- a/graphics/synaesthesia/Makefile
+++ b/graphics/synaesthesia/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	synaesthesia
 PORTVERSION=	2.4
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.logarithmic.net/pfh-files/synaesthesia/
+MASTER_SITES=	http://www.logarithmic.net/pfh-files/synaesthesia/ CSME
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Graphically represents sound in real time
diff --git a/misc/diary-hercules/Makefile b/misc/diary-hercules/Makefile
index a5834da8aa5d..3ae79cd101d9 100644
--- a/misc/diary-hercules/Makefile
+++ b/misc/diary-hercules/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	hercules
 PORTVERSION=	0.0.3.2
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 PKGNAMEPREFIX=	diary-
 
 MAINTAINER=	infofarmer@FreeBSD.org
diff --git a/multimedia/libmpeg3/Makefile b/multimedia/libmpeg3/Makefile
index 5fcf9c5e9399..bd23e07ba4b9 100644
--- a/multimedia/libmpeg3/Makefile
+++ b/multimedia/libmpeg3/Makefile
@@ -9,13 +9,13 @@ PORTNAME=	libmpeg3
 PORTVERSION=	1.7
 DISTVERSIONSUFFIX=	-src
 CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	heroines
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Advanced editing and manipulation of MPEG streams
 
-BUILD_DEPENSD=	nasm:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 LIB_DEPENDS=	ao.3:${PORTSDIR}/audio/libao \
 		a52.0:${PORTSDIR}/audio/liba52
 
diff --git a/multimedia/p5-File-Format-RIFF/Makefile b/multimedia/p5-File-Format-RIFF/Makefile
index 601b48125b0a..545e8c712d5f 100644
--- a/multimedia/p5-File-Format-RIFF/Makefile
+++ b/multimedia/p5-File-Format-RIFF/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	File-Format-RIFF
 DISTVERSION=	1.0.1
 CATEGORIES=	multimedia perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	File
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	infofarmer@FreeBSD.org
diff --git a/multimedia/subtools/Makefile b/multimedia/subtools/Makefile
index 1d46303a1e57..d33401680151 100644
--- a/multimedia/subtools/Makefile
+++ b/multimedia/subtools/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	subtools
 PORTVERSION=	20060508
 DISTVERSIONSUFFIX=	alpha
 CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SFE
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Command-line tools for movie subtitles in SubRipper format
diff --git a/net-im/cjc/Makefile b/net-im/cjc/Makefile
index b8db1fa8eb98..d0bef0b7ed4f 100644
--- a/net-im/cjc/Makefile
+++ b/net-im/cjc/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	cjc
 PORTVERSION=	1.0.0
 CATEGORIES=	net-im python
-MASTER_SITES=	http://jabberstudio.2nw.net/cjc/
+MASTER_SITES=	http://jabberstudio.2nw.net/cjc/ CSME
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	The Console Jabber Client
diff --git a/net-im/cjc/pkg-descr b/net-im/cjc/pkg-descr
index 9844a5a800ae..25bf350d6d2a 100644
--- a/net-im/cjc/pkg-descr
+++ b/net-im/cjc/pkg-descr
@@ -3,4 +3,4 @@ library for XMPP comunication and curses for screen output. It
 is not finished yet, but still quite usable. Its user interface
 is resembling those of popular IRC clients like irssi or BitchX.
 
-WWW: http://jabberstudio.org/projects/cjc/project/view.php
+WWW: http://cjc.jajcus.net/
diff --git a/net-im/mcabber/Makefile b/net-im/mcabber/Makefile
index 044f7920fd83..2e07da5197e4 100644
--- a/net-im/mcabber/Makefile
+++ b/net-im/mcabber/Makefile
@@ -8,10 +8,7 @@
 PORTNAME=	mcabber
 PORTVERSION=	0.7.8
 CATEGORIES=	net-im
-MASTER_SITES=	http://www.lilotux.net/~mikael/mcabber/files/ \
-		http://bsd1.csme.ru/myports/ \
-		http://bsd2.csme.ru/myports/ \
-		http://bsd3.csme.ru/myports/
+MASTER_SITES=	http://www.lilotux.net/~mikael/mcabber/files/ CSME
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Small Jabber console client
diff --git a/net-im/py-xmpppy-irc/Makefile b/net-im/py-xmpppy-irc/Makefile
index 762580f27c60..e3d9c23bee09 100644
--- a/net-im/py-xmpppy-irc/Makefile
+++ b/net-im/py-xmpppy-irc/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	xmpppy-irc
 PORTVERSION=	0.3
 CATEGORIES=	net-im python irc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	xmpppy
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	irc-transport-${PORTVERSION}
diff --git a/net-im/py-xmpppy/Makefile b/net-im/py-xmpppy/Makefile
index 9075da8b77db..344dd8df437d 100644
--- a/net-im/py-xmpppy/Makefile
+++ b/net-im/py-xmpppy/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	xmpppy
 PORTVERSION=	0.3.1
 CATEGORIES=	net-im python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	infofarmer@FreeBSD.org
diff --git a/net/p5-POE-Component-Client-Ident/Makefile b/net/p5-POE-Component-Client-Ident/Makefile
index 186494ba3116..2e52f216df9b 100644
--- a/net/p5-POE-Component-Client-Ident/Makefile
+++ b/net/p5-POE-Component-Client-Ident/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	POE-Component-Client-Ident
 PORTVERSION=	1.01
 CATEGORIES=	net perl5 devel
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	POE
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	infofarmer@FreeBSD.org
diff --git a/net/radvd/Makefile b/net/radvd/Makefile
index 20b89f6e2d83..a78475a81452 100644
--- a/net/radvd/Makefile
+++ b/net/radvd/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	radvd
 PORTVERSION=	0.9.1
 CATEGORIES=	net ipv6
-MASTER_SITES=	http://www.litech.org/radvd/dist/
+MASTER_SITES=	http://www.litech.org/radvd/dist/ CSME
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	A Linux/BSD IPv6 router advertisement daemon
diff --git a/net/spoofer/Makefile b/net/spoofer/Makefile
index 4acae4cbc062..377138ad1355 100644
--- a/net/spoofer/Makefile
+++ b/net/spoofer/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	spoofer
 PORTVERSION=	0.4
 CATEGORIES=	net
-MASTER_SITES=	http://spoofer.csail.mit.edu/
+MASTER_SITES=	http://spoofer.csail.mit.edu/ CSME
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	ANA Spoofer Project testing software
diff --git a/security/parano/Makefile b/security/parano/Makefile
index 910e9b2c398f..dda7f38c8878 100644
--- a/security/parano/Makefile
+++ b/security/parano/Makefile
@@ -8,11 +8,7 @@
 PORTNAME=	parano
 PORTVERSION=	0.3.4
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_BERLIOS} \
-		http://bsd1.csme.ru/myports/ \
-		http://bsd2.csme.ru/myports/ \
-		http://bsd3.csme.ru/myports/
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	BERLIOS
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	A Gnome program to deal with hashfiles
diff --git a/security/secpanel/Makefile b/security/secpanel/Makefile
index e7762da8c6b5..2e81bbcaabfa 100644
--- a/security/secpanel/Makefile
+++ b/security/secpanel/Makefile
@@ -10,10 +10,7 @@ PORTVERSION=	0.5.1
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	security tcl84 tk84
-MASTER_SITES=	http://www.pingx.net/secpanel/ \
-		http://bsd1.csme.ru/myports/ \
-		http://bsd2.csme.ru/myports/ \
-		http://bsd3.csme.ru/myports/
+MASTER_SITES=	http://www.pingx.net/secpanel/ CSME
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	GUI for managing and running ssh and related utilities
diff --git a/sysutils/durep/Makefile b/sysutils/durep/Makefile
index cd43f90d2a9d..325bfd7a3bd5 100644
--- a/sysutils/durep/Makefile
+++ b/sysutils/durep/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	durep
 PORTVERSION=	0.9
 PORTREVISION=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.hibernaculum.net/download/ \
-		http://bsd.gubkin.ru/myports/
+MASTER_SITES=	http://www.hibernaculum.net/download/ CSME
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Utility for monitoring disk usage in a more visual way than du
diff --git a/sysutils/fusefs-curlftpfs/Makefile b/sysutils/fusefs-curlftpfs/Makefile
index fb197af1abc2..c09640ec87f0 100644
--- a/sysutils/fusefs-curlftpfs/Makefile
+++ b/sysutils/fusefs-curlftpfs/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	curlftpfs
 PORTVERSION=	0.8
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 PKGNAMEPREFIX=	fusefs-
 
 MAINTAINER=	infofarmer@FreeBSD.org
diff --git a/sysutils/unieject/Makefile b/sysutils/unieject/Makefile
index e730a909b366..0468fb6b8516 100644
--- a/sysutils/unieject/Makefile
+++ b/sysutils/unieject/Makefile
@@ -8,9 +8,7 @@
 PORTNAME=	unieject
 DISTVERSION=	5.3.2
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		${MASTER_SITE_BERLIOS}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF BERLIOS
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Eject(1) replacement
diff --git a/textproc/archmage/Makefile b/textproc/archmage/Makefile
index 0a70f70b4724..b4d284422f27 100644
--- a/textproc/archmage/Makefile
+++ b/textproc/archmage/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	archmage
 PORTVERSION=	0.0.7
 CATEGORIES=	textproc python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Extensible reader/decompiler of files in CHM format
diff --git a/textproc/p5-Text-Bastardize/Makefile b/textproc/p5-Text-Bastardize/Makefile
index 5ec5efcd54e5..130141c7fc3e 100644
--- a/textproc/p5-Text-Bastardize/Makefile
+++ b/textproc/p5-Text-Bastardize/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Text-Bastardize
 DISTVERSION=	0.06
 CATEGORIES=	textproc perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Text
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	infofarmer@FreeBSD.org
diff --git a/textproc/p5-Unicode-CheckUTF8/Makefile b/textproc/p5-Unicode-CheckUTF8/Makefile
index 976f18593b45..75b6936701f0 100644
--- a/textproc/p5-Unicode-CheckUTF8/Makefile
+++ b/textproc/p5-Unicode-CheckUTF8/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Unicode-CheckUTF8
 DISTVERSION=	1.01
 CATEGORIES=	textproc perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Unicode
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	infofarmer@FreeBSD.org
diff --git a/textproc/redet/Makefile b/textproc/redet/Makefile
index c307ea8bc3ac..ba7f77c6cbe5 100644
--- a/textproc/redet/Makefile
+++ b/textproc/redet/Makefile
@@ -8,9 +8,7 @@
 PORTNAME=	redet
 PORTVERSION=	8.13
 CATEGORIES=	textproc tk84
-MASTER_SITES=	http://bsd1.csme.ru/myports/ \
-		http://bsd2.csme.ru/myports/ \
-		http://bsd3.csme.ru/myports/
+MASTER_SITES=	CSME
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Visual regexp development and execution
diff --git a/www/aria2/Makefile b/www/aria2/Makefile
index 569f3dbae533..8fde3155544e 100644
--- a/www/aria2/Makefile
+++ b/www/aria2/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	aria2
 DISTVERSION=	0.6.0+1
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Yet another download tool
diff --git a/www/conkeror/Makefile b/www/conkeror/Makefile
index fefa820001ce..901e4589dd82 100644
--- a/www/conkeror/Makefile
+++ b/www/conkeror/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	conkeror
 PORTVERSION=	0.33
 DISTVERSIONPREFIX=	firefox-
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_MOZDEV}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	MOZDEV
 PKGNAMEPREFIX?=
 
 MAINTAINER=	infofarmer@FreeBSD.org
diff --git a/www/linux-seamonkey/Makefile.common b/www/linux-seamonkey/Makefile.common
index 98b3eeee1bf9..3bd5e23c5d1c 100644
--- a/www/linux-seamonkey/Makefile.common
+++ b/www/linux-seamonkey/Makefile.common
@@ -6,7 +6,7 @@
 #
 
 CATEGORIES+=	linux
-MASTER_SITES?=	${MASTER_SITE_MOZILLA}
+MASTER_SITES?=	MOZILLA
 MASTER_SITE_SUBDIR?=	${PORTNAME}/releases/${PORTVERSION}
 PKGNAMEPREFIX?=		linux-
 
diff --git a/www/py-openssl-proxy/Makefile b/www/py-openssl-proxy/Makefile
index be865c9f3c09..5fc8c402ba54 100644
--- a/www/py-openssl-proxy/Makefile
+++ b/www/py-openssl-proxy/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	openssl-proxy
 PORTVERSION=	0.1
 CATEGORIES=	www security
-MASTER_SITES=	http://richard.jones.name/google-hacks/gmail-filesystem/
+MASTER_SITES=	http://richard.jones.name/google-hacks/gmail-filesystem/ CSME
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pyOpenSSLProxy-${PORTVERSION}
 
diff --git a/www/xpi-conkeror/Makefile b/www/xpi-conkeror/Makefile
index fefa820001ce..901e4589dd82 100644
--- a/www/xpi-conkeror/Makefile
+++ b/www/xpi-conkeror/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	conkeror
 PORTVERSION=	0.33
 DISTVERSIONPREFIX=	firefox-
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_MOZDEV}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	MOZDEV
 PKGNAMEPREFIX?=
 
 MAINTAINER=	infofarmer@FreeBSD.org
diff --git a/www/xpi-greasemonkey/Makefile b/www/xpi-greasemonkey/Makefile
index acff740eca01..b4d723d08f0d 100644
--- a/www/xpi-greasemonkey/Makefile
+++ b/www/xpi-greasemonkey/Makefile
@@ -7,8 +7,8 @@
 
 PORTNAME=	greasemonkey
 PORTVERSION=	0.6.5.20060727
-CATEGORIES=	www
 DISTVERSIONSUFFIX=	-fx
+CATEGORIES=	www
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Add bits of DHTML to any web page to change its behavior
diff --git a/www/xpi-joga/Makefile b/www/xpi-joga/Makefile
index b38a4e22168f..2db75b65c775 100644
--- a/www/xpi-joga/Makefile
+++ b/www/xpi-joga/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	joga
 PORTVERSION=	1.5
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_CSME}
+MASTER_SITES=	CSME
 # The unversioned dist is at http://dl.google.com/firefox/joga/companion.xpi
 # The update RDF is at http://tools.google.com/firefox/joga/update.rdf
 
diff --git a/www/xpi-mldonkey/Makefile b/www/xpi-mldonkey/Makefile
index 8a3afab97797..60fe27fda4d1 100644
--- a/www/xpi-mldonkey/Makefile
+++ b/www/xpi-mldonkey/Makefile
@@ -8,12 +8,12 @@
 PORTNAME=	mldonkey
 PORTVERSION=	1.7
 CATEGORIES=	www net-p2p
-MASTER_SITES=	http://www.informatik.uni-oldenburg.de/~dyna/${PORTNAME}/${PORTVERSION}/
-DISTNAME=	mldonkey_protocol_handler-${PORTVERSION}
+MASTER_SITES=	http://www.informatik.uni-oldenburg.de/~dyna/${PORTNAME}/${PORTVERSION}/ CSME
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	A ed2k, magnet and sig2dat protocol handling extension
 
+XPI_DISTNAME=	mldonkey_protocol_handler
 XPI_ID=		{bc72206d-b3ce-4b49-88b9-d59b388a0cde}
 XPI_FILES=	components/ed2kprotocol.js contents.rdf install.js install.rdf chrome.manifest
 XPI_DIRS=	components
diff --git a/www/xpi-tabletools/Makefile b/www/xpi-tabletools/Makefile
index 75b8f38c6cb9..91a540b31ed6 100644
--- a/www/xpi-tabletools/Makefile
+++ b/www/xpi-tabletools/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	tabletools
 PORTVERSION=	0.1.3
 DISTVERSIONSUFFIX=	-fx
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_CSME}
+MASTER_SITES=	CSME
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Sort any HTML data table
diff --git a/www/yabb/Makefile b/www/yabb/Makefile
index 7736580135c8..ec75c9d1a31c 100644
--- a/www/yabb/Makefile
+++ b/www/yabb/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	yabb
 PORTVERSION=	2.1
 PORTREVISION=	2
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SFE
 DISTNAME=	YaBB_${PORTVERSION}
 
 MAINTAINER=	infofarmer@FreeBSD.org
diff --git a/x11-toolkits/otk/Makefile b/x11-toolkits/otk/Makefile
index 47640b1d05be..8ebd04f49ac9 100644
--- a/x11-toolkits/otk/Makefile
+++ b/x11-toolkits/otk/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	otk
 PORTVERSION=	0.53
 CATEGORIES=	x11-toolkits graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_lib_${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile
index 0dce65907c9f..a801829ba9b6 100644
--- a/x11/workrave/Makefile
+++ b/x11/workrave/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	workrave
 PORTVERSION=	1.8.3
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	A Gnome RSI prevention tool