Changes 1.14.0:

* New Libraries
  Property Tree: A tree data structure especially suited to storing
  configuration data, from Marcin Kalicinski and Sebastian Redl.
* Updated Libraries
* Build System
  A bug preventing "fat" 32-bit + 64-bit builds on OSX has been fixed.

3 files changed, 339 insertions, 154 deletions

diff --git a/devel/boost-headers/Makefile b/devel/boost-headers/Makefile
index e66472f07ae..6db820af733 100644
--- a/devel/boost-headers/Makefile
+++ b/devel/boost-headers/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/09/13 16:14:13 jmmv Exp $
-#
+# $NetBSD: Makefile,v 1.13 2009/11/24 09:51:20 adam Exp $
 
 BOOST_PACKAGE=		headers
 BOOST_COMMENT=		(build-time headers)
diff --git a/devel/boost-headers/PLIST b/devel/boost-headers/PLIST
index 337fb58c40f..0104d93ff5a 100644
--- a/devel/boost-headers/PLIST
+++ b/devel/boost-headers/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/10/14 06:40:07 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2009/11/24 09:51:20 adam Exp $
 include/boost/accumulators/accumulators.hpp
 include/boost/accumulators/accumulators_fwd.hpp
 include/boost/accumulators/framework/accumulator_base.hpp
@@ -166,6 +166,7 @@ include/boost/archive/detail/basic_pointer_iserializer.hpp
 include/boost/archive/detail/basic_pointer_oserializer.hpp
 include/boost/archive/detail/basic_serializer.hpp
 include/boost/archive/detail/basic_serializer_map.hpp
+include/boost/archive/detail/check.hpp
 include/boost/archive/detail/common_iarchive.hpp
 include/boost/archive/detail/common_oarchive.hpp
 include/boost/archive/detail/decl.hpp
@@ -837,6 +838,7 @@ include/boost/exception/errinfo_errno.hpp
 include/boost/exception/errinfo_file_handle.hpp
 include/boost/exception/errinfo_file_name.hpp
 include/boost/exception/errinfo_file_open_mode.hpp
+include/boost/exception/errinfo_nested_exception.hpp
 include/boost/exception/errinfo_type_info_name.hpp
 include/boost/exception/error_info.hpp
 include/boost/exception/exception.hpp
@@ -1044,6 +1046,14 @@ include/boost/fusion/adapted/boost_tuple/detail/is_view_impl.hpp
 include/boost/fusion/adapted/boost_tuple/detail/size_impl.hpp
 include/boost/fusion/adapted/boost_tuple/detail/value_at_impl.hpp
 include/boost/fusion/adapted/boost_tuple/tag_of.hpp
+include/boost/fusion/adapted/class.hpp
+include/boost/fusion/adapted/class/adapt_assoc_class.hpp
+include/boost/fusion/adapted/class/adapt_class.hpp
+include/boost/fusion/adapted/class/class_iterator.hpp
+include/boost/fusion/adapted/class/detail/at_impl.hpp
+include/boost/fusion/adapted/class/detail/at_key_impl.hpp
+include/boost/fusion/adapted/class/detail/begin_impl.hpp
+include/boost/fusion/adapted/class/detail/category_of_impl.hpp
 include/boost/fusion/adapted/mpl.hpp
 include/boost/fusion/adapted/mpl/detail/at_impl.hpp
 include/boost/fusion/adapted/mpl/detail/begin_impl.hpp
@@ -1249,6 +1259,7 @@ include/boost/fusion/functional/adapter/fused.hpp
 include/boost/fusion/functional/adapter/fused_function_object.hpp
 include/boost/fusion/functional/adapter/fused_procedure.hpp
 include/boost/fusion/functional/adapter/limits.hpp
+include/boost/fusion/functional/adapter/unfused.hpp
 include/boost/fusion/functional/adapter/unfused_generic.hpp
 include/boost/fusion/functional/adapter/unfused_lvalue_args.hpp
 include/boost/fusion/functional/adapter/unfused_rvalue_args.hpp
@@ -1258,6 +1269,7 @@ include/boost/fusion/functional/generation/detail/gen_make_adapter.hpp
 include/boost/fusion/functional/generation/make_fused.hpp
 include/boost/fusion/functional/generation/make_fused_function_object.hpp
 include/boost/fusion/functional/generation/make_fused_procedure.hpp
+include/boost/fusion/functional/generation/make_unfused.hpp
 include/boost/fusion/functional/generation/make_unfused_generic.hpp
 include/boost/fusion/functional/generation/make_unfused_lvalue_args.hpp
 include/boost/fusion/functional/generation/make_unfused_rvalue_args.hpp
@@ -1369,6 +1381,7 @@ include/boost/fusion/include/mpl.hpp
 include/boost/fusion/include/next.hpp
 include/boost/fusion/include/none.hpp
 include/boost/fusion/include/not_equal_to.hpp
+include/boost/fusion/include/nview.hpp
 include/boost/fusion/include/out.hpp
 include/boost/fusion/include/pair.hpp
 include/boost/fusion/include/pair_tie.hpp
@@ -1555,6 +1568,22 @@ include/boost/fusion/view/joint_view/detail/next_impl.hpp
 include/boost/fusion/view/joint_view/detail/value_of_impl.hpp
 include/boost/fusion/view/joint_view/joint_view.hpp
 include/boost/fusion/view/joint_view/joint_view_iterator.hpp
+include/boost/fusion/view/nview.hpp
+include/boost/fusion/view/nview/detail/advance_impl.hpp
+include/boost/fusion/view/nview/detail/at_impl.hpp
+include/boost/fusion/view/nview/detail/begin_impl.hpp
+include/boost/fusion/view/nview/detail/deref_impl.hpp
+include/boost/fusion/view/nview/detail/distance_impl.hpp
+include/boost/fusion/view/nview/detail/end_impl.hpp
+include/boost/fusion/view/nview/detail/equal_to_impl.hpp
+include/boost/fusion/view/nview/detail/next_impl.hpp
+include/boost/fusion/view/nview/detail/nview_impl.hpp
+include/boost/fusion/view/nview/detail/prior_impl.hpp
+include/boost/fusion/view/nview/detail/size_impl.hpp
+include/boost/fusion/view/nview/detail/value_at_impl.hpp
+include/boost/fusion/view/nview/detail/value_of_impl.hpp
+include/boost/fusion/view/nview/nview.hpp
+include/boost/fusion/view/nview/nview_iterator.hpp
 include/boost/fusion/view/repetitive_view.hpp
 include/boost/fusion/view/repetitive_view/detail/begin_impl.hpp
 include/boost/fusion/view/repetitive_view/detail/deref_impl.hpp
@@ -1702,10 +1731,12 @@ include/boost/graph/depth_first_search.hpp
 include/boost/graph/detail/adj_list_edge_iterator.hpp
 include/boost/graph/detail/adjacency_list.hpp
 include/boost/graph/detail/array_binary_tree.hpp
+include/boost/graph/detail/compressed_sparse_row_struct.hpp
 include/boost/graph/detail/connected_components.hpp
 include/boost/graph/detail/d_ary_heap.hpp
 include/boost/graph/detail/edge.hpp
 include/boost/graph/detail/geodesic.hpp
+include/boost/graph/detail/histogram_sort.hpp
 include/boost/graph/detail/incidence_iterator.hpp
 include/boost/graph/detail/incremental_components.hpp
 include/boost/graph/detail/index.hpp
@@ -1791,6 +1822,7 @@ include/boost/graph/graph_traits.hpp
 include/boost/graph/graph_utility.hpp
 include/boost/graph/graphml.hpp
 include/boost/graph/graphviz.hpp
