Changeset 143406


Ignore:
Timestamp:
Dec 12, 2015, 9:10:41 AM (3 years ago)
Author:
mojca@…
Message:

nfsen: upgrade to 1.3.7, switch to p5.22 (#48365), port is still broken (see #38276)

Location:
trunk/dports/net/nfsen
Files:
1 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/net/nfsen/Portfile

    r129027 r143406  
    33
    44PortSystem          1.0
     5PortGroup           perl5 1.0
    56
     7# port is broken, see https://trac.macports.org/ticket/38276
    68name                nfsen
    7 version             1.3.6
     9version             1.3.7
    810categories          net
    911maintainers         nomaintainer
     
    1719master_sites        sourceforge:project/nfsen/stable/nfsen-${version}
    1820
    19 checksums           rmd160  4399b0fe1807b9aeea1c4bcff094e2c8a0235e80 \
    20                     sha256  c5809505544ea2cf5bac69a9829b7d7d78649b67a772519aa8a191b1a25fd918
     21checksums           rmd160  60981d49f6fa4de434c8849ff326b6568fb17937 \
     22                    sha256  635ba97564fe81cbeee0a3950735b9651677b69e1f53a67c654ddd5b00db469d
    2123
    22 depends_lib         port:perl5.16 \
     24perl5.branches      5.22
     25
     26depends_lib         port:perl${perl5.major} \
     27                    port:p${perl5.major}-mailtools \
     28                    port:p${perl5.major}-socket6 \
     29                    port:p${perl5.major}-sys-syslog \
    2330                    port:rrdtool \
    24                     port:p5.16-mailtools \
    25                     port:p5.16-socket6 \
    26                     port:p5.16-sys-syslog \
    2731                    port:nfdump
    2832
    2933patchfiles          patch-install.pl.diff \
    3034                    patch-etc-nfsen-dist.conf.diff \
    31                     patch-libexec-NfProfile.pm.diff \
    3235                    patch-libexec-NfSenRC.pm.diff \
    3336                    patch-bin-nfsend.diff \
     
    6265    eval reinplace "s|__PREFIX__|${prefix}|g" \
    6366        [glob ${worksrcpath}/bin/*]
    64     eval reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.16|g" \
     67    eval reinplace "s|/usr/bin/perl|${perl5.bin}|g" \
    6568        [glob ${worksrcpath}/installer-items/*.pm]
    6669}
     
    8386    reinplace "s|\${VARDIR}/profiles|${destroot}${prefix}/var/nfsen/profiles|g" \
    8487        ${worksrcpath}/etc/nfsen-dist.conf
    85     system -W ${worksrcpath} "${prefix}/bin/perl5.16 ./install.pl ./etc/nfsen-dist.conf"
     88    system -W ${worksrcpath} "${perl5.bin} ./install.pl ./etc/nfsen-dist.conf"
    8689
    8790# Replace the original .conf file
  • trunk/dports/net/nfsen/files/patch-bin-RebuildHierarchy.pl.diff

    r34065 r143406  
    1 --- bin/RebuildHierarchy.pl.org 2007-07-20 05:33:21.000000000 -0700
    2 +++ bin/RebuildHierarchy.pl     2008-02-08 10:01:29.000000000 -0800
     1--- bin/RebuildHierarchy.pl.org
     2+++ bin/RebuildHierarchy.pl
    33@@ -1,4 +1,4 @@
    44-#!%%PERL%% -w
  • trunk/dports/net/nfsen/files/patch-bin-nfsen.diff

    r34065 r143406  
    1 --- bin/nfsen.org       2008-02-08 09:57:18.000000000 -0800
    2 +++ bin/nfsen   2008-02-08 09:57:44.000000000 -0800
     1--- bin/nfsen.org
     2+++ bin/nfsen
    33@@ -1,4 +1,4 @@
    44-#!%%PERL%% -w
  • trunk/dports/net/nfsen/files/patch-bin-nfsend.diff

    r34065 r143406  
    1 --- bin/nfsend.org      2007-11-20 04:27:39.000000000 -0800
    2 +++ bin/nfsend  2008-02-08 09:59:40.000000000 -0800
     1--- bin/nfsend.org
     2+++ bin/nfsend
    33@@ -1,4 +1,4 @@
    44-#!%%PERL%% -w
     
    77 #  Copyright (c) 2004, SWITCH - Teleinformatikdienste fuer Lehre und Forschung
    88 #  All rights reserved.
    9 @@ -703,9 +703,9 @@
     9@@ -750,9 +750,9 @@
    1010 $arg = '' unless defined $arg;
    1111 die "Unknow argument '$arg'" if $arg ne '' && $arg ne 'once';
     
    1818+#}
    1919 
    20  $semlock = semget(IPC_PRIVATE, 1, 0600 | IPC_CREAT ) || die "Can not get semaphore: $!";
    21  semsignal($semlock);
     20 Nfsync::seminit();
     21 
  • trunk/dports/net/nfsen/files/patch-bin-testplugin.diff

    r34065 r143406  
    1 --- bin/testPlugin.org  2007-08-24 09:56:26.000000000 -0700
    2 +++ bin/testPlugin      2008-02-08 10:02:43.000000000 -0800
     1--- bin/testPlugin.org
     2+++ bin/testPlugin
    33@@ -1,4 +1,4 @@
    44-#!%%PERL%% -w
  • trunk/dports/net/nfsen/files/patch-etc-nfsen-dist.conf.diff

    r129020 r143406  
    1 --- etc/nfsen-dist.conf.orig    2011-12-29 04:38:38.000000000 -0800
    2 +++ etc/nfsen-dist.conf 2014-12-03 07:31:47.000000000 -0800
     1--- etc/nfsen-dist.conf.orig
     2+++ etc/nfsen-dist.conf
    33@@ -18,7 +18,7 @@
    44 
     
    8181 # Receive buffer size for nfcapd - see man page nfcapd(1)
    8282 $BUFFLEN = 200000;
    83 @@ -158,8 +158,8 @@
     83@@ -167,8 +167,8 @@
    8484 
    8585 %sources = (
  • trunk/dports/net/nfsen/files/patch-install.pl.diff

    r129020 r143406  
    1 --- install.pl.orig     2011-12-30 06:23:35.000000000 -0800
    2 +++ install.pl  2014-12-03 07:26:35.000000000 -0800
     1--- install.pl.orig
     2+++ install.pl
    33@@ -1,4 +1,4 @@
    44-#!/usr/bin/perl
     
    77 #
    88 #  Copyright (c) 2004, SWITCH - Teleinformatikdienste fuer Lehre und Forschung
    9 @@ -277,8 +277,8 @@
     9@@ -280,8 +280,8 @@
    1010 sub PatchAllScripts {
    1111 
     
    1818 
    1919        foreach my $glob_list ( keys %GlobList ) {
    20 @@ -328,16 +328,15 @@
     20@@ -331,16 +331,15 @@
    2121        my ( $nfsen_uid, $www_gid ) = @_;
    2222 
     
    3939        print CONF "\$COMMSOCKET = \"$NfConf::COMMSOCKET\";\n";
    4040        print CONF "\n\$DEBUG=0;\n";
    41 @@ -356,11 +355,11 @@
     41@@ -359,11 +358,11 @@
    4242        umask 0002;
    4343        print "\nSetup diretories:\n";
     
    5656                "$NfConf::INSTPREFIX$NfConf::PROFILESTATDIR/live",
    5757                "$NfConf::INSTPREFIX$NfConf::PROFILEDATADIR",
    58 @@ -579,20 +578,14 @@
     58@@ -584,20 +583,14 @@
    5959        $CopyRecursive::UID      = 0;
    6060        $CopyRecursive::GID      = $www_gid;
     
    8484 
    8585 } # End of CopyAllFiles
    86 @@ -663,12 +656,6 @@
     86@@ -669,12 +662,6 @@
    8787        exit 1;
    8888 }
    8989 
    90 -# check for extra errornoous nfsen.conf file, which may overwrite existing files
     90-# check for extra errornous nfsen.conf file, which may overwrite existing files
    9191-if ( -f "$NfConf::CONFDIR/nfsen.conf" && -f "etc/nfsen.conf" &&
    9292-       ( (stat($ConfigFile))[1] != (stat("etc/nfsen.conf"))[1] )) {
  • trunk/dports/net/nfsen/files/patch-libexec-NfSenRC.pm.diff

    r34065 r143406  
    1 --- libexec/NfSenRC.pm.org      2007-11-20 04:27:39.000000000 -0800
    2 +++ libexec/NfSenRC.pm  2008-02-07 22:18:47.000000000 -0800
    3 @@ -158,7 +158,7 @@
    4         print ".\n";
     1--- libexec/NfSenRC.pm.org
     2+++ libexec/NfSenRC.pm
     3@@ -234,7 +234,7 @@
     4        print "\n";
    55 
    66        print "Starting nfsend";
Note: See TracChangeset for help on using the changeset viewer.