- Switch SourceForge ports to the new File Release System: categories starting with E,F

21 files changed, 32 insertions, 37 deletions

diff --git a/ftp/bftpd/Makefile b/ftp/bftpd/Makefile
index fd985baaee3a..ce40ba6771a3 100644
--- a/ftp/bftpd/Makefile
+++ b/ftp/bftpd/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	bftpd
 PORTVERSION=	2.3
 CATEGORIES=	ftp
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	beech@FreeBSD.org
 COMMENT=	Very configurable FTP server that can do chroot easily
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index b325a9e771be..a0434af31c0c 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	7.19.6
 PORTREVISION=	1
 CATEGORIES=	ftp ipv6 www
 MASTER_SITES=	http://curl.haxx.se/download/ \
-		${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.sunet.se/pub/www/utilities/curl/ \
 		ftp://ftp.fu-berlin.de/pub/unix/network/curl/ \
 		ftp://crydee.sai.msu.ru/zeus/unix/WWW/tools/mirror/
diff --git a/ftp/dmachine/Makefile b/ftp/dmachine/Makefile
index 9bdf9139cca9..1daf444f6406 100644
--- a/ftp/dmachine/Makefile
+++ b/ftp/dmachine/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	dmachine
 PORTVERSION=	0.22
 PORTREVISION=	2
 CATEGORIES=	ftp java
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//}
 
 MAINTAINER=	beech@FreeBSD.org
diff --git a/ftp/filezilla/Makefile b/ftp/filezilla/Makefile
index 59343d3f8987..d8eca9e892ac 100644
--- a/ftp/filezilla/Makefile
+++ b/ftp/filezilla/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	filezilla
 PORTVERSION=	3.2.6.1
 PORTREVISION=	2
 CATEGORIES=	ftp
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/FileZilla_Client/${PORTVERSION}
 DISTNAME=	FileZilla_${PORTVERSION}_src
 
 MAINTAINER=	jsa@wickedmachine.net
diff --git a/ftp/frox/Makefile b/ftp/frox/Makefile
index cfe2ab16a457..01d62aba6ddc 100644
--- a/ftp/frox/Makefile
+++ b/ftp/frox/Makefile
@@ -11,8 +11,9 @@ PORTREVISION=	2
 CATEGORIES=	ftp
 MASTER_SITES=	http://www.hollo.org/frox/download/ \
 		http://frox.sourceforge.net/download/ \
-		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+
+		SF		
+
 
 MAINTAINER=	sem@FreeBSD.org
 COMMENT=	Transparent FTP proxy with caching support
diff --git a/ftp/jftp/Makefile b/ftp/jftp/Makefile
index cb5ca0a0d634..40877575d88f 100644
--- a/ftp/jftp/Makefile
+++ b/ftp/jftp/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	jftp
 PORTVERSION=	1.51
 CATEGORIES=	ftp java
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	j-ftp
+MASTER_SITES=	SF/j-ftp/${PORTNAME}/${PORTVERSION}
 DISTNAME=	j-ftp-${PORTVERSION}
 
 MAINTAINER=	beech@FreeBSD.org
diff --git a/ftp/kbear/Makefile b/ftp/kbear/Makefile
index 7ffa93d9604f..c27f6af5cf0f 100644
--- a/ftp/kbear/Makefile
+++ b/ftp/kbear/Makefile
@@ -8,8 +8,7 @@ PORTNAME=		kbear
 PORTVERSION=		3.0.a.1
 PORTREVISION=	9
 CATEGORIES=		ftp kde
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/3.0alpha1
 DISTNAME=		${PORTNAME}-${PORTVERSION:S/.a.1/alpha1b/}-1.src
 
 PATCH_SITES=		http://www.brueffer.de/distfiles/
diff --git a/ftp/multiget/Makefile b/ftp/multiget/Makefile
index a4b06e99c9ee..267839bb792a 100644
--- a/ftp/multiget/Makefile
+++ b/ftp/multiget/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	multiget
 PORTVERSION=	1.1.3
 PORTREVISION=	3
 CATEGORIES=	ftp www
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/OldFiles
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	An http/ftp downloader with a nice GUI
diff --git a/ftp/paraget/Makefile b/ftp/paraget/Makefile
index 2472a08d2781..49a3935697a0 100644
--- a/ftp/paraget/Makefile
+++ b/ftp/paraget/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	paraget
 PORTVERSION=	0.3.0
 PORTREVISION=	1
 CATEGORIES=	ftp perl5
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ijliao@FreeBSD.org
 COMMENT=	Parallel ftp-fetching program
diff --git a/ftp/pavuk/Makefile b/ftp/pavuk/Makefile
index 03324a165056..c71d5ace1e60 100644
--- a/ftp/pavuk/Makefile
+++ b/ftp/pavuk/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	pavuk
 PORTVERSION=	0.9.35
 PORTREVISION=	2
 CATEGORIES=	ftp www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	HTTP, FTP and Gopher mirroring tool
diff --git a/ftp/phpwebftp/Makefile b/ftp/phpwebftp/Makefile
index ea4c18ab1c21..33e0b8fcbbdb 100644
--- a/ftp/phpwebftp/Makefile
+++ b/ftp/phpwebftp/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	phpwebftp
 PORTVERSION=	3.3
 PORTREVISION=	1
 CATEGORIES=	ftp
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/OldFiles
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
 
 MAINTAINER=	acm@FreeBSD.org
diff --git a/ftp/pure-ftpd/Makefile b/ftp/pure-ftpd/Makefile
index d9fdc136bcb5..f0a67bf8a364 100644
--- a/ftp/pure-ftpd/Makefile
+++ b/ftp/pure-ftpd/Makefile
@@ -10,15 +10,23 @@ PORTVERSION=	1.0.22
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	http://download.pureftpd.org/pub/pure-ftpd/releases/ \
 		ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/ \
+
 		ftp://ftp2.fr.pureftpd.org/pub/mirrors/ftp.fr.pureftpd.org/pub/pure-ftpd/releases/ \
+
 		ftp://ftp3.fr.pureftpd.org/pure-ftpd/releases/ \
+
 		ftp://ftp.dk.pureftpd.org/mirrors/pure-ftpd/releases/ \
+
 		ftp://ftp.es.pureftpd.org/mirror/pureftpd/latest/releases/ \
+
 		ftp://ftp.nl.pureftpd.org/pub/pure-ftpd/releases/ \
+
 		ftp://ftp.fr.pureftpd.org/pub/pure-ftpd/releases/ \
+
 		ftp://ftp.cn.pureftpd.org/pub/pureftpd/pure-ftpd/releases/ \
-		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	pureftpd
+
+		SF/pureftpd/Pure-FTPd/${PORTVERSION}		
+
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	A small, easy to set up, fast and very secure FTP server
diff --git a/ftp/pureadmin/Makefile b/ftp/pureadmin/Makefile
index c35f0cc5447a..ff9a451733a3 100644
--- a/ftp/pureadmin/Makefile
+++ b/ftp/pureadmin/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	pureadmin
 PORTVERSION=	0.4
 PORTREVISION=	2
 CATEGORIES=	ftp
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	purify
+MASTER_SITES=	SF/purify/Default/${PORTVERSION}
 
 MAINTAINER=	beech@FreeBSD.org
 COMMENT=	Management utility for the PureFTPd
diff --git a/ftp/quftp/Makefile b/ftp/quftp/Makefile
index 3495ec6d422f..3efcfa01ecd4 100644
--- a/ftp/quftp/Makefile
+++ b/ftp/quftp/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	quftp
 PORTVERSION=	1.0.7
 PORTREVISION=	3
 CATEGORIES=	ftp
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	quftp
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A scriptable FTP client
diff --git a/ftp/rexx-curl/Makefile b/ftp/rexx-curl/Makefile
index 23af800e8da6..dac4ff872b39 100644
--- a/ftp/rexx-curl/Makefile
+++ b/ftp/rexx-curl/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	curl
 PORTVERSION=	1.4
 PORTREVISION=	2
 CATEGORIES=	ftp
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	rexx${PORTNAME}
+MASTER_SITES=	SF/rexx${PORTNAME}/rexx${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	rexx-
 DISTNAME=	RexxCURL-${PORTVERSION}
 
diff --git a/ftp/smbftpd/Makefile b/ftp/smbftpd/Makefile
index fb1ddda3e6b3..a8eae665c299 100644
--- a/ftp/smbftpd/Makefile
+++ b/ftp/smbftpd/Makefile
@@ -8,9 +8,9 @@
 PORTNAME=	smbftpd
 PORTVERSION=	2.2
 CATEGORIES=	ftp
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}	\
+MASTER_SITES=	SF/${PORTNAME}/SmbFTPD/${PORTVERSION}	\
 		http://www.twbsd.org/download/download.php?file=smbftpd/
-MASTER_SITE_SUBDIR=	${PORTNAME}
+
 
 MAINTAINER=	jnlin@csie.nctu.edu.tw
 COMMENT=	FTP daemon using Samba-like share management mechanism
diff --git a/ftp/urlgfe/Makefile b/ftp/urlgfe/Makefile
index ccfe19d6e6cd..d6547aa4356f 100644
--- a/ftp/urlgfe/Makefile
+++ b/ftp/urlgfe/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	urlgfe
 PORTVERSION=	0.7.1
 PORTREVISION?=	10
 CATEGORIES=	ftp www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	urlget
+MASTER_SITES=	SF/urlget/Urlgfe%20%28legacy%29/${PORTVERSION}
 
 MAINTAINER=	chip-set@mail.ru
 COMMENT=	A download manager
diff --git a/ftp/wgetpro/Makefile b/ftp/wgetpro/Makefile
index 5eeb02a444f8..0a9d9ec98394 100644
--- a/ftp/wgetpro/Makefile
+++ b/ftp/wgetpro/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	wgetpro
 PORTVERSION=	0.1.3
 PORTREVISION=	2
 CATEGORIES=	ftp
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	stas@FreeBSD.org
diff --git a/ftp/wxdfast/Makefile b/ftp/wxdfast/Makefile
index 946dd188bcd5..a9cf2031aeb7 100644
--- a/ftp/wxdfast/Makefile
+++ b/ftp/wxdfast/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	wxdfast
 PORTVERSION=	0.6.0
 PORTREVISION=	2
 CATEGORIES=	ftp www
-MASTER_SITES=	SF/dfast
+MASTER_SITES=	SF/dfast/wxDownload%20Fast/${PORTVERSION}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	alepulver@FreeBSD.org
diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index 03031972ec0b..39ec0d05331b 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	wzdftpd
 PORTVERSION=	0.8.1
 PORTREVISION=	6
 CATEGORIES=	ftp ipv6
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-sources/${PORTNAME}-0.8
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Modular FTP server configurable online using SITE commands
diff --git a/ftp/yafc/Makefile b/ftp/yafc/Makefile
index c383c528a15c..9d5d889fff07 100644
--- a/ftp/yafc/Makefile
+++ b/ftp/yafc/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	yafc
 PORTVERSION=	1.1.1
 PORTREVISION=	1
 CATEGORIES=	ftp
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Yet another ftp client. Similar to ftp(1)