3 files changed, 16 insertions, 7 deletions

diff --git a/net-mgmt/torrus/Makefile b/net-mgmt/torrus/Makefile
index c6d0d7c50e06..7b2b291e2ed7 100644
--- a/net-mgmt/torrus/Makefile
+++ b/net-mgmt/torrus/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	torrus
-PORTVERSION=	1.0.7
+PORTVERSION=	1.0.8
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	corsmith@gmail.com
 COMMENT=	The Data Series Processing Framework - think mrtg with xml configs
@@ -65,7 +64,8 @@ MAN1=		torrus.1 torrus_acledit.1 torrus_buildsearchdb.1 \
 		torrus_compilexml.1 torrus_configinfo.1 \
 		torrus_configsnapshot.1 torrus_devdiscover.1 torrus_genddx.1 \
 		torrus_genlist.1 torrus_genreport.1 torrus_monitor.1 \
-		torrus_rrddir2xml.1 torrus_schedulerinfo.1 torrus_ttproclist.1
+		torrus_rrddir2xml.1 torrus_schedulerinfo.1 torrus_srvderive.1 \
+		torrus_ttproclist.1
 
 MAN7=		torrus_action_printemail.7 torrus_action_snmptrap.7 \
 		torrus_action_notify.7 torrus_install_plugin.7
@@ -101,5 +101,6 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/init.d/torrus ${PREFIX}/etc/rc.d/torrus.sh
 	@${MKDIR} -m 2775 -p ${PREFIX}/${TORRUS_RRDDIR}
 	@${CHOWN} ${TORRUS_USER}:${TORRUS_USER} ${PREFIX}/${TORRUS_RRDDIR}
+	@${CAT} pkg-message
 
 .include <bsd.port.post.mk>
diff --git a/net-mgmt/torrus/distinfo b/net-mgmt/torrus/distinfo
index 4d82dbfb418d..0c1a9d629580 100644
--- a/net-mgmt/torrus/distinfo
+++ b/net-mgmt/torrus/distinfo
@@ -1,3 +1,3 @@
-MD5 (torrus-1.0.7.tar.gz) = 5eba82be35026e2339b7dff55bd96254
-SHA256 (torrus-1.0.7.tar.gz) = 55d0253c3f073d4def716770f3bf2ab497ad3e56b6411a5288920106fc244b43
-SIZE (torrus-1.0.7.tar.gz) = 519321
+MD5 (torrus-1.0.8.tar.gz) = 4bfeba7d8262aa57bc634f6405350799
+SHA256 (torrus-1.0.8.tar.gz) = f4cef5b0bde577dad9a36fcf6aa9f1a68807a057135c329b99d567fffdb12772
+SIZE (torrus-1.0.8.tar.gz) = 540991
diff --git a/net-mgmt/torrus/pkg-plist b/net-mgmt/torrus/pkg-plist
index bcc6fd47f8b5..cbc3984af87b 100644
--- a/net-mgmt/torrus/pkg-plist
+++ b/net-mgmt/torrus/pkg-plist
@@ -30,6 +30,7 @@ libexec/torrus/rrddir2xml
 libexec/torrus/schedulerinfo
 libexec/torrus/scripts/rrdup_notify.sh
 libexec/torrus/scripts/xml/extract-skeleton.xsl
+libexec/torrus/srvderive
 libexec/torrus/ttproclist
 %%DOCSDIR%%/devdoc/architecture.pod
 %%DOCSDIR%%/devdoc/devdiscover.pod
@@ -108,6 +109,8 @@ share/torrus/xmlconfig/examples/servers.data
 share/torrus/xmlconfig/examples/servers.tmpl
 share/torrus/xmlconfig/generic/collector-periods.xml
 share/torrus/xmlconfig/generic/monitors.xml
+share/torrus/xmlconfig/generic/rfc1628.ups.xml
+share/torrus/xmlconfig/generic/rfc1697.rdbms.xml
 share/torrus/xmlconfig/generic/rfc2662.adsl-line.xml
 share/torrus/xmlconfig/generic/rfc2670.docsis-if.xml
 share/torrus/xmlconfig/generic/rfc2790.host-resources.xml
@@ -125,6 +128,7 @@ share/torrus/xmlconfig/snmp-defs.xml
 share/torrus/xmlconfig/vendor/alteon.xml
 share/torrus/xmlconfig/vendor/apc.ups.xml
 share/torrus/xmlconfig/vendor/apple.ae.xml
+share/torrus/xmlconfig/vendor/arbor_e.xml
 share/torrus/xmlconfig/vendor/ascend.max.xml
 share/torrus/xmlconfig/vendor/atmel.xml
 share/torrus/xmlconfig/vendor/betternetworks.xml
@@ -141,6 +145,7 @@ share/torrus/xmlconfig/vendor/empire.systemedge.xml
 share/torrus/xmlconfig/vendor/f5.bigip.xml
 share/torrus/xmlconfig/vendor/junos.xml
 share/torrus/xmlconfig/vendor/hp.hpux.xml
+share/torrus/xmlconfig/vendor/liebert.xml
 share/torrus/xmlconfig/vendor/microsoft.windows.xml
 share/torrus/xmlconfig/vendor/motorola.bsr.xml
 share/torrus/xmlconfig/vendor/netapp.filer.xml
@@ -175,6 +180,7 @@ share/torrus/xmlconfig/vendor/ucd.ucd-snmp.xml
 %%SITE_PERL%%/Torrus/DevDiscover/AlliedTelesyn_PBC18.pm
 %%SITE_PERL%%/Torrus/DevDiscover/Alteon.pm
 %%SITE_PERL%%/Torrus/DevDiscover/Apple_AE.pm
+%%SITE_PERL%%/Torrus/DevDiscover/Arbor_E.pm
 %%SITE_PERL%%/Torrus/DevDiscover/AscendMax.pm
 %%SITE_PERL%%/Torrus/DevDiscover/AxxessIT.pm
 %%SITE_PERL%%/Torrus/DevDiscover/BetterNetworks.pm
@@ -191,12 +197,14 @@ share/torrus/xmlconfig/vendor/ucd.ucd-snmp.xml
 %%SITE_PERL%%/Torrus/DevDiscover/EmpireSystemedge.pm
 %%SITE_PERL%%/Torrus/DevDiscover/F5BigIp.pm
 %%SITE_PERL%%/Torrus/DevDiscover/JunOS.pm
+%%SITE_PERL%%/Torrus/DevDiscover/Liebert.pm
 %%SITE_PERL%%/Torrus/DevDiscover/MicrosoftWindows.pm
 %%SITE_PERL%%/Torrus/DevDiscover/MotorolaBSR.pm
 %%SITE_PERL%%/Torrus/DevDiscover/NetApp.pm
 %%SITE_PERL%%/Torrus/DevDiscover/NetScreen.pm
 %%SITE_PERL%%/Torrus/DevDiscover/OracleDatabase.pm
 %%SITE_PERL%%/Torrus/DevDiscover/Paradyne.pm
+%%SITE_PERL%%/Torrus/DevDiscover/RFC1628_UPS_MIB.pm
 %%SITE_PERL%%/Torrus/DevDiscover/RFC1657_BGP4_MIB.pm
 %%SITE_PERL%%/Torrus/DevDiscover/RFC1697_RDBMS.pm
 %%SITE_PERL%%/Torrus/DevDiscover/RFC2011_IP_MIB.pm