5 files changed, 24 insertions, 44 deletions

diff --git a/net-mgmt/nfsen/Makefile b/net-mgmt/nfsen/Makefile
index b3a4938653ee..eb3108bc7a3e 100644
--- a/net-mgmt/nfsen/Makefile
+++ b/net-mgmt/nfsen/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	nfsen
-PORTVERSION=	1.2.4.20060810
+PORTVERSION=	1.3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://nfsen.sourceforge.net/
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-snapshot-20060810
 
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	Web based frontend to nfdump netflow collector
 
 RUN_DEPENDS=	${SITE_PERL}/RRDp.pm:${PORTSDIR}/databases/rrdtool \
+		${SITE_PERL}/Mail/Header.pm:${PORTSDIR}/mail/p5-Mail-Tools \
 		nfdump:${PORTSDIR}/net-mgmt/nfdump
 
 USE_ICONV=	yes
diff --git a/net-mgmt/nfsen/distinfo b/net-mgmt/nfsen/distinfo
index d34da0a50fc1..f806550ea3d5 100644
--- a/net-mgmt/nfsen/distinfo
+++ b/net-mgmt/nfsen/distinfo
@@ -1,3 +1,3 @@
-MD5 (nfsen-snapshot-20060810.tar.gz) = 4274e60f8a007e4a01923e975a18ef65
-SHA256 (nfsen-snapshot-20060810.tar.gz) = 11c73c5207ea608a2a1d50d84cddeee6ecbd59e048d0622b322e07100e8af50d
-SIZE (nfsen-snapshot-20060810.tar.gz) = 3362157
+MD5 (nfsen-1.3.tar.gz) = 1c4f057bbb3766090b40bda3ab6b81d2
+SHA256 (nfsen-1.3.tar.gz) = c34a6893fa88d142606c856a181d9fa04017608e3ecd6793de1d969cf570edf6
+SIZE (nfsen-1.3.tar.gz) = 6537807
diff --git a/net-mgmt/nfsen/files/nfsen.sh.in b/net-mgmt/nfsen/files/nfsen.sh.in
index 83ecfc335215..7ae388c538ad 100644
--- a/net-mgmt/nfsen/files/nfsen.sh.in
+++ b/net-mgmt/nfsen/files/nfsen.sh.in
@@ -2,7 +2,7 @@
 #
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=%%PREFIX%%/bin/nfsen.rc
+DAEMON=%%PREFIX%%/bin/nfsen
 NAME=nfsen
 
 test -x $DAEMON || exit 0
diff --git a/net-mgmt/nfsen/files/patch-etc_nfsen-dist.conf b/net-mgmt/nfsen/files/patch-etc_nfsen-dist.conf
index 0d260cabe3a4..47e7b8e04b86 100644
--- a/net-mgmt/nfsen/files/patch-etc_nfsen-dist.conf
+++ b/net-mgmt/nfsen/files/patch-etc_nfsen-dist.conf
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- etc/nfsen-dist.conf.orig
-+++ etc/nfsen-dist.conf
-@@ -26,7 +26,7 @@
+--- etc/nfsen-dist.conf.ori	2008-05-29 13:33:01.000000000 -0700
++++ etc/nfsen-dist.conf	2008-05-29 13:56:53.000000000 -0700
+@@ -18,7 +18,7 @@
  
  #
  # Required for default layout
@@ -12,7 +12,7 @@ $FreeBSD$
  
  #
  # Where to install the NfSen binaries
-@@ -34,7 +34,7 @@
+@@ -26,7 +26,7 @@
  
  #
  # Where to install the NfSen Perl modules
@@ -21,16 +21,16 @@ $FreeBSD$
  
  #
  # Where to install the config files
-@@ -44,7 +44,7 @@
+@@ -36,7 +36,7 @@
  # NfSen html pages directory:
  # All php scripts will be installed here.
  # URL: Entry point for nfsen: http://<webserver>/nfsen/nfsen.php
 -$HTMLDIR    = "/var/www/nfsen/";
-+$HTMLDIR    = "%%PREFIX%%/www/%%PORTNAME%%/";
++$HTMLDIR    = "%%PREFIX%%/www/%%PORTNAME%%";
  
  #
  # Where to install the docs
-@@ -52,20 +52,20 @@
+@@ -44,7 +44,7 @@
  
  #
  # Var space for NfSen
@@ -38,15 +38,18 @@ $FreeBSD$
 +$VARDIR="${BASEDIR}/var/%%PORTNAME%%";
  
  #
+ # directory for all pid files
+@@ -53,15 +53,15 @@
+ #
  # The Profiles stat directory, where all profile information
- # RRD DBs and gif pictures of the profile are stored
--$PROFILESTATDIR="${BASEDIR}/profiles";
-+$PROFILESTATDIR="${VARDIR}/profiles";
+ # RRD DBs and png pictures of the profile are stored
+-$PROFILESTATDIR="${BASEDIR}/profiles-stat";
++$PROFILESTATDIR="${VARDIR}/profiles-stat";
  
  #
  # The Profiles directory, where all netflow data is stored
--$PROFILEDATADIR="${BASEDIR}/profiles";
-+$PROFILEDATADIR="${VARDIR}/profiles";
+-$PROFILEDATADIR="${BASEDIR}/profiles-data";
++$PROFILEDATADIR="${VARDIR}/profiles-data";
  
  #
  # Where go all the backend plugins
@@ -55,7 +58,7 @@ $FreeBSD$
  
  #
  # Where go all the frontend plugins
-@@ -73,7 +73,7 @@
+@@ -69,7 +69,7 @@
  
  #
  # nfdump tools path
@@ -63,8 +66,8 @@ $FreeBSD$
 +$PREFIX  = '%%PREFIX%%/bin';
  
  #
- # BASEDIR unrelated vars:
-@@ -82,7 +82,7 @@
+ # nfsend communication socket
+@@ -81,7 +81,7 @@
  # This may be a different or the same uid than your web server.
  # Note: This user must be in group $WWWGROUP, otherwise nfcapd
  #       is not able to write data files!
@@ -73,12 +76,3 @@ $FreeBSD$
  
  # user and group of the web server process
  # All netflow processing will be done with this user
-@@ -106,7 +106,7 @@
- 
- %sources = (
-     'upstream1'    => { 'port'    => '9995', 'col' => '#0000ff', 'type' => 'netflow' },
--    'peer1'        => { 'port'    => '9996', 'col' => '#ff0000' },
-+#    'peer1'        => { 'port'    => '9996', 'col' => '#ff0000' },
- );
- 
- #
diff --git a/net-mgmt/nfsen/files/patch-html_navigator.php b/net-mgmt/nfsen/files/patch-html_navigator.php
deleted file mode 100644
index 9249f8afc3d2..000000000000
--- a/net-mgmt/nfsen/files/patch-html_navigator.php
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- html/navigator.php.orig
-+++ html/navigator.php
-@@ -18,7 +18,7 @@
- 	 * Copy the doc directory into HTML dir
- 	 */
- 
--	// print "<a href='$DOCURL/NfSen.html' target='_blank' >Docu</a>\n";
-+	print "<a href='$DOCURL/NfSen.html' target='_blank' >Docu</a>\n";
- 
- 	print "<a href='$self?bookmark=" . $_SESSION['bookmark'] . "'>Bookmark URL</a>\n";
- 	print "Selected Profile:&nbsp;\n";