git: 84d246823ece - stable/13 - check/delete-old: Auto-generate lib32 entries for libraries.

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: John Baldwin <jhb_at_FreeBSD.org>
Date: Wed, 13 Jul 2022 16:06:42 UTC
The branch stable/13 has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=84d246823ecedd3ac07defb238910859699b5a9f

commit 84d246823ecedd3ac07defb238910859699b5a9f
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-01-20 22:09:57 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-07-13 15:55:04 +0000

    check/delete-old: Auto-generate lib32 entries for libraries.
    
    - Add usr/lib32/libfoo.so.N for lib/libfoo.so.N.
    
    - Add usr/lib32/foo for usr/lib/foo.
    
    - Treat casper libraries special since they are installed to
      /usr/lib32 instead of /usr/lib32/casper and thus map
      usr/lib/casper/foo to usr/lib32/foo.
    
    Note that OLD_DIRS and MOVED_LIBS entries are not duplicated, only
    OLD_FILES and OLD_LIBS.
    
    Reviewed by:    imp, emaste
    Sponsored by:   The University of Cambridge, Google Inc.
    Differential Revision:  https://reviews.freebsd.org/D33324
    
    (cherry picked from commit 77da558ceb0949b60b566da61cb8d9b9634ca862)
---
 Makefile.inc1                            |   9 +-
 ObsoleteFiles.inc                        | 462 +------------------------------
 tools/build/mk/OptionalObsoleteFiles.inc | 452 ------------------------------
 3 files changed, 10 insertions(+), 913 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index f87b98bdc1d0..cf135f6d9439 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -3204,7 +3204,9 @@ RM_I=-v
 list-old-files: .PHONY
 	@cd ${.CURDIR}; \
 	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
