CVS commit: pkgsrc

["Min Sik Kim" <minskim%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   minskim
Date:           Sun May  6 18:46:09 UTC 2018

Modified Files:
        pkgsrc/devel/boost-headers: Makefile
        pkgsrc/meta-pkgs/boost: distinfo
Added Files:
        pkgsrc/meta-pkgs/boost/patches:
            patch-boost_wave_cpplexer_re2clex_cpp__re.hpp

Log Message:
devel/boost-headers: Fix wave on FreeBSD

https://github.com/boostorg/wave/commit/0e25913e


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/devel/boost-headers/Makefile
cvs rdiff -u -r1.117 -r1.118 pkgsrc/meta-pkgs/boost/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/meta-pkgs/boost/patches/patch-boost_wave_cpplexer_re2clex_cpp__re.hpp

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

Modified files:

Index: pkgsrc/devel/boost-headers/Makefile
diff -u pkgsrc/devel/boost-headers/Makefile:1.49 pkgsrc/devel/boost-headers/Makefile:1.50
--- pkgsrc/devel/boost-headers/Makefile:1.49    Sat May  5 03:47:33 2018
+++ pkgsrc/devel/boost-headers/Makefile Sun May  6 18:46:09 2018
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.49 2018/05/05 03:47:33 minskim Exp $
+# $NetBSD: Makefile,v 1.50 2018/05/06 18:46:09 minskim Exp $
 
 BOOST_PACKAGE=         headers
 BOOST_COMMENT=         (build-time headers)
 BOOST_CONFIG=          generate
 
 .include "../../meta-pkgs/boost/Makefile.common"
-PKGREVISION=           3
+PKGREVISION=           4
 
 BJAM_ARGS+=            --without-\*
 

Index: pkgsrc/meta-pkgs/boost/distinfo
diff -u pkgsrc/meta-pkgs/boost/distinfo:1.117 pkgsrc/meta-pkgs/boost/distinfo:1.118
--- pkgsrc/meta-pkgs/boost/distinfo:1.117       Sat May  5 03:47:33 2018
+++ pkgsrc/meta-pkgs/boost/distinfo     Sun May  6 18:46:09 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.117 2018/05/05 03:47:33 minskim Exp $
+$NetBSD: distinfo,v 1.118 2018/05/06 18:46:09 minskim Exp $
 
 SHA1 (boost_1_67_0.tar.bz2) = 694ae3f4f899d1a80eb7a3b31b33be73c423c1ae
 RMD160 (boost_1_67_0.tar.bz2) = d5bf97b8a953b87c08e367556856204a05346315
@@ -25,6 +25,7 @@ SHA1 (patch-boost_stacktrace_detail_coll
 SHA1 (patch-boost_stacktrace_detail_frame__unwind.ipp) = 0b06b1a1b28decbe61a6f6891b91c6751ff647e1
 SHA1 (patch-boost_stacktrace_detail_location__from__symbol.hpp) = 860bfd99ffce4f6462683fc344d43850632cb6c1
 SHA1 (patch-boost_test_impl_execution__monitor.ipp) = 573e2c8a4575ce1fc50338ddff0968e1c3ed1a61
+SHA1 (patch-boost_wave_cpplexer_re2clex_cpp__re.hpp) = 3f8c14994e68b9aa0efbfc9153e20e9285938d2f
 SHA1 (patch-boostcpp.jam) = f624d0bede17c61de9758033705eaff94d42775b
 SHA1 (patch-libs_config_configure) = e2f204d4fa4f1bd9b4131d28f9be0a1ac22bf711
 SHA1 (patch-libs_config_test_boost__no__range__based__for.ipp) = d9936c472fc2c696d86522b36eb12813ae91bee4

Added files:

Index: pkgsrc/meta-pkgs/boost/patches/patch-boost_wave_cpplexer_re2clex_cpp__re.hpp
diff -u /dev/null pkgsrc/meta-pkgs/boost/patches/patch-boost_wave_cpplexer_re2clex_cpp__re.hpp:1.1
--- /dev/null   Sun May  6 18:46:09 2018
+++ pkgsrc/meta-pkgs/boost/patches/patch-boost_wave_cpplexer_re2clex_cpp__re.hpp        Sun May  6 18:46:09 2018
@@ -0,0 +1,18 @@
+$NetBSD: patch-boost_wave_cpplexer_re2clex_cpp__re.hpp,v 1.1 2018/05/06 18:46:09 minskim Exp $
+
+Avoid using wrong T_DIVIDE on BSDs.
+
+https://github.com/boostorg/wave/commit/0e25913e
+
+--- boost/wave/cpplexer/re2clex/cpp_re.hpp.orig        2018-04-11 13:49:09.000000000 +0000
++++ boost/wave/cpplexer/re2clex/cpp_re.hpp
+@@ -373,6 +373,9 @@ boost::wave::token_id scan(Scanner<Itera
+     string_type   rawstringdelim;         // for use with C++11 raw string literals
+ 
+ // include the correct Re2C token definition rules
++#if (defined (__FreeBSD__) || defined (__DragonFly__) || defined (__OpenBSD__)) && defined (T_DIVIDE)
++#undef T_DIVIDE
++#endif
+ #if BOOST_WAVE_USE_STRICT_LEXER != 0
+ #include "strict_cpp_re.inc"
+ #else