git: 6dbeffb58e2e - main - net/ntopng: Update to latest upstream head

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Guido Falsi <madpilot_at_FreeBSD.org>
Date: Thu, 03 Sep 2026 06:51:54 UTC
The branch main has been updated by madpilot:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6dbeffb58e2eccf4ceeb7884708b1d0cf23a28b7

commit 6dbeffb58e2eccf4ceeb7884708b1d0cf23a28b7
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2026-09-03 06:51:06 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2026-09-03 06:51:06 +0000

    net/ntopng: Update to latest upstream head
    
    Pet portclippy/portfmt
---
 net/ntopng/Makefile                | 47 ++++++++++++++++++--------------------
 net/ntopng/distinfo                | 10 ++++----
 net/ntopng/files/patch-Makefile.in | 12 +++++-----
 3 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile
index 3f0dafe2f72f..3e79f5301f30 100644
--- a/net/ntopng/Makefile
+++ b/net/ntopng/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	ntopng
-PORTVERSION=	6.6.d20260604
-PORTREVISION=	1
+PORTVERSION=	6.6.d20260829
 PORTEPOCH=	1
 CATEGORIES=	net
 
@@ -11,50 +10,48 @@ WWW=		https://www.ntop.org/products/traffic-analysis/ntop/
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	librrd.so:databases/rrdtool \
-		libzmq.so:net/libzmq4 \
-		libcurl.so:ftp/curl \
-		libndpi.so:net/ndpi \
-		libjson-c.so:devel/json-c \
-		libsodium.so:security/libsodium \
-		libmaxminddb.so:net/libmaxminddb \
+BUILD_DEPENDS=	${LOCALBASE}/include/clickhouse/version.h:databases/clickhouse-cpp \
+		bash:shells/bash
+LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libexpat.so:textproc/expat2 \
-		libzstd.so:archivers/zstd \
 		libgcrypt.so:security/libgcrypt \
 		libgpg-error.so:security/libgpg-error \
-		libhiredis.so:databases/hiredis
-BUILD_DEPENDS=	bash:shells/bash \
-		${LOCALBASE}/include/clickhouse/version.h:databases/clickhouse-cpp
+		libhiredis.so:databases/hiredis \
+		libjson-c.so:devel/json-c \
+		libmaxminddb.so:net/libmaxminddb \
+		libndpi.so:net/ndpi \
+		librrd.so:databases/rrdtool \
+		libsodium.so:security/libsodium \
+		libzmq.so:net/libzmq4 \
+		libzstd.so:archivers/zstd
 
 USES=		autoreconf compiler:c++11-lang cpe gmake libtool localbase \
 		lua:54 pathfix pkgconfig shebangfix sqlite ssl
+CPE_VENDOR=	ntop
+USE_GITHUB=	yes
+GH_ACCOUNT=	ntop
+GH_TAGNAME=	ad4d754
+GH_TUPLE=	ntop:ntopng-dist:4a1dc74:dist/httpdocs/dist
+USE_RC_SUBR=	ntopng
 
-SUB_FILES=	ntopng-geoip2update.sh pkg-deinstall pkg-message
 SHEBANG_FILES=	httpdocs/misc/ntopng-add-user.sh \
 		httpdocs/misc/ntopng-utils-manage-config.in
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-dynamic-ndpi \
 		--with-ndpi-includes=${LOCALBASE}/include/ndpi
 
+SUB_FILES=	ntopng-geoip2update.sh pkg-deinstall pkg-message
+
 USERS=		ntopng
 GROUPS=		ntopng
-PLIST_SUB=	NTOPNGUSER="${USERS}" NTOPNGROUP="${GROUPS}"
-
-USE_GITHUB=	yes
-GH_TUPLE=	ntop:ntopng-dist:05ec4ad:dist/httpdocs/dist
-GH_ACCOUNT=	ntop
-GH_TAGNAME=	630101d
-
-CPE_VENDOR=	ntop
+PLIST_SUB=	NTOPNGROUP="${GROUPS}" \
+		NTOPNGUSER="${USERS}"
 
 OPTIONS_DEFINE=	NLS
