diff options
-rw-r--r-- | devel/boost-build/PLIST | 5 | ||||
-rw-r--r-- | devel/boost-build/buildlink3.mk | 4 | ||||
-rw-r--r-- | devel/boost-headers/PLIST | 147 | ||||
-rw-r--r-- | devel/boost-headers/buildlink3.mk | 4 | ||||
-rw-r--r-- | devel/boost-jam/buildlink3.mk | 4 | ||||
-rw-r--r-- | devel/boost-libs/Makefile | 3 | ||||
-rw-r--r-- | devel/boost-libs/buildlink3.mk | 8 | ||||
-rw-r--r-- | devel/boost-libs/hacks.mk | 6 | ||||
-rw-r--r-- | devel/boost-python/buildlink3.mk | 6 | ||||
-rw-r--r-- | meta-pkgs/boost/Makefile.common | 36 | ||||
-rw-r--r-- | meta-pkgs/boost/distinfo | 9 | ||||
-rw-r--r-- | meta-pkgs/boost/options.mk | 14 | ||||
-rw-r--r-- | meta-pkgs/boost/patches/patch-boost_variant_static_visitor.hpp | 16 |
13 files changed, 174 insertions, 88 deletions
diff --git a/devel/boost-build/PLIST b/devel/boost-build/PLIST index a4f94a502b0..3aa75a73801 100644 --- a/devel/boost-build/PLIST +++ b/devel/boost-build/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.18 2014/08/13 10:56:35 adam Exp $ +@comment $NetBSD: PLIST,v 1.19 2014/11/07 19:28:38 adam Exp $ share/boost-build/bootstrap.jam share/boost-build/build-system.jam share/boost-build/build/__init__.py @@ -36,6 +36,7 @@ share/boost-build/build/version.jam share/boost-build/build/virtual-target.jam share/boost-build/build/virtual_target.py share/boost-build/build_system.py +share/boost-build/contrib/__init__.py share/boost-build/contrib/boost.jam share/boost-build/contrib/boost.py share/boost-build/contrib/tntnet.jam @@ -62,9 +63,11 @@ share/boost-build/tools/cast.jam share/boost-build/tools/cast.py share/boost-build/tools/clang-darwin.jam share/boost-build/tools/clang-linux.jam +share/boost-build/tools/clang-win.jam share/boost-build/tools/clang.jam share/boost-build/tools/common.jam share/boost-build/tools/common.py +share/boost-build/tools/common_clang_vc.jam share/boost-build/tools/como-linux.jam share/boost-build/tools/como-win.jam share/boost-build/tools/como.jam diff --git a/devel/boost-build/buildlink3.mk b/devel/boost-build/buildlink3.mk index acabfa935fc..d145901054e 100644 --- a/devel/boost-build/buildlink3.mk +++ b/devel/boost-build/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.27 2014/08/13 10:56:35 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.28 2014/11/07 19:28:38 adam Exp $ BUILDLINK_TREE+= boost-build .if !defined(BOOST_BUILD_BUILDLINK3_MK) BOOST_BUILD_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.boost-build+= boost-build-1.56.* +BUILDLINK_API_DEPENDS.boost-build+= boost-build-1.57.* BUILDLINK_DEPMETHOD.boost-build?= build BUILDLINK_PKGSRCDIR.boost-build?= ../../devel/boost-build .endif # BOOST_BUILD_BUILDLINK3_MK diff --git a/devel/boost-headers/PLIST b/devel/boost-headers/PLIST index 7d3c81851e9..70e6061edfb 100644 --- a/devel/boost-headers/PLIST +++ b/devel/boost-headers/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.26 2014/08/13 10:56:35 adam Exp $ +@comment $NetBSD: PLIST,v 1.27 2014/11/07 19:28:38 adam Exp $ include/boost/accumulators/accumulators.hpp include/boost/accumulators/accumulators_fwd.hpp include/boost/accumulators/framework/accumulator_base.hpp @@ -185,14 +185,15 @@ include/boost/align/detail/alignment_of_codegear.hpp include/boost/align/detail/alignment_of_cxx11.hpp include/boost/align/detail/alignment_of_gcc.hpp include/boost/align/detail/alignment_of_msvc.hpp +include/boost/align/detail/integral_constant.hpp include/boost/align/detail/is_aligned.hpp include/boost/align/detail/is_alignment.hpp -include/boost/align/detail/is_alignment_const.hpp +include/boost/align/detail/is_alignment_constant.hpp include/boost/align/detail/max_align.hpp include/boost/align/detail/max_count_of.hpp include/boost/align/detail/min_size.hpp -include/boost/align/detail/padded.hpp -include/boost/align/detail/type_traits.hpp +include/boost/align/detail/offset_object.hpp +include/boost/align/detail/remove_traits.hpp include/boost/align/is_aligned.hpp include/boost/aligned_storage.hpp include/boost/any.hpp @@ -1082,10 +1083,12 @@ include/boost/container/detail/node_alloc_holder.hpp include/boost/container/detail/node_pool.hpp include/boost/container/detail/node_pool_impl.hpp include/boost/container/detail/pair.hpp +include/boost/container/detail/placement_new.hpp include/boost/container/detail/pool_common.hpp include/boost/container/detail/pool_common_alloc.hpp include/boost/container/detail/preprocessor.hpp include/boost/container/detail/singleton.hpp +include/boost/container/detail/std_fwd.hpp include/boost/container/detail/transform_iterator.hpp include/boost/container/detail/tree.hpp include/boost/container/detail/type_traits.hpp @@ -1118,9 +1121,9 @@ include/boost/context/detail/fcontext_i386.hpp include/boost/context/detail/fcontext_i386_win.hpp include/boost/context/detail/fcontext_mips.hpp include/boost/context/detail/fcontext_ppc.hpp +include/boost/context/detail/fcontext_sparc.hpp include/boost/context/detail/fcontext_x86_64.hpp include/boost/context/detail/fcontext_x86_64_win.hpp -include/boost/context/detail/fcontext_sparc.hpp include/boost/context/fcontext.hpp include/boost/core/addressof.hpp include/boost/core/checked_delete.hpp @@ -1331,6 +1334,7 @@ include/boost/detail/winapi/GetThreadTimes.hpp include/boost/detail/winapi/LocalFree.hpp include/boost/detail/winapi/basic_types.hpp include/boost/detail/winapi/config.hpp +include/boost/detail/winapi/crypt.hpp include/boost/detail/winapi/directory_management.hpp include/boost/detail/winapi/dll.hpp include/boost/detail/winapi/error_handling.hpp @@ -1393,6 +1397,7 @@ include/boost/filesystem/path_traits.hpp include/boost/flyweight.hpp include/boost/flyweight/assoc_container_factory.hpp include/boost/flyweight/assoc_container_factory_fwd.hpp +include/boost/flyweight/detail/archive_constructed.hpp include/boost/flyweight/detail/default_value_policy.hpp include/boost/flyweight/detail/dyn_perfect_fwd.hpp include/boost/flyweight/detail/flyweight_core.hpp @@ -1402,6 +1407,7 @@ include/boost/flyweight/detail/not_placeholder_expr.hpp include/boost/flyweight/detail/perfect_fwd.hpp include/boost/flyweight/detail/pp_perfect_fwd.hpp include/boost/flyweight/detail/recursive_lw_mutex.hpp +include/boost/flyweight/detail/serialization_helper.hpp include/boost/flyweight/detail/value_tag.hpp include/boost/flyweight/factory_tag.hpp include/boost/flyweight/flyweight.hpp @@ -1420,6 +1426,7 @@ include/boost/flyweight/no_tracking.hpp include/boost/flyweight/no_tracking_fwd.hpp include/boost/flyweight/refcounted.hpp include/boost/flyweight/refcounted_fwd.hpp +include/boost/flyweight/serialize.hpp include/boost/flyweight/set_factory.hpp include/boost/flyweight/set_factory_fwd.hpp include/boost/flyweight/simple_locking.hpp @@ -2553,11 +2560,17 @@ include/boost/geometry/algorithms/detail/buffer/turn_in_input.hpp include/boost/geometry/algorithms/detail/buffer/turn_in_piece_visitor.hpp include/boost/geometry/algorithms/detail/calculate_null.hpp include/boost/geometry/algorithms/detail/calculate_sum.hpp +include/boost/geometry/algorithms/detail/centroid/translating_transformer.hpp include/boost/geometry/algorithms/detail/check_iterator_range.hpp +include/boost/geometry/algorithms/detail/closest_feature/geometry_to_range.hpp +include/boost/geometry/algorithms/detail/closest_feature/point_to_range.hpp +include/boost/geometry/algorithms/detail/closest_feature/range_to_range.hpp include/boost/geometry/algorithms/detail/comparable_distance/implementation.hpp include/boost/geometry/algorithms/detail/comparable_distance/interface.hpp include/boost/geometry/algorithms/detail/convert_indexed_to_indexed.hpp include/boost/geometry/algorithms/detail/convert_point_to_point.hpp +include/boost/geometry/algorithms/detail/counting.hpp +include/boost/geometry/algorithms/detail/course.hpp include/boost/geometry/algorithms/detail/disjoint/areal_areal.hpp include/boost/geometry/algorithms/detail/disjoint/box_box.hpp include/boost/geometry/algorithms/detail/disjoint/implementation.hpp @@ -2572,17 +2585,18 @@ include/boost/geometry/algorithms/detail/disjoint/segment_box.hpp include/boost/geometry/algorithms/detail/distance/backward_compatibility.hpp include/boost/geometry/algorithms/detail/distance/box_to_box.hpp include/boost/geometry/algorithms/detail/distance/default_strategies.hpp -include/boost/geometry/algorithms/detail/distance/geometry_to_geometry_rtree.hpp +include/boost/geometry/algorithms/detail/distance/geometry_to_segment_or_box.hpp include/boost/geometry/algorithms/detail/distance/implementation.hpp include/boost/geometry/algorithms/detail/distance/interface.hpp -include/boost/geometry/algorithms/detail/distance/multi_to_multi.hpp -include/boost/geometry/algorithms/detail/distance/multipoint_to_range.hpp +include/boost/geometry/algorithms/detail/distance/is_comparable.hpp +include/boost/geometry/algorithms/detail/distance/iterator_selector.hpp +include/boost/geometry/algorithms/detail/distance/linear_or_areal_to_areal.hpp +include/boost/geometry/algorithms/detail/distance/linear_to_linear.hpp +include/boost/geometry/algorithms/detail/distance/multipoint_to_geometry.hpp include/boost/geometry/algorithms/detail/distance/point_to_geometry.hpp -include/boost/geometry/algorithms/detail/distance/polygon_to_segment_or_box.hpp -include/boost/geometry/algorithms/detail/distance/range_to_segment_or_box.hpp +include/boost/geometry/algorithms/detail/distance/range_to_geometry_rtree.hpp include/boost/geometry/algorithms/detail/distance/segment_to_box.hpp include/boost/geometry/algorithms/detail/distance/segment_to_segment.hpp -include/boost/geometry/algorithms/detail/distance/single_to_multi.hpp include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp include/boost/geometry/algorithms/detail/equals/point_point.hpp include/boost/geometry/algorithms/detail/extreme_points.hpp @@ -2591,6 +2605,10 @@ include/boost/geometry/algorithms/detail/get_left_turns.hpp include/boost/geometry/algorithms/detail/get_max_size.hpp include/boost/geometry/algorithms/detail/has_self_intersections.hpp include/boost/geometry/algorithms/detail/interior_iterator.hpp +include/boost/geometry/algorithms/detail/intersection/box_box.hpp +include/boost/geometry/algorithms/detail/intersection/implementation.hpp +include/boost/geometry/algorithms/detail/intersection/interface.hpp +include/boost/geometry/algorithms/detail/intersection/multi.hpp include/boost/geometry/algorithms/detail/is_simple/always_simple.hpp include/boost/geometry/algorithms/detail/is_simple/areal.hpp include/boost/geometry/algorithms/detail/is_simple/debug_print_boundary_points.hpp @@ -2681,6 +2699,7 @@ include/boost/geometry/algorithms/detail/relate/turns.hpp include/boost/geometry/algorithms/detail/ring_identifier.hpp include/boost/geometry/algorithms/detail/sections/range_by_section.hpp include/boost/geometry/algorithms/detail/sections/sectionalize.hpp +include/boost/geometry/algorithms/detail/signed_index_type.hpp include/boost/geometry/algorithms/detail/single_geometry.hpp include/boost/geometry/algorithms/detail/sub_range.hpp include/boost/geometry/algorithms/detail/throw_on_empty_input.hpp @@ -2712,6 +2731,7 @@ include/boost/geometry/algorithms/not_implemented.hpp include/boost/geometry/algorithms/num_geometries.hpp include/boost/geometry/algorithms/num_interior_rings.hpp include/boost/geometry/algorithms/num_points.hpp +include/boost/geometry/algorithms/num_segments.hpp include/boost/geometry/algorithms/overlaps.hpp include/boost/geometry/algorithms/perimeter.hpp include/boost/geometry/algorithms/point_on_surface.hpp @@ -2786,6 +2806,7 @@ include/boost/geometry/geometries/multi_point.hpp include/boost/geometry/geometries/multi_polygon.hpp include/boost/geometry/geometries/point.hpp include/boost/geometry/geometries/point_xy.hpp +include/boost/geometry/geometries/pointing_segment.hpp include/boost/geometry/geometries/polygon.hpp include/boost/geometry/geometries/register/box.hpp include/boost/geometry/geometries/register/linestring.hpp @@ -2823,7 +2844,6 @@ include/boost/geometry/index/detail/distance_predicates.hpp include/boost/geometry/index/detail/exception.hpp include/boost/geometry/index/detail/meta.hpp include/boost/geometry/index/detail/predicates.hpp -include/boost/geometry/index/detail/pushable_array.hpp include/boost/geometry/index/detail/rtree/adaptors.hpp include/boost/geometry/index/detail/rtree/kmeans/kmeans.hpp include/boost/geometry/index/detail/rtree/kmeans/split.hpp @@ -2834,12 +2854,14 @@ include/boost/geometry/index/detail/rtree/node/concept.hpp include/boost/geometry/index/detail/rtree/node/dynamic_visitor.hpp include/boost/geometry/index/detail/rtree/node/node.hpp include/boost/geometry/index/detail/rtree/node/node_auto_ptr.hpp -include/boost/geometry/index/detail/rtree/node/node_d_mem_dynamic.hpp -include/boost/geometry/index/detail/rtree/node/node_d_mem_static.hpp -include/boost/geometry/index/detail/rtree/node/node_s_mem_dynamic.hpp -include/boost/geometry/index/detail/rtree/node/node_s_mem_static.hpp +include/boost/geometry/index/detail/rtree/node/node_elements.hpp include/boost/geometry/index/detail/rtree/node/pairs.hpp -include/boost/geometry/index/detail/rtree/node/static_visitor.hpp +include/boost/geometry/index/detail/rtree/node/variant_dynamic.hpp +include/boost/geometry/index/detail/rtree/node/variant_static.hpp +include/boost/geometry/index/detail/rtree/node/variant_visitor.hpp +include/boost/geometry/index/detail/rtree/node/weak_dynamic.hpp +include/boost/geometry/index/detail/rtree/node/weak_static.hpp +include/boost/geometry/index/detail/rtree/node/weak_visitor.hpp include/boost/geometry/index/detail/rtree/options.hpp include/boost/geometry/index/detail/rtree/pack_create.hpp include/boost/geometry/index/detail/rtree/quadratic/quadratic.hpp @@ -2892,14 +2914,20 @@ include/boost/geometry/io/wkt/write.hpp include/boost/geometry/iterators/base.hpp include/boost/geometry/iterators/closing_iterator.hpp include/boost/geometry/iterators/concatenate_iterator.hpp +include/boost/geometry/iterators/detail/point_iterator/inner_range_type.hpp +include/boost/geometry/iterators/detail/point_iterator/iterator_type.hpp +include/boost/geometry/iterators/detail/point_iterator/value_type.hpp +include/boost/geometry/iterators/detail/segment_iterator/iterator_type.hpp +include/boost/geometry/iterators/detail/segment_iterator/range_segment_iterator.hpp +include/boost/geometry/iterators/detail/segment_iterator/value_type.hpp include/boost/geometry/iterators/dispatch/point_iterator.hpp -include/boost/geometry/iterators/dispatch/point_iterator_type.hpp +include/boost/geometry/iterators/dispatch/segment_iterator.hpp include/boost/geometry/iterators/ever_circling_iterator.hpp include/boost/geometry/iterators/flatten_iterator.hpp include/boost/geometry/iterators/has_one_element.hpp include/boost/geometry/iterators/point_iterator.hpp -include/boost/geometry/iterators/point_iterator_type.hpp include/boost/geometry/iterators/point_reverse_iterator.hpp +include/boost/geometry/iterators/segment_iterator.hpp include/boost/geometry/multi/algorithms/append.hpp include/boost/geometry/multi/algorithms/area.hpp include/boost/geometry/multi/algorithms/centroid.hpp @@ -3006,7 +3034,6 @@ include/boost/geometry/strategies/cartesian/cart_intersect.hpp include/boost/geometry/strategies/cartesian/centroid_average.hpp include/boost/geometry/strategies/cartesian/centroid_bashein_detmer.hpp include/boost/geometry/strategies/cartesian/centroid_weighted_length.hpp -include/boost/geometry/strategies/cartesian/distance_comparable_to_regular.hpp include/boost/geometry/strategies/cartesian/distance_projected_point.hpp include/boost/geometry/strategies/cartesian/distance_projected_point_ax.hpp include/boost/geometry/strategies/cartesian/distance_pythagoras.hpp @@ -3034,7 +3061,6 @@ include/boost/geometry/strategies/default_distance_result.hpp include/boost/geometry/strategies/default_length_result.hpp include/boost/geometry/strategies/default_strategy.hpp include/boost/geometry/strategies/distance.hpp -include/boost/geometry/strategies/distance_comparable_to_regular.hpp include/boost/geometry/strategies/distance_result.hpp include/boost/geometry/strategies/intersection.hpp include/boost/geometry/strategies/intersection_result.hpp @@ -3043,6 +3069,7 @@ include/boost/geometry/strategies/side_info.hpp include/boost/geometry/strategies/spherical/area_huiller.hpp include/boost/geometry/strategies/spherical/compare_circular.hpp include/boost/geometry/strategies/spherical/distance_cross_track.hpp +include/boost/geometry/strategies/spherical/distance_cross_track_point_box.hpp include/boost/geometry/strategies/spherical/distance_haversine.hpp include/boost/geometry/strategies/spherical/side_by_cross_track.hpp include/boost/geometry/strategies/spherical/ssf.hpp @@ -3697,28 +3724,51 @@ include/boost/intrusive/bstree_algorithms.hpp include/boost/intrusive/circular_list_algorithms.hpp include/boost/intrusive/circular_slist_algorithms.hpp include/boost/intrusive/derivation_value_traits.hpp +include/boost/intrusive/detail/algo_type.hpp include/boost/intrusive/detail/any_node_and_algorithms.hpp +include/boost/intrusive/detail/array_initializer.hpp include/boost/intrusive/detail/assert.hpp include/boost/intrusive/detail/avltree_node.hpp include/boost/intrusive/detail/common_slist_algorithms.hpp include/boost/intrusive/detail/config_begin.hpp include/boost/intrusive/detail/config_end.hpp +include/boost/intrusive/detail/default_header_holder.hpp include/boost/intrusive/detail/ebo_functor_holder.hpp +include/boost/intrusive/detail/empty_node_checker.hpp +include/boost/intrusive/detail/equal_to_value.hpp +include/boost/intrusive/detail/exception_disposer.hpp include/boost/intrusive/detail/function_detector.hpp include/boost/intrusive/detail/generic_hook.hpp +include/boost/intrusive/detail/get_value_traits.hpp include/boost/intrusive/detail/has_member_function_callable_with.hpp include/boost/intrusive/detail/hashtable_node.hpp +include/boost/intrusive/detail/hook_traits.hpp +include/boost/intrusive/detail/iiterator.hpp include/boost/intrusive/detail/is_stateful_value_traits.hpp +include/boost/intrusive/detail/key_nodeptr_comp.hpp +include/boost/intrusive/detail/list_iterator.hpp include/boost/intrusive/detail/list_node.hpp +include/boost/intrusive/detail/math.hpp include/boost/intrusive/detail/memory_util.hpp include/boost/intrusive/detail/mpl.hpp +include/boost/intrusive/detail/node_cloner_disposer.hpp +include/boost/intrusive/detail/node_holder.hpp +include/boost/intrusive/detail/node_to_value.hpp include/boost/intrusive/detail/parent_from_member.hpp +include/boost/intrusive/detail/pointer_element.hpp include/boost/intrusive/detail/preprocessor.hpp include/boost/intrusive/detail/rbtree_node.hpp +include/boost/intrusive/detail/reverse_iterator.hpp +include/boost/intrusive/detail/simple_disposers.hpp +include/boost/intrusive/detail/size_holder.hpp +include/boost/intrusive/detail/slist_iterator.hpp include/boost/intrusive/detail/slist_node.hpp +include/boost/intrusive/detail/std_fwd.hpp +include/boost/intrusive/detail/to_raw_pointer.hpp include/boost/intrusive/detail/transform_iterator.hpp +include/boost/intrusive/detail/tree_iterator.hpp include/boost/intrusive/detail/tree_node.hpp -include/boost/intrusive/detail/utilities.hpp +include/boost/intrusive/detail/uncast.hpp include/boost/intrusive/detail/workaround.hpp include/boost/intrusive/hashtable.hpp include/boost/intrusive/intrusive_fwd.hpp @@ -3731,6 +3781,7 @@ include/boost/intrusive/options.hpp include/boost/intrusive/pack_options.hpp include/boost/intrusive/parent_from_member.hpp include/boost/intrusive/pointer_plus_bits.hpp +include/boost/intrusive/pointer_rebind.hpp include/boost/intrusive/pointer_traits.hpp include/boost/intrusive/priority_compare.hpp include/boost/intrusive/rbtree.hpp @@ -3892,7 +3943,6 @@ include/boost/iterator/detail/config_undef.hpp include/boost/iterator/detail/enable_if.hpp include/boost/iterator/detail/facade_iterator_category.hpp include/boost/iterator/detail/minimum_category.hpp -include/boost/iterator/detail/operator_brackets_dispatch.hpp include/boost/iterator/filter_iterator.hpp include/boost/iterator/function_input_iterator.hpp include/boost/iterator/indirect_iterator.hpp @@ -3905,6 +3955,7 @@ include/boost/iterator/iterator_categories.hpp include/boost/iterator/iterator_concepts.hpp include/boost/iterator/iterator_facade.hpp include/boost/iterator/iterator_traits.hpp +include/boost/iterator/minimum_category.hpp include/boost/iterator/new_iterator_tests.hpp include/boost/iterator/permutation_iterator.hpp include/boost/iterator/reverse_iterator.hpp @@ -3946,6 +3997,18 @@ include/boost/lambda/numeric.hpp include/boost/lambda/switch.hpp include/boost/last_value.hpp include/boost/lexical_cast.hpp +include/boost/lexical_cast/bad_lexical_cast.hpp +include/boost/lexical_cast/detail/converter_lexical.hpp +include/boost/lexical_cast/detail/converter_lexical_streams.hpp +include/boost/lexical_cast/detail/converter_numeric.hpp +include/boost/lexical_cast/detail/inf_nan.hpp +include/boost/lexical_cast/detail/is_character.hpp +include/boost/lexical_cast/detail/lcast_char_constants.hpp +include/boost/lexical_cast/detail/lcast_float_converters.hpp +include/boost/lexical_cast/detail/lcast_unsigned_converters.hpp +include/boost/lexical_cast/detail/widest_char.hpp +include/boost/lexical_cast/lexical_cast_old.hpp +include/boost/lexical_cast/try_lexical_convert.hpp include/boost/limits.hpp include/boost/local_function.hpp include/boost/local_function/aux_/add_pointed_const.hpp @@ -4331,6 +4394,7 @@ include/boost/math/distributions/fisher_f.hpp include/boost/math/distributions/fwd.hpp include/boost/math/distributions/gamma.hpp include/boost/math/distributions/geometric.hpp +include/boost/math/distributions/hyperexponential.hpp include/boost/math/distributions/hypergeometric.hpp include/boost/math/distributions/inverse_chi_squared.hpp include/boost/math/distributions/inverse_gamma.hpp @@ -4580,14 +4644,20 @@ include/boost/mem_fn.hpp include/boost/memory_order.hpp include/boost/move/algorithm.hpp include/boost/move/core.hpp +include/boost/move/default_delete.hpp include/boost/move/detail/config_begin.hpp include/boost/move/detail/config_end.hpp include/boost/move/detail/meta_utils.hpp include/boost/move/detail/move_helpers.hpp +include/boost/move/detail/unique_ptr_meta_utils.hpp +include/boost/move/detail/workaround.hpp include/boost/move/iterator.hpp +include/boost/move/make_unique.hpp include/boost/move/move.hpp include/boost/move/traits.hpp +include/boost/move/unique_ptr.hpp include/boost/move/utility.hpp +include/boost/move/utility_core.hpp include/boost/mpi.hpp include/boost/mpi/allocator.hpp include/boost/mpi/collectives.hpp @@ -5765,6 +5835,7 @@ include/boost/multi_index/detail/auto_space.hpp include/boost/multi_index/detail/base_type.hpp include/boost/multi_index/detail/bidir_node_iterator.hpp include/boost/multi_index/detail/bucket_array.hpp +include/boost/multi_index/detail/cons_stdtuple.hpp include/boost/multi_index/detail/converter.hpp include/boost/multi_index/detail/copy_map.hpp include/boost/multi_index/detail/do_not_copy_elements_tag.hpp @@ -6135,6 +6206,7 @@ include/boost/numeric/ublas/matrix.hpp include/boost/numeric/ublas/matrix_expression.hpp include/boost/numeric/ublas/matrix_proxy.hpp include/boost/numeric/ublas/matrix_sparse.hpp +include/boost/numeric/ublas/matrix_vector.hpp include/boost/numeric/ublas/operation.hpp include/boost/numeric/ublas/operation/begin.hpp include/boost/numeric/ublas/operation/c_array.hpp @@ -6739,6 +6811,7 @@ include/boost/preprocessor/arithmetic/mul.hpp include/boost/preprocessor/arithmetic/sub.hpp include/boost/preprocessor/array.hpp include/boost/preprocessor/array/data.hpp +include/boost/preprocessor/array/detail/get_data.hpp include/boost/preprocessor/array/elem.hpp include/boost/preprocessor/array/enum.hpp include/boost/preprocessor/array/insert.hpp @@ -6801,6 +6874,7 @@ include/boost/preprocessor/expand.hpp include/boost/preprocessor/expr_if.hpp include/boost/preprocessor/facilities.hpp include/boost/preprocessor/facilities/apply.hpp +include/boost/preprocessor/facilities/detail/is_empty.hpp include/boost/preprocessor/facilities/empty.hpp include/boost/preprocessor/facilities/expand.hpp include/boost/preprocessor/facilities/identity.hpp @@ -6808,6 +6882,7 @@ include/boost/preprocessor/facilities/intercept.hpp include/boost/preprocessor/facilities/is_1.hpp include/boost/preprocessor/facilities/is_empty.hpp include/boost/preprocessor/facilities/is_empty_or_1.hpp +include/boost/preprocessor/facilities/is_empty_variadic.hpp include/boost/preprocessor/facilities/overload.hpp include/boost/preprocessor/for.hpp include/boost/preprocessor/identity.hpp @@ -6887,8 +6962,11 @@ include/boost/preprocessor/min.hpp include/boost/preprocessor/punctuation.hpp include/boost/preprocessor/punctuation/comma.hpp include/boost/preprocessor/punctuation/comma_if.hpp +include/boost/preprocessor/punctuation/detail/is_begin_parens.hpp +include/boost/preprocessor/punctuation/is_begin_parens.hpp include/boost/preprocessor/punctuation/paren.hpp include/boost/preprocessor/punctuation/paren_if.hpp +include/boost/preprocessor/punctuation/remove_parens.hpp include/boost/preprocessor/repeat.hpp include/boost/preprocessor/repeat_2nd.hpp include/boost/preprocessor/repeat_3rd.hpp @@ -6962,6 +7040,7 @@ include/boost/preprocessor/slot/detail/slot5.hpp include/boost/preprocessor/slot/slot.hpp include/boost/preprocessor/stringize.hpp include/boost/preprocessor/tuple.hpp +include/boost/preprocessor/tuple/detail/is_single_return.hpp include/boost/preprocessor/tuple/eat.hpp include/boost/preprocessor/tuple/elem.hpp include/boost/preprocessor/tuple/enum.hpp @@ -6979,6 +7058,7 @@ include/boost/preprocessor/tuple/to_array.hpp include/boost/preprocessor/tuple/to_list.hpp include/boost/preprocessor/tuple/to_seq.hpp include/boost/preprocessor/variadic.hpp +include/boost/preprocessor/variadic/detail/is_single_return.hpp include/boost/preprocessor/variadic/elem.hpp include/boost/preprocessor/variadic/size.hpp include/boost/preprocessor/variadic/to_array.hpp @@ -9228,6 +9308,10 @@ include/boost/thread.hpp include/boost/thread/barrier.hpp include/boost/thread/caller_context.hpp include/boost/thread/completion_latch.hpp +include/boost/thread/concurrent_queues/queue_adaptor.hpp +include/boost/thread/concurrent_queues/queue_base.hpp +include/boost/thread/concurrent_queues/queue_op_status.hpp +include/boost/thread/concurrent_queues/queue_views.hpp include/boost/thread/condition.hpp include/boost/thread/condition_variable.hpp include/boost/thread/csbl/deque.hpp @@ -9240,6 +9324,7 @@ include/boost/thread/csbl/memory/config.hpp include/boost/thread/csbl/memory/default_delete.hpp include/boost/thread/csbl/memory/pointer_traits.hpp include/boost/thread/csbl/memory/scoped_allocator.hpp +include/boost/thread/csbl/memory/shared_ptr.hpp include/boost/thread/csbl/memory/unique_ptr.hpp include/boost/thread/csbl/tuple.hpp include/boost/thread/csbl/vector.hpp @@ -9274,6 +9359,7 @@ include/boost/thread/executor.hpp include/boost/thread/executors/basic_thread_pool.hpp include/boost/thread/executors/executor.hpp include/boost/thread/executors/executor_adaptor.hpp +include/boost/thread/executors/generic_executor_ref.hpp include/boost/thread/executors/inline_executor.hpp include/boost/thread/executors/loop_executor.hpp include/boost/thread/executors/serial_executor.hpp @@ -9678,9 +9764,11 @@ include/boost/type_traits/is_complex.hpp include/boost/type_traits/is_compound.hpp include/boost/type_traits/is_const.hpp include/boost/type_traits/is_convertible.hpp +include/boost/type_traits/is_copy_assignable.hpp include/boost/type_traits/is_copy_constructible.hpp include/boost/type_traits/is_empty.hpp include/boost/type_traits/is_enum.hpp +include/boost/type_traits/is_final.hpp include/boost/type_traits/is_float.hpp include/boost/type_traits/is_floating_point.hpp include/boost/type_traits/is_function.hpp @@ -9815,6 +9903,11 @@ include/boost/units/base_units/imperial/stone.hpp include/boost/units/base_units/imperial/thou.hpp include/boost/units/base_units/imperial/ton.hpp include/boost/units/base_units/imperial/yard.hpp +include/boost/units/base_units/information/bit.hpp +include/boost/units/base_units/information/byte.hpp +include/boost/units/base_units/information/hartley.hpp +include/boost/units/base_units/information/nat.hpp +include/boost/units/base_units/information/shannon.hpp include/boost/units/base_units/metric/angstrom.hpp include/boost/units/base_units/metric/are.hpp include/boost/units/base_units/metric/atmosphere.hpp @@ -9939,6 +10032,7 @@ include/boost/units/physical_dimensions/heat_capacity.hpp include/boost/units/physical_dimensions/illuminance.hpp include/boost/units/physical_dimensions/impedance.hpp include/boost/units/physical_dimensions/inductance.hpp +include/boost/units/physical_dimensions/information.hpp include/boost/units/physical_dimensions/kinematic_viscosity.hpp include/boost/units/physical_dimensions/length.hpp include/boost/units/physical_dimensions/luminance.hpp @@ -10009,6 +10103,13 @@ include/boost/units/systems/cgs/velocity.hpp include/boost/units/systems/cgs/volume.hpp include/boost/units/systems/cgs/wavenumber.hpp include/boost/units/systems/detail/constants.hpp +include/boost/units/systems/information.hpp +include/boost/units/systems/information/bit.hpp +include/boost/units/systems/information/byte.hpp +include/boost/units/systems/information/hartley.hpp +include/boost/units/systems/information/nat.hpp +include/boost/units/systems/information/prefixes.hpp +include/boost/units/systems/information/shannon.hpp include/boost/units/systems/si.hpp include/boost/units/systems/si/absorbed_dose.hpp include/boost/units/systems/si/acceleration.hpp diff --git a/devel/boost-headers/buildlink3.mk b/devel/boost-headers/buildlink3.mk index 64a0e84f4e4..f7e9b5b22fb 100644 --- a/devel/boost-headers/buildlink3.mk +++ b/devel/boost-headers/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.28 2014/08/13 10:56:35 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.29 2014/11/07 19:28:38 adam Exp $ BUILDLINK_TREE+= boost-headers @@ -6,7 +6,7 @@ BUILDLINK_TREE+= boost-headers BOOST_HEADERS_BUILDLINK3_MK:= # Use a dependency pattern that guarantees the proper ABI. -BUILDLINK_API_DEPENDS.boost-headers+= boost-headers-1.56.* +BUILDLINK_API_DEPENDS.boost-headers+= boost-headers-1.57.* BUILDLINK_DEPMETHOD.boost-headers?= build BUILDLINK_PKGSRCDIR.boost-headers?= ../../devel/boost-headers diff --git a/devel/boost-jam/buildlink3.mk b/devel/boost-jam/buildlink3.mk index d8381c4ec7b..a4bd669edb1 100644 --- a/devel/boost-jam/buildlink3.mk +++ b/devel/boost-jam/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.23 2014/08/13 10:56:35 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2014/11/07 19:28:38 adam Exp $ BUILDLINK_TREE+= boost-jam .if !defined(BOOST_JAM_BUILDLINK3_MK) BOOST_JAM_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.boost-jam+= boost-jam-1.56.* +BUILDLINK_API_DEPENDS.boost-jam+= boost-jam-1.57.* BUILDLINK_DEPMETHOD.boost-jam?= build BUILDLINK_PKGSRCDIR.boost-jam?= ../../devel/boost-jam .endif # BOOST_JAM_BUILDLINK3_MK diff --git a/devel/boost-libs/Makefile b/devel/boost-libs/Makefile index 8e29c0fd3d2..f8ca6b1e102 100644 --- a/devel/boost-libs/Makefile +++ b/devel/boost-libs/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.29 2014/08/18 13:01:58 fhajny Exp $ +# $NetBSD: Makefile,v 1.30 2014/11/07 19:28:38 adam Exp $ BOOST_PACKAGE= libs BOOST_COMMENT= (binary libraries) BOOST_CONFIG= installed BOOST_INSTALL_LIBS= yes -PKGREVISION= 1 .include "../../meta-pkgs/boost/Makefile.common" diff --git a/devel/boost-libs/buildlink3.mk b/devel/boost-libs/buildlink3.mk index 4cd43c25330..0735c7686ff 100644 --- a/devel/boost-libs/buildlink3.mk +++ b/devel/boost-libs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.34 2014/08/13 10:56:35 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.35 2014/11/07 19:28:38 adam Exp $ BUILDLINK_TREE+= boost-libs @@ -6,11 +6,11 @@ BUILDLINK_TREE+= boost-libs BOOST_LIBS_BUILDLINK3_MK:= # Use a dependency pattern that guarantees the proper ABI. -BUILDLINK_API_DEPENDS.boost-libs+= boost-libs-1.56.* -BUILDLINK_ABI_DEPENDS.boost-libs?= boost-libs>=1.56.0 +BUILDLINK_API_DEPENDS.boost-libs+= boost-libs-1.57.* +BUILDLINK_ABI_DEPENDS.boost-libs?= boost-libs>=1.57.0 BUILDLINK_PKGSRCDIR.boost-libs?= ../../devel/boost-libs -.include "../../mk/bsd.prefs.mk" +.include "../../mk/bsd.fast.prefs.mk" # Sync with meta-pkgs/boost/Makefile.common .if ${OPSYS} == "OpenBSD" GCC_REQD+= 4.6 diff --git a/devel/boost-libs/hacks.mk b/devel/boost-libs/hacks.mk index 34eaa1e8bf1..fc3c8eff0fc 100644 --- a/devel/boost-libs/hacks.mk +++ b/devel/boost-libs/hacks.mk @@ -1,14 +1,14 @@ -# $NetBSD: hacks.mk,v 1.3 2012/08/15 18:28:21 jdc Exp $ +# $NetBSD: hacks.mk,v 1.4 2014/11/07 19:28:38 adam Exp $ .if !defined(BOOST_LIBS_HACKS_MK) -BOOST_LIBS_HACKS_MK= defined +BOOST_LIBS_HACKS_MK= defined .include "../../mk/compiler.mk" # gcc 4 on sparc64 catches an illegal instruction when compiling graphml.cpp .if ${MACHINE_ARCH} == "sparc64" && !empty(CC_VERSION:Mgcc-4*) PKG_HACKS+= optimisation -BUILDLINK_TRANSFORM+= rename:-O3:-O1 +BUILDLINK_TRANSFORM+= rename:-O3:-O1 .endif .endif # BOOST_LIBS_HACKS_MK diff --git a/devel/boost-python/buildlink3.mk b/devel/boost-python/buildlink3.mk index c6ec0d5774f..cb9120a7bc6 100644 --- a/devel/boost-python/buildlink3.mk +++ b/devel/boost-python/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.33 2014/08/13 10:56:35 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.34 2014/11/07 19:28:38 adam Exp $ BUILDLINK_TREE+= boost-python @@ -6,8 +6,8 @@ BUILDLINK_TREE+= boost-python BOOST_PYTHON_BUILDLINK3_MK:= # Use a dependency pattern that guarantees the proper ABI. -BUILDLINK_API_DEPENDS.boost-python+= boost-python-1.56.* -BUILDLINK_ABI_DEPENDS.boost-python+= boost-python-1.56.* +BUILDLINK_API_DEPENDS.boost-python+= boost-python-1.57.* +BUILDLINK_ABI_DEPENDS.boost-python+= boost-python-1.57.* BUILDLINK_PKGSRCDIR.boost-python?= ../../devel/boost-python .include "../../devel/boost-headers/buildlink3.mk" diff --git a/meta-pkgs/boost/Makefile.common b/meta-pkgs/boost/Makefile.common index 7bc94df6bcb..43a70ce5498 100644 --- a/meta-pkgs/boost/Makefile.common +++ b/meta-pkgs/boost/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.46 2014/08/18 10:35:13 fhajny Exp $ +# $NetBSD: Makefile.common,v 1.47 2014/11/07 19:28:38 adam Exp $ # # used by devel/boost-build/Makefile # used by devel/boost-docs/Makefile @@ -9,7 +9,7 @@ BOOST_PACKAGE?= undefined BOOST_COMMENT?= undefined -BOOST_VERSION= 1.56.0 +BOOST_VERSION= 1.57.0 BOOST_SHORT_VERSION= ${BOOST_VERSION:S/./_/:C/\..*$//} DISTNAME= boost_${BOOST_VERSION:S/./_/g} @@ -38,11 +38,11 @@ PATCHDIR= ${.CURDIR}/../../meta-pkgs/boost/patches USE_TOOLS+= pax USE_LANGUAGES= c c++ # GCC 4.5 or later is required to build, and GCC 4.5 is not provided for OpenBSD -.if ${OPSYS} == "OpenBSD" +. if ${OPSYS} == "OpenBSD" GCC_REQD+= 4.6 -.else +. else GCC_REQD+= 4.5 -.endif +. endif PLIST_SUBST+= BOOST_VERSION="${BOOST_VERSION}" @@ -59,24 +59,24 @@ SUBST_FILES.darwin= tools/build/src/tools/*darwin.jam SUBST_SED.darwin= -e 's,-install_name ",-install_name "${PREFIX}/lib/,g' # On SunOS, extract using pkgsrc nbtar to avoid warnings from native gtar. -.if ${OPSYS} == "SunOS" +. if ${OPSYS} == "SunOS" TOOLS_PLATFORM.tar= #empty -. include "../../mk/compiler.mk" -. if !empty(CC_VERSION:Mgcc-4.[6-9]*) +. include "../../mk/compiler.mk" +. if !empty(CC_VERSION:Mgcc-4.[6-9]*) BUILDLINK_TRANSFORM+= rename:-D_XOPEN_SOURCE=500:-D_XOPEN_SOURCE=600 -. endif -.endif +. endif +. endif -.if ${OPSYS} == "Darwin" +. if ${OPSYS} == "Darwin" # Prevent using a pkgsrc libtool in OS X because the darwin toolset needs # the native libtool from /Developer/usr/bin or /usr/bin. post-wrapper: -. if exists(/Developer/usr/bin/libtool) +. if exists(/Developer/usr/bin/libtool) ln -s /Developer/usr/bin/libtool ${WRAPPER_BINDIR}/libtool -. else +. else ln -s /usr/bin/libtool ${WRAPPER_BINDIR}/libtool +. endif . endif -.endif # We can't do this at post-extract because the extract cookie will get a future # timestamp than the sources. If this happens, print-PLIST does not work. @@ -85,18 +85,18 @@ pre-configure: # Generate a new user.hpp or use the installed one, depending on the package # we are building. -.if ${BOOST_CONFIG} == "installed" -. include "../../devel/boost-headers/buildlink3.mk" +. if ${BOOST_CONFIG} == "installed" +. include "../../devel/boost-headers/buildlink3.mk" do-configure: ${CP} -f \ ${BUILDLINK_PREFIX.boost-headers}/include/boost/config/user.hpp \ ${WRKSRC}/boost/config/user.hpp -.elif ${BOOST_CONFIG} == "generate" +. elif ${BOOST_CONFIG} == "generate" do-configure: cd ${WRKSRC}/libs/config && \ ${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CP} -f ${WRKSRC}/libs/config/user.hpp ${WRKSRC}/boost/config/user.hpp -.endif +. endif boost-install-libs: ${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/lib diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo index 945bd76108c..f556b128211 100644 --- a/meta-pkgs/boost/distinfo +++ b/meta-pkgs/boost/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.70 2014/08/18 10:35:13 fhajny Exp $ +$NetBSD: distinfo,v 1.71 2014/11/07 19:28:38 adam Exp $ -SHA1 (boost_1_56_0.tar.bz2) = f94bb008900ed5ba1994a1072140590784b9b5df -RMD160 (boost_1_56_0.tar.bz2) = cef8907987b4187ff913cbf266fd5d99b40137c4 -Size (boost_1_56_0.tar.bz2) = 94777674 bytes +SHA1 (boost_1_57_0.tar.bz2) = e151557ae47afd1b43dc3fac46f8b04a8fe51c12 +RMD160 (boost_1_57_0.tar.bz2) = 8365f7c11e5ae088164ab1cb40ac624e76f8e72e +Size (boost_1_57_0.tar.bz2) = 60821561 bytes SHA1 (patch-aa) = 408a63a807aaa491130db018cd89bca6a427090d SHA1 (patch-ab) = 37c61bcfc27f1533df21f4392f80df2d2dbe51ef SHA1 (patch-ac) = 32d14b50682dae1950ed927ecb9318ad6b07687a @@ -22,7 +22,6 @@ SHA1 (patch-boost_config_stdlib_libstdcpp3.hpp) = 173271c60b3e2ba7bb1fe9390dcd86 SHA1 (patch-boost_core_noncopyable.hpp) = a693e5eda7fc303e1bd86ecfab40321d771af6fe SHA1 (patch-boost_math_tools_config.hpp) = 81402bc38dc858d0818ed91e204966c8382be4ff SHA1 (patch-boost_regex_config.hpp) = 6b752c7c23168c591cd391739c7a4539bef44c12 -SHA1 (patch-boost_variant_static_visitor.hpp) = fe496c504720d305f868a38fa6309517427c351a SHA1 (patch-libs_config_configure) = e2f204d4fa4f1bd9b4131d28f9be0a1ac22bf711 SHA1 (patch-libs_filesystem_src_unique_path.cpp) = 4693ea11cf464d82168cecaa143b48affa94563b SHA1 (patch-libs_log_src_timestamp.cpp) = f80981762e17ba7d6742f8cf5d8d6d4b494aa54e diff --git a/meta-pkgs/boost/options.mk b/meta-pkgs/boost/options.mk index 08d7f3b72a0..e6454c6ee2f 100644 --- a/meta-pkgs/boost/options.mk +++ b/meta-pkgs/boost/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2013/12/10 16:41:00 jperkin Exp $ +# $NetBSD: options.mk,v 1.3 2014/11/07 19:28:38 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.boost PKG_SUPPORTED_OPTIONS= debug expat icu @@ -11,15 +11,15 @@ PKG_SUGGESTED_OPTIONS= icu .if ${BOOST_PACKAGE} == "libs" -.if !empty(PKG_OPTIONS:Mexpat) +. if !empty(PKG_OPTIONS:Mexpat) MAKE_ENV+= EXPAT_INCLUDE=${PREFIX}/include MAKE_ENV+= EXPAT_LIBPATH=${PREFIX}/lib -. include "../../textproc/expat/buildlink3.mk" -.endif +. include "../../textproc/expat/buildlink3.mk" +. endif -.if !empty(PKG_OPTIONS:Micu) +. if !empty(PKG_OPTIONS:Micu) MAKE_ENV+= ICU_PATH=${PREFIX} -. include "../../textproc/icu/buildlink3.mk" -.endif +. include "../../textproc/icu/buildlink3.mk" +. endif .endif # ${BOOST_PACKAGE} == "libs" diff --git a/meta-pkgs/boost/patches/patch-boost_variant_static_visitor.hpp b/meta-pkgs/boost/patches/patch-boost_variant_static_visitor.hpp deleted file mode 100644 index bbee007bfde..00000000000 --- a/meta-pkgs/boost/patches/patch-boost_variant_static_visitor.hpp +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-boost_variant_static_visitor.hpp,v 1.1 2014/08/17 00:10:11 markd Exp $ - -Fix build with gcc 4.5.X -https://github.com/boostorg/variant/commit/8f111d3126c5a706f0eca0b90f5e01c9a4601178 - ---- boost/variant/static_visitor.hpp.orig 2014-08-16 23:31:01.000000000 +0000 -+++ boost/variant/static_visitor.hpp -@@ -48,7 +48,7 @@ public: // typedefs - typedef R result_type; - - protected: // for use as base class only --#ifndef BOOST_NO_DEFAULTED_FUNCTIONS -+#if !defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) && !defined(BOOST_NO_CXX11_NON_PUBLIC_DEFAULTED_FUNCTIONS) - static_visitor() = default; - ~static_visitor() = default; - #else |