Only use OLD_LIBS with shared libraries.

Use OLD_FILES for a few symbolic links and static libraries previously
included in OLD_LIBS.

Add a missing shared library major number to an old libroken entry.

(cherry picked from commit 60a8277413eca3fa57f85caf331b080aee030fe5)

2 files changed, 34 insertions, 34 deletions

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 0fe277b1bc6b..0b70ebf521fb 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -6307,7 +6307,7 @@ OLD_FILES+=usr/tests/sys/geom/class/gate/conf.sh
 OLD_FILES+=usr/lib/libbsnmptools.a
 OLD_FILES+=usr/lib/libbsnmptools_p.a
 OLD_LIBS+=usr/lib/libbsnmptools.so.0
-OLD_LIBS+=usr/lib/libbsnmptools.so
+OLD_FILES+=usr/lib/libbsnmptools.so
 # 20170102: sysdecode_getfsstat_flags() renamed to sysdecode_getfsstat_mode()
 OLD_FILES+=usr/share/man/man3/sysdecode_getfsstat_flags.3.gz
 # 20161230: libarchive ACL pax test renamed to test_acl_pax_posix1e.tar.uu
@@ -10557,7 +10557,7 @@ OLD_FILES+=usr/share/examples/atm/fore-microcode.txt
 OLD_FILES+=usr/share/examples/atm/sscf-design.txt
 OLD_FILES+=usr/share/examples/atm/sscop-design.txt
 OLD_LIBS+=lib/libatm.so.5
-OLD_LIBS+=usr/lib/libatm.so
+OLD_FILES+=usr/lib/libatm.so
 OLD_DIRS+=usr/include/netatm/sigpvc
 OLD_DIRS+=usr/include/netatm/spans
 OLD_DIRS+=usr/include/netatm/ipatm
@@ -12786,16 +12786,16 @@ OLD_LIBS+=usr/lib/libobjc.so.2
 OLD_LIBS+=usr/lib32/libgssapi.so.8
 OLD_LIBS+=usr/lib32/libobjc.so.2
 # 20070519: GCC 4.2
-OLD_LIBS+=usr/lib/libg2c.a
-OLD_LIBS+=usr/lib/libg2c.so
+OLD_FILES+=usr/lib/libg2c.a
+OLD_FILES+=usr/lib/libg2c.so
 OLD_LIBS+=usr/lib/libg2c.so.2
-OLD_LIBS+=usr/lib/libg2c_p.a
-OLD_LIBS+=usr/lib/libgcc_pic.a
-OLD_LIBS+=usr/lib32/libg2c.a
-OLD_LIBS+=usr/lib32/libg2c.so
+OLD_FILES+=usr/lib/libg2c_p.a
+OLD_FILES+=usr/lib/libgcc_pic.a
+OLD_FILES+=usr/lib32/libg2c.a
+OLD_FILES+=usr/lib32/libg2c.so
 OLD_LIBS+=usr/lib32/libg2c.so.2
-OLD_LIBS+=usr/lib32/libg2c_p.a
-OLD_LIBS+=usr/lib32/libgcc_pic.a
+OLD_FILES+=usr/lib32/libg2c_p.a
+OLD_FILES+=usr/lib32/libgcc_pic.a
 # 20060729: OpenSSL 0.9.7e -> 0.9.8b upgrade
 OLD_LIBS+=lib/libcrypto.so.4
 OLD_LIBS+=usr/lib/libssl.so.4
@@ -12818,14 +12818,14 @@ OLD_LIBS+=usr/lib/libpthread.so.2
 # 20060127: revert libdisk to static-only
 OLD_LIBS+=usr/lib/libdisk.so.3
 # 20051027: libc_r discontinued (removed 20101113)
-OLD_LIBS+=usr/lib/libc_r.a
-OLD_LIBS+=usr/lib/libc_r.so
+OLD_FILES+=usr/lib/libc_r.a
+OLD_FILES+=usr/lib/libc_r.so
 OLD_LIBS+=usr/lib/libc_r.so.7
-OLD_LIBS+=usr/lib/libc_r_p.a
-OLD_LIBS+=usr/lib32/libc_r.a
-OLD_LIBS+=usr/lib32/libc_r.so
+OLD_FILES+=usr/lib/libc_r_p.a
+OLD_FILES+=usr/lib32/libc_r.a
+OLD_FILES+=usr/lib32/libc_r.so
 OLD_LIBS+=usr/lib32/libc_r.so.7
-OLD_LIBS+=usr/lib32/libc_r_p.a
+OLD_FILES+=usr/lib32/libc_r_p.a
 # 20050722: bump for 6.0-RELEASE
 OLD_LIBS+=lib/libalias.so.4
 OLD_LIBS+=lib/libatm.so.2
