From 9bc39843c837ec2c2bc9afe6ae69a2c66acad027 Mon Sep 17 00:00:00 2001 From: Guido Falsi Date: Fri, 23 Dec 2016 23:30:06 +0000 Subject: [PATCH] - 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 for his help with testing. --- net/ndpi/Makefile | 7 +++---- net/ndpi/distinfo | 6 +++--- net/ntopng/Makefile | 5 +++-- net/ntopng/distinfo | 6 +++--- net/ntopng/pkg-plist | 1 + 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/net/ndpi/Makefile b/net/ndpi/Makefile index 74f3da8eb48d..aa2b4c7478ed 100644 --- a/net/ndpi/Makefile +++ b/net/ndpi/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ndpi -PORTVERSION= 1.8 -PORTREVISION= 1 +PORTVERSION= 1.8.2016.07.13 CATEGORIES= net MAINTAINER= madpilot@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 diff --git a/net/ndpi/distinfo b/net/ndpi/distinfo index 57b2d632d90a..da77f4b455dd 100644 --- a/net/ndpi/distinfo +++ b/net/ndpi/distinfo @@ -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 diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile index 7505a3498896..59726b47889a 100644 --- a/net/ntopng/Makefile +++ b/net/ntopng/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ntopng -PORTVERSION= 2.4 +PORTVERSION= 2.4.2016.10.14 CATEGORIES= net MAINTAINER= madpilot@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 diff --git a/net/ntopng/distinfo b/net/ntopng/distinfo index efaebce1790e..50c884034d8f 100644 --- a/net/ntopng/distinfo +++ b/net/ntopng/distinfo @@ -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 diff --git a/net/ntopng/pkg-plist b/net/ntopng/pkg-plist index 13d50ccd41aa..b24f02c5cef9 100644 --- a/net/ntopng/pkg-plist +++ b/net/ntopng/pkg-plist @@ -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