3 files changed, 53 insertions, 60 deletions

diff --git a/dns/p5-Net-DNS/Makefile b/dns/p5-Net-DNS/Makefile
index 1e0255001e51..d2d2b12b5862 100644
--- a/dns/p5-Net-DNS/Makefile
+++ b/dns/p5-Net-DNS/Makefile
@@ -10,61 +10,55 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 interface to the DNS resolver, and dynamic updates
 
-# Warnings during build are harmless, the port does not need these to build
-RUN_DEPENDS=	p5-Digest-HMAC>0:${PORTSDIR}/security/p5-Digest-HMAC
+BUILD_DEPENDS=	p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+TEST_DEPENDS=	p5-Digest-BubbleBabble>=0:${PORTSDIR}/security/p5-Digest-BubbleBabble \
+		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod
 
-TEST_DEPENDS=	p5-Test-Pod>0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Digest-BubbleBabble>0:${PORTSDIR}/security/p5-Digest-BubbleBabble
+OPTIONS_DEFINE=	IDN IPV6 DOCS
 
+CONFIGURE_ARGS=	--no-IPv6-tests --no-online-tests
 MAKE_JOBS_SAFE=	yes
-
-OPTIONS_DEFINE=	IPV6 IDN DOCS
-OPTIONS_DEFAULT=	IPV6
-
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--no-online-tests --no-IPv6-tests
-
-MAN3=		Net::DNS.3 Net::DNS::Header.3 Net::DNS::Packet.3 \
-		Net::DNS::Parameters.3 Net::DNS::Question.3 \
-		Net::DNS::RR.3 Net::DNS::RR::A.3 \
-		Net::DNS::RR::AFSDB.3 Net::DNS::RR::CNAME.3 \
-		Net::DNS::RR::ISDN.3 Net::DNS::RR::L32.3 \
-		Net::DNS::RR::L64.3 Net::DNS::RR::LP.3 \
-		Net::DNS::RR::MG.3 Net::DNS::RR::NID.3 \
-		Net::DNS::RR::TLSA.3 Net::DNS::RR::HINFO.3 Net::DNS::RR::IPSECKEY.3 \
-		Net::DNS::RR::MINFO.3 Net::DNS::RR::MR.3 Net::DNS::RR::MX.3 \
-		Net::DNS::RR::NS.3 Net::DNS::RR::PTR.3 Net::DNS::RR::RP.3 \
-		Net::DNS::RR::RT.3 Net::DNS::RR::SOA.3 Net::DNS::RR::SRV.3 \
-		Net::DNS::RR::TXT.3 Net::DNS::RR::X25.3 Net::DNS::Resolver.3 \
-		Net::DNS::RR::AAAA.3 Net::DNS::RR::EID.3 Net::DNS::RR::LOC.3 \
-		Net::DNS::RR::MB.3 Net::DNS::RR::NAPTR.3 \
-		Net::DNS::RR::NIMLOC.3 Net::DNS::RR::NSAP.3 \
-		Net::DNS::RR::NULL.3 Net::DNS::RR::PX.3 Net::DNS::Update.3 \
-		Net::DNS::Nameserver.3 Net::DNS::RR::CERT.3 \
-		Net::DNS::FAQ.3 Net::DNS::RR::TKEY.3 \
-		Net::DNS::RR::OPT.3 Net::DNS::RR::TSIG.3 Net::DNS::RR::DNAME.3 \
-		Net::DNS::RR::SSHFP.3 Net::DNS::Resolver::Base.3 \
-		Net::DNS::Resolver::cygwin.3 Net::DNS::Resolver::MSWin32.3 \
-		Net::DNS::Resolver::os2.3 Net::DNS::Resolver::UNIX.3\
-	       	Net::DNS::Resolver::Recurse.3 Net::DNS::RR::APL.3 \
-		Net::DNS::RR::DHCID.3 Net::DNS::Domain.3 \
-		Net::DNS::DomainName.3 Net::DNS::Text.3 Net::DNS::Mailbox.3 \
-		Net::DNS::ZoneFile.3 Net::DNS::RR::KX.3 Net::DNS::RR::HIP.3 \
-		Net::DNS::RR::SPF.3
+DOCSDIR=	${PREFIX}/share/doc/p5-Net-DNS
 
