Index: Makefile =================================================================== --- Makefile +++ Makefile @@ -154,6 +154,7 @@ installkernel.debug packagekernel packageworld \ reinstallkernel reinstallkernel.debug \ installworld kernel-toolchain libraries maninstall \ + list-old-files list-old-libs \ obj objlink showconfig tags toolchain \ makeman sysent \ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ Index: Makefile.inc1 =================================================================== --- Makefile.inc1 +++ Makefile.inc1 @@ -3197,6 +3197,7 @@ .if make(check-old) || make(check-old-dirs) || \ make(check-old-files) || make(check-old-libs) || \ + make(list-old-files) || make(list-old-libs) || \ make(delete-old) || make(delete-old-dirs) || \ make(delete-old-files) || make(delete-old-libs) @@ -3217,6 +3218,13 @@ RM_I=-v .endif +list-old-files: .PHONY + @cd ${.CURDIR}; \ + ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ + -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)" # Ask for every old file if the user really wants to remove it. @@ -3227,7 +3235,10 @@ @exec 3<&0; \ 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 | \ while read file; do \ if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \ @@ -3257,7 +3268,9 @@ @echo ">>> Checking for old files" @cd ${.CURDIR}; \ ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ - -V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" | xargs -n1 | \ + -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 | \ while read file; do \ if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ echo "${DESTDIR}/$${file}"; \ @@ -3278,13 +3291,24 @@ fi; \ done | sort +list-old-libs: .PHONY + @cd ${.CURDIR}; \ + ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ + -V OLD_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" @echo "${OLD_LIBS_MESSAGE}" | fmt @exec 3<&0; \ cd ${.CURDIR}; \ ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ - -V OLD_LIBS | xargs -n1 | sort | \ + -V OLD_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 | \ while read file; do \ if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \ @@ -3304,7 +3328,9 @@ @echo ">>> Checking for old libraries" @cd ${.CURDIR}; \ ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ - -V OLD_LIBS | xargs -n1 | \ + -V OLD_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 | \ while read file; do \ if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ echo "${DESTDIR}/$${file}"; \ Index: ObsoleteFiles.inc =================================================================== --- ObsoleteFiles.inc +++ ObsoleteFiles.inc @@ -495,8 +495,6 @@ # 20211027: libdialog shlib bumped to version 10 for dialog 1.3 OLD_LIBS+=usr/lib/libdialog.so.9 OLD_LIBS+=usr/lib/libdpv.so.2 -OLD_LIBS+=usr/lib32/libdialog.so.9 -OLD_LIBS+=usr/lib32/libdpv.so.2 # 20211026: retire obsolete iscsi initiator OLD_FILES+=sbin/iscontrol @@ -4465,10 +4463,6 @@ 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 @@ -4576,7 +4570,6 @@ # 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 @@ -5097,10 +5090,6 @@ OLD_FILES+=usr/lib/libprivateevent.so OLD_LIBS+=usr/lib/libprivateevent.so.1 OLD_FILES+=usr/lib/libprivateevent_p.a -OLD_FILES+=usr/lib32/libprivateevent.a -OLD_FILES+=usr/lib32/libprivateevent.so -OLD_LIBS+=usr/lib32/libprivateevent.so.1 -OLD_FILES+=usr/lib32/libprivateevent_p.a # 20200523: new clang import which bumps version from 10.0.0 to 10.0.1. OLD_FILES+=usr/lib/clang/10.0.0/include/cuda_wrappers/algorithm @@ -5360,9 +5349,6 @@ OLD_LIBS+=lib/libalias_cuseeme.so OLD_FILES+=usr/lib/libalias_cuseeme.a OLD_FILES+=usr/lib/libalias_cuseeme_p.a -OLD_FILES+=usr/lib32/libalias_cuseeme.a -OLD_LIBS+=usr/lib32/libalias_cuseeme.so -OLD_FILES+=usr/lib32/libalias_cuseeme_p.a # 20200511: Remove deprecated crypto algorithms OLD_FILES+=usr/include/crypto/cast.h @@ -5384,10 +5370,6 @@ OLD_FILES+=usr/lib/libauditd.so OLD_LIBS+=usr/lib/libauditd.so.5 OLD_FILES+=usr/lib/libauditd_p.a -OLD_FILES+=usr/lib32/libauditd.a -OLD_FILES+=usr/lib32/libauditd.so -OLD_LIBS+=usr/lib32/libauditd.so.5 -OLD_FILES+=usr/lib32/libauditd_p.a # 20200418: Remove bogus man links OLD_FILES+=usr/share/man/man3/getauusernam_R.3.gz @@ -6290,22 +6272,8 @@ 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 @@ -6346,8 +6314,6 @@ # 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 @@ -6790,7 +6756,6 @@ 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 @@ -7257,8 +7222,6 @@ # 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 @@ -7435,10 +7398,8 @@ 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 @@ -7446,8 +7407,6 @@ # 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 @@ -7469,12 +7428,6 @@ 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 @@ -7699,7 +7652,6 @@ 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 @@ -7710,7 +7662,6 @@ 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 OLD_LIBS+=usr/lib/libbe.so.1 # 20180819: Remove deprecated arc4random(3) stir/addrandom interfaces @@ -7722,7 +7673,6 @@ 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 @@ -8106,7 +8056,6 @@ 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 @@ -8294,18 +8243,6 @@ 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 @@ -8326,8 +8263,6 @@ # 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 @@ -9086,10 +9021,6 @@ 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 @@ -9217,9 +9148,6 @@ 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 @@ -9585,7 +9513,6 @@ 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. @@ -9874,31 +9801,6 @@ 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 @@ -9919,7 +9821,6 @@ 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 @@ -9942,7 +9843,6 @@ 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 @@ -10062,10 +9962,6 @@ 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 @@ -10298,8 +10194,6 @@ 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 @@ -10802,7 +10696,6 @@ 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 @@ -10945,25 +10838,11 @@ 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 @@ -11372,10 +11251,6 @@ OLD_FILES+=usr/lib/libgpib.so OLD_LIBS+=usr/lib/libgpib.so.3 OLD_FILES+=usr/lib/libgpib_p.a -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 @@ -11441,7 +11316,6 @@ 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 @@ -11453,38 +11327,10 @@ 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 @@ -11518,7 +11364,6 @@ 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 @@ -11547,14 +11392,6 @@ 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 @@ -11631,8 +11468,6 @@ # 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 @@ -11660,10 +11495,6 @@ 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 @@ -11680,10 +11511,6 @@ 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 @@ -11726,13 +11553,11 @@ 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/ OLD_LIBS+=usr/lib/libcapsicum.so.0 OLD_LIBS+=usr/lib/libcasper.so.0 @@ -11748,10 +11573,6 @@ 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 @@ -11794,10 +11615,6 @@ 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 @@ -12072,10 +11889,6 @@ 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 @@ -12092,10 +11905,8 @@ 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 @@ -12132,7 +11943,6 @@ 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. @@ -12212,10 +12022,6 @@ 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 @@ -12265,7 +12071,7 @@ 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 @@ -12318,8 +12124,6 @@ # 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 @@ -12349,7 +12153,6 @@ # 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 @@ -12360,7 +12163,6 @@ 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 @@ -12420,16 +12222,7 @@ 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 @@ -12453,7 +12246,6 @@ 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 @@ -12466,10 +12258,6 @@ 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 @@ -12477,10 +12265,6 @@ 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 @@ -12498,14 +12282,6 @@ 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 @@ -12545,13 +12321,8 @@ 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 @@ -12580,10 +12351,6 @@ 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 @@ -12702,7 +12469,6 @@ .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 @@ -12736,7 +12502,6 @@ 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 @@ -12780,7 +12545,6 @@ 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 @@ -12988,106 +12752,6 @@ 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) @@ -13274,7 +12938,6 @@ 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) @@ -13286,13 +12949,8 @@ 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 @@ -13579,7 +13237,6 @@ 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 @@ -13603,8 +13260,6 @@ 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 @@ -13629,9 +13284,6 @@ 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() @@ -13725,10 +13377,6 @@ 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 @@ -13813,40 +13461,6 @@ 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 @@ -13916,64 +13530,6 @@ 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 @@ -14221,7 +13777,6 @@ 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 @@ -14238,12 +13793,6 @@ 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 @@ -15940,32 +15489,20 @@ OLD_LIBS+=usr/lib/libkafs5.so.8 OLD_LIBS+=usr/lib/libkrb5.so.8 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_FILES+=usr/lib/libg2c.a OLD_FILES+=usr/lib/libg2c.so OLD_LIBS+=usr/lib/libg2c.so.2 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_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 -OLD_LIBS+=usr/lib32/libcrypto.so.4 -OLD_LIBS+=usr/lib32/libssl.so.4 # 20060521: gethostbyaddr(3) ABI change OLD_LIBS+=usr/lib/libroken.so.8 OLD_LIBS+=lib/libatm.so.3 OLD_LIBS+=lib/libc.so.6 OLD_LIBS+=lib/libutil.so.5 -OLD_LIBS+=usr/lib32/libatm.so.3 -OLD_LIBS+=usr/lib32/libc.so.6 -OLD_LIBS+=usr/lib32/libutil.so.5 # 20060413: shared library moved to /usr/lib OLD_LIBS+=lib/libgpib.so.1 # 20060413: libpcap.so.4 moved to /lib/ @@ -15979,10 +15516,6 @@ OLD_FILES+=usr/lib/libc_r.so OLD_LIBS+=usr/lib/libc_r.so.7 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_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 @@ -16198,8 +15731,6 @@ OLD_LIBS+=usr/lib/libarchive.so.2 OLD_LIBS+=usr/lib/libbsnmp.so.1 OLD_LIBS+=usr/lib/libc_r.so.6 -OLD_LIBS+=usr/lib32/libarchive.so.2 -OLD_LIBS+=usr/lib32/libc_r.so.6 OLD_LIBS+=usr/lib/libcipher.so.2 OLD_LIBS+=usr/lib/libgssapi.so.6 OLD_LIBS+=usr/lib/libkse.so.1 Index: tools/build/mk/OptionalObsoleteFiles.inc =================================================================== --- tools/build/mk/OptionalObsoleteFiles.inc +++ tools/build/mk/OptionalObsoleteFiles.inc @@ -109,12 +109,6 @@ OLD_FILES+=usr/lib/libngatm.so OLD_LIBS+=usr/lib/libngatm.so.4 OLD_FILES+=usr/lib/libngatm_p.a -.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" -OLD_FILES+=usr/lib32/libngatm.a -OLD_FILES+=usr/lib32/libngatm.so -OLD_LIBS+=usr/lib32/libngatm.so.4 -OLD_FILES+=usr/lib32/libngatm_p.a -.endif OLD_FILES+=usr/share/man/man1/sscop.1.gz OLD_FILES+=usr/share/man/man3/libngatm.3.gz OLD_FILES+=usr/share/man/man3/uniaddr.3.gz @@ -266,16 +260,6 @@ OLD_FILES+=usr/lib/libsdp.so OLD_LIBS+=usr/lib/libsdp.so.4 OLD_FILES+=usr/lib/libsdp_p.a -.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" -OLD_FILES+=usr/lib32/libbluetooth.a -OLD_FILES+=usr/lib32/libbluetooth.so -OLD_LIBS+=usr/lib32/libbluetooth.so.4 -OLD_FILES+=usr/lib32/libbluetooth_p.a -OLD_FILES+=usr/lib32/libsdp.a -OLD_FILES+=usr/lib32/libsdp.so -OLD_LIBS+=usr/lib32/libsdp.so.4 -OLD_FILES+=usr/lib32/libsdp_p.a -.endif OLD_FILES+=usr/sbin/ath3kfw OLD_FILES+=usr/sbin/bcmfw OLD_FILES+=usr/sbin/bluetooth-config @@ -534,10 +518,6 @@ OLD_LIBS+=usr/lib/snmp_vacm.so.6 OLD_FILES+=usr/lib/snmp_wlan.so OLD_LIBS+=usr/lib/snmp_wlan.so.6 -OLD_FILES+=usr/lib32/libbsnmp.a -OLD_FILES+=usr/lib32/libbsnmp.so -OLD_LIBS+=usr/lib32/libbsnmp.so.6 -OLD_FILES+=usr/lib32/libbsnmp_p.a OLD_FILES+=usr/sbin/bsnmpd OLD_FILES+=usr/sbin/gensnmptree OLD_FILES+=usr/share/examples/etc/snmpd.config @@ -967,33 +947,6 @@ OLD_FILES+=usr/lib/libuutil.a OLD_FILES+=usr/lib/libuutil.so OLD_FILES+=usr/lib/libuutil_p.a -.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" -OLD_FILES+=usr/lib32/dtrace/drti.o -OLD_FILES+=usr/lib32/libavl.a -OLD_FILES+=usr/lib32/libavl.so -OLD_LIBS+=usr/lib32/libavl.so.2 -OLD_FILES+=usr/lib32/libavl_p.a -OLD_FILES+=usr/lib32/libctf.a -OLD_FILES+=usr/lib32/libctf.so -OLD_LIBS+=usr/lib32/libctf.so.2 -OLD_FILES+=usr/lib32/libctf_p.a -OLD_FILES+=usr/lib32/libdtrace.a -OLD_FILES+=usr/lib32/libdtrace.so -OLD_LIBS+=usr/lib32/libdtrace.so.2 -OLD_FILES+=usr/lib32/libdtrace_p.a -OLD_FILES+=usr/lib32/libnvpair.a -OLD_FILES+=usr/lib32/libnvpair.so -OLD_LIBS+=usr/lib32/libnvpair.so.2 -OLD_FILES+=usr/lib32/libnvpair_p.a -OLD_FILES+=usr/lib32/libumem.a -OLD_FILES+=usr/lib32/libumem.so -OLD_LIBS+=usr/lib32/libumem.so.2 -OLD_FILES+=usr/lib32/libumem_p.a -OLD_FILES+=usr/lib32/libuutil.a -OLD_FILES+=usr/lib32/libuutil.so -OLD_LIBS+=usr/lib32/libuutil.so.2 -OLD_FILES+=usr/lib32/libuutil_p.a -.endif OLD_LIBS+=lib/libdtrace.so.2 OLD_FILES+=usr/libexec/dwatch/chmod OLD_FILES+=usr/libexec/dwatch/errno @@ -1154,20 +1107,6 @@ OLD_FILES+=usr/lib/libzpool.a OLD_FILES+=usr/lib/libzpool.so OLD_LIBS+=usr/lib/libzpool.so.2 -.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" -OLD_FILES+=usr/lib32/libzfs.a -OLD_FILES+=usr/lib32/libzfs.so -OLD_LIBS+=usr/lib32/libzfs.so.2 -OLD_LIBS+=usr/lib32/libzfs.so.3 -OLD_FILES+=usr/lib32/libzfs_core.a -OLD_FILES+=usr/lib32/libzfs_core.so -OLD_LIBS+=usr/lib32/libzfs_core.so.2 -OLD_FILES+=usr/lib32/libzfs_core_p.a -OLD_FILES+=usr/lib32/libzfs_p.a -OLD_FILES+=usr/lib32/libzpool.a -OLD_FILES+=usr/lib32/libzpool.so -OLD_LIBS+=usr/lib32/libzpool.so.2 -.endif OLD_FILES+=usr/sbin/zfsd OLD_FILES+=usr/sbin/zhack OLD_FILES+=usr/sbin/zdb @@ -2292,10 +2231,6 @@ OLD_FILES+=usr/lib/libgpio.so OLD_LIBS+=usr/lib/libgpio.so.0 OLD_FILES+=usr/lib/libgpio_p.a -OLD_FILES+=usr/lib32/libgpio.a -OLD_FILES+=usr/lib32/libgpio.so -OLD_LIBS+=usr/lib32/libgpio.so.0 -OLD_FILES+=usr/lib32/libgpio_p.a OLD_FILES+=usr/sbin/gpioctl OLD_FILES+=usr/share/man/man3/gpio.3.gz OLD_FILES+=usr/share/man/man3/gpio_close.3.gz @@ -2337,15 +2272,6 @@ OLD_FILES+=usr/lib/librpcsec_gss.a OLD_FILES+=usr/lib/librpcsec_gss.so OLD_LIBS+=usr/lib/librpcsec_gss.so.1 -.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" -OLD_FILES+=usr/lib32/libgssapi.a -OLD_FILES+=usr/lib32/libgssapi.so -OLD_LIBS+=usr/lib32/libgssapi.so.10 -OLD_FILES+=usr/lib32/libgssapi_p.a -OLD_FILES+=usr/lib32/librpcsec_gss.a -OLD_FILES+=usr/lib32/librpcsec_gss.so -OLD_LIBS+=usr/lib32/librpcsec_gss.so.1 -.endif OLD_FILES+=usr/sbin/gssd OLD_FILES+=usr/share/man/man3/gss_accept_sec_context.3.gz OLD_FILES+=usr/share/man/man3/gss_acquire_cred.3.gz @@ -2915,84 +2841,6 @@ OLD_FILES+=usr/lib/libprivateheimipcs.so OLD_LIBS+=usr/lib/libprivateheimipcs.so.11 OLD_FILES+=usr/lib/libprivateheimipcs_p.a -.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" -OLD_FILES+=usr/lib32/libasn1.a -OLD_FILES+=usr/lib32/libasn1.so -OLD_LIBS+=usr/lib32/libasn1.so.11 -OLD_FILES+=usr/lib32/libasn1_p.a -OLD_FILES+=usr/lib32/libgssapi_krb5.a -OLD_FILES+=usr/lib32/libgssapi_krb5.so -OLD_LIBS+=usr/lib32/libgssapi_krb5.so.10 -OLD_FILES+=usr/lib32/libgssapi_krb5_p.a -OLD_FILES+=usr/lib32/libgssapi_ntlm.a -OLD_FILES+=usr/lib32/libgssapi_ntlm.so -OLD_LIBS+=usr/lib32/libgssapi_ntlm.so.10 -OLD_FILES+=usr/lib32/libgssapi_ntlm_p.a -OLD_FILES+=usr/lib32/libgssapi_spnego.a -OLD_FILES+=usr/lib32/libgssapi_spnego.so -OLD_LIBS+=usr/lib32/libgssapi_spnego.so.10 -OLD_FILES+=usr/lib32/libgssapi_spnego_p.a -OLD_FILES+=usr/lib32/libhdb.a -OLD_FILES+=usr/lib32/libhdb.so -OLD_LIBS+=usr/lib32/libhdb.so.11 -OLD_FILES+=usr/lib32/libhdb_p.a -OLD_FILES+=usr/lib32/libheimbase.a -OLD_FILES+=usr/lib32/libheimbase.so -OLD_LIBS+=usr/lib32/libheimbase.so.11 -OLD_FILES+=usr/lib32/libheimbase_p.a -OLD_FILES+=usr/lib32/libheimntlm.a -OLD_FILES+=usr/lib32/libheimntlm.so -OLD_LIBS+=usr/lib32/libheimntlm.so.11 -OLD_FILES+=usr/lib32/libheimntlm_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 -OLD_FILES+=usr/lib32/libhx509.a -OLD_FILES+=usr/lib32/libhx509.so -OLD_LIBS+=usr/lib32/libhx509.so.11 -OLD_FILES+=usr/lib32/libhx509_p.a -OLD_FILES+=usr/lib32/libkadm5clnt.a -OLD_FILES+=usr/lib32/libkadm5clnt.so -OLD_LIBS+=usr/lib32/libkadm5clnt.so.11 -OLD_FILES+=usr/lib32/libkadm5clnt_p.a -OLD_FILES+=usr/lib32/libkadm5srv.a -OLD_FILES+=usr/lib32/libkadm5srv.so -OLD_LIBS+=usr/lib32/libkadm5srv.so.11 -OLD_FILES+=usr/lib32/libkadm5srv_p.a -OLD_FILES+=usr/lib32/libkafs5.a -OLD_FILES+=usr/lib32/libkafs5.so -OLD_LIBS+=usr/lib32/libkafs5.so.11 -OLD_FILES+=usr/lib32/libkafs5_p.a -OLD_FILES+=usr/lib32/libkdc.a -OLD_FILES+=usr/lib32/libkdc.so -OLD_LIBS+=usr/lib32/libkdc.so.11 -OLD_FILES+=usr/lib32/libkdc_p.a -OLD_FILES+=usr/lib32/libkrb5.a -OLD_FILES+=usr/lib32/libkrb5.so -OLD_LIBS+=usr/lib32/libkrb5.so.11 -OLD_FILES+=usr/lib32/libkrb5_p.a -OLD_FILES+=usr/lib32/libroken.a -OLD_FILES+=usr/lib32/libroken.so -OLD_LIBS+=usr/lib32/libroken.so.11 -OLD_FILES+=usr/lib32/libroken_p.a -OLD_FILES+=usr/lib32/libwind.a -OLD_FILES+=usr/lib32/libwind.so -OLD_LIBS+=usr/lib32/libwind.so.11 -OLD_FILES+=usr/lib32/libwind_p.a -OLD_FILES+=usr/lib32/pam_krb5.so -OLD_LIBS+=usr/lib32/pam_krb5.so.6 -OLD_FILES+=usr/lib32/pam_ksu.so -OLD_LIBS+=usr/lib32/pam_ksu.so.6 -OLD_FILES+=usr/lib32/libprivateheimipcc.a -OLD_FILES+=usr/lib32/libprivateheimipcc.so -OLD_LIBS+=usr/lib32/libprivateheimipcc.so.11 -OLD_FILES+=usr/lib32/libprivateheimipcc_p.a -OLD_FILES+=usr/lib32/libprivateheimipcs.a -OLD_FILES+=usr/lib32/libprivateheimipcs.so -OLD_LIBS+=usr/lib32/libprivateheimipcs.so.11 -OLD_FILES+=usr/lib32/libprivateheimipcs_p.a -.endif OLD_FILES+=usr/libexec/digest-service OLD_FILES+=usr/libexec/hprop OLD_FILES+=usr/libexec/hpropd @@ -3734,10 +3582,6 @@ OLD_FILES+=usr/lib/libcom_err.so OLD_LIBS+=usr/lib/libcom_err.so.5 OLD_FILES+=usr/lib/libcom_err_p.a -OLD_FILES+=usr/lib32/libcom_err.a -OLD_FILES+=usr/lib32/libcom_err.so -OLD_LIBS+=usr/lib32/libcom_err.so.5 -OLD_FILES+=usr/lib32/libcom_err_p.a OLD_FILES+=usr/share/man/man1/compile_et.1.gz OLD_FILES+=usr/share/man/man3/com_err.3.gz .endif @@ -3747,12 +3591,6 @@ OLD_FILES+=usr/lib/libprivateldns.so OLD_LIBS+=usr/lib/libprivateldns.so.5 OLD_FILES+=usr/lib/libprivateldns_p.a -.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" -OLD_FILES+=usr/lib32/libprivateldns.a -OLD_FILES+=usr/lib32/libprivateldns.so -OLD_LIBS+=usr/lib32/libprivateldns.so.5 -OLD_FILES+=usr/lib32/libprivateldns_p.a -.endif .endif .if ${MK_LDNS_UTILS} == no @@ -4200,16 +4038,6 @@ OLD_FILES+=usr/include/c++/v1/wchar.h OLD_FILES+=usr/include/c++/v1/wctype.h OLD_DIRS+=usr/include/c++/v1 -OLD_FILES+=usr/lib32/libc++.a -OLD_FILES+=usr/lib32/libc++.so -OLD_LIBS+=usr/lib32/libc++.so.1 -OLD_FILES+=usr/lib32/libc++_p.a -OLD_FILES+=usr/lib32/libc++experimental.a -OLD_FILES+=usr/lib32/libc++fs.a -OLD_FILES+=usr/lib32/libcxxrt.a -OLD_FILES+=usr/lib32/libcxxrt.so -OLD_LIBS+=usr/lib32/libcxxrt.so.1 -OLD_FILES+=usr/lib32/libcxxrt_p.a .endif .if ${MK_LLD} == no @@ -6054,10 +5882,6 @@ OLD_FILES+=usr/lib/libnetgraph.so OLD_LIBS+=usr/lib/libnetgraph.so.4 OLD_FILES+=usr/lib/libnetgraph_p.a -OLD_FILES+=usr/lib32/libnetgraph.a -OLD_FILES+=usr/lib32/libnetgraph.so -OLD_LIBS+=usr/lib32/libnetgraph.so.4 -OLD_FILES+=usr/lib32/libnetgraph_p.a OLD_FILES+=usr/libexec/pppoed OLD_FILES+=usr/sbin/flowctl OLD_FILES+=usr/sbin/lmcconfig @@ -6118,12 +5942,6 @@ OLD_FILES+=usr/lib/libypclnt.so OLD_LIBS+=usr/lib/libypclnt.so.4 OLD_FILES+=usr/lib/libypclnt_p.a -.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" -OLD_FILES+=usr/lib32/libypclnt.a -OLD_FILES+=usr/lib32/libypclnt.so -OLD_LIBS+=usr/lib32/libypclnt.so.4 -OLD_FILES+=usr/lib32/libypclnt_p.a -.endif OLD_FILES+=usr/libexec/mknetid OLD_FILES+=usr/libexec/yppwupdate OLD_FILES+=usr/libexec/ypxfr @@ -6962,44 +6780,6 @@ OLD_FILES+=usr/lib/librdmacm.a OLD_FILES+=usr/lib/librdmacm.so OLD_LIBS+=usr/lib/librdmacm.so.1 -.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" -OLD_FILES+=usr/lib32/libcxgb4.a -OLD_FILES+=usr/lib32/libcxgb4.so -OLD_LIBS+=usr/lib32/libcxgb4.so.1 -OLD_FILES+=usr/lib32/libibcm.a -OLD_FILES+=usr/lib32/libibcm.so -OLD_LIBS+=usr/lib32/libibcm.so.1 -OLD_FILES+=usr/lib32/libibmad.a -OLD_FILES+=usr/lib32/libibmad.so -OLD_LIBS+=usr/lib32/libibmad.so.5 -OLD_FILES+=usr/lib32/libibnetdisc.a -OLD_FILES+=usr/lib32/libibnetdisc.so -OLD_LIBS+=usr/lib32/libibnetdisc.so.5 -OLD_FILES+=usr/lib32/libibumad.a -OLD_FILES+=usr/lib32/libibumad.so -OLD_LIBS+=usr/lib32/libibumad.so.1 -OLD_FILES+=usr/lib32/libibverbs.a -OLD_FILES+=usr/lib32/libibverbs.so -OLD_LIBS+=usr/lib32/libibverbs.so.1 -OLD_FILES+=usr/lib32/libmlx4.a -OLD_FILES+=usr/lib32/libmlx4.so -OLD_LIBS+=usr/lib32/libmlx4.so.1 -OLD_FILES+=usr/lib32/libmlx5.a -OLD_FILES+=usr/lib32/libmlx5.so -OLD_LIBS+=usr/lib32/libmlx5.so.1 -OLD_FILES+=usr/lib32/libopensm.a -OLD_FILES+=usr/lib32/libopensm.so -OLD_LIBS+=usr/lib32/libopensm.so.5 -OLD_FILES+=usr/lib32/libosmcomp.a -OLD_FILES+=usr/lib32/libosmcomp.so -OLD_LIBS+=usr/lib32/libosmcomp.so.3 -OLD_FILES+=usr/lib32/libosmvendor.a -OLD_FILES+=usr/lib32/libosmvendor.so -OLD_LIBS+=usr/lib32/libosmvendor.so.4 -OLD_FILES+=usr/lib32/librdmacm.a -OLD_FILES+=usr/lib32/librdmacm.so -OLD_LIBS+=usr/lib32/librdmacm.so.1 -.endif OLD_FILES+=usr/share/man/man1/ibv_asyncwatch.1.gz OLD_FILES+=usr/share/man/man1/ibv_devices.1.gz OLD_FILES+=usr/share/man/man1/ibv_devinfo.1.gz @@ -7169,9 +6949,7 @@ .if ${MK_OPENMP} == no OLD_FILES+=usr/include/omp.h 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 .if ${MK_OPENSSH} == no @@ -7201,14 +6979,6 @@ OLD_FILES+=usr/lib/libprivatessh.so OLD_LIBS+=usr/lib/libprivatessh.so.5 OLD_FILES+=usr/lib/libprivatessh_p.a -.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" -OLD_FILES+=usr/lib32/pam_ssh.so -OLD_LIBS+=usr/lib32/pam_ssh.so.6 -OLD_FILES+=usr/lib32/libprivatessh.a -OLD_FILES+=usr/lib32/libprivatessh.so -OLD_LIBS+=usr/lib32/libprivatessh.so.5 -OLD_FILES+=usr/lib32/libprivatessh_p.a -.endif OLD_FILES+=usr/libexec/sftp-server OLD_FILES+=usr/libexec/ssh-keysign OLD_FILES+=usr/libexec/ssh-pkcs11-helper @@ -7357,10 +7127,6 @@ OLD_FILES+=usr/lib/libpmc.so OLD_LIBS+=usr/lib/libpmc.so.5 OLD_FILES+=usr/lib/libpmc_p.a -OLD_FILES+=usr/lib32/libpmc.a -OLD_FILES+=usr/lib32/libpmc.so -OLD_LIBS+=usr/lib32/libpmc.so.5 -OLD_FILES+=usr/lib32/libpmc_p.a OLD_FILES+=usr/sbin/pmc OLD_FILES+=usr/sbin/pmcannotate OLD_FILES+=usr/sbin/pmccontrol @@ -7636,185 +7402,6 @@ OLD_FILES+=usr/lib/libzfs_p.a OLD_FILES+=usr/lib/libzfsbootenv_p.a OLD_FILES+=usr/lib/libzutil_p.a -OLD_FILES+=usr/lib32/lib80211_p.a -OLD_FILES+=usr/lib32/lib9p_p.a -OLD_FILES+=usr/lib32/libBlocksRuntime_p.a -OLD_FILES+=usr/lib32/libalias_dummy_p.a -OLD_FILES+=usr/lib32/libalias_ftp_p.a -OLD_FILES+=usr/lib32/libalias_irc_p.a -OLD_FILES+=usr/lib32/libalias_nbt_p.a -OLD_FILES+=usr/lib32/libalias_p.a -OLD_FILES+=usr/lib32/libalias_pptp_p.a -OLD_FILES+=usr/lib32/libalias_skinny_p.a -OLD_FILES+=usr/lib32/libalias_smedia_p.a -OLD_FILES+=usr/lib32/libarchive_p.a -OLD_FILES+=usr/lib32/libasn1_p.a -OLD_FILES+=usr/lib32/libauditd_p.a -OLD_FILES+=usr/lib32/libavl_p.a -OLD_FILES+=usr/lib32/libbe_p.a -OLD_FILES+=usr/lib32/libbegemot_p.a -OLD_FILES+=usr/lib32/libblacklist_p.a -OLD_FILES+=usr/lib32/libbluetooth_p.a -OLD_FILES+=usr/lib32/libbsdxml_p.a -OLD_FILES+=usr/lib32/libbsm_p.a -OLD_FILES+=usr/lib32/libbsnmp_p.a -OLD_FILES+=usr/lib32/libbz2_p.a -OLD_FILES+=usr/lib32/libc++_p.a -OLD_FILES+=usr/lib32/libc_p.a -OLD_FILES+=usr/lib32/libcalendar_p.a -OLD_FILES+=usr/lib32/libcam_p.a -OLD_FILES+=usr/lib32/libcom_err_p.a -OLD_FILES+=usr/lib32/libcompat_p.a -OLD_FILES+=usr/lib32/libcompiler_rt_p.a -OLD_FILES+=usr/lib32/libcrypt_p.a -OLD_FILES+=usr/lib32/libcrypto_p.a -OLD_FILES+=usr/lib32/libctf_p.a -OLD_FILES+=usr/lib32/libcurses_p.a -OLD_FILES+=usr/lib32/libcursesw_p.a -OLD_FILES+=usr/lib32/libcuse_p.a -OLD_FILES+=usr/lib32/libcxxrt_p.a -OLD_FILES+=usr/lib32/libdevctl_p.a -OLD_FILES+=usr/lib32/libdevinfo_p.a -OLD_FILES+=usr/lib32/libdevstat_p.a -OLD_FILES+=usr/lib32/libdialog_p.a -OLD_FILES+=usr/lib32/libdl_p.a -OLD_FILES+=usr/lib32/libdpv_p.a -OLD_FILES+=usr/lib32/libdtrace_p.a -OLD_FILES+=usr/lib32/libdwarf_p.a -OLD_FILES+=usr/lib32/libedit_p.a -OLD_FILES+=usr/lib32/libefivar_p.a -OLD_FILES+=usr/lib32/libelf_p.a -OLD_FILES+=usr/lib32/libexecinfo_p.a -OLD_FILES+=usr/lib32/libfetch_p.a -OLD_FILES+=usr/lib32/libfigpar_p.a -OLD_FILES+=usr/lib32/libfl_p.a -OLD_FILES+=usr/lib32/libform_p.a -OLD_FILES+=usr/lib32/libformw_p.a -OLD_FILES+=usr/lib32/libgcc_eh_p.a -OLD_FILES+=usr/lib32/libgcc_p.a -OLD_FILES+=usr/lib32/libgeom_p.a -OLD_FILES+=usr/lib32/libgpio_p.a -OLD_FILES+=usr/lib32/libgssapi_krb5_p.a -OLD_FILES+=usr/lib32/libgssapi_ntlm_p.a -OLD_FILES+=usr/lib32/libgssapi_p.a -OLD_FILES+=usr/lib32/libgssapi_spnego_p.a -OLD_FILES+=usr/lib32/libhdb_p.a -OLD_FILES+=usr/lib32/libheimbase_p.a -OLD_FILES+=usr/lib32/libheimntlm_p.a -OLD_FILES+=usr/lib32/libheimsqlite_p.a -OLD_FILES+=usr/lib32/libhistory_p.a -OLD_FILES+=usr/lib32/libhx509_p.a -OLD_FILES+=usr/lib32/libicp_p.a -OLD_FILES+=usr/lib32/libicp_rescue_p.a -OLD_FILES+=usr/lib32/libipsec_p.a -OLD_FILES+=usr/lib32/libipt_p.a -OLD_FILES+=usr/lib32/libjail_p.a -OLD_FILES+=usr/lib32/libkadm5clnt_p.a -OLD_FILES+=usr/lib32/libkadm5srv_p.a -OLD_FILES+=usr/lib32/libkafs5_p.a -OLD_FILES+=usr/lib32/libkdc_p.a -OLD_FILES+=usr/lib32/libkiconv_p.a -OLD_FILES+=usr/lib32/libkrb5_p.a -OLD_FILES+=usr/lib32/libkvm_p.a -OLD_FILES+=usr/lib32/libl_p.a -OLD_FILES+=usr/lib32/libln_p.a -OLD_FILES+=usr/lib32/liblzma_p.a -OLD_FILES+=usr/lib32/libm_p.a -OLD_FILES+=usr/lib32/libmagic_p.a -OLD_FILES+=usr/lib32/libmd_p.a -OLD_FILES+=usr/lib32/libmemstat_p.a -OLD_FILES+=usr/lib32/libmenu_p.a -OLD_FILES+=usr/lib32/libmenuw_p.a -OLD_FILES+=usr/lib32/libmilter_p.a -OLD_FILES+=usr/lib32/libmp_p.a -OLD_FILES+=usr/lib32/libmt_p.a -OLD_FILES+=usr/lib32/libncurses_p.a -OLD_FILES+=usr/lib32/libncursesw_p.a -OLD_FILES+=usr/lib32/libnetgraph_p.a -OLD_FILES+=usr/lib32/libnetmap_p.a -OLD_FILES+=usr/lib32/libngatm_p.a -OLD_FILES+=usr/lib32/libnv_p.a -OLD_FILES+=usr/lib32/libnvpair_p.a -OLD_FILES+=usr/lib32/libopencsd_p.a -OLD_FILES+=usr/lib32/libopie_p.a -OLD_FILES+=usr/lib32/libpanel_p.a -OLD_FILES+=usr/lib32/libpanelw_p.a -OLD_FILES+=usr/lib32/libpathconv_p.a -OLD_FILES+=usr/lib32/libpcap_p.a -OLD_FILES+=usr/lib32/libpjdlog_p.a -OLD_FILES+=usr/lib32/libpmc_p.a -OLD_FILES+=usr/lib32/libprivateatf-c++_p.a -OLD_FILES+=usr/lib32/libprivateatf-c_p.a -OLD_FILES+=usr/lib32/libprivateauditd_p.a -OLD_FILES+=usr/lib32/libprivatebsdstat_p.a -OLD_FILES+=usr/lib32/libprivatedevdctl_p.a -OLD_FILES+=usr/lib32/libprivateevent_p.a -OLD_FILES+=usr/lib32/libprivateevent1_p.a -OLD_FILES+=usr/lib32/libprivategmock_main_p.a -OLD_FILES+=usr/lib32/libprivategmock_p.a -OLD_FILES+=usr/lib32/libprivategtest_main_p.a -OLD_FILES+=usr/lib32/libprivategtest_p.a -OLD_FILES+=usr/lib32/libprivateheimipcc_p.a -OLD_FILES+=usr/lib32/libprivateheimipcs_p.a -OLD_FILES+=usr/lib32/libprivateifconfig_p.a -OLD_FILES+=usr/lib32/libprivateldns_p.a -OLD_FILES+=usr/lib32/libprivatesqlite3_p.a -OLD_FILES+=usr/lib32/libprivatessh_p.a -OLD_FILES+=usr/lib32/libprivateucl_p.a -OLD_FILES+=usr/lib32/libprivateunbound_p.a -OLD_FILES+=usr/lib32/libprivatezstd_p.a -OLD_FILES+=usr/lib32/libproc_p.a -OLD_FILES+=usr/lib32/libprocstat_p.a -OLD_FILES+=usr/lib32/libpthread_p.a -OLD_FILES+=usr/lib32/libradius_p.a -OLD_FILES+=usr/lib32/libregex_p.a -OLD_FILES+=usr/lib32/libroken_p.a -OLD_FILES+=usr/lib32/librpcsvc_p.a -OLD_FILES+=usr/lib32/librss_p.a -OLD_FILES+=usr/lib32/librt_p.a -OLD_FILES+=usr/lib32/librtld_db_p.a -OLD_FILES+=usr/lib32/libsbuf_p.a -OLD_FILES+=usr/lib32/libsdp_p.a -OLD_FILES+=usr/lib32/libsmb_p.a -OLD_FILES+=usr/lib32/libspl_p.a -OLD_FILES+=usr/lib32/libssl_p.a -OLD_FILES+=usr/lib32/libstats_p.a -OLD_FILES+=usr/lib32/libstdbuf_p.a -OLD_FILES+=usr/lib32/libstdc++_p.a -OLD_FILES+=usr/lib32/libstdthreads_p.a -OLD_FILES+=usr/lib32/libsupc++_p.a -OLD_FILES+=usr/lib32/libsysdecode_p.a -OLD_FILES+=usr/lib32/libtacplus_p.a -OLD_FILES+=usr/lib32/libtermcap_p.a -OLD_FILES+=usr/lib32/libtermcapw_p.a -OLD_FILES+=usr/lib32/libtermlib_p.a -OLD_FILES+=usr/lib32/libtermlibw_p.a -OLD_FILES+=usr/lib32/libthr_p.a -OLD_FILES+=usr/lib32/libthread_db_p.a -OLD_FILES+=usr/lib32/libtinfo_p.a -OLD_FILES+=usr/lib32/libtinfow_p.a -OLD_FILES+=usr/lib32/libtpool_p.a -OLD_FILES+=usr/lib32/libufs_p.a -OLD_FILES+=usr/lib32/libugidfw_p.a -OLD_FILES+=usr/lib32/libulog_p.a -OLD_FILES+=usr/lib32/libumem_p.a -OLD_FILES+=usr/lib32/libusb_p.a -OLD_FILES+=usr/lib32/libusbhid_p.a -OLD_FILES+=usr/lib32/libutempter_p.a -OLD_FILES+=usr/lib32/libutil_p.a -OLD_FILES+=usr/lib32/libuutil_p.a -OLD_FILES+=usr/lib32/libvgl_p.a -OLD_FILES+=usr/lib32/libvmmapi_p.a -OLD_FILES+=usr/lib32/libwind_p.a -OLD_FILES+=usr/lib32/libwrap_p.a -OLD_FILES+=usr/lib32/libxo_p.a -OLD_FILES+=usr/lib32/liby_p.a -OLD_FILES+=usr/lib32/libypclnt_p.a -OLD_FILES+=usr/lib32/libz_p.a -OLD_FILES+=usr/lib32/libzfs_core_p.a -OLD_FILES+=usr/lib32/libzfs_p.a -OLD_FILES+=usr/lib32/libzfsbootenv_p.a -OLD_FILES+=usr/lib32/libzutil_p.a .endif .if ${MK_QUOTAS} == no @@ -7839,12 +7426,6 @@ OLD_FILES+=usr/lib/libradius_p.a OLD_FILES+=usr/lib/pam_radius.so OLD_LIBS+=usr/lib/pam_radius.so.6 -OLD_FILES+=usr/lib32/libradius.a -OLD_FILES+=usr/lib32/libradius.so -OLD_LIBS+=usr/lib32/libradius.so.4 -OLD_FILES+=usr/lib32/libradius_p.a -OLD_FILES+=usr/lib32/pam_radius.so -OLD_LIBS+=usr/lib32/pam_radius.so.6 OLD_FILES+=usr/include/radlib.h OLD_FILES+=usr/include/radlib_vs.h OLD_FILES+=usr/share/man/man3/libradius.3.gz @@ -7927,12 +7508,6 @@ OLD_FILES+=usr/lib/libmilter.so OLD_LIBS+=usr/lib/libmilter.so.5 OLD_FILES+=usr/lib/libmilter_p.a -.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" -OLD_FILES+=usr/lib32/libmilter.a -OLD_FILES+=usr/lib32/libmilter.so -OLD_LIBS+=usr/lib32/libmilter.so.5 -OLD_FILES+=usr/lib32/libmilter_p.a -.endif OLD_FILES+=usr/libexec/mail.local OLD_FILES+=usr/libexec/sendmail/sendmail OLD_FILES+=usr/libexec/smrsh @@ -8449,19 +8024,6 @@ 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_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_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_FILES+=usr/lib32/libatf-c_p.a -OLD_LIBS+=usr/lib32/libprivateatf-c.so.0 -OLD_LIBS+=usr/lib32/libprivateatf-c++.so.1 -.endif OLD_FILES+=usr/libdata/pkgconfig/atf-c++.pc OLD_FILES+=usr/libdata/pkgconfig/atf-c.pc OLD_FILES+=usr/libdata/pkgconfig/atf-sh.pc @@ -9487,17 +9049,11 @@ OLD_FILES+=usr/lib/libprivateunbound.so OLD_LIBS+=usr/lib/libprivateunbound.so.5 OLD_FILES+=usr/lib/libprivateunbound_p.a -.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" -OLD_FILES+=usr/lib32/libprivateunbound.a -OLD_FILES+=usr/lib32/libprivateunbound.so -OLD_LIBS+=usr/lib32/libprivateunbound.so.5 -OLD_FILES+=usr/lib32/libprivateunbound_p.a OLD_FILES+=usr/share/man/man5/local-unbound.conf.5.gz OLD_FILES+=usr/share/man/man8/local-unbound-anchor.8.gz OLD_FILES+=usr/share/man/man8/local-unbound-checkconf.8.gz OLD_FILES+=usr/share/man/man8/local-unbound-control.8.gz OLD_FILES+=usr/share/man/man8/local-unbound.8.gz -.endif OLD_FILES+=usr/sbin/local-unbound-setup OLD_FILES+=usr/sbin/local-unbound OLD_FILES+=usr/sbin/local-unbound-anchor @@ -9525,14 +9081,6 @@ OLD_FILES+=usr/lib/libusbhid.so OLD_LIBS+=usr/lib/libusbhid.so.4 OLD_FILES+=usr/lib/libusbhid_p.a -OLD_FILES+=usr/lib32/libusb.a -OLD_FILES+=usr/lib32/libusb.so -OLD_LIBS+=usr/lib32/libusb.so.3 -OLD_FILES+=usr/lib32/libusb_p.a -OLD_FILES+=usr/lib32/libusbhid.a -OLD_FILES+=usr/lib32/libusbhid.so -OLD_LIBS+=usr/lib32/libusbhid.so.4 -OLD_FILES+=usr/lib32/libusbhid_p.a OLD_FILES+=usr/libdata/pkgconfig/libusb-0.1.pc OLD_FILES+=usr/libdata/pkgconfig/libusb-1.0.pc OLD_FILES+=usr/libdata/pkgconfig/libusb-2.0.pc