Attachment #145858 for bug #192700

Lines 2-23 Link Here

(-)./Makefile (-6 / +22 lines)
2	# $FreeBSD: head/net/ndpi/Makefile 360559 2014-07-04 07:38:53Z amdmi3 $	2	# $FreeBSD: head/net/ndpi/Makefile 360559 2014-07-04 07:38:53Z amdmi3 $
3		3
4	PORTNAME= ndpi	4	PORTNAME= ndpi
5	PORTVERSION= 1.4.0	5	PORTVERSION= 1.5.0
6	PORTREVISION= 1
7	CATEGORIES= net	6	CATEGORIES= net
8	MASTER_SITES= SF/ntop/nDPI	7	MASTER_SITES= SF/ntop/nDPI
9	DISTNAME= nDPI-${PORTVERSION}_r7023	8	DISTNAME= libndpi-${PORTVERSION}_r8115
10		9
11	MAINTAINER= 5u623l20@gmail.com	10	MAINTAINER= 5u623l20@gmail.com
12	COMMENT= ntop-maintained superset of the popular OpenDPI library	11	COMMENT= NTOP-maintained superset of the popular OpenDPI library
13		12
14	LICENSE= GPLv3	13	LICENSE= GPLv3
15		14
		15	LIB_DEPENDS= libjson-c.so:${PORTSDIR}/devel/json-c
		16
16	CONFIGURE_ARGS= --with-pic	17	CONFIGURE_ARGS= --with-pic
		18	CPPFLAGS+= -I${LOCALBASE}/include/json-c
		19	LDFLAGS+= -L${LOCALBASE}/lib
		20	LIBS+= -ljson-c
17	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
18	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
19	USES= libtool pathfix pkgconfig	23	USES= libtool pathfix pkgconfig
		24	WRKSRC= ${WRKDIR}/libndpi-${PORTVERSION}
		25
		26	PLIST_SUB= MAJOR_VER=${PORTVERSION}
		27
		28	.include <bsd.port.pre.mk>
		29	.if ${OSVERSION} < 1000000
		30	BUILD_DEPENDS+= llvm-config33:${PORTSDIR}/devel/llvm33 \
		31	clang++33:${PORTSDIR}/lang/clang33
		32	CC= clang33
		33	CXX= clang++33
		34	.endif
20		35
21	PLIST_SUB= MAJOR_VER=${PORTVERSION:R}	36	post-install:
		37	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libndpi.so.1.0.0
22		38
23	.include <bsd.port.mk>	39	.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (nDPI-1.4.0_r7023.tar.gz) = a06b45cbe9336d40acb7892a3399f41e7e341a37fd2526d0b242587d21bd4197	1	SHA256 (libndpi-1.5.0_r8115.tar.gz) = c37b572b1a46643bfc127af197735c47c7895517ab397a4e5489c0ea82602740
2	SIZE (nDPI-1.4.0_r7023.tar.gz) = 522464	2	SIZE (libndpi-1.5.0_r8115.tar.gz) = 1140853




--- configure.orig	2014-08-16 00:57:46.212599224 +0600
+++ configure	2014-08-16 00:58:17.728596731 +0600
@@ -12619,13 +12619,13 @@
 
 
 
-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"
 
 cat >>confdefs.h <<_ACEOF
 #define NDPI_SVN_DATE "${SVN_DATE}"




--- 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.

Lines 1-13 Link Here

(-)./pkg-plist (-5 / +9 lines)
		1	bin/ndpiReader
		2	include/libndpi-%%MAJOR_VER%%/libndpi/linux_compat.h
1	include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_api.h	3	include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_api.h
2	include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_debug_functions.h
3	include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_define.h	4	include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_define.h
4	include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_macros.h	5	include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_main.h
5	include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_protocols_osdpi.h	6	include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_protocol_ids.h
6	include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_public_functions.h	7	include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_protocols.h
		8	include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_typedefs.h
		9	include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_unix.h
		10	include/libndpi-%%MAJOR_VER%%/libndpi/ndpi_win32.h
