Update to argus 3.6

* Version 3.6 [2008 Oct 27]
  SNMP interface auto-discovery (oid: ifInOctets[POS1/0])
  better handling of solaris low descriptor limit
  faster startup
  correctly count aliases
  new severity features
  new data directory structure
  show test results on webpage
  overview webpage
  friendlier notification messages
  compute service
  bugfixes
    => some config file changes may be needed

* Version 3.5 [2007 June 14]
  SNMPv2c
  SNMP get-bulk
  UDP bug fixes
  faster startup/shutdown
  faster graphs
  faster with large configs
  Resolv in displayed config
  checknow button
  notification %O fix
  notification conditional text
  DARP (Failover and Redundancy)
  acl simplification
  detect GD at runtime
  can specify units for time duration parameters
  web page changes
  data archiving interface
  various config parameter inheritance changes
    => some config file changes may be needed

3 files changed, 82 insertions, 30 deletions

diff --git a/net/argus/Makefile b/net/argus/Makefile
index 67ad6ccb9d8..459eeade798 100644
--- a/net/argus/Makefile
+++ b/net/argus/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2009/02/10 17:47:59 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2009/07/25 11:44:49 markd Exp $
 
-DISTNAME=	argus-3.4
-PKGREVISION=	1
+DISTNAME=	argus-3.6
 CATEGORIES=	net
 MASTER_SITES=	http://www.tcp4me.com/code/argus-archive/
 EXTRACT_SUFX=	.tgz
@@ -9,9 +8,12 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	argus@tcp4me.com
 HOMEPAGE=	http://argus.tcp4me.com/
 COMMENT=	System and Network Monitoring Application
+LICENSE=	artistic
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+BUILD_DEFS+=	VARBASE
+
 DEPENDS+=	fping>=2.4b2:../../net/fping
 DEPENDS+=	p5-GD>=2.11:../../graphics/p5-GD
 DEPENDS+=	p5-Net-SSLeay-[0-9]*:../../security/p5-Net-SSLeay
@@ -25,7 +27,8 @@ CONFIGURE_SCRIPT=	${WRKSRC}/Configure
 CONFIGURE_ARGS+=	--bin_dir ${PREFIX}/bin
 CONFIGURE_ARGS+=	--sbin_dir ${PREFIX}/sbin
 CONFIGURE_ARGS+=	--lib_dir ${PREFIX}/lib/argus
-CONFIGURE_ARGS+=	--data_dir ${PREFIX}/etc/argus
+CONFIGURE_ARGS+=	--cgi_dir ${PREFIX}/libexec/cgi-bin
+CONFIGURE_ARGS+=	--data_dir ${VARBASE}/argus
 CONFIGURE_ENV+=		PERL=${TOOLS_PERL5:Q}
 
 REPLACE_PERL+=		${WRKSRC}/built/argus-config
@@ -34,8 +37,28 @@ RCD_SCRIPTS=		argusd
 
 INSTALL_MAKE_FLAGS+= 	INSTALL_BIN=${DESTDIR}${PREFIX}/bin \
 			INSTALL_SBIN=${DESTDIR}${PREFIX}/sbin \
+			INSTALL_CGI=${DESTDIR}${PREFIX}/libexec/cgi-bin \
 			INSTALL_LIB=${DESTDIR}${PREFIX}/lib/argus \
-			INSTALL_DATA=${DESTDIR}${PREFIX}/etc/argus
+			INSTALL_DATA=${DESTDIR}${PREFIX}/share/examples/argus
+
+OWN_DIRS_PERMS=		${VARBASE}/argus ${ROOT_USER} ${ROOT_GROUP} 0777
+OWN_DIRS_PERMS+=	${VARBASE}/argus/perl ${ROOT_USER} ${ROOT_GROUP} 0777
+OWN_DIRS_PERMS+=	${VARBASE}/argus/gcache ${ROOT_USER} ${ROOT_GROUP} 0777
+OWN_DIRS_PERMS+=	${VARBASE}/argus/gdata ${ROOT_USER} ${ROOT_GROUP} 0777
+OWN_DIRS=		${VARBASE}/argus/stats
+OWN_DIRS+=		${VARBASE}/argus/notify
+OWN_DIRS+=		${VARBASE}/argus/locale
+OWN_DIRS+=		${VARBASE}/argus/html
+CONF_FILES=		${PREFIX}/share/examples/argus/config.example ${VARBASE}/argus/config
+CONF_FILES+=		${PREFIX}/share/examples/argus/users.example ${VARBASE}/argus/users
+CONF_FILES+=		${PREFIX}/share/examples/argus/log ${VARBASE}/argus/log
+CONF_FILES+=		${PREFIX}/share/examples/argus/notno ${VARBASE}/argus/notno
+.for f in de_DE el_gr fr_fr lt_LT nl_NL piglatin ru_RU sp_ar template
+CONF_FILES+=		${PREFIX}/share/examples/argus/locale/${f} ${VARBASE}/argus/locale/${f}
+.endfor
+
+post-install:
+	(cd ${DESTDIR}${PREFIX}/share/examples/argus; chmod 755 . perl gcache gdata)
 
 .include "options.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/argus/PLIST b/net/argus/PLIST
index 6b1a3d13174..bdb4d43821d 100644
--- a/net/argus/PLIST
+++ b/net/argus/PLIST
@@ -1,28 +1,28 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:09:21 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/07/25 11:44:49 markd Exp $
 bin/argus-config
-etc/argus/config.example
-etc/argus/locale/de_DE
-etc/argus/locale/el_gr
-etc/argus/locale/eubonics
-etc/argus/locale/piglatin
-etc/argus/locale/sp_ar
-etc/argus/locale/template
-etc/argus/log
-etc/argus/notno
-etc/argus/users.example
 lib/argus/Alias.pm
 lib/argus/Argus/Agent.pm
