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

77 files changed, 80 insertions, 128 deletions

diff --git a/net-mgmt/angst/Makefile b/net-mgmt/angst/Makefile
index 110fc8a3a8a..47931099a33 100644
--- a/net-mgmt/angst/Makefile
+++ b/net-mgmt/angst/Makefile
@@ -10,9 +10,9 @@ PORTNAME=	angst
 PORTVERSION=	0.4b
 PORTREVISION=	2
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/${PORTNAME}-0.4.tar.gz \
 		${MASTER_SITE_PACKETSTORM:S:%SUBDIR%:sniffers/angst:}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An active sniffer
diff --git a/net-mgmt/ap-utils/Makefile b/net-mgmt/ap-utils/Makefile
index 35c580404a9..0acf9b67551 100644
--- a/net-mgmt/ap-utils/Makefile
+++ b/net-mgmt/ap-utils/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	ap-utils
 PORTVERSION=	1.4.1
 PORTREVISION=	3
 CATEGORIES=	net-mgmt
-MASTER_SITES=`	SF
+MASTER_SITES=` SF
 
 MAINTAINER=	david@catwhisker.org
 COMMENT=	A set of utilities to configure and monitor wireless access points
diff --git a/net-mgmt/bandwidthd/Makefile b/net-mgmt/bandwidthd/Makefile
index 304e9b72df6..ccf3fc323f8 100644
--- a/net-mgmt/bandwidthd/Makefile
+++ b/net-mgmt/bandwidthd/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	bandwidthd
 PORTVERSION=	2.0.1
 PORTREVISION=	2
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
 DISTNAME=		${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
diff --git a/net-mgmt/bigsister/Makefile b/net-mgmt/bigsister/Makefile
index 0a4f3676403..218360f6b87 100644
--- a/net-mgmt/bigsister/Makefile
+++ b/net-mgmt/bigsister/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	bigsister
 PORTVERSION=	1.02
 PORTREVISION=	3
 CATEGORIES=	net-mgmt
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=		SF/${PORTNAME}/Big%20Sister/${PORTVERSION}
 DISTNAME=		big-sister-${PORTVERSION}
 
 MAINTAINER=	freebsd@troback.com
diff --git a/net-mgmt/bpft/Makefile b/net-mgmt/bpft/Makefile
index 80c47ed9f20..8e95ea2b265 100644
--- a/net-mgmt/bpft/Makefile
+++ b/net-mgmt/bpft/Makefile
@@ -7,9 +7,9 @@
 PORTNAME=	bpft
 PORTVERSION=	4.20040414
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	SF/${PORTNAME}4/${PORTNAME}4/${PORTNAME}4-snapshot \
 		ftp://rusunix.org/pub/FreeBSD/distfiles/
-MASTER_SITE_SUBDIR=bpft4
+
 DISTNAME=	bpft4-2004-04-14
 EXTRACT_SUFX=	.tgz
 
diff --git a/net-mgmt/cdpr/Makefile b/net-mgmt/cdpr/Makefile
index 1f60730a413..d75a9728f12 100644
--- a/net-mgmt/cdpr/Makefile
+++ b/net-mgmt/cdpr/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	cdpr
 PORTVERSION=	2.2.1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	mich@FreeBSD.org
 COMMENT=	Cisco Discovery Protocol Reporter
diff --git a/net-mgmt/choparp/Makefile b/net-mgmt/choparp/Makefile
index c9b03efe779..af6e8ef215d 100644
--- a/net-mgmt/choparp/Makefile
+++ b/net-mgmt/choparp/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	choparp
 PORTVERSION=	20021107
 PORTREVISION=	3
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	choparp
+MASTER_SITES=	SF
 
 MAINTAINER=	nork@FreeBSD.org
 COMMENT=	Simple proxy arp daemon
diff --git a/net-mgmt/confregdecode/Makefile b/net-mgmt/confregdecode/Makefile
index 989cd05c906..4352188f2b1 100644
--- a/net-mgmt/confregdecode/Makefile
+++ b/net-mgmt/confregdecode/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	confregdecode
 PORTVERSION=	1.2.1
 PORTREVISION=	3
 CATEGORIES=	net-mgmt java
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	cosi-nms
+MASTER_SITES=	SF/cosi-nms/${PORTNAME}/${PORTVERSION}
 DISTNAME=	confregdecode-src-${PORTVERSION}
 
 MAINTAINER=	marcus@FreeBSD.org
diff --git a/net-mgmt/cricket/Makefile b/net-mgmt/cricket/Makefile
index 83e23d8aca2..7ec1b6df8b1 100644
--- a/net-mgmt/cricket/Makefile
+++ b/net-mgmt/cricket/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	cricket
 PORTVERSION=	1.0.5
 PORTREVISION=	5
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net-mgmt/docsis/Makefile b/net-mgmt/docsis/Makefile
index 747ef810415..fdc168330e9 100644
--- a/net-mgmt/docsis/Makefile
+++ b/net-mgmt/docsis/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	docsis
 PORTVERSION=	0.9.5
 PORTREVISION=	3
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	jflemer@alum.rpi.edu
 COMMENT=	DOCSIS(tm) binary configuration file encoder/decoder
diff --git a/net-mgmt/ehnt/Makefile b/net-mgmt/ehnt/Makefile
index 37805a91db6..609fc8706cc 100644
--- a/net-mgmt/ehnt/Makefile
+++ b/net-mgmt/ehnt/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	ehnt
 PORTVERSION=	0.3
 PORTREVISION=	8
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	marck@FreeBSD.org
 COMMENT=	A simple Cisco NetFlow data collector
diff --git a/net-mgmt/etherape/Makefile b/net-mgmt/etherape/Makefile
index bd4c00292be..0712793cf2f 100644
--- a/net-mgmt/etherape/Makefile
+++ b/net-mgmt/etherape/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	etherape
 PORTVERSION=	0.9.6
 PORTREVISION=	5
 CATEGORIES=	net-mgmt gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A graphical network traffic visualization tool for gnome
diff --git a/net-mgmt/ezradius/Makefile b/net-mgmt/ezradius/Makefile
index 9fb6e9b062d..d9a70de1c22 100644
--- a/net-mgmt/ezradius/Makefile
+++ b/net-mgmt/ezradius/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	ezradius
 PORTVERSION=	0.2.1.2
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.2.1stable
 DISTNAME=	${PORTNAME}-${PORTVERSION}stable${EXTRACT_SUFFIX}
 
 MAINTAINER=	lucio@zetasolucoes.com.br
diff --git a/net-mgmt/fprobe/Makefile b/net-mgmt/fprobe/Makefile
index d004bd0e63e..617a6fd571b 100644
--- a/net-mgmt/fprobe/Makefile
+++ b/net-mgmt/fprobe/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	fprobe
 PORTVERSION=	1.1
 PORTREVISION=	1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool that collects network traffic data
diff --git a/net-mgmt/fruity/Makefile b/net-mgmt/fruity/Makefile
index 417034d22f9..fbfb06972b7 100644
--- a/net-mgmt/fruity/Makefile
+++ b/net-mgmt/fruity/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	fruity
 DISTVERSION=	1.0-rc2
 PORTREVISION=	3
 CATEGORIES=	net-mgmt www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	fruity
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-1.0-rc2
 
 MAINTAINER=	dan@langille.org
 COMMENT=	Fruity is a PHP based web-frontend to your Nagios configuration
diff --git a/net-mgmt/icmpmonitor/Makefile b/net-mgmt/icmpmonitor/Makefile
index 39d75cfb8a1..700623c63f2 100644
--- a/net-mgmt/icmpmonitor/Makefile
+++ b/net-mgmt/icmpmonitor/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	icmpmonitor
 PORTVERSION=	1.2
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	icmpmonitor
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A multiple host icmp monitoring tool
diff --git a/net-mgmt/ifgraph/Makefile b/net-mgmt/ifgraph/Makefile
index 2b16f9c123e..14f4b3bf8a2 100644
--- a/net-mgmt/ifgraph/Makefile
+++ b/net-mgmt/ifgraph/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	ifgraph
 PORTVERSION=	0.4.10
 PORTREVISION=	2
 CATEGORIES=	net-mgmt www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION}
 
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Simple grapher of SNMP data with RRD
diff --git a/net-mgmt/ipacco/Makefile b/net-mgmt/ipacco/Makefile
index ed97561292b..e3a9fc2dbb1 100644
--- a/net-mgmt/ipacco/Makefile
+++ b/net-mgmt/ipacco/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	ipacco
 PORTVERSION=	0.2.0.1
 PORTREVISION=	5
 CATEGORIES=	net-mgmt www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	ipacco
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Web based tool to analyze Cisco IP accounting data
diff --git a/net-mgmt/ipcad/Makefile b/net-mgmt/ipcad/Makefile
index 8e8f818a792..727b63619d8 100644
--- a/net-mgmt/ipcad/Makefile
+++ b/net-mgmt/ipcad/Makefile
@@ -9,10 +9,11 @@ PORTNAME=	ipcad
 PORTVERSION=	3.7.3
 PORTREVISION=	1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} 	\
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} 	\
 		http://ipcad.sourceforge.net/	\
