Index: head/net/ntopng/Makefile
===================================================================
--- head/net/ntopng/Makefile	(revision 441484)
+++ head/net/ntopng/Makefile	(revision 441485)
@@ -1,56 +1,55 @@
 # Created by: Muhammad Moinur Rahman <5u623l20@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	ntopng
-PORTVERSION=	2.4.2017.01.20
-PORTREVISION=	1
+PORTVERSION=	2.4.2017.05.12
 CATEGORIES=	net
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Network monitoring tool with command line and web interfaces
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	librrd.so:databases/rrdtool \
 		libluajit-5.1.so:lang/luajit \
 		libzmq.so:net/libzmq4 \
 		libcurl.so:ftp/curl \
 		libndpi.so:net/ndpi \
 		libjson-c.so:devel/json-c
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USES=	 	autoreconf cpe gmake libtool localbase mysql pathfix pkgconfig sqlite
 SUB_FILES=	ntopng-geoipupdate.sh pkg-deinstall
 
 USERS=		ntopng
 GROUPS=		ntopng
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ntop
-GH_TAGNAME=	2d9a513
+GH_TAGNAME=	00c19bd
 
 CPE_VENDOR=	ntop
 
 OPTIONS_DEFINE=		GEOIP NLS
 OPTIONS_DEFAULT=	GEOIP
 
 OPTIONS_SUB=	yes
 
 GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
 NLS_USES=	gettext
 
 USE_RC_SUBR=	ntopng
 
 post-patch:
 	cd ${WRKSRC} && ${SH} autogen.sh
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ntopng
 
 post-install-GEOIP-on:
 	${INSTALL_SCRIPT} ${WRKDIR}/ntopng-geoipupdate.sh ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: head/net/ntopng/distinfo
===================================================================
--- head/net/ntopng/distinfo	(revision 441484)
+++ head/net/ntopng/distinfo	(revision 441485)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485958691
-SHA256 (ntop-ntopng-2.4.2017.01.20-2d9a513_GH0.tar.gz) = de58a197ff3424a9eaf9ab6fad4178bbefd1eef568b4e9a53080e6e43c0b473d
-SIZE (ntop-ntopng-2.4.2017.01.20-2d9a513_GH0.tar.gz) = 21819824
+TIMESTAMP = 1495439609
+SHA256 (ntop-ntopng-2.4.2017.05.12-00c19bd_GH0.tar.gz) = 4800530c7029c9cd00aa7cd6e67d75efc7a70ffed3b609aec248a6bda7a2a014
+SIZE (ntop-ntopng-2.4.2017.05.12-00c19bd_GH0.tar.gz) = 21819806
Index: head/net/ntopng/files/ntopng-geoipupdate.sh.in
===================================================================
--- head/net/ntopng/files/ntopng-geoipupdate.sh.in	(revision 441484)
+++ head/net/ntopng/files/ntopng-geoipupdate.sh.in	(revision 441485)
@@ -1,39 +1,39 @@
 #!/bin/sh
 
 set -eu
 mkdir -p "%%DATADIR%%/httpdocs/geoip"
 
 # arguments:
 # $1 URL
 # $2 output file name
 _fetch() {
     url="$1"
     out="$2"
     TEMPFILE="$(mktemp "%%DATADIR%%/httpdocs/geoip/GeoIP.dat-XXXXXX")"
     trap 'rc=$? ; set +e ; rm -f "'"$TEMPFILE"'" ; exit $rc' 0
     if fetch -o - "$url" | gunzip >> "$TEMPFILE" ; then
 	chmod 444 "$TEMPFILE"
-	if ! mv -f "$TEMPFILE" "%%DATADIR%%/$2" ; then
-	    echo "Unable to replace %%DATADIR%%/$2"
+	if ! mv -f "$TEMPFILE" "%%DATADIR%%/httpdocs/geoip/$2" ; then
+	    echo "Unable to replace %%DATADIR%%/httpdocs/geoip/$2"
 	    return 2
 	fi
     else
 	echo "$2 download failed"
 	return 1
     fi
     rm -f "$TEMPFILE"
     trap - 0
     return 0
 }
 
 echo Fetching GeoLiteCity.dat...
 _fetch "http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz" GeoLiteCity.dat
 
 echo Fetching GeoLiteCityv6.dat...
 _fetch "http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" GeoLiteCityv6.dat
 
 echo Fetching GeoIPASNum.dat...
 _fetch "http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz" GeoIPASNum.dat.gz
 
 echo Fetching GeoIPASNumv6.dat...
 _fetch "http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz" GeoIPASNumv6.dat.gz
Index: head/net/ntopng/files/pkg-deinstall.in
===================================================================
--- head/net/ntopng/files/pkg-deinstall.in	(revision 441484)
+++ head/net/ntopng/files/pkg-deinstall.in	(revision 441485)
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
 # $FreeBSD$
 
 [ "$2" != "DEINSTALL" ] && exit 0
 
-[ -f "%%DATADIR%%/GeoLiteCity.dat" ] && /bin/rm "%%DATADIR%%/GeoLiteCity.dat"
-[ -f "%%DATADIR%%/GeoLiteCityv6.dat" ] && /bin/rm "%%DATADIR%%/GeoLiteCityv6.dat"
-[ -f "%%DATADIR%%/GeoIPASNum.dat.gz" ] && /bin/rm "%%DATADIR%%/GeoIPASNum.dat.gz"
-[ -f "%%DATADIR%%/GeoIPASNumv6.dat.gz" ] && /bin/rm "%%DATADIR%%/GeoIPASNumv6.dat.gz"
+[ -f "%%DATADIR%%/httpdocs/geoip/GeoLiteCity.dat" ] && /bin/rm "%%DATADIR%%/httpdocs/geoip/GeoLiteCity.dat"
+[ -f "%%DATADIR%%/httpdocs/geoip/GeoLiteCityv6.dat" ] && /bin/rm "%%DATADIR%%/httpdocs/geoip/GeoLiteCityv6.dat"
+[ -f "%%DATADIR%%/httpdocs/geoip/GeoIPASNum.dat.gz" ] && /bin/rm "%%DATADIR%%/httpdocs/geoip/GeoIPASNum.dat.gz"
+[ -f "%%DATADIR%%/httpdocs/geoip/GeoIPASNumv6.dat.gz" ] && /bin/rm "%%DATADIR%%/httpdocs/geoip/GeoIPASNumv6.dat.gz"
 [ -d "%%DATADIR%%/httpdocs/geoip" ] && /usr/bin/find "%%DATADIR%%/httpdocs/geoip" -type d -empty -delete