Merge ^/head r358400 through r358465.

6 files changed, 3 insertions, 650 deletions

diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index e398f829146d..cc445b0befda 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1781,585 +1781,6 @@ OLD_FILES+=usr/share/man/man5/ftpchroot.5.gz
 OLD_FILES+=usr/share/man/man8/ftpd.8.gz
 .endif
 
-.if ${MK_GNUCXX} == no
-.if !defined(WITH_PORT_BASE_GCC)
-OLD_FILES+=usr/bin/g++
-.endif
-OLD_FILES+=usr/include/c++/4.2/algorithm
-OLD_FILES+=usr/include/c++/4.2/backward/algo.h
-OLD_FILES+=usr/include/c++/4.2/backward/algobase.h
-OLD_FILES+=usr/include/c++/4.2/backward/alloc.h
-OLD_FILES+=usr/include/c++/4.2/backward/backward_warning.h
-OLD_FILES+=usr/include/c++/4.2/backward/bvector.h
-OLD_FILES+=usr/include/c++/4.2/backward/complex.h
-OLD_FILES+=usr/include/c++/4.2/backward/defalloc.h
-OLD_FILES+=usr/include/c++/4.2/backward/deque.h
-OLD_FILES+=usr/include/c++/4.2/backward/fstream.h
-OLD_FILES+=usr/include/c++/4.2/backward/function.h
-OLD_FILES+=usr/include/c++/4.2/backward/hash_map.h
-OLD_FILES+=usr/include/c++/4.2/backward/hash_set.h
-OLD_FILES+=usr/include/c++/4.2/backward/hashtable.h
-OLD_FILES+=usr/include/c++/4.2/backward/heap.h
-OLD_FILES+=usr/include/c++/4.2/backward/iomanip.h
-OLD_FILES+=usr/include/c++/4.2/backward/iostream.h
-OLD_FILES+=usr/include/c++/4.2/backward/istream.h
-OLD_FILES+=usr/include/c++/4.2/backward/iterator.h
-OLD_FILES+=usr/include/c++/4.2/backward/list.h
-OLD_FILES+=usr/include/c++/4.2/backward/map.h
-OLD_FILES+=usr/include/c++/4.2/backward/multimap.h
-OLD_FILES+=usr/include/c++/4.2/backward/multiset.h
-OLD_FILES+=usr/include/c++/4.2/backward/new.h
-OLD_FILES+=usr/include/c++/4.2/backward/ostream.h
-OLD_FILES+=usr/include/c++/4.2/backward/pair.h
-OLD_FILES+=usr/include/c++/4.2/backward/queue.h
-OLD_FILES+=usr/include/c++/4.2/backward/rope.h
-OLD_FILES+=usr/include/c++/4.2/backward/set.h
-OLD_FILES+=usr/include/c++/4.2/backward/slist.h
-OLD_FILES+=usr/include/c++/4.2/backward/stack.h
-OLD_FILES+=usr/include/c++/4.2/backward/stream.h
-OLD_FILES+=usr/include/c++/4.2/backward/streambuf.h
-OLD_FILES+=usr/include/c++/4.2/backward/strstream
-OLD_FILES+=usr/include/c++/4.2/backward/tempbuf.h
-OLD_FILES+=usr/include/c++/4.2/backward/tree.h
-OLD_FILES+=usr/include/c++/4.2/backward/vector.h
-OLD_FILES+=usr/include/c++/4.2/bits/allocator.h
-OLD_FILES+=usr/include/c++/4.2/bits/atomic_word.h
-OLD_FILES+=usr/include/c++/4.2/bits/basic_file.h
-OLD_FILES+=usr/include/c++/4.2/bits/basic_ios.h
-OLD_FILES+=usr/include/c++/4.2/bits/basic_ios.tcc
-OLD_FILES+=usr/include/c++/4.2/bits/basic_string.h
-OLD_FILES+=usr/include/c++/4.2/bits/basic_string.tcc
-OLD_FILES+=usr/include/c++/4.2/bits/boost_concept_check.h
-OLD_FILES+=usr/include/c++/4.2/bits/c++allocator.h
-OLD_FILES+=usr/include/c++/4.2/bits/c++config.h
-OLD_FILES+=usr/include/c++/4.2/bits/c++io.h
-OLD_FILES+=usr/include/c++/4.2/bits/c++locale.h
-OLD_FILES+=usr/include/c++/4.2/bits/c++locale_internal.h
-OLD_FILES+=usr/include/c++/4.2/bits/char_traits.h
-OLD_FILES+=usr/include/c++/4.2/bits/cmath.tcc
-OLD_FILES+=usr/include/c++/4.2/bits/codecvt.h
-OLD_FILES+=usr/include/c++/4.2/bits/compatibility.h
-OLD_FILES+=usr/include/c++/4.2/bits/concept_check.h
-OLD_FILES+=usr/include/c++/4.2/bits/cpp_type_traits.h
-OLD_FILES+=usr/include/c++/4.2/bits/cpu_defines.h
-OLD_FILES+=usr/include/c++/4.2/bits/ctype_base.h
-OLD_FILES+=usr/include/c++/4.2/bits/ctype_inline.h
-OLD_FILES+=usr/include/c++/4.2/bits/ctype_noninline.h
-OLD_FILES+=usr/include/c++/4.2/bits/cxxabi_tweaks.h
-OLD_FILES+=usr/include/c++/4.2/bits/deque.tcc
-OLD_FILES+=usr/include/c++/4.2/bits/fstream.tcc
-OLD_FILES+=usr/include/c++/4.2/bits/functexcept.h
-OLD_FILES+=usr/include/c++/4.2/bits/gslice.h
-OLD_FILES+=usr/include/c++/4.2/bits/gslice_array.h
-OLD_FILES+=usr/include/c++/4.2/bits/gthr-default.h
-OLD_FILES+=usr/include/c++/4.2/bits/gthr-posix.h
-OLD_FILES+=usr/include/c++/4.2/bits/gthr-single.h
-OLD_FILES+=usr/include/c++/4.2/bits/gthr-tpf.h
-OLD_FILES+=usr/include/c++/4.2/bits/gthr.h
-OLD_FILES+=usr/include/c++/4.2/bits/indirect_array.h
-OLD_FILES+=usr/include/c++/4.2/bits/ios_base.h
-OLD_FILES+=usr/include/c++/4.2/bits/istream.tcc
-OLD_FILES+=usr/include/c++/4.2/bits/list.tcc
-OLD_FILES+=usr/include/c++/4.2/bits/locale_classes.h
-OLD_FILES+=usr/include/c++/4.2/bits/locale_facets.h
-OLD_FILES+=usr/include/c++/4.2/bits/locale_facets.tcc
-OLD_FILES+=usr/include/c++/4.2/bits/localefwd.h
-OLD_FILES+=usr/include/c++/4.2/bits/mask_array.h
-OLD_FILES+=usr/include/c++/4.2/bits/messages_members.h
-OLD_FILES+=usr/include/c++/4.2/bits/os_defines.h
-OLD_FILES+=usr/include/c++/4.2/bits/ostream.tcc
-OLD_FILES+=usr/include/c++/4.2/bits/ostream_insert.h
-OLD_FILES+=usr/include/c++/4.2/bits/postypes.h
-OLD_FILES+=usr/include/c++/4.2/bits/slice_array.h
-OLD_FILES+=usr/include/c++/4.2/bits/sstream.tcc
-OLD_FILES+=usr/include/c++/4.2/bits/stl_algo.h
-OLD_FILES+=usr/include/c++/4.2/bits/stl_algobase.h
-OLD_FILES+=usr/include/c++/4.2/bits/stl_bvector.h
-OLD_FILES+=usr/include/c++/4.2/bits/stl_construct.h
-OLD_FILES+=usr/include/c++/4.2/bits/stl_deque.h
-OLD_FILES+=usr/include/c++/4.2/bits/stl_function.h
-OLD_FILES+=usr/include/c++/4.2/bits/stl_heap.h
-OLD_FILES+=usr/include/c++/4.2/bits/stl_iterator.h
-OLD_FILES+=usr/include/c++/4.2/bits/stl_iterator_base_funcs.h
-OLD_FILES+=usr/include/c++/4.2/bits/stl_iterator_base_types.h
-OLD_FILES+=usr/include/c++/4.2/bits/stl_list.h
-OLD_FILES+=usr/include/c++/4.2/bits/stl_map.h
-OLD_FILES+=usr/include/c++/4.2/bits/stl_multimap.h
-OLD_FILES+=usr/include/c++/4.2/bits/stl_multiset.h
-OLD_FILES+=usr/include/c++/4.2/bits/stl_numeric.h
-OLD_FILES+=usr/include/c++/4.2/bits/stl_pair.h
-OLD_FILES+=usr/include/c++/4.2/bits/stl_queue.h
-OLD_FILES+=usr/include/c++/4.2/bits/stl_raw_storage_iter.h
-OLD_FILES+=usr/include/c++/4.2/bits/stl_relops.h
-OLD_FILES+=usr/include/c++/4.2/bits/stl_set.h
-OLD_FILES+=usr/include/c++/4.2/bits/stl_stack.h
-OLD_FILES+=usr/include/c++/4.2/bits/stl_tempbuf.h
-OLD_FILES+=usr/include/c++/4.2/bits/stl_tree.h
-OLD_FILES+=usr/include/c++/4.2/bits/stl_uninitialized.h
-OLD_FILES+=usr/include/c++/4.2/bits/stl_vector.h
-OLD_FILES+=usr/include/c++/4.2/bits/stream_iterator.h
-OLD_FILES+=usr/include/c++/4.2/bits/streambuf.tcc
-OLD_FILES+=usr/include/c++/4.2/bits/streambuf_iterator.h
-OLD_FILES+=usr/include/c++/4.2/bits/stringfwd.h
-OLD_FILES+=usr/include/c++/4.2/bits/time_members.h
-OLD_FILES+=usr/include/c++/4.2/bits/valarray_after.h
-OLD_FILES+=usr/include/c++/4.2/bits/valarray_array.h
-OLD_FILES+=usr/include/c++/4.2/bits/valarray_array.tcc
-OLD_FILES+=usr/include/c++/4.2/bits/valarray_before.h
-OLD_FILES+=usr/include/c++/4.2/bits/vector.tcc
-OLD_FILES+=usr/include/c++/4.2/bitset
-OLD_FILES+=usr/include/c++/4.2/cassert
-OLD_FILES+=usr/include/c++/4.2/cctype
-OLD_FILES+=usr/include/c++/4.2/cerrno
-OLD_FILES+=usr/include/c++/4.2/cfloat
-OLD_FILES+=usr/include/c++/4.2/ciso646
-OLD_FILES+=usr/include/c++/4.2/climits
-OLD_FILES+=usr/include/c++/4.2/clocale
-OLD_FILES+=usr/include/c++/4.2/cmath
-OLD_FILES+=usr/include/c++/4.2/complex
-OLD_FILES+=usr/include/c++/4.2/csetjmp
-OLD_FILES+=usr/include/c++/4.2/csignal
-OLD_FILES+=usr/include/c++/4.2/cstdarg
-OLD_FILES+=usr/include/c++/4.2/cstddef
-OLD_FILES+=usr/include/c++/4.2/cstdio
-OLD_FILES+=usr/include/c++/4.2/cstdlib
-OLD_FILES+=usr/include/c++/4.2/cstring
-OLD_FILES+=usr/include/c++/4.2/ctime
-OLD_FILES+=usr/include/c++/4.2/cwchar
-OLD_FILES+=usr/include/c++/4.2/cwctype
-OLD_FILES+=usr/include/c++/4.2/cxxabi.h
-OLD_FILES+=usr/include/c++/4.2/debug/bitset
-OLD_FILES+=usr/include/c++/4.2/debug/debug.h
-OLD_FILES+=usr/include/c++/4.2/debug/deque
-OLD_FILES+=usr/include/c++/4.2/debug/formatter.h
-OLD_FILES+=usr/include/c++/4.2/debug/functions.h
-OLD_FILES+=usr/include/c++/4.2/debug/hash_map
-OLD_FILES+=usr/include/c++/4.2/debug/hash_map.h
-OLD_FILES+=usr/include/c++/4.2/debug/hash_multimap.h
-OLD_FILES+=usr/include/c++/4.2/debug/hash_multiset.h
-OLD_FILES+=usr/include/c++/4.2/debug/hash_set
-OLD_FILES+=usr/include/c++/4.2/debug/hash_set.h
-OLD_FILES+=usr/include/c++/4.2/debug/list
-OLD_FILES+=usr/include/c++/4.2/debug/macros.h
-OLD_FILES+=usr/include/c++/4.2/debug/map
-OLD_FILES+=usr/include/c++/4.2/debug/map.h
-OLD_FILES+=usr/include/c++/4.2/debug/multimap.h
-OLD_FILES+=usr/include/c++/4.2/debug/multiset.h
-OLD_FILES+=usr/include/c++/4.2/debug/safe_base.h
-OLD_FILES+=usr/include/c++/4.2/debug/safe_iterator.h
-OLD_FILES+=usr/include/c++/4.2/debug/safe_iterator.tcc
-OLD_FILES+=usr/include/c++/4.2/debug/safe_sequence.h
-OLD_FILES+=usr/include/c++/4.2/debug/set
-OLD_FILES+=usr/include/c++/4.2/debug/set.h
-OLD_FILES+=usr/include/c++/4.2/debug/string
-OLD_FILES+=usr/include/c++/4.2/debug/vector
-OLD_FILES+=usr/include/c++/4.2/deque
-OLD_FILES+=usr/include/c++/4.2/exception
-OLD_FILES+=usr/include/c++/4.2/exception_defines.h
-OLD_FILES+=usr/include/c++/4.2/ext/algorithm
-OLD_FILES+=usr/include/c++/4.2/ext/array_allocator.h
-OLD_FILES+=usr/include/c++/4.2/ext/atomicity.h
-OLD_FILES+=usr/include/c++/4.2/ext/bitmap_allocator.h
-OLD_FILES+=usr/include/c++/4.2/ext/codecvt_specializations.h
-OLD_FILES+=usr/include/c++/4.2/ext/concurrence.h
-OLD_FILES+=usr/include/c++/4.2/ext/debug_allocator.h
-OLD_FILES+=usr/include/c++/4.2/ext/functional
-OLD_FILES+=usr/include/c++/4.2/ext/hash_fun.h
-OLD_FILES+=usr/include/c++/4.2/ext/hash_map
-OLD_FILES+=usr/include/c++/4.2/ext/hash_set
-OLD_FILES+=usr/include/c++/4.2/ext/hashtable.h
-OLD_FILES+=usr/include/c++/4.2/ext/iterator
-OLD_FILES+=usr/include/c++/4.2/ext/malloc_allocator.h
-OLD_FILES+=usr/include/c++/4.2/ext/memory
-OLD_FILES+=usr/include/c++/4.2/ext/mt_allocator.h
-OLD_FILES+=usr/include/c++/4.2/ext/new_allocator.h
-OLD_FILES+=usr/include/c++/4.2/ext/numeric
-OLD_FILES+=usr/include/c++/4.2/ext/numeric_traits.h
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/assoc_container.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/basic_tree_policy/basic_tree_policy_base.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/basic_tree_policy/null_node_metadata.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/basic_tree_policy/traits.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/basic_types.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/cond_dtor_entry_dealtor.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/cond_key_dtor_entry_dealtor.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/debug_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/erase_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/find_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/info_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/insert_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/iterators_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/policy_access_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/r_erase_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/rotate_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/traits.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/binary_heap_.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/const_iterator.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/const_point_iterator.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/constructors_destructor_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/debug_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/entry_cmp.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/entry_pred.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/erase_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/find_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/info_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/insert_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/iterators_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/policy_access_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/resize_policy.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/trace_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_/binomial_heap_.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_/constructors_destructor_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_/debug_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/binomial_heap_base_.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/constructors_destructor_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/debug_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/erase_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/find_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/insert_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/split_join_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/cmp_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/cond_key_dtor_entry_dealtor.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/debug_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/debug_no_store_hash_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/debug_store_hash_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/entry_list_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/erase_store_hash_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/find_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/find_store_hash_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/info_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/insert_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/insert_no_store_hash_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/insert_store_hash_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/iterators_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/policy_access_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/resize_no_store_hash_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/resize_store_hash_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/size_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/standard_policies.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/trace_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cond_dealtor.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/constructors_destructor_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/container_base_dispatch.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/eq_fn/eq_by_less.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/debug_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/debug_no_store_hash_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/debug_store_hash_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/erase_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/erase_no_store_hash_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/erase_store_hash_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/find_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/find_no_store_hash_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/find_store_hash_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/info_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/insert_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/insert_no_store_hash_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/insert_store_hash_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/iterator_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/policy_access_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/resize_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/resize_no_store_hash_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/resize_store_hash_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/standard_policies.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/trace_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/direct_mask_range_hashing_imp.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/direct_mod_range_hashing_imp.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/linear_probe_fn_imp.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/mask_based_range_hashing.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/mod_based_range_hashing.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/probe_fn_base.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/quadratic_probe_fn_imp.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/ranged_hash_fn.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/ranged_probe_fn.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/sample_ranged_hash_fn.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/sample_ranged_probe_fn.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/const_point_iterator.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/debug_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/erase_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/info_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/insert_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/iterators_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/node.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/null_metadata.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/policy_access_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/trace_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/constructor_destructor_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/debug_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/entry_metadata_base.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/erase_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/find_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/info_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/insert_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/iterators_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/lu_map_.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/trace_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy/counter_lu_metadata.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy/counter_lu_policy_imp.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy/mtf_lu_policy_imp.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy/sample_update_policy.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/map_debug_base.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/cond_dtor.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/info_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/iterators_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/ov_tree_map_.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/policy_access_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/split_join_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/traits.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/constructors_destructor_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/find_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/pairing_heap_.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/child_iterator.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/cond_dtor_entry_dealtor.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/const_child_iterator.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/constructors_destructor_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/head.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/info_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/insert_join_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/internal_node.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/leaf.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/node_base.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/node_iterators.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/node_metadata_base.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/pat_trie_.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/point_iterators.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/policy_access_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/split_join_branch_bag.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/synth_e_access_traits.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/traits.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/priority_queue_base_dispatch.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/constructors_destructor_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/find_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/node.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/traits.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/constructors_destructor_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/debug_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/rc.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/rc_binomial_heap_.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/split_join_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/trace_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/cc_hash_max_collision_check_resize_trigger_imp.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_exponential_size_policy_imp.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_prime_size_policy_imp.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_standard_resize_policy_imp.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/sample_resize_policy.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/sample_resize_trigger.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/constructors_destructor_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/info_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/node.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/splay_tree_.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/split_join_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/traits.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/standard_policies.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/constructors_destructor_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/split_join_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/thin_heap_.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/trace_fn_imps.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy/node_metadata_selector.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy/null_node_update_imp.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy/order_statistics_imp.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy/sample_tree_node_update.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_trace_base.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/node_metadata_selector.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/null_node_update_imp.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/order_statistics_imp.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/prefix_search_node_update_imp.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/sample_trie_e_access_traits.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/sample_trie_node_update.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/string_trie_e_access_traits_imp.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/trie_policy_base.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/type_utils.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/types_traits.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator/const_iterator.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator/const_point_iterator.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator/iterator.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator/point_iterator.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/exception.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/hash_policy.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/list_update_policy.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/priority_queue.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/tag_and_trait.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/tree_policy.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/trie_policy.hpp
-OLD_FILES+=usr/include/c++/4.2/ext/pod_char_traits.h
-OLD_FILES+=usr/include/c++/4.2/ext/pool_allocator.h
-OLD_FILES+=usr/include/c++/4.2/ext/rb_tree
-OLD_FILES+=usr/include/c++/4.2/ext/rc_string_base.h
-OLD_FILES+=usr/include/c++/4.2/ext/rope
-OLD_FILES+=usr/include/c++/4.2/ext/ropeimpl.h
-OLD_FILES+=usr/include/c++/4.2/ext/slist
-OLD_FILES+=usr/include/c++/4.2/ext/sso_string_base.h
-OLD_FILES+=usr/include/c++/4.2/ext/stdio_filebuf.h
-OLD_FILES+=usr/include/c++/4.2/ext/stdio_sync_filebuf.h
-OLD_FILES+=usr/include/c++/4.2/ext/throw_allocator.h
-OLD_FILES+=usr/include/c++/4.2/ext/type_traits.h
-OLD_FILES+=usr/include/c++/4.2/ext/typelist.h
-OLD_FILES+=usr/include/c++/4.2/ext/vstring.h
-OLD_FILES+=usr/include/c++/4.2/ext/vstring.tcc
-OLD_FILES+=usr/include/c++/4.2/ext/vstring_fwd.h
-OLD_FILES+=usr/include/c++/4.2/ext/vstring_util.h
-OLD_FILES+=usr/include/c++/4.2/fstream
-OLD_FILES+=usr/include/c++/4.2/functional
-OLD_FILES+=usr/include/c++/4.2/iomanip
-OLD_FILES+=usr/include/c++/4.2/ios
-OLD_FILES+=usr/include/c++/4.2/iosfwd
-OLD_FILES+=usr/include/c++/4.2/iostream
-OLD_FILES+=usr/include/c++/4.2/istream
-OLD_FILES+=usr/include/c++/4.2/iterator
-OLD_FILES+=usr/include/c++/4.2/limits
-OLD_FILES+=usr/include/c++/4.2/list
-OLD_FILES+=usr/include/c++/4.2/locale
-OLD_FILES+=usr/include/c++/4.2/map
-OLD_FILES+=usr/include/c++/4.2/memory
-OLD_FILES+=usr/include/c++/4.2/new
-OLD_FILES+=usr/include/c++/4.2/numeric
-OLD_FILES+=usr/include/c++/4.2/ostream
-OLD_FILES+=usr/include/c++/4.2/queue
-OLD_FILES+=usr/include/c++/4.2/set
-OLD_FILES+=usr/include/c++/4.2/sstream
-OLD_FILES+=usr/include/c++/4.2/stack
-OLD_FILES+=usr/include/c++/4.2/stdexcept
-OLD_FILES+=usr/include/c++/4.2/streambuf
-OLD_FILES+=usr/include/c++/4.2/string
-OLD_FILES+=usr/include/c++/4.2/tr1/array
-OLD_FILES+=usr/include/c++/4.2/tr1/bind_iterate.h
-OLD_FILES+=usr/include/c++/4.2/tr1/bind_repeat.h
-OLD_FILES+=usr/include/c++/4.2/tr1/boost_shared_ptr.h
-OLD_FILES+=usr/include/c++/4.2/tr1/cctype
-OLD_FILES+=usr/include/c++/4.2/tr1/cfenv
-OLD_FILES+=usr/include/c++/4.2/tr1/cfloat
-OLD_FILES+=usr/include/c++/4.2/tr1/cinttypes
-OLD_FILES+=usr/include/c++/4.2/tr1/climits
-OLD_FILES+=usr/include/c++/4.2/tr1/cmath
-OLD_FILES+=usr/include/c++/4.2/tr1/common.h
-OLD_FILES+=usr/include/c++/4.2/tr1/complex
-OLD_FILES+=usr/include/c++/4.2/tr1/cstdarg
-OLD_FILES+=usr/include/c++/4.2/tr1/cstdbool
-OLD_FILES+=usr/include/c++/4.2/tr1/cstdint
-OLD_FILES+=usr/include/c++/4.2/tr1/cstdio
-OLD_FILES+=usr/include/c++/4.2/tr1/cstdlib
-OLD_FILES+=usr/include/c++/4.2/tr1/ctgmath
-OLD_FILES+=usr/include/c++/4.2/tr1/ctime
-OLD_FILES+=usr/include/c++/4.2/tr1/ctype.h
-OLD_FILES+=usr/include/c++/4.2/tr1/cwchar
-OLD_FILES+=usr/include/c++/4.2/tr1/cwctype
-OLD_FILES+=usr/include/c++/4.2/tr1/fenv.h
-OLD_FILES+=usr/include/c++/4.2/tr1/float.h
-OLD_FILES+=usr/include/c++/4.2/tr1/functional
-OLD_FILES+=usr/include/c++/4.2/tr1/functional_hash.h
-OLD_FILES+=usr/include/c++/4.2/tr1/functional_iterate.h
-OLD_FILES+=usr/include/c++/4.2/tr1/hashtable
-OLD_FILES+=usr/include/c++/4.2/tr1/hashtable_policy.h
-OLD_FILES+=usr/include/c++/4.2/tr1/inttypes.h
-OLD_FILES+=usr/include/c++/4.2/tr1/limits.h
-OLD_FILES+=usr/include/c++/4.2/tr1/math.h
-OLD_FILES+=usr/include/c++/4.2/tr1/memory
-OLD_FILES+=usr/include/c++/4.2/tr1/mu_iterate.h
-OLD_FILES+=usr/include/c++/4.2/tr1/random
-OLD_FILES+=usr/include/c++/4.2/tr1/random.tcc
-OLD_FILES+=usr/include/c++/4.2/tr1/ref_fwd.h
-OLD_FILES+=usr/include/c++/4.2/tr1/ref_wrap_iterate.h
-OLD_FILES+=usr/include/c++/4.2/tr1/repeat.h
-OLD_FILES+=usr/include/c++/4.2/tr1/stdarg.h
-OLD_FILES+=usr/include/c++/4.2/tr1/stdbool.h
-OLD_FILES+=usr/include/c++/4.2/tr1/stdint.h
-OLD_FILES+=usr/include/c++/4.2/tr1/stdio.h
-OLD_FILES+=usr/include/c++/4.2/tr1/stdlib.h
-OLD_FILES+=usr/include/c++/4.2/tr1/tgmath.h
-OLD_FILES+=usr/include/c++/4.2/tr1/tuple
-OLD_FILES+=usr/include/c++/4.2/tr1/tuple_defs.h
-OLD_FILES+=usr/include/c++/4.2/tr1/tuple_iterate.h
-OLD_FILES+=usr/include/c++/4.2/tr1/type_traits
-OLD_FILES+=usr/include/c++/4.2/tr1/type_traits_fwd.h
-OLD_FILES+=usr/include/c++/4.2/tr1/unordered_map
-OLD_FILES+=usr/include/c++/4.2/tr1/unordered_set
-OLD_FILES+=usr/include/c++/4.2/tr1/utility
-OLD_FILES+=usr/include/c++/4.2/tr1/wchar.h
-OLD_FILES+=usr/include/c++/4.2/tr1/wctype.h
-OLD_FILES+=usr/include/c++/4.2/typeinfo
-OLD_FILES+=usr/include/c++/4.2/utility
-OLD_FILES+=usr/include/c++/4.2/valarray
-OLD_FILES+=usr/include/c++/4.2/vector
-OLD_FILES+=usr/lib/libstdc++.a
-OLD_FILES+=usr/lib/libstdc++.so
-OLD_LIBS+=usr/lib/libstdc++.so.6
-OLD_FILES+=usr/lib/libstdc++_p.a
-OLD_FILES+=usr/lib/libsupc++.a
-OLD_FILES+=usr/lib/libsupc++.so
-OLD_LIBS+=usr/lib/libsupc++.so.1
-OLD_FILES+=usr/lib/libsupc++_p.a
-.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
-OLD_FILES+=usr/lib32/libstdc++.a
-OLD_FILES+=usr/lib32/libstdc++.so
-OLD_LIBS+=usr/lib32/libstdc++.so.6
-OLD_FILES+=usr/lib32/libstdc++_p.a
-OLD_FILES+=usr/lib32/libsupc++.a
-OLD_FILES+=usr/lib32/libsupc++.so
-OLD_LIBS+=usr/lib32/libsupc++.so.1
-OLD_FILES+=usr/lib32/libsupc++_p.a
-.endif
-OLD_FILES+=usr/libexec/cc1plus
-.endif
-
 .if ${MK_DICT} == no
 OLD_FILES+=usr/share/dict/README
 OLD_FILES+=usr/share/dict/freebsd
