- Provide additional mirrors where needed

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

10 files changed, 11 insertions, 15 deletions

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