Attachment #232682 for bug #262756

Lines 2-7 Link Here

(-)b/net/ndpi/Makefile (-1 / +3 lines)
2		2
3	PORTNAME= ndpi	3	PORTNAME= ndpi
4	PORTVERSION= 4.2.d20220210	4	PORTVERSION= 4.2.d20220210
		5	PORTREVISION= 1
5	PORTEPOCH= 1	6	PORTEPOCH= 1
6	CATEGORIES= net	7	CATEGORIES= net
7		8
Lines 11-17 COMMENT= NTOP-maintained superset of the popular OpenDPI library Link Here
11	LICENSE= LGPL3+	12	LICENSE= LGPL3+
12	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
13		14
14	LIB_DEPENDS= libjson-c.so:devel/json-c \	15	LIB_DEPENDS= librrd.so:databases/rrdtool \
		16	libjson-c.so:devel/json-c \
15	libgcrypt.so:security/libgcrypt \	17	libgcrypt.so:security/libgcrypt \
16	libgpg-error.so:security/libgpg-error	18	libgpg-error.so:security/libgpg-error
17		19

Lines 2-7 Link Here

(-)b/net/ntopng/Makefile (+1 lines)
2		2
3	PORTNAME= ntopng	3	PORTNAME= ntopng
4	PORTVERSION= 5.2.d20220314	4	PORTVERSION= 5.2.d20220314
		5	PORTREVISION= 1
5	PORTEPOCH= 1	6	PORTEPOCH= 1
6	CATEGORIES= net	7	CATEGORIES= net
7		8




--- configure.ac.in.orig	2022-03-14 16:15:57 UTC
+++ configure.ac.in
@@ -236,8 +236,8 @@ PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [
 PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [
    NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"`
    # Use static libndpi library as building against the dynamic library fails
-   NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic"
-   #NDPI_LIB="$NDPI_LIBS"
+   #NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic"
+   NDPI_LIB="$NDPI_LIBS"
    NDPI_LIB_DEP=
    ], [
       AC_MSG_CHECKING(for nDPI source)
@@ -444,7 +444,7 @@ if test "${with_nedge+set}" != set; then
  PF_RING_HOME=${HOME}/PF_RING
 

Return to bug 262756

Lines 1-5 Link Here

(-)b/net/ntopng/files/patch-configure.ac.in (-1 / +12 lines)
1	--- configure.ac.in.orig 2022-02-08 09:52:25 UTC	1	--- configure.ac.in.orig 2022-03-14 16:15:57 UTC
2	+++ configure.ac.in	2	+++ configure.ac.in
		3	@@ -236,8 +236,8 @@ PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [
		4	PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [
		5	NDPI_INC=`echo $NDPI_CFLAGS \| sed -e "s/[ ]*$//"`
		6	# Use static libndpi library as building against the dynamic library fails
		7	- NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic"
		8	- #NDPI_LIB="$NDPI_LIBS"
		9	+ #NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic"
		10	+ NDPI_LIB="$NDPI_LIBS"
		11	NDPI_LIB_DEP=
		12	], [
		13	AC_MSG_CHECKING(for nDPI source)
3	@@ -444,7 +444,7 @@ if test "${with_nedge+set}" != set; then	14	@@ -444,7 +444,7 @@ if test "${with_nedge+set}" != set; then
4	PF_RING_HOME=${HOME}/PF_RING	15	PF_RING_HOME=${HOME}/PF_RING
5		16