+
 		http://lionet.info/soft/
-MASTER_SITE_SUBDIR=	${PORTNAME}
+
 
 MAINTAINER=	vlm@lionet.info
 COMMENT=	IP accounting daemon with Cisco-like RSH and NetFlow export
diff --git a/net-mgmt/ipplan/Makefile b/net-mgmt/ipplan/Makefile
index eb6d199f973..c1223f5823b 100644
--- a/net-mgmt/ipplan/Makefile
+++ b/net-mgmt/ipplan/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	ipplan
 PORTVERSION=	4.92
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF/iptrack
+MASTER_SITES=	SF/iptrack/${PORTNAME}/Release%20${PORTVERSION}
 
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	IP address management and tracking
diff --git a/net-mgmt/isic/Makefile b/net-mgmt/isic/Makefile
index 7fbf61733cc..0679a18f471 100644
--- a/net-mgmt/isic/Makefile
+++ b/net-mgmt/isic/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	isic
 PORTVERSION=	0.07
 PORTREVISION=	1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/ISIC%20v${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	wxs@FreeBSD.org
diff --git a/net-mgmt/jffnms/Makefile b/net-mgmt/jffnms/Makefile
index f6e8ef09ca3..8ebf82c04af 100644
--- a/net-mgmt/jffnms/Makefile
+++ b/net-mgmt/jffnms/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	jffnms
 PORTVERSION=	0.8.3
 PORTREVISION=	4
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Very advanced network monitoring and control system
diff --git a/net-mgmt/mtrace/Makefile b/net-mgmt/mtrace/Makefile
index 82e627e1e19..92b2743c0ec 100644
--- a/net-mgmt/mtrace/Makefile
+++ b/net-mgmt/mtrace/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	mtrace
 PORTVERSION=	5.2
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	bms@FreeBSD.org
 COMMENT=	Multicast traceroute program for IPv4
diff --git a/net-mgmt/nagios-check_bacula/Makefile b/net-mgmt/nagios-check_bacula/Makefile
index 5a067d580b4..601b6b1de41 100644
--- a/net-mgmt/nagios-check_bacula/Makefile
+++ b/net-mgmt/nagios-check_bacula/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	check_bacula
 PORTVERSION=	3.0.0
 PORTREVISION=	1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF/bacula
+MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 PKGNAMEPREFIX=	nagios-
 DISTNAME=	bacula-${PORTVERSION}
 
diff --git a/net-mgmt/nagios-devel/Makefile b/net-mgmt/nagios-devel/Makefile
index 9e6bde75ea7..17290b01467 100644
--- a/net-mgmt/nagios-devel/Makefile
+++ b/net-mgmt/nagios-devel/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	nagios
 PORTVERSION=	3.1.2
 PORTREVISION=	1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-3.x/${PORTNAME}-${PORTVERSION}
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	jarrod@netleader.com.au
diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile
index a1f06866bb4..b316a61225b 100644
--- a/net-mgmt/nagios/Makefile
+++ b/net-mgmt/nagios/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	nagios
 PORTVERSION=	3.0.6
 PORTREVISION=	3
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-3.x/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	jarrod@netleader.com.au
 COMMENT=	Extremely powerful network monitoring system
diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile
index 06c9abeff5e..46bdf7335d9 100644
--- a/net-mgmt/nagios2/Makefile
+++ b/net-mgmt/nagios2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	nagios
 PORTVERSION=	2.12
 PORTREVISION=	5
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-2.x/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	jarrod@netleader.com.au
 COMMENT=	Extremely powerful network monitoring system
diff --git a/net-mgmt/nagiostat/Makefile b/net-mgmt/nagiostat/Makefile
index 0b184a78738..9770a7b7a29 100644
--- a/net-mgmt/nagiostat/Makefile
+++ b/net-mgmt/nagiostat/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	nagiostat
 PORTVERSION=	1.0.0
 PORTREVISION=	3
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/1.0
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	janos.mohacsi@bsd.hu
diff --git a/net-mgmt/ndoutils/Makefile b/net-mgmt/ndoutils/Makefile
index 2633a869623..f054b71eafb 100644
--- a/net-mgmt/ndoutils/Makefile
+++ b/net-mgmt/ndoutils/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	ndoutils
 PORTVERSION=	1.4b7
 PORTREVISION=	1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	nagios
+MASTER_SITES=	SF/nagios/${PORTNAME}-1.x/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	pgollucci@FreeBSD.org
 COMMENT=	Keep Nagios perfdata in MySQL or Postgresql database
diff --git a/net-mgmt/ndpmon/Makefile b/net-mgmt/ndpmon/Makefile
index fa827a18481..5200df9c8ef 100644
--- a/net-mgmt/ndpmon/Makefile
+++ b/net-mgmt/ndpmon/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	ndpmon
 PORTVERSION=	1.3d
 CATEGORIES=	net-mgmt ipv6
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-1.3
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	janos.mohacsi@bsd.hu
diff --git a/net-mgmt/nedi/Makefile b/net-mgmt/nedi/Makefile
index 2a5763363a5..ef72653f4ec 100644
--- a/net-mgmt/nedi/Makefile
+++ b/net-mgmt/nedi/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	nedi
 DISTVERSION=	1.0.w
 PORTREVISION=	1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/w
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	cristi@net.utcluj.ro
diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile
index c2440a81e69..a9a7d46755c 100644
--- a/net-mgmt/net-snmp-devel/Makefile
+++ b/net-mgmt/net-snmp-devel/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	snmp
 PORTVERSION=	5.4.2.1
 PORTREVISION=	5
 CATEGORIES=	net-mgmt ipv6
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	net-snmp
+MASTER_SITES=	SF/net-${PORTNAME}/net-${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	net-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
diff --git a/net-mgmt/net-snmp-tkmib/Makefile b/net-mgmt/net-snmp-tkmib/Makefile
index abc876757a4..33980146651 100644
--- a/net-mgmt/net-snmp-tkmib/Makefile
+++ b/net-mgmt/net-snmp-tkmib/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	ucd-snmp-tkmib
 PORTVERSION=	4.2.7.1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	net-snmp
+MASTER_SITES=	SF/net-snmp/ucd-snmp/${PORTVERSION}%20source%20code
 DISTNAME=	ucd-snmp-${PORTVERSION}
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index c2440a81e69..a9a7d46755c 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	snmp
 PORTVERSION=	5.4.2.1
 PORTREVISION=	5
 CATEGORIES=	net-mgmt ipv6
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	net-snmp
+MASTER_SITES=	SF/net-${PORTNAME}/net-${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	net-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
diff --git a/net-mgmt/net-snmp4/Makefile b/net-mgmt/net-snmp4/Makefile
index 14d32099f99..9a0fecce1c3 100644
--- a/net-mgmt/net-snmp4/Makefile
+++ b/net-mgmt/net-snmp4/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	ucd-snmp
 PORTVERSION=	4.2.7.1
 CATEGORIES=	net-mgmt ipv6
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	net-snmp
+MASTER_SITES=	SF/net-snmp/${PORTNAME}/${PORTVERSION}%20source%20code
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An extendable SNMP implementation
diff --git a/net-mgmt/netams/Makefile b/net-mgmt/netams/Makefile
index 4684467ce50..a606f3b3b5e 100644
--- a/net-mgmt/netams/Makefile
+++ b/net-mgmt/netams/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	netams
 DISTVERSION=	3.4.1rc1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	http://www.netams.com/files/ \
-		SF
+MASTER_SITES=	http://www.netams.com/files/
 
 MAINTAINER=	jura@netams.com
 COMMENT=	Network Traffic Accounting and Monitoring Software
diff --git a/net-mgmt/netdisco/Makefile b/net-mgmt/netdisco/Makefile
index c937a7e34c0..877b8f5af8b 100644
--- a/net-mgmt/netdisco/Makefile
+++ b/net-mgmt/netdisco/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	netdisco
 PORTVERSION=	0.95
 PORTREVISION=	2
 CATEGORIES=	net-mgmt www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}_with_mibs
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net-mgmt/netleak/Makefile b/net-mgmt/netleak/Makefile
index 78259f0d8af..7df06d2a706 100644
--- a/net-mgmt/netleak/Makefile
+++ b/net-mgmt/netleak/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	netleak
 PORTVERSION=	0.1a
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-devel/${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net-mgmt/nfdump-devel/Makefile b/net-mgmt/nfdump-devel/Makefile
index 9514904db29..e5de4e2a1c5 100644
--- a/net-mgmt/nfdump-devel/Makefile
+++ b/net-mgmt/nfdump-devel/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	nfdump-devel
 PORTVERSION=	20070808
 PORTREVISION=	1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	nfdump
+MASTER_SITES=	SF/nfdump/snapshot/nfdump-snapshot-${PORTVERSION}
 DISTNAME=	nfdump-snapshot-${PORTVERSION}
 
 MAINTAINER=	janos.mohacsi@bsd.hu
diff --git a/net-mgmt/nfdump/Makefile b/net-mgmt/nfdump/Makefile
index 05471df55eb..a1b0b924515 100644
--- a/net-mgmt/nfdump/Makefile
+++ b/net-mgmt/nfdump/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	nfdump
 PORTVERSION=	1.5.8
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	Command-line tools to collect and process NetFlow data
diff --git a/net-mgmt/nfsen/Makefile b/net-mgmt/nfsen/Makefile
index 2c28990d168..faa71520626 100644
--- a/net-mgmt/nfsen/Makefile
+++ b/net-mgmt/nfsen/Makefile
@@ -8,9 +8,9 @@
 PORTNAME=	nfsen
 PORTVERSION=	1.3.2
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION} \
 		http://nfsen.sourceforge.net/
-MASTER_SITE_SUBDIR=	${PORTNAME}
+
 
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	Web based frontend to nfdump netflow collector
diff --git a/net-mgmt/nipper/Makefile b/net-mgmt/nipper/Makefile
index e6ee3101b4d..3ac42895a81 100644
--- a/net-mgmt/nipper/Makefile
+++ b/net-mgmt/nipper/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	nipper
 PORTVERSION=	0.11.10
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Nipper%20${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	steinex@nognu.de
diff --git a/net-mgmt/nrpe2/Makefile b/net-mgmt/nrpe2/Makefile
index 06db4b5454f..bdb980de265 100644
--- a/net-mgmt/nrpe2/Makefile
+++ b/net-mgmt/nrpe2/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	nrpe
 DISTVERSION=	2.12
 PORTREVISION=	1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	nagios
+MASTER_SITES=	SF/nagios/${PORTNAME}-2.x/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	jarrod@netleader.com.au
 COMMENT=	Nagios Remote Plugin Executor
diff --git a/net-mgmt/nsca-client/Makefile b/net-mgmt/nsca-client/Makefile
index 80f0146e238..dd5c8e9adcc 100644
--- a/net-mgmt/nsca-client/Makefile
+++ b/net-mgmt/nsca-client/Makefile
@@ -5,7 +5,6 @@
 # $FreeBSD$
 #
 
-PORTNAME=	nsca
 PKGNAMESUFFIX=	-client
 
 MASTERDIR=	${.CURDIR}/../nsca
diff --git a/net-mgmt/nsca/Makefile b/net-mgmt/nsca/Makefile
index c26ba3db5ed..d3446023bae 100644
--- a/net-mgmt/nsca/Makefile
+++ b/net-mgmt/nsca/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	nsca
 PORTVERSION=	2.7.2
 PORTREVISION=	2
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	nagios
+MASTER_SITES=	SF/nagios/nsca-2.x/nsca-${PORTVERSION}
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Nagios Service Check Acceptor
diff --git a/net-mgmt/ocsinventory-agent/Makefile b/net-mgmt/ocsinventory-agent/Makefile
index 99b4a379b37..00b99de2dc8 100644
--- a/net-mgmt/ocsinventory-agent/Makefile
+++ b/net-mgmt/ocsinventory-agent/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Ocsinventory
 PORTVERSION=	1.02
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	ocsinventory
+MASTER_SITES=	SF/${PORTNAME:L}/OCS%20Inventory%20NG/${PORTVERSION}
 PKGNAMESUFFIX=	-Agent
 DISTNAME=	OCSNG_UNIX_AGENT-${PORTVERSION}
 
diff --git a/net-mgmt/ocsinventory-ng/Makefile b/net-mgmt/ocsinventory-ng/Makefile
index 0694c32a64e..a63ba59e09b 100644
--- a/net-mgmt/ocsinventory-ng/Makefile
+++ b/net-mgmt/ocsinventory-ng/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	ocsinventory-ng
 PORTVERSION=	1.02.1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	ocsinventory
+MASTER_SITES=	SF/ocsinventory/OCS%20Inventory%20NG/1.02
 DISTNAME=	OCSNG_UNIX_SERVER-${PORTVERSION}
 
 MAINTAINER=	araujo@FreeBSD.org
diff --git a/net-mgmt/openlldp/Makefile b/net-mgmt/openlldp/Makefile
index 1245bce70a1..48e0ce8e2db 100644
--- a/net-mgmt/openlldp/Makefile
+++ b/net-mgmt/openlldp/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	openlldp
 DISTVERSION=	0.3alpha
 PORTREVISION=	1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.3alpha
 
 MAINTAINER=	roar.pettersen@it.uib.no
 COMMENT=	Link Layer Discovery Protocol daemon
diff --git a/net-mgmt/openvmps/Makefile b/net-mgmt/openvmps/Makefile
index 360a3ee2d05..00933a2709b 100644
--- a/net-mgmt/openvmps/Makefile
+++ b/net-mgmt/openvmps/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	openvmps
 PORTVERSION=	1.3
 PORTREVISION=	1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	vmps
+MASTER_SITES=	SF/vmps/vmpsd/${PORTVERSION}
 DISTNAME=	vmpsd-${PORTVERSION}
 
 MAINTAINER=	craig@yekse.gank.org
diff --git a/net-mgmt/ourmon/Makefile b/net-mgmt/ourmon/Makefile
index 894105373a5..3ea93600451 100644
--- a/net-mgmt/ourmon/Makefile
+++ b/net-mgmt/ourmon/Makefile
@@ -8,7 +8,7 @@ PORTNAME=	ourmon
 PORTVERSION=	2.8.1
 PORTREVISION=	3
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}281
 DISTNAME=	ourmon281
 
 MAINTAINER=	manos@cs.pdx.edu
diff --git a/net-mgmt/p5-SNMP-Info/Makefile b/net-mgmt/p5-SNMP-Info/Makefile
index b0b5d1bbdf3..c4cf3f0dfd8 100644
--- a/net-mgmt/p5-SNMP-Info/Makefile
+++ b/net-mgmt/p5-SNMP-Info/Makefile
@@ -8,7 +8,6 @@ PORTNAME=	SNMP-Info
 PORTVERSION=	2.01
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	snmp-info
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jadawin@FreeBSD.org
diff --git a/net-mgmt/p5-SNMP/Makefile b/net-mgmt/p5-SNMP/Makefile
index d8b0bbeb36f..94153300d58 100644
--- a/net-mgmt/p5-SNMP/Makefile
+++ b/net-mgmt/p5-SNMP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	SNMP
 PORTVERSION=	4.2.7.1
 CATEGORIES=	net-mgmt perl5
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	net-snmp
+MASTER_SITES=	SF/net-${PORTNAME:L}/ucd-${PORTNAME:L}/${PORTVERSION}%20source%20code
 PKGNAMEPREFIX=	p5-
 DISTNAME=	ucd-snmp-${PORTVERSION}
 
diff --git a/net-mgmt/pads/Makefile b/net-mgmt/pads/Makefile
index 14df522d9a0..e13a431d7ab 100644
--- a/net-mgmt/pads/Makefile
+++ b/net-mgmt/pads/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	pads
 PORTVERSION=	1.2
 PORTREVISION=	1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF/passive
+MASTER_SITES=	SF/passive/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Passively detect network assets
diff --git a/net-mgmt/phpip/Makefile b/net-mgmt/phpip/Makefile
index bb00c2fecdb..8524b630962 100644
--- a/net-mgmt/phpip/Makefile
+++ b/net-mgmt/phpip/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	phpip
 PORTVERSION=	${SNAPSHOT}
 CATEGORIES=	net-mgmt www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	phpip
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/4.3.2%20-%20No%20Upgrade%20Support
 DISTNAME=	${PORTNAME}-4.3.2-build-${SNAPSHOT}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net-mgmt/pixilate/Makefile b/net-mgmt/pixilate/Makefile
index 62d18242814..d2c44602887 100644
--- a/net-mgmt/pixilate/Makefile
+++ b/net-mgmt/pixilate/Makefile
@@ -8,8 +8,7 @@ PORTNAME=	pixilate
 PORTVERSION=	0.4.1
 PORTREVISION=	4
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	winfingerprint
+MASTER_SITES=	SF/winfingerprint/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generates packets to match a list of Cisco PIX access lists
diff --git a/net-mgmt/pnp/Makefile b/net-mgmt/pnp/Makefile
index c9727feca0e..37e6a08c06a 100644
--- a/net-mgmt/pnp/Makefile
+++ b/net-mgmt/pnp/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	pnp
 PORTVERSION=	0.4.14
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF/pnp4nagios
+MASTER_SITES=	SF/${PORTNAME}4nagios/PNP/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	rea-fbsd@codelabs.ru
 COMMENT=	Nagios performance data collector and grapher
diff --git a/net-mgmt/py-snmp/Makefile b/net-mgmt/py-snmp/Makefile
index f7591e3942b..a66fe89deef 100644
--- a/net-mgmt/py-snmp/Makefile
+++ b/net-mgmt/py-snmp/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	snmp
 PORTVERSION=	3.4.4
 CATEGORIES=	net-mgmt python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	pysnmp
+MASTER_SITES=	SF/py${PORTNAME}/py${PORTNAME}-devel/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pysnmp-${PORTVERSION}
 
diff --git a/net-mgmt/py-snmp2/Makefile b/net-mgmt/py-snmp2/Makefile
index fb62bd61275..717265241e6 100644
--- a/net-mgmt/py-snmp2/Makefile
+++ b/net-mgmt/py-snmp2/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	snmp2
 PORTVERSION=	2.0.9
 CATEGORIES=	net-mgmt python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	pysnmp
+MASTER_SITES=	SF/pysnmp/pysnmp/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pysnmp-${PORTVERSION}
 
diff --git a/net-mgmt/py-snmp4-apps/Makefile b/net-mgmt/py-snmp4-apps/Makefile
index 74ac5dfb821..377cfb78338 100644
--- a/net-mgmt/py-snmp4-apps/Makefile
+++ b/net-mgmt/py-snmp4-apps/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	snmp4-apps
 PORTVERSION=	0.2.7a
 CATEGORIES=	net-mgmt python
-MASTER_SITES=	SF/pysnmp
+MASTER_SITES=	SF/pysnmp/pysnmp-apps-devel/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pysnmp-apps-${PORTVERSION}
 
diff --git a/net-mgmt/py-snmp4-mibs/Makefile b/net-mgmt/py-snmp4-mibs/Makefile
index 451a2d8474e..7b605b1b867 100644
--- a/net-mgmt/py-snmp4-mibs/Makefile
+++ b/net-mgmt/py-snmp4-mibs/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	snmp4-mibs
 PORTVERSION=	0.0.6a
 CATEGORIES=	net-mgmt python
-MASTER_SITES=	SF/pysnmp
+MASTER_SITES=	SF/pysnmp/pysnmp-mibs-devel/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pysnmp-mibs-${PORTVERSION}
 
diff --git a/net-mgmt/py-snmp4/Makefile b/net-mgmt/py-snmp4/Makefile
index 873dc4312b1..45f27dab47c 100644
--- a/net-mgmt/py-snmp4/Makefile
+++ b/net-mgmt/py-snmp4/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	snmp4
 PORTVERSION=	4.1.10a
 CATEGORIES=	net-mgmt python
-MASTER_SITES=	SF/pysnmp
+MASTER_SITES=	SF/pysnmp/pysnmp-devel/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pysnmp-${PORTVERSION}
 
diff --git a/net-mgmt/py-twistedSNMP/Makefile b/net-mgmt/py-twistedSNMP/Makefile
index 09845989258..25d6205fb19 100644
--- a/net-mgmt/py-twistedSNMP/Makefile
+++ b/net-mgmt/py-twistedSNMP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	twistedSNMP
 PORTVERSION=	0.3.13
 CATEGORIES=	net-mgmt python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME:L}
+MASTER_SITES=	SF
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	TwistedSNMP-${PORTVERSION}
 
diff --git a/net-mgmt/py-yapsnmp/Makefile b/net-mgmt/py-yapsnmp/Makefile
index 430123d3ca1..832313c7ffc 100644
--- a/net-mgmt/py-yapsnmp/Makefile
+++ b/net-mgmt/py-yapsnmp/Makefile
@@ -8,8 +8,7 @@ PORTNAME=	yapsnmp
 PORTVERSION=	0.7.8
 PORTREVISION=	5
 CATEGORIES=	net-mgmt python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	yapsnmp
+MASTER_SITES=	SF
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	arved@FreeBSD.org
diff --git a/net-mgmt/sblim-wbemcli/Makefile b/net-mgmt/sblim-wbemcli/Makefile
index 7e560021c60..4f2ed7e9c90 100644
--- a/net-mgmt/sblim-wbemcli/Makefile
+++ b/net-mgmt/sblim-wbemcli/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	sblim-wbemcli
 PORTVERSION=	1.6.1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,sblim,}
