Index: head/net-mgmt/nfsen/Makefile =================================================================== --- head/net-mgmt/nfsen/Makefile (revision 308084) +++ head/net-mgmt/nfsen/Makefile (revision 308085) @@ -1,58 +1,56 @@ # New ports collection makefile for: nfsen # Date created: 25 March 2005 # Whom: janos.mohacsi@bsd.hu # # $FreeBSD$ # PORTNAME= nfsen -PORTVERSION= 1.3.5 -PORTREVISION= 3 +PORTVERSION= 1.3.6p1 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION} \ http://nfsen.sourceforge.net/ MAINTAINER= janos.mohacsi@bsd.hu COMMENT= Web based frontend to nfdump netflow collector LICENSE= BSD LICENSE_FILE= ${WRKSRC}/BSD-license.txt RUN_DEPENDS= rrdtool>=0:${PORTSDIR}/databases/rrdtool \ p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \ nfdump:${PORTSDIR}/net-mgmt/nfdump USE_ICONV= yes USE_PERL5= yes USE_PHP= session pcre sockets NO_BUILD= yes PLIST_SUB+= PORTNAME=${PORTNAME} USE_RC_SUBR= nfsen .if defined(PACKAGE_BUILDING) IGNORE= needs running syslogd .endif post-patch: @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' -e 's,%%PORTNAME%%,${PORTNAME},' \ ${WRKSRC}/etc/nfsen-dist.conf @${RM} ${WRKSRC}/etc/nfsen-dist.conf.* @${REINPLACE_CMD} -e 's,%%PERL%%,${PERL},' -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/install.pl do-install: @${MKDIR} ${PREFIX}/var/${PORTNAME}/profiles/live @${MKDIR} ${PREFIX}/libexec/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/installer-items/CopyRecursive.pm ${PREFIX}/libexec/${PORTNAME}/ ${INSTALL_DATA} ${WRKSRC}/installer-items/RRDconvertv1.pm ${PREFIX}/libexec/${PORTNAME}/ - ${RM} -f ${WRKSRC}/libexec/NfSenRC.pm.orig @ if [ -f ${PREFIX}/etc/nfsen.conf ] ; then \ ${ECHO_MSG} "installing with existing nfsen.conf"; \ cd ${WRKSRC} ;${PERL} ${WRKSRC}/install.pl ${PREFIX}/etc/nfsen.conf; \ else \ ${ECHO_MSG} "installing with sample nfsen.conf"; \ cd ${WRKSRC} ;${PERL} ${WRKSRC}/install.pl ${WRKSRC}/etc/nfsen-dist.conf; \ fi @${ECHO_MSG} "Configure your ${LOCALBASE}/etc/nfsen.conf to have necessary sources "; @${ECHO_MSG} "Then run 'nfsen -R ${LOCALBASE}/etc/nfsen.conf' to correctly setup source, RRD, and profile files"; .include Property changes on: head/net-mgmt/nfsen/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/nfsen/distinfo =================================================================== --- head/net-mgmt/nfsen/distinfo (revision 308084) +++ head/net-mgmt/nfsen/distinfo (revision 308085) @@ -1,2 +1,2 @@ -SHA256 (nfsen-1.3.5.tar.gz) = b2afd700818c2f91182d2970a1759f1c0a8c2835990726f15f695514f00b1e43 -SIZE (nfsen-1.3.5.tar.gz) = 221348 +SHA256 (nfsen-1.3.6p1.tar.gz) = 810e95546338622756deb919d7ee6c39721bc9873bb75dc7ec411ec0b87e1265 +SIZE (nfsen-1.3.6p1.tar.gz) = 220620 Property changes on: head/net-mgmt/nfsen/distinfo ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/nfsen/files/patch-libexec__NFSenRC.pm =================================================================== --- head/net-mgmt/nfsen/files/patch-libexec__NFSenRC.pm (revision 308084) +++ head/net-mgmt/nfsen/files/patch-libexec__NFSenRC.pm (nonexistent) @@ -1,32 +0,0 @@ ---- libexec/NfSenRC.pm 2010-09-09 07:56:05.000000000 +0200 -+++ libexec/NfSenRC.pm.patched 2011-03-09 13:09:32.000000000 +0100 -@@ -54,22 +54,21 @@ - print "[no collector]"; - return; - } -- - my @SourceList; - my $type = undef; - foreach my $source ( sort keys %NfConf::sources ) { - my $_port = $NfConf::sources{$source}{'port'}; - if ( $_port == $port ) { - push @SourceList, $source; -- } -- my $_type = exists $NfConf::sources{$source}{'type'} ? $NfConf::sources{$source}{'type'}: 'netflow'; -- if ( defined $type ) { -- if ( $type ne $_type ) { -- print "Can not start different type '$type' and '$_type' on same port!\n"; -- return; -+ my $_type = exists $NfConf::sources{$source}{'type'} ? $NfConf::sources{$source}{'type'}: 'netflow'; -+ if ( defined $type ) { -+ if ( $type ne $_type ) { -+ print "Can not start different type '$type' and '$_type' on same port!\n"; -+ return; -+ } -+ } else { -+ $type = $_type; - } -- } else { -- $type = $_type; - } - } Property changes on: head/net-mgmt/nfsen/files/patch-libexec__NFSenRC.pm ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/net-mgmt/nfsen/files/patch-install.pl =================================================================== --- head/net-mgmt/nfsen/files/patch-install.pl (revision 308084) +++ head/net-mgmt/nfsen/files/patch-install.pl (revision 308085) @@ -1,67 +1,43 @@ ---- install.pl.orig 2010-09-09 09:56:05.000000000 +0400 -+++ install.pl 2011-08-13 16:39:01.000000000 +0400 +--- install.pl.orig 2012-01-23 20:36:02.000000000 +0400 ++++ install.pl 2012-11-12 15:52:05.000000000 +0400 @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!%%PERL%% -I %%PREFIX%%/libexec/nfsen # # # Copyright (c) 2004, SWITCH - Teleinformatikdienste fuer Lehre und Forschung -@@ -85,33 +85,7 @@ +@@ -88,33 +88,7 @@ # Get Perl sub GetPerl { - my $whichperl; - my $ans; - $whichperl = FindCommand("perl"); - if ( defined $whichperl ) { - print "Perl to use: [$whichperl] "; - chomp($ans = ); - if ( length $ans ) { - $whichperl = $ans; - } - } else { - print "No Perl found in your PATH. Please specify where to find perl [] "; - chomp($whichperl = ); - } - - while (1) { - if ( -x $whichperl ) { - my $err = system("$whichperl -e 'require 5.6.0;'") >> 8; - last if $err == 0; - print "Found errors while testing Perl\n"; - } else { - print "No executable: '$whichperl'\n"; - } - print "Perl to use: [] "; - chomp($whichperl = ); - } - - return $whichperl; + return "%%PERL%%"; } # End of GetPerl -@@ -200,11 +174,8 @@ - } - - my @out = `$NfConf::PREFIX/nfdump -V`; -- if ( scalar @out != 2 ) { -- die "Error getting nfdump version"; -- } - chomp $out[0]; -- my ($major, $minor) = $out[0] =~ /Version:\s(\d)\.(\d)\s/; -+ my ($major, $minor) = $out[0] =~ /Version:\s(\d)\.(\d)[\.\s]/; - if ( defined $major && defined $minor) { - if ( $major >= 1 && $minor >= 6 ) { - print "Found $out[0]\n"; -@@ -212,7 +183,9 @@ - print "out[0]\n"; - die "Nfdump version not compatible with current NfSen version.\n"; - } -- } -+ } else { -+ die "Error getting nfdump version"; -+ } - - my $www_gid = getgrnam($NfConf::WWWGROUP) || - die "WWW group '$NfConf::WWWGROUP' not found on this system\n"; Property changes on: head/net-mgmt/nfsen/files/patch-install.pl ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property