-	    -V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" | xargs -n1 | sort
+	    -V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" \
+	    -V "OLD_FILES:Mlib/*.so.*:S,^lib,usr/lib32," \
+	    -V "OLD_FILES:Musr/lib/*:S,^usr/lib,usr/lib32," | xargs -n1 | sort
 
 delete-old-files: .PHONY
 	@echo ">>> Removing old files (only deletes safe to delete libs)"
@@ -3268,7 +3270,10 @@ check-old-files: .PHONY
 list-old-libs: .PHONY
 	@cd ${.CURDIR}; \
 	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
-	    -V OLD_LIBS -V MOVED_LIBS | xargs -n1 | sort
+	    -V OLD_LIBS -V MOVED_LIBS -V "OLD_LIBS:Mlib/*:S,^lib,usr/lib32," \
+	    -V "OLD_LIBS:Musr/lib/*:S,^usr/lib,usr/lib32," \
+	    -V "OLD_LIBS:Mlib/casper/*:S,^lib/casper,usr/lib32," | \
+	    xargs -n1 | sort
 
 delete-old-libs: .PHONY
 	@echo ">>> Removing old libraries"
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 5d2661b8d283..dfcab74e75fc 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -2376,10 +2376,6 @@ OLD_FILES+=usr/lib/libgnuregex.a
 OLD_FILES+=usr/lib/libgnuregex.so
 OLD_LIBS+=usr/lib/libgnuregex.so.5
 OLD_FILES+=usr/lib/libgnuregex_p.a
-OLD_FILES+=usr/lib32/libgnuregex.a
-OLD_FILES+=usr/lib32/libgnuregex.so
-OLD_LIBS+=usr/lib32/libgnuregex.so.5
-OLD_FILES+=usr/lib32/libgnuregex_p.a
 
 # 20201225: gnugrep removed
 OLD_FILES+=usr/bin/bsdgrep
@@ -2480,7 +2476,6 @@ OLD_FILES+=boot/lua/logo-orbbw.lua
 
 # 20200825: merged OpenZFS support
 OLD_LIBS+=lib/libzfs.so.3
-OLD_LIBS+=usr/lib32/libzfs.so.3
 OLD_FILES+=usr/share/man/man1/zstreamdump.1.gz
 #OLD_FILES+=usr/share/man/man7/zpool-features.7.gz
 
@@ -4185,22 +4180,8 @@ 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_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
-OLD_LIBS+=usr/lib32/libgomp.so.1
-OLD_FILES+=usr/lib32/libgomp_p.a
 OLD_FILES+=usr/libexec/cc1
 OLD_FILES+=usr/libexec/cc1plus
 OLD_FILES+=usr/share/man/man1/gcpp.1.gz
@@ -4210,8 +4191,6 @@ OLD_FILES+=usr/share/man/man7/gperf.7.gz
 # 20200220: Upgrade of ncurses, shlib bumped to version 9
 OLD_LIBS+=lib/libncurses.so.8
 OLD_LIBS+=lib/libncursesw.so.8
-OLD_LIBS+=usr/lib32/libncurses.so.8
-OLD_LIBS+=usr/lib32/libncursesw.so.8
 
 # 20200206: Remove elf2aout
 OLD_FILES+=usr/bin/elf2aout
@@ -4654,7 +4633,6 @@ OLD_FILES+=usr/include/c++/v1/experimental/string_view
 OLD_FILES+=usr/include/c++/v1/experimental/system_error
 OLD_FILES+=usr/include/c++/v1/experimental/tuple
 OLD_FILES+=usr/lib/libc++fs.a
-OLD_FILES+=usr/lib32/libc++fs.a
 # 20191003: Remove useless ZFS tests
 OLD_FILES+=usr/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_013_neg.ksh
 OLD_FILES+=usr/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_014_neg.ksh
@@ -5121,8 +5099,6 @@ OLD_FILES+=usr/include/sys/seq.h
 # 20190222: libifconfig made INTERNALLIB
 OLD_FILES+=usr/lib/libprivateifconfig.a
 OLD_FILES+=usr/lib/libprivateifconfig_p.a
-OLD_FILES+=usr/lib32/libprivateifconfig.a
-OLD_FILES+=usr/lib32/libprivateifconfig_p.a
 # 20190131: pfil(9) changed
 OLD_FILES+=usr/share/man/man9/pfil_hook_get.9.gz
 OLD_FILES+=usr/share/man/man9/pfil_rlock.9.gz
@@ -5299,10 +5275,8 @@ OLD_DIRS+=usr/lib/clang/6.0.1
 OLD_FILES+=usr/tests/sys/netinet/reuseport_lb
 # 20181113: libufs version bumped to 7
 OLD_LIBS+=lib/libufs.so.6
-OLD_LIBS+=usr/lib32/libufs.so.6
 # 20181112: Cleanup old libcap_dns
 OLD_LIBS+=lib/casper/libcap_dns.so.1
-OLD_LIBS+=usr/lib32/libcap_dns.so.1
 # 20181030: malloc_domain(9) KPI change
 OLD_FILES+=usr/share/man/man9/malloc_domain.9.gz
 # 20181026: joy(4) removal
@@ -5310,8 +5284,6 @@ OLD_FILES+=usr/share/man/man4/joy.4.gz
 # 20181025: OpenSSL libraries version bump to avoid conflict with ports
 OLD_LIBS+=lib/libcrypto.so.9
 OLD_LIBS+=usr/lib/libssl.so.9
-OLD_LIBS+=usr/lib32/libcrypto.so.9
-OLD_LIBS+=usr/lib32/libssl.so.9
 # 20181022: aha(4) removal
 OLD_FILES+=usr/share/man/man4/aha.4.gz
 # 20181022: dpt(4) removal
@@ -5333,12 +5305,6 @@ OLD_LIBS+=lib/casper/libcap_pwd.so.0
 OLD_LIBS+=lib/casper/libcap_random.so.0
 OLD_LIBS+=lib/casper/libcap_dns.so.0
 OLD_LIBS+=lib/casper/libcap_syslog.so.0
-OLD_LIBS+=usr/lib32/libcap_sysctl.so.0
-OLD_LIBS+=usr/lib32/libcap_grp.so.0
-OLD_LIBS+=usr/lib32/libcap_pwd.so.0
-OLD_LIBS+=usr/lib32/libcap_random.so.0
-OLD_LIBS+=usr/lib32/libcap_dns.so.0
-OLD_LIBS+=usr/lib32/libcap_syslog.so.0
 # 20181012: rename of ixlv(4) to iavf(4)
 OLD_FILES+=usr/share/man/man4/if_ixlv.4.gz
 OLD_FILES+=usr/share/man/man4/ixlv.4.gz
@@ -5549,7 +5515,6 @@ OLD_LIBS+=usr/lib/engines/libnuron.so
 OLD_LIBS+=usr/lib/engines/libsureware.so
 OLD_LIBS+=usr/lib/engines/libubsec.so
 OLD_LIBS+=usr/lib/libssl.so.8
-OLD_LIBS+=usr/lib32/libcrypto.so.8
 OLD_LIBS+=usr/lib32/lib4758cca.so
 OLD_LIBS+=usr/lib32/libaep.so
 OLD_LIBS+=usr/lib32/libatalla.so
@@ -5560,7 +5525,6 @@ OLD_LIBS+=usr/lib32/libgost.so
 OLD_LIBS+=usr/lib32/libnuron.so
 OLD_LIBS+=usr/lib32/libsureware.so
 OLD_LIBS+=usr/lib32/libubsec.so
-OLD_LIBS+=usr/lib32/libssl.so.8
 # 20180824: libbe(3) SHLIBDIR fixed to reflect correct location
 MOVED_LIBS+=usr/lib/libbe.so.1
 # 20180819: Remove deprecated arc4random(3) stir/addrandom interfaces
@@ -5572,7 +5536,6 @@ OLD_FILES+=usr/bin/send-pr
 OLD_FILES+=usr/share/man/man4/jedec_ts.4.gz
 # 20180725: Cleanup old libcasper.so.0
 OLD_LIBS+=lib/libcasper.so.0
-OLD_LIBS+=usr/lib32/libcasper.so.0
 # 20180722: indent(1) option renamed, test files follow
 OLD_FILES+=usr/bin/indent/tests/nsac.0
 OLD_FILES+=usr/bin/indent/tests/nsac.0.pro
@@ -5953,7 +5916,6 @@ OLD_FILES+=usr/share/man/man3/basename_r.3.gz
 OLD_FILES+=usr/share/man/man1/fdformat.1.gz
 # 20171203: libproc version bump
 OLD_LIBS+=usr/lib/libproc.so.4
-OLD_LIBS+=usr/lib32/libproc.so.4
 # 20171203: new clang import which bumps version from 5.0.0 to 5.0.1
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/asan_interface.h
@@ -6141,18 +6103,6 @@ OLD_FILES+=usr/lib/libcap_sysctl.a
 OLD_FILES+=usr/lib/libcap_sysctl_p.a
 OLD_FILES+=usr/lib/libcasper.a
 OLD_FILES+=usr/lib/libcasper_p.a
-OLD_FILES+=usr/lib32/libcap_dns.a
-OLD_FILES+=usr/lib32/libcap_dns_p.a
-OLD_FILES+=usr/lib32/libcap_grp.a
-OLD_FILES+=usr/lib32/libcap_grp_p.a
-OLD_FILES+=usr/lib32/libcap_pwd.a
-OLD_FILES+=usr/lib32/libcap_pwd_p.a
-OLD_FILES+=usr/lib32/libcap_random.a
-OLD_FILES+=usr/lib32/libcap_random_p.a
-OLD_FILES+=usr/lib32/libcap_sysctl.a
-OLD_FILES+=usr/lib32/libcap_sysctl_p.a
-OLD_FILES+=usr/lib32/libcasper.a
-OLD_FILES+=usr/lib32/libcasper_p.a
 # 20171031: Removal of adding_user man page
 OLD_FILES+=usr/share/man/man7/adding_user.7.gz
 # 20171031: Disconnected libpathconv tests
@@ -6173,8 +6123,6 @@ OLD_FILES+=usr/share/man/man9/mbp_sync.9.gz
 # 20171010: Remove libstand
 OLD_FILES+=usr/lib/libstand.a
 OLD_FILES+=usr/lib/libstand_p.a
-OLD_FILES+=usr/lib32/libstand.a
-OLD_FILES+=usr/lib32/libstand_p.a
 OLD_FILES+=usr/include/stand.h
 OLD_FILES+=usr/share/man/man3/libstand.3.gz
 # 20171003: remove RCMDS
@@ -6933,10 +6881,6 @@ OLD_FILES+=usr/lib/libifc.a
 OLD_FILES+=usr/lib/libifc_p.a
 OLD_FILES+=usr/lib/libifconfig.a
 OLD_FILES+=usr/lib/libifconfig_p.a
-OLD_FILES+=usr/lib32/libifc.a
-OLD_FILES+=usr/lib32/libifc_p.a
-OLD_FILES+=usr/lib32/libifconfig.a
-OLD_FILES+=usr/lib32/libifconfig_p.a
 # 20170529: mount.conf(8) -> mount.conf(5)
 OLD_FILES+=usr/share/man/man8/mount.conf.8.gz
 # 20170525: remove misleading template
@@ -7064,9 +7008,6 @@ OLD_DIRS+=usr/share/doc/usd
 OLD_LIBS+=lib/libzfs.so.2
 OLD_LIBS+=usr/lib/libarchive.so.6
 OLD_LIBS+=usr/lib/libmilter.so.5
-OLD_LIBS+=usr/lib32/libzfs.so.2
-OLD_LIBS+=usr/lib32/libarchive.so.6
-OLD_LIBS+=usr/lib32/libmilter.so.5
 # 20170427: NATM configuration support removed
 OLD_FILES+=etc/rc.d/atm1
 OLD_FILES+=etc/rc.d/atm2
@@ -7429,7 +7370,6 @@ OLD_DIRS+=usr/lib/clang/3.9.0/lib
 OLD_DIRS+=usr/lib/clang/3.9.0
 # 20161205: libproc version bump
 OLD_LIBS+=usr/lib/libproc.so.3
-OLD_LIBS+=usr/lib32/libproc.so.3
 # 20161127: Remove vm_page_cache(9)
 OLD_FILES+=usr/share/man/man9/vm_page_cache.9.gz
 # 20161124: new clang import which bumps version from 3.8.0 to 3.9.0
@@ -7718,31 +7658,6 @@ OLD_LIBS+=usr/lib/pam_self.so.5
 OLD_LIBS+=usr/lib/pam_ssh.so.5
 OLD_LIBS+=usr/lib/pam_tacplus.so.5
 OLD_LIBS+=usr/lib/pam_unix.so.5
-OLD_LIBS+=usr/lib32/libpam.so.5
-OLD_LIBS+=usr/lib32/pam_chroot.so.5
-OLD_LIBS+=usr/lib32/pam_deny.so.5
-OLD_LIBS+=usr/lib32/pam_echo.so.5
-OLD_LIBS+=usr/lib32/pam_exec.so.5
-OLD_LIBS+=usr/lib32/pam_ftpusers.so.5
-OLD_LIBS+=usr/lib32/pam_group.so.5
-OLD_LIBS+=usr/lib32/pam_guest.so.5
-OLD_LIBS+=usr/lib32/pam_krb5.so.5
-OLD_LIBS+=usr/lib32/pam_ksu.so.5
-OLD_LIBS+=usr/lib32/pam_lastlog.so.5
-OLD_LIBS+=usr/lib32/pam_login_access.so.5
-OLD_LIBS+=usr/lib32/pam_nologin.so.5
-OLD_LIBS+=usr/lib32/pam_opie.so.5
-OLD_LIBS+=usr/lib32/pam_opieaccess.so.5
-OLD_LIBS+=usr/lib32/pam_passwdqc.so.5
-OLD_LIBS+=usr/lib32/pam_permit.so.5
-OLD_LIBS+=usr/lib32/pam_radius.so.5
-OLD_LIBS+=usr/lib32/pam_rhosts.so.5
-OLD_LIBS+=usr/lib32/pam_rootok.so.5
-OLD_LIBS+=usr/lib32/pam_securetty.so.5
-OLD_LIBS+=usr/lib32/pam_self.so.5
-OLD_LIBS+=usr/lib32/pam_ssh.so.5
-OLD_LIBS+=usr/lib32/pam_tacplus.so.5
-OLD_LIBS+=usr/lib32/pam_unix.so.5
 # 20160523: remove extranous ALTQ files
 OLD_FILES+=usr/include/altq/altq_codel.h
 OLD_FILES+=usr/include/altq/altq_fairq.h
@@ -7763,7 +7678,6 @@ OLD_FILES+=usr/share/man/man5/reiserfs.5.gz
 OLD_FILES+=usr/tests/lib/libc/regex/data/README
 # 20160430: kvm_getfiles(3) removed from kvm(3)
 OLD_LIBS+=lib/libkvm.so.6
-OLD_LIBS+=usr/lib32/libkvm.so.6
 OLD_FILES+=usr/share/man/man3/kvm_getfiles.3.gz
 # 20160423: remove mroute6d
 OLD_FILES+=etc/rc.d/mroute6d
@@ -7786,7 +7700,6 @@ OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hant_HK.Big5HKSCS
 # 20160317: rman_res_t size bump to uintmax_t
 OLD_LIBS+=usr/lib/libdevinfo.so.5
-OLD_LIBS+=usr/lib32/libdevinfo.so.5
 # 20160305: new clang import which bumps version from 3.7.1 to 3.8.0
 OLD_FILES+=usr/bin/macho-dump
 OLD_FILES+=usr/bin/tblgen
@@ -7906,10 +7819,6 @@ OLD_FILES+=usr/lib/libcapsicum.a
 OLD_FILES+=usr/lib/libcapsicum.so
 OLD_LIBS+=lib/libcapsicum.so.0
 OLD_FILES+=usr/lib/libcapsicum_p.a
-OLD_FILES+=usr/lib32/libcapsicum.a
-OLD_FILES+=usr/lib32/libcapsicum.so
-OLD_LIBS+=usr/lib32/libcapsicum.so.0
-OLD_FILES+=usr/lib32/libcapsicum_p.a
 # 20160223: functionality from mkulzma(1) merged into mkuzip(1)
 OLD_FILES+=usr/bin/mkulzma
 OLD_FILES+=usr/share/man/man4/geom_uncompress.4.gz
@@ -8142,8 +8051,6 @@ OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_ctrl_str.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/d2i_509_CRL_fp.3.gz
 OLD_LIBS+=lib/libcrypto.so.7
 OLD_LIBS+=usr/lib/libssl.so.7
-OLD_LIBS+=usr/lib32/libcrypto.so.7
-OLD_LIBS+=usr/lib32/libssl.so.7
 # 20151029: LinuxKPI moved to sys/compat/linuxkpi
 OLD_FILES+=usr/include/dev/usb/usb_compat_linux.h
 # 20151015: test symbols moved to /usr/lib/debug
@@ -8646,7 +8553,6 @@ OLD_FILES+=usr/include/sys/nvlist_impl.h
 OLD_FILES+=usr/include/sys/nvpair_impl.h
 # 20150624
 OLD_LIBS+=usr/lib/libugidfw.so.4
-OLD_LIBS+=usr/lib32/libugidfw.so.4
 # 20150604: Move nvlist man pages to section 9
 OLD_FILES+=usr/share/man/man3/libnv.3.gz
 OLD_FILES+=usr/share/man/man3/nv.3.gz
@@ -8789,25 +8695,11 @@ OLD_FILES+=usr/lib/libheimsqlite.a
 OLD_FILES+=usr/lib/libheimsqlite.so
 OLD_LIBS+=usr/lib/libheimsqlite.so.11
 OLD_FILES+=usr/lib/libheimsqlite_p.a
-OLD_FILES+=usr/lib32/libheimsqlite.a
-OLD_FILES+=usr/lib32/libheimsqlite.so
-OLD_LIBS+=usr/lib32/libheimsqlite.so.11
-OLD_FILES+=usr/lib32/libheimsqlite_p.a
 # 20150506
 OLD_FILES+=usr/share/man/man9/NDHASGIANT.9.gz
 # 20150504
 OLD_FILES+=usr/share/examples/etc/libmap32.conf
 OLD_FILES+=usr/include/bsdstat.h
-OLD_LIBS+=usr/lib32/private/libatf-c++.so.2
-OLD_LIBS+=usr/lib32/private/libbsdstat.so.1
-OLD_LIBS+=usr/lib32/private/libheimipcs.so.11
-OLD_LIBS+=usr/lib32/private/libsqlite3.so.0
-OLD_LIBS+=usr/lib32/private/libunbound.so.5
-OLD_LIBS+=usr/lib32/private/libatf-c.so.1
-OLD_LIBS+=usr/lib32/private/libheimipcc.so.11
-OLD_LIBS+=usr/lib32/private/libldns.so.5
-OLD_LIBS+=usr/lib32/private/libssh.so.5
-OLD_LIBS+=usr/lib32/private/libucl.so.1
 OLD_DIRS+=usr/lib32/private
 OLD_LIBS+=usr/lib/private/libatf-c++.so.2
 OLD_LIBS+=usr/lib/private/libbsdstat.so.1
@@ -9215,10 +9107,6 @@ OLD_FILES+=usr/lib/libgpib.a
 OLD_FILES+=usr/lib/libgpib_p.a
 OLD_FILES+=usr/lib/libgpib.so
 OLD_LIBS+=usr/lib/libgpib.so.3
-OLD_FILES+=usr/lib32/libgpib.a
-OLD_FILES+=usr/lib32/libgpib_p.a
-OLD_FILES+=usr/lib32/libgpib.so
-OLD_LIBS+=usr/lib32/libgpib.so.3
 OLD_FILES+=usr/share/man/man3/gpib.3.gz
 OLD_FILES+=usr/share/man/man3/ibclr.3.gz
 OLD_FILES+=usr/share/man/man3/ibdev.3.gz
@@ -9285,7 +9173,6 @@ OLD_FILES+=usr/lib/debug/usr/lib32/private
 OLD_FILES+=usr/share/openssl/man/man3/CMS_sign_add1_signer.3.gz
 # 20141003: libproc version bump
 OLD_LIBS+=usr/lib/libproc.so.2
-OLD_LIBS+=usr/lib32/libproc.so.2
 # 20140922: sleepq_calc_signal_retval.9 and sleepq_catch_signals.9 removed
 OLD_FILES+=usr/share/man/man9/sleepq_calc_signal_retval.9.gz
 OLD_FILES+=usr/share/man/man9/sleepq_catch_signals.9.gz
@@ -9297,38 +9184,10 @@ MOVED_LIBS+=usr/lib/libnv.so.0
 OLD_FILES+=etc/rc.d/kerberos
 # 20140814: libopie version bump
 OLD_LIBS+=usr/lib/libopie.so.7
-OLD_LIBS+=usr/lib32/libopie.so.7
 # 20140811: otp-sha renamed to otp-sha1
 OLD_FILES+=usr/bin/otp-sha
 OLD_FILES+=usr/share/man/man1/otp-sha.1.gz
 # 20140807: Remove private lib files that should not be installed
-OLD_FILES+=usr/lib32/private/libatf-c.a
-OLD_FILES+=usr/lib32/private/libatf-c.so
-OLD_FILES+=usr/lib32/private/libatf-c_p.a
-OLD_FILES+=usr/lib32/private/libatf-c++.a
-OLD_FILES+=usr/lib32/private/libatf-c++.so
-OLD_FILES+=usr/lib32/private/libatf-c++_p.a
-OLD_FILES+=usr/lib32/private/libbsdstat.a
-OLD_FILES+=usr/lib32/private/libbsdstat.so
-OLD_FILES+=usr/lib32/private/libbsdstat_p.a
-OLD_FILES+=usr/lib32/private/libheimipcc.a
-OLD_FILES+=usr/lib32/private/libheimipcc.so
-OLD_FILES+=usr/lib32/private/libheimipcc_p.a
-OLD_FILES+=usr/lib32/private/libheimipcs.a
-OLD_FILES+=usr/lib32/private/libheimipcs.so
-OLD_FILES+=usr/lib32/private/libheimipcs_p.a
-OLD_FILES+=usr/lib32/private/libldns.a
-OLD_FILES+=usr/lib32/private/libldns.so
-OLD_FILES+=usr/lib32/private/libldns_p.a
-OLD_FILES+=usr/lib32/private/libssh.a
-OLD_FILES+=usr/lib32/private/libssh.so
-OLD_FILES+=usr/lib32/private/libssh_p.a
-OLD_FILES+=usr/lib32/private/libunbound.a
-OLD_FILES+=usr/lib32/private/libunbound.so
-OLD_FILES+=usr/lib32/private/libunbound_p.a
-OLD_FILES+=usr/lib32/private/libucl.a
-OLD_FILES+=usr/lib32/private/libucl.so
-OLD_FILES+=usr/lib32/private/libucl_p.a
 OLD_FILES+=usr/lib/private/libatf-c.a
 OLD_FILES+=usr/lib/private/libatf-c.so
 OLD_FILES+=usr/lib/private/libatf-c_p.a
@@ -9362,7 +9221,6 @@ OLD_FILES+=usr/share/man/man9/pmap_change_wiring.9.gz
 OLD_FILES+=usr/share/man/man9/SYSCTL_ADD_OID.9.gz
 # 20140728: libsbuf restored to old version
 OLD_LIBS+=lib/libsbuf.so.7
-OLD_LIBS+=usr/lib32/libsbuf.so.7
 # 20140728: Remove an obsolete man page
 OLD_FILES+=usr/share/man/man9/VOP_GETVOBJECT.9.gz
 OLD_FILES+=usr/share/man/man9/VOP_CREATEVOBJECT.9.gz
@@ -9391,14 +9249,6 @@ OLD_FILES+=usr/lib/libhistory.a
 OLD_FILES+=usr/lib/libhistory_p.a
 OLD_FILES+=usr/lib/libhistory.so
 OLD_LIBS+=usr/lib/libhistory.so.8
-OLD_FILES+=usr/lib32/libhistory.a
-OLD_FILES+=usr/lib32/libhistory.so
-OLD_LIBS+=usr/lib32/libhistory.so.8
-OLD_FILES+=usr/lib32/libhistory_p.a
-OLD_FILES+=usr/lib32/libreadline.a
-OLD_FILES+=usr/lib32/libreadline.so
-OLD_LIBS+=usr/lib32/libreadline.so.8
-OLD_FILES+=usr/lib32/libreadline_p.a
 OLD_FILES+=usr/include/readline/chardefs.h
 OLD_FILES+=usr/include/readline/history.h
 OLD_FILES+=usr/include/readline/keymaps.h
@@ -9475,8 +9325,6 @@ OLD_FILES+=usr/share/man/man4/lindev.4.gz
 # 20140425
 OLD_FILES+=usr/lib/libssp_p.a
 OLD_FILES+=usr/lib/libstand_p.a
-OLD_FILES+=usr/lib32/libssp_p.a
-OLD_FILES+=usr/lib32/libstand_p.a
 # 20140413: Removed NO_MANCOMPRESS from mount_fusefs
 OLD_FILES+=usr/share/man/man8/mount_fusefs.8
 # 20140314: AppleTalk
@@ -9504,10 +9352,6 @@ OLD_DIRS+=usr/include/netipx
 OLD_FILES+=usr/lib/libipx.a
 OLD_FILES+=usr/lib/libipx.so
 OLD_FILES+=usr/lib/libipx_p.a
-OLD_FILES+=usr/lib32/libipx.a
-OLD_FILES+=usr/lib32/libipx.so
-OLD_LIBS+=usr/lib32/libipx.so.5
-OLD_FILES+=usr/lib32/libipx_p.a
 OLD_FILES+=usr/sbin/IPXrouted
 OLD_FILES+=usr/share/man/man3/ipx.3.gz
 OLD_FILES+=usr/share/man/man3/ipx_addr.3.gz
@@ -9524,10 +9368,6 @@ OLD_FILES+=usr/lib/private/libyaml.a
 OLD_FILES+=usr/lib/private/libyaml.so
 OLD_LIBS+=usr/lib/private/libyaml.so.1
 OLD_FILES+=usr/lib/private/libyaml_p.a
-OLD_FILES+=usr/lib32/private/libyaml.a
-OLD_FILES+=usr/lib32/private/libyaml.so
-OLD_LIBS+=usr/lib32/private/libyaml.so.1
-OLD_FILES+=usr/lib32/private/libyaml_p.a
 # 20140216: new clang import which bumps version from 3.3 to 3.4
 OLD_FILES+=usr/bin/llvm-prof
 OLD_FILES+=usr/include/clang/3.3/__wmmintrin_aes.h
@@ -9570,13 +9410,11 @@ OLD_FILES+=usr/share/man/man4/nve.4.gz
 OLD_FILES+=usr/include/dev/ofw/ofw_nexus.h
 # 20140128: libelf and libdwarf import
 OLD_LIBS+=usr/lib/libelf.so.1
-OLD_LIBS+=usr/lib32/libelf.so.1
 OLD_LIBS+=usr/lib/libdwarf.so.3
-OLD_LIBS+=usr/lib32/libdwarf.so.3
 # 20140123: apicvar header moved to x86
 OLD_FILES+=usr/include/machine/apicvar.h
 # 20131215: libcam version bumped
-OLD_LIBS+=lib/libcam.so.6 usr/lib32/libcam.so.6
+OLD_LIBS+=lib/libcam.so.6
 # 20131202: libcapsicum and libcasper moved to /lib/
 MOVED_LIBS+=usr/lib/libcapsicum.so.0
 MOVED_LIBS+=usr/lib/libcasper.so.0
@@ -9592,10 +9430,6 @@ OLD_FILES+=usr/lib/libiconv.a
 OLD_FILES+=usr/lib/libiconv.so
 OLD_LIBS+=usr/lib/libiconv.so.3
 OLD_FILES+=usr/lib/libiconv_p.a
-OLD_FILES+=usr/lib32/libiconv.a
-OLD_FILES+=usr/lib32/libiconv.so
-OLD_LIBS+=usr/lib32/libiconv.so.3
-OLD_FILES+=usr/lib32/libiconv_p.a
 # 20131103: removal of utxrm(8), use 'utx rm' instead
 OLD_FILES+=usr/sbin/utxrm
 OLD_FILES+=usr/share/man/man8/utxrm.8.gz
@@ -9638,10 +9472,6 @@ OLD_FILES+=usr/lib/libbsdyml.a
 OLD_FILES+=usr/lib/libbsdyml.so
 OLD_LIBS+=usr/lib/libbsdyml.so.0
 OLD_FILES+=usr/lib/libbsdyml_p.a
-OLD_FILES+=usr/lib32/libbsdyml.a
-OLD_FILES+=usr/lib32/libbsdyml.so
-OLD_LIBS+=usr/lib32/libbsdyml.so.0
-OLD_FILES+=usr/lib32/libbsdyml_p.a
 OLD_FILES+=usr/share/man/man3/libbsdyml.3.gz
 OLD_FILES+=usr/include/bsdyml.h
 # 20131013: Removal of the ATF tools
@@ -9916,10 +9746,6 @@ OLD_FILES+=usr/lib/libssh.a
 OLD_FILES+=usr/lib/libssh.so
 OLD_LIBS+=usr/lib/libssh.so.5
 OLD_FILES+=usr/lib/libssh_p.a
-OLD_FILES+=usr/lib32/libssh.a
-OLD_FILES+=usr/lib32/libssh.so
-OLD_LIBS+=usr/lib32/libssh.so.5
-OLD_FILES+=usr/lib32/libssh_p.a
 # 20130903: gnupatch is no more
 OLD_FILES+=usr/bin/gnupatch
 OLD_FILES+=usr/share/man/man1/gnupatch.1.gz
@@ -9936,10 +9762,8 @@ OLD_FILES+=usr/share/man/man9/vm_page_io_start.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_wakeup.9.gz
 # 20130710: libkvm version bump
 OLD_LIBS+=lib/libkvm.so.5
-OLD_LIBS+=usr/lib32/libkvm.so.5
 # 20130623: dialog update from 1.1 to 1.2
 OLD_LIBS+=usr/lib/libdialog.so.7
-OLD_LIBS+=usr/lib32/libdialog.so.7
 # 20130616: vfs_mount.9 removed
 OLD_FILES+=usr/share/man/man9/vfs_mount.9.gz
 # 20130614: remove CVS from base
@@ -9976,7 +9800,6 @@ OLD_FILES+=usr/share/man/man5/cvs.5.gz
 OLD_FILES+=usr/share/man/man8/cvsbug.8.gz
 # 20130607: WITH_DEBUG_FILES added
 OLD_FILES+=lib/libufs.so.6.symbols
-OLD_FILES+=usr/lib32/libufs.so.6.symbols
 # 20130417: nfs fha moved from nfsserver to nfs
 OLD_FILES+=usr/include/nfsserver/nfs_fha.h
 # 20130411: new clang import which bumps version from 3.2 to 3.3
@@ -10056,10 +9879,6 @@ OLD_FILES+=usr/lib/libncp.a
 OLD_FILES+=usr/lib/libncp.so
 OLD_LIBS+=usr/lib/libncp.so.4
 OLD_FILES+=usr/lib/libncp_p.a
-OLD_FILES+=usr/lib32/libncp.a
-OLD_FILES+=usr/lib32/libncp.so
-OLD_LIBS+=usr/lib32/libncp.so.4
-OLD_FILES+=usr/lib32/libncp_p.a
 OLD_FILES+=usr/sbin/mount_nwfs
 OLD_FILES+=usr/share/examples/nwclient/dot.nwfsrc
 OLD_FILES+=usr/share/examples/nwclient/nwfs.sh.sample
@@ -10109,7 +9928,7 @@ OLD_DIRS+=usr/share/man/en.UTF-8/cat1aout
 OLD_FILES+=usr/share/examples/cvsup/gnats-supfile
 # 20121230: libdisk removed
 OLD_FILES+=usr/share/man/man3/libdisk.3.gz usr/include/libdisk.h
-OLD_FILES+=usr/lib/libdisk.a usr/lib32/libdisk.a
+OLD_FILES+=usr/lib/libdisk.a
 # 20121230: remove wrongly created directories for auditdistd
 OLD_DIRS+=var/dist
 OLD_DIRS+=var/remote
@@ -10162,8 +9981,6 @@ OLD_FILES+=usr/share/man/man1/llvm-ld.1.gz
 # 20120712: OpenSSL 1.0.1c import
 OLD_LIBS+=lib/libcrypto.so.6
 OLD_LIBS+=usr/lib/libssl.so.6
-OLD_LIBS+=usr/lib32/libcrypto.so.6
-OLD_LIBS+=usr/lib32/libssl.so.6
 OLD_FILES+=usr/include/openssl/aes_locl.h
 OLD_FILES+=usr/include/openssl/bio_lcl.h
 OLD_FILES+=usr/include/openssl/e_os.h
@@ -10193,7 +10010,6 @@ OLD_FILES+=usr/include/clang/3.1/stdalign.h
 # 20120428: MD2 removed from libmd
 OLD_LIBS+=lib/libmd.so.5
 OLD_FILES+=usr/include/md2.h
-OLD_LIBS+=usr/lib32/libmd.so.5
 OLD_FILES+=usr/share/man/man3/MD2Data.3.gz
 OLD_FILES+=usr/share/man/man3/MD2End.3.gz
 OLD_FILES+=usr/share/man/man3/MD2File.3.gz
@@ -10204,7 +10020,6 @@ OLD_FILES+=usr/share/man/man3/MD2Update.3.gz
 OLD_FILES+=usr/share/man/man3/md2.3.gz
 # 20120425: libusb version bump (r234684)
 OLD_LIBS+=usr/lib/libusb.so.2
-OLD_LIBS+=usr/lib32/libusb.so.2
 OLD_FILES+=usr/share/man/man3/libsub_get_active_config_descriptor.3.gz
 # 20120415: new clang import which bumps version from 3.0 to 3.1
 OLD_FILES+=usr/include/clang/3.0/altivec.h
@@ -10264,16 +10079,7 @@ OLD_LIBS+=usr/lib/libasn1.so.10 \
 	usr/lib/libkadm5srv.so.10 \
 	usr/lib/libkafs5.so.10 \
 	usr/lib/libkrb5.so.10 \
-	usr/lib/libroken.so.10 \
-	usr/lib32/libasn1.so.10 \
-	usr/lib32/libhdb.so.10 \
-	usr/lib32/libheimntlm.so.10 \
-	usr/lib32/libhx509.so.10 \
-	usr/lib32/libkadm5clnt.so.10 \
-	usr/lib32/libkadm5srv.so.10 \
-	usr/lib32/libkafs5.so.10 \
-	usr/lib32/libkrb5.so.10 \
-	usr/lib32/libroken.so.10
+	usr/lib/libroken.so.10
 # 20120309: Remove fifofs header files
 OLD_FILES+=usr/include/fs/fifofs/fifo.h
 OLD_DIRS+=usr/include/fs/fifofs
@@ -10297,7 +10103,6 @@ OLD_FILES+=usr/share/man/man3/archive_read_data_into_buffer.3.gz \
 	usr/share/man/man3/archive_write_set_compression_none.3.gz \
 	usr/share/man/man3/archive_write_set_compression_program.3.gz
 OLD_LIBS+=usr/lib/libarchive.so.5
-OLD_LIBS+=usr/lib32/libarchive.so.5
 # 20120113: removal of wtmpcvt(1)
 OLD_FILES+=usr/bin/wtmpcvt
 OLD_FILES+=usr/share/man/man1/wtmpcvt.1.gz
@@ -10310,10 +10115,6 @@ OLD_FILES+=usr/lib/libodialog.a
 OLD_FILES+=usr/lib/libodialog.so
 OLD_LIBS+=usr/lib/libodialog.so.7
 OLD_FILES+=usr/lib/libodialog_p.a
-OLD_FILES+=usr/lib32/libodialog.a
-OLD_FILES+=usr/lib32/libodialog.so
-OLD_LIBS+=usr/lib32/libodialog.so.7
-OLD_FILES+=usr/lib32/libodialog_p.a
 # 20110930: sysinstall removed
 OLD_FILES+=usr/sbin/sysinstall
 OLD_FILES+=usr/share/man/man8/sysinstall.8.gz
@@ -10321,10 +10122,6 @@ OLD_FILES+=usr/lib/libftpio.a
 OLD_FILES+=usr/lib/libftpio.so
 OLD_LIBS+=usr/lib/libftpio.so.8
 OLD_FILES+=usr/lib/libftpio_p.a
-OLD_FILES+=usr/lib32/libftpio.a
-OLD_FILES+=usr/lib32/libftpio.so
-OLD_LIBS+=usr/lib32/libftpio.so.8
-OLD_FILES+=usr/lib32/libftpio_p.a
 OLD_FILES+=usr/include/ftpio.h
 OLD_FILES+=usr/share/man/man3/ftpio.3.gz
 # 20110915: rename congestion control manpages
@@ -10342,14 +10139,6 @@ OLD_LIBS+=usr/lib/libdwarf.so.2
 OLD_LIBS+=usr/lib/libopie.so.6
 OLD_LIBS+=usr/lib/librtld_db.so.1
 OLD_LIBS+=usr/lib/libtacplus.so.4
-OLD_LIBS+=usr/lib32/libcam.so.5
-OLD_LIBS+=usr/lib32/libpcap.so.7
-OLD_LIBS+=usr/lib32/libufs.so.5
-OLD_LIBS+=usr/lib32/libbsnmp.so.5
-OLD_LIBS+=usr/lib32/libdwarf.so.2
-OLD_LIBS+=usr/lib32/libopie.so.6
-OLD_LIBS+=usr/lib32/librtld_db.so.1
-OLD_LIBS+=usr/lib32/libtacplus.so.4
 # 20110817: no more acd.4, ad.4, afd.4 and ast.4
 OLD_FILES+=usr/share/man/man4/acd.4.gz
 OLD_FILES+=usr/share/man/man4/ad.4.gz
@@ -10389,13 +10178,8 @@ OLD_FILES+=usr/lib/libpkg.a
 OLD_FILES+=usr/lib/libpkg.so
 OLD_LIBS+=usr/lib/libpkg.so.0
 OLD_FILES+=usr/lib/libpkg_p.a
-OLD_FILES+=usr/lib32/libpkg.a
-OLD_FILES+=usr/lib32/libpkg.so
-OLD_LIBS+=usr/lib32/libpkg.so.0
-OLD_FILES+=usr/lib32/libpkg_p.a
 # 20110517: libsbuf version bump
 OLD_LIBS+=lib/libsbuf.so.5
-OLD_LIBS+=usr/lib32/libsbuf.so.5
 # 20110502: new clang import which bumps version from 2.9 to 3.0
 OLD_FILES+=usr/include/clang/2.9/emmintrin.h
 OLD_FILES+=usr/include/clang/2.9/mm_malloc.h
@@ -10424,10 +10208,6 @@ OLD_FILES+=usr/lib/libobjc_p.a
 OLD_FILES+=usr/libexec/cc1obj
 OLD_LIBS+=usr/lib/libobjc.so.4
 OLD_DIRS+=usr/include/objc
-OLD_FILES+=usr/lib32/libobjc.a
-OLD_FILES+=usr/lib32/libobjc.so
-OLD_FILES+=usr/lib32/libobjc_p.a
-OLD_LIBS+=usr/lib32/libobjc.so.4
 # 20110331: firmware.img created at build time
 OLD_FILES+=usr/share/examples/kld/firmware/fwimage/firmware.img
 # 20110224: sticky.8 -> sticky.7
@@ -10546,7 +10326,6 @@ OLD_FILES+=usr/include/machine/intr.h
 .endif
 # 20100514: library version bump for versioned symbols for liblzma
 OLD_LIBS+=usr/lib/liblzma.so.0
-OLD_LIBS+=usr/lib32/liblzma.so.0
 # 20100511: move GCC-specific headers to /usr/include/gcc
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/emmintrin.h
@@ -10580,7 +10359,6 @@ OLD_FILES+=usr/share/info/cpio.info.gz
 OLD_FILES+=usr/share/man/man1/gcpio.1.gz
 # 20100322: libz update
 OLD_LIBS+=lib/libz.so.5
-OLD_LIBS+=usr/lib32/libz.so.5
 # 20100314: removal of regexp.h
 OLD_FILES+=usr/include/regexp.h
 OLD_FILES+=usr/share/man/man3/regexp.3.gz
@@ -10624,7 +10402,6 @@ OLD_FILES+=usr/share/man/man5/lastlog.5.gz
 OLD_FILES+=usr/share/man/man5/utmp.5.gz
 OLD_FILES+=usr/share/man/man5/wtmp.5.gz
 OLD_LIBS+=lib/libutil.so.8
-OLD_LIBS+=usr/lib32/libutil.so.8
 # 20100105: new userland semaphore implementation
 OLD_FILES+=usr/include/sys/semaphore.h
 # 20100103: ntptrace(8) removed
@@ -10832,106 +10609,6 @@ OLD_LIBS+=usr/lib/snmp_hostres.so.5
 OLD_LIBS+=usr/lib/snmp_mibII.so.5
 OLD_LIBS+=usr/lib/snmp_netgraph.so.5
 OLD_LIBS+=usr/lib/snmp_pf.so.5
-OLD_LIBS+=usr/lib32/libalias.so.6
-OLD_LIBS+=usr/lib32/libarchive.so.4
-OLD_LIBS+=usr/lib32/libauditd.so.4
-OLD_LIBS+=usr/lib32/libavl.so.1
-OLD_LIBS+=usr/lib32/libbegemot.so.3
-OLD_LIBS+=usr/lib32/libbluetooth.so.3
-OLD_LIBS+=usr/lib32/libbsdxml.so.3
-OLD_LIBS+=usr/lib32/libbsm.so.2
-OLD_LIBS+=usr/lib32/libbsnmp.so.4
-OLD_LIBS+=usr/lib32/libbz2.so.3
-OLD_LIBS+=usr/lib32/libcalendar.so.4
-OLD_LIBS+=usr/lib32/libcam.so.4
-OLD_LIBS+=usr/lib32/libcom_err.so.4
-OLD_LIBS+=usr/lib32/libcrypt.so.4
-OLD_LIBS+=usr/lib32/libcrypto.so.5
-OLD_LIBS+=usr/lib32/libctf.so.1
-OLD_LIBS+=usr/lib32/libdevinfo.so.4
-OLD_LIBS+=usr/lib32/libdevstat.so.6
-OLD_LIBS+=usr/lib32/libdialog.so.6
-OLD_LIBS+=usr/lib32/libdtrace.so.1
-OLD_LIBS+=usr/lib32/libdwarf.so.1
-OLD_LIBS+=usr/lib32/libedit.so.6
-OLD_LIBS+=usr/lib32/libfetch.so.5
-OLD_LIBS+=usr/lib32/libform.so.4
-OLD_LIBS+=usr/lib32/libformw.so.4
-OLD_LIBS+=usr/lib32/libftpio.so.7
-OLD_LIBS+=usr/lib32/libgeom.so.4
-OLD_LIBS+=usr/lib32/libgnuregex.so.4
-OLD_LIBS+=usr/lib32/libgpib.so.2
-OLD_LIBS+=usr/lib32/libhistory.so.7
-OLD_LIBS+=usr/lib32/libipsec.so.3
-OLD_LIBS+=usr/lib32/libipx.so.4
-OLD_LIBS+=usr/lib32/libkiconv.so.3
-OLD_LIBS+=usr/lib32/libkvm.so.4
-OLD_LIBS+=usr/lib32/libmagic.so.3
-OLD_LIBS+=usr/lib32/libmd.so.4
-OLD_LIBS+=usr/lib32/libmemstat.so.2
-OLD_LIBS+=usr/lib32/libmenu.so.4
-OLD_LIBS+=usr/lib32/libmenuw.so.4
-OLD_LIBS+=usr/lib32/libmilter.so.4
-OLD_LIBS+=usr/lib32/libncp.so.3
-OLD_LIBS+=usr/lib32/libncurses.so.7
-OLD_LIBS+=usr/lib32/libncursesw.so.7
-OLD_LIBS+=usr/lib32/libnetgraph.so.3
-OLD_LIBS+=usr/lib32/libngatm.so.3
-OLD_LIBS+=usr/lib32/libnvpair.so.1
-OLD_LIBS+=usr/lib32/libobjc.so.3
-OLD_LIBS+=usr/lib32/libopie.so.5
-OLD_LIBS+=usr/lib32/libpam.so.4
-OLD_LIBS+=usr/lib32/libpanel.so.4
-OLD_LIBS+=usr/lib32/libpanelw.so.4
-OLD_LIBS+=usr/lib32/libpcap.so.6
-OLD_LIBS+=usr/lib32/libpmc.so.4
-OLD_LIBS+=usr/lib32/libproc.so.1
-OLD_LIBS+=usr/lib32/libradius.so.3
-OLD_LIBS+=usr/lib32/libreadline.so.7
-OLD_LIBS+=usr/lib32/librpcsvc.so.4
-OLD_LIBS+=usr/lib32/libsbuf.so.4
-OLD_LIBS+=usr/lib32/libsdp.so.3
-OLD_LIBS+=usr/lib32/libsmb.so.3
-OLD_LIBS+=usr/lib32/libssh.so.4
-OLD_LIBS+=usr/lib32/libssl.so.5
-OLD_LIBS+=usr/lib32/libtacplus.so.3
-OLD_LIBS+=usr/lib32/libufs.so.4
-OLD_LIBS+=usr/lib32/libugidfw.so.3
-OLD_LIBS+=usr/lib32/libumem.so.1
-OLD_LIBS+=usr/lib32/libusb.so.1
-OLD_LIBS+=usr/lib32/libusbhid.so.3
-OLD_LIBS+=usr/lib32/libutil.so.7
-OLD_LIBS+=usr/lib32/libuutil.so.1
-OLD_LIBS+=usr/lib32/libvgl.so.5
-OLD_LIBS+=usr/lib32/libwrap.so.5
-OLD_LIBS+=usr/lib32/libypclnt.so.3
-OLD_LIBS+=usr/lib32/libz.so.4
-OLD_LIBS+=usr/lib32/libzfs.so.1
-OLD_LIBS+=usr/lib32/libzpool.so.1
-OLD_LIBS+=usr/lib32/pam_chroot.so.4
-OLD_LIBS+=usr/lib32/pam_deny.so.4
-OLD_LIBS+=usr/lib32/pam_echo.so.4
-OLD_LIBS+=usr/lib32/pam_exec.so.4
-OLD_LIBS+=usr/lib32/pam_ftpusers.so.4
-OLD_LIBS+=usr/lib32/pam_group.so.4
-OLD_LIBS+=usr/lib32/pam_guest.so.4
-OLD_LIBS+=usr/lib32/pam_krb5.so.4
-OLD_LIBS+=usr/lib32/pam_ksu.so.4
-OLD_LIBS+=usr/lib32/pam_lastlog.so.4
-OLD_LIBS+=usr/lib32/pam_login_access.so.4
-OLD_LIBS+=usr/lib32/pam_nologin.so.4
-OLD_LIBS+=usr/lib32/pam_opie.so.4
-OLD_LIBS+=usr/lib32/pam_opieaccess.so.4
-OLD_LIBS+=usr/lib32/pam_passwdqc.so.4
-OLD_LIBS+=usr/lib32/pam_permit.so.4
-OLD_LIBS+=usr/lib32/pam_radius.so.4
-OLD_LIBS+=usr/lib32/pam_rhosts.so.4
-OLD_LIBS+=usr/lib32/pam_rootok.so.4
-OLD_LIBS+=usr/lib32/pam_securetty.so.4
-OLD_LIBS+=usr/lib32/pam_self.so.4
-OLD_LIBS+=usr/lib32/pam_ssh.so.4
-OLD_LIBS+=usr/lib32/pam_tacplus.so.4
-OLD_LIBS+=usr/lib32/pam_unix.so.4
 # 20090718: the gdm pam.d file is no longer required
 OLD_FILES+=etc/pam.d/gdm
 # 20090714: net_add_domain(9) renamed to domain_add(9)
@@ -11118,7 +10795,6 @@ OLD_FILES+=usr/share/man/man8/sliplogin.8.gz
 OLD_FILES+=usr/share/man/man8/slstat.8.gz
 # 20090321: libpcap upgraded to 1.0.0
 OLD_LIBS+=lib/libpcap.so.5
-OLD_LIBS+=usr/lib32/libpcap.so.5
 # 20090319: uscanner(4) has been removed
 OLD_FILES+=usr/share/man/man4/uscanner.4.gz
 # 20090313: k8temp(4) renamed to amdtemp(4)
@@ -11130,13 +10806,8 @@ OLD_FILES+=usr/lib/libusb20.so
 OLD_FILES+=usr/lib/libusb20_p.a
 OLD_FILES+=usr/include/libusb20_compat01.h
 OLD_FILES+=usr/include/libusb20_compat10.h
-OLD_LIBS+=usr/lib32/libusb20.so.1
-OLD_FILES+=usr/lib32/libusb20.a
-OLD_FILES+=usr/lib32/libusb20.so
-OLD_FILES+=usr/lib32/libusb20_p.a
 # 20090226: libmp(3) functions renamed
 OLD_LIBS+=usr/lib/libmp.so.6
-OLD_LIBS+=usr/lib32/libmp.so.6
 # 20090223: changeover of USB stacks
 OLD_FILES+=usr/include/dev/usb2/include/ufm2_ioctl.h
 OLD_FILES+=usr/include/dev/usb2/include/urio2_ioctl.h
@@ -11423,7 +11094,6 @@ OLD_LIBS+=usr/lib/libkadm5srv.so.9
 OLD_LIBS+=usr/lib/libkafs5.so.9
 OLD_LIBS+=usr/lib/libkrb5.so.9
 OLD_LIBS+=usr/lib/libroken.so.9
-OLD_LIBS+=usr/lib32/libgssapi.so.9
 # 20080420: Symbol card support dropped
 OLD_FILES+=usr/include/dev/wi/spectrum24t_cf.h
 # 20080420: awi removal
@@ -11447,8 +11117,6 @@ OLD_FILES+=usr/share/man/man2/kse_release.2.gz
 OLD_FILES+=usr/share/man/man2/kse_switchin.2.gz
 OLD_FILES+=usr/share/man/man2/kse_thr_interrupt.2.gz
 OLD_FILES+=usr/share/man/man2/kse_wakeup.2.gz
-OLD_FILES+=usr/lib32/libkse.so
-OLD_LIBS+=usr/lib32/libkse.so.3
 # 20080225: bsdar/bsdranlib rename to ar/ranlib
 OLD_FILES+=usr/bin/bsdar
 OLD_FILES+=usr/bin/bsdranlib
@@ -11473,9 +11141,6 @@ OLD_FILES+=usr/include/sys/xrpuio.h
 OLD_FILES+=usr/lib/libkse.a
 OLD_FILES+=usr/lib/libkse_p.a
 OLD_FILES+=usr/lib/libkse_pic.a
-OLD_FILES+=usr/lib32/libkse.a
-OLD_FILES+=usr/lib32/libkse_p.a
-OLD_FILES+=usr/lib32/libkse_pic.a
 # 20071129: Removed a Solaris compatibility header
 OLD_FILES+=usr/include/sys/_elf_solaris.h
 # 20071125: Renamed to pmc_get_msr()
@@ -11569,10 +11234,6 @@ OLD_DIRS+=usr/include/netatm/ipatm
 OLD_DIRS+=usr/include/netatm/uni
 OLD_DIRS+=usr/include/netatm
 OLD_DIRS+=usr/share/examples/atm
-OLD_FILES+=usr/lib32/libatm.a
-OLD_FILES+=usr/lib32/libatm.so
-OLD_LIBS+=usr/lib32/libatm.so.5
-OLD_FILES+=usr/lib32/libatm_p.a
 # 20070705: I4B headers repo-copied to include/i4b/
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/i4b_cause.h
@@ -11657,40 +11318,6 @@ OLD_LIBS+=usr/lib/snmp_hostres.so.4
 OLD_LIBS+=usr/lib/snmp_mibII.so.4
 OLD_LIBS+=usr/lib/snmp_netgraph.so.4
 OLD_LIBS+=usr/lib/snmp_pf.so.4
-OLD_LIBS+=usr/lib32/libalias.so.5
-OLD_LIBS+=usr/lib32/libbsnmp.so.3
-OLD_LIBS+=usr/lib32/libdialog.so.5
-OLD_LIBS+=usr/lib32/libgnuregex.so.3
-OLD_LIBS+=usr/lib32/libhistory.so.6
-OLD_LIBS+=usr/lib32/libncurses.so.6
-OLD_LIBS+=usr/lib32/libncursesw.so.6
-OLD_LIBS+=usr/lib32/libpam.so.3
-OLD_LIBS+=usr/lib32/libreadline.so.6
-OLD_LIBS+=usr/lib32/libssh.so.3
-OLD_LIBS+=usr/lib32/pam_chroot.so.3
-OLD_LIBS+=usr/lib32/pam_deny.so.3
-OLD_LIBS+=usr/lib32/pam_echo.so.3
-OLD_LIBS+=usr/lib32/pam_exec.so.3
-OLD_LIBS+=usr/lib32/pam_ftpusers.so.3
-OLD_LIBS+=usr/lib32/pam_group.so.3
-OLD_LIBS+=usr/lib32/pam_guest.so.3
-OLD_LIBS+=usr/lib32/pam_krb5.so.3
-OLD_LIBS+=usr/lib32/pam_ksu.so.3
-OLD_LIBS+=usr/lib32/pam_lastlog.so.3
-OLD_LIBS+=usr/lib32/pam_login_access.so.3
-OLD_LIBS+=usr/lib32/pam_nologin.so.3
-OLD_LIBS+=usr/lib32/pam_opie.so.3
-OLD_LIBS+=usr/lib32/pam_opieaccess.so.3
-OLD_LIBS+=usr/lib32/pam_passwdqc.so.3
-OLD_LIBS+=usr/lib32/pam_permit.so.3
-OLD_LIBS+=usr/lib32/pam_radius.so.3
-OLD_LIBS+=usr/lib32/pam_rhosts.so.3
-OLD_LIBS+=usr/lib32/pam_rootok.so.3
-OLD_LIBS+=usr/lib32/pam_securetty.so.3
-OLD_LIBS+=usr/lib32/pam_self.so.3
-OLD_LIBS+=usr/lib32/pam_ssh.so.3
-OLD_LIBS+=usr/lib32/pam_tacplus.so.3
-OLD_LIBS+=usr/lib32/pam_unix.so.3
 # 20070613: IPX over IP tunnel removal
 OLD_FILES+=usr/include/netipx/ipx_ip.h
 # 20070605: sched_core removal
@@ -11760,64 +11387,6 @@ OLD_LIBS+=usr/lib/libwrap.so.4
 OLD_LIBS+=usr/lib/libypclnt.so.2
 OLD_LIBS+=usr/lib/snmp_bridge.so.3
 OLD_LIBS+=usr/lib/snmp_hostres.so.3
-OLD_LIBS+=usr/lib32/libatm.so.4
-OLD_LIBS+=usr/lib32/libbegemot.so.2
-OLD_LIBS+=usr/lib32/libbluetooth.so.2
-OLD_LIBS+=usr/lib32/libbsdxml.so.2
-OLD_LIBS+=usr/lib32/libbsm.so.1
-OLD_LIBS+=usr/lib32/libbz2.so.2
-OLD_LIBS+=usr/lib32/libcalendar.so.3
-OLD_LIBS+=usr/lib32/libcam.so.3
-OLD_LIBS+=usr/lib32/libcom_err.so.3
-OLD_LIBS+=usr/lib32/libcrypt.so.3
-OLD_LIBS+=usr/lib32/libdevinfo.so.3
-OLD_LIBS+=usr/lib32/libdevstat.so.5
-OLD_LIBS+=usr/lib32/libedit.so.5
-OLD_LIBS+=usr/lib32/libfetch.so.4
-OLD_LIBS+=usr/lib32/libform.so.3
-OLD_LIBS+=usr/lib32/libformw.so.3
-OLD_LIBS+=usr/lib32/libftpio.so.6
-OLD_LIBS+=usr/lib32/libgeom.so.3
-OLD_LIBS+=usr/lib32/libgpib.so.1
-OLD_LIBS+=usr/lib32/libipsec.so.2
-OLD_LIBS+=usr/lib32/libipx.so.3
-OLD_LIBS+=usr/lib32/libkiconv.so.2
-OLD_LIBS+=usr/lib32/libkse.so.2
-OLD_LIBS+=usr/lib32/libkvm.so.3
-OLD_LIBS+=usr/lib32/libm.so.4
-OLD_LIBS+=usr/lib32/libmagic.so.2
-OLD_LIBS+=usr/lib32/libmd.so.3
-OLD_LIBS+=usr/lib32/libmemstat.so.1
-OLD_LIBS+=usr/lib32/libmenu.so.3
-OLD_LIBS+=usr/lib32/libmenuw.so.3
-OLD_LIBS+=usr/lib32/libmilter.so.3
-OLD_LIBS+=usr/lib32/libmp.so.5
-OLD_LIBS+=usr/lib32/libncp.so.2
-OLD_LIBS+=usr/lib32/libnetgraph.so.2
-OLD_LIBS+=usr/lib32/libngatm.so.2
-OLD_LIBS+=usr/lib32/libopie.so.4
-OLD_LIBS+=usr/lib32/libpanel.so.3
-OLD_LIBS+=usr/lib32/libpanelw.so.3
-OLD_LIBS+=usr/lib32/libpcap.so.4
-OLD_LIBS+=usr/lib32/libpmc.so.3
-OLD_LIBS+=usr/lib32/libpthread.so.2
-OLD_LIBS+=usr/lib32/libradius.so.2
-OLD_LIBS+=usr/lib32/librpcsvc.so.3
-OLD_LIBS+=usr/lib32/libsbuf.so.3
-OLD_LIBS+=usr/lib32/libsdp.so.2
-OLD_LIBS+=usr/lib32/libsmb.so.2
-OLD_LIBS+=usr/lib32/libstdc++.so.5
-OLD_LIBS+=usr/lib32/libtacplus.so.2
-OLD_LIBS+=usr/lib32/libthr.so.2
-OLD_LIBS+=usr/lib32/libthread_db.so.2
-OLD_LIBS+=usr/lib32/libufs.so.3
-OLD_LIBS+=usr/lib32/libugidfw.so.2
-OLD_LIBS+=usr/lib32/libusbhid.so.2
-OLD_LIBS+=usr/lib32/libutil.so.6
-OLD_LIBS+=usr/lib32/libvgl.so.4
-OLD_LIBS+=usr/lib32/libwrap.so.4
-OLD_LIBS+=usr/lib32/libypclnt.so.2
-OLD_LIBS+=usr/lib32/libz.so.3
 # 20070519: GCC 4.2
 OLD_FILES+=usr/bin/f77
 OLD_FILES+=usr/bin/protoize
@@ -12065,7 +11634,6 @@ OLD_FILES+=usr/bin/uuidgen
 OLD_FILES+=usr/share/info/bzip2.info.gz
 # 20070303: libarchive 2.0
 OLD_LIBS+=usr/lib/libarchive.so.3
-OLD_LIBS+=usr/lib32/libarchive.so.3
 # 20070301: remove addr2ascii and ascii2addr
 OLD_FILES+=usr/share/man/man3/addr2ascii.3.gz
 OLD_FILES+=usr/share/man/man3/ascii2addr.3.gz
@@ -12082,12 +11650,6 @@ OLD_FILES+=usr/lib/libmytinfo_p.a
 OLD_FILES+=usr/lib/libmytinfow.a
 OLD_FILES+=usr/lib/libmytinfow.so
 OLD_FILES+=usr/lib/libmytinfow_p.a
-OLD_FILES+=usr/lib32/libmytinfo.a
-OLD_FILES+=usr/lib32/libmytinfo.so
-OLD_FILES+=usr/lib32/libmytinfo_p.a
-OLD_FILES+=usr/lib32/libmytinfow.a
-OLD_FILES+=usr/lib32/libmytinfow.so
-OLD_FILES+=usr/lib32/libmytinfow_p.a
 # 20070128: remove vnconfig
 OLD_FILES+=usr/sbin/vnconfig
 # 20070127: remove bpf_compat.h
*** 676 LINES SKIPPED ***