Index: head/net/ndpi/Makefile =================================================================== --- head/net/ndpi/Makefile (revision 388697) +++ head/net/ndpi/Makefile (revision 388698) @@ -1,29 +1,33 @@ # Created by: Muhammad Moinur Rahman <5u623l20@gmail.com> # $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@FreeBSD.org COMMENT= NTOP-maintained superset of the popular OpenDPI library LICENSE= GPLv3 LIB_DEPENDS= libjson-c.so:${PORTSDIR}/devel/json-c CONFIGURE_ARGS= --with-pic CPPFLAGS+= -I${LOCALBASE}/include/json-c 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 Index: head/net/ndpi/distinfo =================================================================== --- head/net/ndpi/distinfo (revision 388697) +++ head/net/ndpi/distinfo (revision 388698) @@ -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 Index: head/net/ndpi/files/patch-configure =================================================================== --- head/net/ndpi/files/patch-configure (revision 388697) +++ head/net/ndpi/files/patch-configure (nonexistent) @@ -1,18 +0,0 @@ ---- configure.orig 2014-08-16 00:57:46.212599224 +0600 -+++ configure 2014-08-16 00:58:17.728596731 +0600 -@@ -12620,13 +12620,8 @@ - - - --if test -d ".svn"; then : --SVN_RELEASE=`svn info . | grep "^Revision"|cut -d " " -f 2` --SVN_DATE=`svn info . | grep "^Last Changed Date"|cut -d " " -f 4-` --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 Property changes on: head/net/ndpi/files/patch-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/net/ndpi/files/patch-configure.ac =================================================================== --- head/net/ndpi/files/patch-configure.ac (nonexistent) +++ head/net/ndpi/files/patch-configure.ac (revision 388698) @@ -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]) Property changes on: head/net/ndpi/files/patch-configure.ac ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property