6 files changed, 38 insertions, 35 deletions

diff --git a/net-mgmt/nav/Makefile b/net-mgmt/nav/Makefile
index 49450783e7c0..28e49bf7dd39 100644
--- a/net-mgmt/nav/Makefile
+++ b/net-mgmt/nav/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nav
-PORTVERSION=	3.0.b8
+PORTVERSION=	3.0.b10
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://metanav.ntnu.no/downloads/v3/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/_beta/}
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant \
 		ginstall:${PORTSDIR}/sysutils/coreutils \
 		gfind:${PORTSDIR}/misc/findutils
 EXTRACT_DEPENDS+=	ginstall:${PORTSDIR}/sysutils/coreutils \
-			${LOCALBASE}/share/java/classes/snmp.jar:${PORTSDIR}/java/westhawksnmp
+			${LOCALBASE}/share/java/classes/snmp.jar:${PORTSDIR}/java/drexelsnmp
 .if exists(${LOCALBASE}/jakarta-tomcat4.1)
 TOMCAT_DEPEND=	${LOCALBASE}/jakarta-tomcat4.1:${PORTSDIR}/www/jakarta-tomcat41
 CATALINA_HOME=	${LOCALBASE}/jakarta-tomcat4.1
diff --git a/net-mgmt/nav/distinfo b/net-mgmt/nav/distinfo
index a4c6c56b42d7..566489de0f01 100644
--- a/net-mgmt/nav/distinfo
+++ b/net-mgmt/nav/distinfo
@@ -1,2 +1,2 @@
-MD5 (nav-3.0_beta8.tar.gz) = af9c3982dba86bf71e7fb5f5e2e83df3
-SIZE (nav-3.0_beta8.tar.gz) = 4278241
+MD5 (nav-3.0_beta10.tar.gz) = 093d9c0546749076d99943d75819cc3e
+SIZE (nav-3.0_beta10.tar.gz) = 4298892
diff --git a/net-mgmt/nav/files/patch-subsystem-alertEngine-alertdaemon.pl b/net-mgmt/nav/files/patch-subsystem-alertEngine-alertdaemon.pl
index 59e24d2a3b50..679515452802 100644
--- a/net-mgmt/nav/files/patch-subsystem-alertEngine-alertdaemon.pl
+++ b/net-mgmt/nav/files/patch-subsystem-alertEngine-alertdaemon.pl
@@ -1,9 +1,9 @@
---- subsystem/alertEngine/alertdaemon.pl.orig	Wed Apr 28 15:03:41 2004
-+++ subsystem/alertEngine/alertdaemon.pl	Thu Nov 11 12:13:15 2004
+--- subsystem/alertEngine/alertdaemon.pl.orig	Tue Feb 15 14:05:23 2005
++++ subsystem/alertEngine/alertdaemon.pl	Tue Feb 15 14:07:58 2005
 @@ -37,9 +37,16 @@
  use IO::Handle;
  
- use Engine;
+ use NAV::AlertEngine::Engine;
 +use vars qw ($pscmd);
  
  #BEGIN {require "alertengine.cfg";}
@@ -17,16 +17,15 @@
  ####################################################
  ## Engine 
  ####################################################
-@@ -65,7 +72,7 @@
- 		die "Cannot open pidfile";
+@@ -66,6 +73,7 @@
  	    my ($pid, $tid) = split / /, <pid_file>;
  	    close(pid_file);
