svn commit: r334651 - in head/net/tcpflow: . files

[Antoine Brodin]

Author: antoine
Date: Sat Nov 23 09:25:06 2013
New Revision: 334651
URL: http://svnweb.freebsd.org/changeset/ports/334651

Log:
  Update to 1.4.2

Added:
  head/net/tcpflow/files/patch-src__wifipcap__wifipcap.cpp   (contents, props changed)
Deleted:
  head/net/tcpflow/files/patch-src__be13_api__plugin.cpp
  head/net/tcpflow/files/patch-src__tcpdemux.h
Modified:
  head/net/tcpflow/Makefile
  head/net/tcpflow/distinfo

Modified: head/net/tcpflow/Makefile
==============================================================================
--- head/net/tcpflow/Makefile	Sat Nov 23 09:21:43 2013	(r334650)
+++ head/net/tcpflow/Makefile	Sat Nov 23 09:25:06 2013	(r334651)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tcpflow
-PORTVERSION=	1.4.0
+PORTVERSION=	1.4.2
 CATEGORIES=	net
 MASTER_SITES=	http://www.digitalcorpora.org/downloads/${PORTNAME}/
 
@@ -14,6 +14,7 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/icl/interval.hpp:${PORTSDIR}/devel/boost-libs
 LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
 
+USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -25,11 +26,6 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*}
-# Needed for __sync_add_and_fetch_8
-CFLAGS+=	-march=i586
-.endif
-
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Modified: head/net/tcpflow/distinfo
==============================================================================
--- head/net/tcpflow/distinfo	Sat Nov 23 09:21:43 2013	(r334650)
+++ head/net/tcpflow/distinfo	Sat Nov 23 09:25:06 2013	(r334651)
@@ -1,2 +1,2 @@
-SHA256 (tcpflow-1.4.0.tar.gz) = e177ccca0e683ffd3311317e9062b7d1116be45a8d7b2a92e7896c26a49997e1
-SIZE (tcpflow-1.4.0.tar.gz) = 407046
+SHA256 (tcpflow-1.4.2.tar.gz) = afe55ee4aba76a156120b80f6bacbd981ea1772022b4e811433cac29bc7797de
+SIZE (tcpflow-1.4.2.tar.gz) = 434157

Added: head/net/tcpflow/files/patch-src__wifipcap__wifipcap.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/tcpflow/files/patch-src__wifipcap__wifipcap.cpp	Sat Nov 23 09:25:06 2013	(r334651)
@@ -0,0 +1,16 @@
+--- ./src/wifipcap/wifipcap.cpp.orig	2013-11-18 02:20:51.000000000 +0000
++++ ./src/wifipcap/wifipcap.cpp	2013-11-22 21:47:50.000000000 +0000
+@@ -2213,6 +2213,13 @@
+ const char *Wifipcap::SetFilter(const char *filter)
+ {
+     struct bpf_program fp;
++/*
++ * libpcap from FreeBSD 8 does not have PCAP_NETMASK_UNKNOWN
++ * According to pcap_compile(3) a value of 0 can be supplied
++ */
++#ifndef PCAP_NETMASK_UNKNOWN
++#define PCAP_NETMASK_UNKNOWN 0
++#endif
+     bpf_u_int32 netp=PCAP_NETMASK_UNKNOWN;
+ 
+     if(pcap_compile(descr,&fp,(char *)filter,0,netp) == -1) {