<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[129020] trunk/dports/net/nfsen</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/129020">129020</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-12-03 08:16:35 -0800 (Wed, 03 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>nfsen: add mode line and retab, white space only.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetnfsenPortfile">trunk/dports/net/nfsen/Portfile</a></li>
<li><a href="#trunkdportsnetnfsenfilespatchetcnfsendistconfdiff">trunk/dports/net/nfsen/files/patch-etc-nfsen-dist.conf.diff</a></li>
<li><a href="#trunkdportsnetnfsenfilespatchinstallpldiff">trunk/dports/net/nfsen/files/patch-install.pl.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsnetnfsenfilespatchlibexecNfProfilepmdiff">trunk/dports/net/nfsen/files/patch-libexec-NfProfile.pm.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetnfsenPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/nfsen/Portfile (129019 => 129020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/nfsen/Portfile 2014-12-03 15:39:35 UTC (rev 129019)
+++ trunk/dports/net/nfsen/Portfile 2014-12-03 16:16:35 UTC (rev 129020)
</span><span class="lines">@@ -1,37 +1,38 @@
</span><ins>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</ins><span class="cx"> # $Id$
</span><span class="cx">
</span><del>-PortSystem 1.0
</del><ins>+PortSystem 1.0
</ins><span class="cx">
</span><del>-name nfsen
-version 1.3
-revision 3
-categories net
-maintainers nomaintainer
-license BSD
</del><ins>+name nfsen
+version 1.3
+revision 3
+categories net
+maintainers nomaintainer
+license BSD
</ins><span class="cx">
</span><del>-description Web based frontend to nfdump netflow collector
-long_description ${description}
-homepage http://nfsen.sourceforge.net/
-platforms darwin
-master_sites sourceforge:project/nfsen/stable/nfsen-${version}
</del><ins>+description Web based frontend to nfdump netflow collector
+long_description ${description}
+homepage http://nfsen.sourceforge.net/
+platforms darwin
+master_sites sourceforge:project/nfsen/stable/nfsen-${version}
</ins><span class="cx">
</span><del>-checksums md5 1c4f057bbb3766090b40bda3ab6b81d2
</del><ins>+checksums md5 1c4f057bbb3766090b40bda3ab6b81d2
</ins><span class="cx">
</span><del>-depends_lib port:perl5.12 \
- port:rrdtool \
- port:p5.12-mailtools \
- port:p5.12-sys-syslog \
- port:nfdump
</del><ins>+depends_lib port:perl5.12 \
+ port:rrdtool \
+ port:p5.12-mailtools \
+ port:p5.12-sys-syslog \
+ port:nfdump
</ins><span class="cx">
</span><del>-patchfiles patch-install.pl.diff \
- patch-etc-nfsen-dist.conf.diff \
- patch-libexec-NfSenRC.pm.diff \
- patch-bin-nfsend.diff \
- patch-bin-nfsen.diff \
- patch-bin-testplugin.diff \
- patch-bin-RebuildHierarchy.pl.diff
</del><ins>+patchfiles patch-install.pl.diff \
+ patch-etc-nfsen-dist.conf.diff \
+ patch-libexec-NfSenRC.pm.diff \
+ patch-bin-nfsend.diff \
+ patch-bin-nfsen.diff \
+ patch-bin-testplugin.diff \
+ patch-bin-RebuildHierarchy.pl.diff
</ins><span class="cx">
</span><del>-use_configure no
</del><ins>+use_configure no
</ins><span class="cx"> build {}
</span><span class="cx">
</span><span class="cx"> startupitem.create yes
</span><span class="lines">@@ -40,26 +41,25 @@
</span><span class="cx"> post-patch {
</span><span class="cx"> # Read the nfsen.conf comments for details on the use of these variables
</span><span class="cx">
</span><del>-set netflowuser "www"
-set wwwuser "www"
-set wwwgroup "www"
</del><ins>+set netflowuser "www"
+set wwwuser "www"
+set wwwgroup "www"
</ins><span class="cx">
</span><del>- reinplace "s|__NETFLOWUSER__|${netflowuser}|g" \
- ${worksrcpath}/etc/nfsen-dist.conf \
- ${worksrcpath}/libexec/NfSenRC.pm
- reinplace "s|__WWWUSER__|${wwwuser}|g" \
- ${worksrcpath}/etc/nfsen-dist.conf
- reinplace "s|__WWWGROUP__|${wwwgroup}|g" \
- ${worksrcpath}/etc/nfsen-dist.conf
-
- reinplace "s|__PREFIX__|${prefix}|g" \
- ${worksrcpath}/install.pl
- reinplace "s|__DESTDIR__|${destroot}|g" \
- ${worksrcpath}/install.pl
- eval reinplace "s|__PREFIX__|${prefix}|g" \
- [glob ${worksrcpath}/bin/*]
- eval reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.12|g" \
- [glob ${worksrcpath}/installer-items/*.pm]
</del><ins>+ reinplace "s|__NETFLOWUSER__|${netflowuser}|g" \
+ ${worksrcpath}/etc/nfsen-dist.conf \
+ ${worksrcpath}/libexec/NfSenRC.pm
+ reinplace "s|__WWWUSER__|${wwwuser}|g" \
+ ${worksrcpath}/etc/nfsen-dist.conf
+ reinplace "s|__WWWGROUP__|${wwwgroup}|g" \
+ ${worksrcpath}/etc/nfsen-dist.conf
+ reinplace "s|__PREFIX__|${prefix}|g" \
+ ${worksrcpath}/install.pl
+ reinplace "s|__DESTDIR__|${destroot}|g" \
+ ${worksrcpath}/install.pl
+ eval reinplace "s|__PREFIX__|${prefix}|g" \
+ [glob ${worksrcpath}/bin/*]
+ eval reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.12|g" \
+ [glob ${worksrcpath}/installer-items/*.pm]
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> destroot {
</span><span class="lines">@@ -69,27 +69,27 @@
</span><span class="cx"> # to point to destroot, and after the install replace the previous .conf file that points to profiles in PREFIX.
</span><span class="cx"> # Yuch! I've asked the developers to add DESTDIR support in a future version.
</span><span class="cx">
</span><del>- reinplace "s|__PREFIX__|${prefix}|g" \
- ${worksrcpath}/etc/nfsen-dist.conf
</del><ins>+ reinplace "s|__PREFIX__|${prefix}|g" \
+ ${worksrcpath}/etc/nfsen-dist.conf
</ins><span class="cx">
</span><span class="cx"> # Backup the .conf file
</span><del>- file copy ${worksrcpath}/etc/nfsen-dist.conf \
- ${worksrcpath}/etc/nfsen-dist.conf.org
</del><ins>+ copy ${worksrcpath}/etc/nfsen-dist.conf \
+ ${worksrcpath}/etc/nfsen-dist.conf.org
</ins><span class="cx">
</span><span class="cx"> # Set profiles-stat and profiles-data to destroot until install is done
</span><del>- reinplace "s|\${VARDIR}/profiles|${destroot}${prefix}/var/nfsen/profiles|g" \
- ${worksrcpath}/etc/nfsen-dist.conf
- system -W ${worksrcpath} "${prefix}/bin/perl5.12 ./install.pl ./etc/nfsen-dist.conf"
</del><ins>+ reinplace "s|\${VARDIR}/profiles|${destroot}${prefix}/var/nfsen/profiles|g" \
+ ${worksrcpath}/etc/nfsen-dist.conf
+ system -W ${worksrcpath} "${prefix}/bin/perl5.12 ./install.pl ./etc/nfsen-dist.conf"
</ins><span class="cx">
</span><span class="cx"> # Replace the original .conf file
</span><del>- file rename -force ${destroot}${prefix}/etc/nfsen-dist.conf.org \
- ${destroot}${prefix}/etc/nfsen-dist.conf
</del><ins>+ file rename -force ${destroot}${prefix}/etc/nfsen-dist.conf.org \
+ ${destroot}${prefix}/etc/nfsen-dist.conf
</ins><span class="cx">
</span><del>- destroot.keepdirs \
- ${destroot}${prefix}/var/nfsen/run \
- ${destroot}${prefix}/var/nfsen/tmp \
- ${destroot}${prefix}/var/nfsen/filters \
- ${destroot}${prefix}/var/nfsen/fmt
</del><ins>+ destroot.keepdirs \
+ ${destroot}${prefix}/var/nfsen/run \
+ ${destroot}${prefix}/var/nfsen/tmp \
+ ${destroot}${prefix}/var/nfsen/filters \
+ ${destroot}${prefix}/var/nfsen/fmt
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-activate {
</span><span class="lines">@@ -121,4 +121,4 @@
</span><span class="cx"> \n"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.regex /${name}-(\[0-9.\]+)${extract.suffix}
</del><ins>+livecheck.regex /${name}-(\[0-9.\]+)${extract.suffix}
</ins></span></pre></div>
<a id="trunkdportsnetnfsenfilespatchetcnfsendistconfdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/nfsen/files/patch-etc-nfsen-dist.conf.diff (129019 => 129020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/nfsen/files/patch-etc-nfsen-dist.conf.diff 2014-12-03 15:39:35 UTC (rev 129019)
+++ trunk/dports/net/nfsen/files/patch-etc-nfsen-dist.conf.diff 2014-12-03 16:16:35 UTC (rev 129020)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- etc/nfsen-dist.conf.org 2007-11-20 04:27:39.000000000 -0800
-+++ etc/nfsen-dist.conf 2008-02-12 14:50:04.000000000 -0800
</del><ins>+--- etc/nfsen-dist.conf.orig 2011-12-29 04:38:38.000000000 -0800
++++ etc/nfsen-dist.conf 2014-12-03 07:31:47.000000000 -0800
</ins><span class="cx"> @@ -18,7 +18,7 @@
</span><span class="cx">
</span><span class="cx"> #
</span><span class="lines">@@ -34,9 +34,9 @@
</span><span class="cx"> -$VARDIR="${BASEDIR}/var";
</span><span class="cx"> +$VARDIR="${BASEDIR}/var/nfsen";
</span><span class="cx">
</span><del>- #
</del><span class="cx"> # directory for all pid files
</span><del>-@@ -53,15 +53,15 @@
</del><ins>+ # $PIDDIR="$VARDIR/run";
+@@ -60,15 +60,15 @@
</ins><span class="cx"> #
</span><span class="cx"> # The Profiles stat directory, where all profile information
</span><span class="cx"> # RRD DBs and png pictures of the profile are stored
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx">
</span><span class="cx"> #
</span><span class="cx"> # Where go all the frontend plugins
</span><del>-@@ -69,7 +69,7 @@
</del><ins>+@@ -76,7 +76,7 @@
</ins><span class="cx">
</span><span class="cx"> #
</span><span class="cx"> # nfdump tools path
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> #
</span><span class="cx"> # nfsend communication socket
</span><del>-@@ -81,12 +81,12 @@
</del><ins>+@@ -88,12 +88,12 @@
</ins><span class="cx"> # This may be a different or the same uid than your web server.
</span><span class="cx"> # Note: This user must be in group $WWWGROUP, otherwise nfcapd
</span><span class="cx"> # is not able to write data files!
</span><span class="lines">@@ -80,12 +80,14 @@
</span><span class="cx">
</span><span class="cx"> # Receive buffer size for nfcapd - see man page nfcapd(1)
</span><span class="cx"> $BUFFLEN = 200000;
</span><del>-@@ -136,7 +136,7 @@
</del><ins>+@@ -158,8 +158,8 @@
</ins><span class="cx">
</span><span class="cx"> %sources = (
</span><del>- 'upstream1' => { 'port' => '9995', 'col' => '#0000ff', 'type' => 'netflow' },
-- 'peer1' => { 'port' => '9996', 'col' => '#ff0000' },
-+# 'peer1' => { 'port' => '9996', 'col' => '#ff0000' },
</del><ins>+ 'upstream1' => { 'port' => '9995', 'col' => '#0000ff', 'type' => 'netflow' },
+- 'peer1' => { 'port' => '9996', 'IP' => '172.16.17.18' },
+- 'peer2' => { 'port' => '9996', 'IP' => '172.16.17.19' },
++# 'peer1' => { 'port' => '9996', 'IP' => '172.16.17.18' },
++# 'peer2' => { 'port' => '9996', 'IP' => '172.16.17.19' },
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> #
</span></span></pre></div>
<a id="trunkdportsnetnfsenfilespatchinstallpldiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/nfsen/files/patch-install.pl.diff (129019 => 129020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/nfsen/files/patch-install.pl.diff 2014-12-03 15:39:35 UTC (rev 129019)
+++ trunk/dports/net/nfsen/files/patch-install.pl.diff 2014-12-03 16:16:35 UTC (rev 129020)
</span><span class="lines">@@ -1,77 +1,78 @@
</span><del>---- install.pl.org 2007-11-21 01:12:04.000000000 -0800
-+++ install.pl 2008-02-09 20:52:23.000000000 -0800
</del><ins>+--- install.pl.orig 2011-12-30 06:23:35.000000000 -0800
++++ install.pl 2014-12-03 07:26:35.000000000 -0800
</ins><span class="cx"> @@ -1,4 +1,4 @@
</span><span class="cx"> -#!/usr/bin/perl
</span><del>-+#!__PREFIX__/bin/perl -I __PREFIX__/libexec/nfsen -I __DESTDIR____PREFIX__/libexec/nfsen
</del><ins>++#!__PREFIX__/bin/perl5.16 -I __PREFIX__/libexec/nfsen -I __DESTDIR____PREFIX__/libexec/nfsen
</ins><span class="cx"> #
</span><span class="cx"> #
</span><span class="cx"> # Copyright (c) 2004, SWITCH - Teleinformatikdienste fuer Lehre und Forschung
</span><del>-@@ -283,8 +283,8 @@
</del><ins>+@@ -277,8 +277,8 @@
</ins><span class="cx"> sub PatchAllScripts {
</span><span class="cx">
</span><span class="cx"> my %GlobList = (
</span><del>-- "bin/*" => "$NfConf::BINDIR",
-- "libexec/*" => "$NfConf::LIBEXECDIR"
</del><ins>+- "bin/*" => "$NfConf::INSTPREFIX$NfConf::BINDIR",
+- "libexec/*" => "$NfConf::INSTPREFIX$NfConf::LIBEXECDIR"
</ins><span class="cx"> + "bin/*" => "__DESTDIR____PREFIX__/bin",
</span><span class="cx"> + "libexec/*" => "__DESTDIR____PREFIX__/libexec/nfsen"
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> foreach my $glob_list ( keys %GlobList ) {
</span><del>-@@ -334,15 +334,14 @@
</del><ins>+@@ -328,16 +328,15 @@
</ins><span class="cx"> my ( $nfsen_uid, $www_gid ) = @_;
</span><span class="cx">
</span><span class="cx"> print "Setup php and html files.\n";
</span><del>-- mkdir "$NfConf::HTMLDIR" unless -d "$NfConf::HTMLDIR";
-- die "Could not create HTMl directory '$NfConf::HTMLDIR': $!\n" unless -d $NfConf::HTMLDIR;
-+ mkdir "__DESTDIR____PREFIX__/www/nfsen";
</del><ins>+- mkpath("$NfConf::INSTPREFIX$NfConf::HTMLDIR", 1, 0755) unless -d "$NfConf::INSTPREFIX$NfConf::HTMLDIR";
+- die "Could not create HTMl directory '$NfConf::INSTPREFIX$NfConf::HTMLDIR': $!\n" unless -d "$NfConf::INSTPREFIX$NfConf::HTMLDIR";
++ mkdir "__DESTDIR____PREFIX__/www/nfsen";
</ins><span class="cx">
</span><span class="cx"> $CopyRecursive::CopyLink = 1;
</span><span class="cx"> $CopyRecursive::MODE = 0644;
</span><span class="cx"> $CopyRecursive::UID = 0;
</span><span class="cx"> $CopyRecursive::GID = $www_gid;
</span><del>-- CopyRecursive::dircopy("html", "$NfConf::HTMLDIR");
-- open CONF, ">$NfConf::HTMLDIR/conf.php" || die "Can't open conf.php for writing: $!\n";
-+ CopyRecursive::dircopy("html", "__DESTDIR____PREFIX__/www/nfsen");
-+ open CONF, ">__DESTDIR____PREFIX__/www/nfsen/conf.php" || die "Can't open conf.php for writing: $!\n";
- print CONF "<?\n";
- print CONF "/* This file was automatically created by the NfSen install.pl script */\n\n";
</del><ins>+- CopyRecursive::dircopy("html", "$NfConf::INSTPREFIX$NfConf::HTMLDIR");
+- open CONF, ">$NfConf::INSTPREFIX$NfConf::HTMLDIR/conf.php" || die "Can't open conf.php for writing: $!\n";
+- print CONF "<?php\n";
++ CopyRecursive::dircopy("html", "__DESTDIR____PREFIX__/www/nfsen");
++ open CONF, ">__DESTDIR____PREFIX__/www/nfsen/conf.php" || die "Can't open conf.php for writing: $!\n";
++ print CONF "<?php\n";
+ print CONF "/* This file was automatically created by the NfSen $nfsen_version install.pl script */\n\n";
</ins><span class="cx"> print CONF "\$COMMSOCKET = \"$NfConf::COMMSOCKET\";\n";
</span><del>-@@ -362,11 +361,11 @@
</del><ins>+ print CONF "\n\$DEBUG=0;\n";
+@@ -356,11 +355,11 @@
</ins><span class="cx"> umask 0002;
</span><span class="cx"> print "\nSetup diretories:\n";
</span><span class="cx"> my @dirs = (
</span><del>-- "$NfConf::VARDIR",
-- "$NfConf::PIDDIR",
-- "$NfConf::VARDIR/tmp",
-- "$NfConf::VARDIR/filters",
-- "$NfConf::VARDIR/fmt",
-+ "__DESTDIR____PREFIX__/var/nfsen",
-+ "__DESTDIR____PREFIX__/var/nfsen/run",
-+ "__DESTDIR____PREFIX__/var/nfsen/tmp",
-+ "__DESTDIR____PREFIX__/var/nfsen/filters",
-+ "__DESTDIR____PREFIX__/var/nfsen/fmt",
- "$NfConf::PROFILESTATDIR",
- "$NfConf::PROFILESTATDIR/live",
- "$NfConf::PROFILEDATADIR",
-@@ -585,21 +584,15 @@
</del><ins>+- "$NfConf::INSTPREFIX$NfConf::VARDIR",
+- "$NfConf::INSTPREFIX$NfConf::VARDIR/tmp",
+- "$NfConf::INSTPREFIX$NfConf::PIDDIR",
+- "$NfConf::INSTPREFIX$NfConf::FILTERDIR",
+- "$NfConf::INSTPREFIX$NfConf::FORMATDIR",
++ "__DESTDIR____PREFIX__/var/nfsen",
++ "__DESTDIR____PREFIX__/var/nfsen/tmp",
++ "__DESTDIR____PREFIX__/var/nfsen/run",
++ "__DESTDIR____PREFIX__/var/nfsen/filters",
++ "__DESTDIR____PREFIX__/var/nfsen/fmt",
+ "$NfConf::INSTPREFIX$NfConf::PROFILESTATDIR",
+ "$NfConf::INSTPREFIX$NfConf::PROFILESTATDIR/live",
+ "$NfConf::INSTPREFIX$NfConf::PROFILEDATADIR",
+@@ -579,20 +578,14 @@
</ins><span class="cx"> $CopyRecursive::UID = 0;
</span><span class="cx"> $CopyRecursive::GID = $www_gid;
</span><span class="cx"> $CopyRecursive::MODE = 0755;
</span><span class="cx"> - unlink "$NfConf::BINDIR/nfsen.rc";
</span><del>-- CopyRecursive::dircopy("bin", "$NfConf::BINDIR");
-- CopyRecursive::dircopy("libexec", "$NfConf::LIBEXECDIR");
-+ unlink "__DESTDIR____PREFIX__/bin/nfsen.rc";
-+ CopyRecursive::dircopy("bin", "__DESTDIR____PREFIX__/bin");
-+ CopyRecursive::dircopy("libexec", "__DESTDIR____PREFIX__/libexec/nfsen");
- $CopyRecursive::MODE = 0644;
-- CopyRecursive::dircopy("etc", "$NfConf::CONFDIR");
-- CopyRecursive::dircopy("plugins/backend", "$NfConf::BACKEND_PLUGINDIR");
-- CopyRecursive::dircopy("plugins/frontend", "$NfConf::FRONTEND_PLUGINDIR");
-- CopyRecursive::dircopy("doc", "$NfConf::DOCDIR");
-+ CopyRecursive::dircopy("etc", "__DESTDIR____PREFIX__/etc");
-+ CopyRecursive::dircopy("plugins/backend", "__DESTDIR____PREFIX__/libexec/nfsen/plugins");
-+ CopyRecursive::dircopy("plugins/frontend", "__DESTDIR____PREFIX__/www/nfsen/plugins");
-+ CopyRecursive::dircopy("doc", "__DESTDIR____PREFIX__/www/nfsen/doc");
</del><ins>+- CopyRecursive::dircopy("bin", "$NfConf::INSTPREFIX$NfConf::BINDIR");
+- CopyRecursive::dircopy("libexec", "$NfConf::INSTPREFIX$NfConf::LIBEXECDIR");
+- $CopyRecursive::MODE = 0644;
+- CopyRecursive::dircopy("etc", "$NfConf::INSTPREFIX$NfConf::CONFDIR");
+- CopyRecursive::dircopy("plugins/backend", "$NfConf::INSTPREFIX$NfConf::BACKEND_PLUGINDIR");
+- CopyRecursive::dircopy("plugins/frontend", "$NfConf::INSTPREFIX$NfConf::FRONTEND_PLUGINDIR");
++ unlink "__DESTDIR____PREFIX__/bin/nfsen.rc";
++ CopyRecursive::dircopy("bin", "__DESTDIR____PREFIX__/bin");
++ CopyRecursive::dircopy("libexec", "__DESTDIR____PREFIX__/libexec/nfsen");
++ $CopyRecursive::MODE = 0644;
++ CopyRecursive::dircopy("etc", "__DESTDIR____PREFIX__/etc");
++ CopyRecursive::dircopy("plugins/backend", "__DESTDIR____PREFIX__/libexec/nfsen/plugins");
++ CopyRecursive::dircopy("plugins/frontend", "__DESTDIR____PREFIX__/www/nfsen/plugins");
</ins><span class="cx">
</span><span class="cx"> - if ( $ConfigFile eq "$NfConf::CONFDIR/nfsen.conf" ) {
</span><span class="cx"> - print "Keep config file '$ConfigFile'\n";
</span><span class="lines">@@ -82,7 +83,7 @@
</span><span class="cx"> print "\n";
</span><span class="cx">
</span><span class="cx"> } # End of CopyAllFiles
</span><del>-@@ -669,12 +662,6 @@
</del><ins>+@@ -663,12 +656,6 @@
</ins><span class="cx"> exit 1;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -92,6 +93,6 @@
</span><span class="cx"> - die "Extra nfsen.conf file in etc directory found. Remove errornous file first"
</span><span class="cx"> -}
</span><span class="cx"> -
</span><ins>+ Log::LogInit();
+
</ins><span class="cx"> my $hints = NfSen::LoadHints();
</span><del>- if ( $$$hints{'version'} == -1 ) {
- # initial NfSen install or upgrade from old version without hints
</del></span></pre></div>
<a id="trunkdportsnetnfsenfilespatchlibexecNfProfilepmdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/net/nfsen/files/patch-libexec-NfProfile.pm.diff (0 => 129020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/nfsen/files/patch-libexec-NfProfile.pm.diff (rev 0)
+++ trunk/dports/net/nfsen/files/patch-libexec-NfProfile.pm.diff 2014-12-03 16:16:35 UTC (rev 129020)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+--- libexec/NfProfile.pm.orig 2014-12-03 08:02:49.000000000 -0800
++++ libexec/NfProfile.pm 2014-12-03 08:03:33.000000000 -0800
+@@ -41,6 +41,7 @@
+ use Fcntl qw(:DEFAULT :flock);
+
+ use NfSen;
++use NfSync;
+ use NfSenRRD;
+ use Log;
+
</ins></span></pre>
</div>
</div>
</body>
</html>