- 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, 8 insertions, 15 deletions

diff --git a/audio/adplay/Makefile b/audio/adplay/Makefile
index f0e008114194..ea0ea02bbb11 100644
--- a/audio/adplay/Makefile
+++ b/audio/adplay/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	adplay
 PORTVERSION=	1.6
 PORTREVISION=	1
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR=	adplug
+MASTER_SITES=	SF/adplug/AdPlay_UNIX/${PORTVERSION}
 DISTFILES=	${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${EXTRACT_SUFX} \
 		${DBFILE}
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${EXTRACT_SUFX}
diff --git a/audio/bmp-fc/Makefile b/audio/bmp-fc/Makefile
index 46e6af4223c7..600a27db75c6 100644
--- a/audio/bmp-fc/Makefile
+++ b/audio/bmp-fc/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	bmp-fc
 PORTVERSION=	0.1
 PORTREVISION=	4
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR=	xmms-fc
+MASTER_SITES=	SF/xmms-fc/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A Future Composer input plug-in for beep-media-player
diff --git a/audio/k3bmonkeyaudioplugin/Makefile b/audio/k3bmonkeyaudioplugin/Makefile
index 35350635d454..f680fde464fe 100644
--- a/audio/k3bmonkeyaudioplugin/Makefile
+++ b/audio/k3bmonkeyaudioplugin/Makefile
@@ -8,8 +8,7 @@ PORTNAME=	k3bmonkeyaudioplugin
 PORTVERSION=	3.1
 PORTREVISION=	3
 CATEGORIES=	audio kde
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR=	k3b
+MASTER_SITES=	SF/k3b/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	markus@FreeBSD.org
 COMMENT=	K3b plugin for Monkey's Audio files
diff --git a/audio/libadplug/Makefile b/audio/libadplug/Makefile
index fd7b6c6c2603..c6c71c98322f 100644
--- a/audio/libadplug/Makefile
+++ b/audio/libadplug/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	libadplug
 PORTVERSION=	2.1
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR=	adplug
+MASTER_SITES=	SF/adplug/AdPlug%20core%20library/${PORTVERSION}
 DISTNAME=	adplug-${PORTVERSION}
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/audio/pacpl/Makefile b/audio/pacpl/Makefile
index 599b9819bc97..e2ff69a0d070 100644
--- a/audio/pacpl/Makefile
+++ b/audio/pacpl/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	pacpl
 PORTVERSION=	4.0.5
 CATEGORIES=	audio
-MASTER_SITES=	SFE
+MASTER_SITES=	SF
 
 MAINTAINER=	hideo@lastamericanempire.com
 COMMENT=	Perl Audio Converter
diff --git a/audio/xmms-ahx/Makefile b/audio/xmms-ahx/Makefile
index 93940b3ce48f..dfc31a216e0b 100644
--- a/audio/xmms-ahx/Makefile
+++ b/audio/xmms-ahx/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	xmms-ahx
 PORTVERSION=	0.6
 PORTREVISION=	4
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}.tar.gz
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	XMMS plugin for playing AHX tunes
diff --git a/audio/xmms-modplug/Makefile b/audio/xmms-modplug/Makefile
index 502f1cefcc58..d5d1ff7ea8f9 100644
--- a/audio/xmms-modplug/Makefile
+++ b/audio/xmms-modplug/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	modplug
 PORTVERSION=	2.0.5
 PORTREVISION=	5
 CATEGORIES?=	audio
-MASTER_SITES=	SFE
-MASTER_SITE_SUBDIR=	${PORTNAME}-${PKGNAMEPREFIX:S/-//}
+MASTER_SITES=	SF/${PORTNAME}-xmms/${PORTNAME}-xmms/2.05
 PKGNAMEPREFIX=	xmms-
 DISTNAME=	${PORTNAME}${PKGNAMEPREFIX}2.05
 
diff --git a/audio/xmms-xymms/Makefile b/audio/xmms-xymms/Makefile
index 4d39f48b196a..0c0ea610aa35 100644
--- a/audio/xmms-xymms/Makefile
+++ b/audio/xmms-xymms/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	xymms
 DISTVERSION=	0.9.1
 PORTREVISION=	4
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 PKGNAMEPREFIX=	xmms-
 
 MAINTAINER=	ehaupt@FreeBSD.org