- Switch SourceForge ports to the new File Release System: categories starting with N

author: Dmitry Marakasov <amdmi3@FreeBSD.org> 2009-08-22 00:32:25 +0000
committer: Dmitry Marakasov <amdmi3@FreeBSD.org> 2009-08-22 00:32:25 +0000
commit: 7914161a414ec0a620f9de779057c9fe0a80343d (patch)
tree: a4cb00a0087b36d6067c707189e054581a0f12cf /net
parent: - Switch SourceForge ports to the new File Release System: categories startin... (diff)
149 files changed, 152 insertions, 276 deletions
diff --git a/net/arpdig/Makefile b/net/arpdig/Makefile
index 714abadd0952..5ad58f61c39d 100644
--- a/net/arpdig/Makefile
+++ b/net/arpdig/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	arpdig
 PORTVERSION=	0.5.2
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	marck@FreeBSD.org
 COMMENT=	ARP Digger utility
diff --git a/net/arprelease/Makefile b/net/arprelease/Makefile
index 9e7d92bc7bc8..fa35f43f59d9 100644
--- a/net/arprelease/Makefile
+++ b/net/arprelease/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	arprelease
 PORTVERSION=	1.2
 PORTREVISION=	2
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Libnet tool to flush arp cache entries from devices (eg. routers)
diff --git a/net/asfrecorder/Makefile b/net/asfrecorder/Makefile
index e4741d763d46..a213cfd1da79 100644
--- a/net/asfrecorder/Makefile
+++ b/net/asfrecorder/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	asfrecorder
 PORTVERSION=	1.1.20010307
 CATEGORIES=	net audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	asfrecorder
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/1.1
 DISTNAME=	ASFRecorder
 
 MAINTAINER= 	ports@FreeBSD.org
diff --git a/net/bittwist/Makefile b/net/bittwist/Makefile
index e2d4ab093136..6c88ff4d2f65 100644
--- a/net/bittwist/Makefile
+++ b/net/bittwist/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	bittwist
 PORTVERSION=	1.0
 CATEGORIES=	net
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/_BSD/Bit-Twist%20${PORTVERSION}
 DISTNAME=	${PORTNAME}-bsd-${PORTVERSION}
 
 MAINTAINER=	wxs@FreeBSD.org
diff --git a/net/ccxstream/Makefile b/net/ccxstream/Makefile
index 46d4526db8d3..b91ea1ea7934 100644
--- a/net/ccxstream/Makefile
+++ b/net/ccxstream/Makefile
@@ -9,8 +9,7 @@ PORTNAME=		ccxstream
 PORTVERSION=		1.0.15
 PORTREVISION=		1
 CATEGORIES=		net
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	xbplayer
+MASTER_SITES=		SF/xbplayer/XStream%20Servers/ccXStream%20${PORTVERSION}%20for%20Linux
 
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		Stream media files to XBox Media Center via XBMSP
diff --git a/net/clusterit/Makefile b/net/clusterit/Makefile
index 66a953a35f8b..cb19d5b85855 100644
--- a/net/clusterit/Makefile
+++ b/net/clusterit/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	clusterit
 PORTVERSION=	2.5
 CATEGORIES=	net devel parallel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	A collection of clustering tools
diff --git a/net/cryptcat/Makefile b/net/cryptcat/Makefile
index 10d22f173340..cfad64014561 100644
--- a/net/cryptcat/Makefile
+++ b/net/cryptcat/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	cryptcat
 PORTVERSION=	1.2.1
 PORTEPOCH=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-unix-1.2/${PORTNAME}-unix-${PORTVERSION}
 DISTNAME=	${PORTNAME}-unix-${PORTVERSION}
 EXTRACT_SUFX=	.tar
 
diff --git a/net/cyphesis/Makefile b/net/cyphesis/Makefile
index 2ae3548721aa..8d789dcbf766 100644
--- a/net/cyphesis/Makefile
+++ b/net/cyphesis/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	cyphesis
 PORTVERSION=	0.5.20
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=worldforge
+MASTER_SITES=	SF/worldforge/${PORTNAME}%20%28server%29/${PORTVERSION}
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A server for WorldForge games
diff --git a/net/dhcp6/Makefile b/net/dhcp6/Makefile
index c43ad0fccef3..4677c022e7a4 100644
--- a/net/dhcp6/Makefile
+++ b/net/dhcp6/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	dhcp6
 PORTVERSION=	20080615
 PORTREVISION=	1
 CATEGORIES=	net ipv6
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	wide-dhcpv6
+MASTER_SITES=	SF/wide-dhcpv6/wide-dhcpv6/wide-dhcpv6-${PORTVERSION}
 DISTNAME=	wide-dhcpv6-${PORTVERSION}
 
 MAINTAINER=	suz@FreeBSD.org
diff --git a/net/dictd/Makefile b/net/dictd/Makefile
index 732828288369..43cee016a78d 100644
--- a/net/dictd/Makefile
+++ b/net/dictd/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	dictd
 PORTVERSION=	1.11.1
 CATEGORIES+=	net textproc
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=		dict
+MASTER_SITES=	SF/dict/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER?=	clsung@FreeBSD.org
 COMMENT=	Dict protocol (RFC 2229) server
diff --git a/net/easysoap/Makefile b/net/easysoap/Makefile
index 5566e5e8bd7b..18b2cb38f69f 100644
--- a/net/easysoap/Makefile
+++ b/net/easysoap/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	easysoap
 PORTVERSION=	0.8.0
 PORTREVISION=	3
 CATEGORIES=	net
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/SWANSONG
 DISTNAME=	EasySoap++-${PORTVERSION}
 
 MAINTAINER=	glarkin@FreeBSD.org
diff --git a/net/empty/Makefile b/net/empty/Makefile
index 50bc5593b4eb..cde4b616a136 100644
--- a/net/empty/Makefile
+++ b/net/empty/Makefile
@@ -7,7 +7,7 @@
 PORTNAME=	empty
 PORTVERSION=	0.6.17b
 CATEGORIES=	net
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	zmey20000@yahoo.com
diff --git a/net/frickin/Makefile b/net/frickin/Makefile
index 3ed160306ed8..6e3916567bcb 100644
--- a/net/frickin/Makefile
+++ b/net/frickin/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	frickin
 DISTVERSION=	2.0BETA2
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/OldFiles
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	asm@asm.kiev.ua
diff --git a/net/fspclient/Makefile b/net/fspclient/Makefile
index ed19d75b2edc..db64b14b7cbf 100644
--- a/net/fspclient/Makefile
+++ b/net/fspclient/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	fspclient
 PORTVERSION=	0.92.1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A ftp-like client for the FSP service
diff --git a/net/fspd/Makefile b/net/fspd/Makefile
index f9c2bee6cbd3..52ca828a5e82 100644
--- a/net/fspd/Makefile
+++ b/net/fspd/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	fspd
 PORTVERSION=	2.8.1.24
 PORTREVISION=	2
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	fsp
+MASTER_SITES=	SF/fsp/fsp/2.8.1b24
 DISTNAME=	fsp-2.8.1b24
 
 MAINTAINER=	bg1tpt@gmail.com
