- Use CPAN version

- Resolve all conflicts

4 files changed, 23 insertions, 72 deletions

diff --git a/security/p5-Net-SinFP/Makefile b/security/p5-Net-SinFP/Makefile
index 239f59dd73b3..494b1e2a264f 100644
--- a/security/p5-Net-SinFP/Makefile
+++ b/security/p5-Net-SinFP/Makefile
@@ -5,57 +5,34 @@
 # $FreeBSD$
 #
 
-PORTNAME=	SinFP
-DISTVERSION=	2.02-1
+PORTNAME=	Net-SinFP
+PORTVERSION=	2.02.1
+DISTVERSION=	2.02
+PORTREVISION=	1
 CATEGORIES=	security ipv6 perl5
-MASTER_SITES=	SF
+MASTER_SITES=	CPAN
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Full operating system stack fingerprinting suite
 
-LIB_DEPENDS=	dnet.1:${PORTSDIR}/net/libdnet
-BUILD_DEPENDS=	p5-DBD-SQLite>=1.12:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-DBI>=1.50:${PORTSDIR}/databases/p5-DBI \
-		p5-Bit-Vector>=6.4:${PORTSDIR}/math/p5-Bit-Vector \
-		p5-Carp-Clan>=5.3:${PORTSDIR}/devel/p5-Carp-Clan \
-		p5-Math-Base85>=0.2:${PORTSDIR}/math/p5-Math-Base85 \
-		p5-Net-IPv4Addr>=0.10:${PORTSDIR}/net-mgmt/p5-Net-IPv4Addr \
-		p5-Net-IPv6Addr>=0.2:${PORTSDIR}/net-mgmt/p5-Net-IPv6Addr \
-		p5-Socket6>=0.19:${PORTSDIR}/net/p5-Socket6 \
-		p5-Net-Libdnet>=0.01:${PORTSDIR}/net/p5-Net-Libdnet \
-		p5-Net-Pcap>=0.12:${PORTSDIR}/net/p5-Net-Pcap \
-		p5-Class-Gomor>=1.00:${PORTSDIR}/devel/p5-Class-Gomor \
+BUILD_DEPENDS=	p5-Class-Gomor>=1.00:${PORTSDIR}/devel/p5-Class-Gomor \
 		p5-DBIx-SQLite-Simple>=0.33:${PORTSDIR}/databases/p5-DBIx-SQLite-Simple \
-		p5-Net-Write>=0.82:${PORTSDIR}/net/p5-Net-Write
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-CONFLICTS=	p5-Net-Packet-[0-9]* p5-Net-Packet-Target-[0-9]*
-MAN3=	Net::Packet.3 Net::Packet::ARP.3 Net::Packet::Consts.3 Net::Packet::Desc.3 \
-	Net::Packet::DescL2.3 Net::Packet::DescL3.3 Net::Packet::DescL4.3 Net::Packet::Dump.3 \
-	Net::Packet::ETH.3 Net::Packet::Env.3 Net::Packet::Frame.3 Net::Packet::ICMPv4.3 \
-	Net::Packet::IPv4.3 Net::Packet::IPv6.3 Net::Packet::Layer.3 Net::Packet::Layer2.3 \
-	Net::Packet::Layer3.3 Net::Packet::Layer4.3 Net::Packet::Layer7.3 Net::Packet::NULL.3 \
-	Net::Packet::RAW.3 Net::Packet::SLL.3 Net::Packet::TCP.3 Net::Packet::Target.3 \
-	Net::Packet::UDP.3 Net::Packet::Utils.3 Net::Packet::VLAN.3 Net::SinFP.3 Net::SinFP::Consts.3 \
-	Net::SinFP::DB.3 Net::SinFP::DB::IpVersion.3 Net::SinFP::DB::Os.3 Net::SinFP::DB::OsVersion.3 \
-	Net::SinFP::DB::OsVersionChildren.3 Net::SinFP::DB::OsVersionFamily.3 \
-	Net::SinFP::DB::PatternBinary.3 Net::SinFP::DB::PatternTcpFlags.3 \
-	Net::SinFP::DB::PatternTcpMss.3 Net::SinFP::DB::PatternTcpOptions.3 \
-	Net::SinFP::DB::PatternTcpWindow.3 Net::SinFP::DB::Signature.3 Net::SinFP::DB::SystemClass.3 \
-	Net::SinFP::DB::Vendor.3 Net::SinFP::Result.3 Net::SinFP::Search.3 Net::SinFP::SinFP4.3 \
-	Net::SinFP::SinFP6.3
+		p5-Net-Packet>=3.00:${PORTSDIR}/net/p5-Net-Packet \
+		p5-Net-Packet-Target>=1.00:${PORTSDIR}/net/p5-Net-Packet-Target
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ENV=	GOMOR_PATH=${PREFIX}
+MAN3=	Net::SinFP.3 Net::SinFP::Consts.3 Net::SinFP::DB.3 Net::SinFP::DB::IpVersion.3 \
+	Net::SinFP::DB::Os.3 Net::SinFP::DB::OsVersion.3 Net::SinFP::DB::OsVersionChildren.3 \
+	Net::SinFP::DB::OsVersionFamily.3 Net::SinFP::DB::PatternBinary.3 \
+	Net::SinFP::DB::PatternTcpFlags.3 Net::SinFP::DB::PatternTcpMss.3 \
+	Net::SinFP::DB::PatternTcpOptions.3 Net::SinFP::DB::PatternTcpWindow.3 \
+	Net::SinFP::DB::Signature.3 Net::SinFP::DB::SystemClass.3 Net::SinFP::DB::Vendor.3 \
+	Net::SinFP::Result.3 Net::SinFP::Search.3 Net::SinFP::SinFP4.3 Net::SinFP::SinFP6.3
 
 ONLY_FOR_ARCHS=		i386 amd64 alpha
 ONLY_FOR_ARCHS_REASON=	Big endian architectures not supported yet
 
