12 files changed, 12 insertions, 22 deletions

diff --git a/dns/crossip/Makefile b/dns/crossip/Makefile
index 61469796d650..2ff001265322 100644
--- a/dns/crossip/Makefile
+++ b/dns/crossip/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	crossip
 DISTVERSION=	1.2
 PORTREVISION=	4
 CATEGORIES=	dns java
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME:L}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/CrossIP%20${PORTVERSION}
 
 MAINTAINER=	dan@algenta.com
 COMMENT=	Java DNS update client for the ThatIP protocol
diff --git a/dns/ddclient/Makefile b/dns/ddclient/Makefile
index ae3c580038a7..45a28f63adcd 100644
--- a/dns/ddclient/Makefile
+++ b/dns/ddclient/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	ddclient
 PORTVERSION=	3.7.3
 CATEGORIES=	dns
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	radek@raadradd.com
 COMMENT=	Update dynamic DNS entries
diff --git a/dns/dnsjava/Makefile b/dns/dnsjava/Makefile
index 4a6534c6693e..a3490ed8bfbf 100644
--- a/dns/dnsjava/Makefile
+++ b/dns/dnsjava/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	dnsjava
 PORTVERSION=	2.0.6
 PORTREVISION=	1
 CATEGORIES=	dns java
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Implementation of DNS in Java
diff --git a/dns/dnsmax-perl/Makefile b/dns/dnsmax-perl/Makefile
index eb69465c477a..1494715c32bd 100644
--- a/dns/dnsmax-perl/Makefile
+++ b/dns/dnsmax-perl/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	dnsmax-perl
 PORTVERSION=	1.0.1
 CATEGORIES=	dns
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	dynamicdns
+MASTER_SITES=	SF/dynamicdns/${PORTNAME}/${PORTVERSION}
 DISTNAME=	${PORTNAME:L}-${PORTVERSION:S/.p/-pre/:S/.b/-beta/}
 
 MAINTAINER=	dan@algenta.com
diff --git a/dns/dnsutl/Makefile b/dns/dnsutl/Makefile
index 51794024b06e..872b8471ad3d 100644
--- a/dns/dnsutl/Makefile
+++ b/dns/dnsutl/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	dnsutl
 PORTVERSION=	1.11
 CATEGORIES=	dns
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	stefan@fh-mainz.de
 COMMENT=	Programs to make using DNS easier
diff --git a/dns/dualserver/Makefile b/dns/dualserver/Makefile
index 68c25bf9453b..2391995f85be 100644
--- a/dns/dualserver/Makefile
+++ b/dns/dualserver/Makefile
@@ -6,8 +6,7 @@
 PORTNAME=	dualserver
 PORTVERSION=	3.0
 CATEGORIES=	dns net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	dhcp-dns-server
+MASTER_SITES=	SF/dhcp-dns-server/OldFiles
 DISTNAME=	${PORTNAME}V${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/dns/ghtool/Makefile b/dns/ghtool/Makefile
index dc9a189af84b..76ec355dbce0 100644
--- a/dns/ghtool/Makefile
+++ b/dns/ghtool/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	ghtool
 PORTVERSION=	1.0
 CATEGORIES=	dns
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=gh-tool
+MASTER_SITES=	SF/gh-tool/gh-tool/1
 DISTNAME=	ghmain.c
 EXTRACT_SUFX=
 
diff --git a/dns/mydns-ng/Makefile b/dns/mydns-ng/Makefile
index c0cced8fd60a..335260d97ef8 100644
--- a/dns/mydns-ng/Makefile
+++ b/dns/mydns-ng/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	mydns-ng
 PORTREVISION=	1
 PORTVERSION=	1.2.8.27
 CATEGORIES=	dns databases
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	mydns-ng
+MASTER_SITES=	SF/${PORTNAME}/mydns/${PORTVERSION}
 DISTNAME=	mydns-${PORTVERSION}
 
 MAINTAINER=	gaod@hychen.org
diff --git a/dns/posadis/Makefile b/dns/posadis/Makefile
index 8f433730b9a2..eef909c97707 100644
--- a/dns/posadis/Makefile
+++ b/dns/posadis/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	posadis
 PORTVERSION=	0.60.5
 PORTREVISION=	4
 CATEGORIES=	dns ipv6
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/OldFiles
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Domain Name Server (DNS) implementation
diff --git a/dns/py-dns/Makefile b/dns/py-dns/Makefile
index fdc268769290..9ec6f31a8ef0 100644
--- a/dns/py-dns/Makefile
+++ b/dns/py-dns/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	dns
 PORTVERSION=	2.3.3
 CATEGORIES=	dns python
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	pydns
+MASTER_SITES=	SF/py${PORTNAME}/py${PORTNAME}/py${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pydns-${PORTVERSION}
 
diff --git a/dns/rbllookup/Makefile b/dns/rbllookup/Makefile
index c366ec5d8ebd..01d7732f789c 100644
--- a/dns/rbllookup/Makefile
+++ b/dns/rbllookup/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	rbllookup
 PORTVERSION=	0.0.1.1
 CATEGORIES=	dns mail
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	drixter@e-utp.net
 COMMENT=	Check given IP/Host presence in 106 RBLs
diff --git a/dns/zkt/Makefile b/dns/zkt/Makefile
index f33e9f8a4c86..a835b9dbca44 100644
--- a/dns/zkt/Makefile
+++ b/dns/zkt/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=		zkt
 DISTVERSION=		0.99c
 CATEGORIES=		dns
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-v${DISTVERSION} \
 			http://www.hznet.de/dns/zkt/
 MASTER_SITE_SUBDIR=	${PORTNAME}