1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00

net-mgmt/torrus: update to 2.07 [1]

- Support stage
- Use @sample

PR:		190369 [1]
Submitted by:	a.shikov itcons net ua, maintainer, wg
This commit is contained in:
William Grzybowski 2014-06-25 13:19:50 +00:00
parent 688f3ac046
commit fb8980749d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=359237
5 changed files with 99 additions and 49 deletions

View File

@ -2,13 +2,12 @@
# $FreeBSD$
PORTNAME= torrus
PORTVERSION= 2.05
PORTREVISION= 1
PORTVERSION= 2.07
CATEGORIES= net-mgmt
MASTER_SITES= SF/torrus/torrus/
MAINTAINER= corsmith@gmail.com
COMMENT= The Data Series Processing Framework - think mrtg with xml configs
COMMENT= Data Series Processing Framework - think mrtg with xml configs
LICENSE= GPLv2
@ -43,25 +42,19 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
pkgbindir=${PREFIX}/libexec/torrus \
pkgdocdir=${DOCSDIR} \
exmpdir=${EXAMPLESDIR} \
perllibdir=${SITE_PERL} \
perllibdir=${PREFIX}/${SITE_PERL_REL} \
scriptsdir=${PREFIX}/libexec/torrus/scripts \
--enable-pkgonly
MAN1= torrus.1 torrus_acledit.1 torrus_buildsearchdb.1 \
torrus_cleanup.1 torrus_clearcache.1 torrus_collector.1 \
torrus_compilexml.1 torrus_configinfo.1 \
torrus_configsnapshot.1 torrus_devdiscover.1 \
torrus_flushmonitors.1 torrus_genddx.1 \
torrus_genlist.1 torrus_genreport.1 torrus_monitor.1 \
torrus_nodeid.1 torrus_rrddir2xml.1 torrus_schedulerinfo.1 \
torrus_snmpfailures.1 torrus_srvderive.1 \
torrus_ttproclist.1
MAN7= torrus_action_printemail.7 torrus_action_snmptrap.7 \
torrus_action_notify.7 torrus_install_plugin.7
NO_STAGE= yes
post-install:
@${CAT} pkg-message
${INSTALL} -d -m 2775 ${STAGEDIR}/var/log/torrus
${INSTALL} -d -m 775 ${STAGEDIR}/var/torrus
${INSTALL} -d -m 2775 ${STAGEDIR}/var/torrus/cache
${INSTALL} -d -m 2775 ${STAGEDIR}/var/torrus/collector_rrd
${INSTALL} -d -m 2775 ${STAGEDIR}/var/torrus/db
${INSTALL} -d -m 775 ${STAGEDIR}/var/torrus/reports
${INSTALL} -d -m 775 ${STAGEDIR}/var/torrus/session_data
${INSTALL} -d -m 2775 ${STAGEDIR}/var/torrus/session_data/lock
${INSTALL} -d -m 2775 ${STAGEDIR}/var/torrus/session_data/store
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (torrus-2.05.tar.gz) = b127dbe8d7cd0884c4751606e2fd339d1e8e7dc6510111042e41f437f5a5868b
SIZE (torrus-2.05.tar.gz) = 623600
SHA256 (torrus-2.07.tar.gz) = b4ee8930cb36c8985956c852ad6fa2cd284d1d54d4ef54799e77eeee3eb9a6c6
SIZE (torrus-2.07.tar.gz) = 627347

View File

@ -0,0 +1,11 @@
--- doc/stylingprofile.pod.in.orig 2014-06-09 14:51:17.000000000 +0000
+++ doc/stylingprofile.pod.in 2014-06-09 14:51:37.000000000 +0000
@@ -198,7 +198,7 @@
=over 4
-=item * Applying your Schema
+=item 1. Applying your Schema
In the F<torrus-siteconfig.pl> file, add the variable

View File

@ -0,0 +1,22 @@
--- doc/xmlconfig.pod.in.orig 2014-06-09 14:53:44.000000000 +0000
+++ doc/xmlconfig.pod.in 2014-06-09 14:54:43.000000000 +0000
@@ -1306,17 +1306,15 @@
The first one defines the starting time. C<end> may be also optionally
specified.
-C<print-cf> specifies oe or more consolidation functions, separated by comma.
+C<print-cf> specifies one or more consolidation functions, separated by comma.
The result of the rendering is the text line with the output values
separated by colon (:).
-=back
-
=item * C<disable-legend>, C<disable-title>, C<disable-vertical-label>
When set to C<yes>, the corresponding elements of the graph are not displayed.
-
+=back
=head3 Styling Profiles

View File

