- Update to 1.5.1

PR:		193418
Submitted by:	Muhammad Moinur Rahman <5u623l20@gmail.com> (maintainer)

4 files changed, 14 insertions, 59 deletions

diff --git a/net/ndpi/Makefile b/net/ndpi/Makefile
index bbb2625c16dc..7e6ac381abc5 100644
--- a/net/ndpi/Makefile
+++ b/net/ndpi/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	ndpi
-PORTVERSION=	1.5.0
+PORTVERSION=	1.5.1
 CATEGORIES=	net
 MASTER_SITES=	SF/ntop/nDPI
-DISTNAME=	libndpi-${PORTVERSION}_r8115
+DISTNAME=	libndpi-${PORTVERSION}
 
 MAINTAINER=	5u623l20@gmail.com
 COMMENT=	NTOP-maintained superset of the popular OpenDPI library
@@ -22,10 +22,8 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USES=	 	libtool pathfix pkgconfig compiler:c++11-lang
 WRKSRC=		${WRKDIR}/libndpi-${PORTVERSION}
+INSTALL_TARGET=	install-strip
 
 PLIST_SUB=	MAJOR_VER=${PORTVERSION}
 
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libndpi.so.1.0.0
-
 .include <bsd.port.mk>
diff --git a/net/ndpi/distinfo b/net/ndpi/distinfo
index b9823db11a2d..9cbff7aeab17 100644
--- a/net/ndpi/distinfo
+++ b/net/ndpi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libndpi-1.5.0_r8115.tar.gz) = c37b572b1a46643bfc127af197735c47c7895517ab397a4e5489c0ea82602740
-SIZE (libndpi-1.5.0_r8115.tar.gz) = 1140853
+SHA256 (libndpi-1.5.1.tar.gz) = 32f15bcb273ddaead6cb3d57b47e1afa3cb20bb363d61ef294c5aa57a9c07e58
+SIZE (libndpi-1.5.1.tar.gz) = 516961
diff --git a/net/ndpi/files/patch-configure b/net/ndpi/files/patch-configure
index 3fdeb35bf1e2..dd167683c42d 100644
--- a/net/ndpi/files/patch-configure
+++ b/net/ndpi/files/patch-configure
@@ -1,18 +1,18 @@
 --- configure.orig	2014-08-16 00:57:46.212599224 +0600
 +++ configure	2014-08-16 00:58:17.728596731 +0600
-@@ -12619,13 +12619,13 @@
+@@ -12620,13 +12620,8 @@
  
  
  
+-if test -d ".svn"; then :
 -SVN_RELEASE=`svn info . | grep "^Revision"|cut -d " " -f 2`
-+SVN_RELEASE="2014-08-13 21:10:03 +0600 (Wed, 13 Aug 2014)"
- 
- cat >>confdefs.h <<_ACEOF
- #define NDPI_SVN_RELEASE "r${SVN_RELEASE}"
- _ACEOF
- 
 -SVN_DATE=`svn info . | grep "^Last Changed Date"|cut -d " " -f 4-`
-+SVN_DATE="8122"
+-else
+-SVN_RELEASE="${PACKAGE_VERSION}"
+-SVN_DATE=`date`
+-fi
++SVN_RELEASE="8210"
++SVN_DATE="2014-09-06 23:19:42 +0600 (Sat, 06 Sep 2014)"
+ 
  
  cat >>confdefs.h <<_ACEOF
- #define NDPI_SVN_DATE "${SVN_DATE}"
diff --git a/net/ndpi/files/patch-example_Makefile.in b/net/ndpi/files/patch-example_Makefile.in
deleted file mode 100644
index 48bf8ff6c676..000000000000
--- a/net/ndpi/files/patch-example_Makefile.in
+++ /dev/null
@@ -1,43 +0,0 @@
---- example/Makefile.in.orig	2014-08-16 02:17:06.480271669 +0600
-+++ example/Makefile.in	2014-08-16 02:20:49.689257564 +0600
-@@ -98,8 +98,7 @@
- am_ndpiReader_OBJECTS = ndpiReader.$(OBJEXT)
- ndpiReader_OBJECTS = $(am_ndpiReader_OBJECTS)
- ndpiReader_LDADD = $(LDADD)
--ndpiReader_DEPENDENCIES = $(top_builddir)/src/lib/libndpi.la \
--	third-party/json-c/libjson-c.la
-+ndpiReader_DEPENDENCIES = $(top_builddir)/src/lib/libndpi.la
- AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
-@@ -287,9 +286,9 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--AM_CPPFLAGS = -I$(top_srcdir)/src/include -I third-party/json-c
-+AM_CPPFLAGS = -I$(top_srcdir)/src/include
- AM_CFLAGS = @PTHREAD_CFLAGS@
--LDADD = $(top_builddir)/src/lib/libndpi.la third-party/json-c/libjson-c.la @PTHREAD_LIBS@
-+LDADD = $(top_builddir)/src/lib/libndpi.la @PTHREAD_LIBS@
- ndpiReader_SOURCES = ndpiReader.c
- EXTRA_DIST = third-party
- all: all-am
-@@ -627,17 +626,11 @@
- 
- 
- # Explictely state that to build ndpiReader.o we first need json_config.h.
--ndpiReader.o: third-party/json-c/libjson-c.la
--
--third-party/json-c/libjson-c.la:
--	cd third-party/json-c && ./configure
--	cd third-party/json-c && make libjson-c.la
-+ndpiReader.o:
- 
- clean-local:
--	cd third-party/json-c && make clean
- 
- distclean-local:
--	cd third-party/json-c && make distclean
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.