- Retire MASTER_SITE_SOURCEFORGE_EXTENDED, it's no longer needed - all mirrors actually have all distfiles

- Merge all SF mirrors to MASTER_SITE_SOURCEFORGE, resort according to quick download speed survey
- Fix MASTER_SITES for all port that have used SOURCEFORGE_EXTENTED

Approved by:	portmgr (pav)

12 files changed, 12 insertions, 17 deletions

diff --git a/www/aria2/Makefile b/www/aria2/Makefile
index 23f0446acb18..5d95f7f43119 100644
--- a/www/aria2/Makefile
+++ b/www/aria2/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	aria2
 DISTVERSION=	1.5.0
 CATEGORIES=	www
-MASTER_SITES=	SFE
+MASTER_SITES=	SF/${PORTNAME}/stable/archives/${PORTNAME}-${PORTVERSION}
 DISTNAME=	${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	miwi@FreeBSD.org
diff --git a/www/aria2fe/Makefile b/www/aria2fe/Makefile
index edf7753d0216..dadb15f9f0c0 100644
--- a/www/aria2fe/Makefile
+++ b/www/aria2fe/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	aria2fe
 DISTVERSION=	0.0.5
 PORTREVISION=	2
 CATEGORIES=	www
-MASTER_SITES=	SFE
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Aria2 QT front-end
diff --git a/www/eyeos/Makefile b/www/eyeos/Makefile
index dfe6c77c4a1b..00ac1e9ee65a 100644
--- a/www/eyeos/Makefile
+++ b/www/eyeos/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	eyeOS
 DISTVERSION=	0.9.3-5
 CATEGORIES=	www
-MASTER_SITES=	SFE
+MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME:L}/0.9.3-5
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Web Based Desktop System
diff --git a/www/hastymail/Makefile b/www/hastymail/Makefile
index f60965b0bbf0..41871e3b839a 100644
--- a/www/hastymail/Makefile
+++ b/www/hastymail/Makefile
@@ -9,8 +9,7 @@ PORTNAME=		hastymail
 PORTVERSION=		1.5
 PORTREVISION=		3
 CATEGORIES=		www
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR=	hastymail
+MASTER_SITES=		SF/${PORTNAME}/OldFiles
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Small, fast and secure yet powerful IMAP webmail
diff --git a/www/hastymail2-devel/Makefile b/www/hastymail2-devel/Makefile
index f60965b0bbf0..41871e3b839a 100644
--- a/www/hastymail2-devel/Makefile
+++ b/www/hastymail2-devel/Makefile
@@ -9,8 +9,7 @@ PORTNAME=		hastymail
 PORTVERSION=		1.5
 PORTREVISION=		3
 CATEGORIES=		www
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR=	hastymail
+MASTER_SITES=		SF/${PORTNAME}/OldFiles
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Small, fast and secure yet powerful IMAP webmail
diff --git a/www/hastymail2/Makefile b/www/hastymail2/Makefile
index f60965b0bbf0..41871e3b839a 100644
--- a/www/hastymail2/Makefile
+++ b/www/hastymail2/Makefile
@@ -9,8 +9,7 @@ PORTNAME=		hastymail
 PORTVERSION=		1.5
 PORTREVISION=		3
 CATEGORIES=		www
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR=	hastymail
+MASTER_SITES=		SF/${PORTNAME}/OldFiles
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Small, fast and secure yet powerful IMAP webmail
diff --git a/www/mod_fcgid/Makefile b/www/mod_fcgid/Makefile
index 621df1428fcd..1da1f6382bad 100644
--- a/www/mod_fcgid/Makefile
+++ b/www/mod_fcgid/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	mod_fcgid
 PORTVERSION=	2.2
 CATEGORIES=	www
-MASTER_SITES=	SFE
-MASTER_SITE_SUBDIR=	${PORTNAME:S/_/-/}
+MASTER_SITES=	SF/mod-fcgid/OldFiles
 DISTNAME=	${PORTNAME}.${PORTVERSION}
 
 MAINTAINER=	hemi@puresimplicity.net
diff --git a/www/netrik/Makefile b/www/netrik/Makefile
index 8fa977f7bfdb..fd47b2862793 100644
--- a/www/netrik/Makefile
+++ b/www/netrik/Makefile
@@ -10,7 +10,7 @@
 PORTNAME=	netrik
 PORTVERSION=	1.16.1
 CATEGORIES=	www
-MASTER_SITES=	SFE
+MASTER_SITES=	SF/${PORTNAME}/stable/${PORTVERSION}%20%28beta%29
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	A text web browser, very ambitious, in active development
diff --git a/www/pebble/Makefile b/www/pebble/Makefile
index c3df2ff78d37..ca00043da181 100644
--- a/www/pebble/Makefile
+++ b/www/pebble/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	pebble
 PORTVERSION=	2.3.2
 PORTREVISION=	1
 CATEGORIES=	www java
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR=	pebble
+MASTER_SITES=	SF
 
 MAINTAINER=	hq@FreeBSD.org
 COMMENT=	Lightweight, open source, Java EE blogging tool
diff --git a/www/rssowl/Makefile b/www/rssowl/Makefile
index 1b23f7768ee6..f766e7af9425 100644
--- a/www/rssowl/Makefile
+++ b/www/rssowl/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	rssowl
 PORTVERSION=	1.2.3
 PORTREVISION=	5
 CATEGORIES=	www java
-MASTER_SITES=	SFE
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20classic%20%28dont%20use%29/${PORTVERSION}
 DISTNAME=	rssowl_${PORTVERSION:S|.|_|g}_src
 
 MAINTAINER=	m.sund@arcor.de
diff --git a/www/wsmake/Makefile b/www/wsmake/Makefile
index e0334a232ddb..54f70a358567 100644
--- a/www/wsmake/Makefile
+++ b/www/wsmake/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	wsmake
 PORTVERSION=	0.7.901
 CATEGORIES=	www
-MASTER_SITES=	SFE
+MASTER_SITES=	SF/${PORTNAME}/OldFiles
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Software for production and maintenance of web sites
diff --git a/www/yabb/Makefile b/www/yabb/Makefile
index 7ef195a58407..8b21beb601e8 100644
--- a/www/yabb/Makefile
+++ b/www/yabb/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	yabb
 PORTVERSION=	2.1
 PORTREVISION=	2
 CATEGORIES=	www
-MASTER_SITES=	SFE
+MASTER_SITES=	SF/${PORTNAME}/YaBB%202/${PORTVERSION}
 DISTNAME=	YaBB_${PORTVERSION}
 
 MAINTAINER=	rodrigo@bebik.net