diff --git a/net/ndpi/Makefile b/net/ndpi/Makefile index d4c5ace782c0..47e39879cb91 100644 --- a/net/ndpi/Makefile +++ b/net/ndpi/Makefile @@ -1,52 +1,52 @@ PORTNAME= ndpi -PORTVERSION= 4.8.d20231023 +PORTVERSION= 4.8.d20231102 PORTEPOCH= 1 CATEGORIES= net MAINTAINER= madpilot@FreeBSD.org COMMENT= NTOP-maintained superset of the popular OpenDPI library WWW= https://www.ntop.org/products/deep-packet-inspection/ndpi/ LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= librrd.so:databases/rrdtool \ libjson-c.so:devel/json-c \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error USES= autoreconf compiler:c++11-lang cpe libtool localbase:ldflags pathfix \ pkgconfig CPE_VENDOR= ntop USE_LDCONFIG= yes CONFIGURE_ARGS= --with-pic --with-local-libgcrypt CPPFLAGS= -I${LOCALBASE}/include/json-c LIBS= -ljson-c MAKE_ENV= EXAMPLESDIR="${EXAMPLESDIR_REL}" GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_GITHUB= yes GH_ACCOUNT= ntop GH_PROJECT= nDPI -GH_TAGNAME= b328916 +GH_TAGNAME= 816b001 PLIST_SUB= MAJOR_VER=${PORTVERSION:R:R} VER=${PORTVERSION:R} post-configure: @${REINPLACE_CMD} -e 's/#define PACKAGE/#define NDPI_PACKAGE/g' \ -e 's/#define VERSION/#define NDPI_VERSION/g' \ ${WRKSRC}/configure post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libndpi.so.${PORTVERSION:R}.0 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ndpiReader ${RM} ${STAGEDIR}${PREFIX}/lib/libndpi.so \ ${STAGEDIR}${PREFIX}/lib/libndpi.so.${PORTVERSION:R:R} ${RLN} ${STAGEDIR}${PREFIX}/lib/libndpi.so.${PORTVERSION:R}.0 \ ${STAGEDIR}${PREFIX}/lib/libndpi.so ${RLN} ${STAGEDIR}${PREFIX}/lib/libndpi.so.${PORTVERSION:R}.0 \ ${STAGEDIR}${PREFIX}/lib/libndpi.so.${PORTVERSION:R:R} .include diff --git a/net/ndpi/distinfo b/net/ndpi/distinfo index 48e9aa3557e8..3b0e75b70c54 100644 --- a/net/ndpi/distinfo +++ b/net/ndpi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1698154698 -SHA256 (ntop-nDPI-4.8.d20231023-b328916_GH0.tar.gz) = 0ef6805c72ca6f87ec6d2c43e5289e014eeb7cfb48828243202193455fd06522 -SIZE (ntop-nDPI-4.8.d20231023-b328916_GH0.tar.gz) = 39479352 +TIMESTAMP = 1699024440 +SHA256 (ntop-nDPI-4.8.d20231102-816b001_GH0.tar.gz) = ad8243b813864f2cb1c35ebc8d7e9746a81b864e6c994756babb52195642e1d9 +SIZE (ntop-nDPI-4.8.d20231102-816b001_GH0.tar.gz) = 39479382 diff --git a/net/ndpi/files/patch-src_lib_Makefile.in b/net/ndpi/files/patch-src_lib_Makefile.in index 698cb08beee8..3e2dfac5cf62 100644 --- a/net/ndpi/files/patch-src_lib_Makefile.in +++ b/net/ndpi/files/patch-src_lib_Makefile.in @@ -1,49 +1,49 @@ ---- src/lib/Makefile.in.orig 2023-10-23 09:45:30 UTC +--- src/lib/Makefile.in.orig 2023-11-02 19:51:08 UTC +++ src/lib/Makefile.in @@ -14,15 +14,12 @@ includedir = @includedir@/ndpi PREFIX = @prefix@ libdir = @libdir@ includedir = @includedir@/ndpi -ifneq ($(OS),Windows_NT) -CFLAGS += -fPIC -DPIC -endif -CFLAGS += -I. -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION @NDPI_CFLAGS@ @GPROF_CFLAGS@ @CUSTOM_NDPI@ @ADDITIONAL_INCS@ +CFLAGS += -fPIC -DPIC -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION @NDPI_CFLAGS@ @CFLAGS@ @GPROF_CFLAGS@ @CUSTOM_NDPI@ @ADDITIONAL_INCS@ LDFLAGS += @NDPI_LDFLAGS@ LIBS = @ADDITIONAL_LIBS@ @LIBS@ @GPROF_LIBS@ -OBJECTS = $(patsubst protocols/%.c, protocols/%.o, $(wildcard protocols/*.c)) $(patsubst third_party/src/%.c, third_party/src/%.o, $(wildcard third_party/src/*.c)) $(patsubst third_party/src/hll/%.c, third_party/src/hll/%.o, $(wildcard third_party/src/hll/*.c)) $(patsubst ./%.c, ./%.o, $(wildcard ./*.c)) -HEADERS = $(wildcard ../include/*.h) $(wildcard ../include/*.h) +OBJECTS != ls protocols/*.c | sed 's/\(.*\)\.c$$/\1.o/' && ls third_party/src/*.c | sed -e 's/\(.*\)\.c$$/\1.o/' -e '/gcrypt_light/d' && ls third_party/src/hll/*.c | sed -e 's/\(.*\)\.c$$/\1.o/' && ls ./*.c | sed 's/\(.*\)\.c$$/\1.o/' +HEADERS != ls ../include/*.h NDPI_VERSION_MAJOR = @NDPI_MAJOR@ NDPI_LIB_STATIC = libndpi.a NDPI_LIB_SHARED_BASE = libndpi.so @@ -30,27 +27,7 @@ USE_HOST_LIBGCRYPT = @USE_HOST_LIBGCRYPT@ NDPI_LIBS = $(NDPI_LIB_STATIC) $(NDPI_LIB_SHARED) USE_HOST_LIBGCRYPT = @USE_HOST_LIBGCRYPT@ -ifneq ($(USE_HOST_LIBGCRYPT),0) -TMP_OBJS := $(OBJECTS) -OBJECTS = $(filter-out third_party/src/gcrypt_light.o,$(TMP_OBJS)) -endif - -ifneq ($(OS),Windows_NT) -OS := $(shell uname) -endif - BUILD_MINGW = @BUILD_MINGW@ +-BUILD_MINGW = @BUILD_MINGW@ - -ifeq ($(OS),Darwin) -CC=clang -fno-color-diagnostics -SONAME_FLAG= -else -ifneq ($(BUILD_MINGW),) -NDPI_LIB_SHARED_BASE = libndpi -NDPI_LIB_SHARED = $(NDPI_LIB_SHARED_BASE)-@NDPI_VERSION_SHORT@.dll -else --SONAME_FLAG=-Wl,-soname,$(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR) + SONAME_FLAG=-Wl,-soname,$(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR) -endif -endif all: $(NDPI_LIBS)