+include/boost/graph/grid_graph.hpp
 include/boost/graph/gursoy_atun_layout.hpp
 include/boost/graph/howard_cycle_ratio.hpp
 include/boost/graph/incremental_components.hpp
@@ -1904,8 +1936,9 @@ include/boost/interprocess/allocators/private_adaptive_pool.hpp
 include/boost/interprocess/allocators/private_node_allocator.hpp
 include/boost/interprocess/anonymous_shared_memory.hpp
 include/boost/interprocess/containers/allocation_type.hpp
-include/boost/interprocess/containers/container/containers_fwd.hpp
+include/boost/interprocess/containers/container/container_fwd.hpp
 include/boost/interprocess/containers/container/deque.hpp
+include/boost/interprocess/containers/container/detail/adaptive_node_pool_impl.hpp
 include/boost/interprocess/containers/container/detail/advanced_insert_int.hpp
 include/boost/interprocess/containers/container/detail/algorithms.hpp
 include/boost/interprocess/containers/container/detail/allocation_type.hpp
@@ -1914,10 +1947,13 @@ include/boost/interprocess/containers/container/detail/config_end.hpp
 include/boost/interprocess/containers/container/detail/destroyers.hpp
 include/boost/interprocess/containers/container/detail/flat_tree.hpp
 include/boost/interprocess/containers/container/detail/iterators.hpp
+include/boost/interprocess/containers/container/detail/math_functions.hpp
 include/boost/interprocess/containers/container/detail/mpl.hpp
 include/boost/interprocess/containers/container/detail/multiallocation_chain.hpp
 include/boost/interprocess/containers/container/detail/node_alloc_holder.hpp
+include/boost/interprocess/containers/container/detail/node_pool_impl.hpp
 include/boost/interprocess/containers/container/detail/pair.hpp
+include/boost/interprocess/containers/container/detail/pool_common.hpp
 include/boost/interprocess/containers/container/detail/preprocessor.hpp
 include/boost/interprocess/containers/container/detail/transform_iterator.hpp
 include/boost/interprocess/containers/container/detail/tree.hpp
@@ -1936,6 +1972,7 @@ include/boost/interprocess/containers/container/slist.hpp
 include/boost/interprocess/containers/container/stable_vector.hpp
 include/boost/interprocess/containers/container/string.hpp
 include/boost/interprocess/containers/container/vector.hpp
+include/boost/interprocess/containers/containers_fwd.hpp
 include/boost/interprocess/containers/deque.hpp
 include/boost/interprocess/containers/flat_map.hpp
 include/boost/interprocess/containers/flat_set.hpp
@@ -1955,6 +1992,7 @@ include/boost/interprocess/detail/config_begin.hpp
 include/boost/interprocess/detail/config_end.hpp
 include/boost/interprocess/detail/file_wrapper.hpp
 include/boost/interprocess/detail/in_place_interface.hpp
+include/boost/interprocess/detail/intermodule_singleton.hpp
 include/boost/interprocess/detail/interprocess_tester.hpp
 include/boost/interprocess/detail/intersegment_ptr.hpp
 include/boost/interprocess/detail/managed_memory_impl.hpp
@@ -1980,6 +2018,8 @@ include/boost/interprocess/detail/utilities.hpp
 include/boost/interprocess/detail/variadic_templates_tools.hpp
 include/boost/interprocess/detail/win32_api.hpp
 include/boost/interprocess/detail/workaround.hpp
+include/boost/interprocess/detail/xsi_shared_memory.hpp
+include/boost/interprocess/detail/xsi_shared_memory_device.hpp
 include/boost/interprocess/errors.hpp
 include/boost/interprocess/exceptions.hpp
 include/boost/interprocess/file_mapping.hpp
@@ -2052,6 +2092,9 @@ include/boost/interprocess/sync/posix/semaphore_wrapper.hpp
 include/boost/interprocess/sync/scoped_lock.hpp
 include/boost/interprocess/sync/sharable_lock.hpp
 include/boost/interprocess/sync/upgradable_lock.hpp
+include/boost/interprocess/sync/xsi/advanced_xsi_semaphore.hpp
+include/boost/interprocess/sync/xsi/simple_xsi_semaphore.hpp
+include/boost/interprocess/sync/xsi/xsi_named_mutex.hpp
 include/boost/interprocess/windows_shared_memory.hpp
 include/boost/intrusive/any_hook.hpp
 include/boost/intrusive/avl_set.hpp
@@ -2070,8 +2113,10 @@ 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/ebo_functor_holder.hpp
+include/boost/intrusive/detail/function_detector.hpp
 include/boost/intrusive/detail/generic_hook.hpp
 include/boost/intrusive/detail/hashtable_node.hpp
+include/boost/intrusive/detail/is_stateful_value_traits.hpp
 include/boost/intrusive/detail/list_node.hpp
 include/boost/intrusive/detail/mpl.hpp
 include/boost/intrusive/detail/parent_from_member.hpp
@@ -2168,6 +2213,7 @@ include/boost/iostreams/detail/double_object.hpp
 include/boost/iostreams/detail/enable_if_stream.hpp
 include/boost/iostreams/detail/error.hpp
 include/boost/iostreams/detail/execute.hpp
+include/boost/iostreams/detail/file_handle.hpp
 include/boost/iostreams/detail/forward.hpp
 include/boost/iostreams/detail/fstream.hpp
 include/boost/iostreams/detail/functional.hpp
@@ -2178,6 +2224,7 @@ include/boost/iostreams/detail/is_iterator_range.hpp
 include/boost/iostreams/detail/newline.hpp
 include/boost/iostreams/detail/optional.hpp
 include/boost/iostreams/detail/param_type.hpp
+include/boost/iostreams/detail/path.hpp
 include/boost/iostreams/detail/push.hpp
 include/boost/iostreams/detail/push_params.hpp
 include/boost/iostreams/detail/resolve.hpp
@@ -2205,6 +2252,7 @@ include/boost/iostreams/device/null.hpp
 include/boost/iostreams/filter/aggregate.hpp
 include/boost/iostreams/filter/bzip2.hpp
 include/boost/iostreams/filter/counter.hpp
+include/boost/iostreams/filter/grep.hpp
 include/boost/iostreams/filter/gzip.hpp
 include/boost/iostreams/filter/line.hpp
 include/boost/iostreams/filter/newline.hpp
@@ -3834,6 +3882,7 @@ include/boost/numeric/ublas/detail/returntype_deduction.hpp
 include/boost/numeric/ublas/detail/temporary.hpp
 include/boost/numeric/ublas/detail/vector_assign.hpp
 include/boost/numeric/ublas/exception.hpp
+include/boost/numeric/ublas/experimental/sparse_view.hpp
 include/boost/numeric/ublas/expression_types.hpp
 include/boost/numeric/ublas/functional.hpp
 include/boost/numeric/ublas/fwd.hpp
@@ -3845,12 +3894,23 @@ 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/operation.hpp
+include/boost/numeric/ublas/operation/begin.hpp
+include/boost/numeric/ublas/operation/c_array.hpp
+include/boost/numeric/ublas/operation/end.hpp
+include/boost/numeric/ublas/operation/num_columns.hpp
+include/boost/numeric/ublas/operation/num_rows.hpp
+include/boost/numeric/ublas/operation/size.hpp
 include/boost/numeric/ublas/operation_blocked.hpp
 include/boost/numeric/ublas/operation_sparse.hpp
+include/boost/numeric/ublas/operations.hpp
 include/boost/numeric/ublas/storage.hpp
 include/boost/numeric/ublas/storage_sparse.hpp
 include/boost/numeric/ublas/symmetric.hpp
+include/boost/numeric/ublas/tags.hpp
 include/boost/numeric/ublas/traits.hpp