+lib/argus/Argus/Archive.pm
+lib/argus/Argus/Archivist.pm
 lib/argus/Argus/Asterisk.pm
-lib/argus/Argus/BER.pm
+lib/argus/Argus/Compute.pm
 lib/argus/Argus/Ctl.pm
 lib/argus/Argus/Encode.pm
+lib/argus/Argus/Graph/Data.pm
+lib/argus/Argus/HashDir.pm
 lib/argus/Argus/IP.pm
+lib/argus/Argus/MonEl/Expand.pm
+lib/argus/Argus/MonEl/Noise.pm
+lib/argus/Argus/MonEl/Trans.pm
 lib/argus/Argus/RPC.pm
 lib/argus/Argus/RPC/TCP.pm
 lib/argus/Argus/RPC/UDP.pm
 lib/argus/Argus/SIP.pm
 lib/argus/Argus/SIP/TCP.pm
 lib/argus/Argus/SIP/UDP.pm
+lib/argus/Argus/SNMP.pm
+lib/argus/Argus/SNMP/Helper.pm
+lib/argus/Argus/Web/Overview.pm
 lib/argus/Artistic
 lib/argus/BaseIO.pm
 lib/argus/Chart/Strip.pm
@@ -31,14 +31,22 @@ lib/argus/Conf.pm
 lib/argus/Configable.pm
 lib/argus/Control.pm
 lib/argus/Cron.pm
+lib/argus/DARP.pm
+lib/argus/DARP/Conf.pm
+lib/argus/DARP/Master.pm
+lib/argus/DARP/Misc.pm
+lib/argus/DARP/Service.pm
+lib/argus/DARP/Slave.pm
+lib/argus/DARP/Watch.pm
 lib/argus/DNS.pm
 lib/argus/DNS/TCP.pm
 lib/argus/DNS/UDP.pm
 lib/argus/DataBase.pm
 lib/argus/Doc.pm
+lib/argus/Encoding/BER.pm
+lib/argus/Encoding/BER/SNMP.pm
 lib/argus/Error.pm
 lib/argus/Graph.pm
-lib/argus/GraphData.pm
 lib/argus/Group.pm
 lib/argus/LICENSE
 lib/argus/LOCATION
@@ -52,7 +60,6 @@ lib/argus/Ping.pm
 lib/argus/Prog.pm
 lib/argus/README
 lib/argus/Resolv.pm
-lib/argus/SNMP.pm
 lib/argus/SSL.pm
 lib/argus/Self.pm
 lib/argus/Server.pm
@@ -68,17 +75,39 @@ lib/argus/graphd
 lib/argus/localization.pl
 lib/argus/misc.pl
 lib/argus/picasso
+lib/argus/web_about.pl
 lib/argus/web_acl.pl
 lib/argus/web_auth_file.pl
+lib/argus/web_graph.pl
+lib/argus/web_login.pl
 lib/argus/web_misc.pl
+lib/argus/web_notify.pl
+lib/argus/web_override.pl
+lib/argus/web_page.pl
+lib/argus/web_utils.pl
+lib/argus/web_web20.pl
+libexec/cgi-bin/arguscgi
+libexec/cgi-bin/argusvxml
 sbin/argus-agent
-sbin/arguscgi
 sbin/argusctl
 sbin/argusd
+share/examples/argus/config.example
+share/examples/argus/locale/de_DE
+share/examples/argus/locale/el_gr
+share/examples/argus/locale/fr_fr
+share/examples/argus/locale/lt_LT
+share/examples/argus/locale/nl_NL
+share/examples/argus/locale/piglatin
+share/examples/argus/locale/ru_RU
+share/examples/argus/locale/sp_ar
+share/examples/argus/locale/template
+share/examples/argus/log
+share/examples/argus/notno
+share/examples/argus/users.example
 share/examples/rc.d/argusd
-@exec ${MKDIR} %D/etc/argus/stats
-@exec ${MKDIR} %D/etc/argus/perl
-@exec ${MKDIR} %D/etc/argus/notify
-@exec ${MKDIR} %D/etc/argus/html
-@exec ${MKDIR} %D/etc/argus/gdata
-@exec ${MKDIR} %D/etc/argus/gcache
+@pkgdir share/examples/argus/stats
+@pkgdir share/examples/argus/perl
+@pkgdir share/examples/argus/notify
+@pkgdir share/examples/argus/html
+@pkgdir share/examples/argus/gdata
+@pkgdir share/examples/argus/gcache
diff --git a/net/argus/distinfo b/net/argus/distinfo
index 68fa3a8c0c7..dac772fb609 100644
--- a/net/argus/distinfo
+++ b/net/argus/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2007/03/18 18:59:17 adam Exp $
+$NetBSD: distinfo,v 1.6 2009/07/25 11:44:49 markd Exp $
 
-SHA1 (argus-3.4.tgz) = e7be66d511f8d31e367ec31e454a367c3ed106ef
-RMD160 (argus-3.4.tgz) = be206840f1ceaf516a75caab4bdd80df75ed019e
-Size (argus-3.4.tgz) = 297042 bytes
+SHA1 (argus-3.6.tgz) = 132b0ee35a0c4523a65c93673ba838ce8dbe9e09
+RMD160 (argus-3.6.tgz) = a53283ef6162c94864438d90d79de43916032b0f
+Size (argus-3.6.tgz) = 380302 bytes
 SHA1 (patch-aa) = 85725be47608b8f7a7f675c50e90b763fb6cfbe9