- 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)

8 files changed, 9 insertions, 14 deletions

diff --git a/textproc/colordiff/Makefile b/textproc/colordiff/Makefile
index 2a3b60ba632c..3d2d3122e0f8 100644
--- a/textproc/colordiff/Makefile
+++ b/textproc/colordiff/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	colordiff
 PORTVERSION=	1.0.8
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/version%20${PORTVERSION}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A tool to colorize diff output
diff --git a/textproc/dixit/Makefile b/textproc/dixit/Makefile
index 3efff35aba82..150c805900f4 100644
--- a/textproc/dixit/Makefile
+++ b/textproc/dixit/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	dixit
 PORTVERSION=	1.0.1
 PORTREVISION=	4
 CATEGORIES=	textproc # this should/will be romanian ;)
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR=	dixit
+MASTER_SITES=	SF
 DISTFILES=	${PORTNAME}-${PORTVERSION}.tgz ${_DB_D}
 EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tgz
 
diff --git a/textproc/ffe/Makefile b/textproc/ffe/Makefile
index f6a3896d3db7..aa9fa08e3f5b 100644
--- a/textproc/ffe/Makefile
+++ b/textproc/ffe/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	ffe
 PORTVERSION=	0.2.8
 CATEGORIES=	textproc
-MASTER_SITES=	SFE/ff-extractor
+MASTER_SITES=	SF/ff-extractor/ff-extractor/${PORTVERSION}
 
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Flat file extractor
diff --git a/textproc/jalingo/Makefile b/textproc/jalingo/Makefile
index 0e947891e5d2..78c05c13810b 100644
--- a/textproc/jalingo/Makefile
+++ b/textproc/jalingo/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.6.0
 PORTREVISION=	2
 #PORTREVISION=	0
 CATEGORIES=	textproc java
-MASTER_SITES=	SFE
+MASTER_SITES=	SF/${PORTNAME}/JaLingo/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 EXTRACT_SUFX=	.7z
 
diff --git a/textproc/py-tvgrab/Makefile b/textproc/py-tvgrab/Makefile
index c1a2ba973648..afd2ffe36f9a 100644
--- a/textproc/py-tvgrab/Makefile
+++ b/textproc/py-tvgrab/Makefile
@@ -9,10 +9,9 @@ PORTNAME=	TVGrab
 PORTVERSION=	0.5.1
 PORTREVISION=	3
 CATEGORIES=	textproc python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR=	pytvgrab
+MASTER_SITES=	SF/py${PORTNAME:L}/lib/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${MASTER_SITE_SUBDIR}-lib-${PORTVERSION}
+DISTNAME=	pytvgrab-lib-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A xmltv python library to write grabbers of tv scheduling collections
diff --git a/textproc/refdb/Makefile b/textproc/refdb/Makefile
index 0dbc82ecc0a1..00b0f7581815 100644
--- a/textproc/refdb/Makefile
+++ b/textproc/refdb/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	refdb
 PORTVERSION=	0.9.9
 PORTREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	SFE
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTNAME}-src-${PORTVERSION}-1
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/textproc/saxon/Makefile b/textproc/saxon/Makefile
index f47827e38acb..18dd91a651e5 100644
--- a/textproc/saxon/Makefile
+++ b/textproc/saxon/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	saxon
 PORTVERSION=	6.5.4
 PORTREVISION=	2
 CATEGORIES=	textproc java
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR=	saxon
+MASTER_SITES=	SF/${PORTNAME}/OldFiles/${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION:S/./-/g}
 
 MAINTAINER=	hq@FreeBSD.org
diff --git a/textproc/xmlstarlet/Makefile b/textproc/xmlstarlet/Makefile
index 6baaeef85db4..c2edf4a114ce 100644
--- a/textproc/xmlstarlet/Makefile
+++ b/textproc/xmlstarlet/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	xmlstarlet
 PORTVERSION=	1.0.1
 PORTREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR=	xmlstar
+MASTER_SITES=	SF/xmlstar/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Command Line XML Toolkit