Index: head/net/ndpi/Makefile
===================================================================
--- head/net/ndpi/Makefile	(revision 553200)
+++ head/net/ndpi/Makefile	(revision 553201)
@@ -1,53 +1,53 @@
 # Created by: Muhammad Moinur Rahman <5u623l20@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	ndpi
-PORTVERSION=	3.2.d20200721
+PORTVERSION=	3.4.d20201019
 PORTEPOCH=	1
 CATEGORIES=	net
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	NTOP-maintained superset of the popular OpenDPI library
 
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libjson-c.so:devel/json-c
 
 USES=		autoreconf compiler:c++11-lang libtool localbase:ldflags pathfix \
 		pkgconfig
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	--with-pic
 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=	6735bb3
+GH_TAGNAME=	64929a7
 
 PLIST_SUB=	MAJOR_VER=${PORTVERSION:R:R} VER=${PORTVERSION:R}
 
 post-patch:
 	(cd ${WRKSRC} && ${SH} autogen.sh)
 
 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 <bsd.port.mk>
Index: head/net/ndpi/distinfo
===================================================================
--- head/net/ndpi/distinfo	(revision 553200)
+++ head/net/ndpi/distinfo	(revision 553201)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1596791745
-SHA256 (ntop-nDPI-3.2.d20200721-6735bb3_GH0.tar.gz) = 72ad5133db2373114559c076776b50b98281065d19f372312b94b6395fb30124
-SIZE (ntop-nDPI-3.2.d20200721-6735bb3_GH0.tar.gz) = 29585843
+TIMESTAMP = 1603197678
+SHA256 (ntop-nDPI-3.4.d20201019-64929a7_GH0.tar.gz) = 5a1d5a010c68c767deee008dabeca943a5b9897a0f936b2a68c30f6e1d9d6810
+SIZE (ntop-nDPI-3.4.d20201019-64929a7_GH0.tar.gz) = 37976447
Index: head/net/ndpi/files/patch-autogen.sh
===================================================================
--- head/net/ndpi/files/patch-autogen.sh	(revision 553200)
+++ head/net/ndpi/files/patch-autogen.sh	(revision 553201)
@@ -1,47 +1,61 @@
---- autogen.sh.orig	2018-12-21 16:33:57 UTC
+--- autogen.sh.orig	2020-10-19 14:18:25 UTC
 +++ autogen.sh
-@@ -5,44 +5,9 @@ NDPI_MINOR="6"
+@@ -5,46 +5,6 @@ NDPI_MINOR="4"
  NDPI_PATCH="0"
  NDPI_VERSION_SHORT="$NDPI_MAJOR.$NDPI_MINOR.$NDPI_PATCH"
  
 -rm -f configure config.h config.h.in
 -
 -AUTOCONF=$(command -v autoconf)
 -AUTOMAKE=$(command -v automake)
 -LIBTOOL=$(command -v libtool)
 -LIBTOOLIZE=$(command -v libtoolize)
 -AUTORECONF=$(command -v autoreconf)
+-PKG_CONFIG=$(command -v pkg-config)
+-FUZZY=
 -
 -if test -z $AUTOCONF; then
 -    echo "autoconf is missing: please install it and try again"
 -    exit
+-else
+-    V=`autoconf --version | head -1 | cut -d ' ' -f 4`
+-    if [ "$V" = '2.63' ]; then
+-        FUZZY="dnl> "
+-    fi
 -fi
 -
 -if test -z $AUTOMAKE; then
 -    echo "automake is missing: please install it and try again"
 -    exit
 -fi
 -
 -if test -z $LIBTOOL && test -z $LIBTOOLIZE ; then
 -    echo "libtool and libtoolize is missing: please install it and try again"
 -    exit
 -fi
 -
 -if test -z $AUTORECONF; then
 -    echo "autoreconf is missing: please install it and try again"
 -    exit
 -fi
 -
+-if test -z $PKG_CONFIG; then
+-    echo "pkg-config is missing: please install it (apt-get install pkg-config) and try again"
+-    exit
+-fi
+-
  cat configure.seed | sed \
      -e "s/@NDPI_MAJOR@/$NDPI_MAJOR/g" \
      -e "s/@NDPI_MINOR@/$NDPI_MINOR/g" \
-     -e "s/@NDPI_PATCH@/$NDPI_PATCH/g" \
+@@ -52,11 +12,3 @@ cat configure.seed | sed \
      -e "s/@NDPI_VERSION_SHORT@/$NDPI_VERSION_SHORT/g" \
+     -e "s/@FUZZY@/$FUZZY/g" \
      > configure.ac
 -
 -autoreconf -ivf
 -cat configure | sed "s/#define PACKAGE/#define NDPI_PACKAGE/g" | sed "s/#define VERSION/#define NDPI_VERSION/g"  > configure.tmp
 -cat configure.tmp > configure
 -
 -chmod +x configure
