Date: Sun, 2 Dec 2012 02:41:20 +0000 (UTC) From: Wesley Shields <wxs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308085 - in head/net-mgmt/nfsen: . files Message-ID: <201212020241.qB22fKw5056108@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wxs Date: Sun Dec 2 02:41:19 2012 New Revision: 308085 URL: http://svnweb.freebsd.org/changeset/ports/308085 Log: Update to 1.3.6p1. PR: ports/173594 Submitted by: Mike Stupalov <landy2005@gmail.com> Approved by: janos.mohacsi@bsd.hu (maintainer timeout) Feature safe: yes Deleted: head/net-mgmt/nfsen/files/patch-libexec__NFSenRC.pm Modified: head/net-mgmt/nfsen/Makefile (contents, props changed) head/net-mgmt/nfsen/distinfo (contents, props changed) head/net-mgmt/nfsen/files/patch-install.pl (contents, props changed) Modified: head/net-mgmt/nfsen/Makefile ============================================================================== --- head/net-mgmt/nfsen/Makefile Sun Dec 2 01:28:29 2012 (r308084) +++ head/net-mgmt/nfsen/Makefile Sun Dec 2 02:41:19 2012 (r308085) @@ -6,8 +6,7 @@ # 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/ @@ -44,7 +43,6 @@ do-install: @${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; \ Modified: head/net-mgmt/nfsen/distinfo ============================================================================== --- head/net-mgmt/nfsen/distinfo Sun Dec 2 01:28:29 2012 (r308084) +++ head/net-mgmt/nfsen/distinfo Sun Dec 2 02:41:19 2012 (r308085) @@ -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 Modified: head/net-mgmt/nfsen/files/patch-install.pl ============================================================================== --- head/net-mgmt/nfsen/files/patch-install.pl Sun Dec 2 01:28:29 2012 (r308084) +++ head/net-mgmt/nfsen/files/patch-install.pl Sun Dec 2 02:41:19 2012 (r308085) @@ -1,12 +1,12 @@ ---- 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 { @@ -41,27 +41,3 @@ } # 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";
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212020241.qB22fKw5056108>