+include/boost/numeric/ublas/traits/c_array.hpp
+include/boost/numeric/ublas/traits/const_iterator_type.hpp
+include/boost/numeric/ublas/traits/iterator_type.hpp
 include/boost/numeric/ublas/triangular.hpp
 include/boost/numeric/ublas/vector.hpp
 include/boost/numeric/ublas/vector_expression.hpp
@@ -4197,6 +4257,36 @@ include/boost/property_map/property_map_iterator.hpp
 include/boost/property_map/shared_array_property_map.hpp
 include/boost/property_map/vector_property_map.hpp
 include/boost/property_map_iterator.hpp
+include/boost/property_tree/detail/exception_implementation.hpp
+include/boost/property_tree/detail/file_parser_error.hpp
+include/boost/property_tree/detail/info_parser_error.hpp
+include/boost/property_tree/detail/info_parser_read.hpp
+include/boost/property_tree/detail/info_parser_utils.hpp
+include/boost/property_tree/detail/info_parser_write.hpp
+include/boost/property_tree/detail/info_parser_writer_settings.hpp
+include/boost/property_tree/detail/json_parser_error.hpp
+include/boost/property_tree/detail/json_parser_read.hpp
+include/boost/property_tree/detail/json_parser_write.hpp
+include/boost/property_tree/detail/ptree_implementation.hpp
+include/boost/property_tree/detail/ptree_utils.hpp
+include/boost/property_tree/detail/rapidxml.hpp
+include/boost/property_tree/detail/xml_parser_error.hpp
+include/boost/property_tree/detail/xml_parser_flags.hpp
+include/boost/property_tree/detail/xml_parser_read_rapidxml.hpp
+include/boost/property_tree/detail/xml_parser_utils.hpp
+include/boost/property_tree/detail/xml_parser_write.hpp
+include/boost/property_tree/detail/xml_parser_writer_settings.hpp
+include/boost/property_tree/exceptions.hpp
+include/boost/property_tree/id_translator.hpp
+include/boost/property_tree/info_parser.hpp
+include/boost/property_tree/ini_parser.hpp
+include/boost/property_tree/json_parser.hpp
+include/boost/property_tree/ptree.hpp
+include/boost/property_tree/ptree_fwd.hpp
+include/boost/property_tree/ptree_serialization.hpp
+include/boost/property_tree/stream_translator.hpp
+include/boost/property_tree/string_path.hpp
+include/boost/property_tree/xml_parser.hpp
 include/boost/proto/args.hpp
 include/boost/proto/context.hpp
 include/boost/proto/context/callable.hpp
@@ -5115,116 +5205,120 @@ include/boost/spirit/home/classic/version.hpp
 include/boost/spirit/home/karma.hpp
 include/boost/spirit/home/karma/action.hpp
 include/boost/spirit/home/karma/action/action.hpp
-include/boost/spirit/home/karma/action/meta_grammar.hpp
 include/boost/spirit/home/karma/auxiliary.hpp
-include/boost/spirit/home/karma/auxiliary/confix.hpp
+include/boost/spirit/home/karma/auxiliary/attr_cast.hpp
 include/boost/spirit/home/karma/auxiliary/eol.hpp
 include/boost/spirit/home/karma/auxiliary/eps.hpp
-include/boost/spirit/home/karma/auxiliary/functor.hpp
-include/boost/spirit/home/karma/auxiliary/functor_director.hpp
 include/boost/spirit/home/karma/auxiliary/lazy.hpp
-include/boost/spirit/home/karma/auxiliary/meta_grammar.hpp
-include/boost/spirit/home/karma/auxiliary/none.hpp
 include/boost/spirit/home/karma/binary.hpp
 include/boost/spirit/home/karma/binary/binary.hpp
-include/boost/spirit/home/karma/binary/meta_grammar.hpp
 include/boost/spirit/home/karma/binary/padding.hpp
 include/boost/spirit/home/karma/char.hpp
 include/boost/spirit/home/karma/char/char.hpp
-include/boost/spirit/home/karma/char/meta_grammar.hpp
-include/boost/spirit/home/karma/char/space.hpp
-include/boost/spirit/home/karma/delimit.hpp
+include/boost/spirit/home/karma/char/char_class.hpp
+include/boost/spirit/home/karma/char/char_generator.hpp
+include/boost/spirit/home/karma/delimit_out.hpp
+include/boost/spirit/home/karma/detail/alternative_function.hpp
+include/boost/spirit/home/karma/detail/default_width.hpp
+include/boost/spirit/home/karma/detail/extract_from.hpp
+include/boost/spirit/home/karma/detail/fail_function.hpp
 include/boost/spirit/home/karma/detail/generate_to.hpp
-include/boost/spirit/home/karma/detail/ostream_iterator.hpp
+include/boost/spirit/home/karma/detail/get_casetag.hpp
 include/boost/spirit/home/karma/detail/output_iterator.hpp
+include/boost/spirit/home/karma/detail/pass_container.hpp
+include/boost/spirit/home/karma/detail/string_compare.hpp
 include/boost/spirit/home/karma/detail/string_generate.hpp
+include/boost/spirit/home/karma/detail/unused_delimiter.hpp
 include/boost/spirit/home/karma/directive.hpp
-include/boost/spirit/home/karma/directive/alignment_meta_grammar.hpp
-include/boost/spirit/home/karma/directive/case_meta_grammar.hpp
+include/boost/spirit/home/karma/directive/buffer.hpp
 include/boost/spirit/home/karma/directive/center_alignment.hpp
 include/boost/spirit/home/karma/directive/delimit.hpp
-include/boost/spirit/home/karma/directive/delimiter_meta_grammar.hpp
-include/boost/spirit/home/karma/directive/detail/center_alignment_generate.hpp
-include/boost/spirit/home/karma/directive/detail/left_alignment_generate.hpp
-include/boost/spirit/home/karma/directive/detail/right_alignment_generate.hpp
 include/boost/spirit/home/karma/directive/left_alignment.hpp
+include/boost/spirit/home/karma/directive/maxwidth.hpp
+include/boost/spirit/home/karma/directive/omit.hpp
+include/boost/spirit/home/karma/directive/repeat.hpp
 include/boost/spirit/home/karma/directive/right_alignment.hpp
+include/boost/spirit/home/karma/directive/upper_lower_case.hpp
 include/boost/spirit/home/karma/directive/verbatim.hpp
 include/boost/spirit/home/karma/domain.hpp
 include/boost/spirit/home/karma/generate.hpp
-include/boost/spirit/home/karma/meta_grammar.hpp
+include/boost/spirit/home/karma/generate_attr.hpp
+include/boost/spirit/home/karma/generator.hpp
+include/boost/spirit/home/karma/meta_compiler.hpp
 include/boost/spirit/home/karma/nonterminal.hpp
-include/boost/spirit/home/karma/nonterminal/detail/rule.hpp
+include/boost/spirit/home/karma/nonterminal/detail/fcall.hpp
+include/boost/spirit/home/karma/nonterminal/detail/generator_binder.hpp
+include/boost/spirit/home/karma/nonterminal/detail/parameterized.hpp
 include/boost/spirit/home/karma/nonterminal/grammar.hpp
-include/boost/spirit/home/karma/nonterminal/grammar_fwd.hpp
-include/boost/spirit/home/karma/nonterminal/meta_grammar.hpp
-include/boost/spirit/home/karma/nonterminal/nonterminal.hpp
-include/boost/spirit/home/karma/nonterminal/nonterminal_director.hpp
 include/boost/spirit/home/karma/nonterminal/rule.hpp
 include/boost/spirit/home/karma/numeric.hpp