+MASTER_SITES=	SF/sblim/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	CLI for Web Based Enterprise Management by SBLIM
diff --git a/net-mgmt/scdp/Makefile b/net-mgmt/scdp/Makefile
index 511aec75d08..a37c0527013 100644
--- a/net-mgmt/scdp/Makefile
+++ b/net-mgmt/scdp/Makefile
@@ -8,8 +8,7 @@ PORTNAME=	scdp
 PORTVERSION=	1.0.b
 PORTREVISION=	3
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	scdp
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/1.0b
 DISTNAME=	scdp-${PORTVERSION:S/.b/b/}
 
 MAINTAINER=	arved@FreeBSD.org
diff --git a/net-mgmt/sdig/Makefile b/net-mgmt/sdig/Makefile
index 2db7b2b996e..656cd52c27c 100644
--- a/net-mgmt/sdig/Makefile
+++ b/net-mgmt/sdig/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	sdig
 PORTVERSION=	0.43
 PORTREVISION=	3
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	raj@cserv62.csub.edu
 COMMENT=	Translate IP/DNS/WINS/MAC address into port description
diff --git a/net-mgmt/sing/Makefile b/net-mgmt/sing/Makefile
index 52d6307567f..c4fcf58f8eb 100644
--- a/net-mgmt/sing/Makefile
+++ b/net-mgmt/sing/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	sing
 PORTVERSION=	1.1
 PORTREVISION=	2
 CATEGORIES=	net-mgmt security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20sources/${PORTVERSION}
 DISTNAME=	SING-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
