From 73114a872bfcd9f254b6f634468b539e7b4fd0b8 Mon Sep 17 00:00:00 2001
From: scheidell <scheidell@FreeBSD.org>
Date: Sat, 9 Jun 2012 23:35:21 +0000
Subject: - Fix config with both sflow and netflow - Bump PORTREVISION

PR:		ports/168230
Submitted by:	Vincent Hoffman <vince@unsane.co.uk>
Approved by:	maintainer (timeout, 15 days)
---
 net-mgmt/nfsen/Makefile                        |  2 +-
 net-mgmt/nfsen/files/patch-libexec__NFSenRC.pm | 32 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 net-mgmt/nfsen/files/patch-libexec__NFSenRC.pm

(limited to 'net-mgmt/nfsen')

diff --git a/net-mgmt/nfsen/Makefile b/net-mgmt/nfsen/Makefile
index 291cbd62005d..11314aca9bd4 100644
--- a/net-mgmt/nfsen/Makefile
+++ b/net-mgmt/nfsen/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nfsen
 PORTVERSION=	1.3.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION} \
 		http://nfsen.sourceforge.net/
diff --git a/net-mgmt/nfsen/files/patch-libexec__NFSenRC.pm b/net-mgmt/nfsen/files/patch-libexec__NFSenRC.pm
new file mode 100644
index 000000000000..9d63727d5a85
--- /dev/null
+++ b/net-mgmt/nfsen/files/patch-libexec__NFSenRC.pm
@@ -0,0 +1,32 @@
+--- libexec/NfSenRC.pm	2010-09-09 07:56:05.000000000 +0200
++++ libexec/NfSenRC.pm.patched	2011-03-09 13:09:32.000000000 +0100
+@@ -54,22 +54,21 @@
+ 		print "[no collector]";
+ 		return;
+ 	}
+-
+ 	my @SourceList;
+ 	my $type = undef;
+ 	foreach my $source ( sort keys %NfConf::sources ) {
+ 		my $_port = $NfConf::sources{$source}{'port'};
+ 		if ( $_port == $port ) {
+ 			push @SourceList, $source;
+-		}
+-		my $_type = exists $NfConf::sources{$source}{'type'} ? $NfConf::sources{$source}{'type'}: 'netflow';
+-		if ( defined $type ) {
+-			if ( $type ne $_type ) {
+-				print "Can not start different type '$type' and '$_type' on same port!\n";
+-				return;
++			my $_type = exists $NfConf::sources{$source}{'type'} ? $NfConf::sources{$source}{'type'}: 'netflow';
++			if ( defined $type ) {
++				if ( $type ne $_type ) {
++					print "Can not start different type '$type' and '$_type' on same port!\n";
++					return;
++				}
++			} else {
++				$type = $_type;
+ 			}
+-		} else {
+-			$type = $_type;
+ 		}
+ 	}
-- 
cgit