--	    open ps_file, "ps -e | grep $pid | wc -l|";
+ 	    open ps_file, "ps -e | grep $pid | wc -l|";
 +	    open ps_file, "$pscmd | grep $pid | wc -l|";
  	    my $count=<ps_file>;
  	    close(ps_file);
  	    if($count==0) {
-@@ -144,7 +151,7 @@
+@@ -144,7 +152,7 @@
  			die "Cannot open pidfile";
  		my ($pid, $tid) = split / /, <pid_file>;
  		close(pid_file);
@@ -35,7 +34,7 @@
  		my $count=<ps_file>;
  		close(ps_file);
  		if($count==0) {
-@@ -179,7 +186,7 @@
+@@ -179,7 +187,7 @@
  	    die "Cannot open pidfile";
  	my ($pid, $tid) = split / /, <pid_file>;
  	close(pid_file);
diff --git a/net-mgmt/nav/files/patch-subsystem-alertEngine-alertengine.in b/net-mgmt/nav/files/patch-subsystem-alertEngine-alertengine.in
deleted file mode 100644
index 2e04bc1889e1..000000000000
--- a/net-mgmt/nav/files/patch-subsystem-alertEngine-alertengine.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- subsystem/alertEngine/alertengine.in.orig	Fri Nov  5 00:36:53 2004
-+++ subsystem/alertEngine/alertengine.in	Fri Nov  5 00:37:07 2004
-@@ -27,7 +27,7 @@
- case "$1" in
- 	start)
- 		# Start daemons.
--		rc= su -c "${bindir}/alertdaemon.pl start" ${user}
-+		rc= su ${user} -c "${bindir}/alertdaemon.pl start"
- 		echo
- 		exit $rc;
- 		;;
diff --git a/net-mgmt/nav/pkg-plist b/net-mgmt/nav/pkg-plist
index 0e24b9aaf0c8..fbbdcb37cee0 100644
--- a/net-mgmt/nav/pkg-plist
+++ b/net-mgmt/nav/pkg-plist
@@ -231,7 +231,7 @@ nav/apache/webroot/report/DatabaseResult.py
 nav/apache/webroot/report/Generator.py
 nav/apache/webroot/report/Matrix.py
 nav/apache/webroot/report/Report.py
-nav/apache/webroot/report/report.py
+nav/apache/webroot/report/reporthandler.py
 nav/apache/webroot/status/.htaccess
 nav/apache/webroot/status/StatusDefaultPrefs.py
 nav/apache/webroot/status/StatusPrefs.py
@@ -290,6 +290,7 @@ nav/bin/safe_smsd.pl
 nav/bin/servicemon.py
 nav/bin/smsd.pl
 nav/bin/thresholdMon.py
+nav/bin/vprrd.py
 nav/doc/cricket/README
 nav/doc/cricket/cricket-config/.nav
 nav/doc/cricket/cricket-config/Defaults
@@ -301,6 +302,8 @@ nav/doc/cricket/cricket-config/router-interfaces/.nav
 nav/doc/cricket/cricket-config/router-interfaces/Defaults
 nav/doc/cricket/cricket-config/routers/.nav
 nav/doc/cricket/cricket-config/routers/Defaults
+nav/doc/cricket/cricket-config/servers/.nav
+nav/doc/cricket/cricket-config/servers/Defaults
 nav/doc/cricket/cricket-config/switch-ports/.nav
 nav/doc/cricket/cricket-config/switch-ports/Defaults
 nav/doc/cricket/cricket-config/switches/.nav
@@ -315,6 +318,7 @@ nav/doc/sql/manage.sql
 nav/doc/sql/navprofiles.sql
 nav/doc/sql/snmpoid.sql
 nav/doc/sql/upgrades/3.0_beta7.sql
+nav/doc/sql/upgrades/3.0_beta8.sql
 nav/doc/sql/upgrades/README
 nav/etc/alertengine.cfg
 nav/etc/alertmsg.conf
@@ -380,6 +384,7 @@ nav/lib/java/eventEngine/handler-plugins/ThresholdState.jar
 nav/lib/java/getBoksMacs/getBoksMacs.jar
 nav/lib/java/getDeviceData/data-plugins/Device.jar
 nav/lib/java/getDeviceData/data-plugins/Gwport.jar
+nav/lib/java/getDeviceData/data-plugins/Mem.jar
 nav/lib/java/getDeviceData/data-plugins/Module.jar
 nav/lib/java/getDeviceData/data-plugins/ModuleMon.jar
 nav/lib/java/getDeviceData/data-plugins/Netbox.jar
@@ -393,6 +398,7 @@ nav/lib/java/getDeviceData/device-plugins/CiscoSwCL3addon.jar
 nav/lib/java/getDeviceData/device-plugins/CiscoSwIOS.jar
 nav/lib/java/getDeviceData/device-plugins/CiscoSwIOSaddon.jar
 nav/lib/java/getDeviceData/device-plugins/CiscoSwMenu.jar
+nav/lib/java/getDeviceData/device-plugins/DeviceMem.jar
 nav/lib/java/getDeviceData/device-plugins/DNSCheck.jar
 nav/lib/java/getDeviceData/device-plugins/HP.jar
 nav/lib/java/getDeviceData/device-plugins/MibIISw.jar
@@ -401,18 +407,18 @@ nav/lib/java/getDeviceData/device-plugins/StaticRoutes.jar
 nav/lib/java/getDeviceData/device-plugins/Typeoid.jar
 nav/lib/java/getDeviceData/getDeviceData.jar
 nav/lib/java/networkDiscovery/networkDiscovery.jar
-nav/lib/perl/Alert.pm
-nav/lib/perl/AlertsBase.pm
-nav/lib/perl/Engine.pm
-nav/lib/perl/EquipmentGroups.pm
-nav/lib/perl/IP.pm
-nav/lib/perl/Log.pm
-nav/lib/perl/NAV.pm
+nav/lib/perl/NAV/AlertEngine/Alert.pm
+nav/lib/perl/NAV/AlertEngine/AlertsBase.pm
+nav/lib/perl/NAV/AlertEngine/Engine.pm
+nav/lib/perl/NAV/AlertEngine/EquipmentGroups.pm
+nav/lib/perl/NAV/AlertEngine/Log.pm
+nav/lib/perl/NAV/AlertEngine/NewAlerts.pm
+nav/lib/perl/NAV/AlertEngine/QueuedAlerts.pm
+nav/lib/perl/NAV/AlertEngine/User.pm
+nav/lib/perl/NAV/AlertEngine/UserGroups.pm
 nav/lib/perl/NAV/Path.pm
-nav/lib/perl/NewAlerts.pm
-nav/lib/perl/QueuedAlerts.pm
-nav/lib/perl/User.pm
-nav/lib/perl/UserGroups.pm
+nav/lib/perl/NAV.pm
+nav/lib/perl/NetAddr/IP.pm
 nav/lib/python/nav/Snmp.py
 nav/lib/python/nav/__init__.py
 nav/lib/python/nav/auth.py
@@ -627,6 +633,7 @@ nav/lib/python/rotater.py
 @dirrm nav/doc/cricket/cricket-config/giga-switch-ports
 @dirrm nav/doc/cricket/cricket-config/router-interfaces
 @dirrm nav/doc/cricket/cricket-config/routers
+@dirrm nav/doc/cricket/cricket-config/servers
 @dirrm nav/doc/cricket/cricket-config/switch-ports
 @dirrm nav/doc/cricket/cricket-config/switches
 @dirrm nav/doc/cricket/cricket-config
@@ -649,7 +656,9 @@ nav/lib/python/rotater.py
 @dirrm nav/lib/java/getDeviceData
 @dirrm nav/lib/java/networkDiscovery
 @dirrm nav/lib/java
+@dirrm nav/lib/perl/NAV/AlertEngine
 @dirrm nav/lib/perl/NAV
+@dirrm nav/lib/perl/NetAddr
 @dirrm nav/lib/perl
 @dirrm nav/lib/python/nav/db/forgotten
 @dirrm nav/lib/python/nav/db
diff --git a/net-mgmt/nav/scripts/myautoconf b/net-mgmt/nav/scripts/myautoconf
index 6183da54a6d7..cf01b6eb8f90 100644
--- a/net-mgmt/nav/scripts/myautoconf
+++ b/net-mgmt/nav/scripts/myautoconf
@@ -145,4 +145,10 @@ then
 	else
 		echo "Fine, see if I care."
 	fi
+else
+	echo
+	echo "Consider installing a matching ports/databases/postgresqlXX-serverfor your"
+	echo "PostgreSQL client installation if you want a local NAV database. This target"
+	echo "(auto-config) can set up the database for you then, just run make auto-config"
+	echo "again."
 fi