diff --git a/net-mgmt/snmptt/Makefile b/net-mgmt/snmptt/Makefile
index 7a45e4dc9d3..53b061e4553 100644
--- a/net-mgmt/snmptt/Makefile
+++ b/net-mgmt/snmptt/Makefile
@@ -9,7 +9,7 @@ PORTNAME=		snmptt
 PORTVERSION=		1.2
 PORTREVISION=		1
 CATEGORIES=		net-mgmt
-MASTER_SITES=		SF
+MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/${PORTNAME}_${PORTVERSION}
 DISTNAME=		${PORTNAME}_${PORTVERSION}
 EXTRACT_SUFX=		.tgz
 
diff --git a/net-mgmt/tcpreplay/Makefile b/net-mgmt/tcpreplay/Makefile
index 906268876c4..94a2c6aab7d 100644
--- a/net-mgmt/tcpreplay/Makefile
+++ b/net-mgmt/tcpreplay/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	tcpreplay
 PORTVERSION=	3.4.3
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A tool to replay saved packet capture files
diff --git a/net-mgmt/tork/Makefile b/net-mgmt/tork/Makefile
index 49e1334c694..f922e471751 100644
--- a/net-mgmt/tork/Makefile
+++ b/net-mgmt/tork/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	tork
 PORTVERSION=	0.30
 PORTREVISION=	1
 CATEGORIES=	net-mgmt security
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/TorK%20Source%20Tarball/TorK-${PORTVERSION}
 
 MAINTAINER=	thomas.sander@gmx.de
 COMMENT=	TorK is an Anonymity Manager for the KDE Desktop
