5 files changed, 168 insertions, 164 deletions

diff --git a/net-mgmt/nav/Makefile b/net-mgmt/nav/Makefile
index af6f0e8616ca..e898071c950a 100644
--- a/net-mgmt/nav/Makefile
+++ b/net-mgmt/nav/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	nav
-PORTVERSION=	3.2.2
-PORTREVISION=	2
+PORTVERSION=	3.4.4
 CATEGORIES=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://launchpadlibrarian.net/18978371/
 
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	Network Administration Visualized
@@ -63,16 +61,16 @@ RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
 MAKE_ENV+=	CLASSPATH=${CLASSPATH}
 HAS_CONFIGURE=	yes
 USE_PERL5=	yes
-USE_PYTHON=	2.3+
+USE_PYTHON=	2.5+
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
-USE_APACHE=	2.0+
+JAVA_VERSION=	1.5+
+USE_APACHE=	2.2+
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_PHP=	ctype gettext overload pcre pgsql posix \
+USE_PHP=	ctype gettext pcre pgsql posix \
 		session tokenizer xml zlib
-DEFAULT_PHP_VER=4
-IGNORE_WITH_PHP=5
+DEFAULT_PHP_VER=5
+IGNORE_WITH_PHP=4
 WANT_PHP_MOD=	yes
 USE_REINPLACE_CMD=	yes
 