diff --git a/net/fsplib/Makefile b/net/fsplib/Makefile
index 1bf5d0670d3f..44a09cff2fb0 100644
--- a/net/fsplib/Makefile
+++ b/net/fsplib/Makefile
@@ -8,8 +8,7 @@ PORTNAME=	fsplib
 PORTVERSION=	0.11
 PORTREVISION=	0
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	fsp
+MASTER_SITES=	SF/fsp/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library implementing FSP protocol
diff --git a/net/gatekeeper/Makefile b/net/gatekeeper/Makefile
index a8045baa1bce..4b4f2a5aa2ca 100644
--- a/net/gatekeeper/Makefile
+++ b/net/gatekeeper/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	gatekeeper
 DISTVERSION=	2.2.4
 PORTREVISION=	3
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	openh323gk
+MASTER_SITES=	SF/openh323gk/Sources/${PORTVERSION}
 DISTNAME=	gnugk-${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/geotrace/Makefile b/net/geotrace/Makefile
index 06cb7fcfe3f5..33d9f3bc54ef 100644
--- a/net/geotrace/Makefile
+++ b/net/geotrace/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	geotrace
 PORTVERSION=	0.0.4
 PORTREVISION=	6
 CATEGORIES=	net gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/GeoTrace/${PORTVERSION}
 
 MAINTAINER=	ijliao@FreeBSD.org
 COMMENT=	Graphical traceroute utility
diff --git a/net/gini/Makefile b/net/gini/Makefile
index de02e59264e1..1cce84c2a3ca 100644
--- a/net/gini/Makefile
+++ b/net/gini/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gini
 PORTVERSION=	0.5.1
 PORTREVISION=	5
 CATEGORIES=	net multimedia
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/OldFiles
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A lightweight media streaming server
diff --git a/net/glflow/Makefile b/net/glflow/Makefile
index ea7d57e568b1..dac93f4ef621 100644
--- a/net/glflow/Makefile
+++ b/net/glflow/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	glFlow
 PORTVERSION=	0.1.4
 PORTEPOCH=	1
 CATEGORIES=	net security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	glflow
+MASTER_SITES=	SF
 DISTNAME=	glFlow-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
diff --git a/net/gnetcat/Makefile b/net/gnetcat/Makefile
index f68d68bff531..28039e2c1d03 100644
--- a/net/gnetcat/Makefile
+++ b/net/gnetcat/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gnetcat
 PORTVERSION=	0.7.1
 PORTREVISION=	2
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	netcat
+MASTER_SITES=	SF/netcat/netcat/${PORTVERSION}
 DISTNAME=	netcat-0.7.1
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/gofish/Makefile b/net/gofish/Makefile
index 841a0f1317c8..ab635d6a6478 100644
--- a/net/gofish/Makefile
+++ b/net/gofish/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	gofish
 PORTVERSION=	1.1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	kaiw27@gmail.com
 COMMENT=	GoFish Gopher Server
diff --git a/net/gq/Makefile b/net/gq/Makefile
index 4ae88ef8b56d..3174c0c56633 100644
--- a/net/gq/Makefile
+++ b/net/gq/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.3.4
 PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	net
-MASTER_SITES=	SF/gqclient
+MASTER_SITES=	SF/${PORTNAME}client/GQ%20Unstable/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK-based LDAP client
diff --git a/net/grdc-applet/Makefile b/net/grdc-applet/Makefile
index 9bded90d5a36..f0b7c4217409 100644
--- a/net/grdc-applet/Makefile
+++ b/net/grdc-applet/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	grdc
 PORTVERSION=	0.6.0
 CATEGORIES=	net gnome
-MASTER_SITES=	SF/grdc
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-gnome/${PORTVERSION}
 PKGNAMESUFFIX=	-applet
 DISTNAME=	${PORTNAME}-gnome-${PORTVERSION}
 
diff --git a/net/gspoof/Makefile b/net/gspoof/Makefile
index e5dae8db3ba0..ccc5ade13cc5 100644
--- a/net/gspoof/Makefile
+++ b/net/gspoof/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	gspoof
 PORTVERSION=	3.2
 PORTREVISION=	11
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/Gspoof-3/${PORTVERSION}
 
 MAINTAINER=	cm@therek.net
 COMMENT=	Console/GTK+ TCP/IP Packets Forger
diff --git a/net/gutenfetch/Makefile b/net/gutenfetch/Makefile
index 0d72f1d5f8b1..9ce1aa641249 100644
--- a/net/gutenfetch/Makefile
+++ b/net/gutenfetch/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	gutenfetch
 PORTVERSION=	1.5
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	gutenfetch
+MASTER_SITES=	SF
 
 MAINTAINER=	johntabularasa@users.sf.net
 COMMENT=	Fetch listings and books from Project Gutenberg
diff --git a/net/hlmaster/Makefile b/net/hlmaster/Makefile
index 20cde0bd77ec..7d5d794f3157 100644
--- a/net/hlmaster/Makefile
+++ b/net/hlmaster/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	hlmaster
 PORTVERSION=	0.9.3
 CATEGORIES=	net games
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Half-Life game master server daemon
diff --git a/net/iaxmodem/Makefile b/net/iaxmodem/Makefile
index be4c78693715..9e570e73da48 100644
--- a/net/iaxmodem/Makefile
+++ b/net/iaxmodem/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	iaxmodem
 PORTVERSION=	1.2.0
 PORTREVISION=	1
 CATEGORIES=	net comms
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	stucchi@gufi.org
 COMMENT=	Software modem that connects to IAX channel
diff --git a/net/igmpproxy/Makefile b/net/igmpproxy/Makefile
index 90c43ccef07c..3104ba7b972e 100644
--- a/net/igmpproxy/Makefile
+++ b/net/igmpproxy/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	igmpproxy
 PORTVERSION=	0.1
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-beta2
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}-beta2
 
 MAINTAINER=	melifaro@ipfw.ru
diff --git a/net/ipex/Makefile b/net/ipex/Makefile
index c91bab5f04c8..893bb49b4700 100644
--- a/net/ipex/Makefile
+++ b/net/ipex/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	ipex
 PORTVERSION=	3.0
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	ipex
+MASTER_SITES=	SF
 
 MAINTAINER=	csjp@FreeBSD.org
 COMMENT=	Packet examination / sniffer utility
diff --git a/net/iplog/Makefile b/net/iplog/Makefile
index 639dfb7fcfe8..f857043b6df1 100644
--- a/net/iplog/Makefile
+++ b/net/iplog/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	iplog
 PORTVERSION=	2.2.3
 PORTREVISION=	3
 CATEGORIES=	net security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	ojnk
+MASTER_SITES=	SF/ojnk/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	udo.schweigert@siemens.com
 COMMENT=	TCP/IP traffic logging tool
