4 files changed, 20 insertions, 14 deletions

diff --git a/net-mgmt/torrus/Makefile b/net-mgmt/torrus/Makefile
index 43889c3a92bc..5f404557fb30 100644
--- a/net-mgmt/torrus/Makefile
+++ b/net-mgmt/torrus/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	torrus
-PORTVERSION=	1.0.9
-PORTREVISION=	1
+PORTVERSION=	2.01
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF
 
 MAINTAINER=	corsmith@gmail.com
 COMMENT=	The Data Series Processing Framework - think mrtg with xml configs
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	${SITE_PERL}/RRDp.pm:${PORTSDIR}/databases/rrdtool \
 		${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML \
 		${SITE_PERL}/${PERL_ARCH}/BerkeleyDB.pm:${PORTSDIR}/databases/p5-BerkeleyDB \
@@ -25,7 +26,7 @@ BUILD_DEPENDS=	${SITE_PERL}/RRDp.pm:${PORTSDIR}/databases/rrdtool \
 		${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session \
 		${SITE_PERL}/${PERL_ARCH}/FCGI.pm:${PORTSDIR}/www/p5-FCGI \
 		p5-JSON>0:${PORTSDIR}/converters/p5-JSON
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GNOME=	libxml2
 USE_PERL5_RUN=	5.8.1+
diff --git a/net-mgmt/torrus/distinfo b/net-mgmt/torrus/distinfo
index 52a51a39db4b..778b8956ea0d 100644
--- a/net-mgmt/torrus/distinfo
+++ b/net-mgmt/torrus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (torrus-1.0.9.tar.gz) = 65d8a3e49892466a17d44c2d85ad8cfb12a0f12e2475cad2b4550705a6f953f9
-SIZE (torrus-1.0.9.tar.gz) = 595763
+SHA256 (torrus-2.01.tar.gz) = a8352ff94bce98996df1cf1a8e61185e6dd14e107659767093c96c21075341fb
+SIZE (torrus-2.01.tar.gz) = 600664
diff --git a/net-mgmt/torrus/files/patch-xmlconfig_Makefile.in b/net-mgmt/torrus/files/patch-xmlconfig_Makefile.in
index 82b0a6b8fa29..8c5be40287b5 100644
--- a/net-mgmt/torrus/files/patch-xmlconfig_Makefile.in
+++ b/net-mgmt/torrus/files/patch-xmlconfig_Makefile.in
@@ -1,11 +1,11 @@
---- xmlconfig/Makefile.in.orig	2010-10-28 18:19:45.000000000 +0000
-+++ xmlconfig/Makefile.in	2010-10-28 18:20:38.000000000 +0000
-@@ -534,6 +534,8 @@
+--- xmlconfig/Makefile.in.orig	2011-09-06 17:49:25.660248500 -0400
++++ xmlconfig/Makefile.in	2011-09-06 17:51:25.410749729 -0400
+@@ -600,6 +600,8 @@
  	  $(INSTALL_DATA) site-global.xml \
  		$(DESTDIR)$(sitexmldir)/site-global.xml; \
  	fi
-+	$(INSTALL_DATA) site-global.xml \
++	  $(INSTALL_DATA) site-global.xml \
 +		$(DESTDIR)$(sitexmldir)/site-global.xml.sample;
+ 
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/net-mgmt/torrus/pkg-plist b/net-mgmt/torrus/pkg-plist
index cde57ea8dade..1c8a6e312a3a 100644
--- a/net-mgmt/torrus/pkg-plist
+++ b/net-mgmt/torrus/pkg-plist
@@ -53,10 +53,6 @@ libexec/torrus/ttproclist
 %%DOCSDIR%%/devdoc/reqs.0.0.pod
 %%DOCSDIR%%/devdoc/reqs.0.1.pod
 %%DOCSDIR%%/devdoc/torrus_roadmap.pod
-%%DOCSDIR%%/devdoc/wd.distributed.pod
-%%DOCSDIR%%/devdoc/wd.messaging.pod
-%%DOCSDIR%%/devdoc/wd.monitor-escalation.pod
-%%DOCSDIR%%/devdoc/wd.uptime-mon.pod
 %%DOCSDIR%%/install.txt
 %%DOCSDIR%%/nodeid_usage.txt
 %%DOCSDIR%%/reporting_setup.txt
@@ -104,6 +100,7 @@ libexec/torrus/ttproclist
 %%DATADIR%%/templates/expanded-dir.html
 %%DATADIR%%/templates/globalsearch.html
 %%DATADIR%%/templates/html-incblocks.txt
+%%DATADIR%%/templates/iframe-rrd.html
 %%DATADIR%%/templates/overview-subleaves.html
 %%DATADIR%%/templates/report-index.html
 %%DATADIR%%/templates/report-monthly.html
@@ -157,6 +154,7 @@ libexec/torrus/ttproclist
 %%DATADIR%%/xmlconfig/vendor/cisco.ios.xml
 %%DATADIR%%/xmlconfig/vendor/cisco.sce.xml
 %%DATADIR%%/xmlconfig/vendor/cisco.vdsl-line.xml
+%%DATADIR%%/xmlconfig/vendor/cisco.wlc.xml
 %%DATADIR%%/xmlconfig/vendor/compaq.cim.xml
 %%DATADIR%%/xmlconfig/vendor/empire.systemedge.ntregperf.xml
 %%DATADIR%%/xmlconfig/vendor/empire.systemedge.xml
@@ -199,6 +197,7 @@ libexec/torrus/ttproclist
 %%SITE_PERL%%/Torrus/DB.pm
 %%SITE_PERL%%/Torrus/DataAccess.pm
 %%SITE_PERL%%/Torrus/DevDiscover.pm
+%%SITE_PERL%%/Torrus/DevDiscover/Actelis.pm
 %%SITE_PERL%%/Torrus/DevDiscover/ALU_Timetra.pm
 %%SITE_PERL%%/Torrus/DevDiscover/ATMEL.pm
 %%SITE_PERL%%/Torrus/DevDiscover/AlliedTelesyn_PBC18.pm
@@ -210,6 +209,7 @@ libexec/torrus/ttproclist
 %%SITE_PERL%%/Torrus/DevDiscover/AxxessIT.pm
 %%SITE_PERL%%/Torrus/DevDiscover/BetterNetworks.pm
 %%SITE_PERL%%/Torrus/DevDiscover/CasaCMTS.pm
+%%SITE_PERL%%/Torrus/DevDiscover/CCOM.pm
 %%SITE_PERL%%/Torrus/DevDiscover/CiscoCatOS.pm
 %%SITE_PERL%%/Torrus/DevDiscover/CiscoFirewall.pm
 %%SITE_PERL%%/Torrus/DevDiscover/CiscoGeneric.pm
@@ -219,6 +219,7 @@ libexec/torrus/ttproclist
 %%SITE_PERL%%/Torrus/DevDiscover/CiscoIOS_SAA.pm
 %%SITE_PERL%%/Torrus/DevDiscover/CiscoSCE.pm
 %%SITE_PERL%%/Torrus/DevDiscover/CiscoVDSL.pm
+%%SITE_PERL%%/Torrus/DevDiscover/CiscoWLC.pm
 %%SITE_PERL%%/Torrus/DevDiscover/CompaqCIM.pm
 %%SITE_PERL%%/Torrus/DevDiscover/EmpireSystemedge.pm
 %%SITE_PERL%%/Torrus/DevDiscover/F5BigIp.pm
@@ -232,8 +233,10 @@ libexec/torrus/ttproclist
 %%SITE_PERL%%/Torrus/DevDiscover/NetApp.pm
 %%SITE_PERL%%/Torrus/DevDiscover/NetBotz.pm
 %%SITE_PERL%%/Torrus/DevDiscover/NetScreen.pm
+%%SITE_PERL%%/Torrus/DevDiscover/NexComm.pm
 %%SITE_PERL%%/Torrus/DevDiscover/OracleDatabase.pm
 %%SITE_PERL%%/Torrus/DevDiscover/Paradyne.pm
+%%SITE_PERL%%/Torrus/DevDiscover/Patton.pm
 %%SITE_PERL%%/Torrus/DevDiscover/RFC1628_UPS_MIB.pm
 %%SITE_PERL%%/Torrus/DevDiscover/RFC1657_BGP4_MIB.pm
 %%SITE_PERL%%/Torrus/DevDiscover/RFC1697_RDBMS.pm
@@ -244,6 +247,7 @@ libexec/torrus/ttproclist
 %%SITE_PERL%%/Torrus/DevDiscover/RFC2790_HOST_RESOURCES.pm
 %%SITE_PERL%%/Torrus/DevDiscover/RFC2863_IF_MIB.pm
 %%SITE_PERL%%/Torrus/DevDiscover/Symmetricom.pm
+%%SITE_PERL%%/Torrus/DevDiscover/Thomson_xDSL.pm
 %%SITE_PERL%%/Torrus/DevDiscover/UcdSnmp.pm
 %%SITE_PERL%%/Torrus/DevDiscover/Xylan.pm
 %%SITE_PERL%%/Torrus/Log.pm
@@ -253,6 +257,7 @@ libexec/torrus/ttproclist
 %%SITE_PERL%%/Torrus/Renderer/AdmInfo.pm
 %%SITE_PERL%%/Torrus/Renderer/Frontpage.pm
 %%SITE_PERL%%/Torrus/Renderer/HTML.pm
+%%SITE_PERL%%/Torrus/Renderer/RPC.pm
 %%SITE_PERL%%/Torrus/Renderer/RRDtool.pm
 %%SITE_PERL%%/Torrus/ReportGenerator/MonthlySrvUsage.pm
 %%SITE_PERL%%/Torrus/ReportGenerator.pm