+include/boost/spirit/home/karma/numeric/bool.hpp
+include/boost/spirit/home/karma/numeric/bool_policies.hpp
+include/boost/spirit/home/karma/numeric/detail/bool_utils.hpp
 include/boost/spirit/home/karma/numeric/detail/numeric_utils.hpp
+include/boost/spirit/home/karma/numeric/detail/real_utils.hpp
 include/boost/spirit/home/karma/numeric/int.hpp
-include/boost/spirit/home/karma/numeric/meta_grammar.hpp
-include/boost/spirit/home/karma/numeric/numeric_fwd.hpp
 include/boost/spirit/home/karma/numeric/real.hpp
 include/boost/spirit/home/karma/numeric/real_policies.hpp
 include/boost/spirit/home/karma/numeric/uint.hpp
 include/boost/spirit/home/karma/operator.hpp
 include/boost/spirit/home/karma/operator/alternative.hpp
-include/boost/spirit/home/karma/operator/detail/alternative.hpp
-include/boost/spirit/home/karma/operator/detail/sequence.hpp
-include/boost/spirit/home/karma/operator/karma-alt/alternative.hpp
-include/boost/spirit/home/karma/operator/karma-alt/detail/alternative.hpp
+include/boost/spirit/home/karma/operator/and_predicate.hpp
 include/boost/spirit/home/karma/operator/kleene.hpp
 include/boost/spirit/home/karma/operator/list.hpp
-include/boost/spirit/home/karma/operator/meta_grammar.hpp
+include/boost/spirit/home/karma/operator/not_predicate.hpp
 include/boost/spirit/home/karma/operator/optional.hpp
 include/boost/spirit/home/karma/operator/plus.hpp
 include/boost/spirit/home/karma/operator/sequence.hpp
+include/boost/spirit/home/karma/reference.hpp
 include/boost/spirit/home/karma/stream.hpp
 include/boost/spirit/home/karma/stream/detail/format_manip.hpp
-include/boost/spirit/home/karma/stream/detail/iterator_ostream.hpp
+include/boost/spirit/home/karma/stream/detail/iterator_sink.hpp
 include/boost/spirit/home/karma/stream/format_manip.hpp
-include/boost/spirit/home/karma/stream/meta_grammar.hpp
+include/boost/spirit/home/karma/stream/format_manip_attr.hpp
+include/boost/spirit/home/karma/stream/ostream_iterator.hpp
 include/boost/spirit/home/karma/stream/stream.hpp
 include/boost/spirit/home/karma/string.hpp
 include/boost/spirit/home/karma/string/lit.hpp
-include/boost/spirit/home/karma/string/meta_grammar.hpp
 include/boost/spirit/home/karma/what.hpp
 include/boost/spirit/home/lex.hpp
+include/boost/spirit/home/lex/argument.hpp
+include/boost/spirit/home/lex/detail/sequence_function.hpp
 include/boost/spirit/home/lex/domain.hpp
 include/boost/spirit/home/lex/lexer.hpp
 include/boost/spirit/home/lex/lexer/action.hpp
 include/boost/spirit/home/lex/lexer/char_token_def.hpp
-include/boost/spirit/home/lex/lexer/detail/sequence.hpp
 include/boost/spirit/home/lex/lexer/lexer.hpp
-include/boost/spirit/home/lex/lexer/lexer_actions.hpp
-include/boost/spirit/home/lex/lexer/lexer_fwd.hpp
+include/boost/spirit/home/lex/lexer/lexertl/functor.hpp
+include/boost/spirit/home/lex/lexer/lexertl/functor_data.hpp
+include/boost/spirit/home/lex/lexer/lexertl/generate_static.hpp
+include/boost/spirit/home/lex/lexer/lexertl/iterator.hpp
 include/boost/spirit/home/lex/lexer/lexertl/iterator_tokenizer.hpp
-include/boost/spirit/home/lex/lexer/lexertl/lexertl_functor.hpp
-include/boost/spirit/home/lex/lexer/lexertl/lexertl_generate_static.hpp
-include/boost/spirit/home/lex/lexer/lexertl/lexertl_iterator.hpp
-include/boost/spirit/home/lex/lexer/lexertl/lexertl_lexer.hpp
-include/boost/spirit/home/lex/lexer/lexertl/lexertl_static_functor.hpp
-include/boost/spirit/home/lex/lexer/lexertl/lexertl_static_lexer.hpp
-include/boost/spirit/home/lex/lexer/lexertl/lexertl_token.hpp
+include/boost/spirit/home/lex/lexer/lexertl/lexer.hpp
+include/boost/spirit/home/lex/lexer/lexertl/semantic_action_data.hpp
+include/boost/spirit/home/lex/lexer/lexertl/static_functor_data.hpp
+include/boost/spirit/home/lex/lexer/lexertl/static_lexer.hpp
+include/boost/spirit/home/lex/lexer/lexertl/static_version.hpp
+include/boost/spirit/home/lex/lexer/lexertl/token.hpp
 include/boost/spirit/home/lex/lexer/lexertl/wrap_action.hpp
-include/boost/spirit/home/lex/lexer/meta_grammar.hpp
+include/boost/spirit/home/lex/lexer/pass_flags.hpp
 include/boost/spirit/home/lex/lexer/sequence.hpp
 include/boost/spirit/home/lex/lexer/string_token_def.hpp
-include/boost/spirit/home/lex/lexer/terminal_director.hpp
-include/boost/spirit/home/lex/lexer/terminal_holder.hpp
+include/boost/spirit/home/lex/lexer/support_functions.hpp
+include/boost/spirit/home/lex/lexer/terminals.hpp
 include/boost/spirit/home/lex/lexer/token_def.hpp
-include/boost/spirit/home/lex/lexer/token_set.hpp
 include/boost/spirit/home/lex/lexer_lexertl.hpp
 include/boost/spirit/home/lex/lexer_static_lexertl.hpp
-include/boost/spirit/home/lex/meta_grammar.hpp
-include/boost/spirit/home/lex/qi/meta_grammar.hpp
-include/boost/spirit/home/lex/qi/state/in_state.hpp
-include/boost/spirit/home/lex/qi/state/state_switcher.hpp
-include/boost/spirit/home/lex/qi/utility/plain_token.hpp
-include/boost/spirit/home/lex/set_state.hpp
+include/boost/spirit/home/lex/lexer_type.hpp
+include/boost/spirit/home/lex/meta_compiler.hpp
+include/boost/spirit/home/lex/primitives.hpp
+include/boost/spirit/home/lex/qi.hpp
+include/boost/spirit/home/lex/qi/in_state.hpp
+include/boost/spirit/home/lex/qi/plain_token.hpp
+include/boost/spirit/home/lex/qi/state_switcher.hpp
+include/boost/spirit/home/lex/reference.hpp
 include/boost/spirit/home/lex/tokenize_and_parse.hpp
+include/boost/spirit/home/lex/tokenize_and_parse_attr.hpp
 include/boost/spirit/home/phoenix.hpp
 include/boost/spirit/home/phoenix/algorithm.hpp
 include/boost/spirit/home/phoenix/bind.hpp
@@ -5337,9 +5431,6 @@ include/boost/spirit/home/phoenix/stl/algorithm/detail/is_std_map.hpp
 include/boost/spirit/home/phoenix/stl/algorithm/detail/is_std_set.hpp
 include/boost/spirit/home/phoenix/stl/algorithm/detail/std_hash_map_fwd.hpp
 include/boost/spirit/home/phoenix/stl/algorithm/detail/std_hash_set_fwd.hpp