diff --git a/net-mgmt/weplab/Makefile b/net-mgmt/weplab/Makefile
index c2307b257fb..f31cb556cec 100644
--- a/net-mgmt/weplab/Makefile
+++ b/net-mgmt/weplab/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	weplab
 PORTVERSION=	0.1.5
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	WepLab is a tool designed to teach how WEP works
diff --git a/net-mgmt/xymon-client/Makefile b/net-mgmt/xymon-client/Makefile
index 4b7f68cba8d..fa1faec6268 100644
--- a/net-mgmt/xymon-client/Makefile
+++ b/net-mgmt/xymon-client/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	xymon
 PORTVERSION=	4.2.3
 CATEGORIES=	net-mgmt www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	hobbitmon
+MASTER_SITES=	SF/hobbitmon/hobbitserver/${PORTVERSION}
 PKGNAMESUFFIX=	-client${PKGNAMESUFFIX2}
 
 MAINTAINER=	dinoex@FreeBSD.org
diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile
index fee17f7109d..5de6219394b 100644
--- a/net-mgmt/xymon-server/Makefile
+++ b/net-mgmt/xymon-server/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	xymon
 PORTVERSION=	4.2.3
 CATEGORIES=	net-mgmt www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	hobbitmon
+MASTER_SITES=	SF/hobbitmon/hobbitserver/${PORTVERSION}
 PKGNAMESUFFIX=	-server${PKGNAMESUFFIX2}
 
 MAINTAINER=	dinoex@FreeBSD.org