+MAN3=		Net::DNS.3 Net::DNS::Domain.3 Net::DNS::DomainName.3 \
+		Net::DNS::FAQ.3 Net::DNS::Header.3 Net::DNS::Mailbox.3 \
+		Net::DNS::Nameserver.3 Net::DNS::Packet.3 \
+		Net::DNS::Parameters.3 Net::DNS::Question.3 Net::DNS::RR.3 \
+		Net::DNS::RR::A.3 Net::DNS::RR::AAAA.3 Net::DNS::RR::AFSDB.3 \
+		Net::DNS::RR::APL.3 Net::DNS::RR::CERT.3 Net::DNS::RR::CNAME.3 \
+		Net::DNS::RR::DHCID.3 Net::DNS::RR::DNAME.3 \
+		Net::DNS::RR::EID.3 Net::DNS::RR::HINFO.3 Net::DNS::RR::HIP.3 \
+		Net::DNS::RR::IPSECKEY.3 Net::DNS::RR::ISDN.3 \
+		Net::DNS::RR::KX.3 Net::DNS::RR::L32.3 Net::DNS::RR::L64.3 \
+		Net::DNS::RR::LOC.3 Net::DNS::RR::LP.3 Net::DNS::RR::MB.3 \
+		Net::DNS::RR::MG.3 Net::DNS::RR::MINFO.3 Net::DNS::RR::MR.3 \
+		Net::DNS::RR::MX.3 Net::DNS::RR::NAPTR.3 Net::DNS::RR::NID.3 \
+		Net::DNS::RR::NIMLOC.3 Net::DNS::RR::NS.3 Net::DNS::RR::NSAP.3 \
+		Net::DNS::RR::NULL.3 Net::DNS::RR::OPT.3 Net::DNS::RR::PTR.3 \
+		Net::DNS::RR::PX.3 Net::DNS::RR::RP.3 Net::DNS::RR::RT.3 \
+		Net::DNS::RR::SOA.3 Net::DNS::RR::SPF.3 Net::DNS::RR::SRV.3 \
+		Net::DNS::RR::SSHFP.3 Net::DNS::RR::TKEY.3 \
+		Net::DNS::RR::TLSA.3 Net::DNS::RR::TSIG.3 Net::DNS::RR::TXT.3 \
+		Net::DNS::RR::X25.3 Net::DNS::Resolver.3 \
+		Net::DNS::Resolver::Base.3 Net::DNS::Resolver::MSWin32.3 \
+		Net::DNS::Resolver::Recurse.3 Net::DNS::Resolver::UNIX.3 \
+		Net::DNS::Resolver::cygwin.3 Net::DNS::Resolver::os2.3 \
+		Net::DNS::Text.3 Net::DNS::Update.3 Net::DNS::ZoneFile.3
 PORTDOCS=	Changes README TODO
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MIPV6}
-RUN_DEPENDS+=	p5-IO-Socket-INET6>0:${PORTSDIR}/net/p5-IO-Socket-INET6
-.endif
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIDN}
-RUN_DEPENDS+=	p5-Net-LibIDN>0:${PORTSDIR}/dns/p5-Net-LibIDN
+BUILD_DEPENDS+=	p5-Net-LibIDN>=0:${PORTSDIR}/dns/p5-Net-LibIDN
+RUN_DEPENDS+=	p5-Net-LibIDN>=0:${PORTSDIR}/dns/p5-Net-LibIDN
 .endif
 
-DOCSDIR=	${PREFIX}/share/doc/p5-Net-DNS
+.if ${PORT_OPTIONS:MIPV6}
+BUILD_DEPENDS+=	p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6
+RUN_DEPENDS+=	p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6
+.endif
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
@@ -72,4 +66,4 @@ post-install:
 	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/dns/p5-Net-DNS/pkg-descr b/dns/p5-Net-DNS/pkg-descr
index 37800bbfc3f5..cf2dd97a67c1 100644
--- a/dns/p5-Net-DNS/pkg-descr
+++ b/dns/p5-Net-DNS/pkg-descr
@@ -1,9 +1,8 @@
-	Net::DNS is a collection of Perl modules to interface with
-	the Domain Name System (DNS) resolver.  It allows the
-	programmer to perform queries that are beyond the
-	capabilities of gethostbyname and gethostbyaddr.
+Net::DNS is a collection of Perl modules to interface with the Domain Name
+System (DNS) resolver. It allows the programmer to perform queries that are
+beyond the capabilities of gethostbyname and gethostbyaddr.
 
-	There are also methods for dealing with creating and
-	parsing dynamic updates packets.
+There are also methods for dealing with creating and parsing dynamic updates
+packets.
 
 WWW: http://search.cpan.org/dist/Net-DNS/
diff --git a/dns/p5-Net-DNS/pkg-plist b/dns/p5-Net-DNS/pkg-plist
index 314d6db62b3b..4e5104360fbb 100644
--- a/dns/p5-Net-DNS/pkg-plist
+++ b/dns/p5-Net-DNS/pkg-plist
@@ -8,7 +8,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Packet.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Parameters.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Question.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Text.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/A.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/AAAA.pm
@@ -24,9 +23,9 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/IPSECKEY.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/ISDN.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/KX.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/LOC.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/L32.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/L64.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/LOC.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/LP.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/MB.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/MG.pm
@@ -48,26 +47,27 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/SPF.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/SRV.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/SSHFP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/TLSA.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/TKEY.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/TLSA.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/TSIG.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/TXT.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR/X25.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Resolver.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Resolver/Base.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Resolver/cygwin.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Resolver/MSWin32.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Resolver/os2.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Resolver/Recurse.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Resolver/UNIX.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Resolver/cygwin.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Resolver/os2.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Text.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Update.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/ZoneFile.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/DNS.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/DNS.so
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Resolver
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/Resolver
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS/RR
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net/DNS
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net