@@ -, +, @@ 
 net-mgmt/nagvis:
 
 * Update to 1.9.9
 * Modernized options
--- net-mgmt/nagvis/Makefile	(revision 479914)
+++ net-mgmt/nagvis/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 # $FreeBSD$
 
 PORTNAME=	nagvis
-PORTVERSION=	1.9.7
+PORTVERSION=	1.9.9
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.nagvis.org/share/
 
@@ -11,46 +11,37 @@ 
 
 LICENSE=	GPLv2
 
-OPTIONS_DEFINE=	GRAPHVIZ
-OPTIONS_SINGLE=	BROKER
-OPTIONS_SINGLE_BROKER=	MKLIVESTATUS NDO2DB
-OPTIONS_DEFAULT=	MKLIVESTATUS
-MKLIVESTATUS_DESC=	Depend on mk-livestatus broker (preferred)
-NDO2DB_DESC=	Depend on ndo2db broker
-GRAPHVIZ_DESC=	Graphviz is needed for automaps
-
 USES=		gettext php:web
-NLS_USES=	gettext
-NLS_CONFIGURE_OFF=	--disable-nls
+USE_PHP=	gd gettext mbstring session json pdo pdo_sqlite
 
 NO_BUILD=	yes
-USE_PHP=	gd gettext mbstring session json pdo pdo_sqlite
+NO_ARCH=	yes
 
-.include <bsd.port.options.mk>
-
+SUB_LIST+=	WWW_OWNER=${WWW_OWNER} WWW_GROUP=${WWW_GROUP} \
+		DIRMODE=${DIRMODE} FILEMODE=${FILEMODE}
+SUB_FILES+=	pkg-install pkg-deinstall
+PLIST_SUB+=	WWWDIR="${WWWDIR}"
 WWW_OWNER?=	${WWWOWN}
 WWW_GROUP?=	${WWWGRP}
 DIRMODE?=	750
 FILEMODE?=	640
 
-SUB_LIST+=	WWW_OWNER=${WWW_OWNER} WWW_GROUP=${WWW_GROUP} \
-		DIRMODE=${DIRMODE} FILEMODE=${FILEMODE}
-SUB_FILES+=	pkg-install pkg-deinstall
-PLIST_SUB+=	WWWDIR="${WWWDIR}"
+OPTIONS_DEFINE=		GRAPHVIZ
+OPTIONS_SINGLE=		BROKER
+OPTIONS_SINGLE_BROKER=	MKLIVESTATUS NDO2DB
+OPTIONS_DEFAULT=	MKLIVESTATUS
 
-.if ${PORT_OPTIONS:MNDO2DB}
-USE_PHP+=	mysql
-RUN_DEPENDS+=	ndo2db-3x:net-mgmt/ndoutils
-.endif
+GRAPHVIZ_DESC=		Graphviz is needed for automaps
+MKLIVESTATUS_DESC=	Depend on mk-livestatus broker (preferred)
+NDO2DB_DESC=		Depend on ndo2db broker
 
-.if ${PORT_OPTIONS:MMKLIVESTATUS}
-RUN_DEPENDS+=	mk-livestatus>=0:net-mgmt/mk-livestatus
-.endif
+GRAPHVIZ_RUN_DEPENDS=		dot:graphics/graphviz
+MKLIVESTATUS_RUN_DEPENDS=	mk-livestatus>=0:net-mgmt/mk-livestatus
+NDO2DB_USE=			PHP=mysql
+NDO2DB_RUN_DEPENDS=		ndo2b-3x:net-mgmt/ndoutils
+NLS_USES=			gettext
+NLS_CONFIGURE_WITH=		nls
 
-.if ${PORT_OPTIONS:MGRAPHVIZ}
-RUN_DEPENDS+=	dot:graphics/graphviz
-.endif
-
 post-extract:
 	@${RM} ${WRKSRC}/.gitignore ${WRKSRC}/install.sh ${WRKSRC}/INSTALL
 
@@ -62,10 +53,10 @@ 
 		${WRKSRC}/etc/nagvis.ini.php-sample
 
 do-install:
-	cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WWWDIR}/
 	${MKDIR} ${STAGEDIR}${WWWDIR}/etc/automaps \
 		${STAGEDIR}${WWWDIR}/share/var \
 		${STAGEDIR}${WWWDIR}/var/tmpl/cache \
 		${STAGEDIR}${WWWDIR}/var/tmpl/compile
+	cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WWWDIR}/
 
 .include <bsd.port.mk>
--- net-mgmt/nagvis/distinfo	(revision 479914)
+++ net-mgmt/nagvis/distinfo	(working copy)
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1521970546
-SHA256 (nagvis-1.9.7.tar.gz) = b0cce0f484c5af6d68475ddcca11a35e559ee229b477f21208b6a4cfbec3ed10
-SIZE (nagvis-1.9.7.tar.gz) = 1790286
+TIMESTAMP = 1537154451
+SHA256 (nagvis-1.9.9.tar.gz) = 02b6e682012fb5c9493f3bd9748223b181d20e5aeb10fc603adbb40285de4162
+SIZE (nagvis-1.9.9.tar.gz) = 1791989