-include/boost/spirit/home/phoenix/stl/algorithm/detail/std_list_fwd.hpp
-include/boost/spirit/home/phoenix/stl/algorithm/detail/std_map_fwd.hpp
-include/boost/spirit/home/phoenix/stl/algorithm/detail/std_set_fwd.hpp
 include/boost/spirit/home/phoenix/stl/algorithm/iteration.hpp
 include/boost/spirit/home/phoenix/stl/algorithm/querying.hpp
 include/boost/spirit/home/phoenix/stl/algorithm/transformation.hpp
@@ -5350,68 +5441,53 @@ include/boost/spirit/home/phoenix/version.hpp
 include/boost/spirit/home/qi.hpp
 include/boost/spirit/home/qi/action.hpp
 include/boost/spirit/home/qi/action/action.hpp
-include/boost/spirit/home/qi/action/meta_grammar.hpp
 include/boost/spirit/home/qi/auxiliary.hpp
-include/boost/spirit/home/qi/auxiliary/confix.hpp
+include/boost/spirit/home/qi/auxiliary/attr.hpp
+include/boost/spirit/home/qi/auxiliary/attr_cast.hpp
+include/boost/spirit/home/qi/auxiliary/eoi.hpp
+include/boost/spirit/home/qi/auxiliary/eol.hpp
 include/boost/spirit/home/qi/auxiliary/eps.hpp
-include/boost/spirit/home/qi/auxiliary/functor.hpp
-include/boost/spirit/home/qi/auxiliary/functor_director.hpp
 include/boost/spirit/home/qi/auxiliary/lazy.hpp
-include/boost/spirit/home/qi/auxiliary/meta_grammar.hpp
-include/boost/spirit/home/qi/auxiliary/none.hpp
-include/boost/spirit/home/qi/auxiliary/primitives.hpp
 include/boost/spirit/home/qi/binary.hpp
 include/boost/spirit/home/qi/binary/binary.hpp
-include/boost/spirit/home/qi/binary/meta_grammar.hpp
 include/boost/spirit/home/qi/char.hpp
 include/boost/spirit/home/qi/char/char.hpp
 include/boost/spirit/home/qi/char/char_class.hpp
 include/boost/spirit/home/qi/char/char_parser.hpp
-include/boost/spirit/home/qi/char/detail/basic_chset.hpp
-include/boost/spirit/home/qi/char/detail/get_char.hpp
-include/boost/spirit/home/qi/char/detail/range.hpp
-include/boost/spirit/home/qi/char/detail/range_functions.hpp
-include/boost/spirit/home/qi/char/detail/range_run.hpp
-include/boost/spirit/home/qi/char/detail/range_run_impl.hpp
-include/boost/spirit/home/qi/char/meta_grammar.hpp
-include/boost/spirit/home/qi/debug.hpp
-include/boost/spirit/home/qi/debug/detail/debug_handler.hpp
-include/boost/spirit/home/qi/debug/detail/print_node_info.hpp
-include/boost/spirit/home/qi/debug/minimal_macros.hpp
-include/boost/spirit/home/qi/debug/simple_debug.hpp
-include/boost/spirit/home/qi/debug/simple_debug_macros.hpp
 include/boost/spirit/home/qi/detail/alternative_function.hpp
 include/boost/spirit/home/qi/detail/assign_to.hpp
 include/boost/spirit/home/qi/detail/construct.hpp
-include/boost/spirit/home/qi/detail/construct_fwd.hpp
 include/boost/spirit/home/qi/detail/expect_function.hpp
 include/boost/spirit/home/qi/detail/fail_function.hpp
+include/boost/spirit/home/qi/detail/pass_container.hpp
 include/boost/spirit/home/qi/detail/pass_function.hpp
 include/boost/spirit/home/qi/detail/permute_function.hpp
 include/boost/spirit/home/qi/detail/string_parse.hpp
+include/boost/spirit/home/qi/detail/unused_skipper.hpp
 include/boost/spirit/home/qi/directive.hpp
 include/boost/spirit/home/qi/directive/lexeme.hpp
-include/boost/spirit/home/qi/directive/meta_grammar.hpp
+include/boost/spirit/home/qi/directive/no_case.hpp
 include/boost/spirit/home/qi/directive/omit.hpp
 include/boost/spirit/home/qi/directive/raw.hpp
+include/boost/spirit/home/qi/directive/repeat.hpp
+include/boost/spirit/home/qi/directive/skip.hpp
 include/boost/spirit/home/qi/domain.hpp
-include/boost/spirit/home/qi/meta_grammar.hpp
+include/boost/spirit/home/qi/meta_compiler.hpp
 include/boost/spirit/home/qi/nonterminal.hpp
-include/boost/spirit/home/qi/nonterminal/detail/error_handler.hpp
-include/boost/spirit/home/qi/nonterminal/detail/rule.hpp
-include/boost/spirit/home/qi/nonterminal/error_handler_result.hpp
+include/boost/spirit/home/qi/nonterminal/debug_handler.hpp
+include/boost/spirit/home/qi/nonterminal/detail/fcall.hpp
+include/boost/spirit/home/qi/nonterminal/detail/parameterized.hpp
+include/boost/spirit/home/qi/nonterminal/detail/parser_binder.hpp
+include/boost/spirit/home/qi/nonterminal/error_handler.hpp
 include/boost/spirit/home/qi/nonterminal/grammar.hpp
-include/boost/spirit/home/qi/nonterminal/grammar_fwd.hpp
-include/boost/spirit/home/qi/nonterminal/meta_grammar.hpp
-include/boost/spirit/home/qi/nonterminal/nonterminal.hpp
-include/boost/spirit/home/qi/nonterminal/nonterminal_director.hpp
 include/boost/spirit/home/qi/nonterminal/rule.hpp
-include/boost/spirit/home/qi/nonterminal/virtual_component_base.hpp
+include/boost/spirit/home/qi/nonterminal/simple_trace.hpp
 include/boost/spirit/home/qi/numeric.hpp
+include/boost/spirit/home/qi/numeric/bool.hpp
+include/boost/spirit/home/qi/numeric/bool_policies.hpp
 include/boost/spirit/home/qi/numeric/detail/numeric_utils.hpp
 include/boost/spirit/home/qi/numeric/detail/real_impl.hpp
 include/boost/spirit/home/qi/numeric/int.hpp
-include/boost/spirit/home/qi/numeric/meta_grammar.hpp
 include/boost/spirit/home/qi/numeric/numeric_utils.hpp
 include/boost/spirit/home/qi/numeric/real.hpp
 include/boost/spirit/home/qi/numeric/real_policies.hpp
@@ -5423,7 +5499,6 @@ include/boost/spirit/home/qi/operator/difference.hpp
 include/boost/spirit/home/qi/operator/expect.hpp
 include/boost/spirit/home/qi/operator/kleene.hpp
 include/boost/spirit/home/qi/operator/list.hpp
-include/boost/spirit/home/qi/operator/meta_grammar.hpp
 include/boost/spirit/home/qi/operator/not_predicate.hpp
 include/boost/spirit/home/qi/operator/optional.hpp
 include/boost/spirit/home/qi/operator/permutation.hpp
@@ -5432,41 +5507,50 @@ include/boost/spirit/home/qi/operator/sequence.hpp
 include/boost/spirit/home/qi/operator/sequence_base.hpp
 include/boost/spirit/home/qi/operator/sequential_or.hpp
 include/boost/spirit/home/qi/parse.hpp
-include/boost/spirit/home/qi/skip.hpp
+include/boost/spirit/home/qi/parse_attr.hpp
+include/boost/spirit/home/qi/parser.hpp
+include/boost/spirit/home/qi/reference.hpp
+include/boost/spirit/home/qi/skip_over.hpp
 include/boost/spirit/home/qi/stream.hpp
