svn commit: r335164 - in releng/11.2: . tools/build/mk

[Glen Barber]

Author: gjb
Date: Thu Jun 14 17:42:36 2018
New Revision: 335164
URL: https://svnweb.freebsd.org/changeset/base/335164

Log:
  MFS11 r335088 (dim):
   MFC rr334886:
    Add missed libc++ entries to (Optional)ObsoleteFiles.inc
  
    Some of these were removed during the libc++ 5.0.0 import, others
    were added in the libc++ 6.0.0 import.
  
  Approved by:	re (marius)
  Sponsored by:	The FreeBSD Foundation

Modified:
  releng/11.2/ObsoleteFiles.inc
  releng/11.2/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
  releng/11.2/   (props changed)

Modified: releng/11.2/ObsoleteFiles.inc
==============================================================================
--- releng/11.2/ObsoleteFiles.inc	Thu Jun 14 17:42:19 2018	(r335163)
+++ releng/11.2/ObsoleteFiles.inc	Thu Jun 14 17:42:36 2018	(r335164)
@@ -38,6 +38,11 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20180613: obsolete libc++ files missed from the 5.0.0 import
+OLD_FILES+=usr/include/c++/v1/__refstring
+OLD_FILES+=usr/include/c++/v1/__undef_min_max
+OLD_FILES+=usr/include/c++/v1/tr1/__refstring
+OLD_FILES+=usr/include/c++/v1/tr1/__undef_min_max
 # 20180513: remove DTrace scripts made obsolete by dwatch(1)
 OLD_FILES+=usr/share/dtrace/watch_execve
 OLD_FILES+=usr/share/dtrace/watch_kill

Modified: releng/11.2/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- releng/11.2/tools/build/mk/OptionalObsoleteFiles.inc	Thu Jun 14 17:42:19 2018	(r335163)
+++ releng/11.2/tools/build/mk/OptionalObsoleteFiles.inc	Thu Jun 14 17:42:36 2018	(r335164)
@@ -4499,7 +4499,6 @@ OLD_FILES+=usr/include/c++/v1/__libcpp_version
 OLD_FILES+=usr/include/c++/v1/__locale
 OLD_FILES+=usr/include/c++/v1/__mutex_base
 OLD_FILES+=usr/include/c++/v1/__nullptr
-OLD_FILES+=usr/include/c++/v1/__refstring
 OLD_FILES+=usr/include/c++/v1/__split_buffer
 OLD_FILES+=usr/include/c++/v1/__sso_allocator
 OLD_FILES+=usr/include/c++/v1/__std_stream
@@ -4552,6 +4551,7 @@ OLD_FILES+=usr/include/c++/v1/experimental/__memory
 OLD_FILES+=usr/include/c++/v1/experimental/algorithm
 OLD_FILES+=usr/include/c++/v1/experimental/any
 OLD_FILES+=usr/include/c++/v1/experimental/chrono
+OLD_FILES+=usr/include/c++/v1/experimental/coroutine
 OLD_FILES+=usr/include/c++/v1/experimental/deque
 OLD_FILES+=usr/include/c++/v1/experimental/dynarray
 OLD_FILES+=usr/include/c++/v1/experimental/filesystem
@@ -4561,6 +4561,7 @@ OLD_FILES+=usr/include/c++/v1/experimental/iterator
 OLD_FILES+=usr/include/c++/v1/experimental/list
 OLD_FILES+=usr/include/c++/v1/experimental/map
 OLD_FILES+=usr/include/c++/v1/experimental/memory_resource
+OLD_FILES+=usr/include/c++/v1/experimental/numeric
 OLD_FILES+=usr/include/c++/v1/experimental/optional
 OLD_FILES+=usr/include/c++/v1/experimental/propagate_const
 OLD_FILES+=usr/include/c++/v1/experimental/ratio
@@ -4642,7 +4643,6 @@ OLD_FILES+=usr/include/c++/v1/tr1/__libcpp_version
 OLD_FILES+=usr/include/c++/v1/tr1/__locale
 OLD_FILES+=usr/include/c++/v1/tr1/__mutex_base
 OLD_FILES+=usr/include/c++/v1/tr1/__nullptr
-OLD_FILES+=usr/include/c++/v1/tr1/__refstring
 OLD_FILES+=usr/include/c++/v1/tr1/__split_buffer
 OLD_FILES+=usr/include/c++/v1/tr1/__sso_allocator
 OLD_FILES+=usr/include/c++/v1/tr1/__std_stream
@@ -4650,7 +4650,7 @@ OLD_FILES+=usr/include/c++/v1/tr1/__string
 OLD_FILES+=usr/include/c++/v1/tr1/__threading_support
 OLD_FILES+=usr/include/c++/v1/tr1/__tree
 OLD_FILES+=usr/include/c++/v1/tr1/__tuple
-OLD_FILES+=usr/include/c++/v1/tr1/__undef_min_max
+OLD_FILES+=usr/include/c++/v1/tr1/__undef_macros
 OLD_FILES+=usr/include/c++/v1/tr1/algorithm
 OLD_FILES+=usr/include/c++/v1/tr1/any
 OLD_FILES+=usr/include/c++/v1/tr1/array