diff --git a/net-mgmt/zabbix-agent/Makefile b/net-mgmt/zabbix-agent/Makefile
index 2b4b115c060..4a060b1d06b 100644
--- a/net-mgmt/zabbix-agent/Makefile
+++ b/net-mgmt/zabbix-agent/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	zabbix
 PORTVERSION=	1.6.5
 PORTEPOCH=	2
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/ZABBIX%20Latest%20Stable/${PORTVERSION}
 PKGNAMESUFFIX=	-agent
 
 MAINTAINER=	ports@christianserving.org
diff --git a/net-mgmt/zabbix/Makefile b/net-mgmt/zabbix/Makefile
index 4f38e914f82..91b7a81dfa6 100644
--- a/net-mgmt/zabbix/Makefile
+++ b/net-mgmt/zabbix/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.6.5
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/ZABBIX%20Latest%20Stable/${PORTVERSION}
 
 MAINTAINER=	ports@christianserving.org
 COMMENT=	Application and network monitoring solution
diff --git a/net-mgmt/zabbix2-agent/Makefile b/net-mgmt/zabbix2-agent/Makefile
index 2b4b115c060..4a060b1d06b 100644
--- a/net-mgmt/zabbix2-agent/Makefile
+++ b/net-mgmt/zabbix2-agent/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	zabbix
 PORTVERSION=	1.6.5
 PORTEPOCH=	2
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/ZABBIX%20Latest%20Stable/${PORTVERSION}
 PKGNAMESUFFIX=	-agent
 
 MAINTAINER=	ports@christianserving.org
diff --git a/net-mgmt/zabbix2/Makefile b/net-mgmt/zabbix2/Makefile
index 4f38e914f82..91b7a81dfa6 100644
--- a/net-mgmt/zabbix2/Makefile
+++ b/net-mgmt/zabbix2/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.6.5
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/ZABBIX%20Latest%20Stable/${PORTVERSION}
 
 MAINTAINER=	ports@christianserving.org
 COMMENT=	Application and network monitoring solution