48 files changed, 50 insertions, 50 deletions

diff --git a/chinese/bind8/Makefile b/chinese/bind8/Makefile
index 0bc8566d3708..6426c0035e62 100644
--- a/chinese/bind8/Makefile
+++ b/chinese/bind8/Makefile
@@ -7,7 +7,7 @@
 
 CATEGORIES=	chinese net
 
-MASTERDIR=	${.CURDIR}/../../net/bind8
+MASTERDIR=	${.CURDIR}/../../dns/bind8
 
 PATCH_SITES=	http://www.sinica.edu.tw/~jihuang/
 
diff --git a/devel/liboop/Makefile b/devel/liboop/Makefile
index a19d7de48ef4..959bceb0d9dc 100644
--- a/devel/liboop/Makefile
+++ b/devel/liboop/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://download.ofb.net/liboop/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A low-level event loop management library for POSIX-based OS
 
-LIB_DEPENDS=	adns.1:${PORTSDIR}/net/adns \
+LIB_DEPENDS=	adns.1:${PORTSDIR}/dns/adns \
 		wwwcore.1:${PORTSDIR}/www/libwww
 
 USE_BZIP2=	yes
diff --git a/dns/bind9-dlz/Makefile b/dns/bind9-dlz/Makefile
index 87565ab2caef..401ea44b7410 100644
--- a/dns/bind9-dlz/Makefile
+++ b/dns/bind9-dlz/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	bind9
 PORTVERSION=	${ISCVERSION}+${DLZVERSION}
 CATEGORIES=	dns ipv6
 MASTER_SITES=	${MASTER_SITE_ISC} \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/bind9/${ISCVERSION}/,} \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,dns/bind9/${ISCVERSION}/,} \
 		${MASTER_SITES_DLZ:S/$/:dlz/}
 MASTER_SITE_SUBDIR=	bind-dlz/:dlz
 PKGNAMESUFFIX=	-dlz
diff --git a/dns/bind9/Makefile b/dns/bind9/Makefile
index 65be5cd33aa8..059ec0925a52 100644
--- a/dns/bind9/Makefile
+++ b/dns/bind9/Makefile
@@ -15,7 +15,7 @@ PORTNAME=	bind9
 PORTVERSION=	9.2.2
 CATEGORIES=	dns ipv6
 MASTER_SITES=	${MASTER_SITE_ISC} \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/bind9/${ISCVERSION}/,}
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,dns/bind9/${ISCVERSION}/,}
 MASTER_SITE_SUBDIR=	bind9/${ISCVERSION}
 DISTFILES=	bind-${ISCVERSION}.tar.gz
 
diff --git a/dns/bind94/Makefile b/dns/bind94/Makefile
index 65be5cd33aa8..059ec0925a52 100644
--- a/dns/bind94/Makefile
+++ b/dns/bind94/Makefile
@@ -15,7 +15,7 @@ PORTNAME=	bind9
 PORTVERSION=	9.2.2
 CATEGORIES=	dns ipv6
 MASTER_SITES=	${MASTER_SITE_ISC} \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/bind9/${ISCVERSION}/,}
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,dns/bind9/${ISCVERSION}/,}
 MASTER_SITE_SUBDIR=	bind9/${ISCVERSION}
 DISTFILES=	bind-${ISCVERSION}.tar.gz
 
diff --git a/dns/bind95/Makefile b/dns/bind95/Makefile
index 65be5cd33aa8..059ec0925a52 100644
--- a/dns/bind95/Makefile
+++ b/dns/bind95/Makefile
@@ -15,7 +15,7 @@ PORTNAME=	bind9
 PORTVERSION=	9.2.2
 CATEGORIES=	dns ipv6
 MASTER_SITES=	${MASTER_SITE_ISC} \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/bind9/${ISCVERSION}/,}
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,dns/bind9/${ISCVERSION}/,}
 MASTER_SITE_SUBDIR=	bind9/${ISCVERSION}
 DISTFILES=	bind-${ISCVERSION}.tar.gz
 
