4 files changed, 79 insertions, 17 deletions

diff --git a/net-mgmt/p5-NetAddr-IP/Makefile b/net-mgmt/p5-NetAddr-IP/Makefile
index 87af2ed04cb4..7f97bca0dbf8 100644
--- a/net-mgmt/p5-NetAddr-IP/Makefile
+++ b/net-mgmt/p5-NetAddr-IP/Makefile
@@ -6,26 +6,30 @@
 #
 
 PORTNAME=	NetAddr-IP
-PORTVERSION=	3.33
+PORTVERSION=	4.00.4
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/L/LU/LUISMUNOZ
 PKGNAMEPREFIX=	p5-
+DISTNAME=	${PORTNAME}-${PORTVERSION:C/.([0-9])$/\1/}
 
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Perl module for working with IP addresses and blocks thereof
 
 PERL_CONFIGURE=	yes
 
-MAN3=		NetAddr::IP.3
+MAN3=		NetAddr::IP.3 \
+	NetAddr::IP::Lite.3 \
+	NetAddr::IP::Util.3 \
+	NetAddr::IP::UtilPP.3
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500601
-IGNORE=		This port requires perl 5.6.x or later version
-.elif ${PERL_LEVEL} < 500800
-BUILD_DEPENDS=	${SITE_PERL}/Math/BigInt.pm:${PORTSDIR}/math/p5-Math-BigInt \
-		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
+post-patch:
+	${PERL} -ni -e 'print unless /^=head1/../^=cut/' ${WRKSRC}/Lite/Util/Makefile.PL
+
+.if ${PERL_LEVEL} < 500700
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
 RUN_DEPENDS=	${BUILD_DEPENDS}
 .endif
 
diff --git a/net-mgmt/p5-NetAddr-IP/distinfo b/net-mgmt/p5-NetAddr-IP/distinfo
index 77f8d7b175c4..1ca00dae114f 100644
--- a/net-mgmt/p5-NetAddr-IP/distinfo
+++ b/net-mgmt/p5-NetAddr-IP/distinfo
@@ -1,3 +1,3 @@
-MD5 (NetAddr-IP-3.33.tar.gz) = 480ab4066f8c04ccbdef07ff12e71015
-SHA256 (NetAddr-IP-3.33.tar.gz) = 0d6dd1693daab6a288d907d834c91589e385a3a9dd0c223cdd32320dfe396d93
-SIZE (NetAddr-IP-3.33.tar.gz) = 48528
+MD5 (NetAddr-IP-4.004.tar.gz) = 4f0ef938abf0b1e43ca96fb0068381df
+SHA256 (NetAddr-IP-4.004.tar.gz) = 102db19438411a253f9483929aa7d6982ae4e26c65bf584a52adfe3fd987695c
+SIZE (NetAddr-IP-4.004.tar.gz) = 97157
diff --git a/net-mgmt/p5-NetAddr-IP/pkg-descr b/net-mgmt/p5-NetAddr-IP/pkg-descr
index cfea581b6464..7153fa5e1c9f 100644
--- a/net-mgmt/p5-NetAddr-IP/pkg-descr
+++ b/net-mgmt/p5-NetAddr-IP/pkg-descr
@@ -3,7 +3,4 @@ manipulation involved when handling IP address calculations. It also
 helps by performing range comparisons between subnets as well as other
 frequently used functions.
 
-Please note that this module provides more functionality when used with
-perl 5.6.1 or perl 5.8.0.
-
 WWW: http://search.cpan.org/dist/NetAddr-IP/
diff --git a/net-mgmt/p5-NetAddr-IP/pkg-plist b/net-mgmt/p5-NetAddr-IP/pkg-plist
index 3b5b565fb485..cf5566f154c8 100644
--- a/net-mgmt/p5-NetAddr-IP/pkg-plist
+++ b/net-mgmt/p5-NetAddr-IP/pkg-plist
@@ -1,5 +1,66 @@
-%%SITE_PERL%%/NetAddr/IP.pm
+@comment $FreeBSD$
+%%SITE_PERL%%/%%PERL_ARCH%%/NetAddr/IP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/NetAddr/IP/Lite.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/NetAddr/IP/Util.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/NetAddr/IP/UtilPP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/NetAddr/IP/Util_IS.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr
-@dirrm %%SITE_PERL%%/NetAddr
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Util/Util.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Util/Util.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Util/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Util/inet_any2n.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Util/inet_n2ad.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Util/inet_n2dx.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Util/ipv6_aton.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Util/ipv6_n2d.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Util/ipv6_n2x.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/_128x10.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/_128x2.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/_bcd2bin.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/_bcdcheck.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/_bin2bcdn.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/_deadlen.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/_sa128.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/add128.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/addconst.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/bcd2bin.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/bcdn2bin.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/bcdn2txt.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/bin2bcd.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/bin2bcdn.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/comp128.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/hasbits.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/ipanyto6.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/ipv4to6.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/ipv6to4.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/isIPv4.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/mask4to6.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/maskanyto6.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/notcontiguous.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/shiftleft.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/simple_pack.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/slowadd128.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP/sub128.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/_compV6.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/_compact_v6.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/coalesce.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/compactref.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/do_prefix.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/hostenum.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/mod_version.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/nprefix.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/prefix.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/re.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/re6.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/short.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/split.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/splitref.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/wildcard.al
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/UtilPP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Util
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/NetAddr/IP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/NetAddr