--./configure $*
+-./configure $@
+-
Index: head/net/ndpi/files/patch-example_Makefile.in
===================================================================
--- head/net/ndpi/files/patch-example_Makefile.in	(revision 553200)
+++ head/net/ndpi/files/patch-example_Makefile.in	(revision 553201)
@@ -1,30 +1,42 @@
---- example/Makefile.in.orig	2020-03-24 12:39:12 UTC
+--- example/Makefile.in.orig	2020-10-19 14:18:25 UTC
 +++ example/Makefile.in
-@@ -8,11 +8,12 @@ HEADERS=intrusion_detection.h reader_util.h $(SRCHOME)
+@@ -9,17 +9,12 @@ HEADERS=intrusion_detection.h reader_util.h $(SRCHOME)
          $(SRCHOME)/include/ndpi_typedefs.h $(SRCHOME)/include/ndpi_protocol_ids.h
  OBJS=ndpiReader.o reader_util.o intrusion_detection.o
  PREFIX?=@prefix@
 +EXAMPLESDIR?=share/examples/ndpi
  
+-ifneq ($(BUILD_MINGW),)
+-all:
+-	@echo 'Examples disabled due to mingw build.'
+-
+-else
+-
  all: ndpiReader @DPDK_TARGET@
  
- EXECUTABLE_SOURCES := ndpiReader.c
+ EXECUTABLE_SOURCES := ndpiReader.c ndpiSimpleIntegration.c
 -COMMON_SOURCES := $(filter-out $(EXECUTABLE_SOURCES),$(wildcard *.c ))
 +COMMON_SOURCES=intrusion_detection.c reader_util.c
  
  libndpiReader.a: $(COMMON_SOURCES:%.c=%.o) $(LIBNDPI)
  	ar rsv libndpiReader.a $(COMMON_SOURCES:%.c=%.o)
