Changes 3.4:

* perl 5.00503 fix
* added TCP/DNS
* added TCP/Rwhois
* added TCP/SIP, UDP/SIP, UDP/IAX2, TCP/Asterisk
* added TCP/RPC, UDP/RPC
* added asynchronous resolver
* radius fix
* code reorganization
* configurable ip options: TTL, TOS, LSRR, SSRR
* support for web_auth_none
* scheduler adjustment
* http redirect loop detection fix
* argusctl checknow added
* notification %O fix
* database testing enhancements
* added remote monitoring agent
* faster SSL failure detection
* enhanced performance

4 files changed, 36 insertions, 21 deletions

diff --git a/net/argus/Makefile b/net/argus/Makefile
index c1844b6ba65..0504cd827df 100644
--- a/net/argus/Makefile
+++ b/net/argus/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2007/02/22 19:26:52 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.11 2007/03/18 18:45:14 adam Exp $
 
-DISTNAME=	argus-3.3
-PKGREVISION=	3
+DISTNAME=	argus-3.4
 CATEGORIES=	net
 MASTER_SITES=	http://www.tcp4me.com/code/argus-archive/
 EXTRACT_SUFX=	.tgz
@@ -21,10 +19,9 @@ DEPENDS+=	p5-DBI-[0-9]*:../../databases/p5-DBI
 USE_TOOLS+=		perl:run
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	${WRKSRC}/Configure
-
-CONFIGURE_ARGS+=	--bin_dir  ${PREFIX}/bin
+CONFIGURE_ARGS+=	--bin_dir ${PREFIX}/bin
 CONFIGURE_ARGS+=	--sbin_dir ${PREFIX}/sbin
-CONFIGURE_ARGS+=	--lib_dir  ${PREFIX}/lib/argus
+CONFIGURE_ARGS+=	--lib_dir ${PREFIX}/lib/argus
 CONFIGURE_ARGS+=	--data_dir ${VARBASE}/argus
 CONFIGURE_ENV+=		PERL=${TOOLS_PERL5:Q}
 
diff --git a/net/argus/PLIST b/net/argus/PLIST
index cd3485ec10a..6392d411911 100644
--- a/net/argus/PLIST
+++ b/net/argus/PLIST
@@ -1,24 +1,35 @@
-@comment $NetBSD: PLIST,v 1.2 2005/05/02 20:34:01 reed Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/03/18 18:45:14 adam Exp $
 bin/argus-config
 lib/argus/Alias.pm
-lib/argus/ArgusCtl.pm
-lib/argus/ArgusEncode.pm
+lib/argus/Argus/Agent.pm
+lib/argus/Argus/Asterisk.pm
+lib/argus/Argus/BER.pm
+lib/argus/Argus/Ctl.pm
+lib/argus/Argus/Encode.pm
+lib/argus/Argus/IP.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/Artistic
-lib/argus/BER.pm
 lib/argus/BaseIO.pm
+lib/argus/Chart/Strip.pm
 lib/argus/Commands.pm
 lib/argus/Conf.pm
 lib/argus/Configable.pm
 lib/argus/Control.pm
 lib/argus/Cron.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/Error.pm
 lib/argus/Graph.pm
 lib/argus/GraphData.pm
 lib/argus/Group.pm
-lib/argus/Image.pm
 lib/argus/LICENSE
 lib/argus/LOCATION
 lib/argus/MonEl.pm
@@ -30,6 +41,7 @@ lib/argus/Override.pm
 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
@@ -49,8 +61,14 @@ lib/argus/picasso
 lib/argus/web_acl.pl
 lib/argus/web_auth_file.pl
 lib/argus/web_misc.pl
+sbin/argus-agent
 sbin/arguscgi
 sbin/argusctl
 sbin/argusd
 share/examples/rc.d/argusd
+@dirrm lib/argus/DNS
+@dirrm lib/argus/Chart
+@dirrm lib/argus/Argus/SIP
+@dirrm lib/argus/Argus/RPC
+@dirrm lib/argus/Argus
 @dirrm lib/argus
diff --git a/net/argus/distinfo b/net/argus/distinfo
index f40096ef30a..92656ecb857 100644
--- a/net/argus/distinfo
+++ b/net/argus/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 12:13:42 agc Exp $
+$NetBSD: distinfo,v 1.4 2007/03/18 18:45:14 adam Exp $
 
-SHA1 (argus-3.3.tgz) = dea646de0e14aa16967f5e7949ae88adc185616e
-RMD160 (argus-3.3.tgz) = 5235f6e567911fafbb94e1a3a55707b94bba1d0e
-Size (argus-3.3.tgz) = 268048 bytes
-SHA1 (patch-aa) = 961ee5b87d2c4158fd9cd146a19b2470bc93bef6
+SHA1 (argus-3.4.tgz) = e7be66d511f8d31e367ec31e454a367c3ed106ef
+RMD160 (argus-3.4.tgz) = be206840f1ceaf516a75caab4bdd80df75ed019e
+Size (argus-3.4.tgz) = 297042 bytes
+SHA1 (patch-aa) = 959360dc85be92216f5222dcfc42e53466d22b34
diff --git a/net/argus/patches/patch-aa b/net/argus/patches/patch-aa
index bc8b2894152..0f1f715520a 100644
--- a/net/argus/patches/patch-aa
+++ b/net/argus/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.1 2005/01/11 13:11:12 markd Exp $
+$NetBSD: patch-aa,v 1.2 2007/03/18 18:45:15 adam Exp $
 
---- Configure.orig	2004-03-23 04:58:18.000000000 +1200
+--- Configure.orig	2005-04-30 18:05:03.000000000 +0200
 +++ Configure
-@@ -155,7 +155,7 @@ perlmodule(){
+@@ -158,7 +158,7 @@ perlmodule(){
  }
  
  
--path_perl=`findit perl`
+-path_perl=`findit $PERL`
 +path_perl=$PERL
  path_sendmail=`findit sendmail`
  path_qpage=`findit qpage`