@@ -12992,7 +12992,7 @@ OLD_LIBS+=usr/lib/libkafs.so.3
 OLD_LIBS+=usr/lib/libkafs5.so.5
 OLD_LIBS+=usr/lib/libkdb.so.3
 OLD_LIBS+=usr/lib/libkrb.so.3
-OLD_LIBS+=usr/lib/libroken.so.
+OLD_LIBS+=usr/lib/libroken.so.5
 OLD_LIBS+=usr/lib/libssl.so.2
 OLD_LIBS+=usr/lib/pam_kerberosIV.so
 # 200208XX
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 4ca7c32ebd73..d17eeb697fa1 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1148,10 +1148,10 @@ OLD_FILES+=usr/lib/libbe_p.a
 OLD_FILES+=usr/lib/libbe.so
 OLD_LIBS+=lib/libbe.so.1
 OLD_FILES+=usr/lib/libzfs.a
-OLD_LIBS+=usr/lib/libzfs.so
+OLD_FILES+=usr/lib/libzfs.so
 OLD_FILES+=usr/lib/libzfs_core.a
-OLD_LIBS+=usr/lib/libzfs_core.so
-OLD_LIBS+=usr/lib/libzfs_core_p.a
+OLD_FILES+=usr/lib/libzfs_core.so
+OLD_FILES+=usr/lib/libzfs_core_p.a
 OLD_FILES+=usr/lib/libzfs_p.a
 OLD_FILES+=usr/lib/libzpool.a
 OLD_FILES+=usr/lib/libzpool.so
@@ -7173,8 +7173,8 @@ OLD_FILES+=usr/share/man/man8/vendstat.8.gz
 
 .if ${MK_OPENMP} == no
 OLD_FILES+=usr/include/omp.h
-OLD_LIBS+=usr/lib/libgomp.so
-OLD_LIBS+=usr/lib32/libgomp.so
+OLD_FILES+=usr/lib/libgomp.so
+OLD_FILES+=usr/lib32/libgomp.so
 OLD_LIBS+=usr/lib/libomp.so
 OLD_LIBS+=usr/lib32/libomp.so
 .endif
@@ -8443,27 +8443,27 @@ OLD_FILES+=usr/share/man/man8/telnetd.8.gz
 OLD_FILES+=usr/bin/atf-sh
 OLD_FILES+=usr/include/atf-c++/config.hpp
 OLD_FILES+=usr/include/atf-c/config.h
-OLD_LIBS+=usr/lib/libatf-c++.a
-OLD_LIBS+=usr/lib/libatf-c++.so
+OLD_FILES+=usr/lib/libatf-c++.a
+OLD_FILES+=usr/lib/libatf-c++.so
 OLD_LIBS+=usr/lib/libatf-c++.so.1
 OLD_LIBS+=usr/lib/libatf-c++.so.2
-OLD_LIBS+=usr/lib/libatf-c++_p.a
-OLD_LIBS+=usr/lib/libatf-c.a
-OLD_LIBS+=usr/lib/libatf-c.so
+OLD_FILES+=usr/lib/libatf-c++_p.a
+OLD_FILES+=usr/lib/libatf-c.a
+OLD_FILES+=usr/lib/libatf-c.so
 OLD_LIBS+=usr/lib/libatf-c.so.1
-OLD_LIBS+=usr/lib/libatf-c_p.a
+OLD_FILES+=usr/lib/libatf-c_p.a
 OLD_LIBS+=usr/lib/libprivateatf-c.so.0
 OLD_LIBS+=usr/lib/libprivateatf-c++.so.1
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
-OLD_LIBS+=usr/lib32/libatf-c++.a
-OLD_LIBS+=usr/lib32/libatf-c++.so
+OLD_FILES+=usr/lib32/libatf-c++.a
+OLD_FILES+=usr/lib32/libatf-c++.so
 OLD_LIBS+=usr/lib32/libatf-c++.so.1
 OLD_LIBS+=usr/lib32/libatf-c++.so.2
-OLD_LIBS+=usr/lib32/libatf-c++_p.a
-OLD_LIBS+=usr/lib32/libatf-c.a
-OLD_LIBS+=usr/lib32/libatf-c.so
+OLD_FILES+=usr/lib32/libatf-c++_p.a
+OLD_FILES+=usr/lib32/libatf-c.a
+OLD_FILES+=usr/lib32/libatf-c.so
 OLD_LIBS+=usr/lib32/libatf-c.so.1
-OLD_LIBS+=usr/lib32/libatf-c_p.a
+OLD_FILES+=usr/lib32/libatf-c_p.a
 OLD_LIBS+=usr/lib32/libprivateatf-c.so.0
 OLD_LIBS+=usr/lib32/libprivateatf-c++.so.1
 .endif