-@@ -25,10 +26,10 @@ ndpiReader: libndpiReader.a $(LIBNDPI) $(EXECUTABLE_SO
+@@ -35,10 +30,10 @@ ndpiSimpleIntegration: ndpiSimpleIntegration.o
  
- install:
+ install: ndpiReader
  	mkdir -p $(DESTDIR)$(PREFIX)/bin/
 -	mkdir -p $(DESTDIR)$(PREFIX)/share/ndpi
 +	mkdir -p $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/
  	cp ndpiReader $(DESTDIR)$(PREFIX)/bin/
 -	cp protos.txt $(DESTDIR)$(PREFIX)/share/ndpi/ndpiProtos.txt
 -	cp mining_hosts.txt $(DESTDIR)$(PREFIX)/share/ndpi/ndpiCustomCategory.txt
 +	cp protos.txt $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/ndpiProtos.txt
 +	cp mining_hosts.txt $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/ndpiCustomCategory.txt
  	[ -f build/app/ndpiReader.dpdk ] && cp build/app/ndpiReader.dpdk $(DESTDIR)$(PREFIX)/bin/ || true
  	[ -f ndpiReader.dpdk ] && cp ndpiReader.dpdk $(DESTDIR)$(PREFIX)/bin/ || true
  
+@@ -61,5 +56,3 @@ distdir:
+ distclean: clean
+ 	/bin/rm -f Makefile.dpdk
+ 	/bin/rm -f Makefile
+-
+-endif
Index: head/net/ndpi/files/patch-src_lib_Makefile.in
===================================================================
--- head/net/ndpi/files/patch-src_lib_Makefile.in	(revision 553200)
+++ head/net/ndpi/files/patch-src_lib_Makefile.in	(revision 553201)
@@ -1,31 +1,37 @@
 -	/bin/rm -f libndpi.a $(OBJECTS)
 new file mode 100644
---- src/lib/Makefile.in.orig	2019-10-21 13:36:38 UTC
+--- src/lib/Makefile.in.orig	2020-10-19 14:18:25 UTC
 +++ src/lib/Makefile.in
-@@ -17,24 +17,15 @@ CC         = @CC@
- CFLAGS     += -fPIC -DPIC -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION -O2 -g -Wall
+@@ -18,30 +18,17 @@ CFLAGS     += -fPIC -DPIC -I../include -Ithird_party/i
+ LDFLAGS    = @LDFLAGS@ @ADDITIONAL_LIBS@ @LIBS@
  RANLIB     = ranlib
  
 -OBJECTS   = $(patsubst protocols/%.c, protocols/%.o, $(wildcard protocols/*.c)) $(patsubst third_party/src/%.c, third_party/src/%.o, $(wildcard third_party/src/*.c)) $(patsubst ./%.c, ./%.o, $(wildcard ./*.c))
 -HEADERS   = $(wildcard ../include/*.h)
 +OBJECTS != ls protocols/*.c | sed 's/\(.*\)\.c$$/\1.o/' && ls third_party/src/*.c | sed '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
  NDPI_LIB_SHARED      = $(NDPI_LIB_SHARED_BASE).@NDPI_VERSION_SHORT@
  NDPI_LIBS            = $(NDPI_LIB_STATIC) $(NDPI_LIB_SHARED)
  
 -ifneq ($(OS),Windows_NT)
 -OS := $(shell uname)
 -endif
--
+ BUILD_MINGW    		 = @BUILD_MINGW@
+ 
 -ifeq ($(OS),Darwin)
 -CC=clang
 -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)
+-endif
 -endif
  
  all: $(NDPI_LIBS)
  
Index: head/net/ndpi/pkg-plist
===================================================================
--- head/net/ndpi/pkg-plist	(revision 553200)
+++ head/net/ndpi/pkg-plist	(revision 553201)
@@ -1,19 +1,20 @@
 bin/ndpiReader
 include/ndpi/ndpi_api.h
 include/ndpi/ndpi_classify.h
 include/ndpi/ndpi_config.h
 include/ndpi/ndpi_define.h
 include/ndpi/ndpi_includes.h
+include/ndpi/ndpi_includes_OpenBSD.h
 include/ndpi/ndpi_main.h
 include/ndpi/ndpi_protocol_ids.h
 include/ndpi/ndpi_protocols.h
 include/ndpi/ndpi_typedefs.h
 include/ndpi/ndpi_unix.h
 include/ndpi/ndpi_win32.h
 lib/libndpi.a
 lib/libndpi.so
 lib/libndpi.so.%%MAJOR_VER%%
 lib/libndpi.so.%%VER%%.0
 libdata/pkgconfig/libndpi.pc
 %%EXAMPLESDIR%%/ndpiCustomCategory.txt
 %%EXAMPLESDIR%%/ndpiProtos.txt
Index: head/net/ntopng/Makefile
===================================================================
--- head/net/ntopng/Makefile	(revision 553200)
+++ head/net/ntopng/Makefile	(revision 553201)
@@ -1,63 +1,63 @@
 # Created by: Muhammad Moinur Rahman <5u623l20@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	ntopng
-PORTVERSION=	4.0.d20200917
+PORTVERSION=	4.0.d20201019
 PORTEPOCH=	1
 CATEGORIES=	net
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Network monitoring tool with command line and web interfaces
 
 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=	bash:shells/bash
 
 USES=		autoreconf compiler:c++11-lang cpe gmake libtool localbase \
 		mysql pathfix pkgconfig shebangfix sqlite ssl
 
 SUB_FILES=	ntopng-geoip2update.sh pkg-deinstall
 SHEBANG_FILES=	httpdocs/misc/ntopng-add-user.sh \
 		httpdocs/misc/ntopng-utils-manage-config.in
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ndpi-includes=${LOCALBASE}/include/ndpi
 
 USERS=		ntopng
 GROUPS=		ntopng
 PLIST_SUB=	NTOPNGUSER="${USERS}" NTOPNGROUP="${GROUPS}"
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ntop
-GH_TAGNAME=	17bc5c0
+GH_TAGNAME=	882b255
 
 CPE_VENDOR=	ntop
 
 OPTIONS_DEFINE=	NLS
 
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 
 USE_RC_SUBR=	ntopng
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/bind(/::bind(/' \
 		${WRKSRC}/src/SyslogCollectorInterface.cpp
 	cd ${WRKSRC} && ${SH} autogen.sh
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ntopng
 	${MKDIR} ${STAGEDIR}/var/db/ntopng
 	${INSTALL_SCRIPT} ${WRKDIR}/ntopng-geoip2update.sh ${STAGEDIR}${PREFIX}/bin
 	${RM} ${STAGEDIR}${DATADIR}/httpdocs/misc/ntopng-utils-manage-updates \
 		${STAGEDIR}${DATADIR}/httpdocs/misc/ntopng-utils-manage-updates.in
 
 .include <bsd.port.mk>
Index: head/net/ntopng/distinfo
===================================================================
--- head/net/ntopng/distinfo	(revision 553200)
+++ head/net/ntopng/distinfo	(revision 553201)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601472514
-SHA256 (ntop-ntopng-4.0.d20200917-17bc5c0_GH0.tar.gz) = f5edb75e6f1b8c09c7531b9684078cf4ceb0d3cbadfbbaae455d476e01dac62e
-SIZE (ntop-ntopng-4.0.d20200917-17bc5c0_GH0.tar.gz) = 43417733
+TIMESTAMP = 1603197726
+SHA256 (ntop-ntopng-4.0.d20201019-882b255_GH0.tar.gz) = 2fdd1eeb3b7cb67be71e4410e8b8ec8062fc873fdf34a53bb8886fb0e3a43b6b
+SIZE (ntop-ntopng-4.0.d20201019-882b255_GH0.tar.gz) = 43417332