5 files changed, 20 insertions, 95 deletions

diff --git a/net/tcpflow/Makefile b/net/tcpflow/Makefile
index 47c85896c635..ef3de68a0db4 100644
--- a/net/tcpflow/Makefile
+++ b/net/tcpflow/Makefile
@@ -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}
diff --git a/net/tcpflow/distinfo b/net/tcpflow/distinfo
index 1af40242c2c2..fbc2ca233d85 100644
--- a/net/tcpflow/distinfo
+++ b/net/tcpflow/distinfo
@@ -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
diff --git a/net/tcpflow/files/patch-src__be13_api__plugin.cpp b/net/tcpflow/files/patch-src__be13_api__plugin.cpp
deleted file mode 100644
index cc2a9d695bf9..000000000000
--- a/net/tcpflow/files/patch-src__be13_api__plugin.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
---- ./src/be13_api/plugin.cpp.orig	2013-08-03 16:58:46.000000000 +0000
-+++ ./src/be13_api/plugin.cpp	2013-09-07 22:32:02.000000000 +0000
-@@ -9,7 +9,16 @@
- #include <sys/stat.h>
- #include <dirent.h>
- #include <algorithm>
-+#ifdef __clang__
-+#if __has_include(<unordered_set>)
-+#define HAVE_CXX11_UNORDERED_SET 1
-+#endif
-+#endif
-+#ifdef HAVE_CXX11_UNORDERED_SET
-+#include <unordered_set>
-+#else
- #include <tr1/unordered_set>
-+#endif
- #ifdef HAVE_ERR_H
- #include <err.h>
- #endif
-@@ -23,20 +32,28 @@
- #include "../dfxml/src/hash_t.h"
- 
- namespace std {
-+#ifndef HAVE_CXX11_UNORDERED_SET
-     namespace tr1 {
-+#endif
-         template<>
-         struct hash<md5_t> {
-             size_t operator()(const md5_t &key) const {
-                 return *(size_t *)(key.final());
-             }
-         };
-+#ifndef HAVE_CXX11_UNORDERED_SET
-     }
-+#endif
- }
- 
- class atomic_hash_set 
- {
-     cppmutex M;
-+#ifdef HAVE_CXX11_UNORDERED_SET
-+    std::unordered_set<md5_t>myset;
-+#else
-     std::tr1::unordered_set<md5_t>myset;
-+#endif
- public:
-     atomic_hash_set():M(),myset(){}
-     bool in(const md5_t &s){
diff --git a/net/tcpflow/files/patch-src__tcpdemux.h b/net/tcpflow/files/patch-src__tcpdemux.h
deleted file mode 100644
index d967b5a9191d..000000000000
--- a/net/tcpflow/files/patch-src__tcpdemux.h
+++ /dev/null
@@ -1,39 +0,0 @@
---- ./src/tcpdemux.h.orig	2013-05-27 22:28:50.000000000 +0000
-+++ ./src/tcpdemux.h	2013-09-07 22:32:29.000000000 +0000
-@@ -20,8 +20,18 @@
- #include "pcap_writer.h"
- #include "dfxml/src/dfxml_writer.h"
- #include "dfxml/src/hash_t.h"
-+#ifdef __clang__
-+#if __has_include(<unordered_set>)
-+#define HAVE_CXX11_UNORDERED_SET 1
-+#endif
-+#endif
-+#ifdef HAVE_CXX11_UNORDERED_SET
-+#include <unordered_map>
-+#include <unordered_set>
-+#else
- #include <tr1/unordered_map>
- #include <tr1/unordered_set>
-+#endif
- #include <queue>
- 
- 
-@@ -53,10 +63,17 @@
-         bool operator() (const flow_addr &x, const flow_addr &y) const { return x==y;}
-     } flow_addr_key_eq;
- 
-+#ifdef HAVE_CXX11_UNORDERED_SET
-+    typedef std::unordered_set<class tcpip *> tcpset;
-+    typedef std::vector<class saved_flow *> saved_flows_t; // needs to be ordered
-+    typedef std::unordered_map<flow_addr,tcpip *,flow_addr_hash,flow_addr_key_eq> flow_map_t; // active flows
-+    typedef std::unordered_map<flow_addr,saved_flow *,flow_addr_hash,flow_addr_key_eq> saved_flow_map_t; // flows that have been saved
-+#else
-     typedef std::tr1::unordered_set<class tcpip *> tcpset;
-     typedef std::vector<class saved_flow *> saved_flows_t; // needs to be ordered
-     typedef std::tr1::unordered_map<flow_addr,tcpip *,flow_addr_hash,flow_addr_key_eq> flow_map_t; // active flows
-     typedef std::tr1::unordered_map<flow_addr,saved_flow *,flow_addr_hash,flow_addr_key_eq> saved_flow_map_t; // flows that have been saved
-+#endif
-     tcpdemux();
- public:
-     static uint32_t tcp_timeout;
diff --git a/net/tcpflow/files/patch-src__wifipcap__wifipcap.cpp b/net/tcpflow/files/patch-src__wifipcap__wifipcap.cpp
new file mode 100644
index 000000000000..e9817beca3f1
--- /dev/null
+++ b/net/tcpflow/files/patch-src__wifipcap__wifipcap.cpp
@@ -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) {