diff --git a/net/jags/Makefile b/net/jags/Makefile
index 02a06008b32f..aeccef8e7241 100644
--- a/net/jags/Makefile
+++ b/net/jags/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	jags
 PORTVERSION=	0.22.1
 PORTREVISION=	2
 CATEGORIES=	net
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/Jags/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	JAGS - Just Another GTK+ Samba Client
diff --git a/net/java-beepcore/Makefile b/net/java-beepcore/Makefile
index 67dd3942dd0c..90a2684a1ff9 100644
--- a/net/java-beepcore/Makefile
+++ b/net/java-beepcore/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	beepcore
 PORTVERSION=	0.9.08
 PORTREVISION=	3
 CATEGORIES=	net java
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	${PORTNAME}-java
+MASTER_SITES=	SF/${PORTNAME}-java/${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	java-
 EXTRACT_SUFX=	.tgz
 
diff --git a/net/jicmp/Makefile b/net/jicmp/Makefile
index 6e10c5e45b17..8d764dc27c42 100644
--- a/net/jicmp/Makefile
+++ b/net/jicmp/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	jicmp
 PORTVERSION=	1.0.9
 CATEGORIES=	net java
-MASTER_SITES=	SF/opennms
+MASTER_SITES=	SF/opennms/OldFiles
 
 MAINTAINER=	rtdean@cytherianage.net
 COMMENT=	A Java native interface (JNI) to ICMP (ping)
diff --git a/net/jrdesktop/Makefile b/net/jrdesktop/Makefile
index 7512a2009435..031e439b1c4b 100644
--- a/net/jrdesktop/Makefile
+++ b/net/jrdesktop/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	jrdesktop
 PORTVERSION=	0.2.0030
 CATEGORIES=	net java
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 
 MAINTAINER=	gahr@FreeBSD.org
diff --git a/net/kiax/Makefile b/net/kiax/Makefile
index 6f220fbef0fb..b4b14a63d4d8 100644
--- a/net/kiax/Makefile
+++ b/net/kiax/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	kiax
 PORTVERSION=	0.8.51
 PORTREVISION=	3
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src_bin.tar.gz/${PORTVERSION}%20%28Ariana%29
 DISTNAME=	kiax-${PORTVERSION}-src
 
 MAINTAINER=	kjelderg@gmail.com
diff --git a/net/kojoney/Makefile b/net/kojoney/Makefile
index f965e183ed33..a173d5f69252 100644
--- a/net/kojoney/Makefile
+++ b/net/kojoney/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	kojoney
 PORTVERSION=	0.0.4.1
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=kojoney
+MASTER_SITES=	SF/${PORTNAME}/Kojoney%20New%20Way/Kojoney%20${PORTVERSION}
 
 MAINTAINER=	systemoperator@gmail.com
 COMMENT=	A low level interaction honeypot that emulates an SSH server
diff --git a/net/l2tpd/Makefile b/net/l2tpd/Makefile
index 81110fdc1ed1..ee305c0f7b62 100644
--- a/net/l2tpd/Makefile
+++ b/net/l2tpd/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	l2tpd
 PORTVERSION=	0.69
 PORTREVISION=	3
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/L2TPd/${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
 COMMENT=	An implementation of the layer two tunneling protocol
diff --git a/net/lambdamoo/Makefile b/net/lambdamoo/Makefile
index 168cb6a6b01f..f4aa9812a372 100644
--- a/net/lambdamoo/Makefile
+++ b/net/lambdamoo/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	lambdamoo
 PORTVERSION=	1.8.1
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	LambdaMOO-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/latd/Makefile b/net/latd/Makefile
index 517f3fabf7a0..2a5dd67cbe51 100644
--- a/net/latd/Makefile
+++ b/net/latd/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	latd
 PORTVERSION=	1.25
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	linux-decnet
+MASTER_SITES=	SF/linux-decnet/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	tillman@seekingfire.com
 COMMENT=	The linux-decnet project LAT protocol suite
diff --git a/net/ldapscripts/Makefile b/net/ldapscripts/Makefile
index e386fcaef1a6..43a7aa123cfb 100644
--- a/net/ldapscripts/Makefile
+++ b/net/ldapscripts/Makefile
@@ -8,9 +8,9 @@
 PORTNAME=	ldapscripts
 PORTVERSION=	1.9.0
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
 		http://contribs.martymac.com/ldapscripts/
-MASTER_SITE_SUBDIR=	ldapscripts
+
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ganael.laplanche@martymac.com
diff --git a/net/libdnet/Makefile b/net/libdnet/Makefile
index 8de04f5a4517..b3a252e548cf 100644
--- a/net/libdnet/Makefile
+++ b/net/libdnet/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	libdnet
 PORTVERSION=	1.11
 PORTREVISION?=	3
 CATEGORIES?=	net
-MASTER_SITES=	SF
+MASTER_SITES=	SF/libdnet/libdnet/libdnet-${PORTVERSION}
 
 MAINTAINER?=	onatan@gmail.com
 COMMENT=	A simple interface to low level networking routines
diff --git a/net/libnetdude/Makefile b/net/libnetdude/Makefile
index 3588b7739f26..89a9b5461163 100644
--- a/net/libnetdude/Makefile
+++ b/net/libnetdude/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	libnetdude
 PORTVERSION=	0.10a
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	netdude
+MASTER_SITES=	SF/netdude/${PORTNAME}/0.10
 
 MAINTAINER=	brenton.chang@gmail.com
 COMMENT=	A library for manipulating libpcap/tcpdump trace files
diff --git a/net/libnids/Makefile b/net/libnids/Makefile
index 02069e16a8a8..467af6b9e008 100644
--- a/net/libnids/Makefile
+++ b/net/libnids/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	libnids
 PORTVERSION=	1.23
 CATEGORIES=	net security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	roam@FreeBSD.org
 COMMENT=	Network monitoring library with TCP/IP reassembly
diff --git a/net/libnss-mysql/Makefile b/net/libnss-mysql/Makefile
index d95115243e76..a99fdab1f756 100644
--- a/net/libnss-mysql/Makefile
+++ b/net/libnss-mysql/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	libnss-mysql
 PORTVERSION=	1.5
 PORTREVISION=	2
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	libnss-mysql
+MASTER_SITES=	SF
 
 MAINTAINER=	vd@FreeBSD.org
 COMMENT=	NSS module using a MySQL database for backend
diff --git a/net/libpcapnav/Makefile b/net/libpcapnav/Makefile
index ba485ad35978..f1e27c5fdecb 100644
--- a/net/libpcapnav/Makefile
+++ b/net/libpcapnav/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	libpcapnav
 PORTVERSION=	0.8
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	netdude
+MASTER_SITES=	SF/netdude/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	brenton.chang@gmail.com
 COMMENT=	A libpcap wrapper library
diff --git a/net/librsync/Makefile b/net/librsync/Makefile
index 212aa71f0e7a..2612deb5cda4 100644
--- a/net/librsync/Makefile
+++ b/net/librsync/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	librsync
 PORTVERSION=	0.9.7
 PORTREVISION=	2
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for delta compression of streams
diff --git a/net/libsocketcpp/Makefile b/net/libsocketcpp/Makefile
index 8311d7e7030c..fc6cff79e993 100644
--- a/net/libsocketcpp/Makefile
+++ b/net/libsocketcpp/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	libsocketcpp
 PORTVERSION=	1.0.7
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	libsocket
+MASTER_SITES=	SF/libsocket/${PORTNAME}-stable/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A C++ wrapper library to the sockets
diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index 5925866d380b..880ce4a0bf45 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	liferea
 PORTVERSION=	1.4.28
 PORTREVISION=	2
 CATEGORIES=	net gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	liferea
+MASTER_SITES=	SF/${PORTNAME}/Liferea%20Stable/${PORTVERSION}
 
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Simple RSS/RDF feed reader
diff --git a/net/linknx/Makefile b/net/linknx/Makefile
index 8feade116f43..1b973a2f7929 100644
--- a/net/linknx/Makefile
+++ b/net/linknx/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	linknx
 PORTVERSION=	0.0.1.25
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	bkoenig@alpha-tierchen.de
 COMMENT=	Rule-based event handling in a KNX installation
diff --git a/net/linuxigd/Makefile b/net/linuxigd/Makefile
index e566e9441cad..3ddf18bea28c 100644
--- a/net/linuxigd/Makefile
+++ b/net/linuxigd/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	linuxigd
 PORTVERSION=	1.0
 PORTREVISION=	2
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	linux-igd
+MASTER_SITES=	SF/linux-igd/linux-igd/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Linux UPnP Internet Gateway Device
diff --git a/net/lla/Makefile b/net/lla/Makefile
index e825d75bc971..3c7c623368c6 100644
--- a/net/lla/Makefile
+++ b/net/lla/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	lla
 PORTVERSION=	0.99.1
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}.${PORTVERSION}
 EXTRACT_SUFX=	.pl
 
diff --git a/net/lyntin/Makefile b/net/lyntin/Makefile
index 29949bdd7f0d..c1501e025bbe 100644
--- a/net/lyntin/Makefile
+++ b/net/lyntin/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	lyntin
 PORTVERSION=	4.1.1
 PORTREVISION=	1
 CATEGORIES=	net games
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/OldFiles
 
 MAINTAINER=	stefan@aeschbacher.ch
 COMMENT=	A highly configurable client program to help playing muds
diff --git a/net/mcast-tools/Makefile b/net/mcast-tools/Makefile
index 7dca7f5b22cf..17ab6a08745d 100644
--- a/net/mcast-tools/Makefile
+++ b/net/mcast-tools/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	mcast-tools
 PORTVERSION=	20061214
 PORTREVISION=	0
 CATEGORIES=	net ipv6
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	mcast-tools
+MASTER_SITES=	SF
 
 MAINTAINER=	suz@FreeBSD.org
 COMMENT=	IPv6 multicast routing daemons and tools
diff --git a/net/mediatomb/Makefile b/net/mediatomb/Makefile
index 7eb8f19b3da6..7b3c8b266936 100644
--- a/net/mediatomb/Makefile
+++ b/net/mediatomb/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	mediatomb
 PORTVERSION=	0.11.0
 PORTREVISION=	2
 CATEGORIES=	net multimedia
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/MediaTomb/${PORTVERSION}
 
 MAINTAINER=	leo@mediatomb.cc
 COMMENT=	UPnP AV MediaServer
diff --git a/net/mknbi/Makefile b/net/mknbi/Makefile
index 467ed85aef6b..d31707bf0bfa 100644
--- a/net/mknbi/Makefile
+++ b/net/mknbi/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	mknbi
 PORTVERSION=	1.4.4
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	etherboot
+MASTER_SITES=	SF/etherboot/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Creates tagged boot images for net/ether boot
diff --git a/net/mmucl/Makefile b/net/mmucl/Makefile
index 7d6247dc4dcb..557b250dd41d 100644
--- a/net/mmucl/Makefile
+++ b/net/mmucl/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	mmucl
 PORTVERSION=	1.5.2
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	tim@SPYDERWEB.COM.AU
 COMMENT=	Powerful GUI MUD client written in TCL
diff --git a/net/mpd4/Makefile b/net/mpd4/Makefile
index 89493bd82716..f669b21545f4 100644
--- a/net/mpd4/Makefile
+++ b/net/mpd4/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	mpd
 DISTVERSION=	4.4.1
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	mpd
+MASTER_SITES=	SF/${PORTNAME}/Mpd4/Mpd-${PORTVERSION}
 DIST_SUBDIR=	mpd4
 
 MAINTAINER=	mav@FreeBSD.org
diff --git a/net/mpd5/Makefile b/net/mpd5/Makefile
index 5b794a3a5649..9d93025ac5fe 100644
--- a/net/mpd5/Makefile
+++ b/net/mpd5/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	mpd
 DISTVERSION=	5.3
 CATEGORIES=	net
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	mpd
+MASTER_SITES=	SF/${PORTNAME}/Mpd5/Mpd-${PORTVERSION}
 DIST_SUBDIR=	mpd5
 
 MAINTAINER=	mav@FreeBSD.org
diff --git a/net/nbd-server/Makefile b/net/nbd-server/Makefile
index 35f277ae1a3a..513107b0befb 100644
--- a/net/nbd-server/Makefile
+++ b/net/nbd-server/Makefile
@@ -10,8 +10,7 @@ PORTVERSION=	2.8.5
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	nbd
+MASTER_SITES=	SF/nbd/nbd/${PORTVERSION}
 DISTNAME=	nbd-${PORTVERSION}
 
 MAINTAINER=	rebehn@ant.uni-bremen.de
diff --git a/net/nemesis/Makefile b/net/nemesis/Makefile
index b34ccf3cf42e..ed0c07d931a0 100644
--- a/net/nemesis/Makefile
+++ b/net/nemesis/Makefile
@@ -10,8 +10,7 @@ PORTVERSION=	1.4
 PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	molter@tin.it
 COMMENT=	Command-line network packet creation and injection suite
diff --git a/net/nepenthes/Makefile b/net/nepenthes/Makefile
index 4c9e69d89ddd..9237c99cf0bf 100644
--- a/net/nepenthes/Makefile
+++ b/net/nepenthes/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	nepenthes
 PORTVERSION=	0.2.2
 PORTREVISION=	2
 CATEGORIES=	net
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/Nepenthes%20development/${PORTVERSION}
 
 MAINTAINER=	systemoperator@gmail.com
 COMMENT=	Determine the malware activity on a network
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index c890d29836ee..289506abc39a 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	netatalk
 PORTVERSION=	2.0.4
 PORTEPOCH=	1
 CATEGORIES=	net print
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	netatalk
+MASTER_SITES=	SF
 
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	File and print server for AppleTalk networks
diff --git a/net/netclasses/Makefile b/net/netclasses/Makefile
index 9f3d008745ef..f8fb07048642 100644
--- a/net/netclasses/Makefile
+++ b/net/netclasses/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	netclasses
 PORTVERSION=	1.06
 CATEGORIES=	net gnustep
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Objective-C framework for socket programming with GNUstep
diff --git a/net/netdude/Makefile b/net/netdude/Makefile
index 12358d8fa10c..0cd5d5e20665 100644
--- a/net/netdude/Makefile
+++ b/net/netdude/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	netdude
 PORTVERSION=	0.4.8a
 PORTREVISION=	2
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/0.4.8
 
 MAINTAINER=	brenton.chang@gmail.com
 COMMENT=	NETwork DUmp data Displayer and Editor for tcpdump tracefiles
diff --git a/net/netmap/Makefile b/net/netmap/Makefile
index 4afe76350990..4b87b3e85c31 100644
--- a/net/netmap/Makefile
+++ b/net/netmap/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	netmap
 PORTVERSION=	0.1.2b
 PORTREVISION=	3
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/NetMap%200.1.2
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Make a graphical representation of the surounding network
diff --git a/net/netscript/Makefile b/net/netscript/Makefile
index a31c892ae6cf..82b063cd4a0c 100644
--- a/net/netscript/Makefile
+++ b/net/netscript/Makefile
@@ -10,9 +10,9 @@ PORTNAME=	netscript
 PORTVERSION=	1.7.1
 PORTREVISION=	2
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	SF \
 		http://fakehalo.deadpig.org/%SUBDIR%/
-MASTER_SITE_SUBDIR=	${PORTNAME}
+
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/netstrain/Makefile b/net/netstrain/Makefile
index c88e9afd7501..4c20b95454c7 100644
--- a/net/netstrain/Makefile
+++ b/net/netstrain/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	netstrain
 PORTVERSION=	3.0
 CATEGORIES=	net ipv6
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	Janos.Mohacsi@bsd.hu
 COMMENT=	Tool to measure practical TCP throughput between two machines
diff --git a/net/ng_car/Makefile b/net/ng_car/Makefile
index 490ace370309..d9adf053f08f 100644
--- a/net/ng_car/Makefile
+++ b/net/ng_car/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	ng_car
 PORTVERSION=	0.6
 CATEGORIES=	net kld
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	mpd
+MASTER_SITES=	SF/mpd/misc/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	mav@FreeBSD.org
 COMMENT=	Netgraph committed access rate node
diff --git a/net/ngrep/Makefile b/net/ngrep/Makefile
index 101d60a4d9ce..50e9e229c5bc 100644
--- a/net/ngrep/Makefile
+++ b/net/ngrep/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	ngrep
 PORTVERSION=	1.45
 CATEGORIES=	net security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	edwin@mavetju.org
diff --git a/net/ns/Makefile b/net/ns/Makefile
index b57ca4302f3c..3496a940136e 100644
--- a/net/ns/Makefile
+++ b/net/ns/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	ns
 PORTVERSION=	2.33
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	nsnam
+MASTER_SITES=	SF/${PORTNAME}nam/${PORTNAME}-2/${PORTVERSION}
 
 MAINTAINER=	lstewart@FreeBSD.org
 COMMENT=	Discrete event simulator for networking research
diff --git a/net/ns2/Makefile b/net/ns2/Makefile
index b57ca4302f3c..3496a940136e 100644
--- a/net/ns2/Makefile
+++ b/net/ns2/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	ns
 PORTVERSION=	2.33
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	nsnam
+MASTER_SITES=	SF/${PORTNAME}nam/${PORTNAME}-2/${PORTVERSION}
 
 MAINTAINER=	lstewart@FreeBSD.org
 COMMENT=	Discrete event simulator for networking research
diff --git a/net/ntlmaps/Makefile b/net/ntlmaps/Makefile
index 826b296a3199..6f9e9068f56e 100644
--- a/net/ntlmaps/Makefile
+++ b/net/ntlmaps/Makefile
@@ -8,8 +8,7 @@ PORTNAME=	ntlmaps
 PORTVERSION=	0.9.9.0.1
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	A proxy that authenticates the user using the NTLM protocol
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 3bc047c36446..f6d5af8acb5e 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	ntop
 PORTVERSION=	3.3.9
 PORTREVISION=	2
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	wxs@FreeBSD.org
 COMMENT=	Network monitoring tool with command line and web interfaces
diff --git a/net/omnitty/Makefile b/net/omnitty/Makefile
index e1416cab027d..ab30d3ac4b3e 100644
--- a/net/omnitty/Makefile
+++ b/net/omnitty/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	omnitty
 PORTVERSION=	0.3.0
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	rafan@FreeBSD.org
 COMMENT=	A curses-based SSH multiplexer
diff --git a/net/openmcu/Makefile b/net/openmcu/Makefile
index b7644d106c50..d6ae6081ef94 100644
--- a/net/openmcu/Makefile
+++ b/net/openmcu/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	openmcu
 PORTVERSION=	2.2.1
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	openh323
+MASTER_SITES=	SF/openh323/${PORTNAME}/${PORTVERSION}
 DISTNAME=	${PORTNAME}-v${PORTVERSION:S/./_/g}-src
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/openslp/Makefile b/net/openslp/Makefile
index 7ea1acf69888..681443cc776a 100644
--- a/net/openslp/Makefile
+++ b/net/openslp/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	openslp
 PORTVERSION=	1.2.1
 PORTREVISION=	3
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	openslp
+MASTER_SITES=	SF/${PORTNAME}/OpenSLP/${PORTVERSION}
 
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Open-source implementation of the Service Location Protocol
diff --git a/net/p5-Net-Gnats/Makefile b/net/p5-Net-Gnats/Makefile
index 307705d3b932..154b83330e60 100644
--- a/net/p5-Net-Gnats/Makefile
+++ b/net/p5-Net-Gnats/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	Net-Gnats
 PORTVERSION=	0.06
 CATEGORIES=	net databases perl5
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	gnatsperl
+MASTER_SITES=	SF/gnatsperl/gnatsperl/${PORTVERSION}
 PKGNAMEPREFIX=	p5-
 EXTRACT_SUFX=	.tgz
 
diff --git a/net/p5-Net-HL7/Makefile b/net/p5-Net-HL7/Makefile
index 4b1b9d65bb64..e3a9a8c9fb0d 100644
--- a/net/p5-Net-HL7/Makefile
+++ b/net/p5-Net-HL7/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Net-HL7
 PORTVERSION=	0.75
 CATEGORIES=	net perl5
-MASTER_SITES=	SF/hl7toolkit
+MASTER_SITES=	SF/hl7toolkit/hl7api/${PORTVERSION}
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bbp2006@columbia.edu
diff --git a/net/panoptis/Makefile b/net/panoptis/Makefile
index ec90edeadd5a..20fb8c8ca0f8 100644
--- a/net/panoptis/Makefile
+++ b/net/panoptis/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	0.1.4
 PORTREVISION=	1
 CATEGORIES=	net security
 MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sbrabez@gmail.com
 COMMENT=	Detect and block DoS/DDoS attacks
diff --git a/net/pdb/Makefile b/net/pdb/Makefile
index 2547a419e4d7..1d783f32ab4c 100644
--- a/net/pdb/Makefile
+++ b/net/pdb/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	pdb
 PORTVERSION=	0.1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	pktdbg pdb
+MASTER_SITES=	SF/pktdbg/pktdbg/${PORTVERSION}%20Beta
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	gnn@FreeBSD.org
diff --git a/net/penguintv/Makefile b/net/penguintv/Makefile
index 56e04c24bb45..b657ae8e0b96 100644
--- a/net/penguintv/Makefile
+++ b/net/penguintv/Makefile
@@ -8,8 +8,7 @@ PORTNAME=	PenguinTV
 PORTVERSION=	4.0.0
 PORTREVISION=	1
 CATEGORIES=	net audio multimedia
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	penguintv
+MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME:L}/4.0
 
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Graphical RSS feed reader with incorperated playback functions - development version
diff --git a/net/phpldapadmin/Makefile b/net/phpldapadmin/Makefile
index 35b6d23d6b81..7b5f852c9728 100644
--- a/net/phpldapadmin/Makefile
+++ b/net/phpldapadmin/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	phpldapadmin
 PORTVERSION=	1.2.0
 PORTEPOCH=	1
 CATEGORIES=	net www
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-php5/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
diff --git a/net/phpldapadmin098/Makefile b/net/phpldapadmin098/Makefile
index cee295bbf620..b64eee4d8255 100644
--- a/net/phpldapadmin098/Makefile
+++ b/net/phpldapadmin098/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	phpldapadmin098
 PORTVERSION=	0.9.8.5
 PORTEPOCH=	1
 CATEGORIES=	net www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	phpldapadmin