-include/boost/spirit/home/qi/stream/detail/iterator_istream.hpp
+include/boost/spirit/home/qi/stream/detail/iterator_source.hpp
 include/boost/spirit/home/qi/stream/detail/match_manip.hpp
 include/boost/spirit/home/qi/stream/match_manip.hpp
-include/boost/spirit/home/qi/stream/meta_grammar.hpp
+include/boost/spirit/home/qi/stream/match_manip_attr.hpp
 include/boost/spirit/home/qi/stream/stream.hpp
 include/boost/spirit/home/qi/string.hpp
 include/boost/spirit/home/qi/string/detail/tst.hpp
 include/boost/spirit/home/qi/string/lit.hpp
-include/boost/spirit/home/qi/string/meta_grammar.hpp
 include/boost/spirit/home/qi/string/symbols.hpp
 include/boost/spirit/home/qi/string/tst.hpp
 include/boost/spirit/home/qi/string/tst_map.hpp
 include/boost/spirit/home/qi/what.hpp
 include/boost/spirit/home/support.hpp
+include/boost/spirit/home/support/action_dispatch.hpp
 include/boost/spirit/home/support/algorithm/any.hpp
 include/boost/spirit/home/support/algorithm/any_if.hpp
+include/boost/spirit/home/support/algorithm/any_if_ns.hpp
 include/boost/spirit/home/support/algorithm/any_ns.hpp
 include/boost/spirit/home/support/argument.hpp
-include/boost/spirit/home/support/as_variant.hpp
-include/boost/spirit/home/support/ascii.hpp
-include/boost/spirit/home/support/attribute_of.hpp
-include/boost/spirit/home/support/attribute_transform.hpp
-include/boost/spirit/home/support/auxiliary/confix.hpp
-include/boost/spirit/home/support/auxiliary/functor_holder.hpp
-include/boost/spirit/home/support/auxiliary/meta_function_holder.hpp
+include/boost/spirit/home/support/assert_msg.hpp
+include/boost/spirit/home/support/attributes.hpp
+include/boost/spirit/home/support/attributes_fwd.hpp
+include/boost/spirit/home/support/auxiliary/attr_cast.hpp
 include/boost/spirit/home/support/char_class.hpp
-include/boost/spirit/home/support/char_class/ascii.hpp
-include/boost/spirit/home/support/char_class/iso8859_1.hpp
-include/boost/spirit/home/support/char_class/standard.hpp
-include/boost/spirit/home/support/char_class/standard_wide.hpp
-include/boost/spirit/home/support/component.hpp
-include/boost/spirit/home/support/detail/action_dispatch.hpp
-include/boost/spirit/home/support/detail/container.hpp
+include/boost/spirit/home/support/char_encoding/ascii.hpp
+include/boost/spirit/home/support/char_encoding/iso8859_1.hpp
+include/boost/spirit/home/support/char_encoding/standard.hpp
+include/boost/spirit/home/support/char_encoding/standard_wide.hpp
+include/boost/spirit/home/support/char_set/basic_chset.hpp
+include/boost/spirit/home/support/char_set/range.hpp
+include/boost/spirit/home/support/char_set/range_functions.hpp
+include/boost/spirit/home/support/char_set/range_run.hpp
+include/boost/spirit/home/support/char_set/range_run_impl.hpp
+include/boost/spirit/home/support/common_terminals.hpp
+include/boost/spirit/home/support/container.hpp
+include/boost/spirit/home/support/context.hpp
+include/boost/spirit/home/support/detail/as_variant.hpp
+include/boost/spirit/home/support/detail/endian.hpp
+include/boost/spirit/home/support/detail/get_encoding.hpp
 include/boost/spirit/home/support/detail/hold_any.hpp
 include/boost/spirit/home/support/detail/integer/cover_operators.hpp
 include/boost/spirit/home/support/detail/integer/endian.hpp
@@ -5480,6 +5564,7 @@ include/boost/spirit/home/support/detail/lexer/file_input.hpp
 include/boost/spirit/home/support/detail/lexer/generate_cpp.hpp
 include/boost/spirit/home/support/detail/lexer/generator.hpp
 include/boost/spirit/home/support/detail/lexer/input.hpp
+include/boost/spirit/home/support/detail/lexer/internals.hpp
 include/boost/spirit/home/support/detail/lexer/parser/parser.hpp
 include/boost/spirit/home/support/detail/lexer/parser/tokeniser/num_token.hpp
 include/boost/spirit/home/support/detail/lexer/parser/tokeniser/re_tokeniser.hpp
@@ -5499,14 +5584,17 @@ include/boost/spirit/home/support/detail/lexer/serialise.hpp
 include/boost/spirit/home/support/detail/lexer/size_t.hpp
 include/boost/spirit/home/support/detail/lexer/state_machine.hpp
 include/boost/spirit/home/support/detail/lexer/string_token.hpp
+include/boost/spirit/home/support/detail/make_cons.hpp
+include/boost/spirit/home/support/detail/make_vector.hpp
 include/boost/spirit/home/support/detail/math/detail/fp_traits.hpp
 include/boost/spirit/home/support/detail/math/fpclassify.hpp
-include/boost/spirit/home/support/detail/math/nonfinite_num_facets.hpp
 include/boost/spirit/home/support/detail/math/signbit.hpp
-include/boost/spirit/home/support/detail/to_narrow.hpp
-include/boost/spirit/home/support/detail/values.hpp
+include/boost/spirit/home/support/detail/pow10.hpp
+include/boost/spirit/home/support/detail/scoped_enum_emulation.hpp
+include/boost/spirit/home/support/detail/sign.hpp
 include/boost/spirit/home/support/detail/what_function.hpp
-include/boost/spirit/home/support/iso8859_1.hpp
+include/boost/spirit/home/support/has_semantic_action.hpp
+include/boost/spirit/home/support/info.hpp
 include/boost/spirit/home/support/iterators/detail/buf_id_check_policy.hpp
 include/boost/spirit/home/support/iterators/detail/combine_policies.hpp
 include/boost/spirit/home/support/iterators/detail/first_owner_policy.hpp
@@ -5523,21 +5611,20 @@ include/boost/spirit/home/support/iterators/detail/split_std_deque_policy.hpp
 include/boost/spirit/home/support/iterators/look_ahead.hpp
 include/boost/spirit/home/support/iterators/multi_pass.hpp
 include/boost/spirit/home/support/iterators/multi_pass_fwd.hpp
-include/boost/spirit/home/support/meta_grammar.hpp
-include/boost/spirit/home/support/meta_grammar/basic_rules.hpp
-include/boost/spirit/home/support/meta_grammar/basic_transforms.hpp
-include/boost/spirit/home/support/meta_grammar/grammar.hpp
-include/boost/spirit/home/support/modifier.hpp
+include/boost/spirit/home/support/lazy.hpp
+include/boost/spirit/home/support/make_component.hpp
+include/boost/spirit/home/support/meta_compiler.hpp
+include/boost/spirit/home/support/modify.hpp
 include/boost/spirit/home/support/multi_pass.hpp
-include/boost/spirit/home/support/nonterminal/detail/expand_arg.hpp
-include/boost/spirit/home/support/nonterminal/detail/nonterminal_fcall.hpp
+include/boost/spirit/home/support/multi_pass_wrapper.hpp
+include/boost/spirit/home/support/nonterminal/expand_arg.hpp
+include/boost/spirit/home/support/nonterminal/extract_param.hpp
 include/boost/spirit/home/support/nonterminal/locals.hpp