@@ -82,10 +80,6 @@ PKGDEINSTALL=	${PKGDIR}/pkg-install
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700042
-BROKEN=		does not compile
-.endif
-
 post-patch:
 	@(${FIND} ${WRKSRC} -name '*.py' -print0 | \
 		${ENV} PYTHON_CMD=${PYTHON_CMD} \
@@ -113,27 +107,12 @@ pre-install:
 post-install:
 	@${INSTALL_DATA} ${FILESDIR}/apache.conf ${PREFIX}/${APACHEETCDIR}/Includes/nav.conf.sample
 	@${CHOWN} -R navcron:nav ${PREFIX}/nav/var
-.ifdef NOTDEF
-	@LOCALBASE=${LOCALBASE} JAVA_HOME=${JAVA_HOME} ${SH} ${SCRIPTDIR}/navenv w >${WRKSRC}/navenv.sh
-	@${INSTALL_SCRIPT} ${WRKSRC}/navenv.sh ${PREFIX}/nav/bin/
-	@${ECHO}
-	@${ECHO_MSG} "===> You need to set up some environment variables for your nav installation."
-	@${ECHO_MSG} "===> To source/set the environment, please add this to /etc/profile or where"
-	@${ECHO_MSG} "===> you want it."
-	@${ECHO}
-	@${ECHO_MSG} ". ${PREFIX}/nav/bin/navenv.sh"
-	@${ECHO}
-	@${ECHO_MSG} "Now is also a good time to configure username and password for the NAV"
-	@${ECHO_MSG} "PostgreSQL database in ${PREFIX}/nav/etc/db.conf. Make sure it is possible to"
-	@${ECHO_MSG} "log into it using TCP/IP, check tcpip_socket in postgresql.conf."
-	@${ECHO}
-.endif # NOTDEF
 	@${ECHO_MSG} "===> Consider using make auto-config. It will auto-configure NAV, setting up"
 	@${ECHO_MSG} "===> shell environment and PostgreSQL database."
 	@${ECHO}
 
 auto-config:
-	@LOCALBASE=${LOCALBASE} PORTSDIR=${PORTSDIR} ${SH} ${SCRIPTDIR}/myautoconf
+	@env LOCALBASE=${LOCALBASE} PORTSDIR=${PORTSDIR} ${SH} ${SCRIPTDIR}/myautoconf
 
 # TODO
 #
diff --git a/net-mgmt/nav/distinfo b/net-mgmt/nav/distinfo
index 5cf688c92953..4aa2d30c98af 100644
--- a/net-mgmt/nav/distinfo
+++ b/net-mgmt/nav/distinfo
@@ -1,3 +1,3 @@
-MD5 (nav-3.2.2.tar.gz) = 2132efb83ff47fd6e8568441024c3233
-SHA256 (nav-3.2.2.tar.gz) = a07fd4bc8545edf5f96f07432c859a4638863ffdc6edab845ee2b7838a06bbb6
-SIZE (nav-3.2.2.tar.gz) = 4303657
+MD5 (nav-3.4.4.tar.gz) = de64b38b2873871a2011a93895d49416
+SHA256 (nav-3.4.4.tar.gz) = a8f9148cb38b76ac05c56c43db11950cf664f9c67cf71734497165cfa6c89986
+SIZE (nav-3.4.4.tar.gz) = 9437582
diff --git a/net-mgmt/nav/files/patch-src-Makefile.in b/net-mgmt/nav/files/patch-src-Makefile.in
deleted file mode 100644
index f4f8a64c9e78..000000000000
--- a/net-mgmt/nav/files/patch-src-Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/Makefile.in.orig	Thu May 27 14:50:34 2004
-+++ src/Makefile.in	Tue Oct 19 22:10:15 2004
-@@ -18,23 +18,23 @@
- INSTALLARGS = -DDESTDIR=$(DESTDIR)
- 
- subdirs = \
--	Util \
-+	Logger \
-+	vlanPlot \
- 	ConfigParser \
- 	Database \
-+	Util \
- 	Event \
-+	NetboxInfo \
- 	eventEngine \
-+	SimpleSnmp \
- 	getBoksMacs \
- 	getDeviceData \
- 	networkDiscovery \
--	Logger \
--	NetboxInfo \
--	SimpleSnmp \
--	vlanPlot \
- 	webapps/navAdmin \
- 	webapps/vPServer
- 
- # We build our own classpath, to resolve interdependencies between the java modules.
--CLASSPATH = $(shell for x in $(subdirs); do echo -n "$$PWD/$${x}/build:"; done ; echo -n $$CLASSPATH)
-+CLASSPATH = $(shell for x in $(subdirs); do echo -n "$$PWD/src/$${x}/build:"; done ; echo -n $$CLASSPATH)
- INSTALL_TARGETS = $(patsubst %,%_inst,$(subdirs))
- QUICK_TARGETS = $(patsubst %,%_q,$(subdirs))
- 
diff --git a/net-mgmt/nav/pkg-plist b/net-mgmt/nav/pkg-plist
index 438a28beebaf..89071b362033 100644
--- a/net-mgmt/nav/pkg-plist
+++ b/net-mgmt/nav/pkg-plist
@@ -1,8 +1,10 @@
 %%APACHEETCDIR%%/Includes/nav.conf.sample
+nav/apache/tools/Netmap.tool
 nav/apache/tools/alertprofiles.tool
 nav/apache/tools/arnold.tool
 nav/apache/tools/devicemanagement.tool
 nav/apache/tools/editdb.tool
+nav/apache/tools/ipdevinfo.tool
 nav/apache/tools/ipinfo.tool
 nav/apache/tools/l2trace.tool
 nav/apache/tools/logger.tool
@@ -32,6 +34,7 @@ nav/apache/webroot/alertprofiles/dbclose.php
 nav/apache/webroot/alertprofiles/dbinit.php
 nav/apache/webroot/alertprofiles/documents/NAValert-manual.pdf
 nav/apache/webroot/alertprofiles/documents/alert-profiles-manual.pdf
+nav/apache/webroot/alertprofiles/error.php
 nav/apache/webroot/alertprofiles/hasPrivilege.function.php
 nav/apache/webroot/alertprofiles/icons/and.gif
 nav/apache/webroot/alertprofiles/icons/arrowdown.gif
@@ -85,7 +88,6 @@ nav/apache/webroot/alertprofiles/icons/toolicon.gif
 nav/apache/webroot/alertprofiles/icons/utstyr.gif
 nav/apache/webroot/alertprofiles/image.php
 nav/apache/webroot/alertprofiles/images/alert.gif
-nav/apache/webroot/alertprofiles/images/backgroundpattern.png
 nav/apache/webroot/alertprofiles/images/bluepixel85.png
 nav/apache/webroot/alertprofiles/images/nav.jpg
 nav/apache/webroot/alertprofiles/images/nav3.jpg
@@ -123,6 +125,7 @@ nav/apache/webroot/alertprofiles/modules/user-group-admin.php
 nav/apache/webroot/alertprofiles/modules/user-to-group-admin.php
 nav/apache/webroot/alertprofiles/modules/wap-setup.php
 nav/apache/webroot/alertprofiles/modules/welcome.php
+nav/apache/webroot/alertprofiles/php4support.php
 nav/apache/webroot/alertprofiles/session.php
 nav/apache/webroot/alertprofiles/timeplan.php
 nav/apache/webroot/alertprofiles/wap/.htaccess
@@ -130,115 +133,67 @@ nav/apache/webroot/alertprofiles/wap/db.php
 nav/apache/webroot/alertprofiles/wap/index.php
 nav/apache/webroot/alertprofiles/wap/varlib.php
 nav/apache/webroot/arnold/.htaccess
-nav/apache/webroot/arnold/arnoldhandler.py
 nav/apache/webroot/browse/.htaccess
 nav/apache/webroot/browse/index
 nav/apache/webroot/devicemanagement/.htaccess
-nav/apache/webroot/devicemanagement/deviceManagement.py
-nav/apache/webroot/devicemanagement/deviceManagementTables.py
 nav/apache/webroot/editdb/.htaccess
 nav/apache/webroot/editdb/editTables.py
 nav/apache/webroot/editdb/editdb.py
 nav/apache/webroot/editdb/editdbSQL.py
 nav/apache/webroot/editdb/initBox.py
 nav/apache/webroot/images/.htaccess
-nav/apache/webroot/images/adminlogo+fill.gif
-nav/apache/webroot/images/arpcam/arplogo+fill.gif
-nav/apache/webroot/images/arpcam/camlogo+fill.gif
-nav/apache/webroot/images/arpcam/fill.gif
+nav/apache/webroot/images/about/ntnu.jpg
+nav/apache/webroot/images/about/uninett.png
+nav/apache/webroot/images/arnold/details.png
+nav/apache/webroot/images/arnold/enable.png
 nav/apache/webroot/images/arpcam/info.gif
 nav/apache/webroot/images/arpcam/ipinfolink.png
-nav/apache/webroot/images/arpcam/mtlogo+fill.gif
-nav/apache/webroot/images/bar-end.gif
-nav/apache/webroot/images/bar-fill.gif
-nav/apache/webroot/images/blank.gif
-nav/apache/webroot/images/emotd/emotdlogo+fill.gif
-nav/apache/webroot/images/emotd/top-l.gif
-nav/apache/webroot/images/emotd/top-r.gif
 nav/apache/webroot/images/form/deleteicon.gif
 nav/apache/webroot/images/form/editicon.gif
 nav/apache/webroot/images/form/fill-active.gif
 nav/apache/webroot/images/form/fill-inactive.gif
 nav/apache/webroot/images/form/fill-submit.gif
-nav/apache/webroot/images/login/login.gif
-nav/apache/webroot/images/login/navlogo.gif
 nav/apache/webroot/images/lys/.htaccess
 nav/apache/webroot/images/lys/green.png
 nav/apache/webroot/images/lys/red.png
 nav/apache/webroot/images/lys/yellow.png
 nav/apache/webroot/images/main/.htaccess
-nav/apache/webroot/images/main/background-navbar.gif
-nav/apache/webroot/images/main/background-navlogo.gif
-nav/apache/webroot/images/main/navbar-separator.gif
-nav/apache/webroot/images/main/quicklink-end.gif
-nav/apache/webroot/images/main/quicklink-fill.gif
-nav/apache/webroot/images/main/quicklink-start.gif
-nav/apache/webroot/images/ntnu.jpg
-nav/apache/webroot/images/pilned.png
-nav/apache/webroot/images/pilopp.png
-nav/apache/webroot/images/ragen/.htaccess
-nav/apache/webroot/images/ragen/bottom-end.gif
-nav/apache/webroot/images/ragen/bottom-fill.gif
-nav/apache/webroot/images/ragen/bottom-next-active.gif
-nav/apache/webroot/images/ragen/bottom-next.gif
-nav/apache/webroot/images/ragen/bottom-previous-active.gif
-nav/apache/webroot/images/ragen/bottom-previous.gif
-nav/apache/webroot/images/ragen/bottom-start.gif
-nav/apache/webroot/images/ragen/logo+fill.gif
-nav/apache/webroot/images/ragen/navbar-end.gif
-nav/apache/webroot/images/ragen/navbar-fill.gif
-nav/apache/webroot/images/ragen/navbar-start.gif
-nav/apache/webroot/images/ragen/next-active.gif
-nav/apache/webroot/images/ragen/next.gif
-nav/apache/webroot/images/ragen/previous-active.gif
-nav/apache/webroot/images/ragen/previous.gif
-nav/apache/webroot/images/ragen/top-end.gif
+nav/apache/webroot/images/main/navlogo-141x50.png
+nav/apache/webroot/images/main/navlogo-281x100.png
+nav/apache/webroot/images/status/pilned.png
+nav/apache/webroot/images/status/pilopp.png
 nav/apache/webroot/images/status/status-history.png
-nav/apache/webroot/images/status/statuslogo+fill.gif
-nav/apache/webroot/images/tabs/blue-l.png
-nav/apache/webroot/images/tabs/blue-r.png
-nav/apache/webroot/images/tabs/white-l.png
-nav/apache/webroot/images/tabs/white-r.png
-nav/apache/webroot/images/tabs/yellow-l.png
-nav/apache/webroot/images/tabs/yellow-r.png
+nav/apache/webroot/images/status/wrench.gif
 nav/apache/webroot/images/toolbox/.htaccess
-nav/apache/webroot/images/toolbox/module-bar-end.gif
-nav/apache/webroot/images/toolbox/module-bar-fill.gif
-nav/apache/webroot/images/toolbox/module-bar-start.gif
-nav/apache/webroot/images/toolbox/module-fill-end.gif
-nav/apache/webroot/images/toolbox/module-fill-start.gif
-nav/apache/webroot/images/toolbox/module-fill.gif
-nav/apache/webroot/images/toolbox/module-footer-end.gif
-nav/apache/webroot/images/toolbox/module-footer-fill.gif
-nav/apache/webroot/images/toolbox/module-footer-start.gif
+nav/apache/webroot/images/toolbox/tools/alertprofiles.png
 nav/apache/webroot/images/toolbox/tools/arnold.png
-nav/apache/webroot/images/toolbox/tools/cricket.gif
-nav/apache/webroot/images/toolbox/tools/devbrowser.gif
-nav/apache/webroot/images/toolbox/tools/devman.gif
-nav/apache/webroot/images/toolbox/tools/editdb.gif
+nav/apache/webroot/images/toolbox/tools/devman.png
+nav/apache/webroot/images/toolbox/tools/editdb.png
 nav/apache/webroot/images/toolbox/tools/ipinfo.png
 nav/apache/webroot/images/toolbox/tools/l2trace.png
 nav/apache/webroot/images/toolbox/tools/machinetracker.png
 nav/apache/webroot/images/toolbox/tools/maintenance.png
 nav/apache/webroot/images/toolbox/tools/messages.png
-nav/apache/webroot/images/toolbox/tools/network-explorer.gif
-nav/apache/webroot/images/toolbox/tools/ragen.gif
-nav/apache/webroot/images/toolbox/tools/searchtools.gif
+nav/apache/webroot/images/toolbox/tools/network-explorer.png
+nav/apache/webroot/images/toolbox/tools/nfsen.png
+nav/apache/webroot/images/toolbox/tools/report.png
+nav/apache/webroot/images/toolbox/tools/stager.png
 nav/apache/webroot/images/toolbox/tools/stats.png
-nav/apache/webroot/images/toolbox/tools/status.gif
-nav/apache/webroot/images/toolbox/tools/syslog-analyzer.gif
+nav/apache/webroot/images/toolbox/tools/status.png
+nav/apache/webroot/images/toolbox/tools/syslog-analyzer.png
 nav/apache/webroot/images/toolbox/tools/useradmin.png
 nav/apache/webroot/images/toolbox/tools/vlanplot.png
-nav/apache/webroot/images/uninett.png
-nav/apache/webroot/images/wrench.gif
 nav/apache/webroot/index.py
+nav/apache/webroot/ipdevinfo/.htaccess
 nav/apache/webroot/ipinfo/.htaccess
 nav/apache/webroot/js/.htaccess
 nav/apache/webroot/js/DeviceBrowserTemplate.js
 nav/apache/webroot/js/EditTemplate.js
+nav/apache/webroot/js/arnold.js
 nav/apache/webroot/js/default.js
 nav/apache/webroot/js/editdbTemplate.js
-nav/apache/webroot/js/table.js
+nav/apache/webroot/js/ipdevinfo.js
+nav/apache/webroot/js/report.js
 nav/apache/webroot/l2trace/.htaccess
 nav/apache/webroot/l2trace/l2trace.py
 nav/apache/webroot/logger/.htaccess
@@ -250,41 +205,45 @@ nav/apache/webroot/messages/.htaccess
 nav/apache/webroot/mysms/.htaccess
 nav/apache/webroot/navAdmin/.htaccess
 nav/apache/webroot/navAdmin/index
+nav/apache/webroot/netmap/.htaccess
+nav/apache/webroot/netmap/applet/.htaccess
+nav/apache/webroot/netmap/applet/Netmap.jar
+nav/apache/webroot/netmap/applet/media/EDGE.png
+nav/apache/webroot/netmap/applet/media/GSW.png
+nav/apache/webroot/netmap/applet/media/GW.png
+nav/apache/webroot/netmap/applet/media/OTHER.png
+nav/apache/webroot/netmap/applet/media/SRV.png
+nav/apache/webroot/netmap/applet/media/SW.png
+nav/apache/webroot/netmap/applet/media/WLAN.png
+nav/apache/webroot/netmap/applet/media/loading.gif
+nav/apache/webroot/netmap/applet/prefuse.jar
 nav/apache/webroot/preferences/.htaccess
 nav/apache/webroot/preferences/list.html
 nav/apache/webroot/preferences/navigation/.htaccess
 nav/apache/webroot/preferences/navigation/navigation.py
 nav/apache/webroot/preferences/preferences.py
 nav/apache/webroot/report/.htaccess
-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/reporthandler.py
 nav/apache/webroot/stats/.htaccess
 nav/apache/webroot/status/.htaccess
-nav/apache/webroot/status/StatusDefaultPrefs.py
 nav/apache/webroot/status/StatusPrefs.py
 nav/apache/webroot/status/StatusSections.py
 nav/apache/webroot/status/status.py
 nav/apache/webroot/style/.htaccess
 nav/apache/webroot/style/DeviceBrowserTemplate.css
-nav/apache/webroot/style/FrontpageTemplate.css
 nav/apache/webroot/style/MatrixScopesTemplate.css
 nav/apache/webroot/style/MatrixTemplate.css
-nav/apache/webroot/style/UserInfo.css
 nav/apache/webroot/style/calendar.css
 nav/apache/webroot/style/default.css
-nav/apache/webroot/style/deviceManagement.css
 nav/apache/webroot/style/editdbTemplate.css
 nav/apache/webroot/style/form.css
-nav/apache/webroot/style/ipinfo.css
+nav/apache/webroot/style/ipdevinfo.css
 nav/apache/webroot/style/l2trace.css
+nav/apache/webroot/style/login.css
 nav/apache/webroot/style/machinetracker.css
 nav/apache/webroot/style/messages.css
+nav/apache/webroot/style/reset.css
 nav/apache/webroot/style/table.css
 nav/apache/webroot/style/tabs.css
-nav/apache/webroot/style/tabs2.css
 nav/apache/webroot/toolbox/.htaccess
 nav/apache/webroot/toolbox/toolbox.py
 nav/apache/webroot/useradmin.py
@@ -315,14 +274,12 @@ nav/apache/webroot/vlanPlot/omvlanplot.html
 nav/apache/webroot/vlanPlot/vlanPlot.jar
 nav/bin/alertdaemon.pl
 nav/bin/alertengine.pl
-nav/bin/arnold.pl
-nav/bin/arplogger.pl
-nav/bin/autoenable.pl
+nav/bin/arnold.py
+nav/bin/autoenable.py
 nav/bin/checkService.py
 nav/bin/cleanrrds.pl
 nav/bin/dump.py
 nav/bin/eventEngine.sh
-nav/bin/filloiddb.pl
 nav/bin/fillthresholds.py
 nav/bin/getBoksMacs.sh
 nav/bin/getDeviceData.sh
@@ -337,8 +294,9 @@ nav/bin/networkDiscovery.sh
 nav/bin/pping.py
 nav/bin/servicemon.py
 nav/bin/smsd.py
-nav/bin/start_arnold.pl
-nav/bin/t1000.pl
+nav/bin/snmptrapd.py
+nav/bin/start_arnold.py
+nav/bin/t1000.py
 nav/bin/thresholdMon.py
 nav/bin/vprrd.py
 nav/doc/cricket/README
@@ -370,16 +328,17 @@ nav/doc/sql/upgrades/3.0_beta8.sql
 nav/doc/sql/upgrades/3.0_rc1.sql
 nav/doc/sql/upgrades/3.1.0.sql
 nav/doc/sql/upgrades/3.2.0.sql
+nav/doc/sql/upgrades/3.3.0.sql
+nav/doc/sql/upgrades/3.4.0.sql
+nav/doc/sql/upgrades/3.4.2.sql
 nav/doc/sql/upgrades/README
 nav/etc/alertengine.cfg
 nav/etc/alertmsg.conf
-nav/etc/arnold/arnold.cfg
+nav/etc/arnold/arnold.conf
 nav/etc/arnold/mailtemplates/README
-nav/etc/arnold/nonblock.cfg
+nav/etc/arnold/nonblock.conf
 nav/etc/cricket-views.conf
-nav/etc/cricketoids.txt
 nav/etc/cron.d/cricket
-nav/etc/cron.d/iptrace
 nav/etc/cron.d/logengine
 nav/etc/cron.d/mactrace
 nav/etc/cron.d/maintengine
@@ -399,6 +358,7 @@ nav/etc/init.d/getDeviceData
 nav/etc/init.d/pping
 nav/etc/init.d/servicemon
 nav/etc/init.d/smsd
+nav/etc/init.d/snmptrapd
 nav/etc/l2trace.conf
 nav/etc/logger.conf
 nav/etc/machinetracker.conf
@@ -410,6 +370,7 @@ nav/etc/report/report.conf
 nav/etc/rrdBrowser.conf
 nav/etc/servicemon.conf
 nav/etc/smsd.conf
+nav/etc/snmptrapd.conf
 nav/etc/sortedStats.conf
 nav/etc/vPServer.conf
 nav/etc/webfront/contact-information.txt
@@ -437,6 +398,7 @@ nav/lib/java/eventEngine/handler-plugins/MaintenanceState.jar
 nav/lib/java/eventEngine/handler-plugins/ServiceState.jar
 nav/lib/java/eventEngine/handler-plugins/ThresholdState.jar
 nav/lib/java/getBoksMacs/getBoksMacs.jar
+nav/lib/java/getDeviceData/data-plugins/Arp.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
@@ -445,6 +407,7 @@ nav/lib/java/getDeviceData/data-plugins/ModuleMon.jar
 nav/lib/java/getDeviceData/data-plugins/Netbox.jar
 nav/lib/java/getDeviceData/data-plugins/Swport.jar
 nav/lib/java/getDeviceData/device-plugins/3Com.jar
+nav/lib/java/getDeviceData/device-plugins/ARPLogger.jar
 nav/lib/java/getDeviceData/device-plugins/CiscoGw.jar
 nav/lib/java/getDeviceData/device-plugins/CiscoModule.jar
 nav/lib/java/getDeviceData/device-plugins/CiscoSw1900.jar
@@ -473,12 +436,13 @@ 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/Arnold.pm
 nav/lib/perl/NAV/Path.pm
 nav/lib/perl/NetAddr/IP.pm
 nav/lib/python/nav/Snmp.py
 nav/lib/python/nav/__init__.py
+nav/lib/python/nav/arnold.py
 nav/lib/python/nav/auth.py
+nav/lib/python/nav/bitvector.py
 nav/lib/python/nav/buildconf.py
 nav/lib/python/nav/config.py
 nav/lib/python/nav/daemon.py
@@ -490,6 +454,11 @@ nav/lib/python/nav/db/forgotten/navprofiles.py
 nav/lib/python/nav/db/manage.py
 nav/lib/python/nav/db/navprofiles.py
 nav/lib/python/nav/debug.py
+nav/lib/python/nav/django/__init__.py
+nav/lib/python/nav/django/context_processors.py
+nav/lib/python/nav/django/settings.py
+nav/lib/python/nav/django/shortcuts.py
+nav/lib/python/nav/django/urls.py
 nav/lib/python/nav/dump.py
 nav/lib/python/nav/errors.py
 nav/lib/python/nav/event.py
@@ -497,16 +466,43 @@ nav/lib/python/nav/getstatus.py
 nav/lib/python/nav/logs.py
 nav/lib/python/nav/maintenance.py
 nav/lib/python/nav/messages.py
+nav/lib/python/nav/models/__init__.py
+nav/lib/python/nav/models/cabling.py
+nav/lib/python/nav/models/event.py
+nav/lib/python/nav/models/manage.py
+nav/lib/python/nav/models/msgmaint.py
+nav/lib/python/nav/models/oid.py
+nav/lib/python/nav/models/rrd.py
+nav/lib/python/nav/models/service.py
+nav/lib/python/nav/natsort.py
 nav/lib/python/nav/path.py
 nav/lib/python/nav/pwhash.py
+nav/lib/python/nav/report/IPtools.py
+nav/lib/python/nav/report/IPtree.py
+nav/lib/python/nav/report/__init__.py
+nav/lib/python/nav/report/colorconfig.py
+nav/lib/python/nav/report/dbresult.py
+nav/lib/python/nav/report/generator.py
+nav/lib/python/nav/report/matrix.py
+nav/lib/python/nav/report/matrixIPv4.py
+nav/lib/python/nav/report/matrixIPv6.py
+nav/lib/python/nav/report/metaIP.py
+nav/lib/python/nav/report/report.py
+nav/lib/python/nav/report/utils.py
 nav/lib/python/nav/rrd/__init__.py
 nav/lib/python/nav/rrd/presenter.py
 nav/lib/python/nav/smsd/__init__.py
 nav/lib/python/nav/smsd/boostdispatcher.py
 nav/lib/python/nav/smsd/dispatcher.py
 nav/lib/python/nav/smsd/gammudispatcher.py
+nav/lib/python/nav/smsd/httpgetdispatcher.py
 nav/lib/python/nav/smsd/navdbqueue.py
 nav/lib/python/nav/smsd/uninettmaildispatcher.py
+nav/lib/python/nav/snmptrapd/__init__.py
+nav/lib/python/nav/snmptrapd/handlers/__init__.py
+nav/lib/python/nav/snmptrapd/handlers/airespace.py
+nav/lib/python/nav/snmptrapd/handlers/handlertemplate.py
+nav/lib/python/nav/snmptrapd/handlers/linkupdown.py
 nav/lib/python/nav/startstop.py
 nav/lib/python/nav/statemon/DEQueue.py
 nav/lib/python/nav/statemon/DNS/Base.py
@@ -585,6 +581,7 @@ nav/lib/python/nav/web/SearchBox.py
 nav/lib/python/nav/web/TreeSelect.py
 nav/lib/python/nav/web/URI.py
 nav/lib/python/nav/web/__init__.py
+nav/lib/python/nav/web/arnoldhandler.py
 nav/lib/python/nav/web/auth.py
 nav/lib/python/nav/web/cycler.py
 nav/lib/python/nav/web/devBrowser/__init__.py
@@ -595,6 +592,26 @@ nav/lib/python/nav/web/devBrowser/port.py
 nav/lib/python/nav/web/devBrowser/rrd.py
 nav/lib/python/nav/web/devBrowser/service.py
 nav/lib/python/nav/web/devBrowser/servicetable.py
+nav/lib/python/nav/web/devicemanagement/__init__.py
+nav/lib/python/nav/web/devicemanagement/common.py
+nav/lib/python/nav/web/devicemanagement/constants.py
+nav/lib/python/nav/web/devicemanagement/db.py
+nav/lib/python/nav/web/devicemanagement/delete.py
+nav/lib/python/nav/web/devicemanagement/deviceevent.py
+nav/lib/python/nav/web/devicemanagement/error.py
+nav/lib/python/nav/web/devicemanagement/formattedlist.py
+nav/lib/python/nav/web/devicemanagement/handler.py
+nav/lib/python/nav/web/devicemanagement/history.py
+nav/lib/python/nav/web/devicemanagement/order.py
+nav/lib/python/nav/web/devicemanagement/page.py
+nav/lib/python/nav/web/devicemanagement/register.py
+nav/lib/python/nav/web/devicemanagement/rma.py
+nav/lib/python/nav/web/devicemanagement/widget.py
+nav/lib/python/nav/web/ipdevinfo/__init__.py
+nav/lib/python/nav/web/ipdevinfo/context_processors.py
+nav/lib/python/nav/web/ipdevinfo/forms.py
+nav/lib/python/nav/web/ipdevinfo/urls.py
+nav/lib/python/nav/web/ipdevinfo/views.py
 nav/lib/python/nav/web/ipinfo/__init__.py
 nav/lib/python/nav/web/ipinfo/config.py
 nav/lib/python/nav/web/ldapAuth.py
@@ -604,10 +621,16 @@ nav/lib/python/nav/web/messages/__init__.py
 nav/lib/python/nav/web/messages/handler.py
 nav/lib/python/nav/web/mysms/__init__.py
 nav/lib/python/nav/web/mysms/handler.py
+nav/lib/python/nav/web/netmap/__init__.py
+nav/lib/python/nav/web/netmap/common.py
+nav/lib/python/nav/web/netmap/datacollector.py
+nav/lib/python/nav/web/netmap/handler.py
 nav/lib/python/nav/web/preferences.py
 nav/lib/python/nav/web/pyproxy/__init__.py
 nav/lib/python/nav/web/pyproxy/proxy.py
 nav/lib/python/nav/web/pyproxy/vlanPlot.py
+nav/lib/python/nav/web/report/__init__.py
+nav/lib/python/nav/web/report/handler.py
 nav/lib/python/nav/web/sci_exp.py
 nav/lib/python/nav/web/selectTree.py
 nav/lib/python/nav/web/serviceHelper.py
@@ -617,24 +640,32 @@ nav/lib/python/nav/web/tableview.py
 nav/lib/python/nav/web/templates/ArnoldTemplate.py
 nav/lib/python/nav/web/templates/ChangeLinkTemplate.py
 nav/lib/python/nav/web/templates/DeviceBrowserTemplate.py
+nav/lib/python/nav/web/templates/ExceptionTemplate.py
 nav/lib/python/nav/web/templates/FrontpageTemplate.py
+nav/lib/python/nav/web/templates/GraphML.py
 nav/lib/python/nav/web/templates/IPInfo.py
+nav/lib/python/nav/web/templates/IpDevInfoTemplate.py
 nav/lib/python/nav/web/templates/LoggerTemplate.py
 nav/lib/python/nav/web/templates/LoginTemplate.py
 nav/lib/python/nav/web/templates/MachineTrackerTemplate.py
 nav/lib/python/nav/web/templates/MainTemplate.py
 nav/lib/python/nav/web/templates/MaintenanceCalTemplate.py
+nav/lib/python/nav/web/templates/MaintenanceDetailsTemplate.py
 nav/lib/python/nav/web/templates/MaintenanceListTemplate.py
 nav/lib/python/nav/web/templates/MaintenanceNewTemplate.py
 nav/lib/python/nav/web/templates/MaintenanceTemplate.py
+nav/lib/python/nav/web/templates/MatrixIpv4Template.py
+nav/lib/python/nav/web/templates/MatrixIpv6Template.py
 nav/lib/python/nav/web/templates/MatrixScopesTemplate.py
 nav/lib/python/nav/web/templates/MatrixTemplate.py
+nav/lib/python/nav/web/templates/MessagesDetailsTemplate.py
 nav/lib/python/nav/web/templates/MessagesFeedTemplate.py
 nav/lib/python/nav/web/templates/MessagesListTemplate.py
 nav/lib/python/nav/web/templates/MessagesNewTemplate.py
 nav/lib/python/nav/web/templates/MessagesTemplate.py
 nav/lib/python/nav/web/templates/MySMSTemplate.py
 nav/lib/python/nav/web/templates/NavbarPreferencesTemplate.py
+nav/lib/python/nav/web/templates/Netmap.py
 nav/lib/python/nav/web/templates/ReportTemplate.py
 nav/lib/python/nav/web/templates/SearchBoxTemplate.py
 nav/lib/python/nav/web/templates/SortedStatsTemplate.py
@@ -656,6 +687,19 @@ nav/lib/python/nav/web/templates/useradmin/UserAdmin.py
 nav/lib/python/nav/web/templates/useradmin/__init__.py
 nav/lib/python/nav/web/toolbox.py
 nav/lib/python/nav/web/urlbuilder.py
+nav/lib/templates/ipdevinfo/base.html
+nav/lib/templates/ipdevinfo/debug.html
+nav/lib/templates/ipdevinfo/ipdev-details.html
+nav/lib/templates/ipdevinfo/module-details.html
+nav/lib/templates/ipdevinfo/module-gwport-status.html
+nav/lib/templates/ipdevinfo/module-swport-active.html
+nav/lib/templates/ipdevinfo/module-swport-status.html
+nav/lib/templates/ipdevinfo/port-details.html
+nav/lib/templates/ipdevinfo/port-legend.html
+nav/lib/templates/ipdevinfo/search.html
+nav/lib/templates/ipdevinfo/service-list-table.html
+nav/lib/templates/ipdevinfo/service-list.html
+nav/lib/templates/ipdevinfo/service-matrix.html
 @exec install -d -m 0755 -o navcron -g nav %D/nav/var
 @exec install -d -m 0755 -o navcron -g nav %D/nav/var/log
 @exec install -d -m 0755 -o navcron -g nav %D/nav/var/log/arnold
@@ -676,20 +720,31 @@ nav/lib/python/nav/web/urlbuilder.py
 @dirrmtry nav/var/log
 @dirrmtry nav/var
 @unexec find %D/nav/lib/python/nav -type f -name "*.pyc" -delete 2>/dev/null || true
+@dirrm nav/lib/templates/ipdevinfo
+@dirrm nav/lib/templates
 @dirrm nav/lib/python/nav/web/templates/useradmin
 @dirrm nav/lib/python/nav/web/templates
+@dirrm nav/lib/python/nav/web/report
 @dirrm nav/lib/python/nav/web/pyproxy
+@dirrm nav/lib/python/nav/web/netmap
 @dirrm nav/lib/python/nav/web/mysms
 @dirrm nav/lib/python/nav/web/messages
 @dirrm nav/lib/python/nav/web/maintenance
 @dirrm nav/lib/python/nav/web/ipinfo
+@dirrm nav/lib/python/nav/web/ipdevinfo
+@dirrm nav/lib/python/nav/web/devicemanagement
 @dirrm nav/lib/python/nav/web/devBrowser
 @dirrm nav/lib/python/nav/web
 @dirrm nav/lib/python/nav/statemon/checker
 @dirrm nav/lib/python/nav/statemon/DNS
 @dirrm nav/lib/python/nav/statemon
+@dirrm nav/lib/python/nav/snmptrapd/handlers
+@dirrm nav/lib/python/nav/snmptrapd
 @dirrm nav/lib/python/nav/smsd
 @dirrm nav/lib/python/nav/rrd
+@dirrm nav/lib/python/nav/report
+@dirrm nav/lib/python/nav/models
+@dirrm nav/lib/python/nav/django
 @dirrm nav/lib/python/nav/db/forgotten
 @dirrm nav/lib/python/nav/db
 @dirrm nav/lib/python/nav
@@ -739,6 +794,9 @@ nav/lib/python/nav/web/urlbuilder.py
 @dirrm nav/apache/webroot/report
 @dirrm nav/apache/webroot/preferences/navigation
 @dirrm nav/apache/webroot/preferences
+@dirrm nav/apache/webroot/netmap/applet/media
+@dirrm nav/apache/webroot/netmap/applet
+@dirrm nav/apache/webroot/netmap
 @dirrm nav/apache/webroot/navAdmin
 @dirrm nav/apache/webroot/mysms
 @dirrm nav/apache/webroot/messages
@@ -748,17 +806,16 @@ nav/lib/python/nav/web/urlbuilder.py
 @dirrm nav/apache/webroot/l2trace
 @dirrm nav/apache/webroot/js
 @dirrm nav/apache/webroot/ipinfo
+@dirrm nav/apache/webroot/ipdevinfo
 @dirrm nav/apache/webroot/images/toolbox/tools
 @dirrm nav/apache/webroot/images/toolbox
-@dirrm nav/apache/webroot/images/tabs
 @dirrm nav/apache/webroot/images/status
-@dirrm nav/apache/webroot/images/ragen
 @dirrm nav/apache/webroot/images/main
 @dirrm nav/apache/webroot/images/lys
-@dirrm nav/apache/webroot/images/login
 @dirrm nav/apache/webroot/images/form
-@dirrm nav/apache/webroot/images/emotd
 @dirrm nav/apache/webroot/images/arpcam
+@dirrm nav/apache/webroot/images/arnold
+@dirrm nav/apache/webroot/images/about
 @dirrm nav/apache/webroot/images
 @dirrm nav/apache/webroot/editdb
 @dirrm nav/apache/webroot/devicemanagement
diff --git a/net-mgmt/nav/scripts/myautoconf b/net-mgmt/nav/scripts/myautoconf
index ab0c70074c06..a0d633a76311 100644
--- a/net-mgmt/nav/scripts/myautoconf
+++ b/net-mgmt/nav/scripts/myautoconf
@@ -31,7 +31,7 @@ then
 fi
 
 setdbcvar() {
-	# $1: variable $2: password $3: config
+	# $1: variable $2: value $3: config
 	sed -e "s/^$1=.*/$1=$2/" $3 >$3.tmp
 	cp $3.tmp $3
 	rm -f $3.tmp
@@ -104,7 +104,7 @@ then
 #			firstdb=`su -l pgsql -c "$LOCALBASE/bin/psql -l -t -A" | head -1 | cut -d'|' -f1`
 			PGUSER=pgsql
 			export PGUSER
-			$LOCALBASE/bin/createuser -A -D nav
+			$LOCALBASE/bin/createuser -A -D -R nav
 			$LOCALBASE/bin/createdb --owner nav --encoding UTF-8 arnold
 			$LOCALBASE/bin/createdb --owner nav --encoding UTF-8 manage
 			$LOCALBASE/bin/createdb --owner nav --encoding UTF-8 navprofiles