+MASTER_SITES=	SF/phpldapadmin/phpldapadmin/${PORTVERSION}
 DISTNAME=	${PORTNAME:S/098//}-${PORTVERSION}
 
 MAINTAINER=	m.seaman@infracaninophile.co.uk
diff --git a/net/plugdaemon/Makefile b/net/plugdaemon/Makefile
index 369053f28f34..c2ac5e4506a2 100644
--- a/net/plugdaemon/Makefile
+++ b/net/plugdaemon/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	plugdaemon
 PORTVERSION=	2.5.4
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	lx@FreeBSD.org
diff --git a/net/poptop/Makefile b/net/poptop/Makefile
index 1755b7335f21..929e3cdc5e8e 100644
--- a/net/poptop/Makefile
+++ b/net/poptop/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	poptop
 PORTVERSION=	1.3.4
 PORTREVISION=	2
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/pptpd/pptpd-${PORTVERSION}
 DISTNAME=	pptpd-${PORTVERSION:S/.b/-b/}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/portfwd/Makefile b/net/portfwd/Makefile
index 3d182bc23292..1c79bd564edf 100644
--- a/net/portfwd/Makefile
+++ b/net/portfwd/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	portfwd
 PORTVERSION=	0.29
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	A Port Forwarding Daemon
diff --git a/net/pppoa/Makefile b/net/pppoa/Makefile
index e4b6ee1e9762..b9a383d4b866 100644
--- a/net/pppoa/Makefile
+++ b/net/pppoa/Makefile
@@ -10,8 +10,7 @@ PORTVERSION=		1.3.1
 PORTEPOCH=		2
 CATEGORIES=		net
 MASTER_SITES=		http://www.oracle-base.com/articles/misc/:mngt \
-			${MASTER_SITE_SOURCEFORGE:S/$/:src/}
-MASTER_SITE_SUBDIR=	speedtouch/:src
+			SF/speedtouch/speedtouch%20driver/Release%20${PORTVERSION}:src
 DISTFILES=		${SPEEDTOUCH}.tar.bz2:src ${ALCATELDRIVER}:mngt
 EXTRACT_ONLY=		${SPEEDTOUCH}.tar.bz2
 
diff --git a/net/pptpclient/Makefile b/net/pptpclient/Makefile
index dcff1e6f453a..51995c53605c 100644
--- a/net/pptpclient/Makefile
+++ b/net/pptpclient/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	pptpclient
 PORTVERSION=	1.7.2
 PORTREVISION=	2
 CATEGORIES=	net
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/pptp/pptp-${PORTVERSION}
 DISTNAME=	pptp-${PORTVERSION}
 
 MAINTAINER=	chinsan@FreeBSD.org
diff --git a/net/prosearch/Makefile b/net/prosearch/Makefile
index b2c46128e13b..e9a3a13247c2 100644
--- a/net/prosearch/Makefile
+++ b/net/prosearch/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	prosearch
 PORTVERSION=	0.18.2
 PORTREVISION=	3
 CATEGORIES=	net www
-MASTER_SITES=	http://pro.setun.net/search/download/ SF
-MASTER_SITE_SUBDIR=	pro-search
+MASTER_SITES=	http://pro.setun.net/search/download/ SF/pro-search/pro-search/${PORTVERSION}
 
 MAINTAINER=	proler@gmail.com
 COMMENT=	Powerful file search
diff --git a/net/proxychains/Makefile b/net/proxychains/Makefile
index 533249a893d7..525439c720bf 100644
--- a/net/proxychains/Makefile
+++ b/net/proxychains/Makefile
@@ -6,8 +6,7 @@
 PORTNAME=	proxychains
 PORTVERSION=	3.1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	proxychains
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/version%20${PORTVERSION}
 
 MAINTAINER=	mycroft@virgaria.org
 COMMENT=	Redirect connection through proxy servers
diff --git a/net/ptpd/Makefile b/net/ptpd/Makefile
index c3c82958c35f..1a6bc444fd19 100644
--- a/net/ptpd/Makefile
+++ b/net/ptpd/Makefile
@@ -10,7 +10,6 @@ DISTVERSION=	1.0.0
 PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	gnn@FreeBSD.org
 COMMENT=	An implementation of the precision time protocol IEEE 1588
diff --git a/net/pvm++/Makefile b/net/pvm++/Makefile
index b80999678dea..33cd5bfb511e 100644
--- a/net/pvm++/Makefile
+++ b/net/pvm++/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	pvm++
 PORTVERSION=	0.6.0
 PORTREVISION=	4
 CATEGORIES=	net parallel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME:S:+:-plus:g}
