One more step towards passing test. Still fails for long options to

ctags.

3 files changed, 41 insertions, 1 deletions

diff --git a/textproc/source-highlight/distinfo b/textproc/source-highlight/distinfo
index afabc8b3e3c..f421b964862 100644
--- a/textproc/source-highlight/distinfo
+++ b/textproc/source-highlight/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.26 2020/04/18 23:11:08 joerg Exp $
+$NetBSD: distinfo,v 1.27 2020/04/19 01:17:11 joerg Exp $
 
 SHA1 (source-highlight-3.1.8.tar.gz) = 55b814ec09674ef7f5ab42c46b2ae5a0f86f7c9b
 RMD160 (source-highlight-3.1.8.tar.gz) = a6e0ad1713deb2056984a97adc7dfd0e6610809f
 SHA512 (source-highlight-3.1.8.tar.gz) = 00a49ab180460750614b38be9a569478d1d34d01f601ebc7452a4fee8475a19faf9bb9fb2f256c6b40d43fbc3d34962a77ba8b9833483345c4e4a42faad6976c
 Size (source-highlight-3.1.8.tar.gz) = 1648351 bytes
+SHA1 (patch-lib_tests_stdboosterror.h) = 3948726a1e358bfcf83a8529c4a9b452c2907e62
+SHA1 (patch-lib_tests_test__wordtokenizer__main.cpp) = 8ccf9b0a2b4dae17c99e933a2c20e2cb6c512928
 SHA1 (patch-tests_valgrind__suppressions.sh.in) = f3bd3b94b74d198ce0ac2cf81a688835fa940323
diff --git a/textproc/source-highlight/patches/patch-lib_tests_stdboosterror.h b/textproc/source-highlight/patches/patch-lib_tests_stdboosterror.h
new file mode 100644
index 00000000000..472c61fdb1c
--- /dev/null
+++ b/textproc/source-highlight/patches/patch-lib_tests_stdboosterror.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_tests_stdboosterror.h,v 1.1 2020/04/19 01:17:11 joerg Exp $
+
+Make sure that it actually declares a variable.
+
+--- lib/tests/stdboosterror.h.orig	2020-04-18 23:28:34.703528997 +0000
++++ lib/tests/stdboosterror.h
+@@ -4,7 +4,7 @@
+ #include <boost/regex/pattern_except.hpp>
+ 
+ static boost::regex_error
+-        std_boost_exception(boost::regex_error(boost::regex_constants::error_bad_pattern));
++        std_boost_exception = boost::regex_error(boost::regex_constants::error_bad_pattern);
+ 
+ /**
+  * returns the string representing a standard exception (which
diff --git a/textproc/source-highlight/patches/patch-lib_tests_test__wordtokenizer__main.cpp b/textproc/source-highlight/patches/patch-lib_tests_test__wordtokenizer__main.cpp
new file mode 100644
index 00000000000..3e034a87d9b
--- /dev/null
+++ b/textproc/source-highlight/patches/patch-lib_tests_test__wordtokenizer__main.cpp
@@ -0,0 +1,23 @@
+$NetBSD: patch-lib_tests_test__wordtokenizer__main.cpp,v 1.1 2020/04/19 01:17:11 joerg Exp $
+
+operator<< must be defined before call site.
+
+--- lib/tests/test_wordtokenizer_main.cpp.orig	2020-04-18 23:43:49.550865959 +0000
++++ lib/tests/test_wordtokenizer_main.cpp
+@@ -6,13 +6,14 @@
+ 
+ #include "asserttestexit.h"
+ #include "srchilite/wordtokenizer.h"
++
++static std::ostream &operator <<(std::ostream &os, const srchilite::WordTokenizer::WordTokenizerResults::value_type &);
++
+ #include "srchilite/tostringcollection.h"
+ 
+ using namespace std;
+ using namespace srchilite;
+ 
+-static ostream &operator <<(ostream &os, const WordTokenizer::WordTokenizerResults::value_type &);
+-
+ ostream &operator <<(ostream &os, const WordTokenizer::WordTokenizerResults::value_type &token) {
+     if (token.first.size()) {
+         os << "space: \"" << token.first << "\"" << endl;