[143406] trunk/dports/net/nfsen

mojca at macports.org mojca at macports.org
Sat Dec 12 10:48:30 PST 2015


Revision: 143406
          https://trac.macports.org/changeset/143406
Author:   mojca at macports.org
Date:     2015-12-12 01:10:41 -0800 (Sat, 12 Dec 2015)
Log Message:
-----------
nfsen: upgrade to 1.3.7, switch to p5.22 (#48365), port is still broken (see #38276)

Modified Paths:
--------------
    trunk/dports/net/nfsen/Portfile
    trunk/dports/net/nfsen/files/patch-bin-RebuildHierarchy.pl.diff
    trunk/dports/net/nfsen/files/patch-bin-nfsen.diff
    trunk/dports/net/nfsen/files/patch-bin-nfsend.diff
    trunk/dports/net/nfsen/files/patch-bin-testplugin.diff
    trunk/dports/net/nfsen/files/patch-etc-nfsen-dist.conf.diff
    trunk/dports/net/nfsen/files/patch-install.pl.diff
    trunk/dports/net/nfsen/files/patch-libexec-NfSenRC.pm.diff

Removed Paths:
-------------
    trunk/dports/net/nfsen/files/patch-libexec-NfProfile.pm.diff

Modified: trunk/dports/net/nfsen/Portfile
===================================================================
--- 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)
@@ -2,9 +2,11 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup           perl5 1.0
 
+# port is broken, see https://trac.macports.org/ticket/38276
 name                nfsen
-version             1.3.6
+version             1.3.7
 categories          net
 maintainers         nomaintainer
 license             BSD
@@ -16,19 +18,20 @@
 platforms           darwin
 master_sites        sourceforge:project/nfsen/stable/nfsen-${version}
 
-checksums           rmd160  4399b0fe1807b9aeea1c4bcff094e2c8a0235e80 \
-                    sha256  c5809505544ea2cf5bac69a9829b7d7d78649b67a772519aa8a191b1a25fd918
+checksums           rmd160  60981d49f6fa4de434c8849ff326b6568fb17937 \
+                    sha256  635ba97564fe81cbeee0a3950735b9651677b69e1f53a67c654ddd5b00db469d
 
-depends_lib         port:perl5.16 \
+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 \
                     port:rrdtool \
-                    port:p5.16-mailtools \
-                    port:p5.16-socket6 \
-                    port:p5.16-sys-syslog \
                     port:nfdump
 
 patchfiles          patch-install.pl.diff \
                     patch-etc-nfsen-dist.conf.diff \
-                    patch-libexec-NfProfile.pm.diff \
                     patch-libexec-NfSenRC.pm.diff \
                     patch-bin-nfsend.diff \
                     patch-bin-nfsen.diff \
