6 files changed, 27 insertions, 57 deletions
diff --git a/net/ndpi/Makefile b/net/ndpi/Makefile
index 482c3008ba6..13989dc78b6 100644
--- a/net/ndpi/Makefile
+++ b/net/ndpi/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2020/05/19 12:09:08 nia Exp $
+# $NetBSD: Makefile,v 1.8 2020/05/25 20:25:22 adam Exp $
 
-DISTNAME=	nDPI-2.8
+DISTNAME=	nDPI-3.2
 PKGNAME=	${DISTNAME:tl}
-PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ntop/}
 GITHUB_PROJECT=	nDPI
diff --git a/net/ndpi/PLIST b/net/ndpi/PLIST
index 165072bf2d4..8c107bc6872 100644
--- a/net/ndpi/PLIST
+++ b/net/ndpi/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2019/07/12 09:30:34 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/05/25 20:25:22 adam Exp $
 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
@@ -13,5 +14,7 @@ include/ndpi/ndpi_win32.h
 lib/libndpi.a
 lib/libndpi.so
 lib/libndpi.so.${PKGVERSION}.0
-lib/libndpi.so.2
+lib/libndpi.so.3
 lib/pkgconfig/libndpi.pc
+share/ndpi/ndpiCustomCategory.txt
+share/ndpi/ndpiProtos.txt
diff --git a/net/ndpi/distinfo b/net/ndpi/distinfo
index 03a6d80a3d1..b87bc09f6c5 100644
--- a/net/ndpi/distinfo
+++ b/net/ndpi/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.5 2019/07/12 09:30:34 adam Exp $
+$NetBSD: distinfo,v 1.6 2020/05/25 20:25:22 adam Exp $
 
-SHA1 (nDPI-2.8.tar.gz) = 5b5f613cf55deeb040483f7c04ede7a2ed415c26
-RMD160 (nDPI-2.8.tar.gz) = c26bfadeee1db4abbf86a06fdfa338cbfaf42d9b
-SHA512 (nDPI-2.8.tar.gz) = aae757047810bbc32700ecf7ac2e5df4b93528021a50da4a0b83865a5248dfca8b1643c75aa7eeb6eac4f155638d45666db487318b2be9adb2f3412cb8ec8497
-Size (nDPI-2.8.tar.gz) = 19754226 bytes
-SHA1 (patch-Makefile.am) = 3f4649a55e519a21e1c5b645669f1febcef82d4e
-SHA1 (patch-configure.seed) = 154f2d6a690bd6e7e01862769bcf0fa4b1a86ad6
+SHA1 (nDPI-3.2.tar.gz) = 47ea3ac4a17afba1c7dd54bc8ec7a116031f16ef
+RMD160 (nDPI-3.2.tar.gz) = aaabdaf8b626925b85b880617b55143b9f6a3e8e
+SHA512 (nDPI-3.2.tar.gz) = bf3a6e66479110b8e1a51a3b66cc0a85aef98af455f2895a75fe2a8b06a9fb72a4dca3d4bbfa6f44959c5043c038927a1a8acb312e881d4e2bb544dc84b6eea8
+Size (nDPI-3.2.tar.gz) = 29586049 bytes
 SHA1 (patch-src_include_ndpi__includes.h) = db5da9ca24ecf32fd8c264e193af280814dc74c6