-
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 
-USE_RC_SUBR=	ntopng
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		-e 's|%%SSL_INC%%|${OPENSSLINC}|g' \
diff --git a/net/ntopng/distinfo b/net/ntopng/distinfo
index 67ceba527d32..a1326871f9bd 100644
--- a/net/ntopng/distinfo
+++ b/net/ntopng/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1781178801
-SHA256 (ntop-ntopng-6.6.d20260604-630101d_GH0.tar.gz) = 76ad6b61e0c41862bc3349b3770760820a03f6abbd3837c507e462a6e410ad79
-SIZE (ntop-ntopng-6.6.d20260604-630101d_GH0.tar.gz) = 82437155
-SHA256 (ntop-ntopng-dist-05ec4ad_GH0.tar.gz) = a9d9c63f95dba1de9c15dc5195de984f4809519f6c20945a22721932490547d1
-SIZE (ntop-ntopng-dist-05ec4ad_GH0.tar.gz) = 7117568
+TIMESTAMP = 1788263383
+SHA256 (ntop-ntopng-6.6.d20260829-ad4d754_GH0.tar.gz) = 55a47936a2d454fe3d6a5a709795364feb2a87d6e733f608aaadd8a1d439dcd3
+SIZE (ntop-ntopng-6.6.d20260829-ad4d754_GH0.tar.gz) = 82439699
+SHA256 (ntop-ntopng-dist-4a1dc74_GH0.tar.gz) = c204b28114da4473ae0a623cfb798f90962f6fe548f339cf5cbf8d8085b4f6e0
+SIZE (ntop-ntopng-dist-4a1dc74_GH0.tar.gz) = 7117860
diff --git a/net/ntopng/files/patch-Makefile.in b/net/ntopng/files/patch-Makefile.in
index 5c479f7129f7..81c3b4d16b25 100644
--- a/net/ntopng/files/patch-Makefile.in
+++ b/net/ntopng/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2025-12-28 10:02:12 UTC
+--- Makefile.in.orig	2026-08-28 12:42:56 UTC
 +++ Makefile.in
-@@ -34,17 +34,11 @@ LUA_LIB=$(LUA_HOME)/src/liblua.a
+@@ -35,17 +35,11 @@ LUA_LIB=$(LUA_HOME)/src/liblua.a
  LUA_INC=-I$(LUA_HOME)/src
  LUA_LIB=$(LUA_HOME)/src/liblua.a
  
@@ -13,7 +13,7 @@
 -CLICKHOUSE_HOME=@CLICKHOUSE_HOME@
 -CLICKHOUSE_INC=-I$(CLICKHOUSE_HOME) -I$(CLICKHOUSE_HOME)/contrib/absl
 -CLICKHOUSE_LIB=$(CLICKHOUSE_HOME)/build/clickhouse/libclickhouse-cpp-lib.a
--CLICKHOUSE_DEP_LIBS=$(CLICKHOUSE_HOME)/build/contrib/cityhash/cityhash/libcityhash.a $(CLICKHOUSE_HOME)/build/contrib/lz4/lz4/liblz4.a
+-CLICKHOUSE_DEP_LIBS=$(CLICKHOUSE_HOME)/build/clickhouse/cityhash/libcityhash.a $(CLICKHOUSE_HOME)/build/contrib/lz4/lz4/liblz4.a $(ZSTD_LIB)
 -endif
 +HAVE_CLICKHOUSE=1
 +CLICKHOUSE_HOME=$(LOCALBASE)
@@ -23,7 +23,7 @@
  
  ifeq ($(OS),Linux)
  	LUA_PLATFORM=linux
-@@ -52,7 +46,8 @@ else ifeq ($(OS), $(filter $(OS), FreeBSD))
+@@ -53,7 +47,8 @@ else ifeq ($(OS), $(filter $(OS), FreeBSD))
  	LUA_PLATFORM=macosx
  else ifeq ($(OS), $(filter $(OS), FreeBSD))
  	LUA_PLATFORM=freebsd
@@ -33,7 +33,7 @@
  endif
  
  ######
-@@ -88,11 +83,7 @@ ifeq ($(HAS_ZSTD), 0)
+@@ -89,11 +84,7 @@ ifeq ($(HAS_ZSTD), 0)
  
  HAS_ZSTD=$(shell $(PKG_CONFIG) --exists libzstd && echo 0)
  ifeq ($(HAS_ZSTD), 0)
@@ -46,7 +46,7 @@
  endif
  
  ######
-@@ -113,7 +104,7 @@ RPM_DATA_PKG = $(TARGET)-data-$(NTOPNG_VERSION)-@REVIS
+@@ -126,7 +117,7 @@ RPM_DATA_PKG = $(TARGET)-data-$(NTOPNG_VERSION)-@REVIS
  RPM_DATA_PKG = $(TARGET)-data-$(NTOPNG_VERSION)-@REVISION@.noarch.rpm
  ######