Attachment 137921 Details for Bug 183684 – p5-FusionInventory-Agent-Task-NetDiscovery-2.1.patch

[patch] p5-FusionInventory-Agent-Task-NetDiscovery-2.1.patch

p5-FusionInventory-Agent-Task-NetDiscovery-2.1.patch (text/plain), 6.57 KB, created by Muhammad Moinur Rahman on 2013-11-05 14:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Muhammad Moinur Rahman

Created: 2013-11-05 14:30:00 UTC

Size: 6.57 KB

patch

obsolete

>diff -ruN /usr/ports//net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/Makefile ./Makefile
>--- /usr/ports//net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/Makefile	2013-09-21 04:24:43.000000000 +0600
>+++ ./Makefile	2013-11-05 20:03:31.000000000 +0600
>@@ -2,13 +2,13 @@
> # $FreeBSD: net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/Makefile 327757 2013-09-20 22:24:43Z bapt $
> 
> 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
>@@ -22,15 +22,7 @@
> 		p5-XML-TreePP>=0:${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
>-
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -ruN /usr/ports//net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/distinfo ./distinfo
>--- /usr/ports//net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/distinfo	2013-02-18 06:20:53.000000000 +0600
>+++ ./distinfo	2013-11-05 18:46:29.000000000 +0600
>@@ -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 -ruN /usr/ports//net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/files/patch-Makefile.PL ./files/patch-Makefile.PL
>--- /usr/ports//net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/files/patch-Makefile.PL	1970-01-01 06:00:00.000000000 +0600
>+++ ./files/patch-Makefile.PL	2013-11-05 19:37:10.000000000 +0600
>@@ -0,0 +1,72 @@
>+--- Makefile.PL.orig	2013-11-05 19:35:08.000000000 +0600
>++++ Makefile.PL	2013-11-05 19:36:19.000000000 +0600
>+@@ -37,69 +37,3 @@
>+ requires 'Net::SNMP'              => undef;
>+ 
>+ WriteAll;
>+-
>+-# substitute prefix everywhere
>+-$MY::variables{DATADIR} =~ s/\$$PREFIX$/$MY::variables{PREFIX}/;
>+-
>+-print <<EOF;
>+-
>+-Installation summary
>+---------------------
>+-prefix: $MY::variables{PREFIX}
>+-constant data installation directory: $MY::variables{DATADIR}
>+-
>+-EOF
>+-
>+-package MY;
>+-
>+-our %setup;
>+-our %variables;
>+-
>+-# force a perl-independant prefix for everything but perl modules
>+-sub constants {
>+-    my ($self) = @_;
>+-
>+-    # for some reason, initialising variables from the global scope doesn't work
>+-    %variables = (
>+-        PREFIX               => '/usr/local',
>+-        INSTALLLIB           => '$(DATADIR)/lib',
>+-        INSTALLSITELIB       => '$(DATADIR)/lib',
>+-        INSTALLVENDORLIB     => '$(DATADIR)/lib',
>+-        INSTALLMAN3DIR       => '$(PREFIX)/share/man/man3',
>+-        INSTALLSITEMAN3DIR   => '$(PREFIX)/share/man/man3',
>+-        INSTALLVENDORMAN3DIR => '$(PREFIX)/share/man/man3',
>+-        DATADIR              => '$(PREFIX)/share/fusioninventory',
>+-        FULLPERLRUN          => '$(FULLPERL) -I$(DATADIR)/lib'
>+-    );
>+-
>+-    # allow variables detected from agent setup to override defaults
>+-    foreach my $name (keys %variables) {
>+-        $variables{$name} = $setup{$name} if $setup{$name};
>+-    }
>+-
>+-    # allow variables defined on command line to override defaults
>+-    foreach my $name (keys %variables) {
>+-        $variables{$name} = $self->{ARGS}->{$name} if $self->{ARGS}->{$name};
>+-    }
>+-
>+-    # get all standard MM variables definitions, and override them if needed
>+-    my @code = split(/\n/, $self->SUPER::constants(@_));
>+-    foreach my $line (@code) {
>+-        # Skip comments
>+-        next if $line =~ /^\s*#/;
>+-        # Skip everything which isn't a var assignment.
>+-        next unless $line =~ /^([A-Z0-9_]+) =/;
>+-        my $name = $1;
>+-        # skip variables we're not interested
>+-        next unless $variables{$name};
>+-
>+-        $line = "$name = $variables{$name}";
>+-    }
>+-
>+-    # add out own variables
>+-    foreach my $name (qw/DATADIR/) {
>+-        push @code, "$name = $variables{$name}";
>+-    }
>+-
>+-    return join("\n", @code);
>+-}
>diff -ruN /usr/ports//net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/files/patch-lib-FusionInventory-Agent-Task-NetDiscovery.pm ./files/patch-lib-FusionInventory-Agent-Task-NetDiscovery.pm
>--- /usr/ports//net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/files/patch-lib-FusionInventory-Agent-Task-NetDiscovery.pm	2013-02-18 06:20:53.000000000 +0600
>+++ ./files/patch-lib-FusionInventory-Agent-Task-NetDiscovery.pm	1970-01-01 06:00:00.000000000 +0600
>@@ -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 -ruN /usr/ports//net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/pkg-plist ./pkg-plist
>--- /usr/ports//net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/pkg-plist	2013-02-18 06:20:53.000000000 +0600
>+++ ./pkg-plist	2013-11-05 20:02:49.000000000 +0600
>@@ -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,7 +12,9 @@
> %%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
>+%%PERL5_MAN3%%/FusionInventory::Agent::Task::NetDiscovery::Dictionary.3.gz
>+%%PERL5_MAN3%%/FusionInventory::Agent::Task::NetDiscovery.3.gz
>+%%PERL5_MAN3%%/FusionInventory::Agent::SNMP.3.gz
> @dirrm %%SITE_PERL%%/mach/auto/FusionInventory/Agent/Task/NetDiscovery
> @dirrmtry %%SITE_PERL%%/mach/auto/FusionInventory/Agent/Task
> @dirrmtry %%SITE_PERL%%/mach/auto/FusionInventory/Agent

Actions: View | Diff

Attachments on bug 183684: 137921