+MASTER_SITES=	SF/pvm-plus-plus/pvm-plus-plus/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A C++-Library for PVM
diff --git a/net/py-google/Makefile b/net/py-google/Makefile
index 0e33c2e7d212..858b833df7da 100644
--- a/net/py-google/Makefile
+++ b/net/py-google/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	google
 PORTVERSION=	0.6
 CATEGORIES=	net python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	pygoogle
+MASTER_SITES=	SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pygoogle-${PORTVERSION}
 
diff --git a/net/py-libnet/Makefile b/net/py-libnet/Makefile
index 7f8a3782c004..dc6b3d503201 100644
--- a/net/py-libnet/Makefile
+++ b/net/py-libnet/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	libnet
 PORTVERSION=	1.1
 PORTREVISION=	1
 CATEGORIES=	net python
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	pylibnet
+MASTER_SITES=	SF/py${PORTNAME}/py${PORTNAME}/py${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pylibnet-${PORTVERSION}
 
diff --git a/net/py-pcap/Makefile b/net/py-pcap/Makefile
index de3976f01ef4..edd898705512 100644
--- a/net/py-pcap/Makefile
+++ b/net/py-pcap/Makefile
@@ -8,9 +8,9 @@
 PORTNAME=	pcap
 PORTVERSION=	0.6.2
 CATEGORIES=	net python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	SF/pylib${PORTNAME}/pylib${PORTNAME}/${PORTVERSION} \
 		http://people.freebsd.org/~perky/distfiles/:local
-MASTER_SITE_SUBDIR=	pylibpcap
+
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pylibpcap-${PORTVERSION}
 
diff --git a/net/py-pcs/Makefile b/net/py-pcs/Makefile
index 558b0fd28128..60324bf35a4d 100644
--- a/net/py-pcs/Makefile
+++ b/net/py-pcs/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	pcs
 PORTVERSION=	0.5
 CATEGORIES=	net python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	pcs
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Beta-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	gnn@FreeBSD.org
diff --git a/net/py-s3cmd/Makefile b/net/py-s3cmd/Makefile
index e0d718dd3ef1..d287c2e5ae0b 100644
--- a/net/py-s3cmd/Makefile
+++ b/net/py-s3cmd/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	s3cmd
 PORTVERSION=	0.9.9
 CATEGORIES=	net python
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	s3tools
+MASTER_SITES=	SF/s3tools/${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/net/py-soappy-devel/Makefile b/net/py-soappy-devel/Makefile
index ff4d3c5d1b6e..aabccafed1a4 100644
--- a/net/py-soappy-devel/Makefile
+++ b/net/py-soappy-devel/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=		soappy
 PORTVERSION=		0.12.0
 CATEGORIES=		net python
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	pywebsvcs
+MASTER_SITES=		SF/pywebsvcs/SOAP.py/${PORTVERSION}_rc1
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=		-devel
 DISTNAME=		SOAPpy-${PORTVERSION}
diff --git a/net/py-soappy/Makefile b/net/py-soappy/Makefile
index 6497a0da33e7..20021caaea20 100644
--- a/net/py-soappy/Makefile
+++ b/net/py-soappy/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=		soappy
 PORTVERSION=		0.11.6
 CATEGORIES=		net python
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	pywebsvcs
+MASTER_SITES=		SF/pywebsvcs/SOAP.py/${PORTVERSION}
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 DISTNAME=		SOAPpy-${PORTVERSION}
 
diff --git a/net/py-soapy/Makefile b/net/py-soapy/Makefile
index 3ed4a7ee4854..f049e7b674ca 100644
--- a/net/py-soapy/Makefile
+++ b/net/py-soapy/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	soapy
 PORTVERSION=	0.1
 CATEGORIES=	net python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sbrabez@gmail.com
diff --git a/net/py-xmlrpc/Makefile b/net/py-xmlrpc/Makefile
index 87e3a696b343..492016dc89df 100644
--- a/net/py-xmlrpc/Makefile
+++ b/net/py-xmlrpc/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	xmlrpc
 PORTVERSION=	0.8.8.3
 PORTREVISION=	2
 CATEGORIES=	net python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	py-${PORTNAME}
+MASTER_SITES=	SF/py-${PORTNAME}/source/py-${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	py-${PORTNAME}-${PORTVERSION}
 
diff --git a/net/py-zsi/Makefile b/net/py-zsi/Makefile
index 3861f38e9cbe..b5946a33bd28 100644
--- a/net/py-zsi/Makefile
+++ b/net/py-zsi/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	zsi
 PORTVERSION=	2.0
 PORTEPOCH=	1
 CATEGORIES=	net python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	pywebsvcs
+MASTER_SITES=	SF/pywebsvcs/ZSI/ZSI-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME:U}-${PORTVERSION}
 
diff --git a/net/pypvm/Makefile b/net/pypvm/Makefile
index 08f172ee6206..417f87995ba5 100644
--- a/net/pypvm/Makefile
+++ b/net/pypvm/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	pypvm
 PORTVERSION=	0.94
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	PVM for Python
diff --git a/net/pythondirector/Makefile b/net/pythondirector/Makefile
index 8296b6ecebf8..4a403f03e2d6 100644
--- a/net/pythondirector/Makefile
+++ b/net/pythondirector/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	pydirector
 PORTVERSION=	1.0.0
 CATEGORIES=	net python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	pythondirector
+MASTER_SITES=	SF/pythondirector/pythondirector/pythondirector-${PORTVERSION}
 
 MAINTAINER=	clement@FreeBSD.org
 COMMENT=	A TCP load balancer written in Python
diff --git a/net/raddump/Makefile b/net/raddump/Makefile
index 15a5b3d43024..db4c6093374d 100644
--- a/net/raddump/Makefile
+++ b/net/raddump/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	raddump
 PORTVERSION=	0.3.1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	raddump
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	shanali@yahoo.com
 COMMENT=	Radius Packet Analyzer
diff --git a/net/rdesktop/Makefile b/net/rdesktop/Makefile
index 1b9ed43d85c3..7230a429ebe1 100644
--- a/net/rdesktop/Makefile
+++ b/net/rdesktop/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	rdesktop
 PORTVERSION=	1.6.0
 PORTREVISION?=	0
 CATEGORIES=	net comms ipv6
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	obrien@FreeBSD.org
 COMMENT=	RDP client for Windows NT/2000/2003 Terminal Server
diff --git a/net/remmina-applet/Makefile b/net/remmina-applet/Makefile
index 9bded90d5a36..f0b7c4217409 100644
--- a/net/remmina-applet/Makefile
+++ b/net/remmina-applet/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	grdc
 PORTVERSION=	0.6.0
 CATEGORIES=	net gnome
-MASTER_SITES=	SF/grdc
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-gnome/${PORTVERSION}
 PKGNAMESUFFIX=	-applet
 DISTNAME=	${PORTNAME}-gnome-${PORTVERSION}
 
diff --git a/net/rexx-sock/Makefile b/net/rexx-sock/Makefile
index f594791d41c5..6d5ea8e7c49c 100644
--- a/net/rexx-sock/Makefile
+++ b/net/rexx-sock/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	sock
 PORTVERSION=	1.4
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	rxsock
+MASTER_SITES=	SF/rx${PORTNAME}/rx${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	rexx-
 DISTNAME=	RxSock-${PORTVERSION}
 
diff --git a/net/ripe-whois/Makefile b/net/ripe-whois/Makefile
index 74eeab705739..df5ee30e6e43 100644
--- a/net/ripe-whois/Makefile
+++ b/net/ripe-whois/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	ripe-whois
 PORTVERSION=	3.2.2
 CATEGORIES=	net ipv6
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	whois
+MASTER_SITES=	SF/whois/whois/${PORTVERSION}
 DISTNAME=	whois3-${PORTVERSION}
 
 MAINTAINER=	lerik@nolink.net
diff --git a/net/rtg/Makefile b/net/rtg/Makefile
index a1a187605a87..f45e8045546d 100644
--- a/net/rtg/Makefile
+++ b/net/rtg/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	rtg
 PORTVERSION=	0.7.4
 PORTREVISION=	4
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	rtg
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A flexible, high-performance SNMP statistics monitoring system
diff --git a/net/ruby-ldap/Makefile b/net/ruby-ldap/Makefile
index 9e2972f5dc7c..5eccc752bea0 100644
--- a/net/ruby-ldap/Makefile
+++ b/net/ruby-ldap/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	ldap
 PORTVERSION=	0.9.7
 PORTREVISION=	1
 CATEGORIES=	net ruby
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	ruby-${PORTNAME}
+MASTER_SITES=	SF/ruby-${PORTNAME}/ruby-${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
diff --git a/net/ruby-mpi/Makefile b/net/ruby-mpi/Makefile
index 31b91cf93613..ae0f48a3fe26 100644
--- a/net/ruby-mpi/Makefile
+++ b/net/ruby-mpi/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	mpi
 PORTVERSION=	0.4
 PORTREVISION=	4
 CATEGORIES=	net ruby
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}ruby
+MASTER_SITES=	SF/${PORTNAME}ruby/${PORTNAME}ruby/${PORTNAME}ruby-${PORTVERSION}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}_ruby-${PORTVERSION}
 DIST_SUBDIR=	ruby
diff --git a/net/ruby-nis/Makefile b/net/ruby-nis/Makefile
index f7f56605e8c3..716ccf911f7f 100644
--- a/net/ruby-nis/Makefile
+++ b/net/ruby-nis/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	nis
 PORTVERSION=	0.1.1
 PORTREVISION=	1
 CATEGORIES=	net ruby
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	ruby-${PORTNAME}
+MASTER_SITES=	SF/ruby-${PORTNAME}/ruby-${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
diff --git a/net/rude/Makefile b/net/rude/Makefile
index ca06e97f350a..6aa296d8c198 100644
--- a/net/rude/Makefile
+++ b/net/rude/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	rude
 PORTVERSION=	0.70
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	Janos.Mohacsi@bsd.hu
 COMMENT=	Rude is a Real-time UDP Data Emitter and Collector (crude)
diff --git a/net/scr_ipfm/Makefile b/net/scr_ipfm/Makefile
index 895f41a2b01d..743a92214b3c 100644
--- a/net/scr_ipfm/Makefile
+++ b/net/scr_ipfm/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	scr_ipfm
 PORTVERSION=	0.64
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	scripfm
+MASTER_SITES=	SF/scripfm/scripfm/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	sexbear@tmu.edu.tw
 COMMENT=	Use logs generated by ipfm to show data graphically
diff --git a/net/seda/Makefile b/net/seda/Makefile
index 388f6bc6f850..f93dfab26882 100644
--- a/net/seda/Makefile
+++ b/net/seda/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	seda
 PORTVERSION=	3.0
 PORTREVISION=	2
 CATEGORIES=	net java
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-release-${VERSION_DATE}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/skstream/Makefile b/net/skstream/Makefile
index 0e2ac5f944a7..1c0d79a334e7 100644
--- a/net/skstream/Makefile
+++ b/net/skstream/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	skstream
 PORTVERSION=	0.3.6
 PORTREVISION=	2
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	worldforge
+MASTER_SITES=	SF/worldforge/${PORTNAME}%20%28network%20lib%29/${PORTVERSION}
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	An iostream based C++ socket library
diff --git a/net/slbd/Makefile b/net/slbd/Makefile
index 50ccaa0c5f72..052c373d4cc9 100644
--- a/net/slbd/Makefile
+++ b/net/slbd/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	slbd
 PORTVERSION=	1.3
 CATEGORIES=	net sysutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	Server load balancing daemon for *BSD pf
diff --git a/net/slirp/Makefile b/net/slirp/Makefile
index fdacfe93d52f..3abd7b2558aa 100644
--- a/net/slirp/Makefile
+++ b/net/slirp/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	slirp
 PORTVERSION=	1.0.16
 PORTEPOCH=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=slirp
+MASTER_SITES=	SF
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	A (C)SLIP/PPP emulator for users with shell accounts
diff --git a/net/smm++/Makefile b/net/smm++/Makefile
index 6d9a6236f67d..12beae893f2d 100644
--- a/net/smm++/Makefile
+++ b/net/smm++/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	smm++
 PORTVERSION=	6.1.1
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	smm
+MASTER_SITES=	SF/smm/smm/${PORTVERSION}
 DISTNAME=	smm611
 EXTRACT_SUFX=	.tgz
 
diff --git a/net/sntop/Makefile b/net/sntop/Makefile
index 394adce75100..efc048c8ee31 100644
--- a/net/sntop/Makefile
+++ b/net/sntop/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	sntop
 PORTVERSION=	1.4.3
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	fernan@iib.unsam.edu.ar
 COMMENT=	Monitor status of network nodes using fping
diff --git a/net/ss5/Makefile b/net/ss5/Makefile
index 5f1c8a18daf6..90f69887f39d 100644
--- a/net/ss5/Makefile
+++ b/net/ss5/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	ss5
 PORTVERSION=	3.6.4
 PORTREVISION=	1
 CATEGORIES=	net security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	ss5
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-3
 DISTNAME=	${PORTNAME}-${PORTVERSION}-3
 
 MAINTAINER=	raffaele.delorenzo@libero.it
diff --git a/net/stund/Makefile b/net/stund/Makefile
index 03b36c1a4ea0..53f142410c4b 100644
--- a/net/stund/Makefile
+++ b/net/stund/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	stund
 PORTVERSION=	0.96
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	stun
+MASTER_SITES=	SF/stun/stun/${PORTVERSION}
 DISTNAME=	${PORTNAME}_${PORTVERSION}_Aug13
 EXTRACT_SUFX=	.tgz
 
diff --git a/net/tapidbus/Makefile b/net/tapidbus/Makefile
index 6ddbeff64796..bce50a828370 100644
--- a/net/tapidbus/Makefile
+++ b/net/tapidbus/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	tapidbus
 PORTVERSION=	0.2.1
 PORTREVISION=	5
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	tapioca-voip
+MASTER_SITES=	SF/tapioca-voip/OldFiles
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Abstraction layer for interprocess communication
diff --git a/net/tcludp/Makefile b/net/tcludp/Makefile
index 8d1e223007ba..ade18d6d6037 100644
--- a/net/tcludp/Makefile
+++ b/net/tcludp/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	tcludp
 PORTVERSION=	1.0.8
 PORTREVISION=	1
 CATEGORIES=	net tcl
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=tcludp
+MASTER_SITES=	SF
 
 MAINTAINER=	frank@fenor.de
 COMMENT=	UDP extension for TCL
diff --git a/net/tcpick/Makefile b/net/tcpick/Makefile
index 4f70cdb59421..d60c1ebe11ac 100644
--- a/net/tcpick/Makefile
+++ b/net/tcpick/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	tcpick
 PORTVERSION=	0.2.1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	A text-based TCP stream sniffer
diff --git a/net/tcpsg/Makefile b/net/tcpsg/Makefile
index 42011a5b2ba1..fb7c073e20fd 100644
--- a/net/tcpsg/Makefile
+++ b/net/tcpsg/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	tcpsg
 PORTVERSION=	0.0.2
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	mich@FreeBSD.org
 COMMENT=	A simple TCP port forwarder
diff --git a/net/tcpxtract/Makefile b/net/tcpxtract/Makefile
index fc5f7f7ac0b9..ebacf9fd0402 100644
--- a/net/tcpxtract/Makefile
+++ b/net/tcpxtract/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	tcpxtract
 PORTVERSION=	1.0.1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	nobutaka@freebsd.org
 COMMENT=	A tool for extracting files from network traffic
diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index 6c5de72706fe..6f30946ad0b8 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	tightvnc
 PORTVERSION=	1.3.10
 PORTREVISION=	2
 CATEGORIES=	net
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	vnc-tight
+MASTER_SITES=	SF/vnc-tight/TightVNC-unix/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}_unixsrc
 
 MAINTAINER=	itetcu@FreeBSD.org
diff --git a/net/tinyfugue/Makefile b/net/tinyfugue/Makefile
index 0c650afad70e..7dfe936ec3b1 100644
--- a/net/tinyfugue/Makefile
+++ b/net/tinyfugue/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	tf
 PORTVERSION=	5.0b8
 CATEGORIES=	net games
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	tinyfugue
+MASTER_SITES=	SF/tinyfugue/tinyfugue/5.0%20beta%208
 DISTVERSION=	${PORTVERSION:S/.//}
 DISTNAME=	${PORTNAME}-${DISTVERSION}
 
diff --git a/net/tptest/Makefile b/net/tptest/Makefile
index 7da45c641b79..d01127f20652 100644
--- a/net/tptest/Makefile
+++ b/net/tptest/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	tptest
 PORTVERSION=	3.1.7
 CATEGORIES=	net benchmarks
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20source/${PORTNAME}%203.1
 
 MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	Software suite for testing network throughput and Internet services
diff --git a/net/tsocks/Makefile b/net/tsocks/Makefile
index 6b3ba85adc44..f11989371e4d 100644
--- a/net/tsocks/Makefile
+++ b/net/tsocks/Makefile
@@ -8,10 +8,11 @@ PORTNAME=	tsocks
 PORTVERSION=	1.8.b5
 PORTREVISION=	4
 CATEGORIES=	net security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/1.8%20beta%205 \
 		http://ftp1.sourceforge.net/tsocks/ \
+
 		http://www.yazzy.org/ports/tsocks/
-MASTER_SITE_SUBDIR=	tsocks
+
 DISTNAME=${PORTNAME}-${PORTVERSION:C/.b/beta/}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/uriparser/Makefile b/net/uriparser/Makefile
index c30c599078b0..f2bd40862c47 100644
--- a/net/uriparser/Makefile
+++ b/net/uriparser/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	uriparser
 PORTVERSION=	0.7.5
 CATEGORIES=	net
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/Sources/${PORTVERSION}
 
 MAINTAINER=	ed@FreeBSD.org
 COMMENT=	URI parsing library
diff --git a/net/vde/Makefile b/net/vde/Makefile
index 4d739e250f30..cff10a11bb51 100644
--- a/net/vde/Makefile
+++ b/net/vde/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	vde
 PORTVERSION=	1.5.7
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	vde
+MASTER_SITES=	SF/${PORTNAME}/OldFiles
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	craig@yekse.gank.org
diff --git a/net/vde2/Makefile b/net/vde2/Makefile
index c91b7ea1739d..770c7689c3e1 100644
--- a/net/vde2/Makefile
+++ b/net/vde2/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	vde2
 PORTVERSION=	2.1.6
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	vde
+MASTER_SITES=	SF/vde/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	pgollucci@FreeBSD.org
 COMMENT=	User-mode virtual ethernet infrastructure
diff --git a/net/vncreflector/Makefile b/net/vncreflector/Makefile
index e7ed5dc3cee8..0f4a4256d424 100644
--- a/net/vncreflector/Makefile
+++ b/net/vncreflector/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	vncreflector
 PORTVERSION=	1.2.4
 PORTREVISION=	3
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=vnc-reflector
+MASTER_SITES=	SF/vnc-reflector/vnc-reflector/${PORTVERSION}
 DISTNAME=	vnc_reflector-${PORTVERSION}
 
 MAINTAINER=	brooks@FreeBSD.org
diff --git a/net/wizd/Makefile b/net/wizd/Makefile
index 2e09abc3de12..7f3c70a8d0c4 100644
--- a/net/wizd/Makefile
+++ b/net/wizd/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	wizd
 PORTVERSION=	24
 PORTREVISION=	2
 CATEGORIES=	net multimedia
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/Sources/Sources%20v${PORTVERSION}
 DISTFILES=	wizd_sources_v${PORTVERSION}.zip simplicity_v1-2.zip
 
 MAINTAINER=	ayu@commun.jp
diff --git a/net/wmlj/Makefile b/net/wmlj/Makefile
index 96c5ce30758c..145ab07a75e0 100644
--- a/net/wmlj/Makefile
+++ b/net/wmlj/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	wmlj
 PORTVERSION=	0.4.0
 PORTREVISION=	5
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A dockapp that monitors your friends list at LiveJournal.com
diff --git a/net/wmping/Makefile b/net/wmping/Makefile
index 315bb3e76a3d..fb10c524bb90 100644
--- a/net/wmping/Makefile
+++ b/net/wmping/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	wmping
 PORTVERSION=	0.2.1
 PORTREVISION=	1
 CATEGORIES=	net windowmaker
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	serg@cad.kiev.ua
 COMMENT=	Windowmaker dock app to display network hosts status
diff --git a/net/wmwave/Makefile b/net/wmwave/Makefile
index 70a5f515eea4..fb387f78dc1f 100644
--- a/net/wmwave/Makefile
+++ b/net/wmwave/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	wmwave
 PORTVERSION=	0.4
 PORTREVISION=	6
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/./-/}
 EXTRACT_SUFX=	.tgz
 
diff --git a/net/wol/Makefile b/net/wol/Makefile
index 1b8092cbc683..c0f5df37f321 100644
--- a/net/wol/Makefile
+++ b/net/wol/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	wol
 PORTVERSION=	0.7.1
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	ahh
+MASTER_SITES=	SF/ahh/OldFiles
 
 MAINTAINER=	cm@therek.net
 COMMENT=	Tool to wake up Wake-On-LAN compliant computers
diff --git a/net/x11vnc/Makefile b/net/x11vnc/Makefile
index baa255fef547..ab0e8b17e9c0 100644
--- a/net/x11vnc/Makefile
+++ b/net/x11vnc/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	x11vnc
 PORTVERSION=	0.9.6
 PORTREVISION=	2
 CATEGORIES=	net
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=libvncserver
+MASTER_SITES=	SF/libvncserver/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	beech@FreeBSD.org
 COMMENT=	VNC server for use with real X displays
diff --git a/net/xmlrpc++/Makefile b/net/xmlrpc++/Makefile
index 94c0db60541e..da488c3a301e 100644
--- a/net/xmlrpc++/Makefile
+++ b/net/xmlrpc++/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	xmlrpc++
 PORTVERSION=	0.7
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	xmlrpcpp
+MASTER_SITES=	SF/xmlrpcpp/xmlrpc%2B%2B/Version%20${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/xmlrpc-c/Makefile b/net/xmlrpc-c/Makefile
index 46bf8ad8a5d3..c1329285840b 100644
--- a/net/xmlrpc-c/Makefile
+++ b/net/xmlrpc-c/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	xmlrpc-c
 PORTVERSION=	1.06.32
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/Xmlrpc-c%20Super%20Stable/${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
diff --git a/net/xmlrpc-epi/Makefile b/net/xmlrpc-epi/Makefile
index e0c17e3effd0..8caa4a895fd6 100644
--- a/net/xmlrpc-epi/Makefile
+++ b/net/xmlrpc-epi/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	xmlrpc-epi
 PORTVERSION=	0.54
 CATEGORIES=	net
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-base/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A general purpose implementation of the xmlrpc specification in C
diff --git a/net/xprobe/Makefile b/net/xprobe/Makefile
index 5c03f34f4418..3a424560b34e 100644
--- a/net/xprobe/Makefile
+++ b/net/xprobe/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	xprobe2
 PORTVERSION=	0.3
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	xprobe
+MASTER_SITES=	SF/xprobe/${PORTNAME}/Xprobe2%20${PORTVERSION}
 
 MAINTAINER=	wxs@FreeBSD.org
 COMMENT=	ICMP active OS fingerprint scanner
diff --git a/net/yaph/Makefile b/net/yaph/Makefile
index 754e2c796ad6..2c1e6598469a 100644
--- a/net/yaph/Makefile
+++ b/net/yaph/Makefile
@@ -6,8 +6,7 @@
 PORTNAME=	yaph
 PORTVERSION=	0.91
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	mycroft@virgaria.org
diff --git a/net/zillion/Makefile b/net/zillion/Makefile
index 12cc0a8e5e3a..4e8125071d61 100644
--- a/net/zillion/Makefile
+++ b/net/zillion/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	zillion
 PORTVERSION=	0.1
 PORTREVISION=	2
 CATEGORIES=	net gnustep
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 DISTNAME=	${PORTNAME}-0_1
 
 MAINTAINER=	dinoex@FreeBSD.org
author	Dmitry Marakasov <amdmi3@FreeBSD.org>	2009-08-22 00:32:25 +0000
committer	Dmitry Marakasov <amdmi3@FreeBSD.org>	2009-08-22 00:32:25 +0000
commit	7914161a414ec0a620f9de779057c9fe0a80343d (patch)
tree	a4cb00a0087b36d6067c707189e054581a0f12cf /net
parent	- Switch SourceForge ports to the new File Release System: categories startin... (diff)