Date: Thu, 11 Jun 2015 09:31:54 -0400 From: Renato Botelho <garga@FreeBSD.org> To: Muhammad Moinur Rahman <bofh@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r388698 - in head/net/ndpi: . files Message-ID: <C4CE252E-E825-4C30-ADDC-6FC62F19FA3D@FreeBSD.org> In-Reply-To: <201506071329.t57DTIto051845@svn.freebsd.org> References: <201506071329.t57DTIto051845@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> On Jun 7, 2015, at 09:29, Muhammad Moinur Rahman <bofh@FreeBSD.org> = wrote: >=20 > Author: bofh > Date: Sun Jun 7 13:29:17 2015 > New Revision: 388698 > URL: https://svnweb.freebsd.org/changeset/ports/388698 >=20 > Log: > net/ndpi: Update version 1.5.1=3D>1.6 >=20 > - Update DISTNAME according to upstream >=20 > 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 >=20 > Modified: head/net/ndpi/Makefile > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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$ >=20 > PORTNAME=3D ndpi > -PORTVERSION=3D 1.5.1 > +PORTVERSION=3D 1.6 > CATEGORIES=3D net > MASTER_SITES=3D SF/ntop/nDPI > -DISTNAME=3D libndpi-${PORTVERSION} > +DISTNAME=3D nDPI-${PORTVERSION} >=20 > MAINTAINER=3D bofh@FreeBSD.org > COMMENT=3D NTOP-maintained superset of the popular OpenDPI library > @@ -20,10 +20,14 @@ LDFLAGS+=3D -L${LOCALBASE}/lib > LIBS+=3D -ljson-c > GNU_CONFIGURE=3D yes > USE_LDCONFIG=3D yes > -USES=3D libtool pathfix pkgconfig compiler:c++11-lang > -WRKSRC=3D ${WRKDIR}/libndpi-${PORTVERSION} > +USES=3D autoreconf libtool pathfix pkgconfig = compiler:c++11-lang > +WRKSRC=3D ${WRKDIR}/nDPI-${PORTVERSION} > INSTALL_TARGET=3D install-strip >=20 > -PLIST_SUB=3D MAJOR_VER=3D${PORTVERSION} > +PLIST_SUB=3D MAJOR_VER=3D${PORTVERSION}.0 > + > +post-patch: > + ${REINPLACE_CMD} 's|$$(libdir)|$$(libdir)data|' \ > + ${WRKSRC}/Makefile.am >=20 > .include <bsd.port.mk> >=20 > Modified: head/net/ndpi/distinfo > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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) =3D = 32f15bcb273ddaead6cb3d57b47e1afa3cb20bb363d61ef294c5aa57a9c07e58 > -SIZE (libndpi-1.5.1.tar.gz) =3D 516961 > +SHA256 (nDPI-1.6.tar.gz) =3D = 0e2201d0d003ac5df0de904f8e4df149ca55a59e708a32ce55500be92a031444 > +SIZE (nDPI-1.6.tar.gz) =3D 3943963 >=20 > Added: head/net/ndpi/files/patch-configure.ac > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- /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 > +=20 > +-if test -d ".git"; then : > +- GIT_TAG=3D`git log -1 --format=3D%h` > +- GIT_DATE=3D`git log -1 --format=3D%cd` > +- # > +- # On CentOS 6 `git rev-list HEAD --count` does not work > +- #=20 > +- # > +- GIT_NUM=3D`git log --pretty=3Doneline | wc -l` > +- GIT_BRANCH=3D`git rev-parse --abbrev-ref HEAD` > +- = GIT_RELEASE=3D"${PACKAGE_VERSION}-${GIT_BRANCH}-${GIT_NUM}-${GIT_TAG}" > +-else > +- GIT_RELEASE=3D"${PACKAGE_VERSION}" > +- GIT_DATE=3D`date` > +-fi > ++GIT_TAG=3D"a31b0a3" > ++GIT_DATE=3D"Sun May 31 19:50:52 2015 +0200" > ++GIT_NUM=3D"62" > ++GIT_BRANCH=3D"master" > ++GIT_RELEASE=3D"${PACKAGE_VERSION}-${GIT_BRANCH}-${GIT_NUM}-${GIT_TAG}"= > +=20 > + AC_DEFINE_UNQUOTED(NDPI_GIT_RELEASE, "${GIT_RELEASE}", [GIT = Release]) > + AC_DEFINE_UNQUOTED(NDPI_GIT_DATE, "${GIT_DATE}", [Last GIT change]) >=20 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?C4CE252E-E825-4C30-ADDC-6FC62F19FA3D>