CVS commit: pkgsrc/net/tcpflow

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri Jul 14 12:58:25 UTC 2017

Modified Files:
        pkgsrc/net/tcpflow: distinfo
Added Files:
        pkgsrc/net/tcpflow/patches: patch-src_be13__api_beregex.cpp
            patch-src_dfxml_src_dfxml__writer.cpp

Log Message:
Deal with libtre without tre.h.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/tcpflow/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/tcpflow/patches/patch-src_be13__api_beregex.cpp \
    pkgsrc/net/tcpflow/patches/patch-src_dfxml_src_dfxml__writer.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/tcpflow/distinfo
diff -u pkgsrc/net/tcpflow/distinfo:1.8 pkgsrc/net/tcpflow/distinfo:1.9
--- pkgsrc/net/tcpflow/distinfo:1.8     Tue Jul  4 13:50:41 2017
+++ pkgsrc/net/tcpflow/distinfo Fri Jul 14 12:58:25 2017
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.8 2017/07/04 13:50:41 jperkin Exp $
+$NetBSD: distinfo,v 1.9 2017/07/14 12:58:25 joerg Exp $
 
 SHA1 (tcpflow-1.4.5.tar.gz) = a86ca927ec68e7a05cdc0da436e365504fdab27b
 RMD160 (tcpflow-1.4.5.tar.gz) = 2f30ea47f301fb4737fc3911c1d94f8c53e5db0f
 SHA512 (tcpflow-1.4.5.tar.gz) = e31b278b8f4e97b6d1ffb6f8f145a56806963271ab96204ba555ab88049dedc5a13adf78b7775e96e92fe48bbf5116781810cef0d3374231764af059fc09dd97
 Size (tcpflow-1.4.5.tar.gz) = 450450 bytes
 SHA1 (patch-configure) = 1cd65ab0ae845d908813773bcc6bc5f3fbd135d0
+SHA1 (patch-src_be13__api_beregex.cpp) = 72edfaae9a55ba5eae250061125744e0d83bebe0
+SHA1 (patch-src_dfxml_src_dfxml__writer.cpp) = 2cda94ad1446ea5fdc9b3712433bb0db747eab11
 SHA1 (patch-src_tcpip.cpp) = 0ff720b2192ba879c390bb5f82d0e0e240e26078
 SHA1 (patch-tests_test-multifile.sh) = 7c614f53a6664b74540ee54f7cb61dfa3934d978

Added files:

Index: pkgsrc/net/tcpflow/patches/patch-src_be13__api_beregex.cpp
diff -u /dev/null pkgsrc/net/tcpflow/patches/patch-src_be13__api_beregex.cpp:1.1
--- /dev/null   Fri Jul 14 12:58:25 2017
+++ pkgsrc/net/tcpflow/patches/patch-src_be13__api_beregex.cpp  Fri Jul 14 12:58:25 2017
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_be13__api_beregex.cpp,v 1.1 2017/07/14 12:58:25 joerg Exp $
+
+--- src/be13_api/beregex.cpp.orig      2017-07-12 22:51:30.689369147 +0000
++++ src/be13_api/beregex.cpp
+@@ -9,7 +9,7 @@
+ #include <unistd.h>
+ 
+ 
+-#if defined(HAVE_LIBTRE) && defined(HAVE_TRE_REGCOMP)
++#if defined(HAVE_LIBTRE) && defined(HAVE_TRE_REGCOMP) && defined(HAVE_TRE_TRE_H)
+ #define REGCOMP tre_regcomp
+ #define REGFREE tre_regfree
+ #define REGEXEC tre_regexec
Index: pkgsrc/net/tcpflow/patches/patch-src_dfxml_src_dfxml__writer.cpp
diff -u /dev/null pkgsrc/net/tcpflow/patches/patch-src_dfxml_src_dfxml__writer.cpp:1.1
--- /dev/null   Fri Jul 14 12:58:25 2017
+++ pkgsrc/net/tcpflow/patches/patch-src_dfxml_src_dfxml__writer.cpp    Fri Jul 14 12:58:25 2017
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_dfxml_src_dfxml__writer.cpp,v 1.1 2017/07/14 12:58:25 joerg Exp $
+
+--- src/dfxml/src/dfxml_writer.cpp.orig        2017-07-12 22:50:57.618132822 +0000
++++ src/dfxml/src/dfxml_writer.cpp
+@@ -710,7 +710,7 @@ void dfxml_writer::add_DFXML_build_envir
+ #ifdef HAVE_EXIV2
+     xmlout("library", "", std::string("name=\"exiv2\" version=\"") + Exiv2::version() + "\"",false);
+ #endif
+-#if defined(HAVE_LIBTRE) && defined(HAVE_TRE_VERSION)
++#if defined(HAVE_LIBTRE) && defined(HAVE_TRE_VERSION) && defined(HAVE_TRE_TRE_H)
+     xmlout("library", "", std::string("name=\"tre\" version=\"") + tre_version() + "\"",false);
+ #endif
+ #ifdef HAVE_HASHID