- update nagvis to version 1.5.5

 - add OPIONS for ndb2dbo and mk-livestatus brokers
 - make mk-livestatus the default broker since it needs no database
 - add pkg-deinstall message

 Changelog for 1.5.5
 ===================
 NagVis WUI:
 * Change backend_id field in WUI to dropdown select field for map options

 NagVis MKLivestatus Backend:
 * Recode MKLivestatus backend to use fsockopen instead of socket module

 NagVis Core
 * State of map objects was not refreshed correctly in 1.5.4
 * Increase max username length limitation to sth. larger than 15
 * The permission for controlling multisite access is missing

 List of all changes:
 http://sourceforge.net/apps/trac/nagvis/report/32

PR:		151999
Submitted by:	ohauer
Approved by:	A.Sidorov <derfi _at_ vei.ru> (maintainer), glarkin (mentor, implicit)

4 files changed, 47 insertions, 12 deletions

diff --git a/net-mgmt/nagvis/Makefile b/net-mgmt/nagvis/Makefile
index 671af8637c55..18607e2f75c1 100644
--- a/net-mgmt/nagvis/Makefile
+++ b/net-mgmt/nagvis/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	nagvis
-PORTVERSION=	1.5.4
+PORTVERSION=	1.5.5
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}/NagVis%201.5/
 
 MAINTAINER=	derfi@vei.ru
 COMMENT=	NagVis is a visualization addon for Nagios
 
-RUN_DEPENDS=	ndo2db-3x:${PORTSDIR}/net-mgmt/ndoutils
-
 LICENSE=	GPLv2
 
-OPTIONS=	GRAPHVIZ "graphviz is needed for automaps" off
+OPTIONS=	MKLIVESTATUS 	"depend on mk-livestatus broker (preferred)" on \
+ 		NDO2DB 		"depend on ndo2db broker" off \
+		GRAPHVIZ	"graphviz is needed for automaps" off
 
 NO_BUILD=	yes
 USE_PHP=	gd gettext mbstring mysql session json pdo pdo_sqlite
@@ -29,12 +29,25 @@ DEFAULT_PHP_VER=5
 WWW_OWNER?=	${WWWOWN}
 WWW_GROUP?=	${WWWGRP}
 SUB_LIST+=	WWW_OWNER=${WWW_OWNER} WWW_GROUP=${WWW_GROUP}
-SUB_FILES+=	pkg-install
+SUB_FILES+=	pkg-install pkg-deinstall
+
+.if defined(WITH_NDO2DB)
+RUN_DEPENDS+=	ndo2db-3x:${PORTSDIR}/net-mgmt/ndoutils
+.endif
+
+.if defined(WITH_MKLIVESTATUS)
+RUN_DEPENDS+=	mk-livestatus>=0:${PORTSDIR}/net-mgmt/mk-livestatus
+.endif
 
 .if defined(WITH_GRAPHVIZ)
 RUN_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz
 .endif
 
+check-sanity:
+.if !defined(WITH_NDO2DB) && !defined(WITH_MKLIVESTATUS)
+IGNORE= please choose at least one nagios broker module
+.endif
+
 post-extract:
 	@${RM} -f ${WRKSRC}/.gitignore ${WRKSRC}/install.sh ${WRKSRC}/INSTALL
 
diff --git a/net-mgmt/nagvis/distinfo b/net-mgmt/nagvis/distinfo
index f5c28c2b3505..1eb4ee85f10b 100644
--- a/net-mgmt/nagvis/distinfo
+++ b/net-mgmt/nagvis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nagvis-1.5.4.tar.gz) = 3257663a9e3a212f84d94e86c7bfa60c5913fe9249d5c16fadf4f0875b4804fc
-SIZE (nagvis-1.5.4.tar.gz) = 3257681
+SHA256 (nagvis-1.5.5.tar.gz) = 37b9fd132427b21d129d181b657c1b064af1f3220209e2a0f48bbb33cc5347d0
+SIZE (nagvis-1.5.5.tar.gz) = 3258337
diff --git a/net-mgmt/nagvis/files/pkg-deinstall.in b/net-mgmt/nagvis/files/pkg-deinstall.in
new file mode 100644
index 000000000000..809cdc831158
--- /dev/null
+++ b/net-mgmt/nagvis/files/pkg-deinstall.in
@@ -0,0 +1,22 @@
+#!/bin/sh
+# $FreeBSD$
+
+if [ "$2" != "POST-DEINSTALL" ]; then
+	exit 0
+fi
+
+if [ -d %%WWWDIR%% ]; then
+    echo
+    echo "=================================================="
+    echo
+    echo " If you want remove nagvis permanently from you"
+    echo " system, execute following command:"
+    echo
+    echo "  # rm -rf %%WWWDIR%%"
+    echo
+    echo " Do not forget to cleanup your webserver config"
+    echo "=================================================="
+    echo
+fi
+
+exit 0
diff --git a/net-mgmt/nagvis/pkg-plist b/net-mgmt/nagvis/pkg-plist
index 64fc9d3a67ab..263f2c7f97d6 100644
--- a/net-mgmt/nagvis/pkg-plist
+++ b/net-mgmt/nagvis/pkg-plist
@@ -700,10 +700,10 @@
 %%WWWDIR%%/uifx/src/modules/gmap/view/controls/LocationMarker.as
 %%WWWDIR%%/uifx/src/services-config.xml
 %%WWWDIR%%/uifx/src/shell.mxml
-@dirrm %%WWWDIR%%/var/tmpl/compile
-@dirrm %%WWWDIR%%/var/tmpl/cache
-@dirrm %%WWWDIR%%/var/tmpl
-@dirrm %%WWWDIR%%/var
+@dirrmtry %%WWWDIR%%/var/tmpl/compile
+@dirrmtry %%WWWDIR%%/var/tmpl/cache
+@dirrmtry %%WWWDIR%%/var/tmpl
+@dirrmtry %%WWWDIR%%/var
 @dirrm %%WWWDIR%%/uifx/src/modules/gmap/view/controls
 @dirrm %%WWWDIR%%/uifx/src/modules/gmap/view
 @dirrm %%WWWDIR%%/uifx/src/modules/gmap/mediator
@@ -723,7 +723,7 @@
 @dirrm %%WWWDIR%%/uifx/html-template/history
 @dirrm %%WWWDIR%%/uifx/html-template
 @dirrm %%WWWDIR%%/uifx
-@dirrm %%WWWDIR%%/share/var
+@dirrmtry %%WWWDIR%%/share/var
 @dirrmtry %%WWWDIR%%/share/userfiles/templates
 @dirrmtry %%WWWDIR%%/share/userfiles/styles
 @dirrmtry %%WWWDIR%%/share/userfiles/sounds