@@ -61,7 +64,7 @@
         ${worksrcpath}/install.pl
     eval reinplace "s|__PREFIX__|${prefix}|g" \
         [glob ${worksrcpath}/bin/*]
-    eval reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.16|g" \
+    eval reinplace "s|/usr/bin/perl|${perl5.bin}|g" \
         [glob ${worksrcpath}/installer-items/*.pm]
 }
 
@@ -82,7 +85,7 @@
 # Set profiles-stat and profiles-data to destroot until install is done
     reinplace "s|\${VARDIR}/profiles|${destroot}${prefix}/var/nfsen/profiles|g" \
         ${worksrcpath}/etc/nfsen-dist.conf
-    system -W ${worksrcpath} "${prefix}/bin/perl5.16 ./install.pl ./etc/nfsen-dist.conf"
+    system -W ${worksrcpath} "${perl5.bin} ./install.pl ./etc/nfsen-dist.conf"
 
 # Replace the original .conf file
     file rename -force ${destroot}${prefix}/etc/nfsen-dist.conf.org \

Modified: trunk/dports/net/nfsen/files/patch-bin-RebuildHierarchy.pl.diff
===================================================================
--- 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)
@@ -1,5 +1,5 @@
---- bin/RebuildHierarchy.pl.org	2007-07-20 05:33:21.000000000 -0700
-+++ bin/RebuildHierarchy.pl	2008-02-08 10:01:29.000000000 -0800
+--- bin/RebuildHierarchy.pl.org
++++ bin/RebuildHierarchy.pl
 @@ -1,4 +1,4 @@
 -#!%%PERL%% -w
 +#!__PREFIX__/bin/perl -w -I __PREFIX__/libexec/nfsen

Modified: trunk/dports/net/nfsen/files/patch-bin-nfsen.diff
===================================================================
--- 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)
@@ -1,5 +1,5 @@
---- bin/nfsen.org	2008-02-08 09:57:18.000000000 -0800
-+++ bin/nfsen	2008-02-08 09:57:44.000000000 -0800
+--- bin/nfsen.org
++++ bin/nfsen
 @@ -1,4 +1,4 @@
 -#!%%PERL%% -w
 +#!__PREFIX__/bin/perl -w -I __PREFIX__/libexec/nfsen

Modified: trunk/dports/net/nfsen/files/patch-bin-nfsend.diff
===================================================================
--- 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)
@@ -1,12 +1,12 @@
---- bin/nfsend.org	2007-11-20 04:27:39.000000000 -0800
-+++ bin/nfsend	2008-02-08 09:59:40.000000000 -0800
+--- bin/nfsend.org
++++ bin/nfsend
 @@ -1,4 +1,4 @@
 -#!%%PERL%% -w
 +#!__PREFIX__/bin/perl -w -I __PREFIX__/libexec/nfsen
  #
  #  Copyright (c) 2004, SWITCH - Teleinformatikdienste fuer Lehre und Forschung
  #  All rights reserved.
-@@ -703,9 +703,9 @@
+@@ -750,9 +750,9 @@
  $arg = '' unless defined $arg;
  die "Unknow argument '$arg'" if $arg ne '' && $arg ne 'once';
  
@@ -17,5 +17,5 @@
 +#	die "$Log::ERROR\n";
 +#}
  
- $semlock = semget(IPC_PRIVATE, 1, 0600 | IPC_CREAT ) || die "Can not get semaphore: $!";
- semsignal($semlock);
+ Nfsync::seminit();
+ 

Modified: trunk/dports/net/nfsen/files/patch-bin-testplugin.diff
===================================================================
--- 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)
@@ -1,5 +1,5 @@
---- bin/testPlugin.org	2007-08-24 09:56:26.000000000 -0700
-+++ bin/testPlugin	2008-02-08 10:02:43.000000000 -0800
+--- bin/testPlugin.org
++++ bin/testPlugin
 @@ -1,4 +1,4 @@
 -#!%%PERL%% -w
 +#!__PREFIX__/bin/perl -w -I __PREFIX__/libexec/nfsen

Modified: trunk/dports/net/nfsen/files/patch-etc-nfsen-dist.conf.diff
===================================================================
--- 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)
@@ -1,5 +1,5 @@
---- 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
+--- etc/nfsen-dist.conf.orig
++++ etc/nfsen-dist.conf
 @@ -18,7 +18,7 @@
  
  #
@@ -80,7 +80,7 @@
  
  # Receive buffer size for nfcapd - see man page nfcapd(1)
  $BUFFLEN = 200000;
-@@ -158,8 +158,8 @@
+@@ -167,8 +167,8 @@
  
  %sources = (
      'upstream1'    => { 'port' => '9995', 'col' => '#0000ff', 'type' => 'netflow' },

Modified: trunk/dports/net/nfsen/files/patch-install.pl.diff
===================================================================
--- 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)
@@ -1,12 +1,12 @@
---- install.pl.orig	2011-12-30 06:23:35.000000000 -0800
-+++ install.pl	2014-12-03 07:26:35.000000000 -0800
+--- install.pl.orig
++++ install.pl
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl
 +#!__PREFIX__/bin/perl5.16 -I __PREFIX__/libexec/nfsen -I __DESTDIR____PREFIX__/libexec/nfsen
  #
  #
  #  Copyright (c) 2004, SWITCH - Teleinformatikdienste fuer Lehre und Forschung
-@@ -277,8 +277,8 @@
+@@ -280,8 +280,8 @@
  sub PatchAllScripts {
  
  	my %GlobList = ( 
@@ -17,7 +17,7 @@
  	);
  
  	foreach my $glob_list ( keys %GlobList ) {
-@@ -328,16 +328,15 @@
+@@ -331,16 +331,15 @@
  	my ( $nfsen_uid, $www_gid ) = @_;
  
  	print "Setup php and html files.\n";
@@ -38,7 +38,7 @@
  	print CONF "/* This file was automatically created by the NfSen $nfsen_version install.pl script */\n\n";
  	print CONF "\$COMMSOCKET = \"$NfConf::COMMSOCKET\";\n";
  	print CONF "\n\$DEBUG=0;\n";
-@@ -356,11 +355,11 @@
+@@ -359,11 +358,11 @@
  	umask 0002;
  	print "\nSetup diretories:\n";
  	my @dirs = (
@@ -55,7 +55,7 @@
  		"$NfConf::INSTPREFIX$NfConf::PROFILESTATDIR",
  		"$NfConf::INSTPREFIX$NfConf::PROFILESTATDIR/live",
  		"$NfConf::INSTPREFIX$NfConf::PROFILEDATADIR",
-@@ -579,20 +578,14 @@
+@@ -584,20 +583,14 @@
  	$CopyRecursive::UID 	 = 0;
  	$CopyRecursive::GID 	 = $www_gid;
  	$CopyRecursive::MODE 	 = 0755;
@@ -83,11 +83,11 @@
  	print "\n";
  
  } # End of CopyAllFiles
-@@ -663,12 +656,6 @@
+@@ -669,12 +662,6 @@
  	exit 1;
  }
  
--# check for extra errornoous nfsen.conf file, which may overwrite existing files
+-# check for extra errornous nfsen.conf file, which may overwrite existing files
 -if ( -f "$NfConf::CONFDIR/nfsen.conf" && -f "etc/nfsen.conf" &&
 -	( (stat($ConfigFile))[1] != (stat("etc/nfsen.conf"))[1] )) {
 -	die "Extra nfsen.conf file in etc directory found. Remove errornous file first"

Deleted: trunk/dports/net/nfsen/files/patch-libexec-NfProfile.pm.diff
===================================================================
--- 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)
@@ -1,10 +0,0 @@
---- 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;
- 

Modified: trunk/dports/net/nfsen/files/patch-libexec-NfSenRC.pm.diff
===================================================================
--- 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)
@@ -1,7 +1,7 @@
---- 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";
+--- libexec/NfSenRC.pm.org
++++ libexec/NfSenRC.pm
+@@ -234,7 +234,7 @@
+ 	print "\n";
  
  	print "Starting nfsend";
 -	system "$NfConf::BINDIR/nfsend";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/c5548a43/attachment-0001.html>


More information about the macports-changes mailing list