svn commit: r429294 - in head/net: ndpi ntopng

[Guido Falsi]

Author: madpilot
Date: Fri Dec 23 23:30:06 2016
New Revision: 429294
URL: https://svnweb.freebsd.org/changeset/ports/429294

Log:
  - Update ndpi and ntopng to head of stable branches.
  - Fix GeoIP dependency in ntopng.
  
  Upstream releases binaries from the top of the stable branches as
  main distribution media, so I make the FreeBSD port do the same.
  
  Thanks to Kaya Saman <kayasaman at gmail.com> for his help with testing.

Modified:
  head/net/ndpi/Makefile
  head/net/ndpi/distinfo
  head/net/ntopng/Makefile
  head/net/ntopng/distinfo
  head/net/ntopng/pkg-plist

Modified: head/net/ndpi/Makefile
==============================================================================
--- head/net/ndpi/Makefile	Fri Dec 23 23:22:20 2016	(r429293)
+++ head/net/ndpi/Makefile	Fri Dec 23 23:30:06 2016	(r429294)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ndpi
-PORTVERSION=	1.8
-PORTREVISION=	1
+PORTVERSION=	1.8.2016.07.13
 CATEGORIES=	net
 
 MAINTAINER=	madpilot at FreeBSD.org
@@ -26,8 +25,8 @@ INSTALL_TARGET=	install-strip
 USE_GITHUB=	yes
 GH_ACCOUNT=	ntop
 GH_PROJECT=	nDPI
-GH_TAGNAME=	6fb81f1
+GH_TAGNAME=	6450ae2
 
-PLIST_SUB=	MAJOR_VER=${PORTVERSION}.0
+PLIST_SUB=	MAJOR_VER=${PORTVERSION:C/([[:digit:]])+\.([[:digit:]])+.*/\1.\2/}.0
 
 .include <bsd.port.mk>

Modified: head/net/ndpi/distinfo
==============================================================================
--- head/net/ndpi/distinfo	Fri Dec 23 23:22:20 2016	(r429293)
+++ head/net/ndpi/distinfo	Fri Dec 23 23:30:06 2016	(r429294)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1467219612
-SHA256 (ntop-nDPI-1.8-6fb81f1_GH0.tar.gz) = 17751d157ce524a2ee5235f285675ffd1e3cac67eba7d083ff95ae7851a2693c
-SIZE (ntop-nDPI-1.8-6fb81f1_GH0.tar.gz) = 7238498
+TIMESTAMP = 1481800146
+SHA256 (ntop-nDPI-1.8.2016.07.13-6450ae2_GH0.tar.gz) = 46abbd598f9f5f66ccc0304034a1d210ec3f3fa021ae02b67f5d873bad17d254
+SIZE (ntop-nDPI-1.8.2016.07.13-6450ae2_GH0.tar.gz) = 10220235

Modified: head/net/ntopng/Makefile
==============================================================================
--- head/net/ntopng/Makefile	Fri Dec 23 23:22:20 2016	(r429293)
+++ head/net/ntopng/Makefile	Fri Dec 23 23:30:06 2016	(r429294)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ntopng
-PORTVERSION=	2.4
+PORTVERSION=	2.4.2016.10.14
 CATEGORIES=	net
 
 MAINTAINER=	madpilot at FreeBSD.org
@@ -28,12 +28,13 @@ GROUPS=		ntopng
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ntop
+GH_TAGNAME=	141c778
 
 CPE_VENDOR=	ntop
 
 OPTIONS_DEFINE=		GEOIP NLS
 OPTIONS_DEFAULT=	GEOIP
-GEOIP_BUILD_DEPENDS=	geoiplookup:net/GeoIP
+GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
 NLS_USES=	gettext
 

Modified: head/net/ntopng/distinfo
==============================================================================
--- head/net/ntopng/distinfo	Fri Dec 23 23:22:20 2016	(r429293)
+++ head/net/ntopng/distinfo	Fri Dec 23 23:30:06 2016	(r429294)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1467219203
-SHA256 (ntop-ntopng-2.4_GH0.tar.gz) = 86f8ed46983f46bcd931304d3d992fc1af572b11e461ab9fb4f0f472429bd5dd
-SIZE (ntop-ntopng-2.4_GH0.tar.gz) = 21818255
+TIMESTAMP = 1481800093
+SHA256 (ntop-ntopng-2.4.2016.10.14-141c778_GH0.tar.gz) = c753a736424750af37975bc00fcb8f80b90bc741018b8e7db0c7d35b06bcc210
+SIZE (ntop-ntopng-2.4.2016.10.14-141c778_GH0.tar.gz) = 21820195

Modified: head/net/ntopng/pkg-plist
==============================================================================
--- head/net/ntopng/pkg-plist	Fri Dec 23 23:22:20 2016	(r429293)
+++ head/net/ntopng/pkg-plist	Fri Dec 23 23:30:06 2016	(r429294)
@@ -353,6 +353,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/os_stats.lua
 %%DATADIR%%/scripts/lua/page_not_found.lua
 %%DATADIR%%/scripts/lua/pid_stats.lua
+%%DATADIR%%/scripts/lua/please_wait.lua
 %%DATADIR%%/scripts/lua/popKeys.lua
 %%DATADIR%%/scripts/lua/port_details.lua
 %%DATADIR%%/scripts/lua/processes_stats.lua