7	lib/libndpi.a	11	lib/libndpi.a
8	lib/libndpi.so	12	lib/libndpi.so
9	lib/libndpi.so.1	13	lib/libndpi.so.1
10	lib/libndpi.so.1.0.4	14	lib/libndpi.so.1.0.0
11	libdata/pkgconfig/libndpi.pc	15	libdata/pkgconfig/libndpi.pc
12	@dirrm include/libndpi-%%MAJOR_VER%%/libndpi	16	@dirrm include/libndpi-%%MAJOR_VER%%/libndpi
13	@dirrm include/libndpi-%%MAJOR_VER%%	17	@dirrm include/libndpi-%%MAJOR_VER%%

Return to bug 192700

Line 0 Link Here

(-)./files/patch-configure (+18 lines)
	1	--- configure.orig 2014-08-16 00:57:46.212599224 +0600
	2	+++ configure 2014-08-16 00:58:17.728596731 +0600
	3	@@ -12619,13 +12619,13 @@
	4
	5
	6
	7	-SVN_RELEASE=`svn info . \| grep "^Revision"\|cut -d " " -f 2`
	8	+SVN_RELEASE="2014-08-13 21:10:03 +0600 (Wed, 13 Aug 2014)"
	9
	10	cat >>confdefs.h <<_ACEOF
	11	#define NDPI_SVN_RELEASE "r${SVN_RELEASE}"
	12	_ACEOF
	13
	14	-SVN_DATE=`svn info . \| grep "^Last Changed Date"\|cut -d " " -f 4-`
	15	+SVN_DATE="8122"
	16
	17	cat >>confdefs.h <<_ACEOF
	18	#define NDPI_SVN_DATE "${SVN_DATE}"

Line 0 Link Here

(-)./files/patch-example_Makefile.in (+43 lines)
	1	--- example/Makefile.in.orig 2014-08-16 02:17:06.480271669 +0600
	2	+++ example/Makefile.in 2014-08-16 02:20:49.689257564 +0600
	3	@@ -98,8 +98,7 @@
	4	am_ndpiReader_OBJECTS = ndpiReader.$(OBJEXT)
	5	ndpiReader_OBJECTS = $(am_ndpiReader_OBJECTS)
	6	ndpiReader_LDADD = $(LDADD)
	7	-ndpiReader_DEPENDENCIES = $(top_builddir)/src/lib/libndpi.la \
	8	- third-party/json-c/libjson-c.la
	9	+ndpiReader_DEPENDENCIES = $(top_builddir)/src/lib/libndpi.la
	10	AM_V_lt = $(am__v_lt_@AM_V@)
	11	am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
	12	am__v_lt_0 = --silent
	13	@@ -287,9 +286,9 @@
	14	top_build_prefix = @top_build_prefix@
	15	top_builddir = @top_builddir@
	16	top_srcdir = @top_srcdir@
	17	-AM_CPPFLAGS = -I$(top_srcdir)/src/include -I third-party/json-c
	18	+AM_CPPFLAGS = -I$(top_srcdir)/src/include
	19	AM_CFLAGS = @PTHREAD_CFLAGS@
	20	-LDADD = $(top_builddir)/src/lib/libndpi.la third-party/json-c/libjson-c.la @PTHREAD_LIBS@
	21	+LDADD = $(top_builddir)/src/lib/libndpi.la @PTHREAD_LIBS@
	22	ndpiReader_SOURCES = ndpiReader.c
	23	EXTRA_DIST = third-party
	24	all: all-am
	25	@@ -627,17 +626,11 @@
	26
	27
	28	# Explictely state that to build ndpiReader.o we first need json_config.h.
	29	-ndpiReader.o: third-party/json-c/libjson-c.la
	30	-
	31	-third-party/json-c/libjson-c.la:
	32	- cd third-party/json-c && ./configure
	33	- cd third-party/json-c && make libjson-c.la
	34	+ndpiReader.o:
	35
	36	clean-local:
	37	- cd third-party/json-c && make clean
	38
	39	distclean-local:
	40	- cd third-party/json-c && make distclean
	41
	42	# Tell versions [3.59,3.63) of GNU make to not export all variables.
	43	# Otherwise a system limit (for SysV at least) may be exceeded.