svn commit: r388698 - in head/net/ndpi: . files

[Renato Botelho]

> On Jun 7, 2015, at 09:29, Muhammad Moinur Rahman <bofh at FreeBSD.org> wrote:
> 
> Author: bofh
> Date: Sun Jun  7 13:29:17 2015
> New Revision: 388698
> URL: https://svnweb.freebsd.org/changeset/ports/388698
> 
> Log:
>  net/ndpi: Update version 1.5.1=>1.6
> 
>  - Update DISTNAME according to upstream
> 
> Added:
>  head/net/ndpi/files/patch-configure.ac   (contents, props changed)
> Deleted:
>  head/net/ndpi/files/patch-configure
> Modified:
>  head/net/ndpi/Makefile
>  head/net/ndpi/distinfo
> 
> Modified: head/net/ndpi/Makefile
> ==============================================================================
> --- head/net/ndpi/Makefile	Sun Jun  7 13:13:53 2015	(r388697)
> +++ head/net/ndpi/Makefile	Sun Jun  7 13:29:17 2015	(r388698)
> @@ -2,10 +2,10 @@
> # $FreeBSD$
> 
> PORTNAME=	ndpi
> -PORTVERSION=	1.5.1
> +PORTVERSION=	1.6
> CATEGORIES=	net
> MASTER_SITES=	SF/ntop/nDPI
> -DISTNAME=	libndpi-${PORTVERSION}
> +DISTNAME=	nDPI-${PORTVERSION}
> 
> MAINTAINER=	bofh at FreeBSD.org
> COMMENT=	NTOP-maintained superset of the popular OpenDPI library
> @@ -20,10 +20,14 @@ LDFLAGS+=	-L${LOCALBASE}/lib
> LIBS+=		-ljson-c
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> -USES=	 	libtool pathfix pkgconfig compiler:c++11-lang
> -WRKSRC=		${WRKDIR}/libndpi-${PORTVERSION}
> +USES=	 	autoreconf libtool pathfix pkgconfig compiler:c++11-lang
> +WRKSRC=		${WRKDIR}/nDPI-${PORTVERSION}
> INSTALL_TARGET=	install-strip
> 
> -PLIST_SUB=	MAJOR_VER=${PORTVERSION}
> +PLIST_SUB=	MAJOR_VER=${PORTVERSION}.0
> +
> +post-patch:
> +	${REINPLACE_CMD} 's|$$(libdir)|$$(libdir)data|' \
> +		${WRKSRC}/Makefile.am
> 
> .include <bsd.port.mk>
> 
> Modified: head/net/ndpi/distinfo
> ==============================================================================
> --- head/net/ndpi/distinfo	Sun Jun  7 13:13:53 2015	(r388697)
> +++ head/net/ndpi/distinfo	Sun Jun  7 13:29:17 2015	(r388698)
> @@ -1,2 +1,2 @@
> -SHA256 (libndpi-1.5.1.tar.gz) = 32f15bcb273ddaead6cb3d57b47e1afa3cb20bb363d61ef294c5aa57a9c07e58
> -SIZE (libndpi-1.5.1.tar.gz) = 516961
> +SHA256 (nDPI-1.6.tar.gz) = 0e2201d0d003ac5df0de904f8e4df149ca55a59e708a32ce55500be92a031444
> +SIZE (nDPI-1.6.tar.gz) = 3943963
> 
> Added: head/net/ndpi/files/patch-configure.ac
> ==============================================================================
> --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> +++ head/net/ndpi/files/patch-configure.ac	Sun Jun  7 13:29:17 2015	(r388698)
> @@ -0,0 +1,28 @@
> +--- configure.ac.orig	2015-06-06 19:48:47 UTC
> ++++ configure.ac
> +@@ -9,20 +9,11 @@ LT_INIT
> + AC_PROG_CC
> + AX_PTHREAD
> + 
> +-if test -d ".git"; then :
> +-     GIT_TAG=`git log -1 --format=%h`
> +-     GIT_DATE=`git log -1 --format=%cd`
> +-     #
> +-     # On CentOS 6 `git rev-list HEAD --count` does not work
> +-     # 
> +-     #
> +-     GIT_NUM=`git log --pretty=oneline | wc -l`
> +-     GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`
> +-     GIT_RELEASE="${PACKAGE_VERSION}-${GIT_BRANCH}-${GIT_NUM}-${GIT_TAG}"
> +-else
> +-     GIT_RELEASE="${PACKAGE_VERSION}"
> +-     GIT_DATE=`date`
> +-fi
> ++GIT_TAG="a31b0a3"
> ++GIT_DATE="Sun May 31 19:50:52 2015 +0200"
> ++GIT_NUM="62"
> ++GIT_BRANCH="master"
> ++GIT_RELEASE="${PACKAGE_VERSION}-${GIT_BRANCH}-${GIT_NUM}-${GIT_TAG}"
> + 
> + AC_DEFINE_UNQUOTED(NDPI_GIT_RELEASE, "${GIT_RELEASE}", [GIT Release])
> + AC_DEFINE_UNQUOTED(NDPI_GIT_DATE, "${GIT_DATE}", [Last GIT change])
> 

This change broke ntopng build:

NetworkInterface.cpp:138:5: error: no matching function for call to 'ndpi_set_proto_defaults'
    ndpi_set_proto_defaults(ndpi_struct, NTOPNG_NDPI_OS_PROTO_ID,
    ^~~~~~~~~~~~~~~~~~~~~~~
/usr/local/include/libndpi-1.6.0/libndpi/ndpi_main.h:120:13: note: candidate function not viable: requires 8 arguments, but 5 were provided
extern void ndpi_set_proto_defaults(struct ndpi_detection_module_struct *ndpi_mod,
            ^
1 error generated.
Makefile:69: recipe for target 'NetworkInterface.o' failed
gmake[1]: *** [NetworkInterface.o] Error 1
gmake[1]: Leaving directory '/wrkdirs/usr/ports/net/ntopng/work/ntopng-1.2.1'
*** Error code 1


--
Renato Botelho