3 files changed, 42 insertions, 39 deletions

diff --git a/net/p5-Net-Packet/Makefile b/net/p5-Net-Packet/Makefile
index 0103c1cbfe9c..17ed89d9e2eb 100644
--- a/net/p5-Net-Packet/Makefile
+++ b/net/p5-Net-Packet/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	Net-Packet
-PORTVERSION=	2.04
+PORTVERSION=	2.22
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
-		http://www.gomor.org/netpkt/
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	netpkt@gomor.org
 COMMENT=	A framework to easily send and receive frames from layer 2 to layer 7
 
-BUILD_DEPENDS=	${SITE_PERL}/Class/Gomor/Hash.pm:${PORTSDIR}/devel/p5-Class-Gomor-Hash \
+BUILD_DEPENDS=	${SITE_PERL}/Class/Gomor/Hash.pm:${PORTSDIR}/devel/p5-Class-Gomor \
+		${SITE_PERL}/${PERL_ARCH}/Net/Write/Layer2.pm:${PORTSDIR}/net/p5-Net-Write \
 		${SITE_PERL}/${PERL_ARCH}/IO/Interface.pm:${PORTSDIR}/net/p5-IO-Interface \
 		${SITE_PERL}/Net/IPv6Addr.pm:${PORTSDIR}/net-mgmt/p5-Net-IPv6Addr \
 		${SITE_PERL}/${PERL_ARCH}/Net/Pcap.pm:${PORTSDIR}/net/p5-Net-Pcap \
@@ -55,4 +55,10 @@ MAN3=		Net::Packet.3 \
 		Net::Packet::VLAN.3 \
 		Net::Pkt.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500600
+IGNORE=	requires perl 5.6.0 or higher. Please install lang/perl5.8 and try again
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/net/p5-Net-Packet/distinfo b/net/p5-Net-Packet/distinfo
index fb96df567988..d85718fae62e 100644
--- a/net/p5-Net-Packet/distinfo
+++ b/net/p5-Net-Packet/distinfo
@@ -1,3 +1,3 @@
-MD5 (Net-Packet-2.04.tar.gz) = 7ca09f74a03414186448f8db7969cab0
-SHA256 (Net-Packet-2.04.tar.gz) = 5f2ce7c538022b5fe5c1eedf9bff6e417ae440d658459e41c11c05546323e2c3
-SIZE (Net-Packet-2.04.tar.gz) = 50984
+MD5 (Net-Packet-2.22.tar.gz) = a85e81460df63e804877fceb07e78ee8
+SHA256 (Net-Packet-2.22.tar.gz) = 032025b08760b2abebfa642b19c7ab5da2e3f22b3ac38ae8db599e10a931f923
+SIZE (Net-Packet-2.22.tar.gz) = 49070
diff --git a/net/p5-Net-Packet/pkg-plist b/net/p5-Net-Packet/pkg-plist
index 0e2e8e51175a..c58abca71aaa 100644
--- a/net/p5-Net-Packet/pkg-plist
+++ b/net/p5-Net-Packet/pkg-plist
@@ -1,35 +1,32 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Packet.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Packet/ARP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Packet/Consts.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Packet/Desc.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Packet/DescL2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Packet/DescL3.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Packet/DescL4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Packet/Dump.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Packet/ETH.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Packet/Env.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Packet/Frame.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Packet/ICMPv4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Packet/IPv4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Packet/IPv6.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Packet/Layer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Packet/Layer2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Packet/Layer3.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Packet/Layer4.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Packet/Layer7.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Packet/NULL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Packet/RAW.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Packet/SLL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Packet/TCP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Packet/UDP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Packet/Utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Packet/VLAN.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/Pkt.pm
+%%SITE_PERL%%/Net/Packet.pm
+%%SITE_PERL%%/Net/Packet/ARP.pm
+%%SITE_PERL%%/Net/Packet/Consts.pm
+%%SITE_PERL%%/Net/Packet/Desc.pm
+%%SITE_PERL%%/Net/Packet/DescL2.pm
+%%SITE_PERL%%/Net/Packet/DescL3.pm
+%%SITE_PERL%%/Net/Packet/DescL4.pm
+%%SITE_PERL%%/Net/Packet/Dump.pm
+%%SITE_PERL%%/Net/Packet/ETH.pm
+%%SITE_PERL%%/Net/Packet/Env.pm
+%%SITE_PERL%%/Net/Packet/Frame.pm
+%%SITE_PERL%%/Net/Packet/ICMPv4.pm
+%%SITE_PERL%%/Net/Packet/IPv4.pm
+%%SITE_PERL%%/Net/Packet/IPv6.pm
+%%SITE_PERL%%/Net/Packet/Layer.pm
+%%SITE_PERL%%/Net/Packet/Layer2.pm
+%%SITE_PERL%%/Net/Packet/Layer3.pm
+%%SITE_PERL%%/Net/Packet/Layer4.pm
+%%SITE_PERL%%/Net/Packet/Layer7.pm
+%%SITE_PERL%%/Net/Packet/NULL.pm
+%%SITE_PERL%%/Net/Packet/RAW.pm
+%%SITE_PERL%%/Net/Packet/SLL.pm
+%%SITE_PERL%%/Net/Packet/TCP.pm
+%%SITE_PERL%%/Net/Packet/UDP.pm
+%%SITE_PERL%%/Net/Packet/Utils.pm
+%%SITE_PERL%%/Net/Packet/VLAN.pm
+%%SITE_PERL%%/Net/Pkt.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Packet/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Packet/Packet.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Packet/Packet.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Packet/autosplit.ix
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/Packet
+@dirrm %%SITE_PERL%%/Net/Packet
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Packet
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net