@@ -2780,62 +2201,7 @@ OLD_FILES+=usr/share/man/man8/strfile.8.gz
 OLD_FILES+=usr/share/man/man8/unstr.8.gz
 .endif
 
-.if ${MK_GCC} == no
-.if !defined(WITH_PORT_BASE_GCC)
-OLD_FILES+=usr/bin/g++
-OLD_FILES+=usr/bin/gcc
-.endif
-OLD_FILES+=usr/bin/gcpp
-OLD_FILES+=usr/bin/gperf
-.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
-OLD_FILES+=usr/include/gcc/4.2/__wmmintrin_aes.h
-OLD_FILES+=usr/include/gcc/4.2/__wmmintrin_pclmul.h
-OLD_FILES+=usr/include/gcc/4.2/ammintrin.h
-OLD_FILES+=usr/include/gcc/4.2/emmintrin.h
-OLD_FILES+=usr/include/gcc/4.2/mm3dnow.h
-OLD_FILES+=usr/include/gcc/4.2/mm_malloc.h
-OLD_FILES+=usr/include/gcc/4.2/mmintrin.h
-OLD_FILES+=usr/include/gcc/4.2/pmmintrin.h
-OLD_FILES+=usr/include/gcc/4.2/tmmintrin.h
-OLD_FILES+=usr/include/gcc/4.2/wmmintrin.h
-OLD_FILES+=usr/include/gcc/4.2/xmmintrin.h
-.elif ${TARGET_ARCH} == "arm"
-OLD_FILES+=usr/include/gcc/4.2/mmintrin.h
-.elif ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "powerpc64"
-OLD_FILES+=usr/include/gcc/4.2/altivec.h
-OLD_FILES+=usr/include/gcc/4.2/ppc-asm.h
-OLD_FILES+=usr/include/gcc/4.2/spe.h
-.endif
-.if ${MK_OPENMP} == no
-OLD_FILES+=usr/include/omp.h
-.endif
-OLD_FILES+=usr/lib/libgcov.a
-OLD_FILES+=usr/lib/libgomp.a
-.if ${MK_OPENMP} == no
-OLD_FILES+=usr/lib/libgomp.so
-.endif
-OLD_LIBS+=usr/lib/libgomp.so.1
-OLD_FILES+=usr/lib/libgomp_p.a
-OLD_FILES+=usr/lib32/libgcov.a
-OLD_FILES+=usr/lib32/libgomp.a
-.if ${MK_OPENMP} == no
-OLD_FILES+=usr/lib32/libgomp.so
-.endif
-OLD_LIBS+=usr/lib32/libgomp.so.1
-OLD_FILES+=usr/lib32/libgomp_p.a
-OLD_FILES+=usr/libexec/cc1
-OLD_FILES+=usr/libexec/cc1plus
-.if !defined(WITH_PORT_BASE_GCC)
-OLD_FILES+=usr/share/man/man1/g++.1.gz
-OLD_FILES+=usr/share/man/man1/gcc.1.gz
-.endif
-OLD_FILES+=usr/share/man/man1/gcpp.1.gz
-OLD_FILES+=usr/share/man/man1/gperf.1.gz
-OLD_FILES+=usr/share/man/man1/gperf.7.gz
-.endif
-
-.if (${MK_GCOV} == no || ${MK_GCC} == no) && ${MK_LLVM_COV} == no && \
-    !defined(WITH_PORT_BASE_GCC)
+.if ${MK_LLVM_COV} == no && !defined(WITH_PORT_BASE_GCC)
 OLD_FILES+=usr/bin/gcov
 OLD_FILES+=usr/share/man/man1/gcov.1.gz
 .endif