diff --git a/dns/bind96/Makefile b/dns/bind96/Makefile
index 65be5cd33aa8..059ec0925a52 100644
--- a/dns/bind96/Makefile
+++ b/dns/bind96/Makefile
@@ -15,7 +15,7 @@ PORTNAME=	bind9
 PORTVERSION=	9.2.2
 CATEGORIES=	dns ipv6
 MASTER_SITES=	${MASTER_SITE_ISC} \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/bind9/${ISCVERSION}/,}
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,dns/bind9/${ISCVERSION}/,}
 MASTER_SITE_SUBDIR=	bind9/${ISCVERSION}
 DISTFILES=	bind-${ISCVERSION}.tar.gz
 
diff --git a/dns/dnssecwalker/Makefile b/dns/dnssecwalker/Makefile
index 1c1182dbdcc6..f27beea6c65e 100644
--- a/dns/dnssecwalker/Makefile
+++ b/dns/dnssecwalker/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	walker-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DNSSEC Walker
 
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS
+RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
 
 USE_PERL5=	yes
 NO_BUILD=	yes
diff --git a/dns/dnswalk/Makefile b/dns/dnswalk/Makefile
index 936740b4e4b7..b33999023f1a 100644
--- a/dns/dnswalk/Makefile
+++ b/dns/dnswalk/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.visi.com/~barr/dnswalk/
 MAINTAINER=	mph@freebsd.org
 COMMENT=	DNS debugger - requests a zone transfer and analyzes the result
 
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS
+RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
 
 NO_WRKSUBDIR=	YES
 NO_BUILD=	YES
diff --git a/dns/fastresolve/Makefile b/dns/fastresolve/Makefile
index de8ed4f51247..6830858cbd10 100644
--- a/dns/fastresolve/Makefile
+++ b/dns/fastresolve/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Programs that process web logs to get DNS and domain ownership info
 
 LIB_DEPENDS=	db3.3:${PORTSDIR}/databases/db3 \
-		adns.1:${PORTSDIR}/net/adns
+		adns.1:${PORTSDIR}/dns/adns
 
 USE_BZIP2=	yes
 USE_PERL5=	yes
diff --git a/dns/p5-Net-DNS-SEC/Makefile b/dns/p5-Net-DNS-SEC/Makefile
index fde1148cecb6..c550266e9884 100644
--- a/dns/p5-Net-DNS-SEC/Makefile
+++ b/dns/p5-Net-DNS-SEC/Makefile
@@ -16,7 +16,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	erwin@FreeBSD.org
 COMMENT=	DNSSEC extensions to Net::DNS
 