-SHA1 (patch-src_lib_Makefile.in) = 458e095e55a3b6f24166813a249350a32a1e0589
+SHA1 (patch-src_lib_Makefile.in) = 70431a2fb53675d221f1383afa86759a2dfd4bfc
diff --git a/net/ndpi/patches/patch-Makefile.am b/net/ndpi/patches/patch-Makefile.am
deleted file mode 100644
index 21642a9fd11..00000000000
--- a/net/ndpi/patches/patch-Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Makefile.am,v 1.1 2019/07/12 09:30:34 adam Exp $
-
-Use standard pkgconfigdir.
-
---- Makefile.am.orig	2019-07-11 10:20:02.000000000 +0000
-+++ Makefile.am
-@@ -1,7 +1,7 @@
- ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = src/lib example tests
- 
--pkgconfigdir = $(prefix)/libdata/pkgconfig
-+pkgconfigdir = $(prefix)/lib/pkgconfig
- pkgconfig_DATA = libndpi.pc
- 
- EXTRA_DIST = autogen.sh
diff --git a/net/ndpi/patches/patch-configure.seed b/net/ndpi/patches/patch-configure.seed
deleted file mode 100644
index 486b4c76530..00000000000
--- a/net/ndpi/patches/patch-configure.seed
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure.seed,v 1.2 2019/07/12 09:30:34 adam Exp $
-
-Portability fix.
-
---- configure.seed.orig	2019-03-01 17:04:18.000000000 +0000
-+++ configure.seed
-@@ -124,7 +124,7 @@ AC_ARG_ENABLE([json-c],
- AS_IF([test "x$enable_json_c" != "xno"], [
-        PKG_CONFIG_PATH=/usr/local/share/pkgconfig:$PKG_CONFIG_PATH
-        pkg-config --exists json-c
--       AS_IF([test "$?" == "0"],
-+       AS_IF([test "$?" = "0"],
-              [
-               CFLAGS="$CFLAGS $(pkg-config --cflags json-c)"
-               LDFLAGS="$LDFLAGS $(pkg-config --libs json-c)"
diff --git a/net/ndpi/patches/patch-src_lib_Makefile.in b/net/ndpi/patches/patch-src_lib_Makefile.in
index 7857650b6a1..b931e46c66d 100644
--- a/net/ndpi/patches/patch-src_lib_Makefile.in
+++ b/net/ndpi/patches/patch-src_lib_Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_lib_Makefile.in,v 1.2 2019/07/12 09:30:34 adam Exp $
+$NetBSD: patch-src_lib_Makefile.in,v 1.3 2020/05/25 20:25:22 adam Exp $
 
 Fix building on Darwin.
 
---- src/lib/Makefile.in.orig	2019-03-01 17:04:18.000000000 +0000
+--- src/lib/Makefile.in.orig	2020-02-20 09:15:44.000000000 +0000
 +++ src/lib/Makefile.in
-@@ -21,8 +21,15 @@ OBJECTS   = $(patsubst protocols/%.c, pr
+@@ -22,8 +22,15 @@ OBJECTS   = $(patsubst protocols/%.c, pr
  HEADERS   = $(wildcard ../include/*.h)
  NDPI_VERSION_MAJOR   = @NDPI_MAJOR@
  NDPI_LIB_STATIC      = libndpi.a
@@ -20,7 +20,7 @@ Fix building on Darwin.
  NDPI_LIBS            = $(NDPI_LIB_STATIC) $(NDPI_LIB_SHARED)
  
  ifneq ($(OS),Windows_NT)
-@@ -30,8 +37,7 @@ OS := $(shell uname)
+@@ -31,8 +38,7 @@ OS := $(shell uname)
  endif
  
  ifeq ($(OS),Darwin)
@@ -30,20 +30,20 @@ Fix building on Darwin.
  else
  SONAME_FLAG=-Wl,-soname,$(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR)
  endif
-@@ -47,7 +53,7 @@ $(NDPI_LIB_STATIC): $(OBJECTS)
+@@ -48,7 +54,7 @@ $(NDPI_LIB_STATIC): $(OBJECTS)
  $(NDPI_LIB_SHARED): $(OBJECTS)
- 	$(CC) -shared -fPIC $(SONAME_FLAG) -o $@ $(OBJECTS)
- 	ln -Ffs $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_BASE)
--	ln -Ffs $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR)
-+	ln -Ffs $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_SHORT)
+ 	$(CC) -shared -fPIC $(SONAME_FLAG) -o $@ $(OBJECTS) $(LDFLAGS) @ADDITIONAL_LIBS@
+ 	ln -fs $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_BASE)
+-	ln -fs $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR)
++	ln -fs $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_SHORT)
  
  %.o: %.c $(HEADERS) Makefile
- 	$(CC) $(CFLAGS) -c $< -o $@
-@@ -62,6 +68,6 @@ install: $(NDPI_LIBS)
+ 	$(CC) $(CFLAGS) -c $< -o $@ $(LDFLAGS)
+@@ -66,6 +72,6 @@ install: $(NDPI_LIBS)
  	mkdir -p $(DESTDIR)$(libdir)
  	cp $(NDPI_LIBS) $(DESTDIR)$(libdir)/
- 	ln -Ffs $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE)
--	ln -Ffs $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR)
-+	ln -Ffs $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_SHORT)
+ 	cp -P $(NDPI_LIB_SHARED_BASE) $(DESTDIR)$(libdir)/
+-	cp -P $(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR) $(DESTDIR)$(libdir)/
++	cp -P $(NDPI_LIB_SHARED_SHORT) $(DESTDIR)$(libdir)/
  	mkdir -p $(DESTDIR)$(includedir)
  	cp ../include/*.h $(DESTDIR)$(includedir)