@@ -7820,11 +7186,9 @@ OLD_FILES+=usr/share/man/man8/vendstat.8.gz
 .endif
 
 .if ${MK_OPENMP} == no
-.if ${MK_GCC} == no
 OLD_FILES+=usr/include/omp.h
 OLD_LIBS+=usr/lib/libgomp.so
 OLD_LIBS+=usr/lib32/libgomp.so
-.endif
 OLD_LIBS+=usr/lib/libomp.so
 OLD_LIBS+=usr/lib32/libomp.so
 .endif
diff --git a/tools/build/options/WITHOUT_CLANG_IS_CC b/tools/build/options/WITHOUT_CLANG_IS_CC
index 4a9d13b410ee..85d80ad476a5 100644
--- a/tools/build/options/WITHOUT_CLANG_IS_CC
+++ b/tools/build/options/WITHOUT_CLANG_IS_CC
@@ -4,6 +4,3 @@ Do not install links to the Clang C/C++ compiler as
 .Pa /usr/bin/c++
 and
 .Pa /usr/bin/cpp .
-If
-.Va WITH_GCC
-is set then links to the GCC C/C++ compiler will be installed instead.
diff --git a/tools/build/options/WITHOUT_LLVM_LIBUNWIND b/tools/build/options/WITHOUT_LLVM_LIBUNWIND
deleted file mode 100644
index 63a904230a26..000000000000
--- a/tools/build/options/WITHOUT_LLVM_LIBUNWIND
+++ /dev/null
@@ -1,2 +0,0 @@
-.\" $FreeBSD$
-Set to use GCC's stack unwinder (instead of LLVM's libunwind).
diff --git a/tools/build/options/WITHOUT_SYSTEM_COMPILER b/tools/build/options/WITHOUT_SYSTEM_COMPILER
index 01bd89b2f351..2bf999af83e2 100644
--- a/tools/build/options/WITHOUT_SYSTEM_COMPILER
+++ b/tools/build/options/WITHOUT_SYSTEM_COMPILER
@@ -7,6 +7,4 @@ This does not prevent a compiler from being built for installation though,
 only for building one for the build itself.
 The
 .Va WITHOUT_CLANG
-and
-.Va WITHOUT_GCC
-options control those.
+option controls that.
diff --git a/tools/build/options/WITH_LLVM_LIBUNWIND b/tools/build/options/WITH_LLVM_LIBUNWIND
deleted file mode 100644
index ff63884af9e4..000000000000
--- a/tools/build/options/WITH_LLVM_LIBUNWIND
+++ /dev/null
@@ -1,2 +0,0 @@
-.\" $FreeBSD$
-Set to use LLVM's libunwind stack unwinder (instead of GCC's unwinder).
diff --git a/tools/build/options/WITH_SYSTEM_COMPILER b/tools/build/options/WITH_SYSTEM_COMPILER
index 3d88bffc4690..6d472c140873 100644
--- a/tools/build/options/WITH_SYSTEM_COMPILER
+++ b/tools/build/options/WITH_SYSTEM_COMPILER
@@ -7,6 +7,4 @@ This does not prevent a compiler from being built for installation though,
 only for building one for the build itself.
 The
 .Va WITHOUT_CLANG
-and
-.Va WITHOUT_GCC
-options control those.
+option controls that.