-include/boost/spirit/home/support/nonterminal/nonterminal.hpp
-include/boost/spirit/home/support/placeholders.hpp
-include/boost/spirit/home/support/safe_bool.hpp
-include/boost/spirit/home/support/standard.hpp
-include/boost/spirit/home/support/standard_wide.hpp
+include/boost/spirit/home/support/sequence_base_id.hpp
+include/boost/spirit/home/support/string_traits.hpp
+include/boost/spirit/home/support/terminal.hpp
 include/boost/spirit/home/support/unused.hpp
+include/boost/spirit/home/support/utf8.hpp
 include/boost/spirit/include/classic.hpp
 include/boost/spirit/include/classic_actions.hpp
 include/boost/spirit/include/classic_actor.hpp
@@ -5666,28 +5753,61 @@ include/boost/spirit/include/classic_version.hpp
 include/boost/spirit/include/classic_while.hpp
 include/boost/spirit/include/karma.hpp
 include/boost/spirit/include/karma_action.hpp
+include/boost/spirit/include/karma_alternative.hpp
+include/boost/spirit/include/karma_and_predicate.hpp
+include/boost/spirit/include/karma_attr_cast.hpp
 include/boost/spirit/include/karma_auxiliary.hpp
 include/boost/spirit/include/karma_binary.hpp
+include/boost/spirit/include/karma_bool.hpp
+include/boost/spirit/include/karma_buffer.hpp
+include/boost/spirit/include/karma_center_alignment.hpp
 include/boost/spirit/include/karma_char.hpp
+include/boost/spirit/include/karma_char_.hpp
+include/boost/spirit/include/karma_char_class.hpp
 include/boost/spirit/include/karma_delimit.hpp
 include/boost/spirit/include/karma_directive.hpp
 include/boost/spirit/include/karma_domain.hpp
+include/boost/spirit/include/karma_eol.hpp
+include/boost/spirit/include/karma_eps.hpp
+include/boost/spirit/include/karma_format.hpp
+include/boost/spirit/include/karma_format_attr.hpp
 include/boost/spirit/include/karma_generate.hpp
-include/boost/spirit/include/karma_meta_grammar.hpp
+include/boost/spirit/include/karma_generate_attr.hpp
+include/boost/spirit/include/karma_grammar.hpp
+include/boost/spirit/include/karma_int.hpp
+include/boost/spirit/include/karma_kleene.hpp
+include/boost/spirit/include/karma_lazy.hpp
+include/boost/spirit/include/karma_left_alignment.hpp
+include/boost/spirit/include/karma_list.hpp
+include/boost/spirit/include/karma_maxwidth.hpp
 include/boost/spirit/include/karma_nonterminal.hpp
+include/boost/spirit/include/karma_not_predicate.hpp
 include/boost/spirit/include/karma_numeric.hpp
+include/boost/spirit/include/karma_omit.hpp
 include/boost/spirit/include/karma_operator.hpp
+include/boost/spirit/include/karma_optional.hpp
+include/boost/spirit/include/karma_plus.hpp
+include/boost/spirit/include/karma_real.hpp
+include/boost/spirit/include/karma_repeat.hpp
+include/boost/spirit/include/karma_right_alignment.hpp
+include/boost/spirit/include/karma_rule.hpp
+include/boost/spirit/include/karma_sequence.hpp
 include/boost/spirit/include/karma_stream.hpp
 include/boost/spirit/include/karma_string.hpp
+include/boost/spirit/include/karma_uint.hpp
+include/boost/spirit/include/karma_upper_lower_case.hpp
+include/boost/spirit/include/karma_verbatim.hpp
 include/boost/spirit/include/karma_what.hpp
 include/boost/spirit/include/lex.hpp
+include/boost/spirit/include/lex_char_token_def.hpp
 include/boost/spirit/include/lex_domain.hpp
+include/boost/spirit/include/lex_generate_static_lexertl.hpp
 include/boost/spirit/include/lex_lexer.hpp
-include/boost/spirit/include/lex_lexer_lexertl.hpp
-include/boost/spirit/include/lex_lexer_static_lexertl.hpp
-include/boost/spirit/include/lex_meta_grammar.hpp
-include/boost/spirit/include/lex_set_state.hpp
+include/boost/spirit/include/lex_lexertl.hpp
+include/boost/spirit/include/lex_primitives.hpp
+include/boost/spirit/include/lex_static_lexertl.hpp
 include/boost/spirit/include/lex_tokenize_and_parse.hpp
+include/boost/spirit/include/lex_tokenize_and_parse_attr.hpp
 include/boost/spirit/include/phoenix.hpp
 include/boost/spirit/include/phoenix1.hpp
 include/boost/spirit/include/phoenix1_actor.hpp
@@ -5717,50 +5837,76 @@ include/boost/spirit/include/phoenix_stl.hpp
 include/boost/spirit/include/phoenix_version.hpp
 include/boost/spirit/include/qi.hpp
 include/boost/spirit/include/qi_action.hpp
+include/boost/spirit/include/qi_alternative.hpp
+include/boost/spirit/include/qi_and_predicate.hpp
+include/boost/spirit/include/qi_attr.hpp
+include/boost/spirit/include/qi_attr_cast.hpp
 include/boost/spirit/include/qi_auxiliary.hpp
 include/boost/spirit/include/qi_binary.hpp
+include/boost/spirit/include/qi_bool.hpp
 include/boost/spirit/include/qi_char.hpp
-include/boost/spirit/include/qi_debug.hpp
+include/boost/spirit/include/qi_char_.hpp
+include/boost/spirit/include/qi_char_class.hpp
+include/boost/spirit/include/qi_core.hpp
+include/boost/spirit/include/qi_difference.hpp
 include/boost/spirit/include/qi_directive.hpp
 include/boost/spirit/include/qi_domain.hpp
-include/boost/spirit/include/qi_meta_grammar.hpp
+include/boost/spirit/include/qi_eoi.hpp
+include/boost/spirit/include/qi_eol.hpp
+include/boost/spirit/include/qi_eps.hpp
+include/boost/spirit/include/qi_expect.hpp
+include/boost/spirit/include/qi_grammar.hpp
+include/boost/spirit/include/qi_int.hpp
+include/boost/spirit/include/qi_kleene.hpp
+include/boost/spirit/include/qi_lazy.hpp
+include/boost/spirit/include/qi_lexeme.hpp
+include/boost/spirit/include/qi_list.hpp
+include/boost/spirit/include/qi_lit.hpp
+include/boost/spirit/include/qi_match.hpp
+include/boost/spirit/include/qi_match_attr.hpp
+include/boost/spirit/include/qi_no_case.hpp
 include/boost/spirit/include/qi_nonterminal.hpp
+include/boost/spirit/include/qi_not_predicate.hpp
 include/boost/spirit/include/qi_numeric.hpp
+include/boost/spirit/include/qi_omit.hpp
 include/boost/spirit/include/qi_operator.hpp
+include/boost/spirit/include/qi_optional.hpp
 include/boost/spirit/include/qi_parse.hpp
+include/boost/spirit/include/qi_parse_attr.hpp
+include/boost/spirit/include/qi_permutation.hpp
+include/boost/spirit/include/qi_plus.hpp
+include/boost/spirit/include/qi_raw.hpp
+include/boost/spirit/include/qi_real.hpp
+include/boost/spirit/include/qi_repeat.hpp
+include/boost/spirit/include/qi_rule.hpp
+include/boost/spirit/include/qi_sequence.hpp
+include/boost/spirit/include/qi_sequential_or.hpp
 include/boost/spirit/include/qi_skip.hpp
 include/boost/spirit/include/qi_stream.hpp
 include/boost/spirit/include/qi_string.hpp
+include/boost/spirit/include/qi_symbols.hpp
+include/boost/spirit/include/qi_uint.hpp
 include/boost/spirit/include/qi_what.hpp
 include/boost/spirit/include/support.hpp
 include/boost/spirit/include/support_any.hpp
 include/boost/spirit/include/support_any_if.hpp
