diff options
Diffstat (limited to 'net-mgmt/nfsen/files/patch-install.pl')
| -rw-r--r-- | net-mgmt/nfsen/files/patch-install.pl | 33 |
1 files changed, 27 insertions, 6 deletions
diff --git a/net-mgmt/nfsen/files/patch-install.pl b/net-mgmt/nfsen/files/patch-install.pl index 4b4113a85cc1..88e8737985e5 100644 --- a/net-mgmt/nfsen/files/patch-install.pl +++ b/net-mgmt/nfsen/files/patch-install.pl @@ -1,15 +1,12 @@ - -$FreeBSD$ - ---- install.pl.orig -+++ install.pl +--- install.pl.orig 2010-09-09 09:56:05.000000000 +0400 ++++ install.pl 2011-08-13 16:39:01.000000000 +0400 @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!%%PERL%% -I %%PREFIX%%/libexec/nfsen # # # Copyright (c) 2004, SWITCH - Teleinformatikdienste fuer Lehre und Forschung -@@ -81,33 +81,7 @@ +@@ -85,33 +85,7 @@ # Get Perl sub GetPerl { @@ -44,3 +41,27 @@ $FreeBSD$ } # End of GetPerl +@@ -200,11 +174,8 @@ + } + + my @out = `$NfConf::PREFIX/nfdump -V`; +- if ( scalar @out != 2 ) { +- die "Error getting nfdump version"; +- } + chomp $out[0]; +- my ($major, $minor) = $out[0] =~ /Version:\s(\d)\.(\d)\s/; ++ my ($major, $minor) = $out[0] =~ /Version:\s(\d)\.(\d)[\.\s]/; + if ( defined $major && defined $minor) { + if ( $major >= 1 && $minor >= 6 ) { + print "Found $out[0]\n"; +@@ -212,7 +183,9 @@ + print "out[0]\n"; + die "Nfdump version not compatible with current NfSen version.\n"; + } +- } ++ } else { ++ die "Error getting nfdump version"; ++ } + + my $www_gid = getgrnam($NfConf::WWWGROUP) || + die "WWW group '$NfConf::WWWGROUP' not found on this system\n"; |