diff options
| author | zi <zi@FreeBSD.org> | 2011-09-26 01:35:41 +0800 |
|---|---|---|
| committer | zi <zi@FreeBSD.org> | 2011-09-26 01:35:41 +0800 |
| commit | cd22f20a0f8cf7cd0d0ae9539b5568b19fc3e555 (patch) | |
| tree | e76341bf2b84029dbb336671fd3a7d1b9db98678 /net-mgmt/nfsen | |
| parent | 882364a9125cefe04fd4d01361b67d15c8454f39 (diff) | |
| download | freebsd-ports-graphics-cd22f20a0f8cf7cd0d0ae9539b5568b19fc3e555.tar.gz freebsd-ports-graphics-cd22f20a0f8cf7cd0d0ae9539b5568b19fc3e555.tar.zst freebsd-ports-graphics-cd22f20a0f8cf7cd0d0ae9539b5568b19fc3e555.zip | |
- Update to 1.3.5
- Fix compatibility with nfdump 1.6.4
- Add LICENSE
PR: ports/159738
Submitted by: Mike Stupalov <landy2005@gmail.com>
Approved by: Mohacsi Janos <janos.mohacsi@bsd.hu> (maintainer)
Diffstat (limited to 'net-mgmt/nfsen')
| -rw-r--r-- | net-mgmt/nfsen/Makefile | 8 | ||||
| -rw-r--r-- | net-mgmt/nfsen/distinfo | 4 | ||||
| -rw-r--r-- | net-mgmt/nfsen/files/patch-install.pl | 33 | ||||
| -rw-r--r-- | net-mgmt/nfsen/files/patch-libexec_NfSenRRD.pm | 11 |
4 files changed, 33 insertions, 23 deletions
diff --git a/net-mgmt/nfsen/Makefile b/net-mgmt/nfsen/Makefile index f5579734ad3..16cc73a8d98 100644 --- a/net-mgmt/nfsen/Makefile +++ b/net-mgmt/nfsen/Makefile @@ -6,16 +6,17 @@ # PORTNAME= nfsen -PORTVERSION= 1.3.2 -PORTREVISION= 1 +PORTVERSION= 1.3.5 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION} \ http://nfsen.sourceforge.net/ - MAINTAINER= janos.mohacsi@bsd.hu COMMENT= Web based frontend to nfdump netflow collector +LICENSE= BSD +LICENSE_FILE= ${WRKSRC}/BSD-license.txt + RUN_DEPENDS= ${SITE_PERL}/RRDp.pm:${PORTSDIR}/databases/rrdtool \ ${SITE_PERL}/Mail/Header.pm:${PORTSDIR}/mail/p5-Mail-Tools \ nfdump:${PORTSDIR}/net-mgmt/nfdump @@ -36,7 +37,6 @@ post-patch: ${WRKSRC}/etc/nfsen-dist.conf @${RM} ${WRKSRC}/etc/nfsen-dist.conf.* @${REINPLACE_CMD} -e 's,%%PERL%%,${PERL},' -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/install.pl - @${RM} ${WRKSRC}/libexec/NfSenRRD.pm.orig do-install: @${MKDIR} ${PREFIX}/var/${PORTNAME}/profiles/live diff --git a/net-mgmt/nfsen/distinfo b/net-mgmt/nfsen/distinfo index 95143f87b17..cf2999514a0 100644 --- a/net-mgmt/nfsen/distinfo +++ b/net-mgmt/nfsen/distinfo @@ -1,2 +1,2 @@ -SHA256 (nfsen-1.3.2.tar.gz) = a51dc81f83ad2273201ba0ca1ee67d598b5a67dc64ea8430ab9ff60d23b259c1 -SIZE (nfsen-1.3.2.tar.gz) = 6539382 +SHA256 (nfsen-1.3.5.tar.gz) = b2afd700818c2f91182d2970a1759f1c0a8c2835990726f15f695514f00b1e43 +SIZE (nfsen-1.3.5.tar.gz) = 221348 diff --git a/net-mgmt/nfsen/files/patch-install.pl b/net-mgmt/nfsen/files/patch-install.pl index 4b4113a85cc..88e8737985e 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"; diff --git a/net-mgmt/nfsen/files/patch-libexec_NfSenRRD.pm b/net-mgmt/nfsen/files/patch-libexec_NfSenRRD.pm deleted file mode 100644 index 6b7a66f7b5d..00000000000 --- a/net-mgmt/nfsen/files/patch-libexec_NfSenRRD.pm +++ /dev/null @@ -1,11 +0,0 @@ ---- libexec/NfSenRRD.pm.orig 2010-03-23 15:58:24.953252437 +0000 -+++ libexec/NfSenRRD.pm 2010-03-23 15:58:35.624042719 +0000 -@@ -73,7 +73,7 @@ - if ( $rrd_version < 1.1 ) { # it's RRD 1.0.x - $RRDoffset = 77; - } -- if ( $rrd_version >= 1.2 && $rrd_version < 1.4 ) { -+ if ( $rrd_version >= 1.2 && $rrd_version < 1.5 ) { - $RRDoffset = 67; - } - |