Attachment #110900 for bug #152116




# Date created:				July 13th, 2005
# Whom:	      				Corey Smith <corsmith@gmail.com>
#
# $FreeBSD$
#

PORTNAME=	torrus
PORTVERSION=	1.0.9
PORTREVISION=	2
CATEGORIES=	net-mgmt
MASTER_SITES=	SF


		${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
		${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
		${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate \
		${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session \
		${SITE_PERL}/${PERL_ARCH}/FCGI.pm:${PORTSDIR}/www/p5-FastCGI \
		p5-JSON>0:${PORTSDIR}/converters/p5-JSON
RUN_DEPENDS=	${BUILD_DEPENDS}
LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2
USE_APACHE= 2.0+
RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/APR/Request.pm:${PORTSDIR}/www/p5-libapreq2
.else
USE_APACHE= 1.3
RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
.endif

USE_PERL5_RUN=	5.8.1+
GNU_CONFIGURE=	YES

TORRUS_USER?=	torrus
PLIST_SUB=	TORRUS_USER=${TORRUS_USER}

CONFIGURE_ARGS=	--prefix=${PREFIX} \
		var_user=${TORRUS_USER} var_group=${TORRUS_USER} \
		torrus_user=${TORRUS_USER} \
		defrrddir=/var/torrus/collector_rrd \
		pkghome=${DATADIR} \
		pkgbindir=${PREFIX}/libexec/torrus \
		pkgdocdir=${DOCSDIR} \
		exmpdir=${EXAMPLESDIR} \
		perllibdir=${SITE_PERL} \
		scriptsdir=${PREFIX}/libexec/torrus/scripts \
		--enable-pkgonly


.include <bsd.port.pre.mk>

pre-fetch:
	@${ECHO_CMD} PREFIX = ${PREFIX}
	@${ECHO_CMD}
	@${ECHO_CMD} "This port supports either mod_perl 1 or mod_perl 2"
	@${ECHO_CMD}
	@${ECHO_CMD} "  mod_perl 1.x support (DEFAULT)"
	@${ECHO_CMD} "  WITH_MODPERL2=yes  Enables mod_perl 2.x support"
	@${ECHO_CMD}
.if !defined(WITH_MODPERL2)
	@${ECHO_CMD} "Enabling mod_perl 1.x support."
.else
	@${ECHO_CMD} "Enabling mod_perl 2.x support."
.endif
	@${ECHO_CMD}

pre-install:
	@if ! pw groupshow ${TORRUS_USER}; then \
		pw groupadd ${TORRUS_USER}; \


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>

Lines 1-3 Link Here

(-)net-mgmt/torrus/distinfo (-3 / +3 lines)
1	MD5 (torrus-1.0.8.tar.gz) = 4bfeba7d8262aa57bc634f6405350799	1	MD5 (torrus-1.0.9.tar.gz) = 561b72fdd445987218d216c02f48db9e
2	SHA256 (torrus-1.0.8.tar.gz) = f4cef5b0bde577dad9a36fcf6aa9f1a68807a057135c329b99d567fffdb12772	2	SHA256 (torrus-1.0.9.tar.gz) = 65d8a3e49892466a17d44c2d85ad8cfb12a0f12e2475cad2b4550705a6f953f9
3	SIZE (torrus-1.0.8.tar.gz) = 540991	3	SIZE (torrus-1.0.9.tar.gz) = 595763




--- configs/Makefile.in.orig	2010-10-28 18:25:20.000000000 +0000
+++ configs/Makefile.in	2010-10-28 18:26:04.000000000 +0000
@@ -392,7 +392,8 @@
 	done
 	for f in devdiscover-siteconfig.pl email-siteconfig.pl \
 	         snmptrap-siteconfig.pl torrus-siteconfig.pl; do \
 	  if test ! -r $(DESTDIR)$(siteconfdir)/$$f; then \
 	    $(INSTALL_DATA) $$f $(DESTDIR)$(siteconfdir)/$$f; \
-	  fi \
+	  fi; \
+	  $(INSTALL_DATA) $$f $(DESTDIR)$(siteconfdir)/$$f.sample; \
 	done
 # Tell versions [3.59,3.63) of GNU make to not export all variables.




--- perllib/Makefile.in.orig	2010-10-28 18:49:34.000000000 +0000
+++ perllib/Makefile.in	2010-10-28 18:50:48.000000000 +0000
@@ -339,7 +339,7 @@
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(perllibdir)
-	find * -type d ! -name CVS -print >list.tmp
+	find * -type d -print | grep -v /.svn >list.tmp
 	for d in `cat list.tmp`; do \
 	  $(mkinstalldirs) $(DESTDIR)$(perllibdir)/$$d; done
 	find * \( -name '*.pm' \) -type f -print >list.tmp
@@ -348,13 +348,13 @@
 	rm -f list.tmp
 
 uninstall-local:
-	find * -type d ! -name CVS -print >list.tmp
+	find * -type d -print | grep -v /.svn >list.tmp
 	for d in `cat list.tmp`; do \
 	  rm -r $(DESTDIR)$(perllibdir)/$$d; done
 	rm -f list.tmp
 
 dist-hook:
-	find * -type d ! -name CVS -print >list.tmp
+	find * -type d -print | grep -v /.svn >list.tmp
 	for d in `cat list.tmp`; do \
 	  mkdir $(distdir)/$$d; done
 	find * \( -name '*.pm' -o -name '*.txt' \) -type f -print >list.tmp




--- 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 @@
 	  $(INSTALL_DATA) site-global.xml \
 		$(DESTDIR)$(sitexmldir)/site-global.xml; \
 	fi
-	if test ! -r $(DESTDIR)$(sitexmldir)/site-global.xml; then \
-	  $(INSTALL_DATA) site-global.xml \
-		$(DESTDIR)$(sitexmldir)/site-global.xml; \
-	fi
+	$(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.

Lines 4-6 Link Here

(-)net-mgmt/torrus/pkg-message (+5 lines)
4	* Remove all of the dbs under db/	4	* Remove all of the dbs under db/
5	* run 'torrus compilexml --all'	5	* run 'torrus compilexml --all'
6	* Restart the collector	6	* Restart the collector
		7
		8	This port has been converted to use fastcgi. Please read the installation
		9	documentation available at:
		10
		11	http://torrus.org/install.pod.html




libexec/torrus/configinfo
libexec/torrus/configsnapshot
libexec/torrus/devdiscover
libexec/torrus/flushmonitors
libexec/torrus/genddx
libexec/torrus/genlist
libexec/torrus/genreport
libexec/torrus/install_plugin
libexec/torrus/monitor
libexec/torrus/nodeid
libexec/torrus/rrddir2xml
libexec/torrus/schedulerinfo
libexec/torrus/scripts/rrdup_notify.sh
libexec/torrus/scripts/xml/extract-skeleton.xsl
libexec/torrus/snmpfailures
libexec/torrus/srvderive
libexec/torrus/torrus.fcgi
libexec/torrus/ttproclist
%%DOCSDIR%%/devdoc/architecture.pod
%%DOCSDIR%%/devdoc/devdiscover.pod

%%DOCSDIR%%/devdoc/wd.monitor-escalation.pod
%%DOCSDIR%%/devdoc/wd.uptime-mon.pod
%%DOCSDIR%%/install.txt
%%DOCSDIR%%/nodeid_usage.txt
%%DOCSDIR%%/reporting_setup.txt
%%DOCSDIR%%/rpnexpr.txt
%%DOCSDIR%%/rrfw_torrus_migration.txt

%%EXAMPLESDIR%%/onmsInterfaces.sh
%%EXAMPLESDIR%%/setmonitor.xupdate.xml
%%EXAMPLESDIR%%/torrus-siteconfig.powerbook.pl
%%DATADIR%%/conf_defaults/devdiscover-config.pl
%%DATADIR%%/conf_defaults/initscript.conf
%%DATADIR%%/conf_defaults/instvars
%%DATADIR%%/conf_defaults/torrus-config.pl
%%DATADIR%%/conf_defaults/webmux.pl
%%DATADIR%%/conf_defaults/webmux2.pl
%%DATADIR%%/sup/dtd/snmp-discovery.dtd
%%DATADIR%%/sup/dtd/torrus-config.dtd
%%DATADIR%%/sup/mibs/RRDTOOL-SMI.txt
%%DATADIR%%/sup/mibs/TORRUS-MIB.txt
%%DATADIR%%/sup/styling/colornames.pl
%%DATADIR%%/sup/styling/rainbow-schema.pl
%%DATADIR%%/sup/styling/torrus-schema.pl
%%DATADIR%%/sup/webplain/explain-rrdgraph.html
%%DATADIR%%/sup/webplain/torrus-printer.css
%%DATADIR%%/sup/webplain/torrus-report.css
%%DATADIR%%/sup/webplain/torrus.css
%%DATADIR%%/templates/aclexport.xml
%%DATADIR%%/templates/adminfo.html
%%DATADIR%%/templates/default-chooser.html
%%DATADIR%%/templates/default-dir.html
%%DATADIR%%/templates/default-helptext.html
%%DATADIR%%/templates/default-login.html
%%DATADIR%%/templates/default-recursivedir.html
%%DATADIR%%/templates/default-rrd.html
%%DATADIR%%/templates/default-tset.html
%%DATADIR%%/templates/email-alarm.txt
%%DATADIR%%/templates/expanded-dir.html
%%DATADIR%%/templates/globalsearch.html
%%DATADIR%%/templates/html-incblocks.txt
%%DATADIR%%/templates/overview-subleaves.html
%%DATADIR%%/templates/report-index.html
%%DATADIR%%/templates/report-monthly.html
%%DATADIR%%/templates/report-serviceid.html
%%DATADIR%%/templates/report-yearly.html
%%DATADIR%%/templates/search.html
%%DATADIR%%/templates/tset-list.html
%%DATADIR%%/xmlconfig/cdef-collector-defs.xml
%%DATADIR%%/xmlconfig/defaults.xml
%%DATADIR%%/xmlconfig/examples/apc-ups.xml
%%DATADIR%%/xmlconfig/examples/ascend.max.xml
%%DATADIR%%/xmlconfig/examples/docsis-monitors.xml
%%DATADIR%%/xmlconfig/examples/generic-netsnmp.xml
%%DATADIR%%/xmlconfig/examples/hpux.xml
%%DATADIR%%/xmlconfig/examples/monitors.xml
%%DATADIR%%/xmlconfig/examples/multigraph.xml
%%DATADIR%%/xmlconfig/examples/rainbow-schema.xml
%%DATADIR%%/xmlconfig/examples/servers.data
%%DATADIR%%/xmlconfig/examples/servers.tmpl
%%DATADIR%%/xmlconfig/generic/collector-periods.xml
%%DATADIR%%/xmlconfig/generic/monitors.xml
%%DATADIR%%/xmlconfig/generic/rfc1628.ups.xml
%%DATADIR%%/xmlconfig/generic/rfc1697.rdbms.xml
%%DATADIR%%/xmlconfig/generic/rfc2662.adsl-line.xml
%%DATADIR%%/xmlconfig/generic/rfc2670.docsis-if.xml
%%DATADIR%%/xmlconfig/generic/rfc2790.host-resources.xml
%%DATADIR%%/xmlconfig/generic/rfc2863.if-mib.xml
%%DATADIR%%/xmlconfig/old/cisco-mac-accounting-example.xml
%%DATADIR%%/xmlconfig/old/cisco.generic.old-0.1.4.xml
%%DATADIR%%/xmlconfig/old/cisco.ios.mac-accounting-0.1.8.xml
%%DATADIR%%/xmlconfig/old/rfc1213.xml
%%DATADIR%%/xmlconfig/old/rfc2670.docsis-if.old.0.1.5d-20040224.xml
%%DATADIR%%/xmlconfig/old/rfc2670.docsis-if.old.1.0.4.xml
%%DATADIR%%/xmlconfig/old/rfc2863.if-mib.old-0.1.4.xml
%%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/alteon.xml
%%DATADIR%%/xmlconfig/vendor/alu-timetra.xml
%%DATADIR%%/xmlconfig/vendor/apc.ups.xml
%%DATADIR%%/xmlconfig/vendor/apple.ae.xml
%%DATADIR%%/xmlconfig/vendor/arbor_e.xml
%%DATADIR%%/xmlconfig/vendor/ascend.max.xml
%%DATADIR%%/xmlconfig/vendor/atmel.xml
%%DATADIR%%/xmlconfig/vendor/betternetworks.xml
%%DATADIR%%/xmlconfig/vendor/casa-cmts.xml
%%DATADIR%%/xmlconfig/vendor/cisco.firewall.xml
%%DATADIR%%/xmlconfig/vendor/cisco.generic.xml
%%DATADIR%%/xmlconfig/vendor/cisco.ios.docsis.xml
%%DATADIR%%/xmlconfig/vendor/cisco.ios.mac-accounting.xml
%%DATADIR%%/xmlconfig/vendor/cisco.ios.xml
%%DATADIR%%/xmlconfig/vendor/cisco.sce.xml
%%DATADIR%%/xmlconfig/vendor/cisco.vdsl-line.xml
%%DATADIR%%/xmlconfig/vendor/compaq.cim.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
%%DATADIR%%/xmlconfig/vendor/junos.xml
%%DATADIR%%/xmlconfig/vendor/hp.hpux.xml
%%DATADIR%%/xmlconfig/vendor/liebert.xml
%%DATADIR%%/xmlconfig/vendor/microsoft.windows.xml
%%DATADIR%%/xmlconfig/vendor/motorola.bsr.xml
%%DATADIR%%/xmlconfig/vendor/netapp.filer.xml
%%DATADIR%%/xmlconfig/vendor/netbotz.xml
%%DATADIR%%/xmlconfig/vendor/netscreen.xml
%%DATADIR%%/xmlconfig/vendor/paradyne.xdsl.xml
%%DATADIR%%/xmlconfig/vendor/symmetricom.xml
%%DATADIR%%/xmlconfig/vendor/ucd.ucd-snmp.xml
%%SITE_PERL%%/Torrus/ACL.pm
%%SITE_PERL%%/Torrus/ACL/AuthLocalMD5.pm
%%SITE_PERL%%/Torrus/ACL/Edit.pm

%%SITE_PERL%%/Torrus/ACL/Import.pm
%%SITE_PERL%%/Torrus/Apache2Handler.pm
%%SITE_PERL%%/Torrus/ApacheHandler.pm
%%SITE_PERL%%/Torrus/CGI.pm
%%SITE_PERL%%/Torrus/Collector.pm
%%SITE_PERL%%/Torrus/Collector/CDef.pm
%%SITE_PERL%%/Torrus/Collector/CDef_Params.pm

%%SITE_PERL%%/Torrus/DB.pm
%%SITE_PERL%%/Torrus/DataAccess.pm
%%SITE_PERL%%/Torrus/DevDiscover.pm
%%SITE_PERL%%/Torrus/DevDiscover/ALU_Timetra.pm
%%SITE_PERL%%/Torrus/DevDiscover/ATMEL.pm
%%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/Arista.pm
%%SITE_PERL%%/Torrus/DevDiscover/AscendMax.pm
%%SITE_PERL%%/Torrus/DevDiscover/AxxessIT.pm
%%SITE_PERL%%/Torrus/DevDiscover/BetterNetworks.pm
%%SITE_PERL%%/Torrus/DevDiscover/CasaCMTS.pm
%%SITE_PERL%%/Torrus/DevDiscover/CiscoCatOS.pm
%%SITE_PERL%%/Torrus/DevDiscover/CiscoFirewall.pm
%%SITE_PERL%%/Torrus/DevDiscover/CiscoGeneric.pm

%%SITE_PERL%%/Torrus/DevDiscover/CompaqCIM.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
%%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/NetBotz.pm
%%SITE_PERL%%/Torrus/DevDiscover/NetScreen.pm
%%SITE_PERL%%/Torrus/DevDiscover/OracleDatabase.pm
%%SITE_PERL%%/Torrus/DevDiscover/Paradyne.pm

%%SITE_PERL%%/Torrus/Scheduler.pm
%%SITE_PERL%%/Torrus/SchedulerInfo.pm
%%SITE_PERL%%/Torrus/SiteConfig.pm
%%SITE_PERL%%/Torrus/SNMP_Failures.pm
%%SITE_PERL%%/Torrus/SQL/Reports.pm
%%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 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 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
@exec mkdir %D/%%DATADIR%%/plugins/torrus-config 2>/dev/null || true
@exec mkdir %D/%%DATADIR%%/plugins/wrapper 2>/dev/null || true
@exec mkdir %D/%%DATADIR%%/sup/webscripts 2>/dev/null || true
@dirrm %%DATADIR%%/xmlconfig/vendor
@dirrm %%DATADIR%%/xmlconfig/old
@dirrm %%DATADIR%%/xmlconfig/generic
@dirrm %%DATADIR%%/xmlconfig/examples
@dirrm %%DATADIR%%/xmlconfig
@dirrm %%DATADIR%%/templates
@dirrm %%DATADIR%%/sup/webscripts
@dirrm %%DATADIR%%/sup/webplain
@dirrm %%DATADIR%%/sup/styling
@dirrm %%DATADIR%%/sup/mibs
@dirrm %%DATADIR%%/sup/dtd
@dirrm %%DATADIR%%/sup
@dirrm %%DATADIR%%/plugins/wrapper
@dirrm %%DATADIR%%/plugins/torrus-config
@dirrm %%DATADIR%%/plugins/devdiscover-config
@dirrm %%DATADIR%%/plugins
@dirrm %%DATADIR%%/conf_defaults
@dirrm %%DATADIR%%
@dirrm share/torrus/sup
@dirrm share/torrus/plugins/wrapper
@dirrm share/torrus/plugins/torrus-config
@dirrm share/torrus/plugins/devdiscover-config
@dirrm share/torrus/plugins
@dirrm share/torrus/conf_defaults
@dirrm share/torrus
@dirrm %%EXAMPLESDIR%%
@dirrm %%DOCSDIR%%/devdoc
@dirrm %%DOCSDIR%%

Return to bug 152116

Lines 2-13 Link Here

(-)net-mgmt/torrus/Makefile (-37 / +13 lines)
2	# Date created: July 13th, 2005	2	# Date created: July 13th, 2005
3	# Whom: Corey Smith <corsmith@gmail.com>	3	# Whom: Corey Smith <corsmith@gmail.com>
4	#	4	#
5	# $FreeBSD: ports/net-mgmt/torrus/Makefile,v 1.9 2010/05/27 04:23:30 pgollucci Exp $	5	# $FreeBSD$
6	#	6	#
7		7
8	PORTNAME= torrus	8	PORTNAME= torrus
9	PORTVERSION= 1.0.8	9	PORTVERSION= 1.0.9
10	PORTREVISION= 2
11	CATEGORIES= net-mgmt	10	CATEGORIES= net-mgmt
12	MASTER_SITES= SF	11	MASTER_SITES= SF
13		12
Lines 22-53 Link Here
22	${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP \	21	${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
23	${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \	22	${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
24	${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate \	23	${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate \
25	${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session	24	${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session \
26	LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2 \	25	${SITE_PERL}/${PERL_ARCH}/FCGI.pm:${PORTSDIR}/www/p5-FastCGI \
27	db-4.3.0:${PORTSDIR}/databases/db43	26	p5-JSON>0:${PORTSDIR}/converters/p5-JSON
28		27	RUN_DEPENDS= ${BUILD_DEPENDS}
29	.if defined(WITH_MODPERL2)	28	LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2
30	USE_APACHE= 2.0+
31	RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/APR/Request.pm:${PORTSDIR}/www/p5-libapreq2
32	.else
33	USE_APACHE= 1.3
34	RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
35	.endif
36		29
37	USE_PERL5_RUN= 5.8.1+	30	USE_PERL5_RUN= 5.8.1+
38	GNU_CONFIGURE= YES	31	GNU_CONFIGURE= YES
39		32
40	TORRUS_USER?= torrus	33	TORRUS_USER?= torrus
41	TORRUS_RRDDIR?= var/torrus/collector_rrd	34	PLIST_SUB= TORRUS_USER=${TORRUS_USER}
42		35
43	CONFIGURE_ARGS= --prefix=${PREFIX} \	36	CONFIGURE_ARGS= --prefix=${PREFIX} \
44	var_user=${TORRUS_USER} var_group=${TORRUS_USER} \	37	var_user=${TORRUS_USER} var_group=${TORRUS_USER} \
45	varprefix=${PREFIX}/var/torrus torrus_user=${TORRUS_USER} \	38	torrus_user=${TORRUS_USER} \
46	defrrddir=${PREFIX}/${TORRUS_RRDDIR} \	39	defrrddir=/var/torrus/collector_rrd \
47	pkghome=${PREFIX}/share/torrus \	40	pkghome=${DATADIR} \
48	pkgbindir=${PREFIX}/libexec/torrus \	41	pkgbindir=${PREFIX}/libexec/torrus \
49	pkgdocdir=${PREFIX}/share/doc/torrus \	42	pkgdocdir=${DOCSDIR} \
50	exmpdir=${PREFIX}/share/examples/torrus \	43	exmpdir=${EXAMPLESDIR} \
51	perllibdir=${SITE_PERL} \	44	perllibdir=${SITE_PERL} \
52	scriptsdir=${PREFIX}/libexec/torrus/scripts \	45	scriptsdir=${PREFIX}/libexec/torrus/scripts \
53	--enable-pkgonly	46	--enable-pkgonly
Lines 65-85 Link Here
65		58
66	.include <bsd.port.pre.mk>	59	.include <bsd.port.pre.mk>
67		60
68	pre-fetch:
69	@${ECHO_CMD} PREFIX = ${PREFIX}
70	@${ECHO_CMD}
71	@${ECHO_CMD} "This port supports either mod_perl 1 or mod_perl 2"
72	@${ECHO_CMD}
73	@${ECHO_CMD} " mod_perl 1.x support (DEFAULT)"
74	@${ECHO_CMD} " WITH_MODPERL2=yes Enables mod_perl 2.x support"
75	@${ECHO_CMD}
76	.if !defined(WITH_MODPERL2)
77	@${ECHO_CMD} "Enabling mod_perl 1.x support."
78	.else
79	@${ECHO_CMD} "Enabling mod_perl 2.x support."
80	.endif
81	@${ECHO_CMD}
82
83	pre-install:	61	pre-install:
84	@if ! pw groupshow ${TORRUS_USER}; then \	62	@if ! pw groupshow ${TORRUS_USER}; then \
85	pw groupadd ${TORRUS_USER}; \	63	pw groupadd ${TORRUS_USER}; \
Lines 92-99 Link Here
92		70
93	post-install:	71	post-install:
94	${INSTALL_SCRIPT} ${WRKSRC}/init.d/torrus ${PREFIX}/etc/rc.d/torrus.sh	72	${INSTALL_SCRIPT} ${WRKSRC}/init.d/torrus ${PREFIX}/etc/rc.d/torrus.sh
95	@${MKDIR} -m 2775 -p ${PREFIX}/${TORRUS_RRDDIR}
96	@${CHOWN} ${TORRUS_USER}:${TORRUS_USER} ${PREFIX}/${TORRUS_RRDDIR}
97	@${CAT} pkg-message	73	@${CAT} pkg-message
98		74
99	.include <bsd.port.post.mk>	75	.include <bsd.port.post.mk>

Lines 1-12 Link Here

(-)net-mgmt/torrus/files/patch-configs_Makefile.in (-7 / +6 lines)
1	--- configs/Makefile.in.orig Tue Jul 19 15:21:59 2005	1	--- configs/Makefile.in.orig 2010-10-28 18:25:20.000000000 +0000
2	+++ configs/Makefile.in Tue Jul 19 15:22:37 2005	2	+++ configs/Makefile.in 2010-10-28 18:26:04.000000000 +0000
3	@@ -385,9 +385,7 @@	3	@@ -392,7 +392,8 @@
4	done
5	for f in devdiscover-siteconfig.pl email-siteconfig.pl \
6	snmptrap-siteconfig.pl torrus-siteconfig.pl; do \	4	snmptrap-siteconfig.pl torrus-siteconfig.pl; do \
7	- if test ! -r $(DESTDIR)$(siteconfdir)/$$f; then \	5	if test ! -r $(DESTDIR)$(siteconfdir)/$$f; then \
8	- $(INSTALL_DATA) $$f $(DESTDIR)$(siteconfdir)/$$f; \	6	$(INSTALL_DATA) $$f $(DESTDIR)$(siteconfdir)/$$f; \
9	- fi \	7	- fi \
		8	+ fi; \
10	+ $(INSTALL_DATA) $$f $(DESTDIR)$(siteconfdir)/$$f.sample; \	9	+ $(INSTALL_DATA) $$f $(DESTDIR)$(siteconfdir)/$$f.sample; \
11	done	10	done
12	# Tell versions [3.59,3.63) of GNU make to not export all variables.	11	# Tell versions [3.59,3.63) of GNU make to not export all variables.

Line 0 Link Here

(-)net-mgmt/torrus/files/patch-perllib_Makefile.in (+27 lines)
	1	--- perllib/Makefile.in.orig 2010-10-28 18:49:34.000000000 +0000
	2	+++ perllib/Makefile.in 2010-10-28 18:50:48.000000000 +0000
	3	@@ -339,7 +339,7 @@
	4
	5	install-data-local:
	6	$(mkinstalldirs) $(DESTDIR)$(perllibdir)
	7	- find * -type d ! -name CVS -print >list.tmp
	8	+ find * -type d -print \| grep -v /.svn >list.tmp
	9	for d in `cat list.tmp`; do \
	10	$(mkinstalldirs) $(DESTDIR)$(perllibdir)/$$d; done
	11	find * \( -name '*.pm' \) -type f -print >list.tmp
	12	@@ -348,13 +348,13 @@
	13	rm -f list.tmp
	14
	15	uninstall-local:
	16	- find * -type d ! -name CVS -print >list.tmp
	17	+ find * -type d -print \| grep -v /.svn >list.tmp
	18	for d in `cat list.tmp`; do \
	19	rm -r $(DESTDIR)$(perllibdir)/$$d; done
	20	rm -f list.tmp
	21
	22	dist-hook:
	23	- find * -type d ! -name CVS -print >list.tmp
	24	+ find * -type d -print \| grep -v /.svn >list.tmp
	25	for d in `cat list.tmp`; do \
	26	mkdir $(distdir)/$$d; done
	27	find * \( -name '.pm' -o -name '.txt' \) -type f -print >list.tmp

Lines 1-13 Link Here

(-)net-mgmt/torrus/files/patch-xmlconfig_Makefile.in (-10 / +6 lines)
1	--- xmlconfig/Makefile.in.orig Tue Jul 19 15:25:15 2005	1	--- xmlconfig/Makefile.in.orig 2010-10-28 18:19:45.000000000 +0000
2	+++ xmlconfig/Makefile.in Tue Jul 19 15:25:41 2005	2	+++ xmlconfig/Makefile.in 2010-10-28 18:20:38.000000000 +0000
3	@@ -511,10 +511,8 @@	3	@@ -534,6 +534,8 @@
4		4	$(INSTALL_DATA) site-global.xml \
5	install-data-local:	5	$(DESTDIR)$(sitexmldir)/site-global.xml; \
6	$(mkinstalldirs) $(DESTDIR)$(sitexmldir)	6	fi
7	- if test ! -r $(DESTDIR)$(sitexmldir)/site-global.xml; then \
8	- $(INSTALL_DATA) site-global.xml \
9	- $(DESTDIR)$(sitexmldir)/site-global.xml; \
10	- fi
11	+ $(INSTALL_DATA) site-global.xml \	7	+ $(INSTALL_DATA) site-global.xml \
12	+ $(DESTDIR)$(sitexmldir)/site-global.xml.sample;	8	+ $(DESTDIR)$(sitexmldir)/site-global.xml.sample;
13	# Tell versions [3.59,3.63) of GNU make to not export all variables.	9	# Tell versions [3.59,3.63) of GNU make to not export all variables.

Lines 21-36 Link Here

(-)net-mgmt/torrus/pkg-plist (-132 / +146 lines)
21	libexec/torrus/configinfo	21	libexec/torrus/configinfo
22	libexec/torrus/configsnapshot	22	libexec/torrus/configsnapshot
23	libexec/torrus/devdiscover	23	libexec/torrus/devdiscover
		24	libexec/torrus/flushmonitors
24	libexec/torrus/genddx	25	libexec/torrus/genddx
25	libexec/torrus/genlist	26	libexec/torrus/genlist
26	libexec/torrus/genreport	27	libexec/torrus/genreport
27	libexec/torrus/install_plugin	28	libexec/torrus/install_plugin
28	libexec/torrus/monitor	29	libexec/torrus/monitor
		30	libexec/torrus/nodeid
29	libexec/torrus/rrddir2xml	31	libexec/torrus/rrddir2xml
30	libexec/torrus/schedulerinfo	32	libexec/torrus/schedulerinfo
31	libexec/torrus/scripts/rrdup_notify.sh	33	libexec/torrus/scripts/rrdup_notify.sh
32	libexec/torrus/scripts/xml/extract-skeleton.xsl	34	libexec/torrus/scripts/xml/extract-skeleton.xsl
		35	libexec/torrus/snmpfailures
33	libexec/torrus/srvderive	36	libexec/torrus/srvderive
		37	libexec/torrus/torrus.fcgi
34	libexec/torrus/ttproclist	38	libexec/torrus/ttproclist
35	%%DOCSDIR%%/devdoc/architecture.pod	39	%%DOCSDIR%%/devdoc/architecture.pod
36	%%DOCSDIR%%/devdoc/devdiscover.pod	40	%%DOCSDIR%%/devdoc/devdiscover.pod
Lines 43-48 Link Here
43	%%DOCSDIR%%/devdoc/wd.monitor-escalation.pod	47	%%DOCSDIR%%/devdoc/wd.monitor-escalation.pod
44	%%DOCSDIR%%/devdoc/wd.uptime-mon.pod	48	%%DOCSDIR%%/devdoc/wd.uptime-mon.pod
45	%%DOCSDIR%%/install.txt	49	%%DOCSDIR%%/install.txt
		50	%%DOCSDIR%%/nodeid_usage.txt
46	%%DOCSDIR%%/reporting_setup.txt	51	%%DOCSDIR%%/reporting_setup.txt
47	%%DOCSDIR%%/rpnexpr.txt	52	%%DOCSDIR%%/rpnexpr.txt
48	%%DOCSDIR%%/rrfw_torrus_migration.txt	53	%%DOCSDIR%%/rrfw_torrus_migration.txt
Lines 58-158 Link Here
58	%%EXAMPLESDIR%%/onmsInterfaces.sh	63	%%EXAMPLESDIR%%/onmsInterfaces.sh
59	%%EXAMPLESDIR%%/setmonitor.xupdate.xml	64	%%EXAMPLESDIR%%/setmonitor.xupdate.xml
60	%%EXAMPLESDIR%%/torrus-siteconfig.powerbook.pl	65	%%EXAMPLESDIR%%/torrus-siteconfig.powerbook.pl
61	share/torrus/conf_defaults/devdiscover-config.pl	66	%%DATADIR%%/conf_defaults/devdiscover-config.pl
62	share/torrus/conf_defaults/initscript.conf	67	%%DATADIR%%/conf_defaults/initscript.conf
63	share/torrus/conf_defaults/instvars	68	%%DATADIR%%/conf_defaults/instvars
64	share/torrus/conf_defaults/torrus-config.pl	69	%%DATADIR%%/conf_defaults/torrus-config.pl
65	share/torrus/conf_defaults/webmux.pl	70	%%DATADIR%%/conf_defaults/webmux.pl
66	share/torrus/conf_defaults/webmux2.pl	71	%%DATADIR%%/conf_defaults/webmux2.pl
67	share/torrus/sup/dtd/snmp-discovery.dtd	72	%%DATADIR%%/sup/dtd/snmp-discovery.dtd
68	share/torrus/sup/dtd/torrus-config.dtd	73	%%DATADIR%%/sup/dtd/torrus-config.dtd
69	share/torrus/sup/mibs/RRDTOOL-SMI.txt	74	%%DATADIR%%/sup/mibs/RRDTOOL-SMI.txt
70	share/torrus/sup/mibs/TORRUS-MIB.txt	75	%%DATADIR%%/sup/mibs/TORRUS-MIB.txt
71	share/torrus/sup/styling/colornames.pl	76	%%DATADIR%%/sup/styling/colornames.pl
72	share/torrus/sup/styling/rainbow-schema.pl	77	%%DATADIR%%/sup/styling/rainbow-schema.pl
73	share/torrus/sup/styling/torrus-schema.pl	78	%%DATADIR%%/sup/styling/torrus-schema.pl
74	share/torrus/sup/webplain/explain-rrdgraph.html	79	%%DATADIR%%/sup/webplain/explain-rrdgraph.html
75	share/torrus/sup/webplain/torrus-printer.css	80	%%DATADIR%%/sup/webplain/torrus-printer.css
76	share/torrus/sup/webplain/torrus-report.css	81	%%DATADIR%%/sup/webplain/torrus-report.css
77	share/torrus/sup/webplain/torrus.css	82	%%DATADIR%%/sup/webplain/torrus.css
78	share/torrus/templates/aclexport.xml	83	%%DATADIR%%/templates/aclexport.xml
79	share/torrus/templates/adminfo.html	84	%%DATADIR%%/templates/adminfo.html
80	share/torrus/templates/default-chooser.html	85	%%DATADIR%%/templates/default-chooser.html
81	share/torrus/templates/default-dir.html	86	%%DATADIR%%/templates/default-dir.html
82	share/torrus/templates/default-helptext.html	87	%%DATADIR%%/templates/default-helptext.html
83	share/torrus/templates/default-login.html	88	%%DATADIR%%/templates/default-login.html
84	share/torrus/templates/default-recursivedir.html	89	%%DATADIR%%/templates/default-recursivedir.html
85	share/torrus/templates/default-rrd.html	90	%%DATADIR%%/templates/default-rrd.html
86	share/torrus/templates/default-tset.html	91	%%DATADIR%%/templates/default-tset.html
87	share/torrus/templates/email-alarm.txt	92	%%DATADIR%%/templates/email-alarm.txt
88	share/torrus/templates/expanded-dir.html	93	%%DATADIR%%/templates/expanded-dir.html
89	share/torrus/templates/globalsearch.html	94	%%DATADIR%%/templates/globalsearch.html
90	share/torrus/templates/html-incblocks.txt	95	%%DATADIR%%/templates/html-incblocks.txt
91	share/torrus/templates/overview-subleaves.html	96	%%DATADIR%%/templates/overview-subleaves.html
92	share/torrus/templates/report-index.html	97	%%DATADIR%%/templates/report-index.html
93	share/torrus/templates/report-monthly.html	98	%%DATADIR%%/templates/report-monthly.html
94	share/torrus/templates/report-serviceid.html	99	%%DATADIR%%/templates/report-serviceid.html
95	share/torrus/templates/report-yearly.html	100	%%DATADIR%%/templates/report-yearly.html
96	share/torrus/templates/search.html	101	%%DATADIR%%/templates/search.html
97	share/torrus/templates/tset-list.html	102	%%DATADIR%%/templates/tset-list.html
98	share/torrus/xmlconfig/cdef-collector-defs.xml	103	%%DATADIR%%/xmlconfig/cdef-collector-defs.xml
99	share/torrus/xmlconfig/defaults.xml	104	%%DATADIR%%/xmlconfig/defaults.xml
100	share/torrus/xmlconfig/examples/apc-ups.xml	105	%%DATADIR%%/xmlconfig/examples/apc-ups.xml
101	share/torrus/xmlconfig/examples/ascend.max.xml	106	%%DATADIR%%/xmlconfig/examples/ascend.max.xml
102	share/torrus/xmlconfig/examples/docsis-monitors.xml	107	%%DATADIR%%/xmlconfig/examples/docsis-monitors.xml
103	share/torrus/xmlconfig/examples/generic-netsnmp.xml	108	%%DATADIR%%/xmlconfig/examples/generic-netsnmp.xml
104	share/torrus/xmlconfig/examples/hpux.xml	109	%%DATADIR%%/xmlconfig/examples/hpux.xml
105	share/torrus/xmlconfig/examples/monitors.xml	110	%%DATADIR%%/xmlconfig/examples/monitors.xml
106	share/torrus/xmlconfig/examples/multigraph.xml	111	%%DATADIR%%/xmlconfig/examples/multigraph.xml
107	share/torrus/xmlconfig/examples/rainbow-schema.xml	112	%%DATADIR%%/xmlconfig/examples/rainbow-schema.xml
108	share/torrus/xmlconfig/examples/servers.data	113	%%DATADIR%%/xmlconfig/examples/servers.data
109	share/torrus/xmlconfig/examples/servers.tmpl	114	%%DATADIR%%/xmlconfig/examples/servers.tmpl
110	share/torrus/xmlconfig/generic/collector-periods.xml	115	%%DATADIR%%/xmlconfig/generic/collector-periods.xml
111	share/torrus/xmlconfig/generic/monitors.xml	116	%%DATADIR%%/xmlconfig/generic/monitors.xml
112	share/torrus/xmlconfig/generic/rfc1628.ups.xml	117	%%DATADIR%%/xmlconfig/generic/rfc1628.ups.xml
113	share/torrus/xmlconfig/generic/rfc1697.rdbms.xml	118	%%DATADIR%%/xmlconfig/generic/rfc1697.rdbms.xml
114	share/torrus/xmlconfig/generic/rfc2662.adsl-line.xml	119	%%DATADIR%%/xmlconfig/generic/rfc2662.adsl-line.xml
115	share/torrus/xmlconfig/generic/rfc2670.docsis-if.xml	120	%%DATADIR%%/xmlconfig/generic/rfc2670.docsis-if.xml
116	share/torrus/xmlconfig/generic/rfc2790.host-resources.xml	121	%%DATADIR%%/xmlconfig/generic/rfc2790.host-resources.xml
117	share/torrus/xmlconfig/generic/rfc2863.if-mib.xml	122	%%DATADIR%%/xmlconfig/generic/rfc2863.if-mib.xml
118	share/torrus/xmlconfig/old/cisco-mac-accounting-example.xml	123	%%DATADIR%%/xmlconfig/old/cisco-mac-accounting-example.xml
119	share/torrus/xmlconfig/old/cisco.generic.old-0.1.4.xml	124	%%DATADIR%%/xmlconfig/old/cisco.generic.old-0.1.4.xml
120	share/torrus/xmlconfig/old/cisco.ios.mac-accounting-0.1.8.xml	125	%%DATADIR%%/xmlconfig/old/cisco.ios.mac-accounting-0.1.8.xml
121	share/torrus/xmlconfig/old/rfc1213.xml	126	%%DATADIR%%/xmlconfig/old/rfc1213.xml
122	share/torrus/xmlconfig/old/rfc2670.docsis-if.old.0.1.5d-20040224.xml	127	%%DATADIR%%/xmlconfig/old/rfc2670.docsis-if.old.0.1.5d-20040224.xml
123	share/torrus/xmlconfig/old/rfc2670.docsis-if.old.1.0.4.xml	128	%%DATADIR%%/xmlconfig/old/rfc2670.docsis-if.old.1.0.4.xml
124	share/torrus/xmlconfig/old/rfc2863.if-mib.old-0.1.4.xml	129	%%DATADIR%%/xmlconfig/old/rfc2863.if-mib.old-0.1.4.xml
125	share/torrus/xmlconfig/old/rfc2863.if-mib.old-0.1.7.xml	130	%%DATADIR%%/xmlconfig/old/rfc2863.if-mib.old-0.1.7.xml
126	share/torrus/xmlconfig/old/snmp-defs.old-0.1.2.xml	131	%%DATADIR%%/xmlconfig/old/snmp-defs.old-0.1.2.xml
127	share/torrus/xmlconfig/snmp-defs.xml	132	%%DATADIR%%/xmlconfig/snmp-defs.xml
128	share/torrus/xmlconfig/vendor/alteon.xml	133	%%DATADIR%%/xmlconfig/vendor/alteon.xml
129	share/torrus/xmlconfig/vendor/apc.ups.xml	134	%%DATADIR%%/xmlconfig/vendor/alu-timetra.xml
130	share/torrus/xmlconfig/vendor/apple.ae.xml	135	%%DATADIR%%/xmlconfig/vendor/apc.ups.xml
131	share/torrus/xmlconfig/vendor/arbor_e.xml	136	%%DATADIR%%/xmlconfig/vendor/apple.ae.xml
132	share/torrus/xmlconfig/vendor/ascend.max.xml	137	%%DATADIR%%/xmlconfig/vendor/arbor_e.xml
133	share/torrus/xmlconfig/vendor/atmel.xml	138	%%DATADIR%%/xmlconfig/vendor/ascend.max.xml
134	share/torrus/xmlconfig/vendor/betternetworks.xml	139	%%DATADIR%%/xmlconfig/vendor/atmel.xml
135	share/torrus/xmlconfig/vendor/cisco.firewall.xml	140	%%DATADIR%%/xmlconfig/vendor/betternetworks.xml
136	share/torrus/xmlconfig/vendor/cisco.generic.xml	141	%%DATADIR%%/xmlconfig/vendor/casa-cmts.xml
137	share/torrus/xmlconfig/vendor/cisco.ios.docsis.xml	142	%%DATADIR%%/xmlconfig/vendor/cisco.firewall.xml
138	share/torrus/xmlconfig/vendor/cisco.ios.mac-accounting.xml	143	%%DATADIR%%/xmlconfig/vendor/cisco.generic.xml
139	share/torrus/xmlconfig/vendor/cisco.ios.xml	144	%%DATADIR%%/xmlconfig/vendor/cisco.ios.docsis.xml
140	share/torrus/xmlconfig/vendor/cisco.sce.xml	145	%%DATADIR%%/xmlconfig/vendor/cisco.ios.mac-accounting.xml
141	share/torrus/xmlconfig/vendor/cisco.vdsl-line.xml	146	%%DATADIR%%/xmlconfig/vendor/cisco.ios.xml
142	share/torrus/xmlconfig/vendor/compaq.cim.xml	147	%%DATADIR%%/xmlconfig/vendor/cisco.sce.xml
143	share/torrus/xmlconfig/vendor/empire.systemedge.ntregperf.xml	148	%%DATADIR%%/xmlconfig/vendor/cisco.vdsl-line.xml
144	share/torrus/xmlconfig/vendor/empire.systemedge.xml	149	%%DATADIR%%/xmlconfig/vendor/compaq.cim.xml
145	share/torrus/xmlconfig/vendor/f5.bigip.xml	150	%%DATADIR%%/xmlconfig/vendor/empire.systemedge.ntregperf.xml
146	share/torrus/xmlconfig/vendor/junos.xml	151	%%DATADIR%%/xmlconfig/vendor/empire.systemedge.xml
147	share/torrus/xmlconfig/vendor/hp.hpux.xml	152	%%DATADIR%%/xmlconfig/vendor/f5.bigip.xml
148	share/torrus/xmlconfig/vendor/liebert.xml	153	%%DATADIR%%/xmlconfig/vendor/foundry.xml
149	share/torrus/xmlconfig/vendor/microsoft.windows.xml	154	%%DATADIR%%/xmlconfig/vendor/ftos.xml
150	share/torrus/xmlconfig/vendor/motorola.bsr.xml	155	%%DATADIR%%/xmlconfig/vendor/jacarta.xml
151	share/torrus/xmlconfig/vendor/netapp.filer.xml	156	%%DATADIR%%/xmlconfig/vendor/junos.xml
152	share/torrus/xmlconfig/vendor/netscreen.xml	157	%%DATADIR%%/xmlconfig/vendor/hp.hpux.xml
153	share/torrus/xmlconfig/vendor/paradyne.xdsl.xml	158	%%DATADIR%%/xmlconfig/vendor/liebert.xml
154	share/torrus/xmlconfig/vendor/symmetricom.xml	159	%%DATADIR%%/xmlconfig/vendor/microsoft.windows.xml
155	share/torrus/xmlconfig/vendor/ucd.ucd-snmp.xml	160	%%DATADIR%%/xmlconfig/vendor/motorola.bsr.xml
		161	%%DATADIR%%/xmlconfig/vendor/netapp.filer.xml
		162	%%DATADIR%%/xmlconfig/vendor/netbotz.xml
		163	%%DATADIR%%/xmlconfig/vendor/netscreen.xml
		164	%%DATADIR%%/xmlconfig/vendor/paradyne.xdsl.xml
		165	%%DATADIR%%/xmlconfig/vendor/symmetricom.xml
		166	%%DATADIR%%/xmlconfig/vendor/ucd.ucd-snmp.xml
156	%%SITE_PERL%%/Torrus/ACL.pm	167	%%SITE_PERL%%/Torrus/ACL.pm
157	%%SITE_PERL%%/Torrus/ACL/AuthLocalMD5.pm	168	%%SITE_PERL%%/Torrus/ACL/AuthLocalMD5.pm
158	%%SITE_PERL%%/Torrus/ACL/Edit.pm	169	%%SITE_PERL%%/Torrus/ACL/Edit.pm
Lines 160-165 Link Here
160	%%SITE_PERL%%/Torrus/ACL/Import.pm	171	%%SITE_PERL%%/Torrus/ACL/Import.pm
161	%%SITE_PERL%%/Torrus/Apache2Handler.pm	172	%%SITE_PERL%%/Torrus/Apache2Handler.pm
162	%%SITE_PERL%%/Torrus/ApacheHandler.pm	173	%%SITE_PERL%%/Torrus/ApacheHandler.pm
		174	%%SITE_PERL%%/Torrus/CGI.pm
163	%%SITE_PERL%%/Torrus/Collector.pm	175	%%SITE_PERL%%/Torrus/Collector.pm
164	%%SITE_PERL%%/Torrus/Collector/CDef.pm	176	%%SITE_PERL%%/Torrus/Collector/CDef.pm
165	%%SITE_PERL%%/Torrus/Collector/CDef_Params.pm	177	%%SITE_PERL%%/Torrus/Collector/CDef_Params.pm
Lines 176-189 Link Here
176	%%SITE_PERL%%/Torrus/DB.pm	188	%%SITE_PERL%%/Torrus/DB.pm
177	%%SITE_PERL%%/Torrus/DataAccess.pm	189	%%SITE_PERL%%/Torrus/DataAccess.pm
178	%%SITE_PERL%%/Torrus/DevDiscover.pm	190	%%SITE_PERL%%/Torrus/DevDiscover.pm
		191	%%SITE_PERL%%/Torrus/DevDiscover/ALU_Timetra.pm
179	%%SITE_PERL%%/Torrus/DevDiscover/ATMEL.pm	192	%%SITE_PERL%%/Torrus/DevDiscover/ATMEL.pm
180	%%SITE_PERL%%/Torrus/DevDiscover/AlliedTelesyn_PBC18.pm	193	%%SITE_PERL%%/Torrus/DevDiscover/AlliedTelesyn_PBC18.pm
181	%%SITE_PERL%%/Torrus/DevDiscover/Alteon.pm	194	%%SITE_PERL%%/Torrus/DevDiscover/Alteon.pm
182	%%SITE_PERL%%/Torrus/DevDiscover/Apple_AE.pm	195	%%SITE_PERL%%/Torrus/DevDiscover/Apple_AE.pm
183	%%SITE_PERL%%/Torrus/DevDiscover/Arbor_E.pm	196	%%SITE_PERL%%/Torrus/DevDiscover/Arbor_E.pm
		197	%%SITE_PERL%%/Torrus/DevDiscover/Arista.pm
184	%%SITE_PERL%%/Torrus/DevDiscover/AscendMax.pm	198	%%SITE_PERL%%/Torrus/DevDiscover/AscendMax.pm
185	%%SITE_PERL%%/Torrus/DevDiscover/AxxessIT.pm	199	%%SITE_PERL%%/Torrus/DevDiscover/AxxessIT.pm
186	%%SITE_PERL%%/Torrus/DevDiscover/BetterNetworks.pm	200	%%SITE_PERL%%/Torrus/DevDiscover/BetterNetworks.pm
		201	%%SITE_PERL%%/Torrus/DevDiscover/CasaCMTS.pm
187	%%SITE_PERL%%/Torrus/DevDiscover/CiscoCatOS.pm	202	%%SITE_PERL%%/Torrus/DevDiscover/CiscoCatOS.pm
188	%%SITE_PERL%%/Torrus/DevDiscover/CiscoFirewall.pm	203	%%SITE_PERL%%/Torrus/DevDiscover/CiscoFirewall.pm
189	%%SITE_PERL%%/Torrus/DevDiscover/CiscoGeneric.pm	204	%%SITE_PERL%%/Torrus/DevDiscover/CiscoGeneric.pm
Lines 196-206 Link Here
196	%%SITE_PERL%%/Torrus/DevDiscover/CompaqCIM.pm	211	%%SITE_PERL%%/Torrus/DevDiscover/CompaqCIM.pm
197	%%SITE_PERL%%/Torrus/DevDiscover/EmpireSystemedge.pm	212	%%SITE_PERL%%/Torrus/DevDiscover/EmpireSystemedge.pm
198	%%SITE_PERL%%/Torrus/DevDiscover/F5BigIp.pm	213	%%SITE_PERL%%/Torrus/DevDiscover/F5BigIp.pm
		214	%%SITE_PERL%%/Torrus/DevDiscover/Foundry.pm
		215	%%SITE_PERL%%/Torrus/DevDiscover/FTOS.pm
		216	%%SITE_PERL%%/Torrus/DevDiscover/Jacarta.pm
199	%%SITE_PERL%%/Torrus/DevDiscover/JunOS.pm	217	%%SITE_PERL%%/Torrus/DevDiscover/JunOS.pm
200	%%SITE_PERL%%/Torrus/DevDiscover/Liebert.pm	218	%%SITE_PERL%%/Torrus/DevDiscover/Liebert.pm
201	%%SITE_PERL%%/Torrus/DevDiscover/MicrosoftWindows.pm	219	%%SITE_PERL%%/Torrus/DevDiscover/MicrosoftWindows.pm
202	%%SITE_PERL%%/Torrus/DevDiscover/MotorolaBSR.pm	220	%%SITE_PERL%%/Torrus/DevDiscover/MotorolaBSR.pm
203	%%SITE_PERL%%/Torrus/DevDiscover/NetApp.pm	221	%%SITE_PERL%%/Torrus/DevDiscover/NetApp.pm
		222	%%SITE_PERL%%/Torrus/DevDiscover/NetBotz.pm
204	%%SITE_PERL%%/Torrus/DevDiscover/NetScreen.pm	223	%%SITE_PERL%%/Torrus/DevDiscover/NetScreen.pm
205	%%SITE_PERL%%/Torrus/DevDiscover/OracleDatabase.pm	224	%%SITE_PERL%%/Torrus/DevDiscover/OracleDatabase.pm
206	%%SITE_PERL%%/Torrus/DevDiscover/Paradyne.pm	225	%%SITE_PERL%%/Torrus/DevDiscover/Paradyne.pm
Lines 233-280 Link Here
233	%%SITE_PERL%%/Torrus/Scheduler.pm	252	%%SITE_PERL%%/Torrus/Scheduler.pm
234	%%SITE_PERL%%/Torrus/SchedulerInfo.pm	253	%%SITE_PERL%%/Torrus/SchedulerInfo.pm
235	%%SITE_PERL%%/Torrus/SiteConfig.pm	254	%%SITE_PERL%%/Torrus/SiteConfig.pm
		255	%%SITE_PERL%%/Torrus/SNMP_Failures.pm
236	%%SITE_PERL%%/Torrus/SQL/Reports.pm	256	%%SITE_PERL%%/Torrus/SQL/Reports.pm
237	%%SITE_PERL%%/Torrus/SQL/SrvExport.pm	257	%%SITE_PERL%%/Torrus/SQL/SrvExport.pm
238	%%SITE_PERL%%/Torrus/SQL.pm	258	%%SITE_PERL%%/Torrus/SQL.pm
239	%%SITE_PERL%%/Torrus/TimeStamp.pm	259	%%SITE_PERL%%/Torrus/TimeStamp.pm
240	@exec mkdir %D/var/torrus 2>/dev/null \|\| true	260	@exec install -d -g %%TORRUS_USER%% -o %%TORRUS_USER%% -m 755 /var/torrus 2>/dev/null \|\| true
241	@exec mkdir %D/var/torrus/cache 2>/dev/null \|\| true	261	@exec install -d -g %%TORRUS_USER%% -o %%TORRUS_USER%% -m 2775 /var/torrus/cache 2>/dev/null \|\| true
242	@exec mkdir %D/var/torrus/db 2>/dev/null \|\| true	262	@exec install -d -g %%TORRUS_USER%% -o %%TORRUS_USER%% -m 2775 /var/torrus/collector_rrd 2>/dev/null \|\| true
243	@exec mkdir %D/var/torrus/reports 2>/dev/null \|\| true	263	@exec install -d -g %%TORRUS_USER%% -o %%TORRUS_USER%% -m 2775 /var/torrus/db 2>/dev/null \|\| true
244	@exec mkdir %D/var/torrus/session_data 2>/dev/null \|\| true	264	@exec install -d -g %%TORRUS_USER%% -o %%TORRUS_USER%% -m 755 /var/torrus/reports 2>/dev/null \|\| true
245	@exec mkdir %D/var/torrus/session_data/lock 2>/dev/null \|\| true	265	@exec install -d -g %%TORRUS_USER%% -o %%TORRUS_USER%% -m 755 /var/torrus/session_data 2>/dev/null \|\| true
246	@exec mkdir %D/var/torrus/session_data/store 2>/dev/null \|\| true	266	@exec install -d -g %%TORRUS_USER%% -o %%TORRUS_USER%% -m 2775 /var/torrus/session_data/lock 2>/dev/null \|\| true
		267	@exec install -d -g %%TORRUS_USER%% -o %%TORRUS_USER%% -m 2775 /var/torrus/session_data/store 2>/dev/null \|\| true
247	@exec mkdir %D/etc/torrus/templates 2>/dev/null \|\| true	268	@exec mkdir %D/etc/torrus/templates 2>/dev/null \|\| true
248	@exec mkdir %D/share/torrus/plugins 2>/dev/null \|\| true	269	@exec mkdir %D/%%DATADIR%%/plugins 2>/dev/null \|\| true
249	@exec mkdir %D/share/torrus/plugins/devdiscover-config 2>/dev/null \|\| true	270	@exec mkdir %D/%%DATADIR%%/plugins/devdiscover-config 2>/dev/null \|\| true
250	@exec mkdir %D/share/torrus/plugins/torrus-config 2>/dev/null \|\| true	271	@exec mkdir %D/%%DATADIR%%/plugins/torrus-config 2>/dev/null \|\| true
251	@exec mkdir %D/share/torrus/plugins/wrapper 2>/dev/null \|\| true	272	@exec mkdir %D/%%DATADIR%%/plugins/wrapper 2>/dev/null \|\| true
252	@exec mkdir %D/share/torrus/sup/webscripts 2>/dev/null \|\| true	273	@exec mkdir %D/%%DATADIR%%/sup/webscripts 2>/dev/null \|\| true
253	@dirrm var/torrus/session_data/store	274	@dirrm %%DATADIR%%/xmlconfig/vendor
254	@dirrm var/torrus/session_data/lock	275	@dirrm %%DATADIR%%/xmlconfig/old
255	@dirrm var/torrus/session_data	276	@dirrm %%DATADIR%%/xmlconfig/generic
256	@dirrm var/torrus/reports	277	@dirrm %%DATADIR%%/xmlconfig/examples
257	@dirrmtry var/torrus/db	278	@dirrm %%DATADIR%%/xmlconfig
258	@dirrm var/torrus/cache	279	@dirrm %%DATADIR%%/templates
259	@dirrmtry var/torrus	280	@dirrm %%DATADIR%%/sup/webscripts
260	@dirrm share/torrus/xmlconfig/vendor	281	@dirrm %%DATADIR%%/sup/webplain
261	@dirrm share/torrus/xmlconfig/old	282	@dirrm %%DATADIR%%/sup/styling
262	@dirrm share/torrus/xmlconfig/generic	283	@dirrm %%DATADIR%%/sup/mibs
263	@dirrm share/torrus/xmlconfig/examples	284	@dirrm %%DATADIR%%/sup/dtd
264	@dirrm share/torrus/xmlconfig	285	@dirrm %%DATADIR%%/sup
265	@dirrm share/torrus/templates	286	@dirrm %%DATADIR%%/plugins/wrapper
266	@dirrm share/torrus/sup/webscripts	287	@dirrm %%DATADIR%%/plugins/torrus-config
267	@dirrm share/torrus/sup/webplain	288	@dirrm %%DATADIR%%/plugins/devdiscover-config
268	@dirrm share/torrus/sup/styling	289	@dirrm %%DATADIR%%/plugins
269	@dirrm share/torrus/sup/mibs	290	@dirrm %%DATADIR%%/conf_defaults
270	@dirrm share/torrus/sup/dtd	291	@dirrm %%DATADIR%%
271	@dirrm share/torrus/sup
272	@dirrm share/torrus/plugins/wrapper
273	@dirrm share/torrus/plugins/torrus-config
274	@dirrm share/torrus/plugins/devdiscover-config
275	@dirrm share/torrus/plugins
276	@dirrm share/torrus/conf_defaults
277	@dirrm share/torrus
278	@dirrm %%EXAMPLESDIR%%	292	@dirrm %%EXAMPLESDIR%%
279	@dirrm %%DOCSDIR%%/devdoc	293	@dirrm %%DOCSDIR%%/devdoc
280	@dirrm %%DOCSDIR%%	294	@dirrm %%DOCSDIR%%