Stop using boost/detail/endian.hpp

4 files changed, 50 insertions, 5 deletions

diff --git a/math/xylib/distinfo b/math/xylib/distinfo
index 7a2c7d771ca..6605bf05c12 100644
--- a/math/xylib/distinfo
+++ b/math/xylib/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.9 2020/01/07 13:35:44 nros Exp $
+$NetBSD: distinfo,v 1.10 2020/05/09 15:19:02 joerg Exp $
 
 SHA1 (xylib-1.5.tar.bz2) = 980b962cb07d93090c1cc6694ce9dc66952854aa
 RMD160 (xylib-1.5.tar.bz2) = 881945873e8d927b8e058ebce634631b24b7d62b
 SHA512 (xylib-1.5.tar.bz2) = 67da8653b422fa4b5ffdc9fe19d23f49e36e2692fb3aa98e130511cfe6db46b8e81b30d45cf302a1fe8b6d1a9b776d3c364ecdabb6489f1d7518e2736b6e2210
 Size (xylib-1.5.tar.bz2) = 365316 bytes
 SHA1 (patch-Makefile.in) = 607a06800f945aa5e406e4b0e4f32809e48ed2cf
+SHA1 (patch-configure) = 6ff770c0ccae9ed19514a7abba6c47e030296617
+SHA1 (patch-configure.ac) = cc05a0ec1abf7cca08719c831398eaaa43957cf4
 SHA1 (patch-gui_xyconvert.cpp) = 6739098920d2abbb63a8b0abd9dd89b0b4f4684e
-SHA1 (patch-xylib_util.cpp) = 822208cda9a88d1a0912908f1a5871800496e16f
+SHA1 (patch-xylib_util.cpp) = dbdecf2f2694f6febb036be0c9720260eb93f898
diff --git a/math/xylib/patches/patch-configure b/math/xylib/patches/patch-configure
new file mode 100644
index 00000000000..c9204366442
--- /dev/null
+++ b/math/xylib/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2020/05/09 15:19:02 joerg Exp $
+
+--- configure.orig	2020-05-09 14:31:13.578115502 +0000
++++ configure
+@@ -16883,8 +16883,8 @@ else
+ fi
+ 
+ 
+-ac_fn_cxx_check_header_mongrel "$LINENO" "boost/detail/endian.hpp" "ac_cv_header_boost_detail_endian_hpp" "$ac_includes_default"
+-if test "x$ac_cv_header_boost_detail_endian_hpp" = xyes; then :
++ac_fn_cxx_check_header_mongrel "$LINENO" "boost/predef/other/endian.h" "ac_cv_header_boost_predef_other_endian_h" "$ac_includes_default"
++if test "x$ac_cv_header_boost_predef_other_endian_h" = xyes; then :
+ 
+ else
+   as_fn_error $? "Could not find necessary Boost headers" "$LINENO" 5
diff --git a/math/xylib/patches/patch-configure.ac b/math/xylib/patches/patch-configure.ac
new file mode 100644
index 00000000000..7a8fa2dbb9b
--- /dev/null
+++ b/math/xylib/patches/patch-configure.ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-configure.ac,v 1.1 2020/05/09 15:19:02 joerg Exp $
+
+--- configure.ac.orig	2020-05-09 14:30:20.178602785 +0000
++++ configure.ac
+@@ -68,7 +68,7 @@ AC_CHECK_HEADER([climits], [],
+                 [AC_MSG_ERROR([Could not find necessary C++ libs headers])])
+ AC_CHECK_HEADER([boost/cstdint.hpp], [],
+                 [AC_MSG_ERROR([Could not find necessary Boost headers])])
+-AC_CHECK_HEADER([boost/detail/endian.hpp], [],
++AC_CHECK_HEADER([boost/predef/other/endian.h], [],
+                 [AC_MSG_ERROR([Could not find necessary Boost headers])])
+ AC_CHECK_HEADER([boost/spirit/version.hpp], [],
+                 [AC_MSG_ERROR([Boost::Spirit headers were not found.])])
diff --git a/math/xylib/patches/patch-xylib_util.cpp b/math/xylib/patches/patch-xylib_util.cpp
index 0188343329d..42b5bc2d148 100644
--- a/math/xylib/patches/patch-xylib_util.cpp
+++ b/math/xylib/patches/patch-xylib_util.cpp
@@ -1,14 +1,29 @@
-$NetBSD: patch-xylib_util.cpp,v 1.1 2020/01/07 13:03:50 nros Exp $
+$NetBSD: patch-xylib_util.cpp,v 1.2 2020/05/09 15:19:02 joerg Exp $
 
 * cstdlib needed for strol
 
 --- xylib/util.cpp.orig	2016-12-17 12:45:55.000000000 +0000
 +++ xylib/util.cpp
-@@ -10,6 +10,7 @@
+@@ -10,10 +10,11 @@
  #include <limits>
  #include <cassert>
  #include <cerrno>
+-#include <boost/detail/endian.hpp>
 +#include <cstdlib>
- #include <boost/detail/endian.hpp>
++#include <boost/predef/other/endian.h>
  #include <boost/cstdint.hpp>
  
+-#if !defined(BOOST_LITTLE_ENDIAN) && !defined(BOOST_BIG_ENDIAN)
++#if !BOOST_ENDIAN_LITTLE_BYTE && !BOOST_ENDIAN_BIG_BYTE
+ #error "Unknown endianness"
+ #endif
+ 
+@@ -71,7 +72,7 @@ void my_read(istream &f, char *buf, int 
+ 
+ // change the byte-order from "little endian" to host endian
+ // ptr: pointer to the data, size - size in bytes
+-#if defined(BOOST_BIG_ENDIAN)
++#if BOOST_ENDIAN_BIG_BYTE
+ void le_to_host(void *ptr, int size)
+ {
+     char *p = (char*) ptr;