<!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>[143406] 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/143406">143406</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2015-12-12 01:10:41 -0800 (Sat, 12 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>nfsen: upgrade to 1.3.7, switch to p5.22 (#48365), port is still broken (see #38276)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetnfsenPortfile">trunk/dports/net/nfsen/Portfile</a></li>
<li><a href="#trunkdportsnetnfsenfilespatchbinRebuildHierarchypldiff">trunk/dports/net/nfsen/files/patch-bin-RebuildHierarchy.pl.diff</a></li>
<li><a href="#trunkdportsnetnfsenfilespatchbinnfsendiff">trunk/dports/net/nfsen/files/patch-bin-nfsen.diff</a></li>
<li><a href="#trunkdportsnetnfsenfilespatchbinnfsenddiff">trunk/dports/net/nfsen/files/patch-bin-nfsend.diff</a></li>
<li><a href="#trunkdportsnetnfsenfilespatchbintestplugindiff">trunk/dports/net/nfsen/files/patch-bin-testplugin.diff</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>
<li><a href="#trunkdportsnetnfsenfilespatchlibexecNfSenRCpmdiff">trunk/dports/net/nfsen/files/patch-libexec-NfSenRC.pm.diff</a></li>
</ul>
<h3>Removed 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 (143405 => 143406)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/nfsen/Portfile 2015-12-12 08:45:20 UTC (rev 143405)
+++ trunk/dports/net/nfsen/Portfile 2015-12-12 09:10:41 UTC (rev 143406)
</span><span class="lines">@@ -2,9 +2,11 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup perl5 1.0
</ins><span class="cx">
</span><ins>+# port is broken, see https://trac.macports.org/ticket/38276
</ins><span class="cx"> name nfsen
</span><del>-version 1.3.6
</del><ins>+version 1.3.7
</ins><span class="cx"> categories net
</span><span class="cx"> maintainers nomaintainer
</span><span class="cx"> license BSD
</span><span class="lines">@@ -16,19 +18,20 @@
</span><span class="cx"> platforms darwin
</span><span class="cx"> master_sites sourceforge:project/nfsen/stable/nfsen-${version}
</span><span class="cx">
</span><del>-checksums rmd160 4399b0fe1807b9aeea1c4bcff094e2c8a0235e80 \
- sha256 c5809505544ea2cf5bac69a9829b7d7d78649b67a772519aa8a191b1a25fd918
</del><ins>+checksums rmd160 60981d49f6fa4de434c8849ff326b6568fb17937 \
+ sha256 635ba97564fe81cbeee0a3950735b9651677b69e1f53a67c654ddd5b00db469d
</ins><span class="cx">
</span><del>-depends_lib port:perl5.16 \
</del><ins>+perl5.branches 5.22
+
+depends_lib port:perl${perl5.major} \
+ port:p${perl5.major}-mailtools \
+ port:p${perl5.major}-socket6 \
+ port:p${perl5.major}-sys-syslog \
</ins><span class="cx"> port:rrdtool \
</span><del>- port:p5.16-mailtools \
- port:p5.16-socket6 \
- port:p5.16-sys-syslog \
</del><span class="cx"> port:nfdump
</span><span class="cx">
</span><span class="cx"> patchfiles patch-install.pl.diff \
</span><span class="cx"> patch-etc-nfsen-dist.conf.diff \
</span><del>- patch-libexec-NfProfile.pm.diff \
</del><span class="cx"> patch-libexec-NfSenRC.pm.diff \
</span><span class="cx"> patch-bin-nfsend.diff \
</span><span class="cx"> patch-bin-nfsen.diff \
</span><span class="lines">@@ -61,7 +64,7 @@
</span><span class="cx"> ${worksrcpath}/install.pl
</span><span class="cx"> eval reinplace "s|__PREFIX__|${prefix}|g" \
</span><span class="cx"> [glob ${worksrcpath}/bin/*]
</span><del>- eval reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.16|g" \
</del><ins>+ eval reinplace "s|/usr/bin/perl|${perl5.bin}|g" \
</ins><span class="cx"> [glob ${worksrcpath}/installer-items/*.pm]
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -82,7 +85,7 @@
</span><span class="cx"> # Set profiles-stat and profiles-data to destroot until install is done
</span><span class="cx"> reinplace "s|\${VARDIR}/profiles|${destroot}${prefix}/var/nfsen/profiles|g" \
</span><span class="cx"> ${worksrcpath}/etc/nfsen-dist.conf
</span><del>- system -W ${worksrcpath} "${prefix}/bin/perl5.16 ./install.pl ./etc/nfsen-dist.conf"
</del><ins>+ system -W ${worksrcpath} "${perl5.bin} ./install.pl ./etc/nfsen-dist.conf"
</ins><span class="cx">
</span><span class="cx"> # Replace the original .conf file
</span><span class="cx"> file rename -force ${destroot}${prefix}/etc/nfsen-dist.conf.org \
</span></span></pre></div>
<a id="trunkdportsnetnfsenfilespatchbinRebuildHierarchypldiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/nfsen/files/patch-bin-RebuildHierarchy.pl.diff (143405 => 143406)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/nfsen/files/patch-bin-RebuildHierarchy.pl.diff 2015-12-12 08:45:20 UTC (rev 143405)
+++ trunk/dports/net/nfsen/files/patch-bin-RebuildHierarchy.pl.diff 2015-12-12 09:10:41 UTC (rev 143406)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- bin/RebuildHierarchy.pl.org 2007-07-20 05:33:21.000000000 -0700
-+++ bin/RebuildHierarchy.pl 2008-02-08 10:01:29.000000000 -0800
</del><ins>+--- bin/RebuildHierarchy.pl.org
++++ bin/RebuildHierarchy.pl
</ins><span class="cx"> @@ -1,4 +1,4 @@
</span><span class="cx"> -#!%%PERL%% -w
</span><span class="cx"> +#!__PREFIX__/bin/perl -w -I __PREFIX__/libexec/nfsen
</span></span></pre></div>
<a id="trunkdportsnetnfsenfilespatchbinnfsendiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/nfsen/files/patch-bin-nfsen.diff (143405 => 143406)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/nfsen/files/patch-bin-nfsen.diff 2015-12-12 08:45:20 UTC (rev 143405)
+++ trunk/dports/net/nfsen/files/patch-bin-nfsen.diff 2015-12-12 09:10:41 UTC (rev 143406)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- bin/nfsen.org 2008-02-08 09:57:18.000000000 -0800
-+++ bin/nfsen 2008-02-08 09:57:44.000000000 -0800
</del><ins>+--- bin/nfsen.org
++++ bin/nfsen
</ins><span class="cx"> @@ -1,4 +1,4 @@
</span><span class="cx"> -#!%%PERL%% -w
</span><span class="cx"> +#!__PREFIX__/bin/perl -w -I __PREFIX__/libexec/nfsen
</span></span></pre></div>
<a id="trunkdportsnetnfsenfilespatchbinnfsenddiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/nfsen/files/patch-bin-nfsend.diff (143405 => 143406)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/nfsen/files/patch-bin-nfsend.diff 2015-12-12 08:45:20 UTC (rev 143405)
+++ trunk/dports/net/nfsen/files/patch-bin-nfsend.diff 2015-12-12 09:10:41 UTC (rev 143406)
</span><span class="lines">@@ -1,12 +1,12 @@
</span><del>---- bin/nfsend.org 2007-11-20 04:27:39.000000000 -0800
-+++ bin/nfsend 2008-02-08 09:59:40.000000000 -0800
</del><ins>+--- bin/nfsend.org
++++ bin/nfsend
</ins><span class="cx"> @@ -1,4 +1,4 @@
</span><span class="cx"> -#!%%PERL%% -w
</span><span class="cx"> +#!__PREFIX__/bin/perl -w -I __PREFIX__/libexec/nfsen
</span><span class="cx"> #
</span><span class="cx"> # Copyright (c) 2004, SWITCH - Teleinformatikdienste fuer Lehre und Forschung
</span><span class="cx"> # All rights reserved.
</span><del>-@@ -703,9 +703,9 @@
</del><ins>+@@ -750,9 +750,9 @@
</ins><span class="cx"> $arg = '' unless defined $arg;
</span><span class="cx"> die "Unknow argument '$arg'" if $arg ne '' && $arg ne 'once';
</span><span class="cx">
</span><span class="lines">@@ -17,5 +17,5 @@
</span><span class="cx"> +# die "$Log::ERROR\n";
</span><span class="cx"> +#}
</span><span class="cx">
</span><del>- $semlock = semget(IPC_PRIVATE, 1, 0600 | IPC_CREAT ) || die "Can not get semaphore: $!";
- semsignal($semlock);
</del><ins>+ Nfsync::seminit();
+
</ins></span></pre></div>
<a id="trunkdportsnetnfsenfilespatchbintestplugindiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/nfsen/files/patch-bin-testplugin.diff (143405 => 143406)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/nfsen/files/patch-bin-testplugin.diff 2015-12-12 08:45:20 UTC (rev 143405)
+++ trunk/dports/net/nfsen/files/patch-bin-testplugin.diff 2015-12-12 09:10:41 UTC (rev 143406)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- bin/testPlugin.org 2007-08-24 09:56:26.000000000 -0700
-+++ bin/testPlugin 2008-02-08 10:02:43.000000000 -0800
</del><ins>+--- bin/testPlugin.org
++++ bin/testPlugin
</ins><span class="cx"> @@ -1,4 +1,4 @@
</span><span class="cx"> -#!%%PERL%% -w
</span><span class="cx"> +#!__PREFIX__/bin/perl -w -I __PREFIX__/libexec/nfsen
</span></span></pre></div>
<a id="trunkdportsnetnfsenfilespatchetcnfsendistconfdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/nfsen/files/patch-etc-nfsen-dist.conf.diff (143405 => 143406)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/nfsen/files/patch-etc-nfsen-dist.conf.diff 2015-12-12 08:45:20 UTC (rev 143405)
+++ trunk/dports/net/nfsen/files/patch-etc-nfsen-dist.conf.diff 2015-12-12 09:10:41 UTC (rev 143406)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- 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
</del><ins>+--- etc/nfsen-dist.conf.orig
++++ etc/nfsen-dist.conf
</ins><span class="cx"> @@ -18,7 +18,7 @@
</span><span class="cx">
</span><span class="cx"> #
</span><span class="lines">@@ -80,7 +80,7 @@
</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>-@@ -158,8 +158,8 @@
</del><ins>+@@ -167,8 +167,8 @@
</ins><span class="cx">
</span><span class="cx"> %sources = (
</span><span class="cx"> 'upstream1' => { 'port' => '9995', 'col' => '#0000ff', 'type' => 'netflow' },
</span></span></pre></div>
<a id="trunkdportsnetnfsenfilespatchinstallpldiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/nfsen/files/patch-install.pl.diff (143405 => 143406)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/nfsen/files/patch-install.pl.diff 2015-12-12 08:45:20 UTC (rev 143405)
+++ trunk/dports/net/nfsen/files/patch-install.pl.diff 2015-12-12 09:10:41 UTC (rev 143406)
</span><span class="lines">@@ -1,12 +1,12 @@
</span><del>---- install.pl.orig 2011-12-30 06:23:35.000000000 -0800
-+++ install.pl 2014-12-03 07:26:35.000000000 -0800
</del><ins>+--- install.pl.orig
++++ install.pl
</ins><span class="cx"> @@ -1,4 +1,4 @@
</span><span class="cx"> -#!/usr/bin/perl
</span><span class="cx"> +#!__PREFIX__/bin/perl5.16 -I __PREFIX__/libexec/nfsen -I __DESTDIR____PREFIX__/libexec/nfsen
</span><span class="cx"> #
</span><span class="cx"> #
</span><span class="cx"> # Copyright (c) 2004, SWITCH - Teleinformatikdienste fuer Lehre und Forschung
</span><del>-@@ -277,8 +277,8 @@
</del><ins>+@@ -280,8 +280,8 @@
</ins><span class="cx"> sub PatchAllScripts {
</span><span class="cx">
</span><span class="cx"> my %GlobList = (
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> foreach my $glob_list ( keys %GlobList ) {
</span><del>-@@ -328,16 +328,15 @@
</del><ins>+@@ -331,16 +331,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><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> print CONF "/* This file was automatically created by the NfSen $nfsen_version install.pl script */\n\n";
</span><span class="cx"> print CONF "\$COMMSOCKET = \"$NfConf::COMMSOCKET\";\n";
</span><span class="cx"> print CONF "\n\$DEBUG=0;\n";
</span><del>-@@ -356,11 +355,11 @@
</del><ins>+@@ -359,11 +358,11 @@
</ins><span class="cx"> umask 0002;
</span><span class="cx"> print "\nSetup diretories:\n";
</span><span class="cx"> my @dirs = (
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> "$NfConf::INSTPREFIX$NfConf::PROFILESTATDIR",
</span><span class="cx"> "$NfConf::INSTPREFIX$NfConf::PROFILESTATDIR/live",
</span><span class="cx"> "$NfConf::INSTPREFIX$NfConf::PROFILEDATADIR",
</span><del>-@@ -579,20 +578,14 @@
</del><ins>+@@ -584,20 +583,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="lines">@@ -83,11 +83,11 @@
</span><span class="cx"> print "\n";
</span><span class="cx">
</span><span class="cx"> } # End of CopyAllFiles
</span><del>-@@ -663,12 +656,6 @@
</del><ins>+@@ -669,12 +662,6 @@
</ins><span class="cx"> exit 1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>--# check for extra errornoous nfsen.conf file, which may overwrite existing files
</del><ins>+-# check for extra errornous nfsen.conf file, which may overwrite existing files
</ins><span class="cx"> -if ( -f "$NfConf::CONFDIR/nfsen.conf" && -f "etc/nfsen.conf" &&
</span><span class="cx"> - ( (stat($ConfigFile))[1] != (stat("etc/nfsen.conf"))[1] )) {
</span><span class="cx"> - die "Extra nfsen.conf file in etc directory found. Remove errornous file first"
</span></span></pre></div>
<a id="trunkdportsnetnfsenfilespatchlibexecNfProfilepmdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/net/nfsen/files/patch-libexec-NfProfile.pm.diff (143405 => 143406)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/nfsen/files/patch-libexec-NfProfile.pm.diff 2015-12-12 08:45:20 UTC (rev 143405)
+++ trunk/dports/net/nfsen/files/patch-libexec-NfProfile.pm.diff 2015-12-12 09:10:41 UTC (rev 143406)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>---- 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;
-
</del></span></pre></div>
<a id="trunkdportsnetnfsenfilespatchlibexecNfSenRCpmdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/nfsen/files/patch-libexec-NfSenRC.pm.diff (143405 => 143406)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/nfsen/files/patch-libexec-NfSenRC.pm.diff 2015-12-12 08:45:20 UTC (rev 143405)
+++ trunk/dports/net/nfsen/files/patch-libexec-NfSenRC.pm.diff 2015-12-12 09:10:41 UTC (rev 143406)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>---- libexec/NfSenRC.pm.org 2007-11-20 04:27:39.000000000 -0800
-+++ libexec/NfSenRC.pm 2008-02-07 22:18:47.000000000 -0800
-@@ -158,7 +158,7 @@
- print ".\n";
</del><ins>+--- libexec/NfSenRC.pm.org
++++ libexec/NfSenRC.pm
+@@ -234,7 +234,7 @@
+ print "\n";
</ins><span class="cx">
</span><span class="cx"> print "Starting nfsend";
</span><span class="cx"> - system "$NfConf::BINDIR/nfsend";
</span></span></pre>
</div>
</div>
</body>
</html>