@ -1,23 +1,11 @@
bin/torrus
etc/torrus/discovery/README
@unexec if cmp -s %D/etc/torrus/conf/devdiscover-siteconfig.pl.sample %D/etc/torrus/conf/devdiscover-siteconfig.pl; then rm -f %D/etc/torrus/conf/devdiscover-siteconfig.pl; fi
etc/torrus/conf/devdiscover-siteconfig.pl.sample
@exec if [ ! -f %D/etc/torrus/conf/devdiscover-siteconfig.pl ] ; then cp -p %D/%F %B/devdiscover-siteconfig.pl; fi
@unexec if cmp -s %D/etc/torrus/conf/email-siteconfig.pl.sample %D/etc/torrus/conf/email-siteconfig.pl; then rm -f %D/etc/torrus/conf/email-siteconfig.pl; fi
etc/torrus/conf/email-siteconfig.pl.sample
@exec if [ ! -f %D/etc/torrus/conf/email-siteconfig.pl ] ; then cp -p %D/%F %B/email-siteconfig.pl; fi
@unexec if cmp -s %D/etc/torrus/conf/notify-siteconfig.pl.sample %D/etc/torrus/conf/notify-siteconfig.pl; then rm -f %D/etc/torrus/conf/notify-siteconfig.pl; fi
etc/torrus/conf/notify-siteconfig.pl.sample
@exec if [ ! -f %D/etc/torrus/conf/notify-siteconfig.pl ] ; then cp -p %D/%F %B/notify-siteconfig.pl; fi
@unexec if cmp -s %D/etc/torrus/conf/snmptrap-siteconfig.pl.sample %D/etc/torrus/conf/snmptrap-siteconfig.pl; then rm -f %D/etc/torrus/conf/snmptrap-siteconfig.pl; fi
etc/torrus/conf/snmptrap-siteconfig.pl.sample
@exec if [ ! -f %D/etc/torrus/conf/snmptrap-siteconfig.pl ] ; then cp -p %D/%F %B/snmptrap-siteconfig.pl; fi
@unexec if cmp -s %D/etc/torrus/conf/torrus-siteconfig.pl.sample %D/etc/torrus/conf/torrus-siteconfig.pl; then rm -f %D/etc/torrus/conf/torrus-siteconfig.pl; fi
etc/torrus/conf/torrus-siteconfig.pl.sample
@exec if [ ! -f %D/etc/torrus/conf/torrus-siteconfig.pl ] ; then cp -p %D/%F %B/torrus-siteconfig.pl; fi
@unexec if cmp -s %D/etc/torrus/xmlconfig/site-global.xml.sample %D/etc/torrus/xmlconfig/site-global.xml; then rm -f %D/etc/torrus/xmlconfig/site-global.xml; fi
etc/torrus/xmlconfig/site-global.xml.sample
@exec if [ ! -f %D/etc/torrus/xmlconfig/site-global.xml ] ; then cp -p %D/%F %B/site-global.xml; fi
@sample etc/torrus/conf/devdiscover-siteconfig.pl.sample
@sample etc/torrus/conf/email-siteconfig.pl.sample
@sample etc/torrus/conf/notify-siteconfig.pl.sample
@sample etc/torrus/conf/snmptrap-siteconfig.pl.sample
@sample etc/torrus/conf/torrus-siteconfig.pl.sample
@sample etc/torrus/xmlconfig/site-global.xml.sample
libexec/torrus/acledit
libexec/torrus/action_notify
libexec/torrus/action_printemail
@ -47,6 +35,31 @@ libexec/torrus/snmpfailures
libexec/torrus/srvderive
libexec/torrus/torrus.fcgi
libexec/torrus/ttproclist
man/man1/torrus.1.gz
man/man1/torrus_acledit.1.gz
man/man1/torrus_buildsearchdb.1.gz
man/man1/torrus_cleanup.1.gz
man/man1/torrus_clearcache.1.gz
man/man1/torrus_collector.1.gz
man/man1/torrus_compilexml.1.gz
man/man1/torrus_configinfo.1.gz
man/man1/torrus_configsnapshot.1.gz
man/man1/torrus_devdiscover.1.gz
man/man1/torrus_flushmonitors.1.gz
man/man1/torrus_genddx.1.gz
man/man1/torrus_genlist.1.gz
man/man1/torrus_genreport.1.gz
man/man1/torrus_monitor.1.gz
man/man1/torrus_nodeid.1.gz
man/man1/torrus_rrddir2xml.1.gz
man/man1/torrus_schedulerinfo.1.gz
man/man1/torrus_snmpfailures.1.gz
man/man1/torrus_srvderive.1.gz
man/man1/torrus_ttproclist.1.gz
man/man7/torrus_action_notify.7.gz
man/man7/torrus_action_printemail.7.gz
man/man7/torrus_action_snmptrap.7.gz
man/man7/torrus_install_plugin.7.gz
%%DOCSDIR%%/devdoc/architecture.pod
%%DOCSDIR%%/devdoc/devdiscover.pod
%%DOCSDIR%%/devdoc/progstyle.pod
@ -161,6 +174,7 @@ libexec/torrus/ttproclist
%%DATADIR%%/xmlconfig/vendor/comtechefdata.xml
%%DATADIR%%/xmlconfig/vendor/empire.systemedge.ntregperf.xml
%%DATADIR%%/xmlconfig/vendor/empire.systemedge.xml
%%DATADIR%%/xmlconfig/vendor/f5.bigip.xml
%%DATADIR%%/xmlconfig/vendor/foundry.xml
%%DATADIR%%/xmlconfig/vendor/ftos.xml
%%DATADIR%%/xmlconfig/vendor/jacarta.xml
@ -229,6 +243,7 @@ libexec/torrus/ttproclist
%%SITE_PERL%%/Torrus/DevDiscover/ComtechEFData.pm
%%SITE_PERL%%/Torrus/DevDiscover/DevDetails.pm
%%SITE_PERL%%/Torrus/DevDiscover/EmpireSystemedge.pm
%%SITE_PERL%%/Torrus/DevDiscover/F5BigIp.pm
%%SITE_PERL%%/Torrus/DevDiscover/Foundry.pm
%%SITE_PERL%%/Torrus/DevDiscover/FTOS.pm
%%SITE_PERL%%/Torrus/DevDiscover/Jacarta.pm
@ -283,16 +298,16 @@ libexec/torrus/ttproclist
%%SITE_PERL%%/Torrus/SQL/SrvExport.pm
%%SITE_PERL%%/Torrus/SQL.pm
%%SITE_PERL%%/Torrus/TimeStamp.pm
@exec install -d -g %%TORRUS_USER%% -o %%TORRUS_USER%% -m 2775 /var/log/torrus 2>/dev/null || true
@exec install -d -g %%TORRUS_USER%% -o %%TORRUS_USER%% -m 2775 /var/run/torrus 2>/dev/null || true
@exec install -d -g %%TORRUS_USER%% -o %%TORRUS_USER%% -m 755 /var/torrus 2>/dev/null || true
@exec install -d -g %%TORRUS_USER%% -o %%TORRUS_USER%% -m 2775 /var/torrus/cache 2>/dev/null || true
@exec install -d -g %%TORRUS_USER%% -o %%TORRUS_USER%% -m 2775 /var/torrus/collector_rrd 2>/dev/null || true
@exec install -d -g %%TORRUS_USER%% -o %%TORRUS_USER%% -m 2775 /var/torrus/db 2>/dev/null || true
@exec install -d -g %%TORRUS_USER%% -o %%TORRUS_USER%% -m 755 /var/torrus/reports 2>/dev/null || true
@exec install -d -g %%TORRUS_USER%% -o %%TORRUS_USER%% -m 755 /var/torrus/session_data 2>/dev/null || true
@exec install -d -g %%TORRUS_USER%% -o %%TORRUS_USER%% -m 2775 /var/torrus/session_data/lock 2>/dev/null || true
@exec install -d -g %%TORRUS_USER%% -o %%TORRUS_USER%% -m 2775 /var/torrus/session_data/store 2>/dev/null || true
@exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/log/torrus 2>/dev/null || true
@exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/run/torrus 2>/dev/null || true
@exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/torrus
@exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/torrus/cache
@exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/torrus/collector_rrd
@exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/torrus/db
@exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/torrus/reports
@exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/torrus/session_data 2>/dev/null || true
@exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/torrus/session_data/store 2>/dev/null || true
@exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/torrus/session_data/lock 2>/dev/null || true
@exec mkdir %D/etc/torrus/templates 2>/dev/null || true
@exec mkdir %D/%%DATADIR%%/plugins 2>/dev/null || true
@exec mkdir %D/%%DATADIR%%/plugins/devdiscover-config 2>/dev/null || true
@ -323,6 +338,15 @@ libexec/torrus/ttproclist
@dirrm libexec/torrus/scripts/xml
@dirrm libexec/torrus/scripts
@dirrm libexec/torrus
@dirrmtry /var/torrus/session_data/store
@dirrmtry /var/torrus/session_data/lock
@dirrmtry /var/torrus/session_data
@dirrmtry /var/torrus/reports
@dirrmtry /var/torrus/db
@dirrmtry /var/torrus/collector_rrd
@dirrmtry /var/torrus/cache
@dirrmtry /var/torrus/
@dirrmtry /var/log/torrus
@dirrmtry etc/torrus/xmlconfig
@dirrmtry etc/torrus/templates
@dirrmtry etc/torrus/discovery