mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-31 05:41:08 +00:00
- 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)
This commit is contained in:
parent
f6da2654cc
commit
cd818112cf
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=282380
@ -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
|
||||
|
@ -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
|
||||
|
@ -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";
|
||||
|
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user