2 files changed, 34 insertions, 24 deletions

diff --git a/dns/pear-Net_DNS2/Makefile b/dns/pear-Net_DNS2/Makefile
index 75a3a2d8872b..fddcc65cffe6 100644
--- a/dns/pear-Net_DNS2/Makefile
+++ b/dns/pear-Net_DNS2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Net_DNS2
-PORTVERSION=	1.0.1
+PORTVERSION=	1.1.0
 CATEGORIES=	dns net pear
 
 MAINTAINER=	wen@FreeBSD.org
@@ -15,27 +15,37 @@ COMMENT=	PHP5 Resolver library used to communicate with a DNS server
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-FILES=		Net/DNS2.php \
-		Net/DNS2/BitMap.php Net/DNS2/Exception.php Net/DNS2/Header.php \
-		Net/DNS2/Lookups.php Net/DNS2/Packet/Request.php Net/DNS2/Packet/Response.php \
-		Net/DNS2/Packet.php Net/DNS2/Question.php Net/DNS2/RR/A.php \
-		Net/DNS2/RR/AAAA.php Net/DNS2/RR/AFSDB.php Net/DNS2/RR/ANY.php \
-		Net/DNS2/RR/APL.php Net/DNS2/RR/CERT.php Net/DNS2/RR/CNAME.php \
-		Net/DNS2/RR/DHCID.php Net/DNS2/RR/DLV.php Net/DNS2/RR/DNAME.php \
-		Net/DNS2/RR/DNSKEY.php Net/DNS2/RR/DS.php Net/DNS2/RR/EID.php \
-		Net/DNS2/RR/HINFO.php Net/DNS2/RR/HIP.php Net/DNS2/RR/IPSECKEY.php \
-		Net/DNS2/RR/ISDN.php Net/DNS2/RR/KEY.php Net/DNS2/RR/KX.php \
-		Net/DNS2/RR/LOC.php Net/DNS2/RR/MX.php Net/DNS2/RR/NAPTR.php \
-		Net/DNS2/RR/NIMLOC.php Net/DNS2/RR/NS.php Net/DNS2/RR/NSAP.php \
-		Net/DNS2/RR/NSEC.php Net/DNS2/RR/NSEC3.php Net/DNS2/RR/NSEC3PARAM.php \
-		Net/DNS2/RR/OPT.php Net/DNS2/RR/PTR.php Net/DNS2/RR/PX.php \
-		Net/DNS2/RR/RP.php Net/DNS2/RR/RRSIG.php Net/DNS2/RR/RT.php \
-		Net/DNS2/RR/SIG.php Net/DNS2/RR/SOA.php Net/DNS2/RR/SPF.php \
-		Net/DNS2/RR/SRV.php Net/DNS2/RR/SSHFP.php Net/DNS2/RR/TKEY.php \
-		Net/DNS2/RR/TSIG.php Net/DNS2/RR/TXT.php Net/DNS2/RR/WKS.php \
-		Net/DNS2/RR/X25.php \
-		Net/DNS2/RR.php Net/DNS2/Resolver.php Net/DNS2/Socket/Sockets.php \
-		Net/DNS2/Socket/Streams.php Net/DNS2/Socket.php Net/DNS2/Updater.php
+CATEGORY=	Net
+PEAR_CATSRC=	yes
+
+FILES=		DNS2.php \
+		DNS2/BitMap.php DNS2/Cache.php \
+		DNS2/Cache/File.php DNS2/Cache/Shm.php \
+		DNS2/Exception.php DNS2/Header.php \
+		DNS2/Lookups.php \
+		DNS2/Packet/Request.php DNS2/Packet/Response.php \
+		DNS2/Packet.php DNS2/PrivateKey.php \
+		DNS2/Question.php \
+		DNS2/RR/A.php \
+		DNS2/RR/AAAA.php DNS2/RR/AFSDB.php DNS2/RR/ANY.php \
+		DNS2/RR/APL.php DNS2/RR/ATMA.php \
+		DNS2/RR/CERT.php DNS2/RR/CNAME.php \
+		DNS2/RR/DHCID.php DNS2/RR/DLV.php DNS2/RR/DNAME.php \
+		DNS2/RR/DNSKEY.php DNS2/RR/DS.php \
+		DNS2/RR/EID.php \
+		DNS2/RR/HINFO.php DNS2/RR/HIP.php DNS2/RR/IPSECKEY.php \
+		DNS2/RR/ISDN.php DNS2/RR/KEY.php DNS2/RR/KX.php \
+		DNS2/RR/LOC.php DNS2/RR/MX.php DNS2/RR/NAPTR.php \
+		DNS2/RR/NIMLOC.php DNS2/RR/NS.php DNS2/RR/NSAP.php \
+		DNS2/RR/NSEC.php DNS2/RR/NSEC3.php DNS2/RR/NSEC3PARAM.php \
+		DNS2/RR/OPT.php DNS2/RR/PTR.php DNS2/RR/PX.php \
+		DNS2/RR/RP.php DNS2/RR/RRSIG.php DNS2/RR/RT.php \
+		DNS2/RR/SIG.php DNS2/RR/SOA.php DNS2/RR/SPF.php \
+		DNS2/RR/SRV.php DNS2/RR/SSHFP.php DNS2/RR/TKEY.php \
+		DNS2/RR/TSIG.php DNS2/RR/TXT.php DNS2/RR/WKS.php \
+		DNS2/RR/X25.php \
+		DNS2/RR.php DNS2/Resolver.php DNS2/Socket/Sockets.php \
+		DNS2/Socket/Streams.php DNS2/Socket.php DNS2/Updater.php
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
diff --git a/dns/pear-Net_DNS2/distinfo b/dns/pear-Net_DNS2/distinfo
index 8892022fc9d7..cbd40a674c3f 100644
--- a/dns/pear-Net_DNS2/distinfo
+++ b/dns/pear-Net_DNS2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (PEAR/Net_DNS2-1.0.1.tgz) = 454a6b01164a4a48c258fbe9e6f3cbb36e68427760009cd08667104889bbc641
-SIZE (PEAR/Net_DNS2-1.0.1.tgz) = 48804
+SHA256 (PEAR/Net_DNS2-1.1.0.tgz) = 68a6c622566c4e419b058d823a1799d19e1d0d58fbabcab61ad6e1c15df55a18
+SIZE (PEAR/Net_DNS2-1.1.0.tgz) = 56586