-post-extract:
-	@${MV} ${WRKSRC}/gomor/* ${WRKSRC}/
-	@cd ${WRKSRC} && ${RM} -rf dbd-sqlite dbi libdnet libpcap modules net-libdnet net-pcap \
-		Makefile Class* DBIx* Net-Write* gomor
-
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500601
diff --git a/security/p5-Net-SinFP/distinfo b/security/p5-Net-SinFP/distinfo
index 7714af6bd4f8..3f9cc4d1f0b9 100644
--- a/security/p5-Net-SinFP/distinfo
+++ b/security/p5-Net-SinFP/distinfo
@@ -1,3 +1,3 @@
-MD5 (SinFP-2.02-1.tar.gz) = d7dda953c60563976c02f735416ce70a
-SHA256 (SinFP-2.02-1.tar.gz) = cdb8dd727a863456ae1b8c59ddfaeff2421c595b8cf180f12b46c8f9a669b776
-SIZE (SinFP-2.02-1.tar.gz) = 2789139
+MD5 (Net-SinFP-2.02.tar.gz) = 9200a258e3f1e2cde3a57fe483e0c172
+SHA256 (Net-SinFP-2.02.tar.gz) = a986a7f548f49a91ba64780e70746c2da5296a13a21282656fae49c50fb461e9
+SIZE (Net-SinFP-2.02.tar.gz) = 25218
diff --git a/security/p5-Net-SinFP/pkg-descr b/security/p5-Net-SinFP/pkg-descr
index 2f9ad428f127..3568b7ed5828 100644
--- a/security/p5-Net-SinFP/pkg-descr
+++ b/security/p5-Net-SinFP/pkg-descr
@@ -13,3 +13,4 @@ only fully standard TCP packets, and limits the number of tests to 2
 or 3 (with only 1 test giving the OS reliably in most cases).
 
 WWW: http://www.gomor.org/sinfp
+Author: GomoR <netpkt@gomor.org>
diff --git a/security/p5-Net-SinFP/pkg-plist b/security/p5-Net-SinFP/pkg-plist
index 8373c3472e21..b781d3c2ab9b 100644
--- a/security/p5-Net-SinFP/pkg-plist
+++ b/security/p5-Net-SinFP/pkg-plist
@@ -1,33 +1,6 @@
 bin/sinfp.db
 bin/sinfp.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/gomor/.packlist
-%%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/Target.pm
-%%SITE_PERL%%/Net/Packet/UDP.pm
-%%SITE_PERL%%/Net/Packet/Utils.pm
-%%SITE_PERL%%/Net/Packet/VLAN.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SinFP/.packlist
 %%SITE_PERL%%/Net/SinFP.pm
 %%SITE_PERL%%/Net/SinFP/Consts.pm
 %%SITE_PERL%%/Net/SinFP/DB.pm
@@ -50,6 +23,6 @@ bin/sinfp.pl
 %%SITE_PERL%%/Net/SinFP/SinFP6.pm
 @dirrmtry %%SITE_PERL%%/Net/SinFP/DB
 @dirrmtry %%SITE_PERL%%/Net/SinFP
-@dirrmtry %%SITE_PERL%%/Net/Packet
 @dirrmtry %%SITE_PERL%%/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/gomor
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SinFP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net