CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   minskim
Date:           Sat May  5 03:47:33 UTC 2018

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

Log Message:
devel/boost-headers: Fix an incorrect line in a patch

The patch file deleted a backslash incorrectly, breaking the packages
using the header file it patched on some platforms.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/devel/boost-headers/Makefile
cvs rdiff -u -r1.116 -r1.117 pkgsrc/meta-pkgs/boost/distinfo
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/meta-pkgs/boost/patches/patch-boost_math_tools_config.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.48 pkgsrc/devel/boost-headers/Makefile:1.49
--- pkgsrc/devel/boost-headers/Makefile:1.48    Tue May  1 15:43:08 2018
+++ pkgsrc/devel/boost-headers/Makefile Sat May  5 03:47:33 2018
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.48 2018/05/01 15:43:08 minskim Exp $
+# $NetBSD: Makefile,v 1.49 2018/05/05 03:47:33 minskim Exp $
 
 BOOST_PACKAGE=         headers
 BOOST_COMMENT=         (build-time headers)
 BOOST_CONFIG=          generate
 
 .include "../../meta-pkgs/boost/Makefile.common"
-PKGREVISION=           2
+PKGREVISION=           3
 
 BJAM_ARGS+=            --without-\*
 

Index: pkgsrc/meta-pkgs/boost/distinfo
diff -u pkgsrc/meta-pkgs/boost/distinfo:1.116 pkgsrc/meta-pkgs/boost/distinfo:1.117
--- pkgsrc/meta-pkgs/boost/distinfo:1.116       Tue May  1 15:43:08 2018
+++ pkgsrc/meta-pkgs/boost/distinfo     Sat May  5 03:47:33 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.116 2018/05/01 15:43:08 minskim Exp $
+$NetBSD: distinfo,v 1.117 2018/05/05 03:47:33 minskim Exp $
 
 SHA1 (boost_1_67_0.tar.bz2) = 694ae3f4f899d1a80eb7a3b31b33be73c423c1ae
 RMD160 (boost_1_67_0.tar.bz2) = d5bf97b8a953b87c08e367556856204a05346315
@@ -17,7 +17,7 @@ SHA1 (patch-boost_core_noncopyable.hpp) 
 SHA1 (patch-boost_lockfree_spsc__queue.hpp) = 095a2375d3e7c18203b7b4eae23413edc38a80a4
 SHA1 (patch-boost_math_special__functions_expm1.hpp) = 724fbd40b3780da8af6ce10bbf50a354eb19031a
 SHA1 (patch-boost_math_special__functions_log1p.hpp) = df6fd088da736a4640663b64841383432f1a1201
-SHA1 (patch-boost_math_tools_config.hpp) = b2c14003444a015d494a87a5f48750ce95dd6d14
+SHA1 (patch-boost_math_tools_config.hpp) = 9d7ef331414526057a6ac1a0ba1af815f017dfc3
 SHA1 (patch-boost_numeric_ublas_storage.hpp) = 282b5a3b5d09216ded14fae166169d64db72590e
 SHA1 (patch-boost_property__tree_detail_xml__parser__read__rapidxml.hpp) = 3499fcc37e72396d23a9fce0f1c97891adf12a9f
 SHA1 (patch-boost_regex_config.hpp) = 6b752c7c23168c591cd391739c7a4539bef44c12

Index: pkgsrc/meta-pkgs/boost/patches/patch-boost_math_tools_config.hpp
diff -u pkgsrc/meta-pkgs/boost/patches/patch-boost_math_tools_config.hpp:1.5 pkgsrc/meta-pkgs/boost/patches/patch-boost_math_tools_config.hpp:1.6
--- pkgsrc/meta-pkgs/boost/patches/patch-boost_math_tools_config.hpp:1.5        Sun Apr 29 20:41:11 2018
+++ pkgsrc/meta-pkgs/boost/patches/patch-boost_math_tools_config.hpp    Sat May  5 03:47:33 2018
@@ -1,21 +1,19 @@
-$NetBSD: patch-boost_math_tools_config.hpp,v 1.5 2018/04/29 20:41:11 adam Exp $
+$NetBSD: patch-boost_math_tools_config.hpp,v 1.6 2018/05/05 03:47:33 minskim Exp $
 
 Enable 'long double' support on NetBSD.
 NetBSD does not have int128_t, log1pl, etc.
 
---- boost/math/tools/config.hpp.orig   2017-04-17 02:22:22.000000000 +0000
+--- boost/math/tools/config.hpp.orig   2018-04-11 13:49:04.000000000 +0000
 +++ boost/math/tools/config.hpp
-@@ -28,8 +28,8 @@
+@@ -28,7 +28,7 @@
  
  #include <boost/math/tools/user.hpp>
  
 -#if (defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__NetBSD__) \
--   || (defined(__hppa) && !defined(__OpenBSD__)) || (defined(__NO_LONG_DOUBLE_MATH) && (DBL_MANT_DIG != LDBL_MANT_DIG))) \
 +#if (defined(__CYGWIN__) || defined(__FreeBSD__) \
-+   || (defined(__hppa) && !defined(__OpenBSD__)) || (defined(__NO_LONG_DOUBLE_MATH) && (DBL_MANT_DIG != LDBL_MANT_DIG)))
+    || (defined(__hppa) && !defined(__OpenBSD__)) || (defined(__NO_LONG_DOUBLE_MATH) && (DBL_MANT_DIG != LDBL_MANT_DIG))) \
     && !defined(BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS)
  #  define BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
- #endif
 @@ -103,7 +103,7 @@
  #  define BOOST_MATH_NO_DEDUCED_FUNCTION_POINTERS
  #endif