Date: Fri, 15 Aug 2014 18:11:34 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365015 - in head/net-mgmt/cacti: . files Message-ID: <201408151811.s7FIBYK1004488@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Fri Aug 15 18:11:34 2014 New Revision: 365015 URL: http://svnweb.freebsd.org/changeset/ports/365015 QAT: https://qat.redports.org/buildarchive/r365015/ Log: net-mgmt/cacti: replace most perl patches with shebangfix PR: 192618 Submitted by: Lars Engels <lars.engels@0x20.net> Deleted: head/net-mgmt/cacti/files/patch-scripts__3com_cable_modem.pl head/net-mgmt/cacti/files/patch-scripts__linux_memory.pl head/net-mgmt/cacti/files/patch-scripts__loadavg.pl head/net-mgmt/cacti/files/patch-scripts__loadavg_multi.pl head/net-mgmt/cacti/files/patch-scripts__query_unix_partitions.pl head/net-mgmt/cacti/files/patch-scripts__unix_processes.pl head/net-mgmt/cacti/files/patch-scripts__unix_tcp_connections.pl head/net-mgmt/cacti/files/patch-scripts__unix_users.pl head/net-mgmt/cacti/files/patch-scripts__weatherbug.pl head/net-mgmt/cacti/files/patch-scripts__webhits.pl Modified: head/net-mgmt/cacti/Makefile head/net-mgmt/cacti/files/patch-scripts__diskfree.pl head/net-mgmt/cacti/files/patch-scripts__ping.pl Modified: head/net-mgmt/cacti/Makefile ============================================================================== --- head/net-mgmt/cacti/Makefile Fri Aug 15 17:54:08 2014 (r365014) +++ head/net-mgmt/cacti/Makefile Fri Aug 15 18:11:34 2014 (r365015) @@ -20,12 +20,25 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool PATCH_STRIP= -p1 +USES= shebangfix USE_MYSQL= yes USE_PHP= mysql pcre session sockets snmp xml WANT_PHP_WEB= yes NO_BUILD= yes PKGMESSAGE= ${WRKDIR}/pkg-message SUB_FILES= pkg-message +SHEBANG_FILES= scripts/3com_cable_modem.pl \ + scripts/diskfree.pl \ + scripts/linux_memory.pl \ + scripts/loadavg.pl \ + scripts/loadavg_multi.pl \ + scripts/ping.pl \ + scripts/query_unix_partitions.pl \ + scripts/unix_processes.pl \ + scripts/unix_tcp_connections.pl \ + scripts/unix_users.pl \ + scripts/weatherbug.pl \ + scripts/webhits.pl CACTIDIR?= share/cacti CACTIUSER?= cacti Modified: head/net-mgmt/cacti/files/patch-scripts__diskfree.pl ============================================================================== --- head/net-mgmt/cacti/files/patch-scripts__diskfree.pl Fri Aug 15 17:54:08 2014 (r365014) +++ head/net-mgmt/cacti/files/patch-scripts__diskfree.pl Fri Aug 15 18:11:34 2014 (r365015) @@ -1,9 +1,8 @@ ---- ./scripts/diskfree.pl.orig 2013-08-06 19:31:19.000000000 -0700 -+++ ./scripts/diskfree.pl 2014-08-11 17:34:23.000000000 -0700 +--- ./scripts/diskfree.pl.orig 2014-08-15 15:39:51.000000000 +0200 ++++ ./scripts/diskfree.pl 2014-08-15 15:40:16.000000000 +0200 @@ -1,5 +1,5 @@ --#!/usr/bin/perl + #!/usr/bin/perl -open(PROCESS,"df --block-size=1024 -P $ARGV[0] | grep -v Filesystem |"); -+#!/usr/local/bin/perl +open(PROCESS,"df -k $ARGV[0] | grep -v Filesystem |"); foreach (<PROCESS>) { if ($_ =~ /($ARGV[0])(.* )(.*[0-9])(.* )(.*[0-9])(.* )(.*[0-9])(.* )(.*[0-9])%(.* )/) { Modified: head/net-mgmt/cacti/files/patch-scripts__ping.pl ============================================================================== --- head/net-mgmt/cacti/files/patch-scripts__ping.pl Fri Aug 15 17:54:08 2014 (r365014) +++ head/net-mgmt/cacti/files/patch-scripts__ping.pl Fri Aug 15 18:11:34 2014 (r365015) @@ -1,11 +1,5 @@ ---- ./scripts/ping.pl.orig 2013-08-06 19:31:19.000000000 -0700 -+++ ./scripts/ping.pl 2014-08-11 17:34:23.000000000 -0700 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -+#!/usr/local/bin/perl - - # take care for tcp:hostname or TCP:ip@ - $host = $ARGV[0]; +--- ./scripts/ping.pl.orig 2014-08-15 15:39:56.000000000 +0200 ++++ ./scripts/ping.pl 2014-08-15 15:40:35.000000000 +0200 @@ -6,7 +6,7 @@ # old linux version use "icmp_seq"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408151811.s7FIBYK1004488>