Skip to content

Commit e599f10

Browse files
committed
net/ntopng: Update to 6.4 stable
1 parent 3719d8e commit e599f10

File tree

4 files changed

+117
-224
lines changed

4 files changed

+117
-224
lines changed

net/ntopng/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PORTNAME= ntopng
2-
PORTVERSION= 6.2.d20241217
2+
PORTVERSION= 6.4.d20250522
33
PORTEPOCH= 1
44
CATEGORIES= net
55

@@ -38,9 +38,9 @@ GROUPS= ntopng
3838
PLIST_SUB= NTOPNGUSER="${USERS}" NTOPNGROUP="${GROUPS}"
3939

4040
USE_GITHUB= yes
41-
GH_TUPLE= ntop:ntopng-dist:11e6b76:dist/httpdocs/dist
41+
GH_TUPLE= ntop:ntopng-dist:7f098fd:dist/httpdocs/dist
4242
GH_ACCOUNT= ntop
43-
GH_TAGNAME= d0029c3
43+
GH_TAGNAME= 7c537ad
4444

4545
CPE_VENDOR= ntop
4646

net/ntopng/distinfo

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
TIMESTAMP = 1734880143
2-
SHA256 (ntop-ntopng-6.2.d20241217-d0029c3_GH0.tar.gz) = 592bbccddec8f3703d7815814b08feaa6ff63de7a057406076babed8629f8ef5
3-
SIZE (ntop-ntopng-6.2.d20241217-d0029c3_GH0.tar.gz) = 79837339
4-
SHA256 (ntop-ntopng-dist-11e6b76_GH0.tar.gz) = 6d112d1a64e2c69ffb790edce2d1cf6a1d6e2df84c30efaff3e2a5372c3bc953
5-
SIZE (ntop-ntopng-dist-11e6b76_GH0.tar.gz) = 3109938
1+
TIMESTAMP = 1748257798
2+
SHA256 (ntop-ntopng-6.4.d20250522-7c537ad_GH0.tar.gz) = 828e0c0b97b535ed31267affe93f67518826352aad75c58453f2b54d26f9f2a5
3+
SIZE (ntop-ntopng-6.4.d20250522-7c537ad_GH0.tar.gz) = 80791169
4+
SHA256 (ntop-ntopng-dist-7f098fd_GH0.tar.gz) = 86dfd05d89e1f3683c880f18d405fbdd7a346c7ffb5c304b5799e39944dbbb71
5+
SIZE (ntop-ntopng-dist-7f098fd_GH0.tar.gz) = 3408329

net/ntopng/files/patch-configure.ac.in

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
--- configure.ac.in.orig 2024-08-13 16:12:12 UTC
1+
--- configure.ac.in.orig 2025-04-29 17:01:16 UTC
22
+++ configure.ac.in
33
@@ -153,40 +153,8 @@ LIBPCAP=-lpcap
44
MAKE=make
@@ -147,29 +147,27 @@
147147
AC_MSG_CHECKING([PF_RING nBPF])
148148
NBPF_HOME=${PWD}/../PF_RING/userland/nbpf
149149
LIBNBPF=${NBPF_HOME}/libnbpf.a
150-
@@ -540,17 +453,12 @@ AS_VAR_IF(with_hiredis, yes, [
151-
AS_VAR_IF(with_hiredis, yes, [
152-
pkg-config --exists hiredis
153-
if test "$?" -ne 1; then
154-
- HIREDIS_INC="`pkg-config --cflags hiredis` -I/usr/include/hiredis"
155-
- if test $SYSTEM = "FreeBSD" && $FREEBSD_VERSION != "15"; then
150+
@@ -544,16 +457,11 @@ AS_VAR_IF(with_hiredis, yes, [
151+
else
152+
pkg-config --exists hiredis
153+
if test "$?" -ne 1; then
154+
- HIREDIS_INC="`pkg-config --cflags hiredis` -I/usr/include/hiredis"
155+
- if test $SYSTEM = "FreeBSD" && $FREEBSD_VERSION != "15"; then
156156
- dnl> Note: on freebsd 15 .a is not installed
157157
- HIREDIS_LIB="/usr/local/lib/libhiredis.a"
158-
+ HIREDIS_INC="`pkg-config --cflags hiredis`"
159-
+ HIREDIS_LIB="`pkg-config --libs hiredis`"
160-
else
161-
- HIREDIS_LIB="`pkg-config --libs hiredis`"
162-
+ echo "Please install hiredis package prerequisite"
163-
+ exit -1
164-
fi
165-
- else
166-
- echo "Please install hiredis package prerequisite"
167-
- exit -1
168-
- fi
158+
- else
159+
+ HIREDIS_INC="`pkg-config --cflags hiredis`"
160+
HIREDIS_LIB="`pkg-config --libs hiredis`"
161+
- fi
162+
else
163+
- echo "Please install hiredis package prerequisite"
164+
- exit -1
165+
+ echo "Please install hiredis package prerequisite"
166+
+ exit -1
167+
fi
168+
fi
169169
])
170-
171-
if test "${with_nedge+set}" != set; then
172-
@@ -565,14 +473,14 @@ if test "${with_nedge+set}" != set; then
170+
@@ -570,14 +478,14 @@ if test "${with_nedge+set}" != set; then
173171
fi
174172

175173
if test $SYSTEM = "FreeBSD"; then
@@ -186,7 +184,7 @@
186184
AC_DEFINE_UNQUOTED(HAVE_PF_RING, 1, [Native PF_RING support])
187185
if test -f "${PF_RING_HOME}/userland/lib/libpfring.a"; then
188186
echo "${PF_RING_HOME}/userland/libpcap/libpcap.a"
189-
@@ -592,18 +500,18 @@ if test "${with_nedge+set}" != set; then
187+
@@ -597,18 +505,18 @@ if test "${with_nedge+set}" != set; then
190188
CXXFLAGS="${CXXFLAGS} -I/opt/pfring/include"
191189
echo "Using PF_RING installed in /opt/pfring"
192190
else
@@ -211,7 +209,7 @@
211209
echo "Please make sure you have installed your PF_RING libraries and try again"
212210
exit 1
213211
fi
214-
@@ -784,11 +692,9 @@ else
212+
@@ -789,11 +697,9 @@ else
215213
fi
216214
else
217215
dnl> FreeBSD
@@ -225,7 +223,7 @@
225223
fi
226224

227225
AC_CHECK_LIB([expat], [XML_ParserCreate], expat=true)
228-
@@ -843,7 +749,7 @@ fi
226+
@@ -848,7 +754,7 @@ fi
229227
INSTALL_DIR=${ac_default_prefix}
230228
fi
231229

0 commit comments

Comments
 (0)