-BUILD_DEPENDS=	${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS \
+BUILD_DEPENDS=	${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS \
 		${SITE_PERL}/${PERL_ARCH}/Crypt/OpenSSL/RSA.pm:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA \
 		${SITE_PERL}/${PERL_ARCH}/Crypt/OpenSSL/DSA.pm:${PORTSDIR}/security/p5-Crypt-OpenSSL-DSA \
 		${SITE_PERL}/${PERL_ARCH}/Crypt/OpenSSL/Bignum.pm:${PORTSDIR}/security/p5-Crypt-OpenSSL-Bignum \
diff --git a/dns/p5-Net-DNS-ZoneFile/Makefile b/dns/p5-Net-DNS-ZoneFile/Makefile
index 2716ef6a6629..a2c859789380 100644
--- a/dns/p5-Net-DNS-ZoneFile/Makefile
+++ b/dns/p5-Net-DNS-ZoneFile/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Perl extension to convert a zone file to a collection of RRs
 
-BUILD_DEPENDS=	${SITE_PERL}/Net/DNS/RR.pm:${PORTSDIR}/net/p5-Net-DNS \
+BUILD_DEPENDS=	${SITE_PERL}/Net/DNS/RR.pm:${PORTSDIR}/dns/p5-Net-DNS \
 		${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
 		${SITE_PERL}/NetAddr/IP.pm:${PORTSDIR}/net/p5-NetAddr-IP
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/dns/p5-POE-Component-Client-DNS/Makefile b/dns/p5-POE-Component-Client-DNS/Makefile
index f92d060bd04f..4a366466d16f 100644
--- a/dns/p5-POE-Component-Client-DNS/Makefile
+++ b/dns/p5-POE-Component-Client-DNS/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	skv@FreeBSD.org
 COMMENT=	POE component for non-blocking/concurrent DNS queries
 
 BUILD_DEPENDS=	${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE \
-		${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS
+		${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/dns/p5-Tie-DNS/Makefile b/dns/p5-Tie-DNS/Makefile
index d98451d8d931..e18f5de0aac3 100644
--- a/dns/p5-Tie-DNS/Makefile
+++ b/dns/p5-Tie-DNS/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	svenasse@polaris.ca
 COMMENT=	Tie interface to p5-Net-DNS
 
-BUILD_DEPENDS=	${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS
+BUILD_DEPENDS=	${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
diff --git a/dns/py-adns/Makefile b/dns/py-adns/Makefile
index 707d85c32ff5..96725f4027ec 100644
--- a/dns/py-adns/Makefile
+++ b/dns/py-adns/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	adns-python-${PORTVERSION}
 MAINTAINER=	perky@FreeBSD.org
 COMMENT=	A Python Interface to adns, the asynchronous DNS library
 
-LIB_DEPENDS=	adns.1:${PORTSDIR}/net/adns
+LIB_DEPENDS=	adns.1:${PORTSDIR}/dns/adns
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
diff --git a/dns/sleuth/Makefile b/dns/sleuth/Makefile
index 135146501147..c885360af6ac 100644
--- a/dns/sleuth/Makefile
+++ b/dns/sleuth/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://atrey.karlin.mff.cuni.cz/pub/local/mj/net/
 MAINTAINER=	markp@FreeBSD.org
 COMMENT=	A tool for checking DNS zones
 
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS
+RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
 
 USE_PERL5=	yes
 
diff --git a/dns/walker/Makefile b/dns/walker/Makefile
index 1a0b9196c5ef..57cc0068b3a6 100644
--- a/dns/walker/Makefile
+++ b/dns/walker/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://josefsson.org/walker/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Recover zone file information from servers that use DNSSEC
 
-RUN_DEPENDS=	${LOCALBASE}/bin/dig:${PORTSDIR}/net/bind9
+RUN_DEPENDS=	${LOCALBASE}/bin/dig:${PORTSDIR}/dns/bind9
 
 USE_REINPLACE=	yes
 NO_BUILD=	yes
diff --git a/mail/dsbl-testers/Makefile b/mail/dsbl-testers/Makefile
index 77df6eac5e38..04c17fe28da2 100644
--- a/mail/dsbl-testers/Makefile
+++ b/mail/dsbl-testers/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	dean@odyssey.apana.org.au
 COMMENT=	Testing software configured to work with DSBL/DSBL-compliant services
 
 BUILD_DEPENDS=	${LOCALBASE}/include/firestring.h:${PORTSDIR}/misc/firestring \
-		${LOCALBASE}/include/firedns.h:${PORTSDIR}/net/firedns
+		${LOCALBASE}/include/firedns.h:${PORTSDIR}/dns/firedns
 
 USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
diff --git a/mail/messagewall/Makefile b/mail/messagewall/Makefile
index d06f9664f460..898b96a3f7fd 100644
--- a/mail/messagewall/Makefile
+++ b/mail/messagewall/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	opr@bsdaemon.be
 COMMENT=	Free SMTP PROXY with filtering
 
 BUILD_DEPENDS=  ${LOCALBASE}/include/firestring.h:${PORTSDIR}/misc/firestring \
-		${LOCALBASE}/include/firedns.h:${PORTSDIR}/net/firedns
+		${LOCALBASE}/include/firedns.h:${PORTSDIR}/dns/firedns
 
 MAN1=		messagewall.1 messagewallctl.1 messagewallstats.1
 MAN5=		messagewall.conf.5 messagewall_profiles.5
diff --git a/mail/p5-Email-Valid/Makefile b/mail/p5-Email-Valid/Makefile
index df9d8abe3c34..302dab21e64d 100644
--- a/mail/p5-Email-Valid/Makefile
+++ b/mail/p5-Email-Valid/Makefile
@@ -16,7 +16,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Check validity of Internet email addresses
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS \
+BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/mail/p5-Mail-SpamAssassin-snapshot/Makefile b/mail/p5-Mail-SpamAssassin-snapshot/Makefile
index 2e24757fba33..ffd1f3dfc8ac 100644
--- a/mail/p5-Mail-SpamAssassin-snapshot/Makefile
+++ b/mail/p5-Mail-SpamAssassin-snapshot/Makefile
@@ -16,7 +16,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	DougB@FreeBSD.org
 COMMENT=	A highly efficient mail filter for identifying spam
 
-BUILD_DEPENDS=	${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS \
+BUILD_DEPENDS=	${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS \
 		${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
 		${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools
 RUN_DEPENDS=	${BUILD_DEPENDS} \
diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile
index 368bb3c2ec99..ec1ade236eda 100644
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/p5-Mail-SpamAssassin/Makefile
@@ -16,7 +16,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	DougB@FreeBSD.org
 COMMENT=	A highly efficient mail filter for identifying spam
 
-BUILD_DEPENDS=	${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS \
+BUILD_DEPENDS=	${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS \
 		${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
 		${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools
 RUN_DEPENDS=	${BUILD_DEPENDS} \
diff --git a/mail/p5-Mail-Spool/Makefile b/mail/p5-Mail-Spool/Makefile
index dd02ff5e2385..2afacabf6f9a 100644
--- a/mail/p5-Mail-Spool/Makefile
+++ b/mail/p5-Mail-Spool/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A "pure perl" implementation of mail spooling, unspooling and sending
 
 BUILD_DEPENDS=	${SITE_PERL}/File/NFSLock.pm:${PORTSDIR}/devel/p5-File-NFSLock \
 		${SITE_PERL}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools \
-		${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS
+		${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/mail/p5-Mail-Verify/Makefile b/mail/p5-Mail-Verify/Makefile
index 94880497dd60..e5ae57dd382e 100644
--- a/mail/p5-Mail-Verify/Makefile
+++ b/mail/p5-Mail-Verify/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	petef@FreeBSD.org
 COMMENT=	Perl module to verify email addresses
 
-BUILD_DEPENDS=	${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS
+BUILD_DEPENDS=	${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
diff --git a/mail/p5-Net-SMTP-Server/Makefile b/mail/p5-Net-SMTP-Server/Makefile
index 46cfed9e9e3e..a7fcc3808c1f 100644
--- a/mail/p5-Net-SMTP-Server/Makefile
+++ b/mail/p5-Net-SMTP-Server/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	SMTP-Server-${PORTVERSION}
 MAINTAINER=	erwin@FreeBSD.org
 COMMENT=	A native Perl SMTP Server
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS
+BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 MASTER_SITE_BACKUP+=	http://www.macgyver.org/software/perl/
diff --git a/mail/qmail-conf/Makefile b/mail/qmail-conf/Makefile
index c667a0dbf01b..14ddb969b307 100644
--- a/mail/qmail-conf/Makefile
+++ b/mail/qmail-conf/Makefile
@@ -21,7 +21,7 @@ COMMENT=	Configure various qmail services to run under daemontools
 ALL_TARGET=	it
 INSTALL_TARGET=	setup check
 
-NO_PACKAGE=	"borrows code from djbdns, thus falls under the same restrictions as net/djbdns"
+NO_PACKAGE=	"borrows code from djbdns, thus falls under the same restrictions as dns/djbdns"
 
 # Note: this MUST be the same as the directory qmail is installed in!
 QMAIL_DIR?=	/var/qmail
diff --git a/mail/razor-agents/Makefile b/mail/razor-agents/Makefile
index 390848f54c2c..0be29950551a 100644
--- a/mail/razor-agents/Makefile
+++ b/mail/razor-agents/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	razor
 MAINTAINER=	leeym@FreeBSD.org
 COMMENT=	A distributed, collaborative, spam detection and filtering network
 
-BUILD_DEPENDS=	${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS \
+BUILD_DEPENDS=	${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS \
 		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
 		${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
 		${SITE_PERL}/${PERL_ARCH}/Digest/Nilsimsa.pm:${PORTSDIR}/security/p5-Digest-Nilsimsa \
diff --git a/mail/ricochet/Makefile b/mail/ricochet/Makefile
index 5c49560c2a9f..e662f482e512 100644
--- a/mail/ricochet/Makefile
+++ b/mail/ricochet/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=     ache@FreeBSD.org
 COMMENT=	An automated agent for tracing and reporting internet junk mail
 
 RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/Template.pm:${PORTSDIR}/textproc/p5-Text-Template \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/XWhois.pm:${PORTSDIR}/net/p5-Net-XWhois \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
diff --git a/net-im/gale/Makefile b/net-im/gale/Makefile
index 854cd062ffc9..de5f6186f68b 100644
--- a/net-im/gale/Makefile
+++ b/net-im/gale/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A secure instant messaging system
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libgc.a:${PORTSDIR}/devel/boehm-gc
 LIB_DEPENDS=	wwwcore.1:${PORTSDIR}/www/libwww \
-		adns.1:${PORTSDIR}/net/adns
+		adns.1:${PORTSDIR}/dns/adns
 
 USE_OPENSSL=	yes
 USE_AUTOCONF_VER=213
diff --git a/net/bind9-dlz/Makefile b/net/bind9-dlz/Makefile
index 4f4735d41b07..83ef23da88ce 100644
--- a/net/bind9-dlz/Makefile
+++ b/net/bind9-dlz/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	bind9
 PORTVERSION=	${ISCVERSION}+${DLZVERSION}
 CATEGORIES=	net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC} \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/bind9/${ISCVERSION}/,} \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,dns/bind9/${ISCVERSION}/,} \
 		${MASTER_SITES_DLZ:S/$/:dlz/}
 MASTER_SITE_SUBDIR=	bind-dlz/:dlz
 PKGNAMESUFFIX=	-dlz
diff --git a/net/bind9/Makefile b/net/bind9/Makefile
index 1067fabd52dd..8d8738b98623 100644
--- a/net/bind9/Makefile
+++ b/net/bind9/Makefile
@@ -15,7 +15,7 @@ PORTNAME=	bind9
 PORTVERSION=	9.2.2
 CATEGORIES=	net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC} \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/bind9/${ISCVERSION}/,}
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,dns/bind9/${ISCVERSION}/,}
 MASTER_SITE_SUBDIR=	bind9/${ISCVERSION}
 DISTFILES=	bind-${ISCVERSION}.tar.gz
 
diff --git a/net/dnssecwalker/Makefile b/net/dnssecwalker/Makefile
index 0f61a1ca2c28..e10b2984a8fb 100644
--- a/net/dnssecwalker/Makefile
+++ b/net/dnssecwalker/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	walker-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DNSSEC Walker
 
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS
+RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
 
 USE_PERL5=	yes
 NO_BUILD=	yes
diff --git a/net/dnswalk/Makefile b/net/dnswalk/Makefile
index 25b5fa765d62..f437f8c4143d 100644
--- a/net/dnswalk/Makefile
+++ b/net/dnswalk/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.visi.com/~barr/dnswalk/
 MAINTAINER=	mph@freebsd.org
 COMMENT=	DNS debugger - requests a zone transfer and analyzes the result
 
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS
+RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
 
 NO_WRKSUBDIR=	YES
 NO_BUILD=	YES
diff --git a/net/gale/Makefile b/net/gale/Makefile
index 854cd062ffc9..de5f6186f68b 100644
--- a/net/gale/Makefile
+++ b/net/gale/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A secure instant messaging system
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libgc.a:${PORTSDIR}/devel/boehm-gc
 LIB_DEPENDS=	wwwcore.1:${PORTSDIR}/www/libwww \
-		adns.1:${PORTSDIR}/net/adns
+		adns.1:${PORTSDIR}/dns/adns
 
 USE_OPENSSL=	yes
 USE_AUTOCONF_VER=213
diff --git a/net/hinfo/Makefile b/net/hinfo/Makefile
index c24f8e2dadbe..9317e7daa693 100644
--- a/net/hinfo/Makefile
+++ b/net/hinfo/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES=	http://www.lonesome.com/FreeBSD/distfiles/
 MAINTAINER=	linimon@lonesome.com
 COMMENT=	Utility primarily designed to find the owner of an IP block
 
-RUN_DEPENDS=	${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS \
+RUN_DEPENDS=	${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS \
 		wget:${PORTSDIR}/ftp/wget/
 
 USE_PERL5_RUN=	yes
diff --git a/net/ipsvd/Makefile b/net/ipsvd/Makefile
index 0bc364875dd3..478980b87d5d 100644
--- a/net/ipsvd/Makefile
+++ b/net/ipsvd/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://smarden.org/ipsvd/
 MAINTAINER=	sergei@kolobov.com
 COMMENT=	Internet protocol service daemons
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libdjbdns.a:${PORTSDIR}/devel/libdjbdns
+BUILD_DEPENDS=	${LOCALBASE}/lib/libdjbdns.a:${PORTSDIR}/dns/libdjbdns
 
 WRKSRC=		${WRKDIR}/net/${DISTNAME}
 ALL_TARGET=	default
diff --git a/net/openreg/Makefile b/net/openreg/Makefile
index 72390cb8fa22..f0b89f157c8f 100644
--- a/net/openreg/Makefile
+++ b/net/openreg/Makefile
@@ -15,10 +15,10 @@ MAINTAINER=	seanc@FreeBSD.org
 COMMENT=	Domain Registry software
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/stunnel:${PORTSDIR}/security/stunnel \
-		${LOCALBASE}/sbin/named:${PORTSDIR}/net/bind9 \
+		${LOCALBASE}/sbin/named:${PORTSDIR}/dns/bind9 \
 		${LOCALBASE}/bin/postgres:${PORTSDIR}/${POSTGRESQL_PORT} \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
-BUILD_DEPENDS=	${LOCALBASE}/include/isc/buffer.h:${PORTSDIR}/net/bind9
+BUILD_DEPENDS=	${LOCALBASE}/include/isc/buffer.h:${PORTSDIR}/dns/bind9
 LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat2
 
 POSTGRESQL_PORT?=	databases/postgresql7
diff --git a/net/p5-Net-DNS-SEC/Makefile b/net/p5-Net-DNS-SEC/Makefile
index 72e55f3ef58d..69faf2905418 100644
--- a/net/p5-Net-DNS-SEC/Makefile
+++ b/net/p5-Net-DNS-SEC/Makefile
@@ -16,7 +16,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	erwin@FreeBSD.org
 COMMENT=	DNSSEC extensions to Net::DNS
 
-BUILD_DEPENDS=	${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS \
+BUILD_DEPENDS=	${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS \
 		${SITE_PERL}/${PERL_ARCH}/Crypt/OpenSSL/RSA.pm:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA \
 		${SITE_PERL}/${PERL_ARCH}/Crypt/OpenSSL/DSA.pm:${PORTSDIR}/security/p5-Crypt-OpenSSL-DSA \
 		${SITE_PERL}/${PERL_ARCH}/Crypt/OpenSSL/Bignum.pm:${PORTSDIR}/security/p5-Crypt-OpenSSL-Bignum \
diff --git a/net/p5-Net-DNS-ZoneFile/Makefile b/net/p5-Net-DNS-ZoneFile/Makefile
index 37911b11b556..e0e2236991bb 100644
--- a/net/p5-Net-DNS-ZoneFile/Makefile
+++ b/net/p5-Net-DNS-ZoneFile/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Perl extension to convert a zone file to a collection of RRs
 
-BUILD_DEPENDS=	${SITE_PERL}/Net/DNS/RR.pm:${PORTSDIR}/net/p5-Net-DNS \
+BUILD_DEPENDS=	${SITE_PERL}/Net/DNS/RR.pm:${PORTSDIR}/dns/p5-Net-DNS \
 		${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
 		${SITE_PERL}/NetAddr/IP.pm:${PORTSDIR}/net/p5-NetAddr-IP
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/net/p5-Tie-DNS/Makefile b/net/p5-Tie-DNS/Makefile
index 12dac45af52b..43e423f92303 100644
--- a/net/p5-Tie-DNS/Makefile
+++ b/net/p5-Tie-DNS/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	svenasse@polaris.ca
 COMMENT=	Tie interface to p5-Net-DNS
 
-BUILD_DEPENDS=	${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS
+BUILD_DEPENDS=	${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
diff --git a/net/py-adns/Makefile b/net/py-adns/Makefile
index 934cdd2ecba6..2df297993aec 100644
--- a/net/py-adns/Makefile
+++ b/net/py-adns/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	adns-python-${PORTVERSION}
 MAINTAINER=	perky@FreeBSD.org
 COMMENT=	A Python Interface to adns, the asynchronous DNS library
 
-LIB_DEPENDS=	adns.1:${PORTSDIR}/net/adns
+LIB_DEPENDS=	adns.1:${PORTSDIR}/dns/adns
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
diff --git a/net/sleuth/Makefile b/net/sleuth/Makefile
index 90298d6e6164..cd3fb2973003 100644
--- a/net/sleuth/Makefile
+++ b/net/sleuth/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://atrey.karlin.mff.cuni.cz/pub/local/mj/net/
 MAINTAINER=	markp@FreeBSD.org
 COMMENT=	A tool for checking DNS zones
 
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS
+RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
 
 USE_PERL5=	yes
 
diff --git a/net/walker/Makefile b/net/walker/Makefile
index b2ece6bd6b19..7f428beb2c1d 100644
--- a/net/walker/Makefile
+++ b/net/walker/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://josefsson.org/walker/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Recover zone file information from servers that use DNSSEC
 
-RUN_DEPENDS=	${LOCALBASE}/bin/dig:${PORTSDIR}/net/bind9
+RUN_DEPENDS=	${LOCALBASE}/bin/dig:${PORTSDIR}/dns/bind9
 
 USE_REINPLACE=	yes
 NO_BUILD=	yes
diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile
index fd343a87ac40..2bde1996fcec 100644
--- a/net/xtraceroute/Makefile
+++ b/net/xtraceroute/Makefile
@@ -14,9 +14,9 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATAFILES}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	3D graphical version of the traceroute program
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/host:${PORTSDIR}/net/host
+BUILD_DEPENDS=	${LOCALBASE}/bin/host:${PORTSDIR}/dns/host
 LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
-RUN_DEPENDS=	${LOCALBASE}/bin/host:${PORTSDIR}/net/host
+RUN_DEPENDS=	${LOCALBASE}/bin/host:${PORTSDIR}/dns/host
 
 USE_X_PREFIX=	yes
 USE_MESA=	yes
diff --git a/security/smtpscan/Makefile b/security/smtpscan/Makefile
index 61c9e63def18..713573d070ec 100644
--- a/security/smtpscan/Makefile
+++ b/security/smtpscan/Makefile
@@ -15,7 +15,7 @@ COMMENT=	A remote SMTP server version detector
 
 RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/IO.pm:${PORTSDIR}/devel/p5-IO \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
 
 USE_PERL5=	yes
 MAN1=		smtpscan.1
diff --git a/sysutils/fastresolve/Makefile b/sysutils/fastresolve/Makefile
index de8ed4f51247..6830858cbd10 100644
--- a/sysutils/fastresolve/Makefile
+++ b/sysutils/fastresolve/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Programs that process web logs to get DNS and domain ownership info
 
 LIB_DEPENDS=	db3.3:${PORTSDIR}/databases/db3 \
-		adns.1:${PORTSDIR}/net/adns
+		adns.1:${PORTSDIR}/dns/adns
 
 USE_BZIP2=	yes
 USE_PERL5=	yes
diff --git a/textproc/modlogan/Makefile b/textproc/modlogan/Makefile
index 6925575f8a41..91782894bf5a 100644
--- a/textproc/modlogan/Makefile
+++ b/textproc/modlogan/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	http://jan.kneschke.de/projects/modlogan/download/ \
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	A modular log file analysis program
 
-LIB_DEPENDS=	adns.1:${PORTSDIR}/net/adns \
+LIB_DEPENDS=	adns.1:${PORTSDIR}/dns/adns \
 		gd.4:${PORTSDIR}/graphics/gd \
 		intl.5:${PORTSDIR}/devel/gettext \
 		pcre.0:${PORTSDIR}/devel/pcre \
diff --git a/www/jdresolve/Makefile b/www/jdresolve/Makefile
index 8f99e74f704b..76d131e35c61 100644
--- a/www/jdresolve/Makefile
+++ b/www/jdresolve/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.jdrowell.com/projects/jdresolve/
 MAINTAINER=	christophe@labouisse.org
 COMMENT=	A IP addresse to hostname program for httpd log files
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS
+BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_BZIP2=	yes