4 files changed, 18 insertions, 34 deletions

diff --git a/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/Makefile b/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/Makefile
index c3715ca1ddf3..a9cf44ba619f 100644
--- a/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/Makefile
+++ b/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/Makefile
@@ -2,35 +2,28 @@
 # $FreeBSD$
 
 PORTNAME=	FusionInventory-Agent-Task-NetDiscovery
-PORTVERSION=	1.5
+PORTVERSION=	2.1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FUSINV
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	5u623l20@gmail.com
 COMMENT=	Network discovery support for FusionInventory Agent
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-FusionInventory-Agent>=0:${PORTSDIR}/net-mgmt/p5-FusionInventory-Agent \
+BUILD_DEPENDS=	p5-FusionInventory-Agent>=2.2.0:${PORTSDIR}/net-mgmt/p5-FusionInventory-Agent \
 		p5-Net-IP>=0:${PORTSDIR}/net-mgmt/p5-Net-IP \
 		p5-Net-NBName>=0:${PORTSDIR}/net/p5-Net-NBName \
 		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
-		p5-Parallel-ForkManager>=0:${PORTSDIR}/devel/p5-Parallel-ForkManager \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-XML-TreePP>=0:${PORTSDIR}/textproc/p5-XML-TreePP
+		p5-XML-TreePP>=0.26:${PORTSDIR}/textproc/p5-XML-TreePP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-MAN3=		FusionInventory::Agent::Task::NetDiscovery.3
-
 USES=		perl5
 USE_PERL5=	configure
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
 post-patch:
-	${RM} ${WRKSRC}/lib/FusionInventory/Agent/Task/NetDiscovery.pm.orig
+	@${REINPLACE_CMD} -e '40,$$ d' ${WRKSRC}/Makefile.PL
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/distinfo b/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/distinfo
index 4411b6fcf37f..52273dfbeb0d 100644
--- a/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/distinfo
+++ b/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/distinfo
@@ -1,2 +1,2 @@
-SHA256 (FusionInventory-Agent-Task-NetDiscovery-1.5.tar.gz) = ed1c07f41ef1f769d8396c9ba33de6b3dac32e0b7cf4cf35ce436f2642d74985
-SIZE (FusionInventory-Agent-Task-NetDiscovery-1.5.tar.gz) = 66587
+SHA256 (FusionInventory-Agent-Task-NetDiscovery-2.1.tar.gz) = 868ed07ef563bda7d1d6cb7bfb27239c8a6215f256a3a2f572668068e3a51c9a
+SIZE (FusionInventory-Agent-Task-NetDiscovery-2.1.tar.gz) = 47603
diff --git a/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/files/patch-lib-FusionInventory-Agent-Task-NetDiscovery.pm b/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/files/patch-lib-FusionInventory-Agent-Task-NetDiscovery.pm
deleted file mode 100644
index dbf62492ec14..000000000000
--- a/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/files/patch-lib-FusionInventory-Agent-Task-NetDiscovery.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/FusionInventory/Agent/Task/NetDiscovery.pm	2011-05-05 13:42:10.000000000 +0200
-+++ lib/FusionInventory/Agent/Task/NetDiscovery.pm	2012-02-14 16:04:54.652712095 +0100
-@@ -41,7 +41,7 @@
- 
-     $s .= $_ foreach @_;
- 
--    return unless $s =~ /Nmap version (\S+) /;
-+    return unless $s =~ /Nmap version (\d*\.?\d+)/;
- 
-     return $1;
- }
diff --git a/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/pkg-plist b/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/pkg-plist
index 074dc70f8a88..5849a09ab560 100644
--- a/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/pkg-plist
+++ b/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/pkg-plist
@@ -1,5 +1,6 @@
+%%SITE_PERL%%/FusionInventory/Agent/SNMP.pm
 %%SITE_PERL%%/FusionInventory/Agent/Task/NetDiscovery.pm
-%%SITE_PERL%%/FusionInventory/Agent/Task/NetDiscovery/Dico.pm
+%%SITE_PERL%%/FusionInventory/Agent/Task/NetDiscovery/Dictionary.pm
 %%SITE_PERL%%/FusionInventory/Agent/Task/NetDiscovery/Manufacturer/Alcatel.pm
 %%SITE_PERL%%/FusionInventory/Agent/Task/NetDiscovery/Manufacturer/Axis.pm
 %%SITE_PERL%%/FusionInventory/Agent/Task/NetDiscovery/Manufacturer/Ddwrt.pm
@@ -11,13 +12,14 @@
 %%SITE_PERL%%/FusionInventory/Agent/Task/NetDiscovery/Manufacturer/Samsung.pm
 %%SITE_PERL%%/FusionInventory/Agent/Task/NetDiscovery/Manufacturer/Wyse.pm
 %%SITE_PERL%%/FusionInventory/Agent/Task/NetDiscovery/Manufacturer/Zebranet.pm
-%%SITE_PERL%%/mach/auto/FusionInventory/Agent/Task/NetDiscovery/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/FusionInventory/Agent/Task/NetDiscovery
-@dirrmtry %%SITE_PERL%%/mach/auto/FusionInventory/Agent/Task
-@dirrmtry %%SITE_PERL%%/mach/auto/FusionInventory/Agent
-@dirrmtry %%SITE_PERL%%/mach/auto/FusionInventory
-@dirrmtry %%SITE_PERL%%/mach/auto
-@dirrmtry %%SITE_PERL%%/mach
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/FusionInventory/Agent/Task/NetDiscovery/.packlist
+%%PERL5_MAN3%%/FusionInventory::Agent::SNMP.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Task::NetDiscovery.3.gz
+%%PERL5_MAN3%%/FusionInventory::Agent::Task::NetDiscovery::Dictionary.3.gz
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FusionInventory/Agent/Task/NetDiscovery
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FusionInventory/Agent/Task
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FusionInventory/Agent
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FusionInventory
 @dirrm %%SITE_PERL%%/FusionInventory/Agent/Task/NetDiscovery/Manufacturer
 @dirrm %%SITE_PERL%%/FusionInventory/Agent/Task/NetDiscovery
 @dirrmtry %%SITE_PERL%%/FusionInventory/Agent/Task