5 files changed, 12 insertions, 37 deletions

diff --git a/net-mgmt/torrus/Makefile b/net-mgmt/torrus/Makefile
index 703044037294..a586f9f83efa 100644
--- a/net-mgmt/torrus/Makefile
+++ b/net-mgmt/torrus/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	torrus
-PORTVERSION=	2.07
-PORTREVISION=	2
+PORTVERSION=	2.09
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/torrus/torrus/
 
diff --git a/net-mgmt/torrus/distinfo b/net-mgmt/torrus/distinfo
index 473b09fc2402..96a56a202ffc 100644
--- a/net-mgmt/torrus/distinfo
+++ b/net-mgmt/torrus/distinfo
@@ -1,2 +1,3 @@
-SHA256 (torrus-2.07.tar.gz) = b4ee8930cb36c8985956c852ad6fa2cd284d1d54d4ef54799e77eeee3eb9a6c6
-SIZE (torrus-2.07.tar.gz) = 627347
+TIMESTAMP = 1464142651
+SHA256 (torrus-2.09.tar.gz) = d460bf14661aec8a8840d185274589abe76a35e9d23fe54ee55bea094c478a1d
+SIZE (torrus-2.09.tar.gz) = 653126
diff --git a/net-mgmt/torrus/files/patch-doc_stylingprofile.pod.in b/net-mgmt/torrus/files/patch-doc_stylingprofile.pod.in
deleted file mode 100644
index d8daa9faaf19..000000000000
--- a/net-mgmt/torrus/files/patch-doc_stylingprofile.pod.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
- 
diff --git a/net-mgmt/torrus/files/patch-doc_xmlconfig.pod.in b/net-mgmt/torrus/files/patch-doc_xmlconfig.pod.in
deleted file mode 100644
index b8c5f7e1eda4..000000000000
--- a/net-mgmt/torrus/files/patch-doc_xmlconfig.pod.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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
- 
diff --git a/net-mgmt/torrus/pkg-plist b/net-mgmt/torrus/pkg-plist
index 97854fe66992..da22924bc3eb 100644
--- a/net-mgmt/torrus/pkg-plist
+++ b/net-mgmt/torrus/pkg-plist
@@ -25,6 +25,7 @@ libexec/torrus/genddx
 libexec/torrus/genlist
 libexec/torrus/genreport
 libexec/torrus/install_plugin
+libexec/torrus/launcher
 libexec/torrus/monitor
 libexec/torrus/nodeid
 libexec/torrus/rrddir2xml
@@ -60,6 +61,7 @@ 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
+man/man7/torrus_launcher.7.gz
 %%DOCSDIR%%/devdoc/architecture.pod
 %%DOCSDIR%%/devdoc/devdiscover.pod
 %%DOCSDIR%%/devdoc/progstyle.pod
@@ -141,6 +143,7 @@ man/man7/torrus_install_plugin.7.gz
 %%DATADIR%%/xmlconfig/generic/rfc2670.docsis-if.xml
 %%DATADIR%%/xmlconfig/generic/rfc2790.host-resources.xml
 %%DATADIR%%/xmlconfig/generic/rfc2863.if-mib.xml
+%%DATADIR%%/xmlconfig/generic/rfc4293.ip-mib.xml
 %%DATADIR%%/xmlconfig/generic/rfc4319_hdsl2_shdsl_line.xml
 %%DATADIR%%/xmlconfig/old/cisco-mac-accounting-example.xml
 %%DATADIR%%/xmlconfig/old/cisco.generic.old-0.1.4.xml
@@ -152,6 +155,7 @@ man/man7/torrus_install_plugin.7.gz
 %%DATADIR%%/xmlconfig/old/rfc2863.if-mib.old-0.1.7.xml
 %%DATADIR%%/xmlconfig/old/snmp-defs.old-0.1.2.xml
 %%DATADIR%%/xmlconfig/snmp-defs.xml
+%%DATADIR%%/xmlconfig/vendor/albis-ulaf.xml
 %%DATADIR%%/xmlconfig/vendor/alteon.xml
 %%DATADIR%%/xmlconfig/vendor/alu-timetra.xml
 %%DATADIR%%/xmlconfig/vendor/apc.powernet.xml
@@ -175,6 +179,7 @@ man/man7/torrus_install_plugin.7.gz
 %%DATADIR%%/xmlconfig/vendor/empire.systemedge.ntregperf.xml
 %%DATADIR%%/xmlconfig/vendor/empire.systemedge.xml
 %%DATADIR%%/xmlconfig/vendor/f5.bigip.xml
+%%DATADIR%%/xmlconfig/vendor/fortinet.xml
 %%DATADIR%%/xmlconfig/vendor/foundry.xml
 %%DATADIR%%/xmlconfig/vendor/ftos.xml
 %%DATADIR%%/xmlconfig/vendor/jacarta.xml
@@ -219,6 +224,7 @@ man/man7/torrus_install_plugin.7.gz
 %%SITE_PERL%%/Torrus/DevDiscover/ALU_Timetra.pm
 %%SITE_PERL%%/Torrus/DevDiscover/APC_PowerNet.pm
 %%SITE_PERL%%/Torrus/DevDiscover/ATMEL.pm
+%%SITE_PERL%%/Torrus/DevDiscover/Albis_ULAF.pm
 %%SITE_PERL%%/Torrus/DevDiscover/AlliedTelesyn_PBC18.pm
 %%SITE_PERL%%/Torrus/DevDiscover/Alteon.pm
 %%SITE_PERL%%/Torrus/DevDiscover/Apple_AE.pm
@@ -244,6 +250,7 @@ man/man7/torrus_install_plugin.7.gz
 %%SITE_PERL%%/Torrus/DevDiscover/DevDetails.pm
 %%SITE_PERL%%/Torrus/DevDiscover/EmpireSystemedge.pm
 %%SITE_PERL%%/Torrus/DevDiscover/F5BigIp.pm
+%%SITE_PERL%%/Torrus/DevDiscover/Fortinet.pm
 %%SITE_PERL%%/Torrus/DevDiscover/Foundry.pm
 %%SITE_PERL%%/Torrus/DevDiscover/FTOS.pm
 %%SITE_PERL%%/Torrus/DevDiscover/Jacarta.pm
@@ -267,6 +274,7 @@ man/man7/torrus_install_plugin.7.gz
 %%SITE_PERL%%/Torrus/DevDiscover/RFC2737_ENTITY_MIB.pm
 %%SITE_PERL%%/Torrus/DevDiscover/RFC2790_HOST_RESOURCES.pm
 %%SITE_PERL%%/Torrus/DevDiscover/RFC2863_IF_MIB.pm
+%%SITE_PERL%%/Torrus/DevDiscover/RFC4293_IP_MIB.pm
 %%SITE_PERL%%/Torrus/DevDiscover/RFC4319_HDSL2_SHDSL_LINE_MIB.pm
 %%SITE_PERL%%/Torrus/DevDiscover/Symmetricom.pm
 %%SITE_PERL%%/Torrus/DevDiscover/Thomson_xDSL.pm