+include/boost/spirit/include/support_any_if_ns.hpp
 include/boost/spirit/include/support_any_ns.hpp
 include/boost/spirit/include/support_argument.hpp
-include/boost/spirit/include/support_as_variant.hpp
 include/boost/spirit/include/support_ascii.hpp
-include/boost/spirit/include/support_attribute_of.hpp
-include/boost/spirit/include/support_attribute_transform.hpp
-include/boost/spirit/include/support_basic_rules.hpp
-include/boost/spirit/include/support_basic_transforms.hpp
+include/boost/spirit/include/support_attributes.hpp
 include/boost/spirit/include/support_char_class.hpp
-include/boost/spirit/include/support_component.hpp
-include/boost/spirit/include/support_functor_holder.hpp
-include/boost/spirit/include/support_grammar.hpp
 include/boost/spirit/include/support_iso8859_1.hpp
 include/boost/spirit/include/support_locals.hpp
 include/boost/spirit/include/support_look_ahead.hpp
-include/boost/spirit/include/support_meta_function_holder.hpp
-include/boost/spirit/include/support_meta_grammar.hpp
-include/boost/spirit/include/support_modifier.hpp
+include/boost/spirit/include/support_modify.hpp
 include/boost/spirit/include/support_multi_pass.hpp
 include/boost/spirit/include/support_multi_pass_fwd.hpp
-include/boost/spirit/include/support_nonterminal.hpp
-include/boost/spirit/include/support_placeholders.hpp
-include/boost/spirit/include/support_safe_bool.hpp
 include/boost/spirit/include/support_standard.hpp
 include/boost/spirit/include/support_standard_wide.hpp
+include/boost/spirit/include/support_string_traits.hpp
 include/boost/spirit/include/support_unused.hpp
+include/boost/spirit/include/version.hpp
 include/boost/spirit/iterator.hpp
 include/boost/spirit/iterator/file_iterator.hpp
 include/boost/spirit/iterator/file_iterator_fwd.hpp
@@ -5790,6 +5936,36 @@ include/boost/spirit/phoenix/special_ops.hpp
 include/boost/spirit/phoenix/statements.hpp
 include/boost/spirit/phoenix/tuple_helpers.hpp
 include/boost/spirit/phoenix/tuples.hpp
+include/boost/spirit/repository/home/karma.hpp
+include/boost/spirit/repository/home/karma/directive.hpp
+include/boost/spirit/repository/home/karma/directive/confix.hpp
+include/boost/spirit/repository/home/karma/nonterminal.hpp
+include/boost/spirit/repository/home/karma/nonterminal/subrule.hpp
+include/boost/spirit/repository/home/qi.hpp
+include/boost/spirit/repository/home/qi/directive.hpp
+include/boost/spirit/repository/home/qi/directive/confix.hpp
+include/boost/spirit/repository/home/qi/directive/distinct.hpp
+include/boost/spirit/repository/home/qi/nonterminal.hpp
+include/boost/spirit/repository/home/qi/nonterminal/subrule.hpp
+include/boost/spirit/repository/home/qi/primitive.hpp
+include/boost/spirit/repository/home/qi/primitive/flush_multi_pass.hpp
+include/boost/spirit/repository/home/support/confix.hpp
+include/boost/spirit/repository/home/support/distinct.hpp
+include/boost/spirit/repository/home/support/flush_multi_pass.hpp
+include/boost/spirit/repository/home/support/subrule_context.hpp
+include/boost/spirit/repository/include/karma.hpp
+include/boost/spirit/repository/include/karma_confix.hpp
+include/boost/spirit/repository/include/karma_directive.hpp
+include/boost/spirit/repository/include/karma_nonterminal.hpp
+include/boost/spirit/repository/include/karma_subrule.hpp
+include/boost/spirit/repository/include/qi.hpp
+include/boost/spirit/repository/include/qi_confix.hpp
+include/boost/spirit/repository/include/qi_directive.hpp
+include/boost/spirit/repository/include/qi_distinct.hpp
+include/boost/spirit/repository/include/qi_flush_multi_pass.hpp
+include/boost/spirit/repository/include/qi_nonterminal.hpp
+include/boost/spirit/repository/include/qi_primitive.hpp
+include/boost/spirit/repository/include/qi_subrule.hpp
 include/boost/spirit/symbols.hpp
 include/boost/spirit/symbols/symbols.hpp
 include/boost/spirit/symbols/symbols_fwd.hpp
@@ -6002,9 +6178,12 @@ include/boost/thread/detail/move.hpp
 include/boost/thread/detail/platform.hpp
 include/boost/thread/detail/singleton.hpp
 include/boost/thread/detail/thread.hpp
+include/boost/thread/detail/thread_group.hpp
 include/boost/thread/detail/thread_heap_alloc.hpp
+include/boost/thread/detail/thread_interruption.hpp
 include/boost/thread/detail/tss_hooks.hpp
 include/boost/thread/exceptions.hpp
+include/boost/thread/future.hpp
 include/boost/thread/locks.hpp
 include/boost/thread/mutex.hpp
 include/boost/thread/once.hpp
@@ -6208,6 +6387,7 @@ include/boost/type_traits/is_arithmetic.hpp
 include/boost/type_traits/is_array.hpp
 include/boost/type_traits/is_base_and_derived.hpp
 include/boost/type_traits/is_base_of.hpp
+include/boost/type_traits/is_base_of_tr1.hpp
 include/boost/type_traits/is_class.hpp
 include/boost/type_traits/is_complex.hpp
 include/boost/type_traits/is_compound.hpp
@@ -6397,6 +6577,7 @@ include/boost/units/base_units/us/minim.hpp
 include/boost/units/base_units/us/ounce.hpp
 include/boost/units/base_units/us/pint.hpp
 include/boost/units/base_units/us/pound.hpp
+include/boost/units/base_units/us/pound_force.hpp
 include/boost/units/base_units/us/quart.hpp
 include/boost/units/base_units/us/tablespoon.hpp
 include/boost/units/base_units/us/teaspoon.hpp
@@ -6623,10 +6804,15 @@ include/boost/units/systems/temperature/fahrenheit.hpp
 include/boost/units/unit.hpp
 include/boost/units/units_fwd.hpp
 include/boost/unordered/detail/allocator_helpers.hpp
-include/boost/unordered/detail/config.hpp
-include/boost/unordered/detail/hash_table.hpp
-include/boost/unordered/detail/hash_table_impl.hpp
+include/boost/unordered/detail/buckets.hpp
+include/boost/unordered/detail/equivalent.hpp
+include/boost/unordered/detail/extract_key.hpp
+include/boost/unordered/detail/fwd.hpp
 include/boost/unordered/detail/move.hpp
+include/boost/unordered/detail/node.hpp
+include/boost/unordered/detail/table.hpp
+include/boost/unordered/detail/unique.hpp
+include/boost/unordered/detail/util.hpp
 include/boost/unordered/unordered_map.hpp
 include/boost/unordered/unordered_map_fwd.hpp
 include/boost/unordered/unordered_set.hpp
diff --git a/devel/boost-headers/buildlink3.mk b/devel/boost-headers/buildlink3.mk
index 04b0de8c1d4..0639a800abe 100644
--- a/devel/boost-headers/buildlink3.mk
+++ b/devel/boost-headers/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2009/10/14 06:40:07 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/11/24 09:51:20 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.40.*
+BUILDLINK_API_DEPENDS.boost-headers+=	boost-headers-1.41.*
 BUILDLINK_DEPMETHOD.boost-headers?=	build
 BUILDLINK_PKGSRCDIR.boost-headers?=	../../devel/boost-headers