diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index f54e13ea3d2d..749b6dfd7ca0 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -1,17980 +1,17983 @@
 #
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS, MOVED_LIBS)
 # and directories (OLD_DIRS) which should get removed after an update.
 # Recently removed entries should be listed first (with the date as a
 # comment). OLD_LIBS and MOVED_LIBS should only list dynamic libraries.
 # Static libraries, links to dynamic libraries (lib*.so), and linker scripts
 # should be listed in OLD_FILES. OLD_LIBS and MOVED_LIBS are removed by the
 # delete-old-libs target, whereas OLD_FILES and OLD_DIRS are removed by the
 # delete-old target. This separation allows users to avoid deleting old
 # dynamic libraries still required by existing binaries.
 #
 # MOVED_LIBS should be used instead of OLD_LIBS when a library is moved
 # from usr/lib to lib or vice versa.  This avoids removing libraries for
 # alternate ABIs (such as lib32) which store all libraries in a single
 # directory (e.g. usr/lib32).
 #
 # For files listed in OLD_FILES, OLD_LIBS, and MOVED_LIBS, the check-old*
 # and delete-old* targets will also delete associated debug symbols from
 # usr/lib/debug.
 #
 # In case of a complete directory hierarchy the sorting is in depth first
 # order.
 #
 # Files that are installed or removed depending on some build option
 # should be listed in /usr/src/tools/build/mk/OptionalObsoleteFiles.inc
 # instead of in this file.
 #
 # Before you commit changes to this file please check if any entries in
 # tools/build/mk/OptionalObsoleteFiles.inc can be removed. The following
 # command tells which files are listed more than once regardless of some
 # architecture specific conditionals, so you can not blindly trust the
 # output:
 # ( grep '+=' /usr/src/ObsoleteFiles.inc | sort -u ; \
 # grep '+=' /usr/src/tools/build/mk/OptionalObsoleteFiles.inc | sort -u) | \
 # sort | uniq -d
 #
 # To find regular duplicates not dependent on optional components, you can
 # also use something that will not give you false positives, e.g.:
 # for t in `make -V TARGETS universe`; do
 #   __MAKE_CONF=/dev/null make -f Makefile.inc1 TARGET=$t \
 #   -V OLD_FILES -V OLD_LIBS -V MOVED_LIBS -V OLD_DIRS check-old | \
 #   xargs -n1 | sort | uniq -d;
 # done
 #
 # For optional components, you can use the following to see if some entries
 # in OptionalObsoleteFiles.inc have been obsoleted by ObsoleteFiles.inc
 # for o in tools/build/options/WITH*; do
 #   __MAKE_CONF=/dev/null make -f Makefile.inc1 -D${o##*/} \
 #   -V OLD_FILES -V OLD_LIBS -V MOVED_LIBS -V OLD_DIRS check-old | \
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20231018: pmc.k7(3) removed
+OLD_FILES+=usr/share/man/man3/pmc.k7.3.gz
+
 # 20231018: Remove misspelled man page link
 OLD_FILES+=usr/share/man/man3/dbm_dirnfo.3.gz
 
 # 20231006: rename tcp6_v4unmapped_bind_test
 OLD_FILES+=usr/tests/sys/netinet/tcp6_v4unmapped_bind_test
 
 # 20231005: Remove man page link for now gone net80211 function.
 OLD_FILES+=usr/share/man/man9/ieee80211_unref_node.9.gz
 
 # 20231005: bsdconfig remove support for floppy and ftp
 OLD_FILES+=usr/share/bsdconfig/media/floppy.subr
 OLD_FILES+=usr/share/bsdconfig/media/ftp.subr
 
 # 20230927: Man pages renamed to match the actual functions
 OLD_FILES+=usr/share/man/man9/cr_seeothergids.9.gz
 OLD_FILES+=usr/share/man/man9/cr_seeotheruids.9.gz
 
 # 20230925
 OLD_FILES+=usr/share/examples/diskless/ME
 OLD_FILES+=usr/share/examples/diskless/README.BOOTP
 OLD_FILES+=usr/share/examples/diskless/README.TEMPLATING
 OLD_FILES+=usr/share/examples/diskless/clone_root
 
 # 20230905
 OLD_FILES+=usr/share/doc/legal/realtek_rtw88_firmware.LICENCE
 
 # 20230828
 MOVED_LIBS+=usr/lib/librt.so.1
 
 # 20230826:
 OLD_FILES+=usr/share/man/man9/knlist_remove_inevent.9.gz
 
 # 20230825: caroot bundle updated
 OLD_FILES+=usr/share/certs/trusted/E-Tugra_Certification_Authority.pem
 OLD_FILES+=usr/share/certs/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem
 OLD_FILES+=usr/share/certs/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem
 OLD_FILES+=usr/share/certs/trusted/Hongkong_Post_Root_CA_1.pem
 
 # 20230807: GoogleTest 1.14.0 upgrade.
 OLD_FILES+=usr/include/private/gmock/gmock-generated-actions.h
 OLD_FILES+=usr/include/private/gmock/gmock-generated-function-mockers.h
 OLD_FILES+=usr/include/private/gmock/gmock-generated-matchers.h
 OLD_FILES+=usr/include/private/gmock/gmock-generated-nice-strict.h
 OLD_FILES+=usr/include/private/gmock/internal/gmock-generated-internal-utils.h
 OLD_FILES+=usr/include/private/gtest/internal/gtest-linked_ptr.h
 OLD_FILES+=usr/include/private/gtest/internal/gtest-param-util-generated.h
 OLD_FILES+=usr/include/private/gtest/internal/gtest-tuple.h
 OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-generated-actions_test
 OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-generated-function-mockers_test
 OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-generated-internal-utils_test
 OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-generated-matchers_test
 OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-matchers_test
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-linked-ptr-test
 
 # 20230807: Removal of the ath(4) AHB bus-frontend for MIPS
 OLD_FILES+=usr/share/man/man4/ath_ahb.4
 OLD_FILES+=usr/share/man/man4/ath_pci.4
 OLD_FILES+=usr/share/man/man4/if_ath_pci.4
 
 # 20230803: Removal of support for cloning pseudo interfaces from iflib(9)
 OLD_FILES+=usr/include/net/iflib_private.h
 
 # 20230802: Remove a copy of libdtrace.so installed to the wrong path
 MOVED_LIBS+=usr/lib/libdtrace.so.2
 
 # 20230726: Removal of support for the VTOC8 partitioning scheme
 OLD_FILES+=usr/include/sys/disk/vtoc.h
 OLD_FILES+=usr/include/sys/vtoc.h
 
 # 20230724: Remove unneeded arm headers
 .if ${TARGET_ARCH} == "arm"
 OLD_FILES+=usr/include/machine/atomic-v6.h
 OLD_FILES+=usr/include/machine/cpu-v6.h
 OLD_FILES+=usr/include/machine/pmap-v6.h
 OLD_FILES+=usr/include/machine/pte-v6.h
 OLD_FILES+=usr/include/machine/swi.h
 .endif
 
 # 20230714: gsignal
 OLD_FILES+=usr/share/man/man9/gsignal.9.gz
 
 # 20230626: Only install sys/dev/nvme/nvme.h to /usr/include
 OLD_FILES+=usr/include/dev/nvme/nvme_private.h
 
 # 20230623: OpenSSL 3.0.9
 OLD_LIBS+=lib/libcrypto.so.111
 OLD_FILES+=usr/include/openssl/rand_drbg.h
 OLD_LIBS+=usr/lib/engines/capi.so
 OLD_LIBS+=usr/lib/engines/padlock.so
 OLD_LIBS+=usr/lib/libssl.so.111
 OLD_DIRS+=usr/lib/engines
 .for libcompat in ${_ALL_libcompats}
 OLD_DIRS+=usr/lib${libcompat}/engines
 .endfor
 OLD_FILES+=usr/share/man/man1/list.1
 OLD_FILES+=usr/share/man/man1/openssl-tsget.1
 OLD_FILES+=usr/share/man/man3/ECDH_get_ex_data.3
 OLD_FILES+=usr/share/man/man3/ECDH_get_ex_new_index.3
 OLD_FILES+=usr/share/man/man3/ECDH_set_ex_data.3
 OLD_FILES+=usr/share/man/man3/ERR_GET_FUNC.3
 OLD_FILES+=usr/share/man/man3/EVP_PKEY_CTX_hkdf_mode.3
 OLD_FILES+=usr/share/man/man3/EVP_PKEY_set_alias_type.3
 OLD_FILES+=usr/share/man/man3/EVP_aes.3
 OLD_FILES+=usr/share/man/man3/EVP_aria.3
 OLD_FILES+=usr/share/man/man3/EVP_camellia.3
 OLD_FILES+=usr/share/man/man3/EVP_des.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_bytes.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_cleanup_entropy_fn.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_cleanup_nonce_fn.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_free.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_generate.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_get0_master.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_get0_private.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_get0_public.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_get_entropy_fn.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_get_ex_data.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_get_ex_new_index.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_get_nonce_fn.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_instantiate.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_new.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_reseed.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_secure_new.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_set.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_set_callbacks.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_set_defaults.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_set_ex_data.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_set_reseed_defaults.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_set_reseed_interval.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_set_reseed_time_interval.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_uninstantiate.3
 OLD_FILES+=usr/share/man/man3/RSA_padding_add_SSLv23.3
 OLD_FILES+=usr/share/man/man3/RSA_padding_check_SSLv23.3
 OLD_FILES+=usr/share/man/man7/RAND_DRBG.7
 OLD_FILES+=usr/share/man/man7/scrypt.7
 
 # 20230622: new clang import which bumps version from 15.0.7 to 16.0.1
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_texture_intrinsics.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_hip_cmath.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/altivec.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm_neon_sve_bridge.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/armintr.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512fp16intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlfp16intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avxvnniintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/builtins.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/cet.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/cpuid.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/crc32intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/15.0.7/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/15.0.7/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/15.0.7/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/15.0.7/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/float.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/15.0.7/include/fuzzer
 OLD_FILES+=usr/lib/clang/15.0.7/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/hexagon_circ_brev_intrinsics.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/hexagon_protos.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/hexagon_types.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/hlsl/hlsl_basic_types.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/hlsl/hlsl_intrinsics.h
 OLD_DIRS+=usr/lib/clang/15.0.7/include/hlsl
 OLD_FILES+=usr/lib/clang/15.0.7/include/hlsl.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/hresetintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/hvx_hexagon_protos.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/immintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/inttypes.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/iso646.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/keylockerintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/limits.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/module.modulemap
 OLD_FILES+=usr/lib/clang/15.0.7/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/msa.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/omp-tools.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/omp.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ompt.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/complex_cmath.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/15.0.7/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/15.0.7/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/bmiintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/immintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/x86intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/15.0.7/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/15.0.7/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/profile/InstrProfData.inc
 OLD_FILES+=usr/lib/clang/15.0.7/include/profile/MemProfData.inc
 OLD_DIRS+=usr/lib/clang/15.0.7/include/profile
 OLD_FILES+=usr/lib/clang/15.0.7/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/rdpruintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/riscv_vector.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/memprof_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/15.0.7/include/sanitizer
 OLD_FILES+=usr/lib/clang/15.0.7/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/stdalign.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/stdarg.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/stdatomic.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/stdbool.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/stddef.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/stdint.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/stdnoreturn.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/tgmath.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/uintrintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/unwind.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/vadefs.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/varargs.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/velintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/velintrin_approx.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/velintrin_gen.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/15.0.7/include/xray
 OLD_FILES+=usr/lib/clang/15.0.7/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/15.0.7/include
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-powerpc64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-powerpc64.so
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-powerpc64le.so
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-powerpc64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-riscv64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-riscv64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-riscv64.so
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-powerpc64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-riscv64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_static-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_static-powerpc64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_static-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_static-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan-powerpc64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan_cxx-powerpc64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan_cxx-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-riscv64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-powerpc64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-riscv64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-powerpc64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-riscv64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan-powerpc64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan_cxx-powerpc64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan_cxx-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-powerpc64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-riscv64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-powerpc64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-riscv64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-powerpc64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-riscv64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-basic-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-fdr-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-profiling-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/15.0.7/lib/freebsd
 OLD_DIRS+=usr/lib/clang/15.0.7/lib
 OLD_FILES+=usr/lib/clang/15.0.7/share/asan_ignorelist.txt
 OLD_FILES+=usr/lib/clang/15.0.7/share/cfi_ignorelist.txt
 OLD_FILES+=usr/lib/clang/15.0.7/share/msan_ignorelist.txt
 OLD_DIRS+=usr/lib/clang/15.0.7/share
 OLD_DIRS+=usr/lib/clang/15.0.7
 
 # 20230622: new libc++ import which bumps version from 15.0.7 to 16.0.1
 OLD_FILES+=usr/include/c++/v1/__bits
 OLD_FILES+=usr/include/c++/v1/__tuple
 OLD_FILES+=usr/include/c++/v1/__utility/transaction.h
 
 # 20230614: caroot bundle updated
 OLD_FILES+=usr/share/certs/trusted/Cybertrust_Global_Root.pem
 OLD_FILES+=usr/share/certs/trusted/DST_Root_CA_X3.pem
 OLD_FILES+=usr/share/certs/trusted/GlobalSign_Root_CA_-_R2.pem
 OLD_FILES+=usr/share/certs/trusted/Hellenic_Academic_and_Research_Institutions_RootCA_2011.pem
 OLD_FILES+=usr/share/certs/trusted/Network_Solutions_Certificate_Authority.pem
 OLD_FILES+=usr/share/certs/trusted/Staat_der_Nederlanden_EV_Root_CA.pem
 OLD_FILES+=usr/share/certs/trusted/TrustCor_ECA-1.pem
 OLD_FILES+=usr/share/certs/trusted/TrustCor_RootCert_CA-1.pem
 OLD_FILES+=usr/share/certs/trusted/TrustCor_RootCert_CA-2.pem
 
 # 20230505: md5 tests are now self-contained
 OLD_FILES+=usr/tests/sbin/md5/1.inp
 OLD_FILES+=usr/tests/sbin/md5/1.sha512-p.chk
 OLD_FILES+=usr/tests/sbin/md5/1.sha512sum-p.chk
 OLD_FILES+=usr/tests/sbin/md5/2.inp
 OLD_FILES+=usr/tests/sbin/md5/2.sha512-p.chk
 OLD_FILES+=usr/tests/sbin/md5/2.sha512sum-p.chk
 OLD_FILES+=usr/tests/sbin/md5/3.inp
 OLD_FILES+=usr/tests/sbin/md5/3.sha512-p.chk
 OLD_FILES+=usr/tests/sbin/md5/3.sha512sum-p.chk
 OLD_FILES+=usr/tests/sbin/md5/4.inp
 OLD_FILES+=usr/tests/sbin/md5/4.sha512-p.chk
 OLD_FILES+=usr/tests/sbin/md5/4.sha512sum-p.chk
 OLD_FILES+=usr/tests/sbin/md5/5.inp
 OLD_FILES+=usr/tests/sbin/md5/5.sha512-p.chk
 OLD_FILES+=usr/tests/sbin/md5/5.sha512sum-p.chk
 OLD_FILES+=usr/tests/sbin/md5/6.inp
 OLD_FILES+=usr/tests/sbin/md5/6.sha512-p.chk
 OLD_FILES+=usr/tests/sbin/md5/6.sha512sum-p.chk
 OLD_FILES+=usr/tests/sbin/md5/7.inp
 OLD_FILES+=usr/tests/sbin/md5/7.sha512-p.chk
 OLD_FILES+=usr/tests/sbin/md5/7.sha512sum-p.chk
 OLD_FILES+=usr/tests/sbin/md5/8.inp
 OLD_FILES+=usr/tests/sbin/md5/8.sha512-p.chk
 OLD_FILES+=usr/tests/sbin/md5/8.sha512sum-p.chk
 OLD_FILES+=usr/tests/sbin/md5/algorithms.txt
 OLD_FILES+=usr/tests/sbin/md5/bsd-c-test
 OLD_FILES+=usr/tests/sbin/md5/bsd-p-test
 OLD_FILES+=usr/tests/sbin/md5/bsd-s-test
 OLD_FILES+=usr/tests/sbin/md5/coreutils-c-test
 OLD_FILES+=usr/tests/sbin/md5/md5.digest
 OLD_FILES+=usr/tests/sbin/md5/md5sum.digest
 OLD_FILES+=usr/tests/sbin/md5/rmd160.digest
 OLD_FILES+=usr/tests/sbin/md5/rmd160sum.digest
 OLD_FILES+=usr/tests/sbin/md5/self-test
 OLD_FILES+=usr/tests/sbin/md5/self-test.md5.chk
 OLD_FILES+=usr/tests/sbin/md5/self-test.rmd160.chk
 OLD_FILES+=usr/tests/sbin/md5/self-test.sh_inp
 OLD_FILES+=usr/tests/sbin/md5/self-test.sha1.chk
 OLD_FILES+=usr/tests/sbin/md5/self-test.sha224.chk
 OLD_FILES+=usr/tests/sbin/md5/self-test.sha256.chk
 OLD_FILES+=usr/tests/sbin/md5/self-test.sha384.chk
 OLD_FILES+=usr/tests/sbin/md5/self-test.sha512.chk
 OLD_FILES+=usr/tests/sbin/md5/self-test.sha512t224.chk
 OLD_FILES+=usr/tests/sbin/md5/self-test.sha512t256.chk
 OLD_FILES+=usr/tests/sbin/md5/self-test.skein1024.chk
 OLD_FILES+=usr/tests/sbin/md5/self-test.skein256.chk
 OLD_FILES+=usr/tests/sbin/md5/self-test.skein512.chk
 OLD_FILES+=usr/tests/sbin/md5/sha1.digest
 OLD_FILES+=usr/tests/sbin/md5/sha1sum.digest
 OLD_FILES+=usr/tests/sbin/md5/sha224.digest
 OLD_FILES+=usr/tests/sbin/md5/sha224sum.digest
 OLD_FILES+=usr/tests/sbin/md5/sha256.digest
 OLD_FILES+=usr/tests/sbin/md5/sha256sum.digest
 OLD_FILES+=usr/tests/sbin/md5/sha384.digest
 OLD_FILES+=usr/tests/sbin/md5/sha384sum.digest
 OLD_FILES+=usr/tests/sbin/md5/sha512.digest
 OLD_FILES+=usr/tests/sbin/md5/sha512sum.digest
 OLD_FILES+=usr/tests/sbin/md5/sha512t224.digest
 OLD_FILES+=usr/tests/sbin/md5/sha512t224sum.digest
 OLD_FILES+=usr/tests/sbin/md5/sha512t256.digest
 OLD_FILES+=usr/tests/sbin/md5/sha512t256sum.digest
 OLD_FILES+=usr/tests/sbin/md5/skein1024.digest
 OLD_FILES+=usr/tests/sbin/md5/skein1024sum.digest
 OLD_FILES+=usr/tests/sbin/md5/skein256.digest
 OLD_FILES+=usr/tests/sbin/md5/skein256sum.digest
 OLD_FILES+=usr/tests/sbin/md5/skein512.digest
 OLD_FILES+=usr/tests/sbin/md5/skein512sum.digest
 OLD_FILES+=usr/tests/sbin/md5/sum_a.in
 OLD_FILES+=usr/tests/sbin/md5/sum_b.in
 OLD_FILES+=usr/tests/sbin/md5/sum_c.in
 OLD_FILES+=usr/tests/sbin/md5/sum_sums.digest
 
 # 20230420: portsnap.8 removed
 OLD_FILES+=etc/portsnap.conf
 OLD_FILES+=usr/libexec/make_index
 OLD_FILES+=usr/sbin/portsnap
 OLD_FILES+=usr/share/examples/etc/portsnap.conf
 OLD_FILES+=usr/share/man/man8/portsnap.8.gz
 
 # 20230331: libpcap updated to 1.10.3
 OLD_FILES+=usr/include/fmtutils.h
 
 # 20230329: libcasper libraries moved to /lib
 MOVED_LIBS+=lib/casper/libcap_dns.so.2
 MOVED_LIBS+=lib/casper/libcap_fileargs.so.1
 MOVED_LIBS+=lib/casper/libcap_grp.so.1
 MOVED_LIBS+=lib/casper/libcap_net.so.1
 MOVED_LIBS+=lib/casper/libcap_netdb.so.1
 MOVED_LIBS+=lib/casper/libcap_pwd.so.1
 MOVED_LIBS+=lib/casper/libcap_sysctl.so.1
 MOVED_LIBS+=lib/casper/libcap_sysctl.so.2
 MOVED_LIBS+=lib/casper/libcap_syslog.so.1
 OLD_DIRS+=lib/casper
 
 # 20230324: libvmmapi shlib version bumped to 6
 OLD_LIBS+=usr/lib/libvmmapi.so.5
 
 # 20230323: tzdata 2023a imported
 OLD_FILES+=usr/share/zoneinfo/posixrules
 
 # 20230320: vcount.9 removed
 OLD_FILES+=usr/share/man/man9/count_dev.9.gz
 OLD_FILES+=usr/share/man/man9/vcount.9.gz
 
 # 20230320: case-sensitive conflicts removed
 OLD_FILES+=usr/tests/bin/pkill/pgrep-F_test
 OLD_FILES+=usr/tests/bin/pkill/pgrep-LF_test
 OLD_FILES+=usr/tests/bin/pkill/pgrep-P_test
 OLD_FILES+=usr/tests/bin/pkill/pgrep-U_test
 OLD_FILES+=usr/tests/bin/pkill/pkill-F_test
 OLD_FILES+=usr/tests/bin/pkill/pkill-LF_test
 OLD_FILES+=usr/tests/bin/pkill/pkill-P_test
 OLD_FILES+=usr/tests/bin/pkill/pkill-U_test
 
 # 20230309: remove remaining ATM support
 OLD_FILES+=usr/bin/sscop
 OLD_FILES+=usr/include/netgraph/atm/ng_ccatm.h
 OLD_FILES+=usr/include/netgraph/atm/ng_sscfu.h
 OLD_FILES+=usr/include/netgraph/atm/ng_sscop.h
 OLD_FILES+=usr/include/netgraph/atm/ng_uni.h
 OLD_FILES+=usr/include/netgraph/atm/ngatmbase.h
 OLD_FILES+=usr/include/netgraph/ng_atmllc.h
 OLD_FILES+=usr/include/netnatm/addr.h
 OLD_FILES+=usr/include/netnatm/api/atmapi.h
 OLD_FILES+=usr/include/netnatm/api/ccatm.h
 OLD_FILES+=usr/include/netnatm/api/unisap.h
 OLD_DIRS+=usr/include/netnatm/api
 OLD_FILES+=usr/include/netnatm/msg/uni_config.h
 OLD_FILES+=usr/include/netnatm/msg/uni_hdr.h
 OLD_FILES+=usr/include/netnatm/msg/uni_ie.h
 OLD_FILES+=usr/include/netnatm/msg/uni_msg.h
 OLD_FILES+=usr/include/netnatm/msg/unimsglib.h
 OLD_FILES+=usr/include/netnatm/msg/uniprint.h
 OLD_FILES+=usr/include/netnatm/msg/unistruct.h
 OLD_DIRS+=usr/include/netnatm/msg
 OLD_FILES+=usr/include/netnatm/saal/sscfu.h
 OLD_FILES+=usr/include/netnatm/saal/sscfudef.h
 OLD_FILES+=usr/include/netnatm/saal/sscop.h
 OLD_FILES+=usr/include/netnatm/saal/sscopdef.h
 OLD_DIRS+=usr/include/netnatm/saal
 OLD_FILES+=usr/include/netnatm/sig/uni.h
 OLD_FILES+=usr/include/netnatm/sig/unidef.h
 OLD_FILES+=usr/include/netnatm/sig/unisig.h
 OLD_DIRS+=usr/include/netnatm/sig
 OLD_FILES+=usr/include/netnatm/unimsg.h
 OLD_DIRS+=usr/include/netnatm
 OLD_FILES+=usr/lib/libngatm.a
 OLD_FILES+=usr/lib/libngatm.so
 OLD_LIBS+=usr/lib/libngatm.so.4
 OLD_FILES+=usr/lib/libngatm_p.a
 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
 OLD_FILES+=usr/share/man/man3/unifunc.3.gz
 OLD_FILES+=usr/share/man/man3/unimsg.3.gz
 OLD_FILES+=usr/share/man/man3/unisap.3.gz
 OLD_FILES+=usr/share/man/man3/unistruct.3.gz
 OLD_FILES+=usr/share/man/man4/ng_atmllc.4.gz
 OLD_FILES+=usr/share/man/man4/ng_ccatm.4.gz
 OLD_FILES+=usr/share/man/man4/ng_sscfu.4.gz
 OLD_FILES+=usr/share/man/man4/ng_sscop.4.gz
 OLD_FILES+=usr/share/man/man4/ng_uni.4.gz
 OLD_FILES+=usr/share/man/man4/ngatmbase.4.gz
 
 # 20230308: machine-id merged into hostid_save
 OLD_FILES+=etc/rc.d/machine-id
 
 # 20230306: remove tzsetwall(3)
 OLD_FILES+=usr/share/man/man3/tzsetwall.3.gz
 
 # 20230208: new clang import which bumps version from 14.0.5 to 15.0.7
 OLD_FILES+=usr/lib/clang/14.0.5/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/14.0.5/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/14.0.5/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/14.0.5/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/14.0.5/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/14.0.5/include/fuzzer
 OLD_FILES+=usr/lib/clang/14.0.5/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/14.0.5/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/14.0.5/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/openmp_wrappers/complex_cmath.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/14.0.5/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/14.0.5/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/14.0.5/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/14.0.5/include/profile/InstrProfData.inc
 OLD_FILES+=usr/lib/clang/14.0.5/include/profile/MemProfData.inc
 OLD_DIRS+=usr/lib/clang/14.0.5/include/profile
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/memprof_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/14.0.5/include/sanitizer
 OLD_FILES+=usr/lib/clang/14.0.5/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/14.0.5/include/xray
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_texture_intrinsics.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_hip_cmath.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/altivec.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm_neon_sve_bridge.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/armintr.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512fp16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlfp16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avxvnniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/builtins.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/cet.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/cpuid.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/crc32intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/float.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/hexagon_circ_brev_intrinsics.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/hexagon_protos.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/hexagon_types.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/hresetintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/hvx_hexagon_protos.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/immintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/inttypes.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/iso646.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/keylockerintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/limits.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/module.modulemap
 OLD_FILES+=usr/lib/clang/14.0.5/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/msa.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/omp-tools.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/omp.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ompt.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/riscv_vector.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/stdalign.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/stdarg.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/stdatomic.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/stdbool.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/stddef.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/stdint.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/stdnoreturn.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/tgmath.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/uintrintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/unwind.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/vadefs.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/varargs.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/14.0.5/include
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-powerpc64.so
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-powerpc64le.so
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-riscv64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-riscv64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-riscv64.so
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-riscv64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_static-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_static-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_static-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_static-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.msan-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.msan-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.msan_cxx-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.msan_cxx-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-riscv64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-riscv64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-riscv64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan_cxx-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan_cxx-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-riscv64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-riscv64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-riscv64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-basic-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-fdr-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-profiling-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/14.0.5/lib/freebsd
 OLD_DIRS+=usr/lib/clang/14.0.5/lib
 OLD_FILES+=usr/lib/clang/14.0.5/share/asan_ignorelist.txt
 OLD_FILES+=usr/lib/clang/14.0.5/share/cfi_ignorelist.txt
 OLD_FILES+=usr/lib/clang/14.0.5/share/msan_ignorelist.txt
 OLD_DIRS+=usr/lib/clang/14.0.5/share
 OLD_DIRS+=usr/lib/clang/14.0.5
 
 # 20230208: new libc++ import which bumps version from 14.0.5 to 15.0.7
 OLD_FILES+=usr/include/c++/v1/__functional_base
 OLD_FILES+=usr/include/c++/v1/__libcpp_version
 OLD_FILES+=usr/include/c++/v1/__nullptr
 OLD_FILES+=usr/include/c++/v1/__string
 OLD_FILES+=usr/include/c++/v1/experimental/filesystem
 
 # 20230203: loader help files renamed
 OLD_FILES+=boot/loader.help
 
 # 20230201: timeout moved from /usr/bin to /bin
 OLD_FILES+=usr/tests/usr.bin/timeout/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/timeout/timeout_test
 
 # 20230124: rtalloc.9 removed
 OLD_FILES+=usr/share/man/man9/rtalloc.9.gz
 OLD_FILES+=usr/share/man/man9/rtalloc_fib.9.gz
 OLD_FILES+=usr/share/man/man9/rtalloc_ign.9.gz
 OLD_FILES+=usr/share/man/man9/rtalloc_ign_fib.9.gz
 OLD_FILES+=usr/share/man/man9/rtalloc1.9.gz
 OLD_FILES+=usr/share/man/man9/rtalloc1_fib.9.gz
 OLD_FILES+=usr/share/man/man9/rtfree.9.gz
 OLD_FILES+=usr/share/man/man9/RT_ADDREF.9.gz
 OLD_FILES+=usr/share/man/man9/RT_LOCK.9.gz
 OLD_FILES+=usr/share/man/man9/RT_REMREF.9.gz
 OLD_FILES+=usr/share/man/man9/RT_RTFREE.9.gz
 OLD_FILES+=usr/share/man/man9/RT_UNLOCK.9.gz
 OLD_FILES+=usr/share/man/man9/RTFREE.9.gz
 OLD_FILES+=usr/share/man/man9/RTFREE_LOCKED.9.gz
 
 # 20230123: PCBGROUP.9 removed
 OLD_FILES+=usr/share/man/man9/PCBGROUP.9.gz
 OLD_FILES+=usr/share/man/man9/in_pcbgroup_byhash.9.gz
 OLD_FILES+=usr/share/man/man9/in_pcbgroup_byinpcb.9.gz
 OLD_FILES+=usr/share/man/man9/in_pcbgroup_destroy.9.gz
 OLD_FILES+=usr/share/man/man9/in_pcbgroup_enabled.9.gz
 OLD_FILES+=usr/share/man/man9/in_pcbgroup_init.9.gz
 OLD_FILES+=usr/share/man/man9/in_pcbgroup_remove.9.gz
 OLD_FILES+=usr/share/man/man9/in_pcbgroup_update.9.gz
 OLD_FILES+=usr/share/man/man9/in_pcbgroup_update_mbuf.9.gz
 OLD_FILES+=usr/share/man/man9/in6_pcbgroup_byhash.9.gz
 
 # 20221214: TCPDEBUG removed
 OLD_FILES+=usr/include/netinet/tcp_debug.h
 
 # 20221213: remove sync serial drivers and utilities
 OLD_FILES+=sbin/sconfig
 OLD_FILES+=usr/share/man/man4/ce.4
 OLD_FILES+=usr/share/man/man4/cp.4
 OLD_FILES+=usr/share/man/man8/sconfig.8.gz
 
 # 20221202: remove trpt(8)
 OLD_FILES+=usr/sbin/trpt
 OLD_FILES+=usr/share/man/man8/trpt.8.gz
 
 # 20221117: remove typo'd man page link
 OLD_FILES+=usr/share/man/man9/vm_map_wire_mapped.9.gz
 
 # 20221114: remove othermta
 OLD_FILES+=etc/rc.d/othermta
 
 # 20221109: remove rc.sendmail(8)
 OLD_FILES+=etc/rc.sendmail
 OLD_FILES+=usr/share/man/man8/rc.sendmail.8.gz
 
 # 20221015: update the ithread(9) man page
 OLD_FILES+=usr/share/man/man9/ithread.9.gz
 OLD_FILES+=usr/share/man/man9/ithread_add_handler.9.gz
 OLD_FILES+=usr/share/man/man9/ithread_create.9.gz
 OLD_FILES+=usr/share/man/man9/ithread_destroy.9.gz
 OLD_FILES+=usr/share/man/man9/ithread_priority.9.gz
 OLD_FILES+=usr/share/man/man9/ithread_remove_handler.9.gz
 OLD_FILES+=usr/share/man/man9/ithread_schedule.9.gz
 
 # 20221012: remove nls support from sort
 OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/sort.cat
 
 # 20221003: ip6protosw.h removed
 OLD_FILES+=usr/include/netinet6/ip6protosw.h
 
 # 20221001: deorbit opie
 OLD_FILES+=etc/opieaccess
 OLD_FILES+=etc/opiekeys
 OLD_FILES+=usr/bin/opieinfo
 OLD_FILES+=usr/bin/opiekey
 OLD_FILES+=usr/bin/opiepasswd
 OLD_FILES+=usr/bin/otp-md4
 OLD_FILES+=usr/bin/otp-md5
 OLD_FILES+=usr/bin/otp-sha1
 OLD_FILES+=usr/include/opie.h
 OLD_FILES+=usr/lib/libopie.a
 OLD_FILES+=usr/lib/libopie.so
 OLD_LIBS+=usr/lib/libopie.so.8
 OLD_FILES+=usr/lib/libopie_p.a
 OLD_FILES+=usr/lib/pam_opie.so
 OLD_LIBS+=usr/lib/pam_opie.so.6
 OLD_FILES+=usr/lib/pam_opieaccess.so
 OLD_LIBS+=usr/lib/pam_opieaccess.so.6
 OLD_FILES+=usr/share/man/man1/opieinfo.1.gz
 OLD_FILES+=usr/share/man/man1/opiekey.1.gz
 OLD_FILES+=usr/share/man/man1/opiepasswd.1.gz
 OLD_FILES+=usr/share/man/man1/otp-md4.1.gz
 OLD_FILES+=usr/share/man/man1/otp-md5.1.gz
 OLD_FILES+=usr/share/man/man1/otp-sha1.1.gz
 OLD_FILES+=usr/share/man/man4/opie.4.gz
 OLD_FILES+=usr/share/man/man4/skey.4.gz
 OLD_FILES+=usr/share/man/man5/opieaccess.5.gz
 OLD_FILES+=usr/share/man/man5/opiekeys.5.gz
 OLD_FILES+=usr/share/man/man8/pam_opie.8.gz
 OLD_FILES+=usr/share/man/man8/pam_opieaccess.8.gz
 
 # 20220928: telnetd(8) removed
 OLD_FILES+=etc/pam.d/telnetd
 OLD_FILES+=usr/libexec/telnetd
 OLD_FILES+=usr/share/man/man8/telnetd.8.gz
 
 # 20220914: domain(9) updated
 OLD_FILES+=usr/share/man/man9/domain_init.9.gz
 OLD_FILES+=usr/share/man/man9/pfctlinput.9.gz
 OLD_FILES+=usr/share/man/man9/pffinddomain.9.gz
 OLD_FILES+=usr/share/man/man9/pffindproto.9.gz
 OLD_FILES+=usr/share/man/man9/pffindtype.9.gz
 
 # 20220825: awk tests moved to subdirs
 OLD_FILES+=usr/tests/usr.bin/awk/awk_test
 OLD_FILES+=usr/tests/usr.bin/awk/d_assign_NF.awk
 OLD_FILES+=usr/tests/usr.bin/awk/d_assign_NF.in
 OLD_FILES+=usr/tests/usr.bin/awk/d_assign_NF.out
 OLD_FILES+=usr/tests/usr.bin/awk/d_big_regexp.awk
 OLD_FILES+=usr/tests/usr.bin/awk/d_big_regexp.in
 OLD_FILES+=usr/tests/usr.bin/awk/d_big_regexp.out
 OLD_FILES+=usr/tests/usr.bin/awk/d_end1.awk
 OLD_FILES+=usr/tests/usr.bin/awk/d_end1.in
 OLD_FILES+=usr/tests/usr.bin/awk/d_end1.out
 OLD_FILES+=usr/tests/usr.bin/awk/d_end2.awk
 OLD_FILES+=usr/tests/usr.bin/awk/d_end2.in
 OLD_FILES+=usr/tests/usr.bin/awk/d_end2.out
 OLD_FILES+=usr/tests/usr.bin/awk/d_period.awk
 OLD_FILES+=usr/tests/usr.bin/awk/d_period.in
 OLD_FILES+=usr/tests/usr.bin/awk/d_period.out
 OLD_FILES+=usr/tests/usr.bin/awk/d_string1.awk
 OLD_FILES+=usr/tests/usr.bin/awk/d_string1.out
 OLD_FILES+=usr/tests/usr.bin/awk/d_tolower.awk
 OLD_FILES+=usr/tests/usr.bin/awk/d_tolower.in
 OLD_FILES+=usr/tests/usr.bin/awk/d_tolower.out
 OLD_FILES+=usr/tests/usr.bin/awk/d_toupper.awk
 OLD_FILES+=usr/tests/usr.bin/awk/d_toupper.in
 OLD_FILES+=usr/tests/usr.bin/awk/d_toupper.out
 
 # 20220820: remove knlist_init_rw_reader()
 OLD_FILES+=usr/share/man/man9/knlist_init_rw_reader.9.gz
 
 # 20220813: minigzip(1) removed in favor of gzip(1)
 OLD_FILES+=usr/bin/minigzip
 OLD_FILES+=usr/share/man/man1/minigzip.1.gz
 
 # 20220811: MP_WATCHDOG removed
 OLD_FILES+=usr/include/machine/mp_watchdog.h
 
 # 20220811: new iconv encoder trait added
 OLD_LIBS+=usr/lib/i18n/libBIG5.so.4
 OLD_LIBS+=usr/lib/i18n/libDECHanyu.so.4
 OLD_LIBS+=usr/lib/i18n/libEUC.so.4
 OLD_LIBS+=usr/lib/i18n/libEUCTW.so.4
 OLD_LIBS+=usr/lib/i18n/libGBK2K.so.4
 OLD_LIBS+=usr/lib/i18n/libHZ.so.4
 OLD_LIBS+=usr/lib/i18n/libISO2022.so.4
 OLD_LIBS+=usr/lib/i18n/libJOHAB.so.4
 OLD_LIBS+=usr/lib/i18n/libMSKanji.so.4
 OLD_LIBS+=usr/lib/i18n/libUES.so.4
 OLD_LIBS+=usr/lib/i18n/libUTF1632.so.4
 OLD_LIBS+=usr/lib/i18n/libUTF7.so.4
 OLD_LIBS+=usr/lib/i18n/libUTF8.so.4
 OLD_LIBS+=usr/lib/i18n/libVIQR.so.4
 OLD_LIBS+=usr/lib/i18n/libZW.so.4
 OLD_LIBS+=usr/lib/i18n/libiconv_none.so.4
 OLD_LIBS+=usr/lib/i18n/libiconv_std.so.4
 OLD_LIBS+=usr/lib/i18n/libmapper_646.so.4
 OLD_LIBS+=usr/lib/i18n/libmapper_none.so.4
 OLD_LIBS+=usr/lib/i18n/libmapper_parallel.so.4
 OLD_LIBS+=usr/lib/i18n/libmapper_serial.so.4
 OLD_LIBS+=usr/lib/i18n/libmapper_std.so.4
 OLD_LIBS+=usr/lib/i18n/libmapper_zone.so.4
 
 # 20220811: raw socket layer removed
 OLD_FILES+=usr/include/net/raw_cb.h
 
 # 20220721: libnv version bumps
 OLD_LIBS+=lib/libnv.so.0
 
 # 20220624: unix_passfd_test -> unix_passfd_stream/unix_passfd_dgram
 OLD_FILES+=usr/tests/sys/kern/unix_passfd_test
 
 # 20220621: ISA sound card drivers removed
 OLD_FILES+=usr/share/man/man4/snd_ad1816.4.gz
 OLD_FILES+=usr/share/man/man4/snd_ess.4.gz
 OLD_FILES+=usr/share/man/man4/snd_gusc.4.gz
 OLD_FILES+=usr/share/man/man4/snd_mss.4.gz
 OLD_FILES+=usr/share/man/man4/snd_sb16.4.gz
 OLD_FILES+=usr/share/man/man4/snd_sb8.4.gz
 OLD_FILES+=usr/share/man/man4/snd_sbc.4.gz
 
 # 20220612: new clang import which bumps version from 14.0.4 to 14.0.5
 OLD_FILES+=usr/lib/clang/14.0.4/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/14.0.4/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/14.0.4/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/14.0.4/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/14.0.4/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/14.0.4/include/fuzzer
 OLD_FILES+=usr/lib/clang/14.0.4/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/14.0.4/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/14.0.4/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/openmp_wrappers/complex_cmath.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/14.0.4/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/14.0.4/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/14.0.4/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/14.0.4/include/profile/InstrProfData.inc
 OLD_FILES+=usr/lib/clang/14.0.4/include/profile/MemProfData.inc
 OLD_DIRS+=usr/lib/clang/14.0.4/include/profile
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/memprof_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/14.0.4/include/sanitizer
 OLD_FILES+=usr/lib/clang/14.0.4/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/14.0.4/include/xray
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_texture_intrinsics.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_hip_cmath.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/altivec.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm_neon_sve_bridge.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/armintr.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512fp16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vlfp16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avxvnniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/builtins.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/cet.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/cpuid.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/crc32intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/float.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/hexagon_circ_brev_intrinsics.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/hexagon_protos.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/hexagon_types.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/hresetintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/hvx_hexagon_protos.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/immintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/inttypes.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/iso646.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/keylockerintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/limits.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/module.modulemap
 OLD_FILES+=usr/lib/clang/14.0.4/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/msa.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/omp-tools.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/omp.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ompt.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/riscv_vector.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/stdalign.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/stdarg.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/stdatomic.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/stdbool.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/stddef.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/stdint.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/stdnoreturn.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/tgmath.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/uintrintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/unwind.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/vadefs.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/varargs.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/14.0.4/include
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan_static-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan_static-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/14.0.4/lib/freebsd
 OLD_DIRS+=usr/lib/clang/14.0.4/lib/share
 OLD_DIRS+=usr/lib/clang/14.0.4/lib
 OLD_FILES+=usr/lib/clang/14.0.4/share/asan_ignorelist.txt
 OLD_FILES+=usr/lib/clang/14.0.4/share/cfi_ignorelist.txt
 OLD_FILES+=usr/lib/clang/14.0.4/share/msan_ignorelist.txt
 OLD_DIRS+=usr/lib/clang/14.0.4/share
 OLD_DIRS+=usr/lib/clang/14.0.4
 
 # 20220605: new clang import which bumps version from 14.0.3 to 14.0.4
 OLD_FILES+=usr/lib/clang/14.0.3/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/14.0.3/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/14.0.3/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/14.0.3/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/14.0.3/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/14.0.3/include/fuzzer
 OLD_FILES+=usr/lib/clang/14.0.3/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/14.0.3/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/14.0.3/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/openmp_wrappers/complex_cmath.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/14.0.3/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/14.0.3/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/14.0.3/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/14.0.3/include/profile/InstrProfData.inc
 OLD_FILES+=usr/lib/clang/14.0.3/include/profile/MemProfData.inc
 OLD_DIRS+=usr/lib/clang/14.0.3/include/profile
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/memprof_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/14.0.3/include/sanitizer
 OLD_FILES+=usr/lib/clang/14.0.3/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/14.0.3/include/xray
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_texture_intrinsics.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_hip_cmath.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/altivec.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm_neon_sve_bridge.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/armintr.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512fp16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vlfp16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avxvnniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/builtins.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/cet.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/cpuid.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/crc32intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/float.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/hexagon_circ_brev_intrinsics.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/hexagon_protos.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/hexagon_types.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/hresetintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/hvx_hexagon_protos.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/immintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/inttypes.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/iso646.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/keylockerintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/limits.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/module.modulemap
 OLD_FILES+=usr/lib/clang/14.0.3/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/msa.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/omp-tools.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/omp.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ompt.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/riscv_vector.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/stdalign.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/stdarg.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/stdatomic.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/stdbool.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/stddef.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/stdint.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/stdnoreturn.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/tgmath.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/uintrintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/unwind.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/vadefs.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/varargs.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/14.0.3/include
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan_static-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan_static-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/14.0.3/lib/freebsd
 OLD_DIRS+=usr/lib/clang/14.0.3/lib/share
 OLD_DIRS+=usr/lib/clang/14.0.3/lib
 OLD_FILES+=usr/lib/clang/14.0.3/share/asan_ignorelist.txt
 OLD_FILES+=usr/lib/clang/14.0.3/share/cfi_ignorelist.txt
 OLD_FILES+=usr/lib/clang/14.0.3/share/msan_ignorelist.txt
 OLD_DIRS+=usr/lib/clang/14.0.3/share
 OLD_DIRS+=usr/lib/clang/14.0.3
 
 # 20220524: libkqueue test updates
 OLD_FILES+=usr/tests/sys/kqueue/libkqueue/kqtest
 
 # 20220514: new clang import which bumps version from 13.0.0 to 14.0.3
 OLD_FILES+=usr/lib/clang/13.0.0/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/13.0.0/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/13.0.0/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/13.0.0/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/13.0.0/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/13.0.0/include/fuzzer
 OLD_FILES+=usr/lib/clang/13.0.0/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/13.0.0/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/13.0.0/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/openmp_wrappers/complex_cmath.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/13.0.0/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/13.0.0/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/13.0.0/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/13.0.0/include/profile/InstrProfData.inc
 OLD_DIRS+=usr/lib/clang/13.0.0/include/profile
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/13.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/13.0.0/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/13.0.0/include/xray
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_hip_cmath.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avxvnniintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/builtins.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/cet.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/float.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/hexagon_circ_brev_intrinsics.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/hexagon_protos.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/hexagon_types.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/hresetintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/hvx_hexagon_protos.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/inttypes.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/iso646.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/keylockerintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/limits.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/13.0.0/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/omp-tools.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/omp.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ompt.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/riscv_vector.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/stdalign.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/stdarg.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/stdatomic.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/stdbool.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/stddef.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/stdint.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/stdnoreturn.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/tgmath.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/uintrintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/unwind.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/varargs.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/13.0.0/include
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/13.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/13.0.0/lib
 OLD_DIRS+=usr/lib/clang/13.0.0
 
 # 20220514: new libc++ import which bumps version from 13.0.0 to 14.0.3
 OLD_FILES+=usr/include/c++/v1/__function_like.h
 OLD_FILES+=usr/include/c++/v1/__memory/pointer_safety.h
 OLD_FILES+=usr/include/c++/v1/__utility/__decay_copy.h
 
 # 20220418: uudecode merged into uuencode and renamed to bintrans
 OLD_FILES+=usr/lib/debug/usr/bin/uuencode.debug
 OLD_FILES+=usr/lib/debug/usr/bin/uudecode.debug
 OLD_FILES+=usr/tests/usr.bin/uuencode/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/uuencode/legacy_test
 OLD_FILES+=usr/tests/usr.bin/uuencode/regress.base64.in
 OLD_FILES+=usr/tests/usr.bin/uuencode/regress.traditional.out
 OLD_FILES+=usr/tests/usr.bin/uuencode/regress.traditional.in
 OLD_FILES+=usr/tests/usr.bin/uuencode/regress.out
 OLD_FILES+=usr/tests/usr.bin/uuencode/regress.sh
 OLD_FILES+=usr/tests/usr.bin/uuencode/regress.in
 OLD_FILES+=usr/tests/usr.bin/uuencode/regress.153276.in
 OLD_FILES+=usr/tests/usr.bin/uuencode/regress.base64.out
 OLD_FILES+=usr/tests/usr.bin/uuencode/regress.153276.out
 OLD_FILES+=usr/tests/usr.bin/uudecode/regress.base64.in
 OLD_FILES+=usr/tests/usr.bin/uudecode/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/uudecode/regress.out
 OLD_FILES+=usr/tests/usr.bin/uudecode/regress.sh
 OLD_FILES+=usr/tests/usr.bin/uudecode/regress.153276.out
 OLD_FILES+=usr/tests/usr.bin/uudecode/regress.traditional.in
 OLD_FILES+=usr/tests/usr.bin/uudecode/legacy_test
 OLD_FILES+=usr/tests/usr.bin/uudecode/regress.153276.in
 OLD_DIRS+=usr/tests/usr.bin/uuencode
 OLD_DIRS+=usr/tests/usr.bin/uudecode
 
 # 20220318: snd_ds1 and snd_maestro drivers removed
 OLD_FILES+=usr/share/man/man4/snd_ds1.4.gz
 OLD_FILES+=usr/share/man/man4/snd_maestro.4.gz
 
 # 20220307: remove 330.news
 OLD_FILES+=etc/periodic/daily/330.news
 
 # 20220210: unwind.h moved to /usr/include
 OLD_FILES+=usr/include/c++/v1/unwind-arm.h
 OLD_FILES+=usr/include/c++/v1/unwind-itanium.h
 OLD_FILES+=usr/include/c++/v1/unwind.h
 
 # 20220128: mips pmc events removed
 OLD_FILES+=usr/share/man/man3/pmc.mips24k.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.octeon.3.gz
 
 # 20220127: terasic_mtl.4 removed
 OLD_FILES+=usr/share/man/man4/terasic_mtl.4.gz
 
 # 20211229: libc++ moved to /lib
 MOVED_LIBS+=usr/lib/libc++.so.1
 
 # 20211221: efi_set_variables_supported.3 should be efi_variables_supported.3
 OLD_FILES+=usr/share/man/man3/efi_set_variables_supported.3.gz
 
 # 20211218: meteor.4 removed, see also 20200301 entry below
 OLD_FILES+=usr/share/man/man4/meteor.4.gz
 
 # 20211125: Old SCSI drivers removed
 OLD_FILES+=usr/include/dev/ic/esp.h
 OLD_FILES+=usr/share/man/man4/amr.4.gz
 OLD_FILES+=usr/share/man/man4/esp.4.gz
 OLD_FILES+=usr/share/man/man4/iir.4.gz
 OLD_FILES+=usr/share/man/man4/mly.4.gz
 OLD_FILES+=usr/share/man/man4/twa.4.gz
 
 # 20211120: kernel_vmount function removed
 OLD_FILES+=usr/share/man/man9/kernel_vmount.9.gz
 
 # 20211115: vm_page busy functions removed
 OLD_FILES+=share/man/man9/vm_page_sbusy.9.gz
 OLD_FILES+=share/man/man9/vm_page_xbusy.9.gz
 OLD_FILES+=share/man/man9/vm_page_sleep_if_busy.9.gz
 
 # 20211113: new clang import which bumps version from 12.0.1 to 13.0.0
 OLD_FILES+=usr/lib/clang/12.0.1/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/12.0.1/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/12.0.1/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/12.0.1/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/12.0.1/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/12.0.1/include/fuzzer
 OLD_FILES+=usr/lib/clang/12.0.1/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/12.0.1/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/12.0.1/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/openmp_wrappers/complex_cmath.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/12.0.1/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/12.0.1/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/12.0.1/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/12.0.1/include/profile/InstrProfData.inc
 OLD_DIRS+=usr/lib/clang/12.0.1/include/profile
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/12.0.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/12.0.1/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/12.0.1/include/xray
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_hip_cmath.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/armintr.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avxvnniintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/cet.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/float.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/hresetintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/inttypes.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/iso646.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/keylockerintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/limits.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/12.0.1/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/msa.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/omp-tools.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/omp.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ompt.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/stdalign.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/stdarg.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/stdatomic.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/stdbool.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/stddef.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/stdint.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/stdnoreturn.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/tgmath.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/uintrintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/unwind.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/varargs.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/12.0.1/include
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/12.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/12.0.1/lib
 OLD_DIRS+=usr/lib/clang/12.0.1
 
 # 20211113: new libc++ import which bumps version from 12.0.1 to 13.0.0
 OLD_FILES+=usr/include/c++/v1/__functional_03
 OLD_FILES+=usr/include/c++/v1/__functional_base_03
 OLD_FILES+=usr/include/c++/v1/__memory/base.h
 OLD_FILES+=usr/include/c++/v1/__memory/utilities.h
 OLD_FILES+=usr/include/c++/v1/__sso_allocator
 OLD_FILES+=usr/include/c++/v1/tr1/__availability
 OLD_FILES+=usr/include/c++/v1/tr1/__bit_reference
 OLD_FILES+=usr/include/c++/v1/tr1/__bits
 OLD_FILES+=usr/include/c++/v1/tr1/__bsd_locale_defaults.h
 OLD_FILES+=usr/include/c++/v1/tr1/__bsd_locale_fallbacks.h
 OLD_FILES+=usr/include/c++/v1/tr1/__config
 OLD_FILES+=usr/include/c++/v1/tr1/__debug
 OLD_FILES+=usr/include/c++/v1/tr1/__errc
 OLD_FILES+=usr/include/c++/v1/tr1/__functional_03
 OLD_FILES+=usr/include/c++/v1/tr1/__functional_base
 OLD_FILES+=usr/include/c++/v1/tr1/__functional_base_03
 OLD_FILES+=usr/include/c++/v1/tr1/__hash_table
 OLD_FILES+=usr/include/c++/v1/tr1/__libcpp_version
 OLD_FILES+=usr/include/c++/v1/tr1/__locale
 OLD_FILES+=usr/include/c++/v1/tr1/__mutex_base
 OLD_FILES+=usr/include/c++/v1/tr1/__node_handle
 OLD_FILES+=usr/include/c++/v1/tr1/__nullptr
 OLD_FILES+=usr/include/c++/v1/tr1/__split_buffer
 OLD_FILES+=usr/include/c++/v1/tr1/__sso_allocator
 OLD_FILES+=usr/include/c++/v1/tr1/__std_stream
 OLD_FILES+=usr/include/c++/v1/tr1/__string
 OLD_FILES+=usr/include/c++/v1/tr1/__threading_support
 OLD_FILES+=usr/include/c++/v1/tr1/__tree
 OLD_FILES+=usr/include/c++/v1/tr1/__tuple
 OLD_FILES+=usr/include/c++/v1/tr1/__undef_macros
 OLD_FILES+=usr/include/c++/v1/tr1/algorithm
 OLD_FILES+=usr/include/c++/v1/tr1/any
 OLD_FILES+=usr/include/c++/v1/tr1/array
 OLD_FILES+=usr/include/c++/v1/tr1/atomic
 OLD_FILES+=usr/include/c++/v1/tr1/barrier
 OLD_FILES+=usr/include/c++/v1/tr1/bit
 OLD_FILES+=usr/include/c++/v1/tr1/bitset
 OLD_FILES+=usr/include/c++/v1/tr1/cassert
 OLD_FILES+=usr/include/c++/v1/tr1/ccomplex
 OLD_FILES+=usr/include/c++/v1/tr1/cctype
 OLD_FILES+=usr/include/c++/v1/tr1/cerrno
 OLD_FILES+=usr/include/c++/v1/tr1/cfenv
 OLD_FILES+=usr/include/c++/v1/tr1/cfloat
 OLD_FILES+=usr/include/c++/v1/tr1/charconv
 OLD_FILES+=usr/include/c++/v1/tr1/chrono
 OLD_FILES+=usr/include/c++/v1/tr1/cinttypes
 OLD_FILES+=usr/include/c++/v1/tr1/ciso646
 OLD_FILES+=usr/include/c++/v1/tr1/climits
 OLD_FILES+=usr/include/c++/v1/tr1/clocale
 OLD_FILES+=usr/include/c++/v1/tr1/cmath
 OLD_FILES+=usr/include/c++/v1/tr1/codecvt
 OLD_FILES+=usr/include/c++/v1/tr1/compare
 OLD_FILES+=usr/include/c++/v1/tr1/complex
 OLD_FILES+=usr/include/c++/v1/tr1/complex.h
 OLD_FILES+=usr/include/c++/v1/tr1/concepts
 OLD_FILES+=usr/include/c++/v1/tr1/condition_variable
 OLD_FILES+=usr/include/c++/v1/tr1/csetjmp
 OLD_FILES+=usr/include/c++/v1/tr1/csignal
 OLD_FILES+=usr/include/c++/v1/tr1/cstdarg
 OLD_FILES+=usr/include/c++/v1/tr1/cstdbool
 OLD_FILES+=usr/include/c++/v1/tr1/cstddef
 OLD_FILES+=usr/include/c++/v1/tr1/cstdint
 OLD_FILES+=usr/include/c++/v1/tr1/cstdio
 OLD_FILES+=usr/include/c++/v1/tr1/cstdlib
 OLD_FILES+=usr/include/c++/v1/tr1/cstring
 OLD_FILES+=usr/include/c++/v1/tr1/ctgmath
 OLD_FILES+=usr/include/c++/v1/tr1/ctime
 OLD_FILES+=usr/include/c++/v1/tr1/ctype.h
 OLD_FILES+=usr/include/c++/v1/tr1/cwchar
 OLD_FILES+=usr/include/c++/v1/tr1/cwctype
 OLD_FILES+=usr/include/c++/v1/tr1/deque
 OLD_FILES+=usr/include/c++/v1/tr1/errno.h
 OLD_FILES+=usr/include/c++/v1/tr1/exception
 OLD_FILES+=usr/include/c++/v1/tr1/execution
 OLD_FILES+=usr/include/c++/v1/tr1/fenv.h
 OLD_FILES+=usr/include/c++/v1/tr1/filesystem
 OLD_FILES+=usr/include/c++/v1/tr1/float.h
 OLD_FILES+=usr/include/c++/v1/tr1/forward_list
 OLD_FILES+=usr/include/c++/v1/tr1/fstream
 OLD_FILES+=usr/include/c++/v1/tr1/functional
 OLD_FILES+=usr/include/c++/v1/tr1/future
 OLD_FILES+=usr/include/c++/v1/tr1/initializer_list
 OLD_FILES+=usr/include/c++/v1/tr1/inttypes.h
 OLD_FILES+=usr/include/c++/v1/tr1/iomanip
 OLD_FILES+=usr/include/c++/v1/tr1/ios
 OLD_FILES+=usr/include/c++/v1/tr1/iosfwd
 OLD_FILES+=usr/include/c++/v1/tr1/iostream
 OLD_FILES+=usr/include/c++/v1/tr1/istream
 OLD_FILES+=usr/include/c++/v1/tr1/iterator
 OLD_FILES+=usr/include/c++/v1/tr1/latch
 OLD_FILES+=usr/include/c++/v1/tr1/limits
 OLD_FILES+=usr/include/c++/v1/tr1/limits.h
 OLD_FILES+=usr/include/c++/v1/tr1/list
 OLD_FILES+=usr/include/c++/v1/tr1/locale
 OLD_FILES+=usr/include/c++/v1/tr1/locale.h
 OLD_FILES+=usr/include/c++/v1/tr1/map
 OLD_FILES+=usr/include/c++/v1/tr1/math.h
 OLD_FILES+=usr/include/c++/v1/tr1/memory
 OLD_FILES+=usr/include/c++/v1/tr1/mutex
 OLD_FILES+=usr/include/c++/v1/tr1/new
 OLD_FILES+=usr/include/c++/v1/tr1/numbers
 OLD_FILES+=usr/include/c++/v1/tr1/numeric
 OLD_FILES+=usr/include/c++/v1/tr1/optional
 OLD_FILES+=usr/include/c++/v1/tr1/ostream
 OLD_FILES+=usr/include/c++/v1/tr1/queue
 OLD_FILES+=usr/include/c++/v1/tr1/random
 OLD_FILES+=usr/include/c++/v1/tr1/ratio
 OLD_FILES+=usr/include/c++/v1/tr1/regex
 OLD_FILES+=usr/include/c++/v1/tr1/scoped_allocator
 OLD_FILES+=usr/include/c++/v1/tr1/semaphore
 OLD_FILES+=usr/include/c++/v1/tr1/set
 OLD_FILES+=usr/include/c++/v1/tr1/setjmp.h
 OLD_FILES+=usr/include/c++/v1/tr1/shared_mutex
 OLD_FILES+=usr/include/c++/v1/tr1/span
 OLD_FILES+=usr/include/c++/v1/tr1/sstream
 OLD_FILES+=usr/include/c++/v1/tr1/stack
 OLD_FILES+=usr/include/c++/v1/tr1/stdbool.h
 OLD_FILES+=usr/include/c++/v1/tr1/stddef.h
 OLD_FILES+=usr/include/c++/v1/tr1/stdexcept
 OLD_FILES+=usr/include/c++/v1/tr1/stdint.h
 OLD_FILES+=usr/include/c++/v1/tr1/stdio.h
 OLD_FILES+=usr/include/c++/v1/tr1/stdlib.h
 OLD_FILES+=usr/include/c++/v1/tr1/streambuf
 OLD_FILES+=usr/include/c++/v1/tr1/string
 OLD_FILES+=usr/include/c++/v1/tr1/string.h
 OLD_FILES+=usr/include/c++/v1/tr1/string_view
 OLD_FILES+=usr/include/c++/v1/tr1/strstream
 OLD_FILES+=usr/include/c++/v1/tr1/system_error
 OLD_FILES+=usr/include/c++/v1/tr1/tgmath.h
 OLD_FILES+=usr/include/c++/v1/tr1/thread
 OLD_FILES+=usr/include/c++/v1/tr1/tuple
 OLD_FILES+=usr/include/c++/v1/tr1/type_traits
 OLD_FILES+=usr/include/c++/v1/tr1/typeindex
 OLD_FILES+=usr/include/c++/v1/tr1/typeinfo
 OLD_FILES+=usr/include/c++/v1/tr1/unordered_map
 OLD_FILES+=usr/include/c++/v1/tr1/unordered_set
 OLD_FILES+=usr/include/c++/v1/tr1/utility
 OLD_FILES+=usr/include/c++/v1/tr1/valarray
 OLD_FILES+=usr/include/c++/v1/tr1/variant
 OLD_FILES+=usr/include/c++/v1/tr1/vector
 OLD_FILES+=usr/include/c++/v1/tr1/version
 OLD_FILES+=usr/include/c++/v1/tr1/wchar.h
 OLD_FILES+=usr/include/c++/v1/tr1/wctype.h
 OLD_DIRS+=usr/include/c++/v1/tr1
 
 # 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
 
 # 20211026: retire obsolete iscsi initiator
 OLD_FILES+=sbin/iscontrol
 OLD_FILES+=usr/share/man/man4/iscsi_initiator.4.gz
 OLD_FILES+=usr/share/man/man8/iscontrol.8.gz
 
 # 20211022
 OLD_FILES+=etc/rc.d/sppp
 OLD_FILES+=rescue/spppcontrol
 OLD_FILES+=sbin/spppcontrol
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/cserial.h
 .endif
 OLD_FILES+=usr/include/net/if_sppp.h
 OLD_FILES+=usr/include/netgraph/ng_sppp.h
 OLD_FILES+=usr/share/man/man4/ng_sppp.4.gz
 OLD_FILES+=usr/share/man/man4/sppp.4.gz
 OLD_FILES+=usr/share/man/man8/spppcontrol.8.gz
 
 # 20211004: Removed sparc64 tests for lastcomm/sa
 OLD_FILES+=usr/tests/usr.bin/lastcomm/v1-sparc64-acct.in
 OLD_FILES+=usr/tests/usr.bin/lastcomm/v1-sparc64.out
 OLD_FILES+=usr/tests/usr.bin/lastcomm/v2-sparc64-acct.in
 OLD_FILES+=usr/tests/usr.bin/lastcomm/v2-sparc64.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-sav.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-sav.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-u.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-usr.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-usr.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-sparc64-sav.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-sparc64-u.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-sparc64-usr.in
 
 # 20210929:
 OLD_FILES+=usr/sbin/hcseriald
 OLD_FILES+=usr/share/man/man8/hcseriald.8.gz
 
 # 20210929: Remove ng_h4
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_h4.h
 OLD_FILES+=usr/share/man/man4/ng_h4.4.gz
 
 # 20210923: rename boot(9) to kern_reboot(9)
 OLD_FILES+=usr/share/man/man9/boot.9.gz
 
 # 20210921: remove cloudabi
 OLD_FILES+=usr/share/man/man4/cloudabi.4.gz
 OLD_FILES+=usr/share/man/man4/cloudabi32.4.gz
 OLD_FILES+=usr/share/man/man4/cloudabi64.4.gz
 
 # 20210906: stop installing {llvm,clang,lldb}-tblgen
 OLD_FILES+=usr/bin/llvm-tblgen
 OLD_FILES+=usr/bin/clang-tblgen
 OLD_FILES+=usr/bin/lldb-tblgen
 OLD_FILES+=usr/share/man/man1/llvm-tblgen.1.gz
 
 # 20210810: remove Pentium-related man pages and references
 OLD_FILES+=usr/share/man/man3/pmc.p4.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.p5.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.p6.3.gz
 
 # 20210805: C.UTF-8 installed to the wrong location
 OLD_FILES+=usr/share/C.UTF-8.LC_CTYPE
 
 # 20210619: new clang import which bumps version from 12.0.0 to 12.0.1
 OLD_FILES+=usr/lib/clang/12.0.0/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/12.0.0/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/12.0.0/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/12.0.0/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/12.0.0/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/12.0.0/include/fuzzer
 OLD_FILES+=usr/lib/clang/12.0.0/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/12.0.0/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/12.0.0/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/openmp_wrappers/complex_cmath.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/12.0.0/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/12.0.0/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/12.0.0/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/12.0.0/include/profile/InstrProfData.inc
 OLD_DIRS+=usr/lib/clang/12.0.0/include/profile
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/12.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/12.0.0/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/12.0.0/include/xray
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_hip_cmath.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avxvnniintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/cet.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/float.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/hresetintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/inttypes.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/iso646.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/keylockerintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/limits.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/12.0.0/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/omp-tools.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/omp.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ompt.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/stdalign.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/stdarg.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/stdatomic.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/stdbool.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/stddef.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/stdint.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/stdnoreturn.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/tgmath.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/uintrintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/unwind.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/varargs.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/12.0.0/include
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/12.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/12.0.0/lib
 OLD_DIRS+=usr/lib/clang/12.0.0
 
 # 20210616: Remove crypto_cursor_seg{base,len}
 OLD_FILES+=usr/share/man/man9/crypto_cursor_segbase.9.gz
 OLD_FILES+=usr/share/man/man9/crypto_cursor_seglen.9.gz
 
 # 20210618: rename of usr/share/certs/blacklisted
 OLD_FILES+=usr/share/certs/blacklisted/AddTrust_External_Root.pem
 OLD_FILES+=usr/share/certs/blacklisted/AddTrust_Low-Value_Services_Root.pem
 OLD_FILES+=usr/share/certs/blacklisted/Camerfirma_Chambers_of_Commerce_Root.pem
 OLD_FILES+=usr/share/certs/blacklisted/Camerfirma_Global_Chambersign_Root.pem
 OLD_FILES+=usr/share/certs/blacklisted/Certum_Root_CA.pem
 OLD_FILES+=usr/share/certs/blacklisted/Chambers_of_Commerce_Root_-_2008.pem
 OLD_FILES+=usr/share/certs/blacklisted/D-TRUST_Root_CA_3_2013.pem
 OLD_FILES+=usr/share/certs/blacklisted/EC-ACC.pem
 OLD_FILES+=usr/share/certs/blacklisted/EE_Certification_Centre_Root_CA.pem
 OLD_FILES+=usr/share/certs/blacklisted/GeoTrust_Global_CA.pem
 OLD_FILES+=usr/share/certs/blacklisted/GeoTrust_Primary_Certification_Authority_-_G2.pem
 OLD_FILES+=usr/share/certs/blacklisted/GeoTrust_Primary_Certification_Authority_-_G3.pem
 OLD_FILES+=usr/share/certs/blacklisted/GeoTrust_Primary_Certification_Authority.pem
 OLD_FILES+=usr/share/certs/blacklisted/GeoTrust_Universal_CA_2.pem
 OLD_FILES+=usr/share/certs/blacklisted/GeoTrust_Universal_CA.pem
 OLD_FILES+=usr/share/certs/blacklisted/Global_Chambersign_Root_-_2008.pem
 OLD_FILES+=usr/share/certs/blacklisted/LuxTrust_Global_Root_2.pem
 OLD_FILES+=usr/share/certs/blacklisted/OISTE_WISeKey_Global_Root_GA_CA.pem
 OLD_FILES+=usr/share/certs/blacklisted/QuoVadis_Root_CA.pem
 OLD_FILES+=usr/share/certs/blacklisted/Sonera_Class_2_Root_CA.pem
 OLD_FILES+=usr/share/certs/blacklisted/Staat_der_Nederlanden_Root_CA_-_G2.pem
 OLD_FILES+=usr/share/certs/blacklisted/Staat_der_Nederlanden_Root_CA_-_G3.pem
 OLD_FILES+=usr/share/certs/blacklisted/SwissSign_Platinum_CA_-_G2.pem
 OLD_FILES+=usr/share/certs/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem
 OLD_FILES+=usr/share/certs/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem
 OLD_FILES+=usr/share/certs/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem
 OLD_FILES+=usr/share/certs/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem
 OLD_FILES+=usr/share/certs/blacklisted/Taiwan_GRCA.pem
 OLD_FILES+=usr/share/certs/blacklisted/thawte_Primary_Root_CA_-_G2.pem
 OLD_FILES+=usr/share/certs/blacklisted/thawte_Primary_Root_CA_-_G3.pem
 OLD_FILES+=usr/share/certs/blacklisted/thawte_Primary_Root_CA.pem
 OLD_FILES+=usr/share/certs/blacklisted/Trustis_FPS_Root_CA.pem
 OLD_FILES+=usr/share/certs/blacklisted/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem
 OLD_FILES+=usr/share/certs/blacklisted/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem
 OLD_FILES+=usr/share/certs/blacklisted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem
 OLD_FILES+=usr/share/certs/blacklisted/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G4.pem
 OLD_FILES+=usr/share/certs/blacklisted/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem
 OLD_FILES+=usr/share/certs/blacklisted/VeriSign_Universal_Root_Certification_Authority.pem
 OLD_DIRS+=usr/share/certs/blacklisted
 
 # 20210613: new clang import which bumps version from 11.0.1 to 12.0.0
 OLD_FILES+=usr/lib/clang/11.0.1/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/11.0.1/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/11.0.1/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/11.0.1/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/11.0.1/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/11.0.1/include/fuzzer
 OLD_FILES+=usr/lib/clang/11.0.1/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/11.0.1/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/11.0.1/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/11.0.1/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/11.0.1/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/11.0.1/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/11.0.1/include/profile/InstrProfData.inc
 OLD_DIRS+=usr/lib/clang/11.0.1/include/profile
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/11.0.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/11.0.1/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/11.0.1/include/xray
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/armintr.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/cet.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/float.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/inttypes.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/iso646.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/limits.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/11.0.1/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/msa.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/omp-tools.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/omp.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ompt.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/stdalign.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/stdarg.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/stdatomic.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/stdbool.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/stddef.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/stdint.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/stdnoreturn.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/tgmath.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/unwind.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/varargs.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/11.0.1/include
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/11.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/11.0.1/lib
 OLD_DIRS+=usr/lib/clang/11.0.1
 
 # 20210613: Rename OpenZFS manual pages
 OLD_FILES+=usr/share/man/man5/spl-module-parameters.5.gz
 OLD_FILES+=usr/share/man/man5/zfs-events.5.gz
 OLD_FILES+=usr/share/man/man5/zfs-module-parameters.5.gz
 OLD_FILES+=usr/share/man/man8/zfsconcepts.8.gz
 OLD_FILES+=usr/share/man/man8/zfsprops.8.gz
 OLD_FILES+=usr/share/man/man5/zpool-features.5.gz
 OLD_FILES+=usr/share/man/man8/zpoolconcepts.8.gz
 OLD_FILES+=usr/share/man/man8/zpoolprops.8.gz
 
 # 20210611: Remove svn and svnlite
 OLD_FILES+=usr/bin/svn
 OLD_FILES+=usr/bin/svnadmin
 OLD_FILES+=usr/bin/svnbench
 OLD_FILES+=usr/bin/svndumpfilter
 OLD_FILES+=usr/bin/svnfsfs
 OLD_FILES+=usr/bin/svnlite
 OLD_FILES+=usr/bin/svnliteadmin
 OLD_FILES+=usr/bin/svnlitebench
 OLD_FILES+=usr/bin/svnlitedumpfilter
 OLD_FILES+=usr/bin/svnlitefsfs
 OLD_FILES+=usr/bin/svnlitelook
 OLD_FILES+=usr/bin/svnlitemucc
 OLD_FILES+=usr/bin/svnliterdump
 OLD_FILES+=usr/bin/svnliteserve
 OLD_FILES+=usr/bin/svnlitesync
 OLD_FILES+=usr/bin/svnliteversion
 OLD_FILES+=usr/bin/svnlook
 OLD_FILES+=usr/bin/svnmucc
 OLD_FILES+=usr/bin/svnrdump
 OLD_FILES+=usr/bin/svnserve
 OLD_FILES+=usr/bin/svnsync
 OLD_FILES+=usr/bin/svnversion
 OLD_FILES+=usr/share/man/man1/svnlite.1.gz
 
 # 20210607: remove ancontrol(8) related programs
 OLD_FILES+=usr/sbin/ancontrol
 OLD_FILES+=usr/share/man/man8/ancontrol.8.gz
 
 # 20210607: remove an(4)
 OLD_FILES+=usr/include/dev/an/if_aironet_ieee.h
 OLD_FILES+=usr/include/dev/an/if_anreg.h
 OLD_FILES+=usr/share/man/man4/an.4.gz
 
 # 20210426: remove unused libexec/rc.d/addswap
 OLD_FILES+=etc/rc.d/addswap
 
 # 20210413: Remove pfctlinput2
 OLD_FILES+=usr/share/man/man9/pfctlinput2.9.gz
 
 # 20210412: Remove kernel asymmetric crypto
 OLD_FILES+=usr/share/man/man9/crypto_asym.9.gz
 OLD_FILES+=usr/share/man/man9/crypto_kdispatch.9.gz
 OLD_FILES+=usr/share/man/man9/crypto_kdone.9.gz
 OLD_FILES+=usr/share/man/man9/crypto_kregister.9.gz
 OLD_FILES+=usr/share/man/man9/CRYPTODEV_KPROCESS.9.gz
 
 # 20210410: remove unused libexec/rc.d/archdep
 OLD_FILES+=etc/rc.d/archdep
 
 # 20210408: remove tcp_hostcache.h
 OLD_FILES+=usr/include/netinet/tcp_hostcache.h
 
 # 20210403: remove kgmon(8)
 OLD_FILES+=usr/sbin/kgmon
 OLD_FILES+=usr/share/man/man8/kgmon.8.gz
 
 # 20210401: remove bt(4) man page
 OLD_FILES+=usr/share/man/man4/bt.4.gz
 
 # 20210322: retire mn(4) sync serial driver
 OLD_FILES+=usr/share/man/man4/if_mn.4.gz
 OLD_FILES+=usr/share/man/man4/mn.4.gz
 
 # 20210318: remove the terminfo database
 OLD_FILES+=usr/share/terminfo/1/1178
 OLD_FILES+=usr/share/terminfo/1/1730-lm
 OLD_DIRS+=usr/share/terminfo/1
 OLD_FILES+=usr/share/terminfo/2/2621
 OLD_FILES+=usr/share/terminfo/2/2621-wl
 OLD_FILES+=usr/share/terminfo/2/2621A
 OLD_FILES+=usr/share/terminfo/2/2621a
 OLD_DIRS+=usr/share/terminfo/2/
 OLD_FILES+=usr/share/terminfo/3/386at
 OLD_FILES+=usr/share/terminfo/3/3b1
 OLD_DIRS+=usr/share/terminfo/3/
 OLD_FILES+=usr/share/terminfo/4/4025ex
 OLD_FILES+=usr/share/terminfo/4/4027ex
 OLD_FILES+=usr/share/terminfo/4/4410-w
 OLD_DIRS+=usr/share/terminfo/4/
 OLD_FILES+=usr/share/terminfo/5/5051
 OLD_FILES+=usr/share/terminfo/5/5410-w
 OLD_FILES+=usr/share/terminfo/5/5620
 OLD_FILES+=usr/share/terminfo/5/5630-24
 OLD_FILES+=usr/share/terminfo/5/5630DMD-24
 OLD_DIRS+=usr/share/terminfo/5/
 OLD_FILES+=usr/share/terminfo/6/6053
 OLD_FILES+=usr/share/terminfo/6/6053-dg
 OLD_FILES+=usr/share/terminfo/6/605x
 OLD_FILES+=usr/share/terminfo/6/605x-dg
 OLD_FILES+=usr/share/terminfo/6/630-lm
 OLD_FILES+=usr/share/terminfo/6/630MTG-24
 OLD_DIRS+=usr/share/terminfo/6/
 OLD_FILES+=usr/share/terminfo/7/730MTG-24
 OLD_FILES+=usr/share/terminfo/7/730MTG-41
 OLD_FILES+=usr/share/terminfo/7/730MTG-41r
 OLD_FILES+=usr/share/terminfo/7/730MTGr
 OLD_FILES+=usr/share/terminfo/7/730MTGr-24
 OLD_DIRS+=usr/share/terminfo/7/
 OLD_FILES+=usr/share/terminfo/8/8510
 OLD_DIRS+=usr/share/terminfo/8/
 OLD_FILES+=usr/share/terminfo/9/955-hb
 OLD_FILES+=usr/share/terminfo/9/955-w
 OLD_FILES+=usr/share/terminfo/9/9term
 OLD_DIRS+=usr/share/terminfo/9/
 OLD_FILES+=usr/share/terminfo/A/Apple_Terminal
 OLD_DIRS+=usr/share/terminfo/A/
 OLD_FILES+=usr/share/terminfo/E/Eterm
 OLD_FILES+=usr/share/terminfo/E/Eterm-256color
 OLD_FILES+=usr/share/terminfo/E/Eterm-88color
 OLD_FILES+=usr/share/terminfo/E/Eterm-color
 OLD_DIRS+=usr/share/terminfo/E/
 OLD_FILES+=usr/share/terminfo/L/LFT-PC850
 OLD_DIRS+=usr/share/terminfo/L/
 OLD_FILES+=usr/share/terminfo/M/MtxOrb
 OLD_FILES+=usr/share/terminfo/M/MtxOrb162
 OLD_FILES+=usr/share/terminfo/M/MtxOrb204
 OLD_DIRS+=usr/share/terminfo/M/
 OLD_FILES+=usr/share/terminfo/N/NCR260VT300WPP
 OLD_FILES+=usr/share/terminfo/N/NCRVT100WPP
 OLD_DIRS+=usr/share/terminfo/N/
 OLD_FILES+=usr/share/terminfo/P/P12
 OLD_FILES+=usr/share/terminfo/P/P12-M
 OLD_FILES+=usr/share/terminfo/P/P12-M-W
 OLD_FILES+=usr/share/terminfo/P/P12-W
 OLD_FILES+=usr/share/terminfo/P/P14
 OLD_FILES+=usr/share/terminfo/P/P14-M
 OLD_FILES+=usr/share/terminfo/P/P14-M-W
 OLD_FILES+=usr/share/terminfo/P/P14-W
 OLD_FILES+=usr/share/terminfo/P/P4
 OLD_FILES+=usr/share/terminfo/P/P5
 OLD_FILES+=usr/share/terminfo/P/P7
 OLD_FILES+=usr/share/terminfo/P/P8
 OLD_FILES+=usr/share/terminfo/P/P8-W
 OLD_FILES+=usr/share/terminfo/P/P9
 OLD_FILES+=usr/share/terminfo/P/P9-8
 OLD_FILES+=usr/share/terminfo/P/P9-8-W
 OLD_FILES+=usr/share/terminfo/P/P9-W
 OLD_DIRS+=usr/share/terminfo/P/
 OLD_FILES+=usr/share/terminfo/Q/Q306-8-pc
 OLD_FILES+=usr/share/terminfo/Q/Q310-vip-H
 OLD_FILES+=usr/share/terminfo/Q/Q310-vip-H-am
 OLD_FILES+=usr/share/terminfo/Q/Q310-vip-Hw
 OLD_FILES+=usr/share/terminfo/Q/Q310-vip-w
 OLD_FILES+=usr/share/terminfo/Q/Q310-vip-w-am
 OLD_DIRS+=usr/share/terminfo/Q/
 OLD_FILES+=usr/share/terminfo/X/X-hpterm
 OLD_DIRS+=usr/share/terminfo/X/
 OLD_FILES+=usr/share/terminfo/a/a210
 OLD_FILES+=usr/share/terminfo/a/a80
 OLD_FILES+=usr/share/terminfo/a/a980
 OLD_FILES+=usr/share/terminfo/a/aa4080
 OLD_FILES+=usr/share/terminfo/a/aaa
 OLD_FILES+=usr/share/terminfo/a/aaa+dec
 OLD_FILES+=usr/share/terminfo/a/aaa+rv
 OLD_FILES+=usr/share/terminfo/a/aaa+unk
 OLD_FILES+=usr/share/terminfo/a/aaa-18
 OLD_FILES+=usr/share/terminfo/a/aaa-18-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-20
 OLD_FILES+=usr/share/terminfo/a/aaa-22
 OLD_FILES+=usr/share/terminfo/a/aaa-24
 OLD_FILES+=usr/share/terminfo/a/aaa-24-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-26
 OLD_FILES+=usr/share/terminfo/a/aaa-28
 OLD_FILES+=usr/share/terminfo/a/aaa-30
 OLD_FILES+=usr/share/terminfo/a/aaa-30-ctxt
 OLD_FILES+=usr/share/terminfo/a/aaa-30-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-30-rv-ctxt
 OLD_FILES+=usr/share/terminfo/a/aaa-30-s
 OLD_FILES+=usr/share/terminfo/a/aaa-30-s-ctxt
 OLD_FILES+=usr/share/terminfo/a/aaa-30-s-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-30-s-rv-ct
 OLD_FILES+=usr/share/terminfo/a/aaa-36
 OLD_FILES+=usr/share/terminfo/a/aaa-36-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-40
 OLD_FILES+=usr/share/terminfo/a/aaa-40-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-48
 OLD_FILES+=usr/share/terminfo/a/aaa-48-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-60
 OLD_FILES+=usr/share/terminfo/a/aaa-60-dec-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-60-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-60-s
 OLD_FILES+=usr/share/terminfo/a/aaa-60-s-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-ctxt
 OLD_FILES+=usr/share/terminfo/a/aaa-db
 OLD_FILES+=usr/share/terminfo/a/aaa-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-rv-ctxt
 OLD_FILES+=usr/share/terminfo/a/aaa-rv-unk
 OLD_FILES+=usr/share/terminfo/a/aaa-s
 OLD_FILES+=usr/share/terminfo/a/aaa-s-ctxt
 OLD_FILES+=usr/share/terminfo/a/aaa-s-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-s-rv-ctxt
 OLD_FILES+=usr/share/terminfo/a/aaa-unk
 OLD_FILES+=usr/share/terminfo/a/aas1901
 OLD_FILES+=usr/share/terminfo/a/abm80
 OLD_FILES+=usr/share/terminfo/a/abm85
 OLD_FILES+=usr/share/terminfo/a/abm85e
 OLD_FILES+=usr/share/terminfo/a/abm85h
 OLD_FILES+=usr/share/terminfo/a/abm85h-old
 OLD_FILES+=usr/share/terminfo/a/absolute
 OLD_FILES+=usr/share/terminfo/a/act4
 OLD_FILES+=usr/share/terminfo/a/act5
 OLD_FILES+=usr/share/terminfo/a/addrinfo
 OLD_FILES+=usr/share/terminfo/a/adds200
 OLD_FILES+=usr/share/terminfo/a/adds980
 OLD_FILES+=usr/share/terminfo/a/addsviewpoint
 OLD_FILES+=usr/share/terminfo/a/addsvp60
 OLD_FILES+=usr/share/terminfo/a/adm+sgr
 OLD_FILES+=usr/share/terminfo/a/adm1
 OLD_FILES+=usr/share/terminfo/a/adm11
 OLD_FILES+=usr/share/terminfo/a/adm1178
 OLD_FILES+=usr/share/terminfo/a/adm12
 OLD_FILES+=usr/share/terminfo/a/adm1a
 OLD_FILES+=usr/share/terminfo/a/adm2
 OLD_FILES+=usr/share/terminfo/a/adm20
 OLD_FILES+=usr/share/terminfo/a/adm21
 OLD_FILES+=usr/share/terminfo/a/adm22
 OLD_FILES+=usr/share/terminfo/a/adm3
 OLD_FILES+=usr/share/terminfo/a/adm31
 OLD_FILES+=usr/share/terminfo/a/adm31-old
 OLD_FILES+=usr/share/terminfo/a/adm36
 OLD_FILES+=usr/share/terminfo/a/adm3a
 OLD_FILES+=usr/share/terminfo/a/adm3a+
 OLD_FILES+=usr/share/terminfo/a/adm42
 OLD_FILES+=usr/share/terminfo/a/adm42-ns
 OLD_FILES+=usr/share/terminfo/a/adm5
 OLD_FILES+=usr/share/terminfo/a/aepro
 OLD_FILES+=usr/share/terminfo/a/aixterm
 OLD_FILES+=usr/share/terminfo/a/aixterm-16color
 OLD_FILES+=usr/share/terminfo/a/aixterm-m
 OLD_FILES+=usr/share/terminfo/a/aixterm-m-old
 OLD_FILES+=usr/share/terminfo/a/aj
 OLD_FILES+=usr/share/terminfo/a/aj510
 OLD_FILES+=usr/share/terminfo/a/aj830
 OLD_FILES+=usr/share/terminfo/a/aj832
 OLD_FILES+=usr/share/terminfo/a/alacritty
 OLD_FILES+=usr/share/terminfo/a/alacritty+common
 OLD_FILES+=usr/share/terminfo/a/alacritty-direct
 OLD_FILES+=usr/share/terminfo/a/alt2
 OLD_FILES+=usr/share/terminfo/a/alt3
 OLD_FILES+=usr/share/terminfo/a/alt4
 OLD_FILES+=usr/share/terminfo/a/alt5
 OLD_FILES+=usr/share/terminfo/a/alt7
 OLD_FILES+=usr/share/terminfo/a/alt7pc
 OLD_FILES+=usr/share/terminfo/a/alto-h19
 OLD_FILES+=usr/share/terminfo/a/alto-heath
 OLD_FILES+=usr/share/terminfo/a/altoh19
 OLD_FILES+=usr/share/terminfo/a/altoheath
 OLD_FILES+=usr/share/terminfo/a/altos-2
 OLD_FILES+=usr/share/terminfo/a/altos-3
 OLD_FILES+=usr/share/terminfo/a/altos-4
 OLD_FILES+=usr/share/terminfo/a/altos-5
 OLD_FILES+=usr/share/terminfo/a/altos2
 OLD_FILES+=usr/share/terminfo/a/altos3
 OLD_FILES+=usr/share/terminfo/a/altos4
 OLD_FILES+=usr/share/terminfo/a/altos5
 OLD_FILES+=usr/share/terminfo/a/altos7
 OLD_FILES+=usr/share/terminfo/a/altos7pc
 OLD_FILES+=usr/share/terminfo/a/ambas
 OLD_FILES+=usr/share/terminfo/a/ambassador
 OLD_FILES+=usr/share/terminfo/a/amiga
 OLD_FILES+=usr/share/terminfo/a/amiga-8bit
 OLD_FILES+=usr/share/terminfo/a/amiga-h
 OLD_FILES+=usr/share/terminfo/a/amiga-vnc
 OLD_FILES+=usr/share/terminfo/a/amp219
 OLD_FILES+=usr/share/terminfo/a/amp219w
 OLD_FILES+=usr/share/terminfo/a/ampex-219
 OLD_FILES+=usr/share/terminfo/a/ampex-219w
 OLD_FILES+=usr/share/terminfo/a/ampex-232
 OLD_FILES+=usr/share/terminfo/a/ampex175
 OLD_FILES+=usr/share/terminfo/a/ampex175-b
 OLD_FILES+=usr/share/terminfo/a/ampex210
 OLD_FILES+=usr/share/terminfo/a/ampex219
 OLD_FILES+=usr/share/terminfo/a/ampex219w
 OLD_FILES+=usr/share/terminfo/a/ampex232
 OLD_FILES+=usr/share/terminfo/a/ampex232w
 OLD_FILES+=usr/share/terminfo/a/ampex80
 OLD_FILES+=usr/share/terminfo/a/annarbor4080
 OLD_FILES+=usr/share/terminfo/a/ansi
 OLD_FILES+=usr/share/terminfo/a/ansi+arrows
 OLD_FILES+=usr/share/terminfo/a/ansi+csr
 OLD_FILES+=usr/share/terminfo/a/ansi+cup
 OLD_FILES+=usr/share/terminfo/a/ansi+enq
 OLD_FILES+=usr/share/terminfo/a/ansi+erase
 OLD_FILES+=usr/share/terminfo/a/ansi+idc
 OLD_FILES+=usr/share/terminfo/a/ansi+idc1
 OLD_FILES+=usr/share/terminfo/a/ansi+idl
 OLD_FILES+=usr/share/terminfo/a/ansi+idl1
 OLD_FILES+=usr/share/terminfo/a/ansi+inittabs
 OLD_FILES+=usr/share/terminfo/a/ansi+local
 OLD_FILES+=usr/share/terminfo/a/ansi+local1
 OLD_FILES+=usr/share/terminfo/a/ansi+pp
 OLD_FILES+=usr/share/terminfo/a/ansi+rca
 OLD_FILES+=usr/share/terminfo/a/ansi+rep
 OLD_FILES+=usr/share/terminfo/a/ansi+sgr
 OLD_FILES+=usr/share/terminfo/a/ansi+sgrbold
 OLD_FILES+=usr/share/terminfo/a/ansi+sgrdim
 OLD_FILES+=usr/share/terminfo/a/ansi+sgrso
 OLD_FILES+=usr/share/terminfo/a/ansi+sgrul
 OLD_FILES+=usr/share/terminfo/a/ansi+tabs
 OLD_FILES+=usr/share/terminfo/a/ansi-color-2-emx
 OLD_FILES+=usr/share/terminfo/a/ansi-color-3-emx
 OLD_FILES+=usr/share/terminfo/a/ansi-emx
 OLD_FILES+=usr/share/terminfo/a/ansi-generic
 OLD_FILES+=usr/share/terminfo/a/ansi-m
 OLD_FILES+=usr/share/terminfo/a/ansi-mini
 OLD_FILES+=usr/share/terminfo/a/ansi-mono
 OLD_FILES+=usr/share/terminfo/a/ansi-mr
 OLD_FILES+=usr/share/terminfo/a/ansi-mtabs
 OLD_FILES+=usr/share/terminfo/a/ansi-nt
 OLD_FILES+=usr/share/terminfo/a/ansi.sys
 OLD_FILES+=usr/share/terminfo/a/ansi.sys-old
 OLD_FILES+=usr/share/terminfo/a/ansi.sysk
 OLD_FILES+=usr/share/terminfo/a/ansi43m
 OLD_FILES+=usr/share/terminfo/a/ansi77
 OLD_FILES+=usr/share/terminfo/a/ansi80x25
 OLD_FILES+=usr/share/terminfo/a/ansi80x25-mono
 OLD_FILES+=usr/share/terminfo/a/ansi80x25-raw
 OLD_FILES+=usr/share/terminfo/a/ansi80x30
 OLD_FILES+=usr/share/terminfo/a/ansi80x30-mono
 OLD_FILES+=usr/share/terminfo/a/ansi80x43
 OLD_FILES+=usr/share/terminfo/a/ansi80x43-mono
 OLD_FILES+=usr/share/terminfo/a/ansi80x50
 OLD_FILES+=usr/share/terminfo/a/ansi80x50-mono
 OLD_FILES+=usr/share/terminfo/a/ansi80x60
 OLD_FILES+=usr/share/terminfo/a/ansi80x60-mono
 OLD_FILES+=usr/share/terminfo/a/ansil
 OLD_FILES+=usr/share/terminfo/a/ansil-mono
 OLD_FILES+=usr/share/terminfo/a/ansis
 OLD_FILES+=usr/share/terminfo/a/ansis-mono
 OLD_FILES+=usr/share/terminfo/a/ansisysk
 OLD_FILES+=usr/share/terminfo/a/ansiterm
 OLD_FILES+=usr/share/terminfo/a/ansiw
 OLD_FILES+=usr/share/terminfo/a/ap-vm80
 OLD_FILES+=usr/share/terminfo/a/apl
 OLD_FILES+=usr/share/terminfo/a/apollo
 OLD_FILES+=usr/share/terminfo/a/apollo_15P
 OLD_FILES+=usr/share/terminfo/a/apollo_19L
 OLD_FILES+=usr/share/terminfo/a/apollo_color
 OLD_FILES+=usr/share/terminfo/a/apple-80
 OLD_FILES+=usr/share/terminfo/a/apple-ae
 OLD_FILES+=usr/share/terminfo/a/apple-soroc
 OLD_FILES+=usr/share/terminfo/a/apple-uterm
 OLD_FILES+=usr/share/terminfo/a/apple-uterm-vb
 OLD_FILES+=usr/share/terminfo/a/apple-videx
 OLD_FILES+=usr/share/terminfo/a/apple-videx2
 OLD_FILES+=usr/share/terminfo/a/apple-videx3
 OLD_FILES+=usr/share/terminfo/a/apple-vm80
 OLD_FILES+=usr/share/terminfo/a/apple2e
 OLD_FILES+=usr/share/terminfo/a/apple2e-p
 OLD_FILES+=usr/share/terminfo/a/apple80p
 OLD_FILES+=usr/share/terminfo/a/appleII
 OLD_FILES+=usr/share/terminfo/a/appleIIc
 OLD_FILES+=usr/share/terminfo/a/appleIIe
 OLD_FILES+=usr/share/terminfo/a/appleIIgs
 OLD_FILES+=usr/share/terminfo/a/arm100
 OLD_FILES+=usr/share/terminfo/a/arm100-am
 OLD_FILES+=usr/share/terminfo/a/arm100-w
 OLD_FILES+=usr/share/terminfo/a/arm100-wam
 OLD_FILES+=usr/share/terminfo/a/at
 OLD_FILES+=usr/share/terminfo/a/at-color
 OLD_FILES+=usr/share/terminfo/a/at-m
 OLD_FILES+=usr/share/terminfo/a/at386
 OLD_FILES+=usr/share/terminfo/a/atari
 OLD_FILES+=usr/share/terminfo/a/atari-color
 OLD_FILES+=usr/share/terminfo/a/atari-m
 OLD_FILES+=usr/share/terminfo/a/atari-old
 OLD_FILES+=usr/share/terminfo/a/atari_st
 OLD_FILES+=usr/share/terminfo/a/atari_st-color
 OLD_FILES+=usr/share/terminfo/a/atarist-m
 OLD_FILES+=usr/share/terminfo/a/aterm
 OLD_FILES+=usr/share/terminfo/a/att2300
 OLD_FILES+=usr/share/terminfo/a/att2350
 OLD_FILES+=usr/share/terminfo/a/att4410
 OLD_FILES+=usr/share/terminfo/a/att4410-w
 OLD_FILES+=usr/share/terminfo/a/att4410v1
 OLD_FILES+=usr/share/terminfo/a/att4410v1-w
 OLD_FILES+=usr/share/terminfo/a/att4415
 OLD_FILES+=usr/share/terminfo/a/att4415+nl
 OLD_FILES+=usr/share/terminfo/a/att4415-nl
 OLD_FILES+=usr/share/terminfo/a/att4415-rv
 OLD_FILES+=usr/share/terminfo/a/att4415-rv-nl
 OLD_FILES+=usr/share/terminfo/a/att4415-w
 OLD_FILES+=usr/share/terminfo/a/att4415-w-nl
 OLD_FILES+=usr/share/terminfo/a/att4415-w-rv
 OLD_FILES+=usr/share/terminfo/a/att4415-w-rv-n
 OLD_FILES+=usr/share/terminfo/a/att4418
 OLD_FILES+=usr/share/terminfo/a/att4418-w
 OLD_FILES+=usr/share/terminfo/a/att4420
 OLD_FILES+=usr/share/terminfo/a/att4424
 OLD_FILES+=usr/share/terminfo/a/att4424-1
 OLD_FILES+=usr/share/terminfo/a/att4424m
 OLD_FILES+=usr/share/terminfo/a/att4425
 OLD_FILES+=usr/share/terminfo/a/att4425-nl
 OLD_FILES+=usr/share/terminfo/a/att4425-w
 OLD_FILES+=usr/share/terminfo/a/att4426
 OLD_FILES+=usr/share/terminfo/a/att500
 OLD_FILES+=usr/share/terminfo/a/att505
 OLD_FILES+=usr/share/terminfo/a/att505-24
 OLD_FILES+=usr/share/terminfo/a/att510a
 OLD_FILES+=usr/share/terminfo/a/att510d
 OLD_FILES+=usr/share/terminfo/a/att513
 OLD_FILES+=usr/share/terminfo/a/att5310
 OLD_FILES+=usr/share/terminfo/a/att5320
 OLD_FILES+=usr/share/terminfo/a/att5410
 OLD_FILES+=usr/share/terminfo/a/att5410-w
 OLD_FILES+=usr/share/terminfo/a/att5410v1
 OLD_FILES+=usr/share/terminfo/a/att5410v1-w
 OLD_FILES+=usr/share/terminfo/a/att5418
 OLD_FILES+=usr/share/terminfo/a/att5418-w
 OLD_FILES+=usr/share/terminfo/a/att5420
 OLD_FILES+=usr/share/terminfo/a/att5420+nl
 OLD_FILES+=usr/share/terminfo/a/att5420-nl
 OLD_FILES+=usr/share/terminfo/a/att5420-rv
 OLD_FILES+=usr/share/terminfo/a/att5420-rv-nl
 OLD_FILES+=usr/share/terminfo/a/att5420-w
 OLD_FILES+=usr/share/terminfo/a/att5420-w-nl
 OLD_FILES+=usr/share/terminfo/a/att5420-w-rv
 OLD_FILES+=usr/share/terminfo/a/att5420-w-rv-n
 OLD_FILES+=usr/share/terminfo/a/att5420_2
 OLD_FILES+=usr/share/terminfo/a/att5420_2-w
 OLD_FILES+=usr/share/terminfo/a/att5425
 OLD_FILES+=usr/share/terminfo/a/att5425-nl
 OLD_FILES+=usr/share/terminfo/a/att5425-w
 OLD_FILES+=usr/share/terminfo/a/att5430
 OLD_FILES+=usr/share/terminfo/a/att5620
 OLD_FILES+=usr/share/terminfo/a/att5620-1
 OLD_FILES+=usr/share/terminfo/a/att5620-24
 OLD_FILES+=usr/share/terminfo/a/att5620-34
 OLD_FILES+=usr/share/terminfo/a/att5620-s
 OLD_FILES+=usr/share/terminfo/a/att605
 OLD_FILES+=usr/share/terminfo/a/att605-pc
 OLD_FILES+=usr/share/terminfo/a/att605-w
 OLD_FILES+=usr/share/terminfo/a/att610
 OLD_FILES+=usr/share/terminfo/a/att610+cvis
 OLD_FILES+=usr/share/terminfo/a/att610+cvis0
 OLD_FILES+=usr/share/terminfo/a/att610-103k
 OLD_FILES+=usr/share/terminfo/a/att610-103k-w
 OLD_FILES+=usr/share/terminfo/a/att610-w
 OLD_FILES+=usr/share/terminfo/a/att615
 OLD_FILES+=usr/share/terminfo/a/att615-103k
 OLD_FILES+=usr/share/terminfo/a/att615-103k-w
 OLD_FILES+=usr/share/terminfo/a/att615-w
 OLD_FILES+=usr/share/terminfo/a/att620
 OLD_FILES+=usr/share/terminfo/a/att620-103k
 OLD_FILES+=usr/share/terminfo/a/att620-103k-w
 OLD_FILES+=usr/share/terminfo/a/att620-w
 OLD_FILES+=usr/share/terminfo/a/att630
 OLD_FILES+=usr/share/terminfo/a/att630-24
 OLD_FILES+=usr/share/terminfo/a/att6386
 OLD_FILES+=usr/share/terminfo/a/att700
 OLD_FILES+=usr/share/terminfo/a/att730
 OLD_FILES+=usr/share/terminfo/a/att730-24
 OLD_FILES+=usr/share/terminfo/a/att730-41
 OLD_FILES+=usr/share/terminfo/a/att7300
 OLD_FILES+=usr/share/terminfo/a/att730r
 OLD_FILES+=usr/share/terminfo/a/att730r-24
 OLD_FILES+=usr/share/terminfo/a/att730r-41
 OLD_FILES+=usr/share/terminfo/a/avatar
 OLD_FILES+=usr/share/terminfo/a/avatar0
 OLD_FILES+=usr/share/terminfo/a/avatar0+
 OLD_FILES+=usr/share/terminfo/a/avatar1
 OLD_FILES+=usr/share/terminfo/a/avt
 OLD_FILES+=usr/share/terminfo/a/avt+s
 OLD_FILES+=usr/share/terminfo/a/avt-ns
 OLD_FILES+=usr/share/terminfo/a/avt-rv
 OLD_FILES+=usr/share/terminfo/a/avt-rv-ns
 OLD_FILES+=usr/share/terminfo/a/avt-rv-s
 OLD_FILES+=usr/share/terminfo/a/avt-s
 OLD_FILES+=usr/share/terminfo/a/avt-w
 OLD_FILES+=usr/share/terminfo/a/avt-w-ns
 OLD_FILES+=usr/share/terminfo/a/avt-w-rv
 OLD_FILES+=usr/share/terminfo/a/avt-w-rv-ns
 OLD_FILES+=usr/share/terminfo/a/avt-w-rv-s
 OLD_FILES+=usr/share/terminfo/a/avt-w-s
 OLD_FILES+=usr/share/terminfo/a/aws
 OLD_FILES+=usr/share/terminfo/a/awsc
 OLD_DIRS+=usr/share/terminfo/a/
 OLD_FILES+=usr/share/terminfo/b/b-128
 OLD_FILES+=usr/share/terminfo/b/bantam
 OLD_FILES+=usr/share/terminfo/b/basic4
 OLD_FILES+=usr/share/terminfo/b/basis
 OLD_FILES+=usr/share/terminfo/b/bct510a
 OLD_FILES+=usr/share/terminfo/b/bct510d
 OLD_FILES+=usr/share/terminfo/b/beacon
 OLD_FILES+=usr/share/terminfo/b/bee
 OLD_FILES+=usr/share/terminfo/b/beehive
 OLD_FILES+=usr/share/terminfo/b/beehive3
 OLD_FILES+=usr/share/terminfo/b/beehive4
 OLD_FILES+=usr/share/terminfo/b/beehiveIIIm
 OLD_FILES+=usr/share/terminfo/b/beterm
 OLD_FILES+=usr/share/terminfo/b/bg1.25
 OLD_FILES+=usr/share/terminfo/b/bg1.25nv
 OLD_FILES+=usr/share/terminfo/b/bg1.25rv
 OLD_FILES+=usr/share/terminfo/b/bg2.0
 OLD_FILES+=usr/share/terminfo/b/bg2.0nv
 OLD_FILES+=usr/share/terminfo/b/bg2.0rv
 OLD_FILES+=usr/share/terminfo/b/bg3.10
 OLD_FILES+=usr/share/terminfo/b/bg3.10nv
 OLD_FILES+=usr/share/terminfo/b/bg3.10rv
 OLD_FILES+=usr/share/terminfo/b/bh3m
 OLD_FILES+=usr/share/terminfo/b/bh4
 OLD_FILES+=usr/share/terminfo/b/bitgraph
 OLD_FILES+=usr/share/terminfo/b/blit
 OLD_FILES+=usr/share/terminfo/b/bobcat
 OLD_FILES+=usr/share/terminfo/b/bq300
 OLD_FILES+=usr/share/terminfo/b/bq300-8
 OLD_FILES+=usr/share/terminfo/b/bq300-8-pc
 OLD_FILES+=usr/share/terminfo/b/bq300-8-pc-rv
 OLD_FILES+=usr/share/terminfo/b/bq300-8-pc-w
 OLD_FILES+=usr/share/terminfo/b/bq300-8-pc-w-rv
 OLD_FILES+=usr/share/terminfo/b/bq300-8rv
 OLD_FILES+=usr/share/terminfo/b/bq300-8w
 OLD_FILES+=usr/share/terminfo/b/bq300-pc
 OLD_FILES+=usr/share/terminfo/b/bq300-pc-rv
 OLD_FILES+=usr/share/terminfo/b/bq300-pc-w
 OLD_FILES+=usr/share/terminfo/b/bq300-pc-w-rv
 OLD_FILES+=usr/share/terminfo/b/bq300-rv
 OLD_FILES+=usr/share/terminfo/b/bq300-w
 OLD_FILES+=usr/share/terminfo/b/bq300-w-8rv
 OLD_FILES+=usr/share/terminfo/b/bq300-w-rv
 OLD_FILES+=usr/share/terminfo/b/bsdos-pc
 OLD_FILES+=usr/share/terminfo/b/bsdos-pc-m
 OLD_FILES+=usr/share/terminfo/b/bsdos-pc-mono
 OLD_FILES+=usr/share/terminfo/b/bsdos-pc-nobold
 OLD_FILES+=usr/share/terminfo/b/bsdos-ppc
 OLD_FILES+=usr/share/terminfo/b/bsdos-sparc
 OLD_FILES+=usr/share/terminfo/b/bterm
 OLD_DIRS+=usr/share/terminfo/b/
 OLD_FILES+=usr/share/terminfo/c/c100
 OLD_FILES+=usr/share/terminfo/c/c100-1p
 OLD_FILES+=usr/share/terminfo/c/c100-4p
 OLD_FILES+=usr/share/terminfo/c/c100-rv
 OLD_FILES+=usr/share/terminfo/c/c100-rv-4p
 OLD_FILES+=usr/share/terminfo/c/c104
 OLD_FILES+=usr/share/terminfo/c/c108
 OLD_FILES+=usr/share/terminfo/c/c108-4p
 OLD_FILES+=usr/share/terminfo/c/c108-8p
 OLD_FILES+=usr/share/terminfo/c/c108-rv
 OLD_FILES+=usr/share/terminfo/c/c108-rv-4p
 OLD_FILES+=usr/share/terminfo/c/c108-rv-8p
 OLD_FILES+=usr/share/terminfo/c/c108-w
 OLD_FILES+=usr/share/terminfo/c/c108-w-8p
 OLD_FILES+=usr/share/terminfo/c/c300
 OLD_FILES+=usr/share/terminfo/c/c301
 OLD_FILES+=usr/share/terminfo/c/c321
 OLD_FILES+=usr/share/terminfo/c/ca22851
 OLD_FILES+=usr/share/terminfo/c/cad68-2
 OLD_FILES+=usr/share/terminfo/c/cad68-3
 OLD_FILES+=usr/share/terminfo/c/cbblit
 OLD_FILES+=usr/share/terminfo/c/cbunix
 OLD_FILES+=usr/share/terminfo/c/cci
 OLD_FILES+=usr/share/terminfo/c/cci1
 OLD_FILES+=usr/share/terminfo/c/cdc456
 OLD_FILES+=usr/share/terminfo/c/cdc721
 OLD_FILES+=usr/share/terminfo/c/cdc721-esc
 OLD_FILES+=usr/share/terminfo/c/cdc721ll
 OLD_FILES+=usr/share/terminfo/c/cdc752
 OLD_FILES+=usr/share/terminfo/c/cdc756
 OLD_FILES+=usr/share/terminfo/c/cg7900
 OLD_FILES+=usr/share/terminfo/c/cgc2
 OLD_FILES+=usr/share/terminfo/c/cgc3
 OLD_FILES+=usr/share/terminfo/c/chromatics
 OLD_FILES+=usr/share/terminfo/c/ci8510
 OLD_FILES+=usr/share/terminfo/c/cit-80
 OLD_FILES+=usr/share/terminfo/c/cit101
 OLD_FILES+=usr/share/terminfo/c/cit101e
 OLD_FILES+=usr/share/terminfo/c/cit101e-132
 OLD_FILES+=usr/share/terminfo/c/cit101e-n
 OLD_FILES+=usr/share/terminfo/c/cit101e-n132
 OLD_FILES+=usr/share/terminfo/c/cit101e-rv
 OLD_FILES+=usr/share/terminfo/c/cit500
 OLD_FILES+=usr/share/terminfo/c/cit80
 OLD_FILES+=usr/share/terminfo/c/citc
 OLD_FILES+=usr/share/terminfo/c/citoh
 OLD_FILES+=usr/share/terminfo/c/citoh-6lpi
 OLD_FILES+=usr/share/terminfo/c/citoh-8lpi
 OLD_FILES+=usr/share/terminfo/c/citoh-comp
 OLD_FILES+=usr/share/terminfo/c/citoh-elite
 OLD_FILES+=usr/share/terminfo/c/citoh-pica
 OLD_FILES+=usr/share/terminfo/c/citoh-prop
 OLD_FILES+=usr/share/terminfo/c/citoh-ps
 OLD_FILES+=usr/share/terminfo/c/coco3
 OLD_FILES+=usr/share/terminfo/c/coherent
 OLD_FILES+=usr/share/terminfo/c/color_xterm
 OLD_FILES+=usr/share/terminfo/c/colorscan
 OLD_FILES+=usr/share/terminfo/c/commodore
 OLD_FILES+=usr/share/terminfo/c/concept
 OLD_FILES+=usr/share/terminfo/c/concept-avt
 OLD_FILES+=usr/share/terminfo/c/concept100
 OLD_FILES+=usr/share/terminfo/c/concept100-rv
 OLD_FILES+=usr/share/terminfo/c/concept108
 OLD_FILES+=usr/share/terminfo/c/concept108-4p
 OLD_FILES+=usr/share/terminfo/c/concept108-8p
 OLD_FILES+=usr/share/terminfo/c/concept108-w-8
 OLD_FILES+=usr/share/terminfo/c/concept108-w8p
 OLD_FILES+=usr/share/terminfo/c/concept108rv4p
 OLD_FILES+=usr/share/terminfo/c/cons25
 OLD_FILES+=usr/share/terminfo/c/cons25-debian
 OLD_FILES+=usr/share/terminfo/c/cons25-iso-m
 OLD_FILES+=usr/share/terminfo/c/cons25-iso8859
 OLD_FILES+=usr/share/terminfo/c/cons25-koi8-r
 OLD_FILES+=usr/share/terminfo/c/cons25-koi8r-m
 OLD_FILES+=usr/share/terminfo/c/cons25-m
 OLD_FILES+=usr/share/terminfo/c/cons25l1
 OLD_FILES+=usr/share/terminfo/c/cons25l1-m
 OLD_FILES+=usr/share/terminfo/c/cons25r
 OLD_FILES+=usr/share/terminfo/c/cons25r-m
 OLD_FILES+=usr/share/terminfo/c/cons25w
 OLD_FILES+=usr/share/terminfo/c/cons30
 OLD_FILES+=usr/share/terminfo/c/cons30-m
 OLD_FILES+=usr/share/terminfo/c/cons43
 OLD_FILES+=usr/share/terminfo/c/cons43-m
 OLD_FILES+=usr/share/terminfo/c/cons50
 OLD_FILES+=usr/share/terminfo/c/cons50-iso-m
 OLD_FILES+=usr/share/terminfo/c/cons50-iso8859
 OLD_FILES+=usr/share/terminfo/c/cons50-koi8r
 OLD_FILES+=usr/share/terminfo/c/cons50-koi8r-m
 OLD_FILES+=usr/share/terminfo/c/cons50-m
 OLD_FILES+=usr/share/terminfo/c/cons50l1
 OLD_FILES+=usr/share/terminfo/c/cons50l1-m
 OLD_FILES+=usr/share/terminfo/c/cons50r
 OLD_FILES+=usr/share/terminfo/c/cons50r-m
 OLD_FILES+=usr/share/terminfo/c/cons60
 OLD_FILES+=usr/share/terminfo/c/cons60-iso
 OLD_FILES+=usr/share/terminfo/c/cons60-iso-m
 OLD_FILES+=usr/share/terminfo/c/cons60-koi8r
 OLD_FILES+=usr/share/terminfo/c/cons60-koi8r-m
 OLD_FILES+=usr/share/terminfo/c/cons60-m
 OLD_FILES+=usr/share/terminfo/c/cons60l1
 OLD_FILES+=usr/share/terminfo/c/cons60l1-m
 OLD_FILES+=usr/share/terminfo/c/cons60r
 OLD_FILES+=usr/share/terminfo/c/cons60r-m
 OLD_FILES+=usr/share/terminfo/c/contel300
 OLD_FILES+=usr/share/terminfo/c/contel301
 OLD_FILES+=usr/share/terminfo/c/contel320
 OLD_FILES+=usr/share/terminfo/c/contel321
 OLD_FILES+=usr/share/terminfo/c/cops
 OLD_FILES+=usr/share/terminfo/c/cops-10
 OLD_FILES+=usr/share/terminfo/c/cops10
 OLD_FILES+=usr/share/terminfo/c/crt
 OLD_FILES+=usr/share/terminfo/c/crt-vt220
 OLD_FILES+=usr/share/terminfo/c/cs10
 OLD_FILES+=usr/share/terminfo/c/cs10-w
 OLD_FILES+=usr/share/terminfo/c/ct82
 OLD_FILES+=usr/share/terminfo/c/ct8500
 OLD_FILES+=usr/share/terminfo/c/ctrm
 OLD_FILES+=usr/share/terminfo/c/cx
 OLD_FILES+=usr/share/terminfo/c/cx100
 OLD_FILES+=usr/share/terminfo/c/cyb110
 OLD_FILES+=usr/share/terminfo/c/cyb83
 OLD_FILES+=usr/share/terminfo/c/cygwin
 OLD_FILES+=usr/share/terminfo/c/cygwinB19
 OLD_FILES+=usr/share/terminfo/c/cygwinDBG
 OLD_DIRS+=usr/share/terminfo/c/
 OLD_FILES+=usr/share/terminfo/d/d132
 OLD_FILES+=usr/share/terminfo/d/d2
 OLD_FILES+=usr/share/terminfo/d/d2-dg
 OLD_FILES+=usr/share/terminfo/d/d200
 OLD_FILES+=usr/share/terminfo/d/d200-dg
 OLD_FILES+=usr/share/terminfo/d/d210
 OLD_FILES+=usr/share/terminfo/d/d210-dg
 OLD_FILES+=usr/share/terminfo/d/d211
 OLD_FILES+=usr/share/terminfo/d/d211-7b
 OLD_FILES+=usr/share/terminfo/d/d211-dg
 OLD_FILES+=usr/share/terminfo/d/d214
 OLD_FILES+=usr/share/terminfo/d/d214-dg
 OLD_FILES+=usr/share/terminfo/d/d215
 OLD_FILES+=usr/share/terminfo/d/d215-7b
 OLD_FILES+=usr/share/terminfo/d/d215-dg
 OLD_FILES+=usr/share/terminfo/d/d216+
 OLD_FILES+=usr/share/terminfo/d/d216+25
 OLD_FILES+=usr/share/terminfo/d/d216+dg
 OLD_FILES+=usr/share/terminfo/d/d216-dg
 OLD_FILES+=usr/share/terminfo/d/d216-unix
 OLD_FILES+=usr/share/terminfo/d/d216-unix-25
 OLD_FILES+=usr/share/terminfo/d/d216e+
 OLD_FILES+=usr/share/terminfo/d/d216e+dg
 OLD_FILES+=usr/share/terminfo/d/d216e-dg
 OLD_FILES+=usr/share/terminfo/d/d216e-unix
 OLD_FILES+=usr/share/terminfo/d/d217-dg
 OLD_FILES+=usr/share/terminfo/d/d217-unix
 OLD_FILES+=usr/share/terminfo/d/d217-unix-25
 OLD_FILES+=usr/share/terminfo/d/d220
 OLD_FILES+=usr/share/terminfo/d/d220-7b
 OLD_FILES+=usr/share/terminfo/d/d220-dg
 OLD_FILES+=usr/share/terminfo/d/d230
 OLD_FILES+=usr/share/terminfo/d/d230-dg
 OLD_FILES+=usr/share/terminfo/d/d230c
 OLD_FILES+=usr/share/terminfo/d/d230c-dg
 OLD_FILES+=usr/share/terminfo/d/d400
 OLD_FILES+=usr/share/terminfo/d/d400-dg
 OLD_FILES+=usr/share/terminfo/d/d410
 OLD_FILES+=usr/share/terminfo/d/d410-7b
 OLD_FILES+=usr/share/terminfo/d/d410-7b-w
 OLD_FILES+=usr/share/terminfo/d/d410-dg
 OLD_FILES+=usr/share/terminfo/d/d410-w
 OLD_FILES+=usr/share/terminfo/d/d411
 OLD_FILES+=usr/share/terminfo/d/d411-7b
 OLD_FILES+=usr/share/terminfo/d/d411-7b-w
 OLD_FILES+=usr/share/terminfo/d/d411-dg
 OLD_FILES+=usr/share/terminfo/d/d411-w
 OLD_FILES+=usr/share/terminfo/d/d412+
 OLD_FILES+=usr/share/terminfo/d/d412+25
 OLD_FILES+=usr/share/terminfo/d/d412+dg
 OLD_FILES+=usr/share/terminfo/d/d412+s
 OLD_FILES+=usr/share/terminfo/d/d412+sr
 OLD_FILES+=usr/share/terminfo/d/d412+w
 OLD_FILES+=usr/share/terminfo/d/d412-dg
 OLD_FILES+=usr/share/terminfo/d/d412-unix
 OLD_FILES+=usr/share/terminfo/d/d412-unix-25
 OLD_FILES+=usr/share/terminfo/d/d412-unix-s
 OLD_FILES+=usr/share/terminfo/d/d412-unix-sr
 OLD_FILES+=usr/share/terminfo/d/d412-unix-w
 OLD_FILES+=usr/share/terminfo/d/d413-dg
 OLD_FILES+=usr/share/terminfo/d/d413-unix
 OLD_FILES+=usr/share/terminfo/d/d413-unix-25
 OLD_FILES+=usr/share/terminfo/d/d413-unix-s
 OLD_FILES+=usr/share/terminfo/d/d413-unix-sr
 OLD_FILES+=usr/share/terminfo/d/d413-unix-w
 OLD_FILES+=usr/share/terminfo/d/d414-unix
 OLD_FILES+=usr/share/terminfo/d/d414-unix-25
 OLD_FILES+=usr/share/terminfo/d/d414-unix-s
 OLD_FILES+=usr/share/terminfo/d/d414-unix-sr
 OLD_FILES+=usr/share/terminfo/d/d414-unix-w
 OLD_FILES+=usr/share/terminfo/d/d430-dg
 OLD_FILES+=usr/share/terminfo/d/d430-dg-ccc
 OLD_FILES+=usr/share/terminfo/d/d430-unix
 OLD_FILES+=usr/share/terminfo/d/d430-unix-25
 OLD_FILES+=usr/share/terminfo/d/d430-unix-25-ccc
 OLD_FILES+=usr/share/terminfo/d/d430-unix-ccc
 OLD_FILES+=usr/share/terminfo/d/d430-unix-s
 OLD_FILES+=usr/share/terminfo/d/d430-unix-s-ccc
 OLD_FILES+=usr/share/terminfo/d/d430-unix-sr
 OLD_FILES+=usr/share/terminfo/d/d430-unix-sr-ccc
 OLD_FILES+=usr/share/terminfo/d/d430-unix-w
 OLD_FILES+=usr/share/terminfo/d/d430-unix-w-ccc
 OLD_FILES+=usr/share/terminfo/d/d430c-dg
 OLD_FILES+=usr/share/terminfo/d/d430c-dg-ccc
 OLD_FILES+=usr/share/terminfo/d/d430c-unix
 OLD_FILES+=usr/share/terminfo/d/d430c-unix-25
 OLD_FILES+=usr/share/terminfo/d/d430c-unix-25-ccc
 OLD_FILES+=usr/share/terminfo/d/d430c-unix-ccc
 OLD_FILES+=usr/share/terminfo/d/d430c-unix-s
 OLD_FILES+=usr/share/terminfo/d/d430c-unix-s-ccc
 OLD_FILES+=usr/share/terminfo/d/d430c-unix-sr
 OLD_FILES+=usr/share/terminfo/d/d430c-unix-sr-ccc
 OLD_FILES+=usr/share/terminfo/d/d430c-unix-w
 OLD_FILES+=usr/share/terminfo/d/d430c-unix-w-ccc
 OLD_FILES+=usr/share/terminfo/d/d450
 OLD_FILES+=usr/share/terminfo/d/d450-dg
 OLD_FILES+=usr/share/terminfo/d/d460
 OLD_FILES+=usr/share/terminfo/d/d460-7b
 OLD_FILES+=usr/share/terminfo/d/d460-7b-w
 OLD_FILES+=usr/share/terminfo/d/d460-dg
 OLD_FILES+=usr/share/terminfo/d/d460-w
 OLD_FILES+=usr/share/terminfo/d/d461
 OLD_FILES+=usr/share/terminfo/d/d461-7b
 OLD_FILES+=usr/share/terminfo/d/d461-7b-w
 OLD_FILES+=usr/share/terminfo/d/d461-dg
 OLD_FILES+=usr/share/terminfo/d/d461-w
 OLD_FILES+=usr/share/terminfo/d/d462+
 OLD_FILES+=usr/share/terminfo/d/d462+25
 OLD_FILES+=usr/share/terminfo/d/d462+dg
 OLD_FILES+=usr/share/terminfo/d/d462+s
 OLD_FILES+=usr/share/terminfo/d/d462+sr
 OLD_FILES+=usr/share/terminfo/d/d462+w
 OLD_FILES+=usr/share/terminfo/d/d462-dg
 OLD_FILES+=usr/share/terminfo/d/d462-unix
 OLD_FILES+=usr/share/terminfo/d/d462-unix-25
 OLD_FILES+=usr/share/terminfo/d/d462-unix-s
 OLD_FILES+=usr/share/terminfo/d/d462-unix-sr
 OLD_FILES+=usr/share/terminfo/d/d462-unix-w
 OLD_FILES+=usr/share/terminfo/d/d462e-dg
 OLD_FILES+=usr/share/terminfo/d/d463-dg
 OLD_FILES+=usr/share/terminfo/d/d463-unix
 OLD_FILES+=usr/share/terminfo/d/d463-unix-25
 OLD_FILES+=usr/share/terminfo/d/d463-unix-s
 OLD_FILES+=usr/share/terminfo/d/d463-unix-sr
 OLD_FILES+=usr/share/terminfo/d/d463-unix-w
 OLD_FILES+=usr/share/terminfo/d/d464-unix
 OLD_FILES+=usr/share/terminfo/d/d464-unix-25
 OLD_FILES+=usr/share/terminfo/d/d464-unix-s
 OLD_FILES+=usr/share/terminfo/d/d464-unix-sr
 OLD_FILES+=usr/share/terminfo/d/d464-unix-w
 OLD_FILES+=usr/share/terminfo/d/d470
 OLD_FILES+=usr/share/terminfo/d/d470-7b
 OLD_FILES+=usr/share/terminfo/d/d470-dg
 OLD_FILES+=usr/share/terminfo/d/d470c
 OLD_FILES+=usr/share/terminfo/d/d470c-7b
 OLD_FILES+=usr/share/terminfo/d/d470c-dg
 OLD_FILES+=usr/share/terminfo/d/d555
 OLD_FILES+=usr/share/terminfo/d/d555-7b
 OLD_FILES+=usr/share/terminfo/d/d555-7b-w
 OLD_FILES+=usr/share/terminfo/d/d555-dg
 OLD_FILES+=usr/share/terminfo/d/d555-w
 OLD_FILES+=usr/share/terminfo/d/d577
 OLD_FILES+=usr/share/terminfo/d/d577-7b
 OLD_FILES+=usr/share/terminfo/d/d577-7b-w
 OLD_FILES+=usr/share/terminfo/d/d577-dg
 OLD_FILES+=usr/share/terminfo/d/d577-w
 OLD_FILES+=usr/share/terminfo/d/d578
 OLD_FILES+=usr/share/terminfo/d/d578-7b
 OLD_FILES+=usr/share/terminfo/d/d578-dg
 OLD_FILES+=usr/share/terminfo/d/d80
 OLD_FILES+=usr/share/terminfo/d/d800
 OLD_FILES+=usr/share/terminfo/d/darwin
 OLD_FILES+=usr/share/terminfo/d/darwin-100x37
 OLD_FILES+=usr/share/terminfo/d/darwin-100x37-m
 OLD_FILES+=usr/share/terminfo/d/darwin-112x37
 OLD_FILES+=usr/share/terminfo/d/darwin-112x37-m
 OLD_FILES+=usr/share/terminfo/d/darwin-128x40
 OLD_FILES+=usr/share/terminfo/d/darwin-128x40-m
 OLD_FILES+=usr/share/terminfo/d/darwin-128x48
 OLD_FILES+=usr/share/terminfo/d/darwin-128x48-m
 OLD_FILES+=usr/share/terminfo/d/darwin-144x48
 OLD_FILES+=usr/share/terminfo/d/darwin-144x48-m
 OLD_FILES+=usr/share/terminfo/d/darwin-160x64
 OLD_FILES+=usr/share/terminfo/d/darwin-160x64-m
 OLD_FILES+=usr/share/terminfo/d/darwin-200x64
 OLD_FILES+=usr/share/terminfo/d/darwin-200x64-m
 OLD_FILES+=usr/share/terminfo/d/darwin-200x75
 OLD_FILES+=usr/share/terminfo/d/darwin-200x75-m
 OLD_FILES+=usr/share/terminfo/d/darwin-256x96
 OLD_FILES+=usr/share/terminfo/d/darwin-256x96-m
 OLD_FILES+=usr/share/terminfo/d/darwin-80x25
 OLD_FILES+=usr/share/terminfo/d/darwin-80x25-m
 OLD_FILES+=usr/share/terminfo/d/darwin-80x30
 OLD_FILES+=usr/share/terminfo/d/darwin-80x30-m
 OLD_FILES+=usr/share/terminfo/d/darwin-90x30
 OLD_FILES+=usr/share/terminfo/d/darwin-90x30-m
 OLD_FILES+=usr/share/terminfo/d/darwin-b
 OLD_FILES+=usr/share/terminfo/d/darwin-f
 OLD_FILES+=usr/share/terminfo/d/darwin-f2
 OLD_FILES+=usr/share/terminfo/d/darwin-m
 OLD_FILES+=usr/share/terminfo/d/darwin-m-b
 OLD_FILES+=usr/share/terminfo/d/darwin-m-f
 OLD_FILES+=usr/share/terminfo/d/darwin-m-f2
 OLD_FILES+=usr/share/terminfo/d/datagraphix
 OLD_FILES+=usr/share/terminfo/d/datamedia2500
 OLD_FILES+=usr/share/terminfo/d/datapoint
 OLD_FILES+=usr/share/terminfo/d/dataspeed40
 OLD_FILES+=usr/share/terminfo/d/dd5000
 OLD_FILES+=usr/share/terminfo/d/ddr
 OLD_FILES+=usr/share/terminfo/d/ddr3180
 OLD_FILES+=usr/share/terminfo/d/dec+pp
 OLD_FILES+=usr/share/terminfo/d/dec+sl
 OLD_FILES+=usr/share/terminfo/d/dec-vt100
 OLD_FILES+=usr/share/terminfo/d/dec-vt220
 OLD_FILES+=usr/share/terminfo/d/dec-vt330
 OLD_FILES+=usr/share/terminfo/d/dec-vt340
 OLD_FILES+=usr/share/terminfo/d/dec-vt400
 OLD_FILES+=usr/share/terminfo/d/decansi
 OLD_FILES+=usr/share/terminfo/d/decpro
 OLD_FILES+=usr/share/terminfo/d/decwriter
 OLD_FILES+=usr/share/terminfo/d/delta
 OLD_FILES+=usr/share/terminfo/d/dg+ccc
 OLD_FILES+=usr/share/terminfo/d/dg+color
 OLD_FILES+=usr/share/terminfo/d/dg+color8
 OLD_FILES+=usr/share/terminfo/d/dg+fixed
 OLD_FILES+=usr/share/terminfo/d/dg-ansi
 OLD_FILES+=usr/share/terminfo/d/dg-generic
 OLD_FILES+=usr/share/terminfo/d/dg100
 OLD_FILES+=usr/share/terminfo/d/dg200
 OLD_FILES+=usr/share/terminfo/d/dg210
 OLD_FILES+=usr/share/terminfo/d/dg211
 OLD_FILES+=usr/share/terminfo/d/dg450
 OLD_FILES+=usr/share/terminfo/d/dg460-ansi
 OLD_FILES+=usr/share/terminfo/d/dg6053
 OLD_FILES+=usr/share/terminfo/d/dg6053-old
 OLD_FILES+=usr/share/terminfo/d/dg605x
 OLD_FILES+=usr/share/terminfo/d/dg6134
 OLD_FILES+=usr/share/terminfo/d/dgkeys+11
 OLD_FILES+=usr/share/terminfo/d/dgkeys+15
 OLD_FILES+=usr/share/terminfo/d/dgkeys+7b
 OLD_FILES+=usr/share/terminfo/d/dgkeys+8b
 OLD_FILES+=usr/share/terminfo/d/dgmode+color
 OLD_FILES+=usr/share/terminfo/d/dgmode+color8
 OLD_FILES+=usr/share/terminfo/d/dgunix+ccc
 OLD_FILES+=usr/share/terminfo/d/dgunix+fixed
 OLD_FILES+=usr/share/terminfo/d/diablo
 OLD_FILES+=usr/share/terminfo/d/diablo-lm
 OLD_FILES+=usr/share/terminfo/d/diablo1620
 OLD_FILES+=usr/share/terminfo/d/diablo1620-m8
 OLD_FILES+=usr/share/terminfo/d/diablo1640
 OLD_FILES+=usr/share/terminfo/d/diablo1640-lm
 OLD_FILES+=usr/share/terminfo/d/diablo1640-m8
 OLD_FILES+=usr/share/terminfo/d/diablo1720
 OLD_FILES+=usr/share/terminfo/d/diablo1730
 OLD_FILES+=usr/share/terminfo/d/diablo1740
 OLD_FILES+=usr/share/terminfo/d/diablo1740-lm
 OLD_FILES+=usr/share/terminfo/d/diablo450
 OLD_FILES+=usr/share/terminfo/d/diablo630
 OLD_FILES+=usr/share/terminfo/d/dialogue
 OLD_FILES+=usr/share/terminfo/d/dialogue80
 OLD_FILES+=usr/share/terminfo/d/digilog
 OLD_FILES+=usr/share/terminfo/d/djgpp
 OLD_FILES+=usr/share/terminfo/d/djgpp203
 OLD_FILES+=usr/share/terminfo/d/djgpp204
 OLD_FILES+=usr/share/terminfo/d/dku7003
 OLD_FILES+=usr/share/terminfo/d/dku7003-dumb
 OLD_FILES+=usr/share/terminfo/d/dku7102
 OLD_FILES+=usr/share/terminfo/d/dku7102-old
 OLD_FILES+=usr/share/terminfo/d/dku7102-sna
 OLD_FILES+=usr/share/terminfo/d/dku7103-sna
 OLD_FILES+=usr/share/terminfo/d/dku7202
 OLD_FILES+=usr/share/terminfo/d/dm1520
 OLD_FILES+=usr/share/terminfo/d/dm1521
 OLD_FILES+=usr/share/terminfo/d/dm2500
 OLD_FILES+=usr/share/terminfo/d/dm3025
 OLD_FILES+=usr/share/terminfo/d/dm3045
 OLD_FILES+=usr/share/terminfo/d/dm80
 OLD_FILES+=usr/share/terminfo/d/dm80w
 OLD_FILES+=usr/share/terminfo/d/dmchat
 OLD_FILES+=usr/share/terminfo/d/dmd
 OLD_FILES+=usr/share/terminfo/d/dmd-24
 OLD_FILES+=usr/share/terminfo/d/dmd-34
 OLD_FILES+=usr/share/terminfo/d/dmd1
 OLD_FILES+=usr/share/terminfo/d/dmdt80
 OLD_FILES+=usr/share/terminfo/d/dmdt80w
 OLD_FILES+=usr/share/terminfo/d/dmterm
 OLD_FILES+=usr/share/terminfo/d/domterm
 OLD_FILES+=usr/share/terminfo/d/dp3360
 OLD_FILES+=usr/share/terminfo/d/dp8242
 OLD_FILES+=usr/share/terminfo/d/ds40
 OLD_FILES+=usr/share/terminfo/d/ds40-2
 OLD_FILES+=usr/share/terminfo/d/dt-100
 OLD_FILES+=usr/share/terminfo/d/dt-100w
 OLD_FILES+=usr/share/terminfo/d/dt100
 OLD_FILES+=usr/share/terminfo/d/dt100w
 OLD_FILES+=usr/share/terminfo/d/dt110
 OLD_FILES+=usr/share/terminfo/d/dt80
 OLD_FILES+=usr/share/terminfo/d/dt80-sas
 OLD_FILES+=usr/share/terminfo/d/dt80w
 OLD_FILES+=usr/share/terminfo/d/dtc300s
 OLD_FILES+=usr/share/terminfo/d/dtc382
 OLD_FILES+=usr/share/terminfo/d/dtterm
 OLD_FILES+=usr/share/terminfo/d/dumb
 OLD_FILES+=usr/share/terminfo/d/dumb-emacs-ansi
 OLD_FILES+=usr/share/terminfo/d/dvtm
 OLD_FILES+=usr/share/terminfo/d/dvtm-256color
 OLD_FILES+=usr/share/terminfo/d/dw
 OLD_FILES+=usr/share/terminfo/d/dw1
 OLD_FILES+=usr/share/terminfo/d/dw2
 OLD_FILES+=usr/share/terminfo/d/dw3
 OLD_FILES+=usr/share/terminfo/d/dw4
 OLD_FILES+=usr/share/terminfo/d/dwk
 OLD_FILES+=usr/share/terminfo/d/dwk-vt
 OLD_DIRS+=usr/share/terminfo/d/
 OLD_FILES+=usr/share/terminfo/e/ecma+color
 OLD_FILES+=usr/share/terminfo/e/ecma+index
 OLD_FILES+=usr/share/terminfo/e/ecma+italics
 OLD_FILES+=usr/share/terminfo/e/ecma+sgr
 OLD_FILES+=usr/share/terminfo/e/ecma+strikeout
 OLD_FILES+=usr/share/terminfo/e/elks
 OLD_FILES+=usr/share/terminfo/e/elks-ansi
 OLD_FILES+=usr/share/terminfo/e/elks-glasstty
 OLD_FILES+=usr/share/terminfo/e/elks-vt52
 OLD_FILES+=usr/share/terminfo/e/emots
 OLD_FILES+=usr/share/terminfo/e/emu
 OLD_FILES+=usr/share/terminfo/e/emu-220
 OLD_FILES+=usr/share/terminfo/e/emx-base
 OLD_FILES+=usr/share/terminfo/e/env230
 OLD_FILES+=usr/share/terminfo/e/envision230
 OLD_FILES+=usr/share/terminfo/e/ep40
 OLD_FILES+=usr/share/terminfo/e/ep4000
 OLD_FILES+=usr/share/terminfo/e/ep4080
 OLD_FILES+=usr/share/terminfo/e/ep48
 OLD_FILES+=usr/share/terminfo/e/ergo4000
 OLD_FILES+=usr/share/terminfo/e/esprit
 OLD_FILES+=usr/share/terminfo/e/esprit-am
 OLD_FILES+=usr/share/terminfo/e/eterm
 OLD_FILES+=usr/share/terminfo/e/eterm-color
 OLD_FILES+=usr/share/terminfo/e/ex155
 OLD_FILES+=usr/share/terminfo/e/excel62
 OLD_FILES+=usr/share/terminfo/e/excel62-rv
 OLD_FILES+=usr/share/terminfo/e/excel62-w
 OLD_FILES+=usr/share/terminfo/e/excel64
 OLD_FILES+=usr/share/terminfo/e/excel64-rv
 OLD_FILES+=usr/share/terminfo/e/excel64-w
 OLD_FILES+=usr/share/terminfo/e/exec80
 OLD_DIRS+=usr/share/terminfo/e/
 OLD_FILES+=usr/share/terminfo/f/f100
 OLD_FILES+=usr/share/terminfo/f/f100-rv
 OLD_FILES+=usr/share/terminfo/f/f110
 OLD_FILES+=usr/share/terminfo/f/f110-14
 OLD_FILES+=usr/share/terminfo/f/f110-14w
 OLD_FILES+=usr/share/terminfo/f/f110-w
 OLD_FILES+=usr/share/terminfo/f/f1720
 OLD_FILES+=usr/share/terminfo/f/f1720a
 OLD_FILES+=usr/share/terminfo/f/f200
 OLD_FILES+=usr/share/terminfo/f/f200-w
 OLD_FILES+=usr/share/terminfo/f/f200vi
 OLD_FILES+=usr/share/terminfo/f/f200vi-w
 OLD_FILES+=usr/share/terminfo/f/falco
 OLD_FILES+=usr/share/terminfo/f/falco-p
 OLD_FILES+=usr/share/terminfo/f/fbterm
 OLD_FILES+=usr/share/terminfo/f/fenix
 OLD_FILES+=usr/share/terminfo/f/fenixw
 OLD_FILES+=usr/share/terminfo/f/fixterm
 OLD_FILES+=usr/share/terminfo/f/fortune
 OLD_FILES+=usr/share/terminfo/f/fos
 OLD_FILES+=usr/share/terminfo/f/fox
 OLD_FILES+=usr/share/terminfo/f/freedom
 OLD_FILES+=usr/share/terminfo/f/freedom-rv
 OLD_FILES+=usr/share/terminfo/f/freedom100
 OLD_FILES+=usr/share/terminfo/f/freedom110
 OLD_FILES+=usr/share/terminfo/f/freedom200
 OLD_DIRS+=usr/share/terminfo/f/
 OLD_FILES+=usr/share/terminfo/g/gator
 OLD_FILES+=usr/share/terminfo/g/gator-52
 OLD_FILES+=usr/share/terminfo/g/gator-52t
 OLD_FILES+=usr/share/terminfo/g/gator-t
 OLD_FILES+=usr/share/terminfo/g/gigi
 OLD_FILES+=usr/share/terminfo/g/glasstty
 OLD_FILES+=usr/share/terminfo/g/gnome
 OLD_FILES+=usr/share/terminfo/g/gnome+pcfkeys
 OLD_FILES+=usr/share/terminfo/g/gnome-2007
 OLD_FILES+=usr/share/terminfo/g/gnome-2008
 OLD_FILES+=usr/share/terminfo/g/gnome-2012
 OLD_FILES+=usr/share/terminfo/g/gnome-256color
 OLD_FILES+=usr/share/terminfo/g/gnome-fc5
 OLD_FILES+=usr/share/terminfo/g/gnome-rh62
 OLD_FILES+=usr/share/terminfo/g/gnome-rh72
 OLD_FILES+=usr/share/terminfo/g/gnome-rh80
 OLD_FILES+=usr/share/terminfo/g/gnome-rh90
 OLD_FILES+=usr/share/terminfo/g/go-225
 OLD_FILES+=usr/share/terminfo/g/go140
 OLD_FILES+=usr/share/terminfo/g/go140w
 OLD_FILES+=usr/share/terminfo/g/go225
 OLD_FILES+=usr/share/terminfo/g/graphos
 OLD_FILES+=usr/share/terminfo/g/graphos-30
 OLD_FILES+=usr/share/terminfo/g/gs5430
 OLD_FILES+=usr/share/terminfo/g/gs5430-22
 OLD_FILES+=usr/share/terminfo/g/gs5430-24
 OLD_FILES+=usr/share/terminfo/g/gs6300
 OLD_FILES+=usr/share/terminfo/g/gsi
 OLD_FILES+=usr/share/terminfo/g/gt100
 OLD_FILES+=usr/share/terminfo/g/gt100a
 OLD_FILES+=usr/share/terminfo/g/gt40
 OLD_FILES+=usr/share/terminfo/g/gt42
 OLD_FILES+=usr/share/terminfo/g/guru
 OLD_FILES+=usr/share/terminfo/g/guru+rv
 OLD_FILES+=usr/share/terminfo/g/guru+s
 OLD_FILES+=usr/share/terminfo/g/guru+unk
 OLD_FILES+=usr/share/terminfo/g/guru-24
 OLD_FILES+=usr/share/terminfo/g/guru-33
 OLD_FILES+=usr/share/terminfo/g/guru-33-rv
 OLD_FILES+=usr/share/terminfo/g/guru-33-s
 OLD_FILES+=usr/share/terminfo/g/guru-44
 OLD_FILES+=usr/share/terminfo/g/guru-44-s
 OLD_FILES+=usr/share/terminfo/g/guru-76
 OLD_FILES+=usr/share/terminfo/g/guru-76-lp
 OLD_FILES+=usr/share/terminfo/g/guru-76-s
 OLD_FILES+=usr/share/terminfo/g/guru-76-w
 OLD_FILES+=usr/share/terminfo/g/guru-76-w-s
 OLD_FILES+=usr/share/terminfo/g/guru-76-wm
 OLD_FILES+=usr/share/terminfo/g/guru-lp
 OLD_FILES+=usr/share/terminfo/g/guru-nctxt
 OLD_FILES+=usr/share/terminfo/g/guru-rv
 OLD_FILES+=usr/share/terminfo/g/guru-s
 OLD_DIRS+=usr/share/terminfo/g/
 OLD_FILES+=usr/share/terminfo/h/h-100
 OLD_FILES+=usr/share/terminfo/h/h-100bw
 OLD_FILES+=usr/share/terminfo/h/h100
 OLD_FILES+=usr/share/terminfo/h/h100bw
 OLD_FILES+=usr/share/terminfo/h/h19
 OLD_FILES+=usr/share/terminfo/h/h19-a
 OLD_FILES+=usr/share/terminfo/h/h19-b
 OLD_FILES+=usr/share/terminfo/h/h19-bs
 OLD_FILES+=usr/share/terminfo/h/h19-g
 OLD_FILES+=usr/share/terminfo/h/h19-smul
 OLD_FILES+=usr/share/terminfo/h/h19-u
 OLD_FILES+=usr/share/terminfo/h/h19-us
 OLD_FILES+=usr/share/terminfo/h/h19a
 OLD_FILES+=usr/share/terminfo/h/h19g
 OLD_FILES+=usr/share/terminfo/h/h19k
 OLD_FILES+=usr/share/terminfo/h/h19kermit
 OLD_FILES+=usr/share/terminfo/h/h19us
 OLD_FILES+=usr/share/terminfo/h/h29a-kc-bc
 OLD_FILES+=usr/share/terminfo/h/h29a-kc-uc
 OLD_FILES+=usr/share/terminfo/h/h29a-nkc-bc
 OLD_FILES+=usr/share/terminfo/h/h29a-nkc-uc
 OLD_FILES+=usr/share/terminfo/h/h80
 OLD_FILES+=usr/share/terminfo/h/ha8675
 OLD_FILES+=usr/share/terminfo/h/ha8686
 OLD_FILES+=usr/share/terminfo/h/hazel
 OLD_FILES+=usr/share/terminfo/h/hds200
 OLD_FILES+=usr/share/terminfo/h/he80
 OLD_FILES+=usr/share/terminfo/h/heath
 OLD_FILES+=usr/share/terminfo/h/heath-19
 OLD_FILES+=usr/share/terminfo/h/heath-ansi
 OLD_FILES+=usr/share/terminfo/h/heathkit
 OLD_FILES+=usr/share/terminfo/h/heathkit-a
 OLD_FILES+=usr/share/terminfo/h/hft
 OLD_FILES+=usr/share/terminfo/h/hft-c
 OLD_FILES+=usr/share/terminfo/h/hft-c-old
 OLD_FILES+=usr/share/terminfo/h/hft-old
 OLD_FILES+=usr/share/terminfo/h/hirez100
 OLD_FILES+=usr/share/terminfo/h/hirez100-w
 OLD_FILES+=usr/share/terminfo/h/hmod1
 OLD_FILES+=usr/share/terminfo/h/hp
 OLD_FILES+=usr/share/terminfo/h/hp+arrows
 OLD_FILES+=usr/share/terminfo/h/hp+color
 OLD_FILES+=usr/share/terminfo/h/hp+labels
 OLD_FILES+=usr/share/terminfo/h/hp+pfk+arrows
 OLD_FILES+=usr/share/terminfo/h/hp+pfk+cr
 OLD_FILES+=usr/share/terminfo/h/hp+pfk-cr
 OLD_FILES+=usr/share/terminfo/h/hp+printer
 OLD_FILES+=usr/share/terminfo/h/hp110
 OLD_FILES+=usr/share/terminfo/h/hp150
 OLD_FILES+=usr/share/terminfo/h/hp2
 OLD_FILES+=usr/share/terminfo/h/hp236
 OLD_FILES+=usr/share/terminfo/h/hp2382
 OLD_FILES+=usr/share/terminfo/h/hp2382a
 OLD_FILES+=usr/share/terminfo/h/hp2392
 OLD_FILES+=usr/share/terminfo/h/hp2397
 OLD_FILES+=usr/share/terminfo/h/hp2397a
 OLD_FILES+=usr/share/terminfo/h/hp2621
 OLD_FILES+=usr/share/terminfo/h/hp2621-48
 OLD_FILES+=usr/share/terminfo/h/hp2621-a
 OLD_FILES+=usr/share/terminfo/h/hp2621-ba
 OLD_FILES+=usr/share/terminfo/h/hp2621-fl
 OLD_FILES+=usr/share/terminfo/h/hp2621-k45
 OLD_FILES+=usr/share/terminfo/h/hp2621-nl
 OLD_FILES+=usr/share/terminfo/h/hp2621-nt
 OLD_FILES+=usr/share/terminfo/h/hp2621-wl
 OLD_FILES+=usr/share/terminfo/h/hp2621A
 OLD_FILES+=usr/share/terminfo/h/hp2621a
 OLD_FILES+=usr/share/terminfo/h/hp2621a-a
 OLD_FILES+=usr/share/terminfo/h/hp2621b
 OLD_FILES+=usr/share/terminfo/h/hp2621b-kx
 OLD_FILES+=usr/share/terminfo/h/hp2621b-kx-p
 OLD_FILES+=usr/share/terminfo/h/hp2621b-p
 OLD_FILES+=usr/share/terminfo/h/hp2621k45
 OLD_FILES+=usr/share/terminfo/h/hp2621p
 OLD_FILES+=usr/share/terminfo/h/hp2621p-a
 OLD_FILES+=usr/share/terminfo/h/hp2622
 OLD_FILES+=usr/share/terminfo/h/hp2622a
 OLD_FILES+=usr/share/terminfo/h/hp2623
 OLD_FILES+=usr/share/terminfo/h/hp2623a
 OLD_FILES+=usr/share/terminfo/h/hp2624
 OLD_FILES+=usr/share/terminfo/h/hp2624-10p
 OLD_FILES+=usr/share/terminfo/h/hp2624a
 OLD_FILES+=usr/share/terminfo/h/hp2624a-10p
 OLD_FILES+=usr/share/terminfo/h/hp2624b
 OLD_FILES+=usr/share/terminfo/h/hp2624b-10p
 OLD_FILES+=usr/share/terminfo/h/hp2624b-10p-p
 OLD_FILES+=usr/share/terminfo/h/hp2624b-4p
 OLD_FILES+=usr/share/terminfo/h/hp2624b-4p-p
 OLD_FILES+=usr/share/terminfo/h/hp2624b-p
 OLD_FILES+=usr/share/terminfo/h/hp2626
 OLD_FILES+=usr/share/terminfo/h/hp2626-12
 OLD_FILES+=usr/share/terminfo/h/hp2626-12-s
 OLD_FILES+=usr/share/terminfo/h/hp2626-12x40
 OLD_FILES+=usr/share/terminfo/h/hp2626-ns
 OLD_FILES+=usr/share/terminfo/h/hp2626-s
 OLD_FILES+=usr/share/terminfo/h/hp2626-x40
 OLD_FILES+=usr/share/terminfo/h/hp2626a
 OLD_FILES+=usr/share/terminfo/h/hp2626p
 OLD_FILES+=usr/share/terminfo/h/hp2627a
 OLD_FILES+=usr/share/terminfo/h/hp2627a-rev
 OLD_FILES+=usr/share/terminfo/h/hp2627c
 OLD_FILES+=usr/share/terminfo/h/hp262x
 OLD_FILES+=usr/share/terminfo/h/hp2640a
 OLD_FILES+=usr/share/terminfo/h/hp2640b
 OLD_FILES+=usr/share/terminfo/h/hp2641a
 OLD_FILES+=usr/share/terminfo/h/hp2644a
 OLD_FILES+=usr/share/terminfo/h/hp2645
 OLD_FILES+=usr/share/terminfo/h/hp2645a
 OLD_FILES+=usr/share/terminfo/h/hp2647a
 OLD_FILES+=usr/share/terminfo/h/hp2648
 OLD_FILES+=usr/share/terminfo/h/hp2648a
 OLD_FILES+=usr/share/terminfo/h/hp300h
 OLD_FILES+=usr/share/terminfo/h/hp45
 OLD_FILES+=usr/share/terminfo/h/hp700
 OLD_FILES+=usr/share/terminfo/h/hp700-wy
 OLD_FILES+=usr/share/terminfo/h/hp70092
 OLD_FILES+=usr/share/terminfo/h/hp70092A
 OLD_FILES+=usr/share/terminfo/h/hp70092a
 OLD_FILES+=usr/share/terminfo/h/hp9837
 OLD_FILES+=usr/share/terminfo/h/hp9845
 OLD_FILES+=usr/share/terminfo/h/hp98550
 OLD_FILES+=usr/share/terminfo/h/hp98550a
 OLD_FILES+=usr/share/terminfo/h/hp98720
 OLD_FILES+=usr/share/terminfo/h/hp98721
 OLD_FILES+=usr/share/terminfo/h/hpansi
 OLD_FILES+=usr/share/terminfo/h/hpex
 OLD_FILES+=usr/share/terminfo/h/hpex2
 OLD_FILES+=usr/share/terminfo/h/hpgeneric
 OLD_FILES+=usr/share/terminfo/h/hpsub
 OLD_FILES+=usr/share/terminfo/h/hpterm
 OLD_FILES+=usr/share/terminfo/h/hpterm-color
 OLD_FILES+=usr/share/terminfo/h/htx11
 OLD_FILES+=usr/share/terminfo/h/hurd
 OLD_FILES+=usr/share/terminfo/h/hz1000
 OLD_FILES+=usr/share/terminfo/h/hz1420
 OLD_FILES+=usr/share/terminfo/h/hz1500
 OLD_FILES+=usr/share/terminfo/h/hz1510
 OLD_FILES+=usr/share/terminfo/h/hz1520
 OLD_FILES+=usr/share/terminfo/h/hz1520-noesc
 OLD_FILES+=usr/share/terminfo/h/hz1552
 OLD_FILES+=usr/share/terminfo/h/hz1552-rv
 OLD_FILES+=usr/share/terminfo/h/hz2000
 OLD_DIRS+=usr/share/terminfo/h/
 OLD_FILES+=usr/share/terminfo/i/i100
 OLD_FILES+=usr/share/terminfo/i/i3101
 OLD_FILES+=usr/share/terminfo/i/i3164
 OLD_FILES+=usr/share/terminfo/i/i400
 OLD_FILES+=usr/share/terminfo/i/iTerm.app
 OLD_FILES+=usr/share/terminfo/i/iTerm2.app
 OLD_FILES+=usr/share/terminfo/i/ibcs2
 OLD_FILES+=usr/share/terminfo/i/ibm+16color
 OLD_FILES+=usr/share/terminfo/i/ibm+color
 OLD_FILES+=usr/share/terminfo/i/ibm-apl
 OLD_FILES+=usr/share/terminfo/i/ibm-pc
 OLD_FILES+=usr/share/terminfo/i/ibm-system1
 OLD_FILES+=usr/share/terminfo/i/ibm3101
 OLD_FILES+=usr/share/terminfo/i/ibm3151
 OLD_FILES+=usr/share/terminfo/i/ibm3161
 OLD_FILES+=usr/share/terminfo/i/ibm3161-C
 OLD_FILES+=usr/share/terminfo/i/ibm3162
 OLD_FILES+=usr/share/terminfo/i/ibm3163
 OLD_FILES+=usr/share/terminfo/i/ibm3164
 OLD_FILES+=usr/share/terminfo/i/ibm327x
 OLD_FILES+=usr/share/terminfo/i/ibm5051
 OLD_FILES+=usr/share/terminfo/i/ibm5081
 OLD_FILES+=usr/share/terminfo/i/ibm5081-c
 OLD_FILES+=usr/share/terminfo/i/ibm5151
 OLD_FILES+=usr/share/terminfo/i/ibm5154
 OLD_FILES+=usr/share/terminfo/i/ibm5154-c
 OLD_FILES+=usr/share/terminfo/i/ibm6153
 OLD_FILES+=usr/share/terminfo/i/ibm6153-40
 OLD_FILES+=usr/share/terminfo/i/ibm6153-90
 OLD_FILES+=usr/share/terminfo/i/ibm6154
 OLD_FILES+=usr/share/terminfo/i/ibm6154-c
 OLD_FILES+=usr/share/terminfo/i/ibm6155
 OLD_FILES+=usr/share/terminfo/i/ibm8503
 OLD_FILES+=usr/share/terminfo/i/ibm8507
 OLD_FILES+=usr/share/terminfo/i/ibm8512
 OLD_FILES+=usr/share/terminfo/i/ibm8513
 OLD_FILES+=usr/share/terminfo/i/ibm8514
 OLD_FILES+=usr/share/terminfo/i/ibm8514-c
 OLD_FILES+=usr/share/terminfo/i/ibm8604
 OLD_FILES+=usr/share/terminfo/i/ibmaed
 OLD_FILES+=usr/share/terminfo/i/ibmapa16
 OLD_FILES+=usr/share/terminfo/i/ibmapa8
 OLD_FILES+=usr/share/terminfo/i/ibmapa8c
 OLD_FILES+=usr/share/terminfo/i/ibmapa8c-c
 OLD_FILES+=usr/share/terminfo/i/ibmega
 OLD_FILES+=usr/share/terminfo/i/ibmega-c
 OLD_FILES+=usr/share/terminfo/i/ibmmono
 OLD_FILES+=usr/share/terminfo/i/ibmmpel-c
 OLD_FILES+=usr/share/terminfo/i/ibmpc
 OLD_FILES+=usr/share/terminfo/i/ibmpc3
 OLD_FILES+=usr/share/terminfo/i/ibmpc3r
 OLD_FILES+=usr/share/terminfo/i/ibmpc3r-mono
 OLD_FILES+=usr/share/terminfo/i/ibmpcx
 OLD_FILES+=usr/share/terminfo/i/ibmvga
 OLD_FILES+=usr/share/terminfo/i/ibmvga-c
 OLD_FILES+=usr/share/terminfo/i/ibmx
 OLD_FILES+=usr/share/terminfo/i/icl6402
 OLD_FILES+=usr/share/terminfo/i/icl6404
 OLD_FILES+=usr/share/terminfo/i/icl6404-w
 OLD_FILES+=usr/share/terminfo/i/ifmr
 OLD_FILES+=usr/share/terminfo/i/ims-ansi
 OLD_FILES+=usr/share/terminfo/i/ims950
 OLD_FILES+=usr/share/terminfo/i/ims950-b
 OLD_FILES+=usr/share/terminfo/i/ims950-rv
 OLD_FILES+=usr/share/terminfo/i/infoton
 OLD_FILES+=usr/share/terminfo/i/interix
 OLD_FILES+=usr/share/terminfo/i/interix-nti
 OLD_FILES+=usr/share/terminfo/i/intertec
 OLD_FILES+=usr/share/terminfo/i/intertube
 OLD_FILES+=usr/share/terminfo/i/intertube2
 OLD_FILES+=usr/share/terminfo/i/intext
 OLD_FILES+=usr/share/terminfo/i/intext2
 OLD_FILES+=usr/share/terminfo/i/intextii
 OLD_FILES+=usr/share/terminfo/i/ips
 OLD_FILES+=usr/share/terminfo/i/ipsi
 OLD_FILES+=usr/share/terminfo/i/iq120
 OLD_FILES+=usr/share/terminfo/i/iq140
 OLD_FILES+=usr/share/terminfo/i/iris-ansi
 OLD_FILES+=usr/share/terminfo/i/iris-ansi-ap
 OLD_FILES+=usr/share/terminfo/i/iris-ansi-net
 OLD_FILES+=usr/share/terminfo/i/iris-color
 OLD_FILES+=usr/share/terminfo/i/iris40
 OLD_FILES+=usr/share/terminfo/i/iterm
 OLD_FILES+=usr/share/terminfo/i/iterm2
 OLD_FILES+=usr/share/terminfo/i/iterm2-direct
 OLD_DIRS+=usr/share/terminfo/i/
 OLD_FILES+=usr/share/terminfo/j/jaixterm
 OLD_FILES+=usr/share/terminfo/j/jaixterm-m
 OLD_FILES+=usr/share/terminfo/j/jerq
 OLD_FILES+=usr/share/terminfo/j/jfbterm
 OLD_DIRS+=usr/share/terminfo/j/
 OLD_FILES+=usr/share/terminfo/k/k45
 OLD_FILES+=usr/share/terminfo/k/kaypro
 OLD_FILES+=usr/share/terminfo/k/kaypro2
 OLD_FILES+=usr/share/terminfo/k/kds6402
 OLD_FILES+=usr/share/terminfo/k/kds7372
 OLD_FILES+=usr/share/terminfo/k/kds7372-w
 OLD_FILES+=usr/share/terminfo/k/kermit
 OLD_FILES+=usr/share/terminfo/k/kermit-am
 OLD_FILES+=usr/share/terminfo/k/kitty
 OLD_FILES+=usr/share/terminfo/k/kitty+common
 OLD_FILES+=usr/share/terminfo/k/kitty-direct
 OLD_FILES+=usr/share/terminfo/k/klone+acs
 OLD_FILES+=usr/share/terminfo/k/klone+color
 OLD_FILES+=usr/share/terminfo/k/klone+koi8acs
 OLD_FILES+=usr/share/terminfo/k/klone+sgr
 OLD_FILES+=usr/share/terminfo/k/klone+sgr-dumb
 OLD_FILES+=usr/share/terminfo/k/klone+sgr8
 OLD_FILES+=usr/share/terminfo/k/kon
 OLD_FILES+=usr/share/terminfo/k/kon2
 OLD_FILES+=usr/share/terminfo/k/konsole
 OLD_FILES+=usr/share/terminfo/k/konsole+pcfkeys
 OLD_FILES+=usr/share/terminfo/k/konsole-16color
 OLD_FILES+=usr/share/terminfo/k/konsole-256color
 OLD_FILES+=usr/share/terminfo/k/konsole-base
 OLD_FILES+=usr/share/terminfo/k/konsole-direct
 OLD_FILES+=usr/share/terminfo/k/konsole-linux
 OLD_FILES+=usr/share/terminfo/k/konsole-solaris
 OLD_FILES+=usr/share/terminfo/k/konsole-vt100
 OLD_FILES+=usr/share/terminfo/k/konsole-vt420pc
 OLD_FILES+=usr/share/terminfo/k/konsole-xf3x
 OLD_FILES+=usr/share/terminfo/k/konsole-xf4x
 OLD_FILES+=usr/share/terminfo/k/kt7
 OLD_FILES+=usr/share/terminfo/k/kt7ix
 OLD_FILES+=usr/share/terminfo/k/kterm
 OLD_FILES+=usr/share/terminfo/k/kterm-co
 OLD_FILES+=usr/share/terminfo/k/kterm-color
 OLD_FILES+=usr/share/terminfo/k/ktm
 OLD_FILES+=usr/share/terminfo/k/kvt
 OLD_DIRS+=usr/share/terminfo/k/
 OLD_FILES+=usr/share/terminfo/l/la120
 OLD_FILES+=usr/share/terminfo/l/layer
 OLD_FILES+=usr/share/terminfo/l/lft
 OLD_FILES+=usr/share/terminfo/l/lft-pc850
 OLD_FILES+=usr/share/terminfo/l/linux
 OLD_FILES+=usr/share/terminfo/l/linux+decid
 OLD_FILES+=usr/share/terminfo/l/linux+sfkeys
 OLD_FILES+=usr/share/terminfo/l/linux-16color
 OLD_FILES+=usr/share/terminfo/l/linux-basic
 OLD_FILES+=usr/share/terminfo/l/linux-c
 OLD_FILES+=usr/share/terminfo/l/linux-c-nc
 OLD_FILES+=usr/share/terminfo/l/linux-koi8
 OLD_FILES+=usr/share/terminfo/l/linux-koi8r
 OLD_FILES+=usr/share/terminfo/l/linux-lat
 OLD_FILES+=usr/share/terminfo/l/linux-m
 OLD_FILES+=usr/share/terminfo/l/linux-m1
 OLD_FILES+=usr/share/terminfo/l/linux-m1b
 OLD_FILES+=usr/share/terminfo/l/linux-m2
 OLD_FILES+=usr/share/terminfo/l/linux-nic
 OLD_FILES+=usr/share/terminfo/l/linux-s
 OLD_FILES+=usr/share/terminfo/l/linux-vt
 OLD_FILES+=usr/share/terminfo/l/linux2.2
 OLD_FILES+=usr/share/terminfo/l/linux2.6
 OLD_FILES+=usr/share/terminfo/l/linux2.6.26
 OLD_FILES+=usr/share/terminfo/l/linux3.0
 OLD_FILES+=usr/share/terminfo/l/lisa
 OLD_FILES+=usr/share/terminfo/l/lisaterm
 OLD_FILES+=usr/share/terminfo/l/lisaterm-w
 OLD_FILES+=usr/share/terminfo/l/liswb
 OLD_FILES+=usr/share/terminfo/l/ln03
 OLD_FILES+=usr/share/terminfo/l/ln03-w
 OLD_FILES+=usr/share/terminfo/l/lpr
 OLD_FILES+=usr/share/terminfo/l/luna
 OLD_FILES+=usr/share/terminfo/l/luna68k
 OLD_DIRS+=usr/share/terminfo/l/
 OLD_FILES+=usr/share/terminfo/m/m2-nam
 OLD_FILES+=usr/share/terminfo/m/mac
 OLD_FILES+=usr/share/terminfo/m/mac-w
 OLD_FILES+=usr/share/terminfo/m/mach
 OLD_FILES+=usr/share/terminfo/m/mach-bold
 OLD_FILES+=usr/share/terminfo/m/mach-color
 OLD_FILES+=usr/share/terminfo/m/mach-gnu
 OLD_FILES+=usr/share/terminfo/m/mach-gnu-color
 OLD_FILES+=usr/share/terminfo/m/macintosh
 OLD_FILES+=usr/share/terminfo/m/macterminal-w
 OLD_FILES+=usr/share/terminfo/m/mai
 OLD_FILES+=usr/share/terminfo/m/masscomp
 OLD_FILES+=usr/share/terminfo/m/masscomp1
 OLD_FILES+=usr/share/terminfo/m/masscomp2
 OLD_FILES+=usr/share/terminfo/m/mdl110
 OLD_FILES+=usr/share/terminfo/m/megatek
 OLD_FILES+=usr/share/terminfo/m/memhp
 OLD_FILES+=usr/share/terminfo/m/mgr
 OLD_FILES+=usr/share/terminfo/m/mgr-linux
 OLD_FILES+=usr/share/terminfo/m/mgr-sun
 OLD_FILES+=usr/share/terminfo/m/mgt
 OLD_FILES+=usr/share/terminfo/m/mgterm
 OLD_FILES+=usr/share/terminfo/m/microb
 OLD_FILES+=usr/share/terminfo/m/microbee
 OLD_FILES+=usr/share/terminfo/m/microterm
 OLD_FILES+=usr/share/terminfo/m/microterm5
 OLD_FILES+=usr/share/terminfo/m/mime
 OLD_FILES+=usr/share/terminfo/m/mime-3ax
 OLD_FILES+=usr/share/terminfo/m/mime-fb
 OLD_FILES+=usr/share/terminfo/m/mime-hb
 OLD_FILES+=usr/share/terminfo/m/mime1
 OLD_FILES+=usr/share/terminfo/m/mime2
 OLD_FILES+=usr/share/terminfo/m/mime2a
 OLD_FILES+=usr/share/terminfo/m/mime2a-s
 OLD_FILES+=usr/share/terminfo/m/mime2a-v
 OLD_FILES+=usr/share/terminfo/m/mime314
 OLD_FILES+=usr/share/terminfo/m/mime340
 OLD_FILES+=usr/share/terminfo/m/mime3a
 OLD_FILES+=usr/share/terminfo/m/mime3ax
 OLD_FILES+=usr/share/terminfo/m/mimei
 OLD_FILES+=usr/share/terminfo/m/mimeii
 OLD_FILES+=usr/share/terminfo/m/minitel
 OLD_FILES+=usr/share/terminfo/m/minitel-2
 OLD_FILES+=usr/share/terminfo/m/minitel-2-nam
 OLD_FILES+=usr/share/terminfo/m/minitel1
 OLD_FILES+=usr/share/terminfo/m/minitel1-nb
 OLD_FILES+=usr/share/terminfo/m/minitel12-80
 OLD_FILES+=usr/share/terminfo/m/minitel1b
 OLD_FILES+=usr/share/terminfo/m/minitel1b-80
 OLD_FILES+=usr/share/terminfo/m/minitel1b-nb
 OLD_FILES+=usr/share/terminfo/m/minitel2-80
 OLD_FILES+=usr/share/terminfo/m/minix
 OLD_FILES+=usr/share/terminfo/m/minix-1.5
 OLD_FILES+=usr/share/terminfo/m/minix-1.7
 OLD_FILES+=usr/share/terminfo/m/minix-3.0
 OLD_FILES+=usr/share/terminfo/m/minix-old
 OLD_FILES+=usr/share/terminfo/m/minix-old-am
 OLD_FILES+=usr/share/terminfo/m/mintty
 OLD_FILES+=usr/share/terminfo/m/mintty+common
 OLD_FILES+=usr/share/terminfo/m/mintty-direct
 OLD_FILES+=usr/share/terminfo/m/mlterm
 OLD_FILES+=usr/share/terminfo/m/mlterm+pcfkeys
 OLD_FILES+=usr/share/terminfo/m/mlterm-256color
 OLD_FILES+=usr/share/terminfo/m/mlterm-direct
 OLD_FILES+=usr/share/terminfo/m/mlterm2
 OLD_FILES+=usr/share/terminfo/m/mlterm3
 OLD_FILES+=usr/share/terminfo/m/mm314
 OLD_FILES+=usr/share/terminfo/m/mm340
 OLD_FILES+=usr/share/terminfo/m/mod
 OLD_FILES+=usr/share/terminfo/m/mod24
 OLD_FILES+=usr/share/terminfo/m/modgraph
 OLD_FILES+=usr/share/terminfo/m/modgraph2
 OLD_FILES+=usr/share/terminfo/m/modgraph48
 OLD_FILES+=usr/share/terminfo/m/mono-emx
 OLD_FILES+=usr/share/terminfo/m/morphos
 OLD_FILES+=usr/share/terminfo/m/mouse-sun
 OLD_FILES+=usr/share/terminfo/m/mrxvt
 OLD_FILES+=usr/share/terminfo/m/mrxvt-256color
 OLD_FILES+=usr/share/terminfo/m/ms-terminal
 OLD_FILES+=usr/share/terminfo/m/ms-vt-utf8
 OLD_FILES+=usr/share/terminfo/m/ms-vt100
 OLD_FILES+=usr/share/terminfo/m/ms-vt100+
 OLD_FILES+=usr/share/terminfo/m/ms-vt100-color
 OLD_FILES+=usr/share/terminfo/m/msk227
 OLD_FILES+=usr/share/terminfo/m/msk22714
 OLD_FILES+=usr/share/terminfo/m/msk227am
 OLD_FILES+=usr/share/terminfo/m/mskermit227
 OLD_FILES+=usr/share/terminfo/m/mskermit22714
 OLD_FILES+=usr/share/terminfo/m/mskermit227am
 OLD_FILES+=usr/share/terminfo/m/mt-70
 OLD_FILES+=usr/share/terminfo/m/mt4520-rv
 OLD_FILES+=usr/share/terminfo/m/mt70
 OLD_FILES+=usr/share/terminfo/m/mterm
 OLD_FILES+=usr/share/terminfo/m/mterm-ansi
 OLD_FILES+=usr/share/terminfo/m/mvterm
 OLD_DIRS+=usr/share/terminfo/m/
 OLD_FILES+=usr/share/terminfo/n/n7900
 OLD_FILES+=usr/share/terminfo/n/nansi.sys
 OLD_FILES+=usr/share/terminfo/n/nansi.sysk
 OLD_FILES+=usr/share/terminfo/n/nansisys
 OLD_FILES+=usr/share/terminfo/n/nansisysk
 OLD_FILES+=usr/share/terminfo/n/ncr160vppp
 OLD_FILES+=usr/share/terminfo/n/ncr160vpwpp
 OLD_FILES+=usr/share/terminfo/n/ncr160vt100an
 OLD_FILES+=usr/share/terminfo/n/ncr160vt100pp
 OLD_FILES+=usr/share/terminfo/n/ncr160vt100wan
 OLD_FILES+=usr/share/terminfo/n/ncr160vt100wpp
 OLD_FILES+=usr/share/terminfo/n/ncr160vt200an
 OLD_FILES+=usr/share/terminfo/n/ncr160vt200pp
 OLD_FILES+=usr/share/terminfo/n/ncr160vt200wan
 OLD_FILES+=usr/share/terminfo/n/ncr160vt200wpp
 OLD_FILES+=usr/share/terminfo/n/ncr160vt300an
 OLD_FILES+=usr/share/terminfo/n/ncr160vt300pp
 OLD_FILES+=usr/share/terminfo/n/ncr160vt300wan
 OLD_FILES+=usr/share/terminfo/n/ncr160vt300wpp
 OLD_FILES+=usr/share/terminfo/n/ncr160wy50+pp
 OLD_FILES+=usr/share/terminfo/n/ncr160wy50+wpp
 OLD_FILES+=usr/share/terminfo/n/ncr160wy60pp
 OLD_FILES+=usr/share/terminfo/n/ncr160wy60wpp
 OLD_FILES+=usr/share/terminfo/n/ncr260intan
 OLD_FILES+=usr/share/terminfo/n/ncr260intpp
 OLD_FILES+=usr/share/terminfo/n/ncr260intwan
 OLD_FILES+=usr/share/terminfo/n/ncr260intwpp
 OLD_FILES+=usr/share/terminfo/n/ncr260vppp
 OLD_FILES+=usr/share/terminfo/n/ncr260vpwpp
 OLD_FILES+=usr/share/terminfo/n/ncr260vt100an
 OLD_FILES+=usr/share/terminfo/n/ncr260vt100pp
 OLD_FILES+=usr/share/terminfo/n/ncr260vt100wan
 OLD_FILES+=usr/share/terminfo/n/ncr260vt100wpp
 OLD_FILES+=usr/share/terminfo/n/ncr260vt200an
 OLD_FILES+=usr/share/terminfo/n/ncr260vt200pp
 OLD_FILES+=usr/share/terminfo/n/ncr260vt200wan
 OLD_FILES+=usr/share/terminfo/n/ncr260vt200wpp
 OLD_FILES+=usr/share/terminfo/n/ncr260vt300an
 OLD_FILES+=usr/share/terminfo/n/ncr260vt300pp
 OLD_FILES+=usr/share/terminfo/n/ncr260vt300wan
 OLD_FILES+=usr/share/terminfo/n/ncr260vt300wpp
 OLD_FILES+=usr/share/terminfo/n/ncr260wy325pp
 OLD_FILES+=usr/share/terminfo/n/ncr260wy325wpp
 OLD_FILES+=usr/share/terminfo/n/ncr260wy350pp
 OLD_FILES+=usr/share/terminfo/n/ncr260wy350wpp
 OLD_FILES+=usr/share/terminfo/n/ncr260wy50+pp
 OLD_FILES+=usr/share/terminfo/n/ncr260wy50+wpp
 OLD_FILES+=usr/share/terminfo/n/ncr260wy60pp
 OLD_FILES+=usr/share/terminfo/n/ncr260wy60wpp
 OLD_FILES+=usr/share/terminfo/n/ncr7900
 OLD_FILES+=usr/share/terminfo/n/ncr7900i
 OLD_FILES+=usr/share/terminfo/n/ncr7900iv
 OLD_FILES+=usr/share/terminfo/n/ncr7901
 OLD_FILES+=usr/share/terminfo/n/ncrvt100an
 OLD_FILES+=usr/share/terminfo/n/ncrvt100pp
 OLD_FILES+=usr/share/terminfo/n/ncrvt100wan
 OLD_FILES+=usr/share/terminfo/n/ncrvt100wpp
 OLD_FILES+=usr/share/terminfo/n/ncsa
 OLD_FILES+=usr/share/terminfo/n/ncsa-m
 OLD_FILES+=usr/share/terminfo/n/ncsa-m-ns
 OLD_FILES+=usr/share/terminfo/n/ncsa-ns
 OLD_FILES+=usr/share/terminfo/n/ncsa-vt220
 OLD_FILES+=usr/share/terminfo/n/ncsa-vt220-8
 OLD_FILES+=usr/share/terminfo/n/nd9500
 OLD_FILES+=usr/share/terminfo/n/ndr9500
 OLD_FILES+=usr/share/terminfo/n/ndr9500-25
 OLD_FILES+=usr/share/terminfo/n/ndr9500-25-mc
 OLD_FILES+=usr/share/terminfo/n/ndr9500-25-mc-nl
 OLD_FILES+=usr/share/terminfo/n/ndr9500-25-nl
 OLD_FILES+=usr/share/terminfo/n/ndr9500-mc
 OLD_FILES+=usr/share/terminfo/n/ndr9500-mc-nl
 OLD_FILES+=usr/share/terminfo/n/ndr9500-nl
 OLD_FILES+=usr/share/terminfo/n/nec
 OLD_FILES+=usr/share/terminfo/n/nec5520
 OLD_FILES+=usr/share/terminfo/n/netbsd6
 OLD_FILES+=usr/share/terminfo/n/newhp
 OLD_FILES+=usr/share/terminfo/n/newhpkeyboard
 OLD_FILES+=usr/share/terminfo/n/news
 OLD_FILES+=usr/share/terminfo/n/news-29
 OLD_FILES+=usr/share/terminfo/n/news-29-euc
 OLD_FILES+=usr/share/terminfo/n/news-29-sjis
 OLD_FILES+=usr/share/terminfo/n/news-33
 OLD_FILES+=usr/share/terminfo/n/news-33-euc
 OLD_FILES+=usr/share/terminfo/n/news-33-sjis
 OLD_FILES+=usr/share/terminfo/n/news-42
 OLD_FILES+=usr/share/terminfo/n/news-42-euc
 OLD_FILES+=usr/share/terminfo/n/news-42-sjis
 OLD_FILES+=usr/share/terminfo/n/news-a
 OLD_FILES+=usr/share/terminfo/n/news-o
 OLD_FILES+=usr/share/terminfo/n/news-old-unk
 OLD_FILES+=usr/share/terminfo/n/news-unk
 OLD_FILES+=usr/share/terminfo/n/news28
 OLD_FILES+=usr/share/terminfo/n/news28-a
 OLD_FILES+=usr/share/terminfo/n/news29
 OLD_FILES+=usr/share/terminfo/n/news31
 OLD_FILES+=usr/share/terminfo/n/news31-a
 OLD_FILES+=usr/share/terminfo/n/news31-o
 OLD_FILES+=usr/share/terminfo/n/news33
 OLD_FILES+=usr/share/terminfo/n/news40
 OLD_FILES+=usr/share/terminfo/n/news40-a
 OLD_FILES+=usr/share/terminfo/n/news40-o
 OLD_FILES+=usr/share/terminfo/n/news42
 OLD_FILES+=usr/share/terminfo/n/newscbm
 OLD_FILES+=usr/share/terminfo/n/newscbm-a
 OLD_FILES+=usr/share/terminfo/n/newscbm-o
 OLD_FILES+=usr/share/terminfo/n/newscbm33
 OLD_FILES+=usr/share/terminfo/n/next
 OLD_FILES+=usr/share/terminfo/n/nextshell
 OLD_FILES+=usr/share/terminfo/n/northstar
 OLD_FILES+=usr/share/terminfo/n/nsterm
 OLD_FILES+=usr/share/terminfo/n/nsterm+7
 OLD_FILES+=usr/share/terminfo/n/nsterm+acs
 OLD_FILES+=usr/share/terminfo/n/nsterm+c
 OLD_FILES+=usr/share/terminfo/n/nsterm+c41
 OLD_FILES+=usr/share/terminfo/n/nsterm+mac
 OLD_FILES+=usr/share/terminfo/n/nsterm+s
 OLD_FILES+=usr/share/terminfo/n/nsterm-16color
 OLD_FILES+=usr/share/terminfo/n/nsterm-256color
 OLD_FILES+=usr/share/terminfo/n/nsterm-7
 OLD_FILES+=usr/share/terminfo/n/nsterm-7-c
 OLD_FILES+=usr/share/terminfo/n/nsterm-7-c-s
 OLD_FILES+=usr/share/terminfo/n/nsterm-7-m
 OLD_FILES+=usr/share/terminfo/n/nsterm-7-m-s
 OLD_FILES+=usr/share/terminfo/n/nsterm-7-s
 OLD_FILES+=usr/share/terminfo/n/nsterm-acs
 OLD_FILES+=usr/share/terminfo/n/nsterm-acs-c
 OLD_FILES+=usr/share/terminfo/n/nsterm-acs-c-s
 OLD_FILES+=usr/share/terminfo/n/nsterm-acs-m
 OLD_FILES+=usr/share/terminfo/n/nsterm-acs-m-s
 OLD_FILES+=usr/share/terminfo/n/nsterm-acs-s
 OLD_FILES+=usr/share/terminfo/n/nsterm-bce
 OLD_FILES+=usr/share/terminfo/n/nsterm-build309
 OLD_FILES+=usr/share/terminfo/n/nsterm-build326
 OLD_FILES+=usr/share/terminfo/n/nsterm-build343
 OLD_FILES+=usr/share/terminfo/n/nsterm-build361
 OLD_FILES+=usr/share/terminfo/n/nsterm-build400
 OLD_FILES+=usr/share/terminfo/n/nsterm-c
 OLD_FILES+=usr/share/terminfo/n/nsterm-c-7
 OLD_FILES+=usr/share/terminfo/n/nsterm-c-acs
 OLD_FILES+=usr/share/terminfo/n/nsterm-c-s
 OLD_FILES+=usr/share/terminfo/n/nsterm-c-s-7
 OLD_FILES+=usr/share/terminfo/n/nsterm-c-s-acs
 OLD_FILES+=usr/share/terminfo/n/nsterm-direct
 OLD_FILES+=usr/share/terminfo/n/nsterm-m
 OLD_FILES+=usr/share/terminfo/n/nsterm-m-7
 OLD_FILES+=usr/share/terminfo/n/nsterm-m-acs
 OLD_FILES+=usr/share/terminfo/n/nsterm-m-s
 OLD_FILES+=usr/share/terminfo/n/nsterm-m-s-7
 OLD_FILES+=usr/share/terminfo/n/nsterm-m-s-acs
 OLD_FILES+=usr/share/terminfo/n/nsterm-old
 OLD_FILES+=usr/share/terminfo/n/nsterm-s
 OLD_FILES+=usr/share/terminfo/n/nsterm-s-7
 OLD_FILES+=usr/share/terminfo/n/nsterm-s-acs
 OLD_FILES+=usr/share/terminfo/n/ntconsole
 OLD_FILES+=usr/share/terminfo/n/ntconsole-100
 OLD_FILES+=usr/share/terminfo/n/ntconsole-100-nti
 OLD_FILES+=usr/share/terminfo/n/ntconsole-25
 OLD_FILES+=usr/share/terminfo/n/ntconsole-25-nti
 OLD_FILES+=usr/share/terminfo/n/ntconsole-25-w
 OLD_FILES+=usr/share/terminfo/n/ntconsole-25-w-vt
 OLD_FILES+=usr/share/terminfo/n/ntconsole-35
 OLD_FILES+=usr/share/terminfo/n/ntconsole-35-nti
 OLD_FILES+=usr/share/terminfo/n/ntconsole-35-w
 OLD_FILES+=usr/share/terminfo/n/ntconsole-50
 OLD_FILES+=usr/share/terminfo/n/ntconsole-50-nti
 OLD_FILES+=usr/share/terminfo/n/ntconsole-50-w
 OLD_FILES+=usr/share/terminfo/n/ntconsole-60
 OLD_FILES+=usr/share/terminfo/n/ntconsole-60-nti
 OLD_FILES+=usr/share/terminfo/n/ntconsole-60-w
 OLD_FILES+=usr/share/terminfo/n/ntconsole-w
 OLD_FILES+=usr/share/terminfo/n/ntconsole-w-vt
 OLD_FILES+=usr/share/terminfo/n/nwe501
 OLD_FILES+=usr/share/terminfo/n/nwe501-a
 OLD_FILES+=usr/share/terminfo/n/nwe501-o
 OLD_FILES+=usr/share/terminfo/n/nwp-511
 OLD_FILES+=usr/share/terminfo/n/nwp-517
 OLD_FILES+=usr/share/terminfo/n/nwp-517-w
 OLD_FILES+=usr/share/terminfo/n/nwp251-a
 OLD_FILES+=usr/share/terminfo/n/nwp251-o
 OLD_FILES+=usr/share/terminfo/n/nwp511
 OLD_FILES+=usr/share/terminfo/n/nwp512
 OLD_FILES+=usr/share/terminfo/n/nwp512-a
 OLD_FILES+=usr/share/terminfo/n/nwp512-o
 OLD_FILES+=usr/share/terminfo/n/nwp513
 OLD_FILES+=usr/share/terminfo/n/nwp513-a
 OLD_FILES+=usr/share/terminfo/n/nwp513-o
 OLD_FILES+=usr/share/terminfo/n/nwp514
 OLD_FILES+=usr/share/terminfo/n/nwp514-a
 OLD_FILES+=usr/share/terminfo/n/nwp514-o
 OLD_FILES+=usr/share/terminfo/n/nwp517
 OLD_FILES+=usr/share/terminfo/n/nwp517-w
 OLD_FILES+=usr/share/terminfo/n/nwp518
 OLD_FILES+=usr/share/terminfo/n/nwp518-a
 OLD_FILES+=usr/share/terminfo/n/nwp518-o
 OLD_FILES+=usr/share/terminfo/n/nxterm
 OLD_DIRS+=usr/share/terminfo/n/
 OLD_FILES+=usr/share/terminfo/o/o31
 OLD_FILES+=usr/share/terminfo/o/o4112-nd
 OLD_FILES+=usr/share/terminfo/o/o85h
 OLD_FILES+=usr/share/terminfo/o/oabm85h
 OLD_FILES+=usr/share/terminfo/o/oblit
 OLD_FILES+=usr/share/terminfo/o/oc100
 OLD_FILES+=usr/share/terminfo/o/oconcept
 OLD_FILES+=usr/share/terminfo/o/ofcons
 OLD_FILES+=usr/share/terminfo/o/ojerq
 OLD_FILES+=usr/share/terminfo/o/old-st
 OLD_FILES+=usr/share/terminfo/o/oldibmpc3
 OLD_FILES+=usr/share/terminfo/o/oldpc3
 OLD_FILES+=usr/share/terminfo/o/oldsun
 OLD_FILES+=usr/share/terminfo/o/omron
 OLD_FILES+=usr/share/terminfo/o/opennt
 OLD_FILES+=usr/share/terminfo/o/opennt-100
 OLD_FILES+=usr/share/terminfo/o/opennt-100-nti
 OLD_FILES+=usr/share/terminfo/o/opennt-25
 OLD_FILES+=usr/share/terminfo/o/opennt-25-nti
 OLD_FILES+=usr/share/terminfo/o/opennt-25-w
 OLD_FILES+=usr/share/terminfo/o/opennt-25-w-vt
 OLD_FILES+=usr/share/terminfo/o/opennt-35
 OLD_FILES+=usr/share/terminfo/o/opennt-35-nti
 OLD_FILES+=usr/share/terminfo/o/opennt-35-w
 OLD_FILES+=usr/share/terminfo/o/opennt-50
 OLD_FILES+=usr/share/terminfo/o/opennt-50-nti
 OLD_FILES+=usr/share/terminfo/o/opennt-50-w
 OLD_FILES+=usr/share/terminfo/o/opennt-60
 OLD_FILES+=usr/share/terminfo/o/opennt-60-nti
 OLD_FILES+=usr/share/terminfo/o/opennt-60-w
 OLD_FILES+=usr/share/terminfo/o/opennt-nti
 OLD_FILES+=usr/share/terminfo/o/opennt-w
 OLD_FILES+=usr/share/terminfo/o/opennt-w-vt
 OLD_FILES+=usr/share/terminfo/o/opus3n1+
 OLD_FILES+=usr/share/terminfo/o/origibmpc3
 OLD_FILES+=usr/share/terminfo/o/origpc3
 OLD_FILES+=usr/share/terminfo/o/os9LII
 OLD_FILES+=usr/share/terminfo/o/osborne
 OLD_FILES+=usr/share/terminfo/o/osborne-w
 OLD_FILES+=usr/share/terminfo/o/osborne1
 OLD_FILES+=usr/share/terminfo/o/osborne1-w
 OLD_FILES+=usr/share/terminfo/o/osexec
 OLD_FILES+=usr/share/terminfo/o/otek4112
 OLD_FILES+=usr/share/terminfo/o/otek4113
 OLD_FILES+=usr/share/terminfo/o/otek4114
 OLD_FILES+=usr/share/terminfo/o/otek4115
 OLD_FILES+=usr/share/terminfo/o/owl
 OLD_DIRS+=usr/share/terminfo/o/
 OLD_FILES+=usr/share/terminfo/p/p12
 OLD_FILES+=usr/share/terminfo/p/p12-m
 OLD_FILES+=usr/share/terminfo/p/p12-m-w
 OLD_FILES+=usr/share/terminfo/p/p12-w
 OLD_FILES+=usr/share/terminfo/p/p14
 OLD_FILES+=usr/share/terminfo/p/p14-m
 OLD_FILES+=usr/share/terminfo/p/p14-m-w
 OLD_FILES+=usr/share/terminfo/p/p14-w
 OLD_FILES+=usr/share/terminfo/p/p19
 OLD_FILES+=usr/share/terminfo/p/p4
 OLD_FILES+=usr/share/terminfo/p/p5
 OLD_FILES+=usr/share/terminfo/p/p7
 OLD_FILES+=usr/share/terminfo/p/p8
 OLD_FILES+=usr/share/terminfo/p/p8-w
 OLD_FILES+=usr/share/terminfo/p/p8gl
 OLD_FILES+=usr/share/terminfo/p/p9
 OLD_FILES+=usr/share/terminfo/p/p9-8
 OLD_FILES+=usr/share/terminfo/p/p9-8-w
 OLD_FILES+=usr/share/terminfo/p/p9-w
 OLD_FILES+=usr/share/terminfo/p/pc-coherent
 OLD_FILES+=usr/share/terminfo/p/pc-minix
 OLD_FILES+=usr/share/terminfo/p/pc-venix
 OLD_FILES+=usr/share/terminfo/p/pc3
 OLD_FILES+=usr/share/terminfo/p/pc3-bold
 OLD_FILES+=usr/share/terminfo/p/pc3r
 OLD_FILES+=usr/share/terminfo/p/pc3r-m
 OLD_FILES+=usr/share/terminfo/p/pc6300plus
 OLD_FILES+=usr/share/terminfo/p/pc7300
 OLD_FILES+=usr/share/terminfo/p/pcansi
 OLD_FILES+=usr/share/terminfo/p/pcansi-25
 OLD_FILES+=usr/share/terminfo/p/pcansi-25-m
 OLD_FILES+=usr/share/terminfo/p/pcansi-33
 OLD_FILES+=usr/share/terminfo/p/pcansi-33-m
 OLD_FILES+=usr/share/terminfo/p/pcansi-43
 OLD_FILES+=usr/share/terminfo/p/pcansi-43-m
 OLD_FILES+=usr/share/terminfo/p/pcansi-m
 OLD_FILES+=usr/share/terminfo/p/pcansi-mono
 OLD_FILES+=usr/share/terminfo/p/pcansi25
 OLD_FILES+=usr/share/terminfo/p/pcansi25m
 OLD_FILES+=usr/share/terminfo/p/pcansi33
 OLD_FILES+=usr/share/terminfo/p/pcansi33m
 OLD_FILES+=usr/share/terminfo/p/pcansi43
 OLD_FILES+=usr/share/terminfo/p/pccon
 OLD_FILES+=usr/share/terminfo/p/pccon+base
 OLD_FILES+=usr/share/terminfo/p/pccon+colors
 OLD_FILES+=usr/share/terminfo/p/pccon+keys
 OLD_FILES+=usr/share/terminfo/p/pccon+sgr+acs
 OLD_FILES+=usr/share/terminfo/p/pccon+sgr+acs0
 OLD_FILES+=usr/share/terminfo/p/pccon-m
 OLD_FILES+=usr/share/terminfo/p/pccon0
 OLD_FILES+=usr/share/terminfo/p/pccon0-m
 OLD_FILES+=usr/share/terminfo/p/pccons
 OLD_FILES+=usr/share/terminfo/p/pcconsole
 OLD_FILES+=usr/share/terminfo/p/pcix
 OLD_FILES+=usr/share/terminfo/p/pckermit
 OLD_FILES+=usr/share/terminfo/p/pckermit12
 OLD_FILES+=usr/share/terminfo/p/pckermit120
 OLD_FILES+=usr/share/terminfo/p/pcmw
 OLD_FILES+=usr/share/terminfo/p/pcplot
 OLD_FILES+=usr/share/terminfo/p/pcvt25
 OLD_FILES+=usr/share/terminfo/p/pcvt25-color
 OLD_FILES+=usr/share/terminfo/p/pcvt25w
 OLD_FILES+=usr/share/terminfo/p/pcvt28
 OLD_FILES+=usr/share/terminfo/p/pcvt28w
 OLD_FILES+=usr/share/terminfo/p/pcvt35
 OLD_FILES+=usr/share/terminfo/p/pcvt35w
 OLD_FILES+=usr/share/terminfo/p/pcvt40
 OLD_FILES+=usr/share/terminfo/p/pcvt40w
 OLD_FILES+=usr/share/terminfo/p/pcvt43
 OLD_FILES+=usr/share/terminfo/p/pcvt43w
 OLD_FILES+=usr/share/terminfo/p/pcvt50
 OLD_FILES+=usr/share/terminfo/p/pcvt50w
 OLD_FILES+=usr/share/terminfo/p/pcvtXX
 OLD_FILES+=usr/share/terminfo/p/pcz19
 OLD_FILES+=usr/share/terminfo/p/pe1100
 OLD_FILES+=usr/share/terminfo/p/pe1200
 OLD_FILES+=usr/share/terminfo/p/pe1251
 OLD_FILES+=usr/share/terminfo/p/pe550
 OLD_FILES+=usr/share/terminfo/p/pe6100
 OLD_FILES+=usr/share/terminfo/p/pe6300
 OLD_FILES+=usr/share/terminfo/p/pe6312
 OLD_FILES+=usr/share/terminfo/p/pe7000c
 OLD_FILES+=usr/share/terminfo/p/pe7000m
 OLD_FILES+=usr/share/terminfo/p/pilot
 OLD_FILES+=usr/share/terminfo/p/pmcons
 OLD_FILES+=usr/share/terminfo/p/pmconsole
 OLD_FILES+=usr/share/terminfo/p/printer
 OLD_FILES+=usr/share/terminfo/p/prism12
 OLD_FILES+=usr/share/terminfo/p/prism12-m
 OLD_FILES+=usr/share/terminfo/p/prism12-m-w
 OLD_FILES+=usr/share/terminfo/p/prism12-w
 OLD_FILES+=usr/share/terminfo/p/prism14
 OLD_FILES+=usr/share/terminfo/p/prism14-m
 OLD_FILES+=usr/share/terminfo/p/prism14-m-w
 OLD_FILES+=usr/share/terminfo/p/prism14-w
 OLD_FILES+=usr/share/terminfo/p/prism2
 OLD_FILES+=usr/share/terminfo/p/prism4
 OLD_FILES+=usr/share/terminfo/p/prism5
 OLD_FILES+=usr/share/terminfo/p/prism7
 OLD_FILES+=usr/share/terminfo/p/prism8
 OLD_FILES+=usr/share/terminfo/p/prism8-w
 OLD_FILES+=usr/share/terminfo/p/prism8gl
 OLD_FILES+=usr/share/terminfo/p/prism9
 OLD_FILES+=usr/share/terminfo/p/prism9-8
 OLD_FILES+=usr/share/terminfo/p/prism9-8-w
 OLD_FILES+=usr/share/terminfo/p/prism9-w
 OLD_FILES+=usr/share/terminfo/p/pro350
 OLD_FILES+=usr/share/terminfo/p/ps300
 OLD_FILES+=usr/share/terminfo/p/psterm
 OLD_FILES+=usr/share/terminfo/p/psterm-80x24
 OLD_FILES+=usr/share/terminfo/p/psterm-90x28
 OLD_FILES+=usr/share/terminfo/p/psterm-96x48
 OLD_FILES+=usr/share/terminfo/p/psterm-basic
 OLD_FILES+=usr/share/terminfo/p/psterm-fast
 OLD_FILES+=usr/share/terminfo/p/psx_ansi
 OLD_FILES+=usr/share/terminfo/p/pt100
 OLD_FILES+=usr/share/terminfo/p/pt100w
 OLD_FILES+=usr/share/terminfo/p/pt200
 OLD_FILES+=usr/share/terminfo/p/pt200w
 OLD_FILES+=usr/share/terminfo/p/pt210
 OLD_FILES+=usr/share/terminfo/p/pt250
 OLD_FILES+=usr/share/terminfo/p/pt250w
 OLD_FILES+=usr/share/terminfo/p/pt505
 OLD_FILES+=usr/share/terminfo/p/pt505-22
 OLD_FILES+=usr/share/terminfo/p/pt505-24
 OLD_FILES+=usr/share/terminfo/p/pty
 OLD_FILES+=usr/share/terminfo/p/putty
 OLD_FILES+=usr/share/terminfo/p/putty+fnkeys
 OLD_FILES+=usr/share/terminfo/p/putty+fnkeys+esc
 OLD_FILES+=usr/share/terminfo/p/putty+fnkeys+linux
 OLD_FILES+=usr/share/terminfo/p/putty+fnkeys+sco
 OLD_FILES+=usr/share/terminfo/p/putty+fnkeys+vt100
 OLD_FILES+=usr/share/terminfo/p/putty+fnkeys+vt400
 OLD_FILES+=usr/share/terminfo/p/putty+fnkeys+xterm
 OLD_FILES+=usr/share/terminfo/p/putty+keypad
 OLD_FILES+=usr/share/terminfo/p/putty+screen
 OLD_FILES+=usr/share/terminfo/p/putty-256color
 OLD_FILES+=usr/share/terminfo/p/putty-m1
 OLD_FILES+=usr/share/terminfo/p/putty-m1b
 OLD_FILES+=usr/share/terminfo/p/putty-m2
 OLD_FILES+=usr/share/terminfo/p/putty-noapp
 OLD_FILES+=usr/share/terminfo/p/putty-sco
 OLD_FILES+=usr/share/terminfo/p/putty-screen
 OLD_FILES+=usr/share/terminfo/p/putty-vt100
 OLD_DIRS+=usr/share/terminfo/p/
 OLD_FILES+=usr/share/terminfo/q/qansi
 OLD_FILES+=usr/share/terminfo/q/qansi-g
 OLD_FILES+=usr/share/terminfo/q/qansi-m
 OLD_FILES+=usr/share/terminfo/q/qansi-t
 OLD_FILES+=usr/share/terminfo/q/qansi-w
 OLD_FILES+=usr/share/terminfo/q/qdcons
 OLD_FILES+=usr/share/terminfo/q/qdss
 OLD_FILES+=usr/share/terminfo/q/qnx
 OLD_FILES+=usr/share/terminfo/q/qnx4
 OLD_FILES+=usr/share/terminfo/q/qnxm
 OLD_FILES+=usr/share/terminfo/q/qnxt
 OLD_FILES+=usr/share/terminfo/q/qnxt2
 OLD_FILES+=usr/share/terminfo/q/qnxt4
 OLD_FILES+=usr/share/terminfo/q/qnxtmono
 OLD_FILES+=usr/share/terminfo/q/qnxw
 OLD_FILES+=usr/share/terminfo/q/qume
 OLD_FILES+=usr/share/terminfo/q/qume5
 OLD_FILES+=usr/share/terminfo/q/qvt101
 OLD_FILES+=usr/share/terminfo/q/qvt101+
 OLD_FILES+=usr/share/terminfo/q/qvt101p
 OLD_FILES+=usr/share/terminfo/q/qvt102
 OLD_FILES+=usr/share/terminfo/q/qvt103
 OLD_FILES+=usr/share/terminfo/q/qvt103-w
 OLD_FILES+=usr/share/terminfo/q/qvt108
 OLD_FILES+=usr/share/terminfo/q/qvt119
 OLD_FILES+=usr/share/terminfo/q/qvt119+
 OLD_FILES+=usr/share/terminfo/q/qvt119+-25
 OLD_FILES+=usr/share/terminfo/q/qvt119+-25-w
 OLD_FILES+=usr/share/terminfo/q/qvt119+-w
 OLD_FILES+=usr/share/terminfo/q/qvt119-25-w
 OLD_FILES+=usr/share/terminfo/q/qvt119-w
 OLD_FILES+=usr/share/terminfo/q/qvt119p
 OLD_FILES+=usr/share/terminfo/q/qvt119p-25
 OLD_FILES+=usr/share/terminfo/q/qvt119p-25-w
 OLD_FILES+=usr/share/terminfo/q/qvt119p-w
 OLD_FILES+=usr/share/terminfo/q/qvt203
 OLD_FILES+=usr/share/terminfo/q/qvt203+
 OLD_FILES+=usr/share/terminfo/q/qvt203-25
 OLD_FILES+=usr/share/terminfo/q/qvt203-25-w
 OLD_FILES+=usr/share/terminfo/q/qvt203-w
 OLD_FILES+=usr/share/terminfo/q/qvt203-w-am
 OLD_DIRS+=usr/share/terminfo/q/
 OLD_FILES+=usr/share/terminfo/r/rbcomm
 OLD_FILES+=usr/share/terminfo/r/rbcomm-nam
 OLD_FILES+=usr/share/terminfo/r/rbcomm-w
 OLD_FILES+=usr/share/terminfo/r/rca
 OLD_FILES+=usr/share/terminfo/r/rcons
 OLD_FILES+=usr/share/terminfo/r/rcons-color
 OLD_FILES+=usr/share/terminfo/r/rebus3180
 OLD_FILES+=usr/share/terminfo/r/regent
 OLD_FILES+=usr/share/terminfo/r/regent100
 OLD_FILES+=usr/share/terminfo/r/regent20
 OLD_FILES+=usr/share/terminfo/r/regent200
 OLD_FILES+=usr/share/terminfo/r/regent25
 OLD_FILES+=usr/share/terminfo/r/regent40
 OLD_FILES+=usr/share/terminfo/r/regent40+
 OLD_FILES+=usr/share/terminfo/r/regent60
 OLD_FILES+=usr/share/terminfo/r/rt6221
 OLD_FILES+=usr/share/terminfo/r/rt6221-w
 OLD_FILES+=usr/share/terminfo/r/rtpc
 OLD_FILES+=usr/share/terminfo/r/rxvt
 OLD_FILES+=usr/share/terminfo/r/rxvt+pcfkeys
 OLD_FILES+=usr/share/terminfo/r/rxvt-16color
 OLD_FILES+=usr/share/terminfo/r/rxvt-256color
 OLD_FILES+=usr/share/terminfo/r/rxvt-88color
 OLD_FILES+=usr/share/terminfo/r/rxvt-basic
 OLD_FILES+=usr/share/terminfo/r/rxvt-color
 OLD_FILES+=usr/share/terminfo/r/rxvt-cygwin
 OLD_FILES+=usr/share/terminfo/r/rxvt-cygwin-native
 OLD_FILES+=usr/share/terminfo/r/rxvt-xpm
 OLD_DIRS+=usr/share/terminfo/r/
 OLD_FILES+=usr/share/terminfo/s/s4
 OLD_FILES+=usr/share/terminfo/s/sb1
 OLD_FILES+=usr/share/terminfo/s/sb2
 OLD_FILES+=usr/share/terminfo/s/sb3
 OLD_FILES+=usr/share/terminfo/s/sbi
 OLD_FILES+=usr/share/terminfo/s/sbobcat
 OLD_FILES+=usr/share/terminfo/s/sc410
 OLD_FILES+=usr/share/terminfo/s/sc415
 OLD_FILES+=usr/share/terminfo/s/scanset
 OLD_FILES+=usr/share/terminfo/s/scoansi
 OLD_FILES+=usr/share/terminfo/s/scoansi-new
 OLD_FILES+=usr/share/terminfo/s/scoansi-old
 OLD_FILES+=usr/share/terminfo/s/screen
 OLD_FILES+=usr/share/terminfo/s/screen+fkeys
 OLD_FILES+=usr/share/terminfo/s/screen+italics
 OLD_FILES+=usr/share/terminfo/s/screen-16color
 OLD_FILES+=usr/share/terminfo/s/screen-16color-bce
 OLD_FILES+=usr/share/terminfo/s/screen-16color-bce-s
 OLD_FILES+=usr/share/terminfo/s/screen-16color-s
 OLD_FILES+=usr/share/terminfo/s/screen-256color
 OLD_FILES+=usr/share/terminfo/s/screen-256color-bce
 OLD_FILES+=usr/share/terminfo/s/screen-256color-bce-s
 OLD_FILES+=usr/share/terminfo/s/screen-256color-s
 OLD_FILES+=usr/share/terminfo/s/screen-bce
 OLD_FILES+=usr/share/terminfo/s/screen-bce.Eterm
 OLD_FILES+=usr/share/terminfo/s/screen-bce.gnome
 OLD_FILES+=usr/share/terminfo/s/screen-bce.konsole
 OLD_FILES+=usr/share/terminfo/s/screen-bce.linux
 OLD_FILES+=usr/share/terminfo/s/screen-bce.mrxvt
 OLD_FILES+=usr/share/terminfo/s/screen-bce.rxvt
 OLD_FILES+=usr/share/terminfo/s/screen-bce.xterm-new
 OLD_FILES+=usr/share/terminfo/s/screen-s
 OLD_FILES+=usr/share/terminfo/s/screen-w
 OLD_FILES+=usr/share/terminfo/s/screen.Eterm
 OLD_FILES+=usr/share/terminfo/s/screen.gnome
 OLD_FILES+=usr/share/terminfo/s/screen.konsole
 OLD_FILES+=usr/share/terminfo/s/screen.konsole-256color
 OLD_FILES+=usr/share/terminfo/s/screen.linux
 OLD_FILES+=usr/share/terminfo/s/screen.linux-m1
 OLD_FILES+=usr/share/terminfo/s/screen.linux-m1b
 OLD_FILES+=usr/share/terminfo/s/screen.linux-m2
 OLD_FILES+=usr/share/terminfo/s/screen.linux-s
 OLD_FILES+=usr/share/terminfo/s/screen.minitel1
 OLD_FILES+=usr/share/terminfo/s/screen.minitel1-nb
 OLD_FILES+=usr/share/terminfo/s/screen.minitel12-80
 OLD_FILES+=usr/share/terminfo/s/screen.minitel1b
 OLD_FILES+=usr/share/terminfo/s/screen.minitel1b-80
 OLD_FILES+=usr/share/terminfo/s/screen.minitel1b-nb
 OLD_FILES+=usr/share/terminfo/s/screen.minitel2-80
 OLD_FILES+=usr/share/terminfo/s/screen.mlterm
 OLD_FILES+=usr/share/terminfo/s/screen.mlterm-256color
 OLD_FILES+=usr/share/terminfo/s/screen.mrxvt
 OLD_FILES+=usr/share/terminfo/s/screen.putty
 OLD_FILES+=usr/share/terminfo/s/screen.putty-256color
 OLD_FILES+=usr/share/terminfo/s/screen.putty-m1
 OLD_FILES+=usr/share/terminfo/s/screen.putty-m1b
 OLD_FILES+=usr/share/terminfo/s/screen.putty-m2
 OLD_FILES+=usr/share/terminfo/s/screen.rxvt
 OLD_FILES+=usr/share/terminfo/s/screen.teraterm
 OLD_FILES+=usr/share/terminfo/s/screen.vte
 OLD_FILES+=usr/share/terminfo/s/screen.vte-256color
 OLD_FILES+=usr/share/terminfo/s/screen.xterm-256color
 OLD_FILES+=usr/share/terminfo/s/screen.xterm-new
 OLD_FILES+=usr/share/terminfo/s/screen.xterm-r6
 OLD_FILES+=usr/share/terminfo/s/screen.xterm-xfree86
 OLD_FILES+=usr/share/terminfo/s/screen2
 OLD_FILES+=usr/share/terminfo/s/screen3
 OLD_FILES+=usr/share/terminfo/s/screen4
 OLD_FILES+=usr/share/terminfo/s/screen5
 OLD_FILES+=usr/share/terminfo/s/screwpoint
 OLD_FILES+=usr/share/terminfo/s/scrhp
 OLD_FILES+=usr/share/terminfo/s/scrt
 OLD_FILES+=usr/share/terminfo/s/securecrt
 OLD_FILES+=usr/share/terminfo/s/sibo
 OLD_FILES+=usr/share/terminfo/s/simpleterm
 OLD_FILES+=usr/share/terminfo/s/simterm
 OLD_FILES+=usr/share/terminfo/s/soroc
 OLD_FILES+=usr/share/terminfo/s/soroc120
 OLD_FILES+=usr/share/terminfo/s/soroc140
 OLD_FILES+=usr/share/terminfo/s/spinwriter
 OLD_FILES+=usr/share/terminfo/s/st
 OLD_FILES+=usr/share/terminfo/s/st-0.6
 OLD_FILES+=usr/share/terminfo/s/st-0.7
 OLD_FILES+=usr/share/terminfo/s/st-0.8
 OLD_FILES+=usr/share/terminfo/s/st-16color
 OLD_FILES+=usr/share/terminfo/s/st-256color
 OLD_FILES+=usr/share/terminfo/s/st-direct
 OLD_FILES+=usr/share/terminfo/s/st52
 OLD_FILES+=usr/share/terminfo/s/st52-color
 OLD_FILES+=usr/share/terminfo/s/st52-m
 OLD_FILES+=usr/share/terminfo/s/st52-old
 OLD_FILES+=usr/share/terminfo/s/stterm
 OLD_FILES+=usr/share/terminfo/s/stterm-16color
 OLD_FILES+=usr/share/terminfo/s/stterm-256color
 OLD_FILES+=usr/share/terminfo/s/stv52
 OLD_FILES+=usr/share/terminfo/s/stv52pc
 OLD_FILES+=usr/share/terminfo/s/sun
 OLD_FILES+=usr/share/terminfo/s/sun+sl
 OLD_FILES+=usr/share/terminfo/s/sun-1
 OLD_FILES+=usr/share/terminfo/s/sun-12
 OLD_FILES+=usr/share/terminfo/s/sun-17
 OLD_FILES+=usr/share/terminfo/s/sun-24
 OLD_FILES+=usr/share/terminfo/s/sun-34
 OLD_FILES+=usr/share/terminfo/s/sun-48
 OLD_FILES+=usr/share/terminfo/s/sun-c
 OLD_FILES+=usr/share/terminfo/s/sun-cgsix
 OLD_FILES+=usr/share/terminfo/s/sun-cmd
 OLD_FILES+=usr/share/terminfo/s/sun-color
 OLD_FILES+=usr/share/terminfo/s/sun-e
 OLD_FILES+=usr/share/terminfo/s/sun-e-s
 OLD_FILES+=usr/share/terminfo/s/sun-il
 OLD_FILES+=usr/share/terminfo/s/sun-nic
 OLD_FILES+=usr/share/terminfo/s/sun-s
 OLD_FILES+=usr/share/terminfo/s/sun-s-e
 OLD_FILES+=usr/share/terminfo/s/sun-ss5
 OLD_FILES+=usr/share/terminfo/s/sun-type4
 OLD_FILES+=usr/share/terminfo/s/sun1
 OLD_FILES+=usr/share/terminfo/s/sun2
 OLD_FILES+=usr/share/terminfo/s/sune
 OLD_FILES+=usr/share/terminfo/s/superbee
 OLD_FILES+=usr/share/terminfo/s/superbee-xsb
 OLD_FILES+=usr/share/terminfo/s/superbeeic
 OLD_FILES+=usr/share/terminfo/s/superbrain
 OLD_FILES+=usr/share/terminfo/s/sv80
 OLD_FILES+=usr/share/terminfo/s/swtp
 OLD_FILES+=usr/share/terminfo/s/synertek
 OLD_FILES+=usr/share/terminfo/s/synertek380
 OLD_FILES+=usr/share/terminfo/s/system1
 OLD_DIRS+=usr/share/terminfo/s/
 
 OLD_FILES+=usr/share/terminfo/t/t10
 OLD_FILES+=usr/share/terminfo/t/t1061
 OLD_FILES+=usr/share/terminfo/t/t1061f
 OLD_FILES+=usr/share/terminfo/t/t16
 OLD_FILES+=usr/share/terminfo/t/t3700
 OLD_FILES+=usr/share/terminfo/t/t3800
 OLD_FILES+=usr/share/terminfo/t/t653x
 OLD_FILES+=usr/share/terminfo/t/tab
 OLD_FILES+=usr/share/terminfo/t/tab132
 OLD_FILES+=usr/share/terminfo/t/tab132-15
 OLD_FILES+=usr/share/terminfo/t/tab132-rv
 OLD_FILES+=usr/share/terminfo/t/tab132-w
 OLD_FILES+=usr/share/terminfo/t/tab132-w-rv
 OLD_FILES+=usr/share/terminfo/t/tandem6510
 OLD_FILES+=usr/share/terminfo/t/tandem653
 OLD_FILES+=usr/share/terminfo/t/tek
 OLD_FILES+=usr/share/terminfo/t/tek4012
 OLD_FILES+=usr/share/terminfo/t/tek4013
 OLD_FILES+=usr/share/terminfo/t/tek4014
 OLD_FILES+=usr/share/terminfo/t/tek4014-sm
 OLD_FILES+=usr/share/terminfo/t/tek4015
 OLD_FILES+=usr/share/terminfo/t/tek4015-sm
 OLD_FILES+=usr/share/terminfo/t/tek4023
 OLD_FILES+=usr/share/terminfo/t/tek4024
 OLD_FILES+=usr/share/terminfo/t/tek4025
 OLD_FILES+=usr/share/terminfo/t/tek4025-17
 OLD_FILES+=usr/share/terminfo/t/tek4025-17-ws
 OLD_FILES+=usr/share/terminfo/t/tek4025-cr
 OLD_FILES+=usr/share/terminfo/t/tek4025-ex
 OLD_FILES+=usr/share/terminfo/t/tek4025a
 OLD_FILES+=usr/share/terminfo/t/tek4025ex
 OLD_FILES+=usr/share/terminfo/t/tek4027
 OLD_FILES+=usr/share/terminfo/t/tek4027-ex
 OLD_FILES+=usr/share/terminfo/t/tek4105
 OLD_FILES+=usr/share/terminfo/t/tek4105-30
 OLD_FILES+=usr/share/terminfo/t/tek4105a
 OLD_FILES+=usr/share/terminfo/t/tek4106brl
 OLD_FILES+=usr/share/terminfo/t/tek4107
 OLD_FILES+=usr/share/terminfo/t/tek4107brl
 OLD_FILES+=usr/share/terminfo/t/tek4109
 OLD_FILES+=usr/share/terminfo/t/tek4109brl
 OLD_FILES+=usr/share/terminfo/t/tek4112
 OLD_FILES+=usr/share/terminfo/t/tek4112-5
 OLD_FILES+=usr/share/terminfo/t/tek4112-nd
 OLD_FILES+=usr/share/terminfo/t/tek4113
 OLD_FILES+=usr/share/terminfo/t/tek4113-34
 OLD_FILES+=usr/share/terminfo/t/tek4113-nd
 OLD_FILES+=usr/share/terminfo/t/tek4114
 OLD_FILES+=usr/share/terminfo/t/tek4115
 OLD_FILES+=usr/share/terminfo/t/tek4125
 OLD_FILES+=usr/share/terminfo/t/tek4205
 OLD_FILES+=usr/share/terminfo/t/tek4207
 OLD_FILES+=usr/share/terminfo/t/tek4207-s
 OLD_FILES+=usr/share/terminfo/t/tek4404
 OLD_FILES+=usr/share/terminfo/t/teken
 OLD_FILES+=usr/share/terminfo/t/teleray
 OLD_FILES+=usr/share/terminfo/t/teletec
 OLD_FILES+=usr/share/terminfo/t/teraterm
 OLD_FILES+=usr/share/terminfo/t/teraterm-256color
 OLD_FILES+=usr/share/terminfo/t/teraterm2.3
 OLD_FILES+=usr/share/terminfo/t/teraterm4.59
 OLD_FILES+=usr/share/terminfo/t/teraterm4.97
 OLD_FILES+=usr/share/terminfo/t/terminator
 OLD_FILES+=usr/share/terminfo/t/terminet
 OLD_FILES+=usr/share/terminfo/t/terminet1200
 OLD_FILES+=usr/share/terminfo/t/terminet300
 OLD_FILES+=usr/share/terminfo/t/terminology
 OLD_FILES+=usr/share/terminfo/t/terminology-0.6.1
 OLD_FILES+=usr/share/terminfo/t/terminology-1.0.0
 OLD_FILES+=usr/share/terminfo/t/terminology-1.8.1
 OLD_FILES+=usr/share/terminfo/t/termite
 OLD_FILES+=usr/share/terminfo/t/tgtelnet
 OLD_FILES+=usr/share/terminfo/t/ti700
 OLD_FILES+=usr/share/terminfo/t/ti703
 OLD_FILES+=usr/share/terminfo/t/ti703-w
 OLD_FILES+=usr/share/terminfo/t/ti707
 OLD_FILES+=usr/share/terminfo/t/ti707-w
 OLD_FILES+=usr/share/terminfo/t/ti733
 OLD_FILES+=usr/share/terminfo/t/ti735
 OLD_FILES+=usr/share/terminfo/t/ti745
 OLD_FILES+=usr/share/terminfo/t/ti800
 OLD_FILES+=usr/share/terminfo/t/ti916
 OLD_FILES+=usr/share/terminfo/t/ti916-132
 OLD_FILES+=usr/share/terminfo/t/ti916-220-7
 OLD_FILES+=usr/share/terminfo/t/ti916-220-8
 OLD_FILES+=usr/share/terminfo/t/ti916-8
 OLD_FILES+=usr/share/terminfo/t/ti916-8-132
 OLD_FILES+=usr/share/terminfo/t/ti924
 OLD_FILES+=usr/share/terminfo/t/ti924-8
 OLD_FILES+=usr/share/terminfo/t/ti924-8w
 OLD_FILES+=usr/share/terminfo/t/ti924w
 OLD_FILES+=usr/share/terminfo/t/ti926
 OLD_FILES+=usr/share/terminfo/t/ti926-8
 OLD_FILES+=usr/share/terminfo/t/ti928
 OLD_FILES+=usr/share/terminfo/t/ti928-8
 OLD_FILES+=usr/share/terminfo/t/ti931
 OLD_FILES+=usr/share/terminfo/t/ti_ansi
 OLD_FILES+=usr/share/terminfo/t/tkterm
 OLD_FILES+=usr/share/terminfo/t/tmux
 OLD_FILES+=usr/share/terminfo/t/tmux-256color
 OLD_FILES+=usr/share/terminfo/t/tmux-direct
 OLD_FILES+=usr/share/terminfo/t/tn1200
 OLD_FILES+=usr/share/terminfo/t/tn300
 OLD_FILES+=usr/share/terminfo/t/trs16
 OLD_FILES+=usr/share/terminfo/t/trs2
 OLD_FILES+=usr/share/terminfo/t/trs80II
 OLD_FILES+=usr/share/terminfo/t/trsII
 OLD_FILES+=usr/share/terminfo/t/ts-1
 OLD_FILES+=usr/share/terminfo/t/ts-1p
 OLD_FILES+=usr/share/terminfo/t/ts1
 OLD_FILES+=usr/share/terminfo/t/ts100
 OLD_FILES+=usr/share/terminfo/t/ts100-ctxt
 OLD_FILES+=usr/share/terminfo/t/ts100-sp
 OLD_FILES+=usr/share/terminfo/t/ts1p
 OLD_FILES+=usr/share/terminfo/t/tt
 OLD_FILES+=usr/share/terminfo/t/tt505-22
 OLD_FILES+=usr/share/terminfo/t/tt52
 OLD_FILES+=usr/share/terminfo/t/tty33
 OLD_FILES+=usr/share/terminfo/t/tty35
 OLD_FILES+=usr/share/terminfo/t/tty37
 OLD_FILES+=usr/share/terminfo/t/tty40
 OLD_FILES+=usr/share/terminfo/t/tty43
 OLD_FILES+=usr/share/terminfo/t/tty4420
 OLD_FILES+=usr/share/terminfo/t/tty4424
 OLD_FILES+=usr/share/terminfo/t/tty4424-1
 OLD_FILES+=usr/share/terminfo/t/tty4424m
 OLD_FILES+=usr/share/terminfo/t/tty4426
 OLD_FILES+=usr/share/terminfo/t/tty5410
 OLD_FILES+=usr/share/terminfo/t/tty5410-w
 OLD_FILES+=usr/share/terminfo/t/tty5410v1
 OLD_FILES+=usr/share/terminfo/t/tty5410v1-w
 OLD_FILES+=usr/share/terminfo/t/tty5420
 OLD_FILES+=usr/share/terminfo/t/tty5420+nl
 OLD_FILES+=usr/share/terminfo/t/tty5420-nl
 OLD_FILES+=usr/share/terminfo/t/tty5420-rv
 OLD_FILES+=usr/share/terminfo/t/tty5420-rv-nl
 OLD_FILES+=usr/share/terminfo/t/tty5420-w
 OLD_FILES+=usr/share/terminfo/t/tty5420-w-nl
 OLD_FILES+=usr/share/terminfo/t/tty5420-w-rv
 OLD_FILES+=usr/share/terminfo/t/tty5420-w-rv-n
 OLD_FILES+=usr/share/terminfo/t/tty5425
 OLD_FILES+=usr/share/terminfo/t/tty5425-nl
 OLD_FILES+=usr/share/terminfo/t/tty5425-w
 OLD_FILES+=usr/share/terminfo/t/tty5620
 OLD_FILES+=usr/share/terminfo/t/tty5620-1
 OLD_FILES+=usr/share/terminfo/t/tty5620-24
 OLD_FILES+=usr/share/terminfo/t/tty5620-34
 OLD_FILES+=usr/share/terminfo/t/tty5620-s
 OLD_FILES+=usr/share/terminfo/t/ttydmd
 OLD_FILES+=usr/share/terminfo/t/tvi803
 OLD_FILES+=usr/share/terminfo/t/tvi9065
 OLD_FILES+=usr/share/terminfo/t/tvi910
 OLD_FILES+=usr/share/terminfo/t/tvi910+
 OLD_FILES+=usr/share/terminfo/t/tvi912
 OLD_FILES+=usr/share/terminfo/t/tvi912b
 OLD_FILES+=usr/share/terminfo/t/tvi912b+2p
 OLD_FILES+=usr/share/terminfo/t/tvi912b+dim
 OLD_FILES+=usr/share/terminfo/t/tvi912b+mc
 OLD_FILES+=usr/share/terminfo/t/tvi912b+printer
 OLD_FILES+=usr/share/terminfo/t/tvi912b+vb
 OLD_FILES+=usr/share/terminfo/t/tvi912b-2p
 OLD_FILES+=usr/share/terminfo/t/tvi912b-2p-mc
 OLD_FILES+=usr/share/terminfo/t/tvi912b-2p-p
 OLD_FILES+=usr/share/terminfo/t/tvi912b-2p-unk
 OLD_FILES+=usr/share/terminfo/t/tvi912b-mc
 OLD_FILES+=usr/share/terminfo/t/tvi912b-mc-2p
 OLD_FILES+=usr/share/terminfo/t/tvi912b-mc-vb
 OLD_FILES+=usr/share/terminfo/t/tvi912b-p
 OLD_FILES+=usr/share/terminfo/t/tvi912b-p-2p
 OLD_FILES+=usr/share/terminfo/t/tvi912b-p-vb
 OLD_FILES+=usr/share/terminfo/t/tvi912b-unk
 OLD_FILES+=usr/share/terminfo/t/tvi912b-unk-2p
 OLD_FILES+=usr/share/terminfo/t/tvi912b-unk-vb
 OLD_FILES+=usr/share/terminfo/t/tvi912b-vb
 OLD_FILES+=usr/share/terminfo/t/tvi912b-vb-mc
 OLD_FILES+=usr/share/terminfo/t/tvi912b-vb-p
 OLD_FILES+=usr/share/terminfo/t/tvi912b-vb-unk
 OLD_FILES+=usr/share/terminfo/t/tvi912c
 OLD_FILES+=usr/share/terminfo/t/tvi912c-2p
 OLD_FILES+=usr/share/terminfo/t/tvi912c-2p-mc
 OLD_FILES+=usr/share/terminfo/t/tvi912c-2p-p
 OLD_FILES+=usr/share/terminfo/t/tvi912c-2p-unk
 OLD_FILES+=usr/share/terminfo/t/tvi912c-mc
 OLD_FILES+=usr/share/terminfo/t/tvi912c-mc-2p
 OLD_FILES+=usr/share/terminfo/t/tvi912c-mc-vb
 OLD_FILES+=usr/share/terminfo/t/tvi912c-p
 OLD_FILES+=usr/share/terminfo/t/tvi912c-p-2p
 OLD_FILES+=usr/share/terminfo/t/tvi912c-p-vb
 OLD_FILES+=usr/share/terminfo/t/tvi912c-unk
 OLD_FILES+=usr/share/terminfo/t/tvi912c-unk-2p
 OLD_FILES+=usr/share/terminfo/t/tvi912c-unk-vb
 OLD_FILES+=usr/share/terminfo/t/tvi912c-vb
 OLD_FILES+=usr/share/terminfo/t/tvi912c-vb-mc
 OLD_FILES+=usr/share/terminfo/t/tvi912c-vb-p
 OLD_FILES+=usr/share/terminfo/t/tvi912c-vb-unk
 OLD_FILES+=usr/share/terminfo/t/tvi912cc
 OLD_FILES+=usr/share/terminfo/t/tvi914
 OLD_FILES+=usr/share/terminfo/t/tvi920
 OLD_FILES+=usr/share/terminfo/t/tvi920b
 OLD_FILES+=usr/share/terminfo/t/tvi920b+fn
 OLD_FILES+=usr/share/terminfo/t/tvi920b-2p
 OLD_FILES+=usr/share/terminfo/t/tvi920b-2p-mc
 OLD_FILES+=usr/share/terminfo/t/tvi920b-2p-p
 OLD_FILES+=usr/share/terminfo/t/tvi920b-2p-unk
 OLD_FILES+=usr/share/terminfo/t/tvi920b-mc
 OLD_FILES+=usr/share/terminfo/t/tvi920b-mc-2p
 OLD_FILES+=usr/share/terminfo/t/tvi920b-mc-vb
 OLD_FILES+=usr/share/terminfo/t/tvi920b-p
 OLD_FILES+=usr/share/terminfo/t/tvi920b-p-2p
 OLD_FILES+=usr/share/terminfo/t/tvi920b-p-vb
 OLD_FILES+=usr/share/terminfo/t/tvi920b-unk
 OLD_FILES+=usr/share/terminfo/t/tvi920b-unk-2p
 OLD_FILES+=usr/share/terminfo/t/tvi920b-unk-vb
 OLD_FILES+=usr/share/terminfo/t/tvi920b-vb
 OLD_FILES+=usr/share/terminfo/t/tvi920b-vb-mc
 OLD_FILES+=usr/share/terminfo/t/tvi920b-vb-p
 OLD_FILES+=usr/share/terminfo/t/tvi920b-vb-unk
 OLD_FILES+=usr/share/terminfo/t/tvi920c
 OLD_FILES+=usr/share/terminfo/t/tvi920c-2p
 OLD_FILES+=usr/share/terminfo/t/tvi920c-2p-mc
 OLD_FILES+=usr/share/terminfo/t/tvi920c-2p-p
 OLD_FILES+=usr/share/terminfo/t/tvi920c-2p-unk
 OLD_FILES+=usr/share/terminfo/t/tvi920c-mc
 OLD_FILES+=usr/share/terminfo/t/tvi920c-mc-2p
 OLD_FILES+=usr/share/terminfo/t/tvi920c-mc-vb
 OLD_FILES+=usr/share/terminfo/t/tvi920c-p
 OLD_FILES+=usr/share/terminfo/t/tvi920c-p-2p
 OLD_FILES+=usr/share/terminfo/t/tvi920c-p-vb
 OLD_FILES+=usr/share/terminfo/t/tvi920c-unk
 OLD_FILES+=usr/share/terminfo/t/tvi920c-unk-2p
 OLD_FILES+=usr/share/terminfo/t/tvi920c-unk-vb
 OLD_FILES+=usr/share/terminfo/t/tvi920c-vb
 OLD_FILES+=usr/share/terminfo/t/tvi920c-vb-mc
 OLD_FILES+=usr/share/terminfo/t/tvi920c-vb-p
 OLD_FILES+=usr/share/terminfo/t/tvi920c-vb-unk
 OLD_FILES+=usr/share/terminfo/t/tvi921
 OLD_FILES+=usr/share/terminfo/t/tvi924
 OLD_FILES+=usr/share/terminfo/t/tvi925
 OLD_FILES+=usr/share/terminfo/t/tvi925-hi
 OLD_FILES+=usr/share/terminfo/t/tvi92B
 OLD_FILES+=usr/share/terminfo/t/tvi92D
 OLD_FILES+=usr/share/terminfo/t/tvi950
 OLD_FILES+=usr/share/terminfo/t/tvi950-2p
 OLD_FILES+=usr/share/terminfo/t/tvi950-4p
 OLD_FILES+=usr/share/terminfo/t/tvi950-rv
 OLD_FILES+=usr/share/terminfo/t/tvi950-rv-2p
 OLD_FILES+=usr/share/terminfo/t/tvi950-rv-4p
 OLD_FILES+=usr/share/terminfo/t/tvi955
 OLD_FILES+=usr/share/terminfo/t/tvi955-hb
 OLD_FILES+=usr/share/terminfo/t/tvi955-w
 OLD_FILES+=usr/share/terminfo/t/tvi970
 OLD_FILES+=usr/share/terminfo/t/tvi970-2p
 OLD_FILES+=usr/share/terminfo/t/tvi970-vb
 OLD_FILES+=usr/share/terminfo/t/tvipt
 OLD_FILES+=usr/share/terminfo/t/tw100
 OLD_FILES+=usr/share/terminfo/t/tw52
 OLD_FILES+=usr/share/terminfo/t/tw52-color
 OLD_FILES+=usr/share/terminfo/t/tw52-m
 OLD_FILES+=usr/share/terminfo/t/tws-generic
 OLD_FILES+=usr/share/terminfo/t/tws2102-sna
 OLD_FILES+=usr/share/terminfo/t/tws2103
 OLD_FILES+=usr/share/terminfo/t/tws2103-sna
 OLD_DIRS+=usr/share/terminfo/t/
 OLD_FILES+=usr/share/terminfo/u/ultima2
 OLD_FILES+=usr/share/terminfo/u/ultimaII
 OLD_FILES+=usr/share/terminfo/u/uniterm
 OLD_FILES+=usr/share/terminfo/u/uniterm49
 OLD_FILES+=usr/share/terminfo/u/unixpc
 OLD_FILES+=usr/share/terminfo/u/unknown
 OLD_FILES+=usr/share/terminfo/u/uts30
 OLD_FILES+=usr/share/terminfo/u/uwin
 OLD_DIRS+=usr/share/terminfo/u/
 OLD_FILES+=usr/share/terminfo/v/v200-nam
 OLD_FILES+=usr/share/terminfo/v/v320n
 OLD_FILES+=usr/share/terminfo/v/v3220
 OLD_FILES+=usr/share/terminfo/v/v5410
 OLD_FILES+=usr/share/terminfo/v/vanilla
 OLD_FILES+=usr/share/terminfo/v/vapple
 OLD_FILES+=usr/share/terminfo/v/vc103
 OLD_FILES+=usr/share/terminfo/v/vc203
 OLD_FILES+=usr/share/terminfo/v/vc303
 OLD_FILES+=usr/share/terminfo/v/vc303a
 OLD_FILES+=usr/share/terminfo/v/vc403a
 OLD_FILES+=usr/share/terminfo/v/vc404
 OLD_FILES+=usr/share/terminfo/v/vc404-s
 OLD_FILES+=usr/share/terminfo/v/vc414
 OLD_FILES+=usr/share/terminfo/v/vc414h
 OLD_FILES+=usr/share/terminfo/v/vc415
 OLD_FILES+=usr/share/terminfo/v/venix
 OLD_FILES+=usr/share/terminfo/v/versaterm
 OLD_FILES+=usr/share/terminfo/v/vi200
 OLD_FILES+=usr/share/terminfo/v/vi200-f
 OLD_FILES+=usr/share/terminfo/v/vi200-rv
 OLD_FILES+=usr/share/terminfo/v/vi300
 OLD_FILES+=usr/share/terminfo/v/vi300-old
 OLD_FILES+=usr/share/terminfo/v/vi50
 OLD_FILES+=usr/share/terminfo/v/vi500
 OLD_FILES+=usr/share/terminfo/v/vi50adm
 OLD_FILES+=usr/share/terminfo/v/vi55
 OLD_FILES+=usr/share/terminfo/v/vi550
 OLD_FILES+=usr/share/terminfo/v/vi603
 OLD_FILES+=usr/share/terminfo/v/viewdata
 OLD_FILES+=usr/share/terminfo/v/viewdata-o
 OLD_FILES+=usr/share/terminfo/v/viewdata-rv
 OLD_FILES+=usr/share/terminfo/v/viewpoint
 OLD_FILES+=usr/share/terminfo/v/viewpoint3a+
 OLD_FILES+=usr/share/terminfo/v/viewpoint60
 OLD_FILES+=usr/share/terminfo/v/viewpoint90
 OLD_FILES+=usr/share/terminfo/v/vip
 OLD_FILES+=usr/share/terminfo/v/vip-H
 OLD_FILES+=usr/share/terminfo/v/vip-Hw
 OLD_FILES+=usr/share/terminfo/v/vip-w
 OLD_FILES+=usr/share/terminfo/v/vip7800-H
 OLD_FILES+=usr/share/terminfo/v/vip7800-Hw
 OLD_FILES+=usr/share/terminfo/v/vip7800-w
 OLD_FILES+=usr/share/terminfo/v/visa50
 OLD_FILES+=usr/share/terminfo/v/visual603
 OLD_FILES+=usr/share/terminfo/v/vitty
 OLD_FILES+=usr/share/terminfo/v/vk100
 OLD_FILES+=usr/share/terminfo/v/vp3a+
 OLD_FILES+=usr/share/terminfo/v/vp60
 OLD_FILES+=usr/share/terminfo/v/vp90
 OLD_FILES+=usr/share/terminfo/v/vremote
 OLD_FILES+=usr/share/terminfo/v/vs100
 OLD_FILES+=usr/share/terminfo/v/vs100-x10
 OLD_FILES+=usr/share/terminfo/v/vsc
 OLD_FILES+=usr/share/terminfo/v/vscode
 OLD_FILES+=usr/share/terminfo/v/vscode-direct
 OLD_FILES+=usr/share/terminfo/v/vt-61
 OLD_FILES+=usr/share/terminfo/v/vt-utf8
 OLD_FILES+=usr/share/terminfo/v/vt100
 OLD_FILES+=usr/share/terminfo/v/vt100+
 OLD_FILES+=usr/share/terminfo/v/vt100+4bsd
 OLD_FILES+=usr/share/terminfo/v/vt100+enq
 OLD_FILES+=usr/share/terminfo/v/vt100+fnkeys
 OLD_FILES+=usr/share/terminfo/v/vt100+keypad
 OLD_FILES+=usr/share/terminfo/v/vt100+pfkeys
 OLD_FILES+=usr/share/terminfo/v/vt100-am
 OLD_FILES+=usr/share/terminfo/v/vt100-bm
 OLD_FILES+=usr/share/terminfo/v/vt100-bm-o
 OLD_FILES+=usr/share/terminfo/v/vt100-bot-s
 OLD_FILES+=usr/share/terminfo/v/vt100-nam
 OLD_FILES+=usr/share/terminfo/v/vt100-nam-w
 OLD_FILES+=usr/share/terminfo/v/vt100-nav
 OLD_FILES+=usr/share/terminfo/v/vt100-nav-w
 OLD_FILES+=usr/share/terminfo/v/vt100-putty
 OLD_FILES+=usr/share/terminfo/v/vt100-s
 OLD_FILES+=usr/share/terminfo/v/vt100-s-bot
 OLD_FILES+=usr/share/terminfo/v/vt100-s-top
 OLD_FILES+=usr/share/terminfo/v/vt100-top-s
 OLD_FILES+=usr/share/terminfo/v/vt100-vb
 OLD_FILES+=usr/share/terminfo/v/vt100-w
 OLD_FILES+=usr/share/terminfo/v/vt100-w-am
 OLD_FILES+=usr/share/terminfo/v/vt100-w-nam
 OLD_FILES+=usr/share/terminfo/v/vt100-w-nav
 OLD_FILES+=usr/share/terminfo/v/vt100nam
 OLD_FILES+=usr/share/terminfo/v/vt102
 OLD_FILES+=usr/share/terminfo/v/vt102+enq
 OLD_FILES+=usr/share/terminfo/v/vt102-nsgr
 OLD_FILES+=usr/share/terminfo/v/vt102-w
 OLD_FILES+=usr/share/terminfo/v/vt125
 OLD_FILES+=usr/share/terminfo/v/vt131
 OLD_FILES+=usr/share/terminfo/v/vt132
 OLD_FILES+=usr/share/terminfo/v/vt200
 OLD_FILES+=usr/share/terminfo/v/vt200-8
 OLD_FILES+=usr/share/terminfo/v/vt200-8bit
 OLD_FILES+=usr/share/terminfo/v/vt200-js
 OLD_FILES+=usr/share/terminfo/v/vt200-old
 OLD_FILES+=usr/share/terminfo/v/vt200-w
 OLD_FILES+=usr/share/terminfo/v/vt220
 OLD_FILES+=usr/share/terminfo/v/vt220+cvis
 OLD_FILES+=usr/share/terminfo/v/vt220+cvis8
 OLD_FILES+=usr/share/terminfo/v/vt220+keypad
 OLD_FILES+=usr/share/terminfo/v/vt220+pcedit
 OLD_FILES+=usr/share/terminfo/v/vt220+vtedit
 OLD_FILES+=usr/share/terminfo/v/vt220-8
 OLD_FILES+=usr/share/terminfo/v/vt220-8bit
 OLD_FILES+=usr/share/terminfo/v/vt220-base
 OLD_FILES+=usr/share/terminfo/v/vt220-js
 OLD_FILES+=usr/share/terminfo/v/vt220-nam
 OLD_FILES+=usr/share/terminfo/v/vt220-old
 OLD_FILES+=usr/share/terminfo/v/vt220-w
 OLD_FILES+=usr/share/terminfo/v/vt220d
 OLD_FILES+=usr/share/terminfo/v/vt300
 OLD_FILES+=usr/share/terminfo/v/vt300-nam
 OLD_FILES+=usr/share/terminfo/v/vt300-w
 OLD_FILES+=usr/share/terminfo/v/vt300-w-nam
 OLD_FILES+=usr/share/terminfo/v/vt320
 OLD_FILES+=usr/share/terminfo/v/vt320-k3
 OLD_FILES+=usr/share/terminfo/v/vt320-k311
 OLD_FILES+=usr/share/terminfo/v/vt320-nam
 OLD_FILES+=usr/share/terminfo/v/vt320-w
 OLD_FILES+=usr/share/terminfo/v/vt320-w-nam
 OLD_FILES+=usr/share/terminfo/v/vt320nam
 OLD_FILES+=usr/share/terminfo/v/vt330
 OLD_FILES+=usr/share/terminfo/v/vt340
 OLD_FILES+=usr/share/terminfo/v/vt400
 OLD_FILES+=usr/share/terminfo/v/vt400-24
 OLD_FILES+=usr/share/terminfo/v/vt420
 OLD_FILES+=usr/share/terminfo/v/vt420+lrmm
 OLD_FILES+=usr/share/terminfo/v/vt420f
 OLD_FILES+=usr/share/terminfo/v/vt420pc
 OLD_FILES+=usr/share/terminfo/v/vt420pcdos
 OLD_FILES+=usr/share/terminfo/v/vt50
 OLD_FILES+=usr/share/terminfo/v/vt50h
 OLD_FILES+=usr/share/terminfo/v/vt510
 OLD_FILES+=usr/share/terminfo/v/vt510pc
 OLD_FILES+=usr/share/terminfo/v/vt510pcdos
 OLD_FILES+=usr/share/terminfo/v/vt52
 OLD_FILES+=usr/share/terminfo/v/vt52+keypad
 OLD_FILES+=usr/share/terminfo/v/vt52-basic
 OLD_FILES+=usr/share/terminfo/v/vt520
 OLD_FILES+=usr/share/terminfo/v/vt520ansi
 OLD_FILES+=usr/share/terminfo/v/vt525
 OLD_FILES+=usr/share/terminfo/v/vt61
 OLD_FILES+=usr/share/terminfo/v/vt61.5
 OLD_FILES+=usr/share/terminfo/v/vte
 OLD_FILES+=usr/share/terminfo/v/vte+pcfkeys
 OLD_FILES+=usr/share/terminfo/v/vte-2007
 OLD_FILES+=usr/share/terminfo/v/vte-2008
 OLD_FILES+=usr/share/terminfo/v/vte-2012
 OLD_FILES+=usr/share/terminfo/v/vte-2014
 OLD_FILES+=usr/share/terminfo/v/vte-2017
 OLD_FILES+=usr/share/terminfo/v/vte-2018
 OLD_FILES+=usr/share/terminfo/v/vte-256color
 OLD_FILES+=usr/share/terminfo/v/vte-direct
 OLD_FILES+=usr/share/terminfo/v/vtnt
 OLD_FILES+=usr/share/terminfo/v/vv100
 OLD_FILES+=usr/share/terminfo/v/vwmterm
 OLD_DIRS+=usr/share/terminfo/v/
 OLD_FILES+=usr/share/terminfo/w/wren
 OLD_FILES+=usr/share/terminfo/w/wrenw
 OLD_FILES+=usr/share/terminfo/w/wsiris
 OLD_FILES+=usr/share/terminfo/w/wsvt25
 OLD_FILES+=usr/share/terminfo/w/wsvt25m
 OLD_FILES+=usr/share/terminfo/w/wy-75ap
 OLD_FILES+=usr/share/terminfo/w/wy-99fgt
 OLD_FILES+=usr/share/terminfo/w/wy-99fgta
 OLD_FILES+=usr/share/terminfo/w/wy100
 OLD_FILES+=usr/share/terminfo/w/wy100q
 OLD_FILES+=usr/share/terminfo/w/wy120
 OLD_FILES+=usr/share/terminfo/w/wy120-25
 OLD_FILES+=usr/share/terminfo/w/wy120-25-w
 OLD_FILES+=usr/share/terminfo/w/wy120-vb
 OLD_FILES+=usr/share/terminfo/w/wy120-w
 OLD_FILES+=usr/share/terminfo/w/wy120-w-vb
 OLD_FILES+=usr/share/terminfo/w/wy120-wvb
 OLD_FILES+=usr/share/terminfo/w/wy150
 OLD_FILES+=usr/share/terminfo/w/wy150-25
 OLD_FILES+=usr/share/terminfo/w/wy150-25-w
 OLD_FILES+=usr/share/terminfo/w/wy150-vb
 OLD_FILES+=usr/share/terminfo/w/wy150-w
 OLD_FILES+=usr/share/terminfo/w/wy150-w-vb
 OLD_FILES+=usr/share/terminfo/w/wy160
 OLD_FILES+=usr/share/terminfo/w/wy160-25
 OLD_FILES+=usr/share/terminfo/w/wy160-25-w
 OLD_FILES+=usr/share/terminfo/w/wy160-42
 OLD_FILES+=usr/share/terminfo/w/wy160-42-w
 OLD_FILES+=usr/share/terminfo/w/wy160-43
 OLD_FILES+=usr/share/terminfo/w/wy160-43-w
 OLD_FILES+=usr/share/terminfo/w/wy160-tek
 OLD_FILES+=usr/share/terminfo/w/wy160-vb
 OLD_FILES+=usr/share/terminfo/w/wy160-w
 OLD_FILES+=usr/share/terminfo/w/wy160-w-vb
 OLD_FILES+=usr/share/terminfo/w/wy160-wvb
 OLD_FILES+=usr/share/terminfo/w/wy185
 OLD_FILES+=usr/share/terminfo/w/wy185-24
 OLD_FILES+=usr/share/terminfo/w/wy185-vb
 OLD_FILES+=usr/share/terminfo/w/wy185-w
 OLD_FILES+=usr/share/terminfo/w/wy185-wvb
 OLD_FILES+=usr/share/terminfo/w/wy30
 OLD_FILES+=usr/share/terminfo/w/wy30-mc
 OLD_FILES+=usr/share/terminfo/w/wy30-vb
 OLD_FILES+=usr/share/terminfo/w/wy325
 OLD_FILES+=usr/share/terminfo/w/wy325-25
 OLD_FILES+=usr/share/terminfo/w/wy325-25w
 OLD_FILES+=usr/share/terminfo/w/wy325-42
 OLD_FILES+=usr/share/terminfo/w/wy325-42w
 OLD_FILES+=usr/share/terminfo/w/wy325-42w-vb
 OLD_FILES+=usr/share/terminfo/w/wy325-42wvb
 OLD_FILES+=usr/share/terminfo/w/wy325-43
 OLD_FILES+=usr/share/terminfo/w/wy325-43w
 OLD_FILES+=usr/share/terminfo/w/wy325-43w-vb
 OLD_FILES+=usr/share/terminfo/w/wy325-43wvb
 OLD_FILES+=usr/share/terminfo/w/wy325-80
 OLD_FILES+=usr/share/terminfo/w/wy325-vb
 OLD_FILES+=usr/share/terminfo/w/wy325-w
 OLD_FILES+=usr/share/terminfo/w/wy325-w-vb
 OLD_FILES+=usr/share/terminfo/w/wy325-wvb
 OLD_FILES+=usr/share/terminfo/w/wy325w-24
 OLD_FILES+=usr/share/terminfo/w/wy350
 OLD_FILES+=usr/share/terminfo/w/wy350-vb
 OLD_FILES+=usr/share/terminfo/w/wy350-w
 OLD_FILES+=usr/share/terminfo/w/wy350-wvb
 OLD_FILES+=usr/share/terminfo/w/wy370
 OLD_FILES+=usr/share/terminfo/w/wy370-101k
 OLD_FILES+=usr/share/terminfo/w/wy370-105k
 OLD_FILES+=usr/share/terminfo/w/wy370-EPC
 OLD_FILES+=usr/share/terminfo/w/wy370-nk
 OLD_FILES+=usr/share/terminfo/w/wy370-rv
 OLD_FILES+=usr/share/terminfo/w/wy370-tek
 OLD_FILES+=usr/share/terminfo/w/wy370-vb
 OLD_FILES+=usr/share/terminfo/w/wy370-w
 OLD_FILES+=usr/share/terminfo/w/wy370-wvb
 OLD_FILES+=usr/share/terminfo/w/wy50
 OLD_FILES+=usr/share/terminfo/w/wy50-mc
 OLD_FILES+=usr/share/terminfo/w/wy50-vb
 OLD_FILES+=usr/share/terminfo/w/wy50-w
 OLD_FILES+=usr/share/terminfo/w/wy50-wvb
 OLD_FILES+=usr/share/terminfo/w/wy520
 OLD_FILES+=usr/share/terminfo/w/wy520-24
 OLD_FILES+=usr/share/terminfo/w/wy520-36
 OLD_FILES+=usr/share/terminfo/w/wy520-36pc
 OLD_FILES+=usr/share/terminfo/w/wy520-36w
 OLD_FILES+=usr/share/terminfo/w/wy520-36wpc
 OLD_FILES+=usr/share/terminfo/w/wy520-48
 OLD_FILES+=usr/share/terminfo/w/wy520-48pc
 OLD_FILES+=usr/share/terminfo/w/wy520-48w
 OLD_FILES+=usr/share/terminfo/w/wy520-48wpc
 OLD_FILES+=usr/share/terminfo/w/wy520-epc
 OLD_FILES+=usr/share/terminfo/w/wy520-epc-24
 OLD_FILES+=usr/share/terminfo/w/wy520-epc-vb
 OLD_FILES+=usr/share/terminfo/w/wy520-epc-w
 OLD_FILES+=usr/share/terminfo/w/wy520-epc-wvb
 OLD_FILES+=usr/share/terminfo/w/wy520-vb
 OLD_FILES+=usr/share/terminfo/w/wy520-w
 OLD_FILES+=usr/share/terminfo/w/wy520-wvb
 OLD_FILES+=usr/share/terminfo/w/wy60
 OLD_FILES+=usr/share/terminfo/w/wy60-25
 OLD_FILES+=usr/share/terminfo/w/wy60-25-w
 OLD_FILES+=usr/share/terminfo/w/wy60-316X
 OLD_FILES+=usr/share/terminfo/w/wy60-42
 OLD_FILES+=usr/share/terminfo/w/wy60-42-w
 OLD_FILES+=usr/share/terminfo/w/wy60-43
 OLD_FILES+=usr/share/terminfo/w/wy60-43-w
 OLD_FILES+=usr/share/terminfo/w/wy60-AT
 OLD_FILES+=usr/share/terminfo/w/wy60-PC
 OLD_FILES+=usr/share/terminfo/w/wy60-vb
 OLD_FILES+=usr/share/terminfo/w/wy60-w
 OLD_FILES+=usr/share/terminfo/w/wy60-w-vb
 OLD_FILES+=usr/share/terminfo/w/wy60-wvb
 OLD_FILES+=usr/share/terminfo/w/wy75
 OLD_FILES+=usr/share/terminfo/w/wy75-mc
 OLD_FILES+=usr/share/terminfo/w/wy75-vb
 OLD_FILES+=usr/share/terminfo/w/wy75-w
 OLD_FILES+=usr/share/terminfo/w/wy75-wvb
 OLD_FILES+=usr/share/terminfo/w/wy75ap
 OLD_FILES+=usr/share/terminfo/w/wy85
 OLD_FILES+=usr/share/terminfo/w/wy85-8bit
 OLD_FILES+=usr/share/terminfo/w/wy85-vb
 OLD_FILES+=usr/share/terminfo/w/wy85-w
 OLD_FILES+=usr/share/terminfo/w/wy85-wvb
 OLD_FILES+=usr/share/terminfo/w/wy99-ansi
 OLD_FILES+=usr/share/terminfo/w/wy99a-ansi
 OLD_FILES+=usr/share/terminfo/w/wy99f
 OLD_FILES+=usr/share/terminfo/w/wy99fa
 OLD_FILES+=usr/share/terminfo/w/wy99fgt
 OLD_FILES+=usr/share/terminfo/w/wy99fgta
 OLD_FILES+=usr/share/terminfo/w/wy99gt
 OLD_FILES+=usr/share/terminfo/w/wy99gt-25
 OLD_FILES+=usr/share/terminfo/w/wy99gt-25-w
 OLD_FILES+=usr/share/terminfo/w/wy99gt-tek
 OLD_FILES+=usr/share/terminfo/w/wy99gt-vb
 OLD_FILES+=usr/share/terminfo/w/wy99gt-w
 OLD_FILES+=usr/share/terminfo/w/wy99gt-w-vb
 OLD_FILES+=usr/share/terminfo/w/wy99gt-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse-325
 OLD_FILES+=usr/share/terminfo/w/wyse-75ap
 OLD_FILES+=usr/share/terminfo/w/wyse-vp
 OLD_FILES+=usr/share/terminfo/w/wyse120
 OLD_FILES+=usr/share/terminfo/w/wyse120-25
 OLD_FILES+=usr/share/terminfo/w/wyse120-25-w
 OLD_FILES+=usr/share/terminfo/w/wyse120-vb
 OLD_FILES+=usr/share/terminfo/w/wyse120-w
 OLD_FILES+=usr/share/terminfo/w/wyse120-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse150
 OLD_FILES+=usr/share/terminfo/w/wyse150-25
 OLD_FILES+=usr/share/terminfo/w/wyse150-25-w
 OLD_FILES+=usr/share/terminfo/w/wyse150-vb
 OLD_FILES+=usr/share/terminfo/w/wyse150-w
 OLD_FILES+=usr/share/terminfo/w/wyse150-w-vb
 OLD_FILES+=usr/share/terminfo/w/wyse160
 OLD_FILES+=usr/share/terminfo/w/wyse160-25
 OLD_FILES+=usr/share/terminfo/w/wyse160-25-w
 OLD_FILES+=usr/share/terminfo/w/wyse160-42
 OLD_FILES+=usr/share/terminfo/w/wyse160-42-w
 OLD_FILES+=usr/share/terminfo/w/wyse160-43
 OLD_FILES+=usr/share/terminfo/w/wyse160-43-w
 OLD_FILES+=usr/share/terminfo/w/wyse160-vb
 OLD_FILES+=usr/share/terminfo/w/wyse160-w
 OLD_FILES+=usr/share/terminfo/w/wyse160-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse185
 OLD_FILES+=usr/share/terminfo/w/wyse185-24
 OLD_FILES+=usr/share/terminfo/w/wyse185-vb
 OLD_FILES+=usr/share/terminfo/w/wyse185-w
 OLD_FILES+=usr/share/terminfo/w/wyse185-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse30
 OLD_FILES+=usr/share/terminfo/w/wyse30-mc
 OLD_FILES+=usr/share/terminfo/w/wyse30-vb
 OLD_FILES+=usr/share/terminfo/w/wyse325
 OLD_FILES+=usr/share/terminfo/w/wyse325-25
 OLD_FILES+=usr/share/terminfo/w/wyse325-25w
 OLD_FILES+=usr/share/terminfo/w/wyse325-42
 OLD_FILES+=usr/share/terminfo/w/wyse325-42w
 OLD_FILES+=usr/share/terminfo/w/wyse325-43
 OLD_FILES+=usr/share/terminfo/w/wyse325-43w
 OLD_FILES+=usr/share/terminfo/w/wyse325-vb
 OLD_FILES+=usr/share/terminfo/w/wyse325-w
 OLD_FILES+=usr/share/terminfo/w/wyse325-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse350
 OLD_FILES+=usr/share/terminfo/w/wyse350-vb
 OLD_FILES+=usr/share/terminfo/w/wyse350-w
 OLD_FILES+=usr/share/terminfo/w/wyse350-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse370
 OLD_FILES+=usr/share/terminfo/w/wyse50
 OLD_FILES+=usr/share/terminfo/w/wyse50-mc
 OLD_FILES+=usr/share/terminfo/w/wyse50-vb
 OLD_FILES+=usr/share/terminfo/w/wyse50-w
 OLD_FILES+=usr/share/terminfo/w/wyse50-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse520
 OLD_FILES+=usr/share/terminfo/w/wyse520-24
 OLD_FILES+=usr/share/terminfo/w/wyse520-36
 OLD_FILES+=usr/share/terminfo/w/wyse520-36pc
 OLD_FILES+=usr/share/terminfo/w/wyse520-36w
 OLD_FILES+=usr/share/terminfo/w/wyse520-36wpc
 OLD_FILES+=usr/share/terminfo/w/wyse520-48
 OLD_FILES+=usr/share/terminfo/w/wyse520-48pc
 OLD_FILES+=usr/share/terminfo/w/wyse520-48w
 OLD_FILES+=usr/share/terminfo/w/wyse520-48wpc
 OLD_FILES+=usr/share/terminfo/w/wyse520-epc
 OLD_FILES+=usr/share/terminfo/w/wyse520-epc-w
 OLD_FILES+=usr/share/terminfo/w/wyse520-p-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse520-pc-24
 OLD_FILES+=usr/share/terminfo/w/wyse520-pc-vb
 OLD_FILES+=usr/share/terminfo/w/wyse520-vb
 OLD_FILES+=usr/share/terminfo/w/wyse520-w
 OLD_FILES+=usr/share/terminfo/w/wyse520-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse60
 OLD_FILES+=usr/share/terminfo/w/wyse60-25
 OLD_FILES+=usr/share/terminfo/w/wyse60-25-w
 OLD_FILES+=usr/share/terminfo/w/wyse60-316X
 OLD_FILES+=usr/share/terminfo/w/wyse60-42
 OLD_FILES+=usr/share/terminfo/w/wyse60-42-w
 OLD_FILES+=usr/share/terminfo/w/wyse60-43
 OLD_FILES+=usr/share/terminfo/w/wyse60-43-w
 OLD_FILES+=usr/share/terminfo/w/wyse60-AT
 OLD_FILES+=usr/share/terminfo/w/wyse60-PC
 OLD_FILES+=usr/share/terminfo/w/wyse60-vb
 OLD_FILES+=usr/share/terminfo/w/wyse60-w
 OLD_FILES+=usr/share/terminfo/w/wyse60-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse75
 OLD_FILES+=usr/share/terminfo/w/wyse75-mc
 OLD_FILES+=usr/share/terminfo/w/wyse75-vb
 OLD_FILES+=usr/share/terminfo/w/wyse75-w
 OLD_FILES+=usr/share/terminfo/w/wyse75-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse75ap
 OLD_FILES+=usr/share/terminfo/w/wyse85
 OLD_FILES+=usr/share/terminfo/w/wyse85-8bit
 OLD_FILES+=usr/share/terminfo/w/wyse85-vb
 OLD_FILES+=usr/share/terminfo/w/wyse85-w
 OLD_FILES+=usr/share/terminfo/w/wyse85-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse99gt
 OLD_FILES+=usr/share/terminfo/w/wyse99gt-25
 OLD_FILES+=usr/share/terminfo/w/wyse99gt-25-w
 OLD_FILES+=usr/share/terminfo/w/wyse99gt-vb
 OLD_FILES+=usr/share/terminfo/w/wyse99gt-w
 OLD_FILES+=usr/share/terminfo/w/wyse99gt-wvb
 OLD_DIRS+=usr/share/terminfo/w/
 OLD_FILES+=usr/share/terminfo/x/x10term
 OLD_FILES+=usr/share/terminfo/x/x1700
 OLD_FILES+=usr/share/terminfo/x/x1700-lm
 OLD_FILES+=usr/share/terminfo/x/x1720
 OLD_FILES+=usr/share/terminfo/x/x1750
 OLD_FILES+=usr/share/terminfo/x/x68k
 OLD_FILES+=usr/share/terminfo/x/x68k-ite
 OLD_FILES+=usr/share/terminfo/x/x820
 OLD_FILES+=usr/share/terminfo/x/xdku
 OLD_FILES+=usr/share/terminfo/x/xenix
 OLD_FILES+=usr/share/terminfo/x/xerox
 OLD_FILES+=usr/share/terminfo/x/xerox-lm
 OLD_FILES+=usr/share/terminfo/x/xerox1720
 OLD_FILES+=usr/share/terminfo/x/xerox820
 OLD_FILES+=usr/share/terminfo/x/xfce
 OLD_FILES+=usr/share/terminfo/x/xiterm
 OLD_FILES+=usr/share/terminfo/x/xl83
 OLD_FILES+=usr/share/terminfo/x/xnuppc
 OLD_FILES+=usr/share/terminfo/x/xnuppc+100x37
 OLD_FILES+=usr/share/terminfo/x/xnuppc+112x37
 OLD_FILES+=usr/share/terminfo/x/xnuppc+128x40
 OLD_FILES+=usr/share/terminfo/x/xnuppc+128x48
 OLD_FILES+=usr/share/terminfo/x/xnuppc+144x48
 OLD_FILES+=usr/share/terminfo/x/xnuppc+160x64
 OLD_FILES+=usr/share/terminfo/x/xnuppc+200x64
 OLD_FILES+=usr/share/terminfo/x/xnuppc+200x75
 OLD_FILES+=usr/share/terminfo/x/xnuppc+256x96
 OLD_FILES+=usr/share/terminfo/x/xnuppc+80x25
 OLD_FILES+=usr/share/terminfo/x/xnuppc+80x30
 OLD_FILES+=usr/share/terminfo/x/xnuppc+90x30
 OLD_FILES+=usr/share/terminfo/x/xnuppc+b
 OLD_FILES+=usr/share/terminfo/x/xnuppc+basic
 OLD_FILES+=usr/share/terminfo/x/xnuppc+c
 OLD_FILES+=usr/share/terminfo/x/xnuppc+f
 OLD_FILES+=usr/share/terminfo/x/xnuppc+f2
 OLD_FILES+=usr/share/terminfo/x/xnuppc-100x37
 OLD_FILES+=usr/share/terminfo/x/xnuppc-100x37-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-112x37
 OLD_FILES+=usr/share/terminfo/x/xnuppc-112x37-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-128x40
 OLD_FILES+=usr/share/terminfo/x/xnuppc-128x40-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-128x48
 OLD_FILES+=usr/share/terminfo/x/xnuppc-128x48-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-144x48
 OLD_FILES+=usr/share/terminfo/x/xnuppc-144x48-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-160x64
 OLD_FILES+=usr/share/terminfo/x/xnuppc-160x64-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-200x64
 OLD_FILES+=usr/share/terminfo/x/xnuppc-200x64-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-200x75
 OLD_FILES+=usr/share/terminfo/x/xnuppc-200x75-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-256x96
 OLD_FILES+=usr/share/terminfo/x/xnuppc-256x96-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-80x25
 OLD_FILES+=usr/share/terminfo/x/xnuppc-80x25-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-80x30
 OLD_FILES+=usr/share/terminfo/x/xnuppc-80x30-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-90x30
 OLD_FILES+=usr/share/terminfo/x/xnuppc-90x30-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-b
 OLD_FILES+=usr/share/terminfo/x/xnuppc-f
 OLD_FILES+=usr/share/terminfo/x/xnuppc-f2
 OLD_FILES+=usr/share/terminfo/x/xnuppc-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-m-b
 OLD_FILES+=usr/share/terminfo/x/xnuppc-m-f
 OLD_FILES+=usr/share/terminfo/x/xnuppc-m-f2
 OLD_FILES+=usr/share/terminfo/x/xtalk
 OLD_FILES+=usr/share/terminfo/x/xterm
 OLD_FILES+=usr/share/terminfo/x/xterm+256color
 OLD_FILES+=usr/share/terminfo/x/xterm+256color2
 OLD_FILES+=usr/share/terminfo/x/xterm+256setaf
 OLD_FILES+=usr/share/terminfo/x/xterm+88color
 OLD_FILES+=usr/share/terminfo/x/xterm+88color2
 OLD_FILES+=usr/share/terminfo/x/xterm+alt+title
 OLD_FILES+=usr/share/terminfo/x/xterm+alt1049
 OLD_FILES+=usr/share/terminfo/x/xterm+app
 OLD_FILES+=usr/share/terminfo/x/xterm+direct
 OLD_FILES+=usr/share/terminfo/x/xterm+direct16
 OLD_FILES+=usr/share/terminfo/x/xterm+direct2
 OLD_FILES+=usr/share/terminfo/x/xterm+direct256
 OLD_FILES+=usr/share/terminfo/x/xterm+edit
 OLD_FILES+=usr/share/terminfo/x/xterm+indirect
 OLD_FILES+=usr/share/terminfo/x/xterm+kbs
 OLD_FILES+=usr/share/terminfo/x/xterm+keypad
 OLD_FILES+=usr/share/terminfo/x/xterm+meta
 OLD_FILES+=usr/share/terminfo/x/xterm+noalt
 OLD_FILES+=usr/share/terminfo/x/xterm+noapp
 OLD_FILES+=usr/share/terminfo/x/xterm+nofkeys
 OLD_FILES+=usr/share/terminfo/x/xterm+osc104
 OLD_FILES+=usr/share/terminfo/x/xterm+pc+edit
 OLD_FILES+=usr/share/terminfo/x/xterm+pcc0
 OLD_FILES+=usr/share/terminfo/x/xterm+pcc1
 OLD_FILES+=usr/share/terminfo/x/xterm+pcc2
 OLD_FILES+=usr/share/terminfo/x/xterm+pcc3
 OLD_FILES+=usr/share/terminfo/x/xterm+pce2
 OLD_FILES+=usr/share/terminfo/x/xterm+pcf0
 OLD_FILES+=usr/share/terminfo/x/xterm+pcf2
 OLD_FILES+=usr/share/terminfo/x/xterm+pcfkeys
 OLD_FILES+=usr/share/terminfo/x/xterm+r6f2
 OLD_FILES+=usr/share/terminfo/x/xterm+sl
 OLD_FILES+=usr/share/terminfo/x/xterm+sl-twm
 OLD_FILES+=usr/share/terminfo/x/xterm+sm+1002
 OLD_FILES+=usr/share/terminfo/x/xterm+sm+1003
 OLD_FILES+=usr/share/terminfo/x/xterm+sm+1005
 OLD_FILES+=usr/share/terminfo/x/xterm+sm+1006
 OLD_FILES+=usr/share/terminfo/x/xterm+titlestack
 OLD_FILES+=usr/share/terminfo/x/xterm+tmux
 OLD_FILES+=usr/share/terminfo/x/xterm+vt+edit
 OLD_FILES+=usr/share/terminfo/x/xterm+x10mouse
 OLD_FILES+=usr/share/terminfo/x/xterm+x11hilite
 OLD_FILES+=usr/share/terminfo/x/xterm+x11mouse
 OLD_FILES+=usr/share/terminfo/x/xterm-1002
 OLD_FILES+=usr/share/terminfo/x/xterm-1003
 OLD_FILES+=usr/share/terminfo/x/xterm-1005
 OLD_FILES+=usr/share/terminfo/x/xterm-1006
 OLD_FILES+=usr/share/terminfo/x/xterm-16color
 OLD_FILES+=usr/share/terminfo/x/xterm-24
 OLD_FILES+=usr/share/terminfo/x/xterm-256color
 OLD_FILES+=usr/share/terminfo/x/xterm-88color
 OLD_FILES+=usr/share/terminfo/x/xterm-8bit
 OLD_FILES+=usr/share/terminfo/x/xterm-basic
 OLD_FILES+=usr/share/terminfo/x/xterm-bold
 OLD_FILES+=usr/share/terminfo/x/xterm-color
 OLD_FILES+=usr/share/terminfo/x/xterm-direct
 OLD_FILES+=usr/share/terminfo/x/xterm-direct16
 OLD_FILES+=usr/share/terminfo/x/xterm-direct2
 OLD_FILES+=usr/share/terminfo/x/xterm-direct256
 OLD_FILES+=usr/share/terminfo/x/xterm-hp
 OLD_FILES+=usr/share/terminfo/x/xterm-mono
 OLD_FILES+=usr/share/terminfo/x/xterm-new
 OLD_FILES+=usr/share/terminfo/x/xterm-nic
 OLD_FILES+=usr/share/terminfo/x/xterm-noapp
 OLD_FILES+=usr/share/terminfo/x/xterm-old
 OLD_FILES+=usr/share/terminfo/x/xterm-pcolor
 OLD_FILES+=usr/share/terminfo/x/xterm-r5
 OLD_FILES+=usr/share/terminfo/x/xterm-r6
 OLD_FILES+=usr/share/terminfo/x/xterm-sco
 OLD_FILES+=usr/share/terminfo/x/xterm-sun
 OLD_FILES+=usr/share/terminfo/x/xterm-utf8
 OLD_FILES+=usr/share/terminfo/x/xterm-vt220
 OLD_FILES+=usr/share/terminfo/x/xterm-vt52
 OLD_FILES+=usr/share/terminfo/x/xterm-x10mouse
 OLD_FILES+=usr/share/terminfo/x/xterm-x11hilite
 OLD_FILES+=usr/share/terminfo/x/xterm-x11mouse
 OLD_FILES+=usr/share/terminfo/x/xterm-xf86-v32
 OLD_FILES+=usr/share/terminfo/x/xterm-xf86-v33
 OLD_FILES+=usr/share/terminfo/x/xterm-xf86-v333
 OLD_FILES+=usr/share/terminfo/x/xterm-xf86-v40
 OLD_FILES+=usr/share/terminfo/x/xterm-xf86-v43
 OLD_FILES+=usr/share/terminfo/x/xterm-xf86-v44
 OLD_FILES+=usr/share/terminfo/x/xterm-xfree86
 OLD_FILES+=usr/share/terminfo/x/xterm-xi
 OLD_FILES+=usr/share/terminfo/x/xterm.js
 OLD_FILES+=usr/share/terminfo/x/xterm1
 OLD_FILES+=usr/share/terminfo/x/xtermc
 OLD_FILES+=usr/share/terminfo/x/xtermm
 OLD_FILES+=usr/share/terminfo/x/xterms
 OLD_FILES+=usr/share/terminfo/x/xterms-sun
 OLD_FILES+=usr/share/terminfo/x/xwsh
 OLD_DIRS+=usr/share/terminfo/x/
 OLD_FILES+=usr/share/terminfo/z/z-100
 OLD_FILES+=usr/share/terminfo/z/z-100bw
 OLD_FILES+=usr/share/terminfo/z/z100
 OLD_FILES+=usr/share/terminfo/z/z100bw
 OLD_FILES+=usr/share/terminfo/z/z110
 OLD_FILES+=usr/share/terminfo/z/z110bw
 OLD_FILES+=usr/share/terminfo/z/z19
 OLD_FILES+=usr/share/terminfo/z/z29
 OLD_FILES+=usr/share/terminfo/z/z29a
 OLD_FILES+=usr/share/terminfo/z/z29a-kc-bc
 OLD_FILES+=usr/share/terminfo/z/z29a-kc-uc
 OLD_FILES+=usr/share/terminfo/z/z29a-nkc-bc
 OLD_FILES+=usr/share/terminfo/z/z29a-nkc-uc
 OLD_FILES+=usr/share/terminfo/z/z29b
 OLD_FILES+=usr/share/terminfo/z/z30
 OLD_FILES+=usr/share/terminfo/z/z340
 OLD_FILES+=usr/share/terminfo/z/z340-nam
 OLD_FILES+=usr/share/terminfo/z/z39-a
 OLD_FILES+=usr/share/terminfo/z/z39a
 OLD_FILES+=usr/share/terminfo/z/z50
 OLD_FILES+=usr/share/terminfo/z/z8001
 OLD_FILES+=usr/share/terminfo/z/zen30
 OLD_FILES+=usr/share/terminfo/z/zen50
 OLD_FILES+=usr/share/terminfo/z/zen8001
 OLD_FILES+=usr/share/terminfo/z/zenith
 OLD_FILES+=usr/share/terminfo/z/zenith29
 OLD_FILES+=usr/share/terminfo/z/zenith39-a
 OLD_FILES+=usr/share/terminfo/z/zenith39-ansi
 OLD_FILES+=usr/share/terminfo/z/zt-1
 OLD_FILES+=usr/share/terminfo/z/ztx
 OLD_FILES+=usr/share/terminfo/z/ztx-1-a
 OLD_FILES+=usr/share/terminfo/z/ztx11
 OLD_DIRS+=usr/share/terminfo/z/
 OLD_DIRS+=usr/share/terminfo/
 
 # 20210316: remove obsolete NFS headers
 OLD_FILES+=usr/include/nfs/nfs_common.h
 OLD_FILES+=usr/include/nfsclient/nfsm_subs.h
 OLD_FILES+=usr/include/nfsclient/nlminfo.h
 OLD_FILES+=usr/include/nfsserver/nfs_fha_old.h
 OLD_FILES+=usr/include/nfsserver/nfsm_subs.h
 OLD_FILES+=usr/include/nfsserver/nfsrvcache.h
 
 # 20210315: Remove kernel-only crypto headers from /usr/include
 OLD_FILES+=usr/include/crypto/_cryptodev.h
 OLD_FILES+=usr/include/crypto/cbc_mac.h
 OLD_FILES+=usr/include/crypto/deflate.h
 OLD_FILES+=usr/include/crypto/gfmult.h
 OLD_FILES+=usr/include/crypto/gmac.h
 OLD_FILES+=usr/include/crypto/rijndael.h
 OLD_FILES+=usr/include/crypto/rmd160.h
 OLD_FILES+=usr/include/crypto/xform.h
 OLD_FILES+=usr/include/crypto/xform_auth.h
 OLD_FILES+=usr/include/crypto/xform_comp.h
 OLD_FILES+=usr/include/crypto/xform_enc.h
 
 # 20210305: removed Poly1305_* symbols
 OLD_FILES+=usr/include/crypto/xform_poly1305.h
 
 # 20210302: fmtree removed
 OLD_FILES+=usr/sbin/fmtree
 OLD_FILES+=usr/share/man/man8/fmtree.8.gz
 
 # 20210201: bump shared libraries which link against ncurses
 OLD_LIBS+=lib/libedit.so.7
 OLD_LIBS+=usr/lib/libdialog.so.8
 OLD_LIBS+=usr/lib/libdpv.so.1
 OLD_LIBS+=usr/lib/libform.so.5
 OLD_LIBS+=usr/lib/libformw.so.5
 OLD_LIBS+=usr/lib/libmenu.so.5
 OLD_LIBS+=usr/lib/libmenuw.so.5
 OLD_LIBS+=usr/lib/libpanel.so.5
 OLD_LIBS+=usr/lib/libpanelw.so.5
 
 # 20210125: ndis driver support removed
 OLD_FILES+=usr/sbin/ndis_events
 OLD_FILES+=usr/sbin/ndiscvt
 OLD_FILES+=usr/sbin/ndisgen
 OLD_FILES+=usr/share/man/man4/ndis.4.gz
 OLD_FILES+=usr/share/man/man4/if_ndis.4.gz
 OLD_FILES+=usr/share/man/man8/ndis_events.8.gz
 OLD_FILES+=usr/share/man/man8/ndiscvt.8.gz
 OLD_FILES+=usr/share/man/man8/ndisgen.8.gz
 OLD_FILES+=usr/share/misc/windrv_stub.c
 
 # 20210116: openpromio(4) removed
 OLD_FILES+=usr/include/dev/ofw/openpromio.h
 
 # 20210116: if_wl_wavelan.h removed
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/if_wl_wavelan.h
 .endif
 
 # 20210108: retire cmx, ng_bt3c, wi drivers
 OLD_FILES+=usr/include/dev/wi/if_wireg.h
 OLD_FILES+=usr/include/dev/wi/if_wavelan_ieee.h
 OLD_FILES+=usr/include/dev/wi/if_wivar.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_bt3c.h
 OLD_FILES+=usr/sbin/bt3cfw
 OLD_FILES+=usr/share/man/man4/cmw.4.gz
 OLD_FILES+=usr/share/man/man4/if_wi.4.gz
 OLD_FILES+=usr/share/man/man4/ng_bt3c.4.gz
 OLD_FILES+=usr/share/man/man4/wi.4.gz
 OLD_FILES+=usr/share/man/man8/bt3cfw.8.gz
 
 # 20210107: retire a.out support
 OLD_DIRS+=usr/lib/aout
 OLD_DIRS+=usr/lib/compat/aout
 
 # 20210107: remove cmx(4)
 OLD_FILES+=usr/share/man/man4/cmx.4.gz
 
 # 20210105: remove non widechar version of ncurses
 OLD_LIBS+=lib/libncurses.so.9
 
 # 20210103: new clang import which bumps version from 11.0.0 to 11.0.1
 OLD_FILES+=usr/lib/clang/11.0.0/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/11.0.0/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/11.0.0/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/11.0.0/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/11.0.0/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/11.0.0/include/fuzzer
 OLD_FILES+=usr/lib/clang/11.0.0/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/11.0.0/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/11.0.0/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/11.0.0/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/11.0.0/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/11.0.0/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/11.0.0/include/profile/InstrProfData.inc
 OLD_DIRS+=usr/lib/clang/11.0.0/include/profile
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/11.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/11.0.0/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/11.0.0/include/xray
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/cet.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/11.0.0/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/11.0.0/include
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/11.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/11.0.0/lib
 OLD_DIRS+=usr/lib/clang/11.0.0
 
 # 20201226: Siemens SAB 82532 support removed
 OLD_FILES+=usr/include/dev/ic/sab82532.h
 
 # 20201225: PMC for Xscale removed
 OLD_FILES+=usr/include/dev/hwpmc/hwpmc_xscale.h
 OLD_FILES+=usr/share/man/man3/pmc.xscale.3.gz
 
 # 20201225: libregex removed
 OLD_FILES+=usr/include/gnu/posix/regex.h
 OLD_DIRS+=usr/include/gnu/posix
 OLD_FILES+=usr/include/gnu/regex.h
 OLD_DIRS+=usr/include/gnu
 OLD_FILES+=usr/include/gnuregex.h
 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
 
 # 20201225: gnugrep removed
 OLD_FILES+=usr/bin/bsdgrep
 OLD_FILES+=usr/bin/gnugrep
 OLD_FILES+=usr/share/man/man1/bsdgrep.1.gz
 OLD_FILES+=usr/share/man/man1/gnugrep.1.gz
 
 # 20201224: mk48txx(4) removed
 OLD_FILES+=usr/share/man/man4/mk48txx.4.gz
 
 # 20201215: in-tree gdb removed
 OLD_FILES+=usr/libexec/gdb
 OLD_FILES+=usr/libexec/kgdb
 
 # 20201211: hme(4) removed
 OLD_FILES+=usr/share/man/man4/hme.4.gz
 OLD_FILES+=usr/share/man/man4/if_hme.4.gz
 
 # 20201129: RADIX_MPATH removed
 OLD_FILES+=usr/include/net/radix_mpath.h
 
 # 20201124: ping6(8) was merged into ping(8)
 OLD_FILES+=usr/share/man/man8/ping6.8.gz
 OLD_FILES+=usr/tests/sbin/ping6/Kyuafile
 OLD_FILES+=usr/tests/sbin/ping6/ping6_c1_s8_t1.out
 OLD_FILES+=usr/tests/sbin/ping6/ping6_test
 OLD_DIRS+=usr/tests/sbin/ping6
 
 # 20201025: Remove cal data files
 OLD_FILES+=usr/share/calendar/calendar.all
 OLD_FILES+=usr/share/calendar/calendar.australia
 OLD_FILES+=usr/share/calendar/calendar.birthday
 OLD_FILES+=usr/share/calendar/calendar.brazilian
 OLD_FILES+=usr/share/calendar/calendar.christian
 OLD_FILES+=usr/share/calendar/calendar.computer
 OLD_FILES+=usr/share/calendar/calendar.croatian
 OLD_FILES+=usr/share/calendar/calendar.dutch
 OLD_FILES+=usr/share/calendar/calendar.french
 OLD_FILES+=usr/share/calendar/calendar.german
 OLD_FILES+=usr/share/calendar/calendar.history
 OLD_FILES+=usr/share/calendar/calendar.holiday
 OLD_FILES+=usr/share/calendar/calendar.hungarian
 OLD_FILES+=usr/share/calendar/calendar.judaic
 OLD_FILES+=usr/share/calendar/calendar.lotr
 OLD_FILES+=usr/share/calendar/calendar.music
 OLD_FILES+=usr/share/calendar/calendar.newzealand
 OLD_FILES+=usr/share/calendar/calendar.russian
 OLD_FILES+=usr/share/calendar/calendar.southafrica
 OLD_FILES+=usr/share/calendar/calendar.ukrainian
 OLD_FILES+=usr/share/calendar/calendar.usholiday
 OLD_FILES+=usr/share/calendar/calendar.world
 OLD_FILES+=usr/share/calendar/de_AT.ISO_8859-15/calendar.feiertag
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.all
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.feiertag
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.geschichte
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.kirche
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.literatur
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.musik
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.wissenschaft
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.all
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.fetes
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.french
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.jferies
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.proverbes
 OLD_FILES+=usr/share/calendar/hr_HR.ISO8859-2/calendar.all
 OLD_FILES+=usr/share/calendar/hr_HR.ISO8859-2/calendar.praznici
 OLD_FILES+=usr/share/calendar/hu_HU.ISO8859-2/calendar.all
 OLD_FILES+=usr/share/calendar/hu_HU.ISO8859-2/calendar.nevnapok
 OLD_FILES+=usr/share/calendar/hu_HU.ISO8859-2/calendar.unnepek
 OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.all
 OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.commemorative
 OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.holidays
 OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.mcommemorative
 OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.all
 OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.commemorative
 OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.holidays
 OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.mcommemorative
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.all
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.common
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.holiday
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.military
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.orthodox
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.pagan
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.all
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.common
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.holiday
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.military
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.orthodox
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.pagan
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.all
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.holiday
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.misc
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.orthodox
 OLD_DIRS+=usr/share/calendar/de_AT.ISO_8859-15
 OLD_DIRS+=usr/share/calendar/de_DE.ISO8859-1
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-15
 OLD_DIRS+=usr/share/calendar/fr_FR.ISO8859-1
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-15
 OLD_DIRS+=usr/share/calendar/hr_HR.ISO8859-2
 OLD_DIRS+=usr/share/calendar/hu_HU.ISO8859-2
 OLD_DIRS+=usr/share/calendar/pt_BR.ISO8859-1
 OLD_DIRS+=usr/share/calendar/pt_BR.UTF-8
 OLD_DIRS+=usr/share/calendar/ru_RU.KOI8-R
 OLD_DIRS+=usr/share/calendar/ru_RU.UTF-8
 OLD_DIRS+=usr/share/calendar/uk_UA.KOI8-U
 
 # 20201004: logo files renamed to type-agnostic gfx-*.lua
 OLD_FILES+=boot/lua/logo-beastie.lua
 OLD_FILES+=boot/lua/logo-beastiebw.lua
 OLD_FILES+=boot/lua/logo-fbsdbw.lua
 OLD_FILES+=boot/lua/logo-orb.lua
 OLD_FILES+=boot/lua/logo-orbbw.lua
 
 # 20200828: net/route/shared.h moved to net/route/route_var.h
 OLD_FILES+=usr/include/net/route/shared.h
 
 # 20200825: merged OpenZFS support
 OLD_LIBS+=lib/libzfs.so.3
 OLD_FILES+=usr/share/man/man1/zstreamdump.1.gz
 #OLD_FILES+=usr/share/man/man7/zpool-features.7.gz
 
 # 20200923: memfd_test moved to /usr/tests/sys/posixshm
 OLD_FILES+=usr/tests/sys/kern/memfd_test
 
 # 20200910: remove vm_map_create(9) to sync with the code
 OLD_FILES+=usr/share/man/man9/vm_map_create.9.gz
 
 # 20200820: Removal of the ufm driver
 OLD_FILES+=usr/share/man/man4/ufm.4.gz
 
 # 20200816: new clang import which bumps version from 10.0.1 to 11.0.0
 OLD_FILES+=usr/lib/clang/10.0.1/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/10.0.1/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/10.0.1/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/10.0.1/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/10.0.1/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/10.0.1/include/fuzzer
 OLD_FILES+=usr/lib/clang/10.0.1/include/openmp_wrappers/__clang_openmp_math.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/openmp_wrappers/__clang_openmp_math_declares.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/10.0.1/include/openmp_wrappers/math.h
 OLD_DIRS+=usr/lib/clang/10.0.1/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/10.0.1/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/10.0.1/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/10.0.1/include/profile/InstrProfData.inc
 OLD_DIRS+=usr/lib/clang/10.0.1/include/profile
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/10.0.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/10.0.1/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/10.0.1/include/xray
 OLD_FILES+=usr/lib/clang/10.0.1/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/armintr.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/10.0.1/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/msa.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/10.0.1/include
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/10.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/10.0.1/lib
 OLD_DIRS+=usr/lib/clang/10.0.1
 
 # 20200803: remove free_domain(9) and uma_zfree_domain(9)
 OLD_FILES+=usr/share/man/man9/free_domain.9.gz
 OLD_FILES+=usr/share/man/man9/uma_zfree_domain.9.gz
 
 # 20200729: remove long expired serial drivers
 OLD_FILES+=usr/share/man/man4/cy.4.gz
 OLD_FILES+=usr/share/man/man4/rc.4.gz
 OLD_FILES+=usr/share/man/man4/rp.4.gz
 
 # 20200721: sys/iommu.h moved to dev/iommu/
 OLD_FILES+=usr/include/sys/iommu.h
 
 # 20200715: rework of devstat(9) man page
 OLD_FILES+=usr/share/man/man9/devstat_add_entry.9.gz
 
 # 20200714: update byacc to 20200330
 OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_calc1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_demo.y
 OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_destroy1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_destroy2.y
 OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_destroy3.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit2.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit3.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit4.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit5.y
 OLD_FILES+=usr/tests/usr.bin/yacc/inherit0.y
 OLD_FILES+=usr/tests/usr.bin/yacc/inherit1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/inherit2.y
 
 # 20200706: update of sglist(9), r360574
 OLD_FILES+=usr/share/man/man9/sglist_append_ext_pgs.9.gz
 OLD_FILES+=usr/share/man/man9/sglist_append_mb_ext_pgs.9.gz
 OLD_FILES+=usr/share/man/man9/sglist_count_ext_pgs.9.gz
 OLD_FILES+=usr/share/man/man9/sglist_count_mb_ext_pgs.9.gz
 
 # 20200617: update opencsd to 0.14.2
 OLD_FILES+=usr/include/opencsd/etmv4/trc_pkt_elem_etmv4d.h
 
 # 20200606: retire binutils build infrastructure
 OLD_FILES+=usr/bin/as
 OLD_FILES+=usr/bin/ld.bfd
 OLD_FILES+=usr/share/man/man1/as.1.gz
 OLD_FILES+=usr/share/man/man1/ld.bfd.1.gz
 OLD_FILES+=usr/share/man/man7/as.7.gz
 OLD_FILES+=usr/share/man/man7/ld.7.gz
 OLD_FILES+=usr/share/man/man7/ldint.7.gz
 OLD_FILES+=usr/share/man/man7/binutils.7.gz
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.x
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.x
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xd
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xn
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xr
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xs
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xu
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xw
 
 # 20200601: OpenSSL 32-bit compat engines moved to /usr/lib32/engines
 OLD_LIBS+=usr/lib32/capi.so
 OLD_LIBS+=usr/lib32/padlock.so
 
 # 20200528: libevent renamed libevent1
 OLD_FILES+=usr/include/private/event/event.h
 OLD_DIRS+=usr/include/private/event
 OLD_FILES+=usr/lib/libprivateevent.a
 OLD_FILES+=usr/lib/libprivateevent.so
 OLD_LIBS+=usr/lib/libprivateevent.so.1
 OLD_FILES+=usr/lib/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
 OLD_FILES+=usr/lib/clang/10.0.0/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/10.0.0/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/10.0.0/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/10.0.0/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/10.0.0/include/fuzzer
 OLD_FILES+=usr/lib/clang/10.0.0/include/openmp_wrappers/__clang_openmp_math.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/openmp_wrappers/__clang_openmp_math_declares.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/10.0.0/include/openmp_wrappers/math.h
 OLD_DIRS+=usr/lib/clang/10.0.0/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/10.0.0/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/10.0.0/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/10.0.0/include/profile/InstrProfData.inc
 OLD_DIRS+=usr/lib/clang/10.0.0/include/profile
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/10.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/10.0.0/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/10.0.0/include/xray
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/10.0.0/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/10.0.0/include
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/10.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/10.0.0/lib
 OLD_DIRS+=usr/lib/clang/10.0.0
 
 # 20200520: xform_userland.h removed
 OLD_FILES+=usr/include/crypto/xform_userland.h
 
 # 20200515: libalias cuseeme protocol support retired
 OLD_LIBS+=lib/libalias_cuseeme.so
 OLD_FILES+=usr/lib/libalias_cuseeme.a
 OLD_FILES+=usr/lib/libalias_cuseeme_p.a
 
 # 20200511: Remove deprecated crypto algorithms
 OLD_FILES+=usr/include/crypto/cast.h
 OLD_FILES+=usr/include/crypto/castsb.h
 OLD_FILES+=usr/include/crypto/skipjack.h
 
 # 20200511: Remove ubsec(4)
 OLD_FILES+=usr/share/man/man4/ubsec.4.gz
 
 # 20200428: route_var.h moved to net/route
 OLD_FILES+=usr/include/net/route_var.h
 
 # 20200418: Make libauditd private
 OLD_FILES+=usr/lib/libauditd.a
 OLD_FILES+=usr/lib/libauditd.so
 OLD_LIBS+=usr/lib/libauditd.so.5
 OLD_FILES+=usr/lib/libauditd_p.a
 
 # 20200418: Remove bogus man links
 OLD_FILES+=usr/share/man/man3/getauusernam_R.3.gz
 OLD_FILES+=usr/share/man/man3/getauclassnam_3.3.gz
 
 # 20200414: NFS file handle affinity code for the NFS server re-organized
 OLD_FILES+=usr/include/nfs/nfs_fha.h
 
 # 20200401: Remove procfs-based process debugging
 OLD_FILES+=usr/include/sys/pioctl.h
 
 # 20200330: GDB_LIBEXEC option retired (always true)
 OLD_FILES+=usr/bin/gdb
 OLD_FILES+=usr/bin/gdbserver
 OLD_FILES+=usr/bin/kgdb
 OLD_FILES+=usr/share/man/man1/gdb.1.gz
 OLD_FILES+=usr/share/man/man1/gdbserver.1.gz
 OLD_FILES+=usr/share/man/man1/kgdb.1.gz
 
 # 20200327: OCF refactoring
 OLD_FILES+=usr/include/crypto/cryptosoft.h
 OLD_FILES+=usr/share/man/man9/crypto_find_driver.9.gz
 OLD_FILES+=usr/share/man/man9/crypto_register.9.gz
 OLD_FILES+=usr/share/man/man9/crypto_unregister.9.gz
 
 # 20200326: compat libs for libl are no longer built
 OLD_FILES+=usr/lib32/libfl.a
 OLD_FILES+=usr/lib32/libl.a
 OLD_FILES+=usr/lib32/libln.a
 
 # 20200323: INTERNALLIB don't install headers anymore
 OLD_FILES+=usr/include/libelftc.h
 OLD_FILES+=usr/include/libifconfig.h
 OLD_FILES+=usr/include/libpmcstat.h
 
 # 20200320: cx and ctau drivers retired
 OLD_FILES+=usr/share/man/man4/ctau.4.gz
 OLD_FILES+=usr/share/man/man4/cx.4.gz
 
 # 20200318: host.conf was deprecated a long time ago
 OLD_FILES+=etc/host.conf
 OLD_FILES+=etc/rc.d/nsswitch
 
 # 20200310: new clang import which bumps version from 9.0.1 to 10.0.0
 OLD_FILES+=usr/lib/clang/9.0.1/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/9.0.1/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/9.0.1/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/9.0.1/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/9.0.1/include/openmp_wrappers/__clang_openmp_math.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/openmp_wrappers/__clang_openmp_math_declares.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/9.0.1/include/openmp_wrappers/math.h
 OLD_DIRS+=usr/lib/clang/9.0.1/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/9.0.1/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/9.0.1/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/9.0.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/armintr.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/9.0.1/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/msa.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/9.0.1/include
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/9.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/9.0.1/lib
 OLD_DIRS+=usr/lib/clang/9.0.1
 
 # 20200309: amd(8) retired
 OLD_FILES+=etc/amd.map
 OLD_FILES+=etc/newsyslog.conf.d/amd.conf
 OLD_FILES+=etc/rc.d/amd
 OLD_FILES+=usr/bin/pawd
 OLD_FILES+=usr/sbin/amd
 OLD_FILES+=usr/sbin/amq
 OLD_FILES+=usr/sbin/fixmount
 OLD_FILES+=usr/sbin/fsinfo
 OLD_FILES+=usr/sbin/hlfsd
 OLD_FILES+=usr/sbin/mk-amd-map
 OLD_FILES+=usr/sbin/wire-test
 OLD_FILES+=usr/share/examples/etc/amd.map
 OLD_FILES+=usr/share/man/man1/pawd.1.gz
 OLD_FILES+=usr/share/man/man5/amd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/amd.8.gz
 OLD_FILES+=usr/share/man/man8/amq.8.gz
 OLD_FILES+=usr/share/man/man8/fixmount.8.gz
 OLD_FILES+=usr/share/man/man8/fsinfo.8.gz
 OLD_FILES+=usr/share/man/man8/hlfsd.8.gz
 OLD_FILES+=usr/share/man/man8/mk-amd-map.8.gz
 OLD_FILES+=usr/share/man/man8/wire-test.8.gz
 
 # 20200301: bktr removed
 OLD_DIRS+=usr/include/dev/bktr
 OLD_FILES+=usr/include/dev/bktr/ioctl_bktr.h
 OLD_FILES+=usr/include/dev/bktr/ioctl_bt848.h
 OLD_FILES+=usr/include/dev/bktr/ioctl_meteor.h
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/ioctl_bktr.h
 OLD_FILES+=usr/include/machine/ioctl_meteor.h
 .endif
 OLD_FILES+=usr/share/man/man4/bktr.4.gz
 OLD_FILES+=usr/share/man/man4/brooktree.4.gz
 
 # 20200229: GCC 4.2.1 removed
 OLD_FILES+=usr/bin/g++
 OLD_FILES+=usr/bin/gcc
 OLD_FILES+=usr/share/man/man1/g++.1.gz
 OLD_FILES+=usr/share/man/man1/gcc.1.gz
 OLD_FILES+=usr/bin/gcpp
 OLD_FILES+=usr/bin/gperf
 OLD_FILES+=usr/include/c++/4.2/algorithm
 OLD_FILES+=usr/include/c++/4.2/backward/algo.h
 OLD_FILES+=usr/include/c++/4.2/backward/algobase.h
 OLD_FILES+=usr/include/c++/4.2/backward/alloc.h
 OLD_FILES+=usr/include/c++/4.2/backward/backward_warning.h
 OLD_FILES+=usr/include/c++/4.2/backward/bvector.h
 OLD_FILES+=usr/include/c++/4.2/backward/complex.h
 OLD_FILES+=usr/include/c++/4.2/backward/defalloc.h
 OLD_FILES+=usr/include/c++/4.2/backward/deque.h
 OLD_FILES+=usr/include/c++/4.2/backward/fstream.h
 OLD_FILES+=usr/include/c++/4.2/backward/function.h
 OLD_FILES+=usr/include/c++/4.2/backward/hash_map.h
 OLD_FILES+=usr/include/c++/4.2/backward/hash_set.h
 OLD_FILES+=usr/include/c++/4.2/backward/hashtable.h
 OLD_FILES+=usr/include/c++/4.2/backward/heap.h
 OLD_FILES+=usr/include/c++/4.2/backward/iomanip.h
 OLD_FILES+=usr/include/c++/4.2/backward/iostream.h
 OLD_FILES+=usr/include/c++/4.2/backward/istream.h
 OLD_FILES+=usr/include/c++/4.2/backward/iterator.h
 OLD_FILES+=usr/include/c++/4.2/backward/list.h
 OLD_FILES+=usr/include/c++/4.2/backward/map.h
 OLD_FILES+=usr/include/c++/4.2/backward/multimap.h
 OLD_FILES+=usr/include/c++/4.2/backward/multiset.h
 OLD_FILES+=usr/include/c++/4.2/backward/new.h
 OLD_FILES+=usr/include/c++/4.2/backward/ostream.h
 OLD_FILES+=usr/include/c++/4.2/backward/pair.h
 OLD_FILES+=usr/include/c++/4.2/backward/queue.h
 OLD_FILES+=usr/include/c++/4.2/backward/rope.h
 OLD_FILES+=usr/include/c++/4.2/backward/set.h
 OLD_FILES+=usr/include/c++/4.2/backward/slist.h
 OLD_FILES+=usr/include/c++/4.2/backward/stack.h
 OLD_FILES+=usr/include/c++/4.2/backward/stream.h
 OLD_FILES+=usr/include/c++/4.2/backward/streambuf.h
 OLD_FILES+=usr/include/c++/4.2/backward/strstream
 OLD_FILES+=usr/include/c++/4.2/backward/tempbuf.h
 OLD_FILES+=usr/include/c++/4.2/backward/tree.h
 OLD_FILES+=usr/include/c++/4.2/backward/vector.h
 OLD_FILES+=usr/include/c++/4.2/bits/allocator.h
 OLD_FILES+=usr/include/c++/4.2/bits/atomic_word.h
 OLD_FILES+=usr/include/c++/4.2/bits/basic_file.h
 OLD_FILES+=usr/include/c++/4.2/bits/basic_ios.h
 OLD_FILES+=usr/include/c++/4.2/bits/basic_ios.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/basic_string.h
 OLD_FILES+=usr/include/c++/4.2/bits/basic_string.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/boost_concept_check.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++allocator.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++config.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++io.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++locale.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++locale_internal.h
 OLD_FILES+=usr/include/c++/4.2/bits/char_traits.h
 OLD_FILES+=usr/include/c++/4.2/bits/cmath.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/codecvt.h
 OLD_FILES+=usr/include/c++/4.2/bits/compatibility.h
 OLD_FILES+=usr/include/c++/4.2/bits/concept_check.h
 OLD_FILES+=usr/include/c++/4.2/bits/cpp_type_traits.h
 OLD_FILES+=usr/include/c++/4.2/bits/cpu_defines.h
 OLD_FILES+=usr/include/c++/4.2/bits/ctype_base.h
 OLD_FILES+=usr/include/c++/4.2/bits/ctype_inline.h
 OLD_FILES+=usr/include/c++/4.2/bits/ctype_noninline.h
 OLD_FILES+=usr/include/c++/4.2/bits/cxxabi_tweaks.h
 OLD_FILES+=usr/include/c++/4.2/bits/deque.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/fstream.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/functexcept.h
 OLD_FILES+=usr/include/c++/4.2/bits/gslice.h
 OLD_FILES+=usr/include/c++/4.2/bits/gslice_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr-default.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr-posix.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr-single.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr-tpf.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr.h
 OLD_FILES+=usr/include/c++/4.2/bits/indirect_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/ios_base.h
 OLD_FILES+=usr/include/c++/4.2/bits/istream.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/list.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/locale_classes.h
 OLD_FILES+=usr/include/c++/4.2/bits/locale_facets.h
 OLD_FILES+=usr/include/c++/4.2/bits/locale_facets.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/localefwd.h
 OLD_FILES+=usr/include/c++/4.2/bits/mask_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/messages_members.h
 OLD_FILES+=usr/include/c++/4.2/bits/os_defines.h
 OLD_FILES+=usr/include/c++/4.2/bits/ostream.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/ostream_insert.h
 OLD_FILES+=usr/include/c++/4.2/bits/postypes.h
 OLD_FILES+=usr/include/c++/4.2/bits/slice_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/sstream.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/stl_algo.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_algobase.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_bvector.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_construct.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_deque.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_function.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_heap.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_iterator.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_iterator_base_funcs.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_iterator_base_types.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_list.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_map.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_multimap.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_multiset.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_numeric.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_pair.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_queue.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_raw_storage_iter.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_relops.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_set.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_stack.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_tempbuf.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_tree.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_uninitialized.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_vector.h
 OLD_FILES+=usr/include/c++/4.2/bits/stream_iterator.h
 OLD_FILES+=usr/include/c++/4.2/bits/streambuf.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/streambuf_iterator.h
 OLD_FILES+=usr/include/c++/4.2/bits/stringfwd.h
 OLD_FILES+=usr/include/c++/4.2/bits/time_members.h
 OLD_FILES+=usr/include/c++/4.2/bits/valarray_after.h
 OLD_FILES+=usr/include/c++/4.2/bits/valarray_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/valarray_array.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/valarray_before.h
 OLD_FILES+=usr/include/c++/4.2/bits/vector.tcc
 OLD_FILES+=usr/include/c++/4.2/bitset
 OLD_FILES+=usr/include/c++/4.2/cassert
 OLD_FILES+=usr/include/c++/4.2/cctype
 OLD_FILES+=usr/include/c++/4.2/cerrno
 OLD_FILES+=usr/include/c++/4.2/cfloat
 OLD_FILES+=usr/include/c++/4.2/ciso646
 OLD_FILES+=usr/include/c++/4.2/climits
 OLD_FILES+=usr/include/c++/4.2/clocale
 OLD_FILES+=usr/include/c++/4.2/cmath
 OLD_FILES+=usr/include/c++/4.2/complex
 OLD_FILES+=usr/include/c++/4.2/csetjmp
 OLD_FILES+=usr/include/c++/4.2/csignal
 OLD_FILES+=usr/include/c++/4.2/cstdarg
 OLD_FILES+=usr/include/c++/4.2/cstddef
 OLD_FILES+=usr/include/c++/4.2/cstdio
 OLD_FILES+=usr/include/c++/4.2/cstdlib
 OLD_FILES+=usr/include/c++/4.2/cstring
 OLD_FILES+=usr/include/c++/4.2/ctime
 OLD_FILES+=usr/include/c++/4.2/cwchar
 OLD_FILES+=usr/include/c++/4.2/cwctype
 OLD_FILES+=usr/include/c++/4.2/cxxabi.h
 OLD_FILES+=usr/include/c++/4.2/debug/bitset
 OLD_FILES+=usr/include/c++/4.2/debug/debug.h
 OLD_FILES+=usr/include/c++/4.2/debug/deque
 OLD_FILES+=usr/include/c++/4.2/debug/formatter.h
 OLD_FILES+=usr/include/c++/4.2/debug/functions.h
 OLD_FILES+=usr/include/c++/4.2/debug/hash_map
 OLD_FILES+=usr/include/c++/4.2/debug/hash_map.h
 OLD_FILES+=usr/include/c++/4.2/debug/hash_multimap.h
 OLD_FILES+=usr/include/c++/4.2/debug/hash_multiset.h
 OLD_FILES+=usr/include/c++/4.2/debug/hash_set
 OLD_FILES+=usr/include/c++/4.2/debug/hash_set.h
 OLD_FILES+=usr/include/c++/4.2/debug/list
 OLD_FILES+=usr/include/c++/4.2/debug/macros.h
 OLD_FILES+=usr/include/c++/4.2/debug/map
 OLD_FILES+=usr/include/c++/4.2/debug/map.h
 OLD_FILES+=usr/include/c++/4.2/debug/multimap.h
 OLD_FILES+=usr/include/c++/4.2/debug/multiset.h
 OLD_FILES+=usr/include/c++/4.2/debug/safe_base.h
 OLD_FILES+=usr/include/c++/4.2/debug/safe_iterator.h
 OLD_FILES+=usr/include/c++/4.2/debug/safe_iterator.tcc
 OLD_FILES+=usr/include/c++/4.2/debug/safe_sequence.h
 OLD_FILES+=usr/include/c++/4.2/debug/set
 OLD_FILES+=usr/include/c++/4.2/debug/set.h
 OLD_FILES+=usr/include/c++/4.2/debug/string
 OLD_FILES+=usr/include/c++/4.2/debug/vector
 OLD_FILES+=usr/include/c++/4.2/deque
 OLD_FILES+=usr/include/c++/4.2/exception
 OLD_FILES+=usr/include/c++/4.2/exception_defines.h
 OLD_FILES+=usr/include/c++/4.2/ext/algorithm
 OLD_FILES+=usr/include/c++/4.2/ext/array_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/atomicity.h
 OLD_FILES+=usr/include/c++/4.2/ext/bitmap_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/codecvt_specializations.h
 OLD_FILES+=usr/include/c++/4.2/ext/concurrence.h
 OLD_FILES+=usr/include/c++/4.2/ext/debug_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/functional
 OLD_FILES+=usr/include/c++/4.2/ext/hash_fun.h
 OLD_FILES+=usr/include/c++/4.2/ext/hash_map
 OLD_FILES+=usr/include/c++/4.2/ext/hash_set
 OLD_FILES+=usr/include/c++/4.2/ext/hashtable.h
 OLD_FILES+=usr/include/c++/4.2/ext/iterator
 OLD_FILES+=usr/include/c++/4.2/ext/malloc_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/memory
 OLD_FILES+=usr/include/c++/4.2/ext/mt_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/new_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/numeric
 OLD_FILES+=usr/include/c++/4.2/ext/numeric_traits.h
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/assoc_container.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/basic_tree_policy/basic_tree_policy_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/basic_tree_policy/null_node_metadata.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/basic_tree_policy/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/basic_types.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/cond_dtor_entry_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/cond_key_dtor_entry_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/r_erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/rotate_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/binary_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/const_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/const_point_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/entry_cmp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/entry_pred.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/resize_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_/binomial_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/binomial_heap_base_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/cmp_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/cond_key_dtor_entry_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/debug_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/debug_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/entry_list_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/erase_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/find_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/insert_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/insert_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/resize_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/resize_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/size_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/standard_policies.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cond_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/container_base_dispatch.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/eq_fn/eq_by_less.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/debug_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/debug_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/erase_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/erase_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/find_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/find_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/insert_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/insert_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/iterator_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/resize_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/resize_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/resize_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/standard_policies.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/direct_mask_range_hashing_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/direct_mod_range_hashing_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/linear_probe_fn_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/mask_based_range_hashing.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/mod_based_range_hashing.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/probe_fn_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/quadratic_probe_fn_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/ranged_hash_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/ranged_probe_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/sample_ranged_hash_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/sample_ranged_probe_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/const_point_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/node.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/null_metadata.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/constructor_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/entry_metadata_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/lu_map_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy/counter_lu_metadata.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy/counter_lu_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy/mtf_lu_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy/sample_update_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/map_debug_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/cond_dtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/ov_tree_map_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/pairing_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/child_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/cond_dtor_entry_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/const_child_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/head.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/insert_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/internal_node.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/leaf.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/node_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/node_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/node_metadata_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/pat_trie_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/point_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/split_join_branch_bag.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/synth_e_access_traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/priority_queue_base_dispatch.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/node.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/rc.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/rc_binomial_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/cc_hash_max_collision_check_resize_trigger_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_exponential_size_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_prime_size_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_standard_resize_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/sample_resize_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/sample_resize_trigger.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/node.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/splay_tree_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/standard_policies.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/thin_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy/node_metadata_selector.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy/null_node_update_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy/order_statistics_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy/sample_tree_node_update.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_trace_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/node_metadata_selector.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/null_node_update_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/order_statistics_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/prefix_search_node_update_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/sample_trie_e_access_traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/sample_trie_node_update.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/string_trie_e_access_traits_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/trie_policy_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/type_utils.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/types_traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator/const_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator/const_point_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator/iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator/point_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/exception.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/hash_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/list_update_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/priority_queue.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/tag_and_trait.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/tree_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/trie_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pod_char_traits.h
 OLD_FILES+=usr/include/c++/4.2/ext/pool_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/rb_tree
 OLD_FILES+=usr/include/c++/4.2/ext/rc_string_base.h
 OLD_FILES+=usr/include/c++/4.2/ext/rope
 OLD_FILES+=usr/include/c++/4.2/ext/ropeimpl.h
 OLD_FILES+=usr/include/c++/4.2/ext/slist
 OLD_FILES+=usr/include/c++/4.2/ext/sso_string_base.h
 OLD_FILES+=usr/include/c++/4.2/ext/stdio_filebuf.h
 OLD_FILES+=usr/include/c++/4.2/ext/stdio_sync_filebuf.h
 OLD_FILES+=usr/include/c++/4.2/ext/throw_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/type_traits.h
 OLD_FILES+=usr/include/c++/4.2/ext/typelist.h
 OLD_FILES+=usr/include/c++/4.2/ext/vstring.h
 OLD_FILES+=usr/include/c++/4.2/ext/vstring.tcc
 OLD_FILES+=usr/include/c++/4.2/ext/vstring_fwd.h
 OLD_FILES+=usr/include/c++/4.2/ext/vstring_util.h
 OLD_FILES+=usr/include/c++/4.2/fstream
 OLD_FILES+=usr/include/c++/4.2/functional
 OLD_FILES+=usr/include/c++/4.2/iomanip
 OLD_FILES+=usr/include/c++/4.2/ios
 OLD_FILES+=usr/include/c++/4.2/iosfwd
 OLD_FILES+=usr/include/c++/4.2/iostream
 OLD_FILES+=usr/include/c++/4.2/istream
 OLD_FILES+=usr/include/c++/4.2/iterator
 OLD_FILES+=usr/include/c++/4.2/limits
 OLD_FILES+=usr/include/c++/4.2/list
 OLD_FILES+=usr/include/c++/4.2/locale
 OLD_FILES+=usr/include/c++/4.2/map
 OLD_FILES+=usr/include/c++/4.2/memory
 OLD_FILES+=usr/include/c++/4.2/new
 OLD_FILES+=usr/include/c++/4.2/numeric
 OLD_FILES+=usr/include/c++/4.2/ostream
 OLD_FILES+=usr/include/c++/4.2/queue
 OLD_FILES+=usr/include/c++/4.2/set
 OLD_FILES+=usr/include/c++/4.2/sstream
 OLD_FILES+=usr/include/c++/4.2/stack
 OLD_FILES+=usr/include/c++/4.2/stdexcept
 OLD_FILES+=usr/include/c++/4.2/streambuf
 OLD_FILES+=usr/include/c++/4.2/string
 OLD_FILES+=usr/include/c++/4.2/tr1/array
 OLD_FILES+=usr/include/c++/4.2/tr1/bind_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/bind_repeat.h
 OLD_FILES+=usr/include/c++/4.2/tr1/boost_shared_ptr.h
 OLD_FILES+=usr/include/c++/4.2/tr1/cctype
 OLD_FILES+=usr/include/c++/4.2/tr1/cfenv
 OLD_FILES+=usr/include/c++/4.2/tr1/cfloat
 OLD_FILES+=usr/include/c++/4.2/tr1/cinttypes
 OLD_FILES+=usr/include/c++/4.2/tr1/climits
 OLD_FILES+=usr/include/c++/4.2/tr1/cmath
 OLD_FILES+=usr/include/c++/4.2/tr1/common.h
 OLD_FILES+=usr/include/c++/4.2/tr1/complex
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdarg
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdbool
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdint
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdio
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdlib
 OLD_FILES+=usr/include/c++/4.2/tr1/ctgmath
 OLD_FILES+=usr/include/c++/4.2/tr1/ctime
 OLD_FILES+=usr/include/c++/4.2/tr1/ctype.h
 OLD_FILES+=usr/include/c++/4.2/tr1/cwchar
 OLD_FILES+=usr/include/c++/4.2/tr1/cwctype
 OLD_FILES+=usr/include/c++/4.2/tr1/fenv.h
 OLD_FILES+=usr/include/c++/4.2/tr1/float.h
 OLD_FILES+=usr/include/c++/4.2/tr1/functional
 OLD_FILES+=usr/include/c++/4.2/tr1/functional_hash.h
 OLD_FILES+=usr/include/c++/4.2/tr1/functional_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/hashtable
 OLD_FILES+=usr/include/c++/4.2/tr1/hashtable_policy.h
 OLD_FILES+=usr/include/c++/4.2/tr1/inttypes.h
 OLD_FILES+=usr/include/c++/4.2/tr1/limits.h
 OLD_FILES+=usr/include/c++/4.2/tr1/math.h
 OLD_FILES+=usr/include/c++/4.2/tr1/memory
 OLD_FILES+=usr/include/c++/4.2/tr1/mu_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/random
 OLD_FILES+=usr/include/c++/4.2/tr1/random.tcc
 OLD_FILES+=usr/include/c++/4.2/tr1/ref_fwd.h
 OLD_FILES+=usr/include/c++/4.2/tr1/ref_wrap_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/repeat.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdarg.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdbool.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdint.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdio.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdlib.h
 OLD_FILES+=usr/include/c++/4.2/tr1/tgmath.h
 OLD_FILES+=usr/include/c++/4.2/tr1/tuple
 OLD_FILES+=usr/include/c++/4.2/tr1/tuple_defs.h
 OLD_FILES+=usr/include/c++/4.2/tr1/tuple_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/type_traits
 OLD_FILES+=usr/include/c++/4.2/tr1/type_traits_fwd.h
 OLD_FILES+=usr/include/c++/4.2/tr1/unordered_map
 OLD_FILES+=usr/include/c++/4.2/tr1/unordered_set
 OLD_FILES+=usr/include/c++/4.2/tr1/utility
 OLD_FILES+=usr/include/c++/4.2/tr1/wchar.h
 OLD_FILES+=usr/include/c++/4.2/tr1/wctype.h
 OLD_FILES+=usr/include/c++/4.2/typeinfo
 OLD_FILES+=usr/include/c++/4.2/utility
 OLD_FILES+=usr/include/c++/4.2/valarray
 OLD_FILES+=usr/include/c++/4.2/vector
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/gcc/4.2/__wmmintrin_aes.h
 OLD_FILES+=usr/include/gcc/4.2/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/gcc/4.2/ammintrin.h
 OLD_FILES+=usr/include/gcc/4.2/emmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/mm3dnow.h
 OLD_FILES+=usr/include/gcc/4.2/mm_malloc.h
 OLD_FILES+=usr/include/gcc/4.2/mmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/pmmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/tmmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/wmmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/xmmintrin.h
 .elif ${TARGET_ARCH} == "arm"
 OLD_FILES+=usr/include/gcc/4.2/mmintrin.h
 .elif ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/include/gcc/4.2/altivec.h
 OLD_FILES+=usr/include/gcc/4.2/ppc-asm.h
 OLD_FILES+=usr/include/gcc/4.2/spe.h
 .endif
 OLD_FILES+=usr/lib/libgcov.a
 OLD_FILES+=usr/lib/libgomp.a
 OLD_FILES+=usr/lib/libstdc++.a
 OLD_FILES+=usr/lib/libstdc++.so
 OLD_LIBS+=usr/lib/libstdc++.so.6
 OLD_FILES+=usr/lib/libstdc++_p.a
 OLD_FILES+=usr/lib/libsupc++.a
 OLD_FILES+=usr/lib/libsupc++.so
 OLD_LIBS+=usr/lib/libsupc++.so.1
 OLD_FILES+=usr/lib/libsupc++_p.a
 OLD_LIBS+=usr/lib/libgomp.so.1
 OLD_FILES+=usr/lib/libgomp_p.a
 OLD_FILES+=usr/libexec/cc1
 OLD_FILES+=usr/libexec/cc1plus
 OLD_FILES+=usr/share/man/man1/gcpp.1.gz
 OLD_FILES+=usr/share/man/man1/gperf.1.gz
 OLD_FILES+=usr/share/man/man7/gperf.7.gz
 OLD_DIRS+=usr/include/c++/4.2/tr1
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/eq_fn
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/basic_tree_policy
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds
 OLD_DIRS+=usr/include/c++/4.2/ext
 OLD_DIRS+=usr/include/c++/4.2/debug
 OLD_DIRS+=usr/include/c++/4.2/bits
 OLD_DIRS+=usr/include/c++/4.2/backward
 OLD_DIRS+=usr/include/c++/4.2
 OLD_DIRS+=usr/include/gcc/4.2
 OLD_DIRS+=usr/include/gcc
 
 # 20200220: Upgrade of ncurses, shlib bumped to version 9
 OLD_LIBS+=lib/libncurses.so.8
 OLD_LIBS+=lib/libncursesw.so.8
 
 # 20200206: Remove elf2aout
 OLD_FILES+=usr/bin/elf2aout
 OLD_FILES+=usr/share/man/man1/elf2aout.1.gz
 
 # 20200204: simple_httpd removed
 OLD_FILES+=usr/sbin/simple_httpd
 
 # 20200127: vpo removed
 OLD_FILES+=usr/include/dev/ppbus/vpoio.h
 OLD_FILES+=usr/share/man/man4/imm.4.gz
 OLD_FILES+=usr/share/man/man4/vpo.4.gz
 
 # 20200104: gcc libssp removed
 OLD_FILES+=usr/include/ssp/ssp.h
 OLD_FILES+=usr/include/ssp/stdio.h
 OLD_FILES+=usr/include/ssp/string.h
 OLD_FILES+=usr/include/ssp/unistd.h
 OLD_DIRS+=usr/include/ssp
 OLD_FILES+=usr/lib/libssp.a
 
 # 20191229: GEOM_SCHED class and gsched tool removed
 OLD_LIBS+=lib/geom/geom_sched.so
 OLD_FILES+=sbin/gsched
 OLD_FILES+=usr/share/man/man8/gsched.8.gz
 
 # 20191222: new clang import which bumps version from 9.0.0 to 9.0.1
 OLD_FILES+=usr/lib/clang/9.0.0/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/9.0.0/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/9.0.0/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/9.0.0/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/9.0.0/include/openmp_wrappers/__clang_openmp_math.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/openmp_wrappers/__clang_openmp_math_declares.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/9.0.0/include/openmp_wrappers/math.h
 OLD_DIRS+=usr/lib/clang/9.0.0/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/9.0.0/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/9.0.0/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/9.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/9.0.0/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/9.0.0/include
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/9.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/9.0.0/lib
 OLD_DIRS+=usr/lib/clang/9.0.0
 # 20191221: Update libpcap from 1.9.0 to 1.9.1
 OLD_FILES+=usr/share/man/man3/pcap_set_immediate_mode.3.gz
 OLD_FILES+=usr/share/man/man3/pcap_set_protocol.3.gz
 # 20191214: Removal of sranddev(3)
 OLD_FILES+=usr/share/man/man3/sranddev.3.gz
 # 20191213: Renamed (BIT|CPU)_NAND to (BIT|CPU)_ANDNOT
 OLD_FILES+=usr/share/man/man9/BIT_NAND.9.gz
 OLD_FILES+=usr/share/man/man9/CPU_NAND.9.gz
 # 20191213: remove timeout(9)
 OLD_FILES+=usr/share/man/man9/callout_handle_init.9.gz
 OLD_FILES+=usr/share/man/man9/timeout.9.gz
 OLD_FILES+=usr/share/man/man9/untimeout.9.gz
 # 20191128: Removal of trm(4)
 OLD_FILES+=usr/share/man/man4/trm.4.gz
 # 20191121: Removal of sio(4)
 OLD_FILES+=usr/share/man/man4/sio.4.gz
 # 20191105: picobsd(8), et al, removed
 OLD_FILES+=usr/share/man/man8/picobsd.8.gz
 # 20191017: taskqueue_start_threads_pinned became taskqueue_start_threads_cpuset
 OLD_FILES+=usr/share/man/man9/taskqueue_start_threads_pinned.9.gz
 # 20191009: new clang import which bumps version from 8.0.1 to 9.0.0
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/8.0.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/armintr.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/8.0.1/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/msa.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/8.0.1/include
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/8.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/8.0.1/lib
 OLD_DIRS+=usr/lib/clang/8.0.1
 # 20191009: libc++ 9.0.0 removed some experimental files
 OLD_FILES+=usr/include/c++/v1/experimental/any
 OLD_FILES+=usr/include/c++/v1/experimental/chrono
 OLD_FILES+=usr/include/c++/v1/experimental/numeric
 OLD_FILES+=usr/include/c++/v1/experimental/optional
 OLD_FILES+=usr/include/c++/v1/experimental/ratio
 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
 # 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
 OLD_FILES+=usr/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_016_pos.ksh
 # 20190910: mklocale(1) and colldef(1) removed
 OLD_FILES+=usr/bin/mklocale
 OLD_FILES+=usr/share/man/man1/mklocale.1.gz
 OLD_FILES+=usr/bin/colldef
 OLD_FILES+=usr/share/man/man1/colldef.1.gz
 # 20190904: Remove boot1.efifat and gptboot.efifat (which never should have been)
 OLD_FILES+=boot/boot1.efifat
 OLD_FILES+=boot/gptboot.efifat
 # 20190903: pc-sysinstall(8) removed
 OLD_FILES+=usr/share/examples/pc-sysinstall/README
 OLD_FILES+=usr/share/examples/pc-sysinstall/pc-autoinstall.conf
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.fbsd-netinstall
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.geli
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.gmirror
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.netinstall
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.restore
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.rsync
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.upgrade
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.zfs
 OLD_FILES+=usr/share/man/man8/pc-sysinstall.8.gz
 OLD_FILES+=usr/share/pc-sysinstall/backend-partmanager/create-part.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-partmanager/delete-part.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-emulation.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-laptop.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-nics.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/disk-info.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/disk-list.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/disk-part.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/enable-net.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/get-packages.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-components.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-config.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-mirrors.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-packages.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-rsync-backups.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-tzones.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/query-langs.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/send-logs.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/setup-ssh-keys.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/set-mirror.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/sys-mem.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/test-live.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/test-netup.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/update-part-list.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/xkeyboard-layouts.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/xkeyboard-models.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/xkeyboard-variants.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-bsdlabel.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-cleanup.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-disk.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-extractimage.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-ftp.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-installcomponents.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-installpackages.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-localize.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-mountdisk.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-mountoptical.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-networking.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-newfs.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-parse.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-packages.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-runcommands.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-unmount.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-upgrade.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-users.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/installimage.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/parseconfig.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/startautoinstall.sh
 OLD_FILES+=usr/share/pc-sysinstall/conf/avail-langs
 OLD_FILES+=usr/share/pc-sysinstall/conf/exclude-from-upgrade
 OLD_FILES+=usr/share/pc-sysinstall/conf/license/bsd-en.txt
 OLD_FILES+=usr/share/pc-sysinstall/conf/license/intel-en.txt
 OLD_FILES+=usr/share/pc-sysinstall/conf/license/nvidia-en.txt
 OLD_FILES+=usr/share/pc-sysinstall/conf/pc-sysinstall.conf
 OLD_FILES+=usr/share/pc-sysinstall/doc/help-disk-list
 OLD_FILES+=usr/share/pc-sysinstall/doc/help-disk-size
 OLD_FILES+=usr/share/pc-sysinstall/doc/help-index
 OLD_FILES+=usr/share/pc-sysinstall/doc/help-start-autoinstall
 OLD_FILES+=usr/sbin/pc-sysinstall
 OLD_DIRS+=usr/share/examples/pc-sysinstall
 OLD_DIRS+=usr/share/pc-sysinstall/backend
 OLD_DIRS+=usr/share/pc-sysinstall/backend-partmanager
 OLD_DIRS+=usr/share/pc-sysinstall/backend-query
 OLD_DIRS+=usr/share/pc-sysinstall/conf/license
 OLD_DIRS+=usr/share/pc-sysinstall/conf
 OLD_DIRS+=usr/share/pc-sysinstall/doc
 OLD_DIRS+=usr/share/pc-sysinstall
 # 20190825: zlib 1.0.4 removed from kernel
 OLD_FILES+=usr/include/sys/zlib.h
 OLD_FILES+=usr/include/sys/zutil.h
 # 20190817: pft_ping.py and sniffer.py moved to /usr/tests/sys/netpfil/common
 OLD_FILES+=usr/tests/sys/netpfil/pf/sniffer.py
 OLD_FILES+=usr/tests/sys/netpfil/pf/pft_ping.py
 # 20190816: dir.h removed from POSIX
 OLD_FILES+=usr/include/sys/dir.h
 # 20190813: deprecated GEOM classes removed
 OLD_FILES+=usr/share/man/man4/geom_fox.4.gz
 # 20190729: gzip'ed a.out support removed
 OLD_FILES+=usr/include/sys/inflate.h
 # 20190722: cap_random(3) removed
 OLD_LIBS+=lib/casper/libcap_random.so.1
 OLD_FILES+=usr/include/casper/cap_random.h
 OLD_LIBS+=usr/lib/libcap_random.so
 OLD_FILES+=usr/share/man/man3/libcap_random.3.gz
 OLD_FILES+=usr/share/man/man3/cap_random.3.gz
 OLD_FILES+=usr/share/man/man3/cap_random_buf.3.gz
 # 20190708: vm_page_hold() and _unhold() removed
 OLD_FILES+=usr/share/man/man9/vm_page_hold.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_unhold.9.gz
 # 20190625: Remove NAND and NANDFS support
 OLD_FILES+=usr/share/man/man4/nand.4.gz
 OLD_FILES+=usr/share/man/man4/nandsim.4.gz
 # 20190618: sys/capability.h removed (sys/capsicum.h is the one to use)
 OLD_FILES+=usr/include/sys/capability.h
 # 20190615: sys/pwm.h renamed to dev/pwmc.h
 OLD_FILES+=usr/include/sys/pwm.h
 # 20190612: new clang import which bumps version from 8.0.0 to 8.0.1
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/8.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/8.0.0/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/8.0.0/include
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/8.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/8.0.0/lib
 OLD_DIRS+=usr/lib/clang/8.0.0
 # 20190523: Remove obsolete kgzip and support files
 OLD_FILES+=usr/sbin/kgzip
 OLD_FILES+=usr/lib/kgzldr.o
 OLD_FILES+=usr/share/man/man8/kgzip.8.gz
 # 20190517: Remove obsolete 10 and 10/100 ethernet drivers
 OLD_FILES+=usr/share/man/man4/bm.4.gz
 OLD_FILES+=usr/share/man/man4/cs.4.gz
 OLD_FILES+=usr/share/man/man4/de.4.gz
 OLD_FILES+=usr/share/man/man4/if_de.4.gz
 OLD_FILES+=usr/share/man/man4/ed.4.gz
 OLD_FILES+=usr/share/man/man4/if_ed.4.gz
 OLD_FILES+=usr/share/man/man4/ep.4.gz
 OLD_FILES+=usr/share/man/man4/ex.4.gz
 OLD_FILES+=usr/share/man/man4/fe.4.gz
 OLD_FILES+=usr/share/man/man4/pcn.4.gz
 OLD_FILES+=usr/share/man/man4/if_pcn.4.gz
 OLD_FILES+=usr/share/man/man4/sf.4.gz
 OLD_FILES+=usr/share/man/man4/if_sf.4.gz
 OLD_FILES+=usr/share/man/man4/sn.4.gz
 OLD_FILES+=usr/share/man/man4/if_sn.4.gz
 OLD_FILES+=usr/share/man/man4/tl.4.gz
 OLD_FILES+=usr/share/man/man4/if_tl.4.gz
 OLD_FILES+=usr/share/man/man4/tx.4.gz
 OLD_FILES+=usr/share/man/man4/if_tx.4.gz
 OLD_FILES+=usr/share/man/man4/txp.4.gz
 OLD_FILES+=usr/share/man/man4/if_txp.4.gz
 OLD_FILES+=usr/share/man/man4/vx.4.gz
 OLD_FILES+=usr/share/man/man4/wb.4.gz
 OLD_FILES+=usr/share/man/man4/if_wb.4.gz
 OLD_FILES+=usr/share/man/man4/xe.4.gz
 OLD_FILES+=usr/share/man/man4/if_xe.4.gz
 # 20190513: libcap_sysctl interface change
 OLD_LIBS+=lib/casper/libcap_sysctl.so.1
 # 20190509: tests/sys/opencrypto requires the net/py-dpkt package
 OLD_FILES+=usr/tests/sys/opencrypto/dpkt.py
 OLD_FILES+=usr/tests/sys/opencrypto/dpkt.pyc
 # 20190304: new libc++ import which bumps version from 7.0.1 to 8.0.0
 OLD_FILES+=usr/include/c++/v1/experimental/dynarray
 # 20190304: new clang import which bumps version from 7.0.1 to 8.0.0
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/7.0.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/armintr.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/7.0.1/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/msa.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/7.0.1/include
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/7.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/7.0.1/lib
 OLD_DIRS+=usr/lib/clang/7.0.1
 # 20190227: rename seq.h to seqc.h
 OLD_FILES+=usr/include/sys/seq.h
 # 20190222: libifconfig made INTERNALLIB
 OLD_FILES+=usr/lib/libprivateifconfig.a
 OLD_FILES+=usr/lib/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
 OLD_FILES+=usr/share/man/man9/pfil_runlock.9.gz
 OLD_FILES+=usr/share/man/man9/pfil_wlock.9.gz
 OLD_FILES+=usr/share/man/man9/pfil_wunlock.9.gz
 # 20190126: adv(4) / adw(4) removal
 OLD_FILES+=usr/share/man/man4/adv.4.gz
 OLD_FILES+=usr/share/man/man4/adw.4.gz
 # 20190123: nonexistant cred_update_thread(9) removed
 OLD_FILES+=usr/share/man/man9/cred_update_thread.9.gz
 # 20190114: old pbuf allocator removed
 OLD_FILES+=usr/share/man/man9/getpbuf.9.gz
 OLD_FILES+=usr/share/man/man9/pbuf.9.gz
 OLD_FILES+=usr/share/man/man9/relpbuf.9.gz
 OLD_FILES+=usr/share/man/man9/trypbuf.9.gz
 # 20181219: ibcs removal
 OLD_FILES+=usr/share/examples/ibcs2/hello.uu
 OLD_FILES+=usr/share/examples/ibcs2/README
 OLD_DIRS+=usr/share/examples/ibcs2
 # 20181215: Migration of CTM to ports
 OLD_FILES+=usr/sbin/ctm
 OLD_FILES+=usr/sbin/ctm_dequeue
 OLD_FILES+=usr/sbin/ctm_rmail
 OLD_FILES+=usr/sbin/ctm_smail
 OLD_FILES+=usr/share/man/man1/ctm.1.gz
 OLD_FILES+=usr/share/man/man1/ctm_dequeue.1.gz
 OLD_FILES+=usr/share/man/man1/ctm_rmail.1.gz
 OLD_FILES+=usr/share/man/man1/ctm_smail.1.gz
 OLD_FILES+=usr/share/man/man5/ctm.5.gz
 # 20181214: Remove timed files
 OLD_FILES+=etc/rc.d/timed
 OLD_FILES+=usr/sbin/timed
 OLD_FILES+=usr/sbin/timedc
 OLD_FILES+=usr/share/man/man8/timed.8.gz
 OLD_FILES+=usr/share/man/man8/timedc.8.gz
 # 20181211: new clang import which bumps version from 6.0.1 to 7.0.1
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/6.0.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/6.0.1/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/armintr.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/6.0.1/include/msa.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/6.0.1/include
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/6.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/6.0.1/lib
 OLD_DIRS+=usr/lib/clang/6.0.1
 # 20181116: Rename test file
 OLD_FILES+=usr/tests/sys/netinet/reuseport_lb
 # 20181113: libufs version bumped to 7
 OLD_LIBS+=lib/libufs.so.6
 # 20181112: Cleanup old libcap_dns
 OLD_LIBS+=lib/casper/libcap_dns.so.1
 # 20181030: malloc_domain(9) KPI change
 OLD_FILES+=usr/share/man/man9/malloc_domain.9.gz
 # 20181026: joy(4) removal
 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
 # 20181022: aha(4) removal
 OLD_FILES+=usr/share/man/man4/aha.4.gz
 # 20181022: dpt(4) removal
 OLD_FILES+=usr/share/man/man4/dpt.4.gz
 # 20181022: ncr(4) removal
 OLD_FILES+=usr/share/man/man4/ncr.4.gz
 # 20181022: ncv(4) removal
 OLD_FILES+=usr/share/man/man4/ncv.4.gz
 # 20181022: nsp(4) removal
 OLD_FILES+=usr/share/man/man4/nsp.4.gz
 # 20181022: stg(4) removal
 OLD_FILES+=usr/share/man/man4/stg.4.gz
 # 20181021: mse(4) removal
 OLD_FILES+=usr/share/man/man4/mse.4.gz
 # 20181015: Stale libcasper(3) files following r329452
 OLD_LIBS+=lib/casper/libcap_sysctl.so.0
 OLD_LIBS+=lib/casper/libcap_grp.so.0
 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
 # 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
 # 20181009: OpenSSL 1.1.1
 OLD_FILES+=usr/include/openssl/des_old.h
 OLD_FILES+=usr/include/openssl/dso.h
 OLD_FILES+=usr/include/openssl/krb5_asn.h
 OLD_FILES+=usr/include/openssl/kssl.h
 OLD_FILES+=usr/include/openssl/pqueue.h
 OLD_FILES+=usr/include/openssl/ssl23.h
 OLD_FILES+=usr/include/openssl/ui_compat.h
 OLD_FILES+=usr/share/openssl/man/man1/dss1.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/md2.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/md4.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/md5.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/mdc2.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/ripemd160.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/sha.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/sha1.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/sha224.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/sha256.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/sha384.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/sha512.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/x509v3_config.1.gz
 OLD_FILES+=usr/share/openssl/man/man3/ASN1_STRING_length_set.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BIO_get_conn_int_port.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BIO_get_conn_ip.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BIO_set.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BIO_set_conn_int_port.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BIO_set_conn_ip.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BN_BLINDING_get_thread_id.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BN_BLINDING_set_thread_id.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BN_BLINDING_thread_id.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BN_CTX_init.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BN_MONT_CTX_init.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BN_RECP_CTX_init.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BN_init.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BUF_memdup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BUF_memdup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BUF_strdup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BUF_strlcat.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BUF_strlcpy.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BUF_strndup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CMS_set1_signer_cert.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_cmp.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_cpy.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_current.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_get_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_hash.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_set_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_destroy_dynlockid.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_get_new_dynlockid.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_lock.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_num_locks.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_dynlock_create_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_dynlock_destroy_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_dynlock_lock_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_locking_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/DES_ede3_cbcm_encrypt.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/DES_enc_read.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/DES_enc_write.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EC_KEY_get_key_method_data.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EC_KEY_insert_key_method_data.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EC_POINT_set_Jprojective_coordinates.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/ERR_load_UI_strings.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_CIPHER_CTX_cleanup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_CIPHER_CTX_init.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_MAX_MD_SIZE.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_MD_CTX_cleanup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_MD_CTX_create.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_MD_CTX_destroy.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_MD_CTX_init.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEVP_PKEY_CTX_set_app_data.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_CTX_set_rsa_rsa_keygen_bits.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_get_default_digest.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_dss.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_dss1.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_sha.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/HMAC_CTX_cleanup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/HMAC_CTX_init.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/HMAC_cleanup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/OPENSSL_ia32cap_loc.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/PEM.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/RAND_SSLeay.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/RSA_PKCS1_SSLeay.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/RSA_null_method.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_need_tmp_rsa.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_set_custom_cli_ext.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_set_default_read_ahead.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_set_tmp_rsa.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_set_tmp_rsa_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_add_session.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_flush_sessions.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_get_accept_state.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_get_msg_callback_arg.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_need_tmp_rsa.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_remove_session.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_set_tmp_rsa.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_set_tmp_rsa_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSLeay.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSLeay_add_ssl_algorithms.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSLeay_version.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSLv2_client_method.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSLv2_method.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSLv2_server_method.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/X509_STORE_CTX_set_chain.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/X509_STORE_CTX_trusted_stack.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bio.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/blowfish.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_add_words.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_check_top.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_cmp_words.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_div_words.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_dump.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_expand.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_expand2.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_fix_top.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_internal.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_add_words.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_comba4.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_comba8.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_high.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_low_normal.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_low_recursive.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_normal.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_part_recursive.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_recursive.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_words.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_print.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_set_high.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_set_low.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_set_max.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_sqr_comba4.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_sqr_comba8.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_sqr_normal.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_sqr_recursive.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_sqr_words.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_sub_words.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_wexpand.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/buffer.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/crypto.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/d2i_ECPKParameters_bio.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/d2i_ECPKParameters_fp.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/d2i_ECPrivate_key.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/d2i_Netscape_RSA.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/d2i_PKCS8PrivateKey.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/d2i_Private_key.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/des.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/des_read_2passwords.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/des_read_password.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/des_read_pw.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/des_read_pw_string.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/dh.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/dsa.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/ec.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/ecdsa.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/engine.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/err.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/evp.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/hmac.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/i2d_ECPKParameters_bio.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/i2d_ECPKParameters_fp.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/i2d_Netscape_RSA.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_delete.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_doall.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_doall_arg.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_error.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_free.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_insert.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_new.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_node_stats.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_node_stats_bio.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_node_usage_stats.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_node_usage_stats_bio.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_retrieve.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_stats.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_stats_bio.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lhash.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/md5.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/mdc2.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/pem.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/rand.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/rc4.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/ripemd.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/rsa.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/sha.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/ssl.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/threads.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/ui.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/ui_compat.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/x509.3.gz
 OLD_LIBS+=lib/libcrypto.so.8
 OLD_LIBS+=usr/lib/engines/lib4758cca.so
 OLD_LIBS+=usr/lib/engines/libaep.so
 OLD_LIBS+=usr/lib/engines/libatalla.so
 OLD_LIBS+=usr/lib/engines/libcapi.so
 OLD_LIBS+=usr/lib/engines/libchil.so
 OLD_LIBS+=usr/lib/engines/libcswift.so
 OLD_LIBS+=usr/lib/engines/libgost.so
 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/lib4758cca.so
 OLD_LIBS+=usr/lib32/libaep.so
 OLD_LIBS+=usr/lib32/libatalla.so
 OLD_LIBS+=usr/lib32/libcapi.so
 OLD_LIBS+=usr/lib32/libchil.so
 OLD_LIBS+=usr/lib32/libcswift.so
 OLD_LIBS+=usr/lib32/libgost.so
 OLD_LIBS+=usr/lib32/libnuron.so
 OLD_LIBS+=usr/lib32/libsureware.so
 OLD_LIBS+=usr/lib32/libubsec.so
 # 20180824: libbe(3) SHLIBDIR fixed to reflect correct location
 MOVED_LIBS+=usr/lib/libbe.so.1
 # 20180819: Remove deprecated arc4random(3) stir/addrandom interfaces
 OLD_FILES+=usr/share/man/man3/arc4random_addrandom.3.gz
 OLD_FILES+=usr/share/man/man3/arc4random_stir.3.gz
 # 20180819: send-pr(1) placeholder removal
 OLD_FILES+=usr/bin/send-pr
 # 20180801: jedec_ts(4) removed
 OLD_FILES+=usr/share/man/man4/jedec_ts.4.gz
 # 20180725: Cleanup old libcasper.so.0
 OLD_LIBS+=lib/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
 OLD_FILES+=usr/bin/indent/tests/nsac.0.stdout
 OLD_FILES+=usr/bin/indent/tests/sac.0
 OLD_FILES+=usr/bin/indent/tests/sac.0.pro
 OLD_FILES+=usr/bin/indent/tests/sac.0.stdout
 # 20180721: move of libmlx5.so.1 and libibverbs.so.1
 MOVED_LIBS+=usr/lib/libmlx5.so.1
 MOVED_LIBS+=usr/lib/libibverbs.so.1
 # 20180720: zfsloader.8 merged into loader.8
 OLD_FILES+=usr/share/man/man8/zfsloader.8.gz
 # 20180710: old numa cleanup
 OLD_FILES+=usr/include/sys/numa.h
 OLD_FILES+=usr/share/man/man2/numa_getaffinity.2.gz
 OLD_FILES+=usr/share/man/man2/numa_setaffinity.2.gz
 OLD_FILES+=usr/share/man/man1/numactl.1.gz
 OLD_FILES+=usr/bin/numactl
 # 20180630: new clang import which bumps version from 6.0.0 to 6.0.1
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/6.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/6.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/6.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/6.0.0/include
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/6.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/6.0.0/lib
 OLD_DIRS+=usr/lib/clang/6.0.0
 # 20180615: asf(8) removed
 OLD_FILES+=usr/sbin/asf
 OLD_FILES+=usr/share/man/man8/asf.8.gz
 # 20180609: obsolete libc++ files missed from the 5.0.0 import
 OLD_FILES+=usr/include/c++/v1/__refstring
 OLD_FILES+=usr/include/c++/v1/__undef_min_max
 OLD_FILES+=usr/include/c++/v1/tr1/__refstring
 OLD_FILES+=usr/include/c++/v1/tr1/__undef_min_max
 # 20180607: remove nls support from grep
 OLD_FILES+=usr/share/nls/pt_BR.ISO8859-1/grep.cat
 OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/grep.cat
 OLD_FILES+=usr/share/nls/ja_JP.SJIS/grep.cat
 OLD_FILES+=usr/share/nls/ja_JP.eucJP/grep.cat
 OLD_FILES+=usr/share/nls/gl_ES.ISO8859-1/grep.cat
 OLD_FILES+=usr/share/nls/zh_CN.UTF-8/grep.cat
 OLD_FILES+=usr/share/nls/es_ES.ISO8859-1/grep.cat
 OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/grep.cat
 OLD_FILES+=usr/share/nls/uk_UA.UTF-8/grep.cat
 OLD_FILES+=usr/share/nls/ja_JP.UTF-8/grep.cat
 # 20180528: libpcap update removed header file
 OLD_FILES+=usr/include/pcap/export-defs.h
 # 20180517: retire vxge
 OLD_FILES+=usr/share/man/man4/if_vxge.4.gz
 OLD_FILES+=usr/share/man/man4/vxge.4.gz
 # 20180512: Rename Unbound tools
 OLD_FILES+=usr/sbin/unbound
 OLD_FILES+=usr/sbin/unbound-anchor
 OLD_FILES+=usr/sbin/unbound-checkconf
 OLD_FILES+=usr/sbin/unbound-control
 OLD_FILES+=usr/share/man/man5/unbound.conf.5.gz
 OLD_FILES+=usr/share/man/man8/unbound-anchor.8.gz
 OLD_FILES+=usr/share/man/man8/unbound-checkconf.8.gz
 OLD_FILES+=usr/share/man/man8/unbound-control.8.gz
 OLD_FILES+=usr/share/man/man8/unbound.8.gz
 # 20180508: retire nxge
 OLD_FILES+=usr/share/man/man4/if_nxge.4.gz
 OLD_FILES+=usr/share/man/man4/nxge.4.gz
 # 20180505: rhosts
 OLD_FILES+=usr/share/skel/dot.rhosts
 # 20180502: retire ixgb
 OLD_FILES+=usr/share/man/man4/if_ixgb.4.gz
 OLD_FILES+=usr/share/man/man4/ixgb.4.gz
 # 20180501: retire lmc
 OLD_FILES+=usr/include/dev/lmc/if_lmc.h
 OLD_DIRS+=usr/include/dev/lmc
 OLD_FILES+=usr/sbin/lmcconfig
 OLD_FILES+=usr/share/man/man4/lmc.4.gz
 OLD_FILES+=usr/share/man/man4/if_lmc.4.gz
 OLD_FILES+=usr/share/man/man8/lmcconfig.8.gz
 # 20180417: remove fuswintr and suswintr
 OLD_FILES+=usr/share/man/man9/fuswintr.9.gz
 OLD_FILES+=usr/share/man/man9/suswintr.9.gz
 # 20180413: remove Arcnet support
 OLD_FILES+=usr/include/net/if_arc.h
 OLD_FILES+=usr/share/man/man4/cm.4.gz
 # 20180409: remove FDDI support
 OLD_FILES+=usr/include/net/fddi.h
 OLD_FILES+=usr/share/man/man4/fpa.4.gz
 # 20180319: remove /boot/overlays, replaced by /boot/dtb/overlays
 OLD_DIRS+=boot/overlays
 # 20180311: remove sys/sys/i386/include/pcaudioio.h
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/pcaudioio.h
 .endif
 # 20180310: remove sys/sys/dataacq.h
 OLD_FILES+=usr/include/sys/dataacq.h
 # 20180306: remove DTrace scripts made obsolete by dwatch(1)
 OLD_FILES+=usr/share/dtrace/watch_execve
 OLD_FILES+=usr/share/dtrace/watch_kill
 OLD_FILES+=usr/share/dtrace/watch_vop_remove
 # 20180212: move devmatch
 OLD_FILES+=usr/sbin/devmatch
 # 20180211: remove usb.conf
 OLD_FILES+=etc/devd/usb.conf
 # 20180208: remove c_rehash(1)
 OLD_FILES+=usr/share/openssl/man/man1/c_rehash.1.gz
 # 20180206: remove gdbtui
 OLD_FILES+=usr/bin/gdbtui
 # 20180201: Obsolete forth files
 OLD_FILES+=boot/pcibios.4th
 # 20180114: new clang import which bumps version from 5.0.1 to 6.0.0
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/5.0.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/5.0.1/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/armintr.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/5.0.1/include/msa.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/5.0.1/include
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/5.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/5.0.1/lib
 OLD_DIRS+=usr/lib/clang/5.0.1
 # 20180109: Remove vestiges of digi(4) driver
 OLD_FILES+=usr/include/sys/digiio.h
 OLD_FILES+=usr/sbin/digictl
 OLD_FILES+=usr/share/man/man8/digictl.8.gz
 # 20180107: Convert remaining geli(8) tests to ATF
 OLD_FILES+=tests/sys/geom/class/eli/nokey_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/readonly_test.sh
 # 20180106: Convert most geli(8) tests to ATF
 OLD_FILES+=tests/sys/geom/class/eli/attach_d_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/configure_b_B_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/detach_l_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/init_B_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/init_J_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/init_a_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/init_alias_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/init_i_P_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/integrity_copy_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/integrity_data_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/integrity_hmac_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/onetime_a_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/onetime_d_test.sh
 # 20171230: Remove /etc/skel from mtree
 OLD_DIRS+=etc/skel
 # 20171208: Remove basename_r(3)
 OLD_FILES+=usr/share/man/man3/basename_r.3.gz
 # 20171206: Remove sponge(1)
 OLD_FILES+=usr/bin/sponge
 OLD_FILES+=usr/share/man/man1/sponge.1.gz
 # 20171204: Move fdformat man page from volume 1 to volume 8
 OLD_FILES+=usr/share/man/man1/fdformat.1.gz
 # 20171203: libproc version bump
 OLD_LIBS+=usr/lib/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
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/5.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/5.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/5.0.0/include
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/5.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/5.0.0/lib
 OLD_DIRS+=usr/lib/clang/5.0.0
 # 20171118: Remove old etc casper files
 OLD_FILES+=etc/casper/system.dns
 OLD_FILES+=etc/casper/system.grp
 OLD_FILES+=etc/casper/system.pwd
 OLD_FILES+=etc/casper/system.random
 OLD_FILES+=etc/casper/system.sysctl
 OLD_DIRS+=etc/casper
 # 20171116: lint(1) removal
 OLD_FILES+=usr/bin/lint
 OLD_FILES+=usr/libexec/lint1
 OLD_FILES+=usr/libexec/lint2
 OLD_FILES+=usr/libdata/lint/llib-lposix.ln
 OLD_FILES+=usr/libdata/lint/llib-lstdc.ln
 OLD_FILES+=usr/share/man/man1/lint.1.gz
 OLD_FILES+=usr/share/man/man7/lint.7.gz
 OLD_DIRS+=usr/libdata/lint
 # 20171114: Removal of all fortune datfiles other than freebsd-tips
 OLD_FILES+=usr/share/games/fortune/fortunes
 OLD_FILES+=usr/share/games/fortune/fortunes.dat
 OLD_FILES+=usr/share/games/fortune/gerrold.limerick
 OLD_FILES+=usr/share/games/fortune/gerrold.limerick.dat
 OLD_FILES+=usr/share/games/fortune/limerick
 OLD_FILES+=usr/share/games/fortune/limerick.dat
 OLD_FILES+=usr/share/games/fortune/murphy
 OLD_FILES+=usr/share/games/fortune/murphy-o
 OLD_FILES+=usr/share/games/fortune/murphy-o.dat
 OLD_FILES+=usr/share/games/fortune/murphy.dat
 OLD_FILES+=usr/share/games/fortune/startrek
 OLD_FILES+=usr/share/games/fortune/startrek.dat
 OLD_FILES+=usr/share/games/fortune/zippy
 OLD_FILES+=usr/share/games/fortune/zippy.dat
 # 20171112: Removal of eqnchar definition
 OLD_FILES+=usr/share/misc/eqnchar
 # 20171110: Removal of mailaddr man page
 OLD_FILES+=usr/share/man/man7/mailaddr.7.gz
 # 20171108: Rename of NgSendMsgReply to NgSendReplyMsg
 OLD_FILES+=usr/share/man/man3/NgSendMsgReply.3.gz
 # 20171108: badsect(8) removal
 OLD_FILES+=sbin/badsect
 OLD_FILES+=rescue/badsect
 OLD_FILES+=usr/share/man/man8/badsect.8.gz
 # 20171105: fixing lib/libclang_rt CRTARCH for arm:armv[67]
 .if ${MACHINE_ARCH:Marmv[67]*} != "" && \
     (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "")
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-arm.a
 OLD_LIBS+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.safestack-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 .endif
 # 20171104: libcap_random should be in /lib not in /usr/lib
 OLD_LIBS+=usr/lib/libcap_random.so.0
 # 20171104: Casper can work only as shared library
 OLD_FILES+=usr/lib/libcap_dns.a
 OLD_FILES+=usr/lib/libcap_dns_p.a
 OLD_FILES+=usr/lib/libcap_grp.a
 OLD_FILES+=usr/lib/libcap_grp_p.a
 OLD_FILES+=usr/lib/libcap_pwd.a
 OLD_FILES+=usr/lib/libcap_pwd_p.a
 OLD_FILES+=usr/lib/libcap_random.a
 OLD_FILES+=usr/lib/libcap_random_p.a
 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
 # 20171031: Removal of adding_user man page
 OLD_FILES+=usr/share/man/man7/adding_user.7.gz
 # 20171031: Disconnected libpathconv tests
 OLD_DIRS+=usr/tests/lib/libpathconv
 # 20171017: Removal of mbpool(9)
 OLD_FILES+=usr/include/sys/mbpool.h
 OLD_FILES+=usr/share/man/man9/mbpool.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_destroy.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_alloc.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_ext_free.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_count.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_card_free.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_get_keep.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_free.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_get.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_create.9.gz
 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/include/stand.h
 OLD_FILES+=usr/share/man/man3/libstand.3.gz
 # 20171003: remove RCMDS
 OLD_FILES+=bin/rcp
 OLD_FILES+=rescue/rcp
 OLD_FILES+=usr/bin/rlogin
 OLD_FILES+=usr/bin/rsh
 OLD_FILES+=usr/libexec/rlogind
 OLD_FILES+=usr/libexec/rshd
 OLD_FILES+=usr/share/man/man1/rcp.1.gz
 OLD_FILES+=usr/share/man/man1/rlogin.1.gz
 OLD_FILES+=usr/share/man/man1/rsh.1.gz
 OLD_FILES+=usr/share/man/man8/rlogind.8.gz
 OLD_FILES+=usr/share/man/man8/rshd.8.gz
 # 20170927: crshared
 OLD_FILES+=usr/share/man/man9/crshared.9.gz
 # 20170927: procctl
 OLD_FILES+=usr/share/man/man8/procctl.8.gz
 OLD_FILES+=usr/sbin/procctl
 # 20170926: remove unneeded man aliases and locales directory
 OLD_FILES+=usr/share/man/en.ISO8859-1/man1
 OLD_FILES+=usr/share/man/en.ISO8859-1/man2
 OLD_FILES+=usr/share/man/en.ISO8859-1/man3
 OLD_FILES+=usr/share/man/en.ISO8859-1/man4
 OLD_FILES+=usr/share/man/en.ISO8859-1/man5
 OLD_FILES+=usr/share/man/en.ISO8859-1/man6
 OLD_FILES+=usr/share/man/en.ISO8859-1/man7
 OLD_FILES+=usr/share/man/en.ISO8859-1/man8
 OLD_FILES+=usr/share/man/en.ISO8859-1/man9
 OLD_DIRS+=usr/share/man/en.ISO8859-1
 OLD_FILES+=usr/share/man/en.ISO8859-1/mandoc.db
 OLD_FILES+=usr/share/man/en.UTF-8/man1
 OLD_FILES+=usr/share/man/en.UTF-8/man2
 OLD_FILES+=usr/share/man/en.UTF-8/man3
 OLD_FILES+=usr/share/man/en.UTF-8/man4
 OLD_FILES+=usr/share/man/en.UTF-8/man5
 OLD_FILES+=usr/share/man/en.UTF-8/man6
 OLD_FILES+=usr/share/man/en.UTF-8/man7
 OLD_FILES+=usr/share/man/en.UTF-8/man8
 OLD_FILES+=usr/share/man/en.UTF-8/man9
 OLD_FILES+=usr/share/man/en.UTF-8/mandoc.db
 OLD_DIRS+=usr/share/man/en.UTF-8
 OLD_FILES+=usr/share/man/en.ISO8859-15
 OLD_FILES+=usr/share/openssl/man/en.ISO8859-1/man1
 OLD_FILES+=usr/share/openssl/man/en.ISO8859-1/man3
 OLD_FILES+=usr/share/openssl/man/en.ISO8859-1/mandoc.db
 OLD_DIRS+=usr/share/openssl/man/en.ISO8859-1
 OLD_FILES+=usr/share/openssl/man/en.ISO8859-15
 OLD_DIRS+=usr/share/man/ja/man1
 OLD_DIRS+=usr/share/man/ja/man2
 OLD_DIRS+=usr/share/man/ja/man3
 OLD_DIRS+=usr/share/man/ja/man4
 OLD_DIRS+=usr/share/man/ja/man5
 OLD_DIRS+=usr/share/man/ja/man6
 OLD_DIRS+=usr/share/man/ja/man7
 OLD_DIRS+=usr/share/man/ja/man8
 OLD_DIRS+=usr/share/man/ja/man9
 OLD_DIRS+=usr/share/man/ja
 # 20170913: remove unneeded catman utility
 OLD_FILES+=etc/periodic/weekly/330.catman
 OLD_FILES+=usr/bin/catman
 OLD_FILES+=usr/libexec/catman.local
 OLD_FILES+=usr/share/man/man1/catman.1.gz
 OLD_FILES+=usr/share/man/man8/catman.local.8.gz
 OLD_DIRS+=usr/share/man/cat1
 OLD_DIRS+=usr/share/man/cat2
 OLD_DIRS+=usr/share/man/cat3
 OLD_DIRS+=usr/share/man/cat4/amd64
 OLD_DIRS+=usr/share/man/cat4/arm
 OLD_DIRS+=usr/share/man/cat4/i386
 OLD_DIRS+=usr/share/man/cat4/powerpc
 OLD_DIRS+=usr/share/man/cat4/sparc64
 OLD_DIRS+=usr/share/man/cat4
 OLD_DIRS+=usr/share/man/cat5
 OLD_DIRS+=usr/share/man/cat6
 OLD_DIRS+=usr/share/man/cat7
 OLD_DIRS+=usr/share/man/cat8/amd64
 OLD_DIRS+=usr/share/man/cat8/arm
 OLD_DIRS+=usr/share/man/cat8/i386
 OLD_DIRS+=usr/share/man/cat8/powerpc
 OLD_DIRS+=usr/share/man/cat8/sparc64
 OLD_DIRS+=usr/share/man/cat8
 OLD_DIRS+=usr/share/man/cat9
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat1
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat2
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat3
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4/amd64
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4/arm
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4/i386
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4/powerpc
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4/sparc64
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat5
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat6
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat7
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8/amd64
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8/arm
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8/i386
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8/powerpc
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8/sparc64
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat9
 OLD_DIRS+=usr/share/man/en.UTF-8/cat1
 OLD_DIRS+=usr/share/man/en.UTF-8/cat2
 OLD_DIRS+=usr/share/man/en.UTF-8/cat3
 OLD_DIRS+=usr/share/man/en.UTF-8/cat4/amd64
 OLD_DIRS+=usr/share/man/en.UTF-8/cat4/arm
 OLD_DIRS+=usr/share/man/en.UTF-8/cat4/i386
 OLD_DIRS+=usr/share/man/en.UTF-8/cat4/powerpc
 OLD_DIRS+=usr/share/man/en.UTF-8/cat4/sparc64
 OLD_DIRS+=usr/share/man/en.UTF-8/cat4
 OLD_DIRS+=usr/share/man/en.UTF-8/cat5
 OLD_DIRS+=usr/share/man/en.UTF-8/cat6
 OLD_DIRS+=usr/share/man/en.UTF-8/cat7
 OLD_DIRS+=usr/share/man/en.UTF-8/cat8/amd64
 OLD_DIRS+=usr/share/man/en.UTF-8/cat8/arm
 OLD_DIRS+=usr/share/man/en.UTF-8/cat8/i386
 OLD_DIRS+=usr/share/man/en.UTF-8/cat8/powerpc
 OLD_DIRS+=usr/share/man/en.UTF-8/cat8/sparc64
 OLD_DIRS+=usr/share/man/en.UTF-8/cat8
 OLD_DIRS+=usr/share/man/en.UTF-8/cat9
 OLD_DIRS+=usr/share/man/ja/cat1
 OLD_DIRS+=usr/share/man/ja/cat2
 OLD_DIRS+=usr/share/man/ja/cat3
 OLD_DIRS+=usr/share/man/ja/cat4/amd64
 OLD_DIRS+=usr/share/man/ja/cat4/arm
 OLD_DIRS+=usr/share/man/ja/cat4/i386
 OLD_DIRS+=usr/share/man/ja/cat4/powerpc
 OLD_DIRS+=usr/share/man/ja/cat4/sparc64
 OLD_DIRS+=usr/share/man/ja/cat4
 OLD_DIRS+=usr/share/man/ja/cat5
 OLD_DIRS+=usr/share/man/ja/cat6
 OLD_DIRS+=usr/share/man/ja/cat7
 OLD_DIRS+=usr/share/man/ja/cat8/amd64
 OLD_DIRS+=usr/share/man/ja/cat8/arm
 OLD_DIRS+=usr/share/man/ja/cat8/powerpc
 OLD_DIRS+=usr/share/man/ja/cat8/sparc64
 OLD_DIRS+=usr/share/man/ja/cat8
 OLD_DIRS+=usr/share/man/ja/cat9
 OLD_DIRS+=usr/share/openssl/man/cat1
 OLD_DIRS+=usr/share/openssl/man/cat3
 OLD_DIRS+=usr/share/openssl/man/en.ISO8859-1/cat1
 OLD_DIRS+=usr/share/openssl/man/en.ISO8859-1/cat3
 # 20170830: rename ntb_hw(4) to ntb_hw_intel(4)
 OLD_FILES+=usr/share/man/man4/ntb_hw.4.gz
 # 20170802: ksyms(4) ioctl interface was removed
 OLD_FILES+=usr/include/sys/ksyms.h
 # 20170729: the iicbus/pcf8563 driver is replaced with iicbus/nxprtc
 OLD_FILES+=usr/include/dev/iicbus/pcf8563reg.h
 # 20170727: options FLOWTABLE removed
 OLD_FILES+=usr/include/net/flowtable.h
 # 20170722: new clang import which bumps version from 4.0.0 to 5.0.0
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/4.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/4.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/4.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/4.0.0/include
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/4.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/4.0.0/lib
 OLD_DIRS+=usr/lib/clang/4.0.0
 OLD_FILES+=usr/bin/llvm-pdbdump
 # 20170717: Remove documentation of vaporware
 OLD_FILES+=usr/share/man/man2/pdwait4.2.gz
 # 20170610: chown-f_test replaced by chown_test
 OLD_FILES+=usr/tests/usr.sbin/chown/chown-f_test
 # 20170609: drop obsolete manpage link (if_rtwn.ko -> rtwn.ko)
 OLD_FILES+=usr/share/man/man4/if_rtwn.4.gz
 # 20170531: removal of groff
 OLD_FILES+=usr/bin/addftinfo
 OLD_FILES+=usr/bin/afmtodit
 OLD_FILES+=usr/bin/checknr
 OLD_FILES+=usr/bin/colcrt
 OLD_FILES+=usr/bin/eqn
 OLD_FILES+=usr/bin/grn
 OLD_FILES+=usr/bin/grodvi
 OLD_FILES+=usr/bin/groff
 OLD_FILES+=usr/bin/grog
 OLD_FILES+=usr/bin/grolbp
 OLD_FILES+=usr/bin/grolj4
 OLD_FILES+=usr/bin/grops
 OLD_FILES+=usr/bin/grotty
 OLD_FILES+=usr/bin/hpftodit
 OLD_FILES+=usr/bin/indxbib
 OLD_FILES+=usr/bin/lkbib
 OLD_FILES+=usr/bin/lookbib
 OLD_FILES+=usr/bin/mmroff
 OLD_FILES+=usr/bin/neqn
 OLD_FILES+=usr/bin/nroff
 OLD_FILES+=usr/bin/pfbtops
 OLD_FILES+=usr/bin/pic
 OLD_FILES+=usr/bin/post-grohtml
 OLD_FILES+=usr/bin/pre-grohtml
 OLD_FILES+=usr/bin/psroff
 OLD_FILES+=usr/bin/refer
 OLD_FILES+=usr/bin/tbl
 OLD_FILES+=usr/bin/tfmtodit
 OLD_FILES+=usr/bin/troff
 OLD_FILES+=usr/bin/vgrind
 OLD_FILES+=usr/libexec/vfontedpr
 OLD_FILES+=usr/share/dict/eign
 OLD_FILES+=usr/share/groff_font/devX100-12/CB
 OLD_FILES+=usr/share/groff_font/devX100-12/CBI
 OLD_FILES+=usr/share/groff_font/devX100-12/CI
 OLD_FILES+=usr/share/groff_font/devX100-12/CR
 OLD_FILES+=usr/share/groff_font/devX100-12/DESC
 OLD_FILES+=usr/share/groff_font/devX100-12/HB
 OLD_FILES+=usr/share/groff_font/devX100-12/HBI
 OLD_FILES+=usr/share/groff_font/devX100-12/HI
 OLD_FILES+=usr/share/groff_font/devX100-12/HR
 OLD_FILES+=usr/share/groff_font/devX100-12/NB
 OLD_FILES+=usr/share/groff_font/devX100-12/NBI
 OLD_FILES+=usr/share/groff_font/devX100-12/NI
 OLD_FILES+=usr/share/groff_font/devX100-12/NR
 OLD_FILES+=usr/share/groff_font/devX100-12/S
 OLD_FILES+=usr/share/groff_font/devX100-12/TB
 OLD_FILES+=usr/share/groff_font/devX100-12/TBI
 OLD_FILES+=usr/share/groff_font/devX100-12/TI
 OLD_FILES+=usr/share/groff_font/devX100-12/TR
 OLD_DIRS+=usr/share/groff_font/devX100-12
 OLD_FILES+=usr/share/groff_font/devX100/CB
 OLD_FILES+=usr/share/groff_font/devX100/CBI
 OLD_FILES+=usr/share/groff_font/devX100/CI
 OLD_FILES+=usr/share/groff_font/devX100/CR
 OLD_FILES+=usr/share/groff_font/devX100/DESC
 OLD_FILES+=usr/share/groff_font/devX100/HB
 OLD_FILES+=usr/share/groff_font/devX100/HBI
 OLD_FILES+=usr/share/groff_font/devX100/HI
 OLD_FILES+=usr/share/groff_font/devX100/HR
 OLD_FILES+=usr/share/groff_font/devX100/NB
 OLD_FILES+=usr/share/groff_font/devX100/NBI
 OLD_FILES+=usr/share/groff_font/devX100/NI
 OLD_FILES+=usr/share/groff_font/devX100/NR
 OLD_FILES+=usr/share/groff_font/devX100/S
 OLD_FILES+=usr/share/groff_font/devX100/TB
 OLD_FILES+=usr/share/groff_font/devX100/TBI
 OLD_FILES+=usr/share/groff_font/devX100/TI
 OLD_FILES+=usr/share/groff_font/devX100/TR
 OLD_DIRS+=usr/share/groff_font/devX100
 OLD_FILES+=usr/share/groff_font/devX75-12/CB
 OLD_FILES+=usr/share/groff_font/devX75-12/CBI
 OLD_FILES+=usr/share/groff_font/devX75-12/CI
 OLD_FILES+=usr/share/groff_font/devX75-12/CR
 OLD_FILES+=usr/share/groff_font/devX75-12/DESC
 OLD_FILES+=usr/share/groff_font/devX75-12/HB
 OLD_FILES+=usr/share/groff_font/devX75-12/HBI
 OLD_FILES+=usr/share/groff_font/devX75-12/HI
 OLD_FILES+=usr/share/groff_font/devX75-12/HR
 OLD_FILES+=usr/share/groff_font/devX75-12/NB
 OLD_FILES+=usr/share/groff_font/devX75-12/NBI
 OLD_FILES+=usr/share/groff_font/devX75-12/NI
 OLD_FILES+=usr/share/groff_font/devX75-12/NR
 OLD_FILES+=usr/share/groff_font/devX75-12/S
 OLD_FILES+=usr/share/groff_font/devX75-12/TB
 OLD_FILES+=usr/share/groff_font/devX75-12/TBI
 OLD_FILES+=usr/share/groff_font/devX75-12/TI
 OLD_FILES+=usr/share/groff_font/devX75-12/TR
 OLD_DIRS+=usr/share/groff_font/devX75-12
 OLD_FILES+=usr/share/groff_font/devX75/CB
 OLD_FILES+=usr/share/groff_font/devX75/CBI
 OLD_FILES+=usr/share/groff_font/devX75/CI
 OLD_FILES+=usr/share/groff_font/devX75/CR
 OLD_FILES+=usr/share/groff_font/devX75/DESC
 OLD_FILES+=usr/share/groff_font/devX75/HB
 OLD_FILES+=usr/share/groff_font/devX75/HBI
 OLD_FILES+=usr/share/groff_font/devX75/HI
 OLD_FILES+=usr/share/groff_font/devX75/HR
 OLD_FILES+=usr/share/groff_font/devX75/NB
 OLD_FILES+=usr/share/groff_font/devX75/NBI
 OLD_FILES+=usr/share/groff_font/devX75/NI
 OLD_FILES+=usr/share/groff_font/devX75/NR
 OLD_FILES+=usr/share/groff_font/devX75/S
 OLD_FILES+=usr/share/groff_font/devX75/TB
 OLD_FILES+=usr/share/groff_font/devX75/TBI
 OLD_FILES+=usr/share/groff_font/devX75/TI
 OLD_FILES+=usr/share/groff_font/devX75/TR
 OLD_DIRS+=usr/share/groff_font/devX75
 OLD_FILES+=usr/share/groff_font/devascii/B
 OLD_FILES+=usr/share/groff_font/devascii/BI
 OLD_FILES+=usr/share/groff_font/devascii/CW
 OLD_FILES+=usr/share/groff_font/devascii/DESC
 OLD_FILES+=usr/share/groff_font/devascii/I
 OLD_FILES+=usr/share/groff_font/devascii/L
 OLD_FILES+=usr/share/groff_font/devascii/R
 OLD_FILES+=usr/share/groff_font/devascii/S
 OLD_DIRS+=usr/share/groff_font/devascii
 OLD_FILES+=usr/share/groff_font/devcp1047/B
 OLD_FILES+=usr/share/groff_font/devcp1047/BI
 OLD_FILES+=usr/share/groff_font/devcp1047/CW
 OLD_FILES+=usr/share/groff_font/devcp1047/DESC
 OLD_FILES+=usr/share/groff_font/devcp1047/I
 OLD_FILES+=usr/share/groff_font/devcp1047/L
 OLD_FILES+=usr/share/groff_font/devcp1047/R
 OLD_FILES+=usr/share/groff_font/devcp1047/S
 OLD_DIRS+=usr/share/groff_font/devcp1047
 OLD_FILES+=usr/share/groff_font/devdvi/CW
 OLD_FILES+=usr/share/groff_font/devdvi/CWEC
 OLD_FILES+=usr/share/groff_font/devdvi/CWI
 OLD_FILES+=usr/share/groff_font/devdvi/CWIEC
 OLD_FILES+=usr/share/groff_font/devdvi/CWITC
 OLD_FILES+=usr/share/groff_font/devdvi/CWTC
 OLD_FILES+=usr/share/groff_font/devdvi/CompileFonts
 OLD_FILES+=usr/share/groff_font/devdvi/DESC
 OLD_FILES+=usr/share/groff_font/devdvi/EX
 OLD_FILES+=usr/share/groff_font/devdvi/HB
 OLD_FILES+=usr/share/groff_font/devdvi/HBEC
 OLD_FILES+=usr/share/groff_font/devdvi/HBI
 OLD_FILES+=usr/share/groff_font/devdvi/HBIEC
 OLD_FILES+=usr/share/groff_font/devdvi/HBITC
 OLD_FILES+=usr/share/groff_font/devdvi/HBTC
 OLD_FILES+=usr/share/groff_font/devdvi/HI
 OLD_FILES+=usr/share/groff_font/devdvi/HIEC
 OLD_FILES+=usr/share/groff_font/devdvi/HITC
 OLD_FILES+=usr/share/groff_font/devdvi/HR
 OLD_FILES+=usr/share/groff_font/devdvi/HREC
 OLD_FILES+=usr/share/groff_font/devdvi/HRTC
 OLD_FILES+=usr/share/groff_font/devdvi/MI
 OLD_FILES+=usr/share/groff_font/devdvi/Makefile
 OLD_FILES+=usr/share/groff_font/devdvi/S
 OLD_FILES+=usr/share/groff_font/devdvi/SA
 OLD_FILES+=usr/share/groff_font/devdvi/SB
 OLD_FILES+=usr/share/groff_font/devdvi/SC
 OLD_FILES+=usr/share/groff_font/devdvi/TB
 OLD_FILES+=usr/share/groff_font/devdvi/TBEC
 OLD_FILES+=usr/share/groff_font/devdvi/TBI
 OLD_FILES+=usr/share/groff_font/devdvi/TBIEC
 OLD_FILES+=usr/share/groff_font/devdvi/TBITC
 OLD_FILES+=usr/share/groff_font/devdvi/TBTC
 OLD_FILES+=usr/share/groff_font/devdvi/TI
 OLD_FILES+=usr/share/groff_font/devdvi/TIEC
 OLD_FILES+=usr/share/groff_font/devdvi/TITC
 OLD_FILES+=usr/share/groff_font/devdvi/TR
 OLD_FILES+=usr/share/groff_font/devdvi/TREC
 OLD_FILES+=usr/share/groff_font/devdvi/TRTC
 OLD_FILES+=usr/share/groff_font/devdvi/ec.map
 OLD_FILES+=usr/share/groff_font/devdvi/msam.map
 OLD_FILES+=usr/share/groff_font/devdvi/msbm.map
 OLD_FILES+=usr/share/groff_font/devdvi/tc.map
 OLD_FILES+=usr/share/groff_font/devdvi/texb.map
 OLD_FILES+=usr/share/groff_font/devdvi/texex.map
 OLD_FILES+=usr/share/groff_font/devdvi/texi.map
 OLD_FILES+=usr/share/groff_font/devdvi/texmi.map
 OLD_FILES+=usr/share/groff_font/devdvi/texr.map
 OLD_FILES+=usr/share/groff_font/devdvi/texsy.map
 OLD_FILES+=usr/share/groff_font/devdvi/textex.map
 OLD_FILES+=usr/share/groff_font/devdvi/textt.map
 OLD_DIRS+=usr/share/groff_font/devdvi
 OLD_FILES+=usr/share/groff_font/devhtml/B
 OLD_FILES+=usr/share/groff_font/devhtml/BI
 OLD_FILES+=usr/share/groff_font/devhtml/CB
 OLD_FILES+=usr/share/groff_font/devhtml/CBI
 OLD_FILES+=usr/share/groff_font/devhtml/CI
 OLD_FILES+=usr/share/groff_font/devhtml/CR
 OLD_FILES+=usr/share/groff_font/devhtml/DESC
 OLD_FILES+=usr/share/groff_font/devhtml/I
 OLD_FILES+=usr/share/groff_font/devhtml/R
 OLD_FILES+=usr/share/groff_font/devhtml/S
 OLD_DIRS+=usr/share/groff_font/devhtml
 OLD_FILES+=usr/share/groff_font/devkoi8-r/B
 OLD_FILES+=usr/share/groff_font/devkoi8-r/BI
 OLD_FILES+=usr/share/groff_font/devkoi8-r/CW
 OLD_FILES+=usr/share/groff_font/devkoi8-r/DESC
 OLD_FILES+=usr/share/groff_font/devkoi8-r/I
 OLD_FILES+=usr/share/groff_font/devkoi8-r/L
 OLD_FILES+=usr/share/groff_font/devkoi8-r/R
 OLD_FILES+=usr/share/groff_font/devkoi8-r/S
 OLD_DIRS+=usr/share/groff_font/devkoi8-r
 OLD_FILES+=usr/share/groff_font/devlatin1/B
 OLD_FILES+=usr/share/groff_font/devlatin1/BI
 OLD_FILES+=usr/share/groff_font/devlatin1/CW
 OLD_FILES+=usr/share/groff_font/devlatin1/DESC
 OLD_FILES+=usr/share/groff_font/devlatin1/I
 OLD_FILES+=usr/share/groff_font/devlatin1/L
 OLD_FILES+=usr/share/groff_font/devlatin1/R
 OLD_FILES+=usr/share/groff_font/devlatin1/S
 OLD_DIRS+=usr/share/groff_font/devlatin1
 OLD_FILES+=usr/share/groff_font/devlbp/CB
 OLD_FILES+=usr/share/groff_font/devlbp/CI
 OLD_FILES+=usr/share/groff_font/devlbp/CR
 OLD_FILES+=usr/share/groff_font/devlbp/DESC
 OLD_FILES+=usr/share/groff_font/devlbp/EB
 OLD_FILES+=usr/share/groff_font/devlbp/EI
 OLD_FILES+=usr/share/groff_font/devlbp/ER
 OLD_FILES+=usr/share/groff_font/devlbp/HB
 OLD_FILES+=usr/share/groff_font/devlbp/HBI
 OLD_FILES+=usr/share/groff_font/devlbp/HI
 OLD_FILES+=usr/share/groff_font/devlbp/HNB
 OLD_FILES+=usr/share/groff_font/devlbp/HNBI
 OLD_FILES+=usr/share/groff_font/devlbp/HNI
 OLD_FILES+=usr/share/groff_font/devlbp/HNR
 OLD_FILES+=usr/share/groff_font/devlbp/HR
 OLD_FILES+=usr/share/groff_font/devlbp/TB
 OLD_FILES+=usr/share/groff_font/devlbp/TBI
 OLD_FILES+=usr/share/groff_font/devlbp/TI
 OLD_FILES+=usr/share/groff_font/devlbp/TR
 OLD_DIRS+=usr/share/groff_font/devlbp
 OLD_FILES+=usr/share/groff_font/devlj4/AB
 OLD_FILES+=usr/share/groff_font/devlj4/ABI
 OLD_FILES+=usr/share/groff_font/devlj4/AI
 OLD_FILES+=usr/share/groff_font/devlj4/ALBB
 OLD_FILES+=usr/share/groff_font/devlj4/ALBR
 OLD_FILES+=usr/share/groff_font/devlj4/AOB
 OLD_FILES+=usr/share/groff_font/devlj4/AOI
 OLD_FILES+=usr/share/groff_font/devlj4/AOR
 OLD_FILES+=usr/share/groff_font/devlj4/AR
 OLD_FILES+=usr/share/groff_font/devlj4/CB
 OLD_FILES+=usr/share/groff_font/devlj4/CBI
 OLD_FILES+=usr/share/groff_font/devlj4/CI
 OLD_FILES+=usr/share/groff_font/devlj4/CLARENDON
 OLD_FILES+=usr/share/groff_font/devlj4/CORONET
 OLD_FILES+=usr/share/groff_font/devlj4/CR
 OLD_FILES+=usr/share/groff_font/devlj4/DESC
 OLD_FILES+=usr/share/groff_font/devlj4/GB
 OLD_FILES+=usr/share/groff_font/devlj4/GBI
 OLD_FILES+=usr/share/groff_font/devlj4/GI
 OLD_FILES+=usr/share/groff_font/devlj4/GR
 OLD_FILES+=usr/share/groff_font/devlj4/LGB
 OLD_FILES+=usr/share/groff_font/devlj4/LGI
 OLD_FILES+=usr/share/groff_font/devlj4/LGR
 OLD_FILES+=usr/share/groff_font/devlj4/MARIGOLD
 OLD_FILES+=usr/share/groff_font/devlj4/OB
 OLD_FILES+=usr/share/groff_font/devlj4/OBI
 OLD_FILES+=usr/share/groff_font/devlj4/OI
 OLD_FILES+=usr/share/groff_font/devlj4/OR
 OLD_FILES+=usr/share/groff_font/devlj4/S
 OLD_FILES+=usr/share/groff_font/devlj4/SYMBOL
 OLD_FILES+=usr/share/groff_font/devlj4/TB
 OLD_FILES+=usr/share/groff_font/devlj4/TBI
 OLD_FILES+=usr/share/groff_font/devlj4/TI
 OLD_FILES+=usr/share/groff_font/devlj4/TNRB
 OLD_FILES+=usr/share/groff_font/devlj4/TNRBI
 OLD_FILES+=usr/share/groff_font/devlj4/TNRI
 OLD_FILES+=usr/share/groff_font/devlj4/TNRR
 OLD_FILES+=usr/share/groff_font/devlj4/TR
 OLD_FILES+=usr/share/groff_font/devlj4/UB
 OLD_FILES+=usr/share/groff_font/devlj4/UBI
 OLD_FILES+=usr/share/groff_font/devlj4/UCB
 OLD_FILES+=usr/share/groff_font/devlj4/UCBI
 OLD_FILES+=usr/share/groff_font/devlj4/UCI
 OLD_FILES+=usr/share/groff_font/devlj4/UCR
 OLD_FILES+=usr/share/groff_font/devlj4/UI
 OLD_FILES+=usr/share/groff_font/devlj4/UR
 OLD_FILES+=usr/share/groff_font/devlj4/WINGDINGS
 OLD_DIRS+=usr/share/groff_font/devlj4
 OLD_FILES+=usr/share/groff_font/devps/AB
 OLD_FILES+=usr/share/groff_font/devps/ABI
 OLD_FILES+=usr/share/groff_font/devps/AI
 OLD_FILES+=usr/share/groff_font/devps/AR
 OLD_FILES+=usr/share/groff_font/devps/BMB
 OLD_FILES+=usr/share/groff_font/devps/BMBI
 OLD_FILES+=usr/share/groff_font/devps/BMI
 OLD_FILES+=usr/share/groff_font/devps/BMR
 OLD_FILES+=usr/share/groff_font/devps/CB
 OLD_FILES+=usr/share/groff_font/devps/CBI
 OLD_FILES+=usr/share/groff_font/devps/CI
 OLD_FILES+=usr/share/groff_font/devps/CR
 OLD_FILES+=usr/share/groff_font/devps/DESC
 OLD_FILES+=usr/share/groff_font/devps/EURO
 OLD_FILES+=usr/share/groff_font/devps/HB
 OLD_FILES+=usr/share/groff_font/devps/HBI
 OLD_FILES+=usr/share/groff_font/devps/HI
 OLD_FILES+=usr/share/groff_font/devps/HNB
 OLD_FILES+=usr/share/groff_font/devps/HNBI
 OLD_FILES+=usr/share/groff_font/devps/HNI
 OLD_FILES+=usr/share/groff_font/devps/HNR
 OLD_FILES+=usr/share/groff_font/devps/HR
 OLD_FILES+=usr/share/groff_font/devps/Makefile
 OLD_FILES+=usr/share/groff_font/devps/NB
 OLD_FILES+=usr/share/groff_font/devps/NBI
 OLD_FILES+=usr/share/groff_font/devps/NI
 OLD_FILES+=usr/share/groff_font/devps/NR
 OLD_FILES+=usr/share/groff_font/devps/PB
 OLD_FILES+=usr/share/groff_font/devps/PBI
 OLD_FILES+=usr/share/groff_font/devps/PI
 OLD_FILES+=usr/share/groff_font/devps/PR
 OLD_FILES+=usr/share/groff_font/devps/S
 OLD_FILES+=usr/share/groff_font/devps/SS
 OLD_FILES+=usr/share/groff_font/devps/TB
 OLD_FILES+=usr/share/groff_font/devps/TBI
 OLD_FILES+=usr/share/groff_font/devps/TI
 OLD_FILES+=usr/share/groff_font/devps/TR
 OLD_FILES+=usr/share/groff_font/devps/ZCMI
 OLD_FILES+=usr/share/groff_font/devps/ZD
 OLD_FILES+=usr/share/groff_font/devps/ZDR
 OLD_FILES+=usr/share/groff_font/devps/afmname
 OLD_FILES+=usr/share/groff_font/devps/dingbats.map
 OLD_FILES+=usr/share/groff_font/devps/dingbats.rmap
 OLD_FILES+=usr/share/groff_font/devps/download
 OLD_FILES+=usr/share/groff_font/devps/freeeuro.pfa
 OLD_FILES+=usr/share/groff_font/devps/lgreekmap
 OLD_FILES+=usr/share/groff_font/devps/prologue
 OLD_FILES+=usr/share/groff_font/devps/symbol.sed
 OLD_FILES+=usr/share/groff_font/devps/symbolchars
 OLD_FILES+=usr/share/groff_font/devps/symbolsl.afm
 OLD_FILES+=usr/share/groff_font/devps/symbolsl.pfa
 OLD_FILES+=usr/share/groff_font/devps/text.enc
 OLD_FILES+=usr/share/groff_font/devps/textmap
 OLD_FILES+=usr/share/groff_font/devps/zapfdr.pfa
 OLD_DIRS+=usr/share/groff_font/devps
 OLD_FILES+=usr/share/groff_font/devutf8/B
 OLD_FILES+=usr/share/groff_font/devutf8/BI
 OLD_FILES+=usr/share/groff_font/devutf8/CW
 OLD_FILES+=usr/share/groff_font/devutf8/DESC
 OLD_FILES+=usr/share/groff_font/devutf8/I
 OLD_FILES+=usr/share/groff_font/devutf8/L
 OLD_FILES+=usr/share/groff_font/devutf8/R
 OLD_FILES+=usr/share/groff_font/devutf8/S
 OLD_DIRS+=usr/share/groff_font/devutf8
 OLD_DIRS+=usr/share/groff_font
 OLD_FILES+=usr/share/man/man1/addftinfo.1.gz
 OLD_FILES+=usr/share/man/man1/afmtodit.1.gz
 OLD_FILES+=usr/share/man/man1/checknr.1.gz
 OLD_FILES+=usr/share/man/man1/colcrt.1.gz
 OLD_FILES+=usr/share/man/man1/eqn.1.gz
 OLD_FILES+=usr/share/man/man1/grn.1.gz
 OLD_FILES+=usr/share/man/man1/grodvi.1.gz
 OLD_FILES+=usr/share/man/man1/groff.1.gz
 OLD_FILES+=usr/share/man/man1/grog.1.gz
 OLD_FILES+=usr/share/man/man1/grolbp.1.gz
 OLD_FILES+=usr/share/man/man1/grolj4.1.gz
 OLD_FILES+=usr/share/man/man1/grops.1.gz
 OLD_FILES+=usr/share/man/man1/grotty.1.gz
 OLD_FILES+=usr/share/man/man1/hpftodit.1.gz
 OLD_FILES+=usr/share/man/man1/indxbib.1.gz
 OLD_FILES+=usr/share/man/man1/lkbib.1.gz
 OLD_FILES+=usr/share/man/man1/lookbib.1.gz
 OLD_FILES+=usr/share/man/man1/mmroff.1.gz
 OLD_FILES+=usr/share/man/man1/neqn.1.gz
 OLD_FILES+=usr/share/man/man1/nroff.1.gz
 OLD_FILES+=usr/share/man/man1/pfbtops.1.gz
 OLD_FILES+=usr/share/man/man1/pic.1.gz
 OLD_FILES+=usr/share/man/man1/psroff.1.gz
 OLD_FILES+=usr/share/man/man1/refer.1.gz
 OLD_FILES+=usr/share/man/man1/tbl.1.gz
 OLD_FILES+=usr/share/man/man1/tfmtodit.1.gz
 OLD_FILES+=usr/share/man/man1/troff.1.gz
 OLD_FILES+=usr/share/man/man1/vgrind.1.gz
 OLD_FILES+=usr/share/man/man5/groff_font.5.gz
 OLD_FILES+=usr/share/man/man5/groff_out.5.gz
 OLD_FILES+=usr/share/man/man5/groff_tmac.5.gz
 OLD_FILES+=usr/share/man/man5/lj4_font.5.gz
 OLD_FILES+=usr/share/man/man5/tmac.5.gz
 OLD_FILES+=usr/share/man/man5/vgrindefs.5.gz
 OLD_FILES+=usr/share/man/man7/ditroff.7.gz
 OLD_FILES+=usr/share/man/man7/groff.7.gz
 OLD_FILES+=usr/share/man/man7/groff_char.7.gz
 OLD_FILES+=usr/share/man/man7/groff_diff.7.gz
 OLD_FILES+=usr/share/man/man7/groff_man.7.gz
 OLD_FILES+=usr/share/man/man7/groff_mdoc.7.gz
 OLD_FILES+=usr/share/man/man7/groff_me.7.gz
 OLD_FILES+=usr/share/man/man7/groff_mm.7.gz
 OLD_FILES+=usr/share/man/man7/groff_mmse.7.gz
 OLD_FILES+=usr/share/man/man7/groff_ms.7.gz
 OLD_FILES+=usr/share/man/man7/groff_trace.7.gz
 OLD_FILES+=usr/share/man/man7/groff_www.7.gz
 OLD_FILES+=usr/share/man/man7/mdoc.samples.7.gz
 OLD_FILES+=usr/share/man/man7/me.7.gz
 OLD_FILES+=usr/share/man/man7/mm.7.gz
 OLD_FILES+=usr/share/man/man7/mmse.7.gz
 OLD_FILES+=usr/share/man/man7/ms.7.gz
 OLD_FILES+=usr/share/man/man7/orig_me.7.gz
 OLD_FILES+=usr/share/me/acm.me
 OLD_FILES+=usr/share/me/chars.me
 OLD_FILES+=usr/share/me/deltext.me
 OLD_FILES+=usr/share/me/eqn.me
 OLD_FILES+=usr/share/me/float.me
 OLD_FILES+=usr/share/me/footnote.me
 OLD_FILES+=usr/share/me/index.me
 OLD_FILES+=usr/share/me/letterhead.me
 OLD_FILES+=usr/share/me/local.me
 OLD_FILES+=usr/share/me/null.me
 OLD_FILES+=usr/share/me/refer.me
 OLD_FILES+=usr/share/me/revisions
 OLD_FILES+=usr/share/me/sh.me
 OLD_FILES+=usr/share/me/tbl.me
 OLD_FILES+=usr/share/me/thesis.me
 OLD_DIRS+=usr/share/me
 OLD_FILES+=usr/share/misc/vgrindefs
 OLD_FILES+=usr/share/misc/vgrindefs.db
 OLD_FILES+=usr/share/tmac/X.tmac
 OLD_FILES+=usr/share/tmac/Xps.tmac
 OLD_FILES+=usr/share/tmac/a4.tmac
 OLD_FILES+=usr/share/tmac/an-old.tmac
 OLD_FILES+=usr/share/tmac/an.tmac
 OLD_FILES+=usr/share/tmac/andoc.tmac
 OLD_FILES+=usr/share/tmac/composite.tmac
 OLD_FILES+=usr/share/tmac/cp1047.tmac
 OLD_FILES+=usr/share/tmac/devtag.tmac
 OLD_FILES+=usr/share/tmac/doc.tmac
 OLD_FILES+=usr/share/tmac/dvi.tmac
 OLD_FILES+=usr/share/tmac/e.tmac
 OLD_FILES+=usr/share/tmac/ec.tmac
 OLD_FILES+=usr/share/tmac/eqnrc
 OLD_FILES+=usr/share/tmac/europs.tmac
 OLD_FILES+=usr/share/tmac/html-end.tmac
 OLD_FILES+=usr/share/tmac/html.tmac
 OLD_FILES+=usr/share/tmac/hyphen.ru
 OLD_FILES+=usr/share/tmac/hyphen.us
 OLD_FILES+=usr/share/tmac/hyphenex.us
 OLD_FILES+=usr/share/tmac/koi8-r.tmac
 OLD_FILES+=usr/share/tmac/latin1.tmac
 OLD_FILES+=usr/share/tmac/latin2.tmac
 OLD_FILES+=usr/share/tmac/latin9.tmac
 OLD_FILES+=usr/share/tmac/lbp.tmac
 OLD_FILES+=usr/share/tmac/lj4.tmac
 OLD_FILES+=usr/share/tmac/m.tmac
 OLD_FILES+=usr/share/tmac/man.local
 OLD_FILES+=usr/share/tmac/man.tmac
 OLD_FILES+=usr/share/tmac/mandoc.tmac
 OLD_FILES+=usr/share/tmac/mdoc.local
 OLD_FILES+=usr/share/tmac/mdoc.tmac
 OLD_FILES+=usr/share/tmac/mdoc/doc-common
 OLD_FILES+=usr/share/tmac/mdoc/doc-ditroff
 OLD_FILES+=usr/share/tmac/mdoc/doc-nroff
 OLD_FILES+=usr/share/tmac/mdoc/doc-syms
 OLD_FILES+=usr/share/tmac/mdoc/fr.ISO8859-1
 OLD_FILES+=usr/share/tmac/mdoc/ru.KOI8-R
 OLD_DIRS+=usr/share/tmac/mdoc
 OLD_FILES+=usr/share/tmac/me.tmac
 OLD_FILES+=usr/share/tmac/mm/0.MT
 OLD_FILES+=usr/share/tmac/mm/4.MT
 OLD_FILES+=usr/share/tmac/mm/5.MT
 OLD_FILES+=usr/share/tmac/mm/locale
 OLD_FILES+=usr/share/tmac/mm/mm.tmac
 OLD_FILES+=usr/share/tmac/mm/mmse.tmac
 OLD_FILES+=usr/share/tmac/mm/ms.cov
 OLD_FILES+=usr/share/tmac/mm/se_locale
 OLD_FILES+=usr/share/tmac/mm/se_ms.cov
 OLD_DIRS+=usr/share/tmac/mm
 OLD_FILES+=usr/share/tmac/ms.tmac
 OLD_FILES+=usr/share/tmac/mse.tmac
 OLD_FILES+=usr/share/tmac/papersize.tmac
 OLD_FILES+=usr/share/tmac/pic.tmac
 OLD_FILES+=usr/share/tmac/ps.tmac
 OLD_FILES+=usr/share/tmac/psatk.tmac
 OLD_FILES+=usr/share/tmac/psold.tmac
 OLD_FILES+=usr/share/tmac/pspic.tmac
 OLD_FILES+=usr/share/tmac/s.tmac
 OLD_FILES+=usr/share/tmac/safer.tmac
 OLD_FILES+=usr/share/tmac/tmac.orig_me
 OLD_FILES+=usr/share/tmac/tmac.vgrind
 OLD_FILES+=usr/share/tmac/trace.tmac
 OLD_FILES+=usr/share/tmac/troffrc
 OLD_FILES+=usr/share/tmac/troffrc-end
 OLD_FILES+=usr/share/tmac/tty-char.tmac
 OLD_FILES+=usr/share/tmac/tty.tmac
 OLD_FILES+=usr/share/tmac/unicode.tmac
 OLD_FILES+=usr/share/tmac/www.tmac
 OLD_DIRS+=usr/share/tmac
 # 20170607: remove incorrect atf_check(1) manpage link
 OLD_FILES+=usr/share/man/man1/atf_check.1.gz
 # 20170601: remove stale manpage
 OLD_FILES+=usr/share/man/man2/cap_rights_get.2.gz
 # 20170601: old libifconfig and libifc
 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
 # 20170529: mount.conf(8) -> mount.conf(5)
 OLD_FILES+=usr/share/man/man8/mount.conf.8.gz
 # 20170525: remove misleading template
 OLD_FILES+=usr/share/misc/man.template
 # 20170525: disconnect the roff docs from the build
 OLD_FILES+=usr/share/doc/papers/beyond43.ascii.gz
 OLD_FILES+=usr/share/doc/papers/bio.ascii.gz
 OLD_FILES+=usr/share/doc/papers/contents.ascii.gz
 OLD_FILES+=usr/share/doc/papers/devfs.ascii.gz
 OLD_FILES+=usr/share/doc/papers/diskperf.ascii.gz
 OLD_FILES+=usr/share/doc/papers/fsinterface.ascii.gz
 OLD_FILES+=usr/share/doc/papers/hwpmc.ascii.gz
 OLD_FILES+=usr/share/doc/papers/jail.ascii.gz
 OLD_FILES+=usr/share/doc/papers/kernmalloc.ascii.gz
 OLD_FILES+=usr/share/doc/papers/kerntune.ascii.gz
 OLD_FILES+=usr/share/doc/papers/malloc.ascii.gz
 OLD_FILES+=usr/share/doc/papers/newvm.ascii.gz
 OLD_FILES+=usr/share/doc/papers/releng.ascii.gz
 OLD_FILES+=usr/share/doc/papers/sysperf.ascii.gz
 OLD_FILES+=usr/share/doc/papers/timecounter.ascii.gz
 OLD_DIRS+=usr/share/doc/papers
 OLD_FILES+=usr/share/doc/psd/01.cacm/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/01.cacm
 OLD_FILES+=usr/share/doc/psd/02.implement/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/02.implement
 OLD_FILES+=usr/share/doc/psd/03.iosys/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/03.iosys
 OLD_FILES+=usr/share/doc/psd/04.uprog/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/04.uprog
 OLD_FILES+=usr/share/doc/psd/05.sysman/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/05.sysman
 OLD_FILES+=usr/share/doc/psd/06.Clang/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/06.Clang
 OLD_FILES+=usr/share/doc/psd/12.make/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/12.make
 OLD_FILES+=usr/share/doc/psd/13.rcs/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/13.rcs
 OLD_FILES+=usr/share/doc/psd/13.rcs/rcs_func.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/13.rcs
 OLD_FILES+=usr/share/doc/psd/15.yacc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/15.yacc
 OLD_FILES+=usr/share/doc/psd/16.lex/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/16.lex
 OLD_FILES+=usr/share/doc/psd/17.m4/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/17.m4
 OLD_FILES+=usr/share/doc/psd/18.gprof/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/18.gprof
 OLD_FILES+=usr/share/doc/psd/20.ipctut/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/20.ipctut
 OLD_FILES+=usr/share/doc/psd/21.ipc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/21.ipc
 OLD_FILES+=usr/share/doc/psd/22.rpcgen/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/22.rpcgen
 OLD_FILES+=usr/share/doc/psd/23.rpc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/23.rpc
 OLD_FILES+=usr/share/doc/psd/24.xdr/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/24.xdr
 OLD_FILES+=usr/share/doc/psd/25.xdrrfc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/25.xdrrfc
 OLD_FILES+=usr/share/doc/psd/26.rpcrfc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/26.rpcrfc
 OLD_FILES+=usr/share/doc/psd/27.nfsrfc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/27.nfsrfc
 OLD_FILES+=usr/share/doc/psd/Title.ascii.gz
 OLD_FILES+=usr/share/doc/psd/contents.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/
 OLD_FILES+=usr/share/doc/smm/01.setup/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/01.setup
 OLD_FILES+=usr/share/doc/smm/02.config/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/02.config
 OLD_FILES+=usr/share/doc/smm/03.fsck/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/03.fsck
 OLD_FILES+=usr/share/doc/smm/04.quotas/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/04.quotas
 OLD_FILES+=usr/share/doc/smm/05.fastfs/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/05.fastfs
 OLD_FILES+=usr/share/doc/smm/06.nfs/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/06.nfs
 OLD_FILES+=usr/share/doc/smm/07.lpd/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/07.lpd
 OLD_FILES+=usr/share/doc/smm/08.sendmailop/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/08.sendmailop
 OLD_FILES+=usr/share/doc/smm/11.timedop/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/11.timedop
 OLD_FILES+=usr/share/doc/smm/12.timed/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/12.timed
 OLD_FILES+=usr/share/doc/smm/18.net/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/18.net
 OLD_FILES+=usr/share/doc/smm/Title.ascii.gz
 OLD_FILES+=usr/share/doc/smm/contents.ascii.gz
 OLD_DIRS+=usr/share/doc/smm
 OLD_FILES+=usr/share/doc/usd/04.csh/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/04.csh
 OLD_FILES+=usr/share/doc/usd/05.dc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/05.dc
 OLD_FILES+=usr/share/doc/usd/06.bc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/06.bc
 OLD_FILES+=usr/share/doc/usd/07.mail/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/07.mail
 OLD_FILES+=usr/share/doc/usd/10.exref/paper.ascii.gz
 OLD_FILES+=usr/share/doc/usd/10.exref/summary.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/10.exref
 OLD_FILES+=usr/share/doc/usd/11.edit/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/11.edit
 OLD_FILES+=usr/share/doc/usd/12.vi/paper.ascii.gz
 OLD_FILES+=usr/share/doc/usd/12.vi/summary.ascii.gz
 OLD_FILES+=usr/share/doc/usd/12.vi/viapwh.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/12.vi
 OLD_FILES+=usr/share/doc/usd/13.viref/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/13.viref
 OLD_FILES+=usr/share/doc/usd/18.msdiffs/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/18.msdiffs
 OLD_FILES+=usr/share/doc/usd/19.memacros/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/19.memacros
 OLD_FILES+=usr/share/doc/usd/20.meref/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/20.meref
 OLD_FILES+=usr/share/doc/usd/21.troff/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/21.troff
 OLD_FILES+=usr/share/doc/usd/22.trofftut/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/22.trofftut
 OLD_FILES+=usr/share/doc/usd/Title.ascii.gz
 OLD_FILES+=usr/share/doc/usd/contents.ascii.gz
 OLD_DIRS+=usr/share/doc/usd
 # 20170523: 64-bit inode support, library version bumps
 OLD_LIBS+=lib/libzfs.so.2
 OLD_LIBS+=usr/lib/libarchive.so.6
 OLD_LIBS+=usr/lib/libmilter.so.5
 # 20170427: NATM configuration support removed
 OLD_FILES+=etc/rc.d/atm1
 OLD_FILES+=etc/rc.d/atm2
 OLD_FILES+=etc/rc.d/atm3
 OLD_FILES+=usr/share/man/man8/rc.atm.8.gz
 # 20170426: UMA_ZONE_REFCNT removed
 OLD_FILES+=usr/share/man/man9/uma_find_refcnt.9.gz
 # 20170424: NATM support removed
 OLD_FILES+=rescue/atmconfig
 OLD_FILES+=sbin/atmconfig
 OLD_FILES+=usr/include/bsnmp/snmp_atm.h
 OLD_FILES+=usr/include/dev/utopia/idtphy.h
 OLD_FILES+=usr/include/dev/utopia/suni.h
 OLD_FILES+=usr/include/dev/utopia/utopia.h
 OLD_FILES+=usr/include/dev/utopia/utopia_priv.h
 OLD_DIRS+=usr/include/dev/utopia
 OLD_FILES+=usr/include/net/if_atm.h
 OLD_FILES+=usr/include/netgraph/atm/ng_atm.h
 OLD_FILES+=usr/include/netinet/if_atm.h
 OLD_FILES+=usr/include/netnatm/natm.h
 OLD_FILES+=usr/lib/snmp_atm.so
 OLD_LIBS+=usr/lib/snmp_atm.so.6
 OLD_FILES+=usr/share/doc/atm/atmconfig.help
 OLD_FILES+=usr/share/doc/atm/atmconfig_device.help
 OLD_DIRS+=usr/share/doc/atm
 OLD_FILES+=usr/share/man/man3/snmp_atm.3.gz
 OLD_FILES+=usr/share/man/man4/en.4.gz
 OLD_FILES+=usr/share/man/man4/fatm.4.gz
 OLD_FILES+=usr/share/man/man4/hatm.4.gz
 OLD_FILES+=usr/share/man/man4/if_en.4.gz
 OLD_FILES+=usr/share/man/man4/if_fatm.4.gz
 OLD_FILES+=usr/share/man/man4/if_hatm.4.gz
 OLD_FILES+=usr/share/man/man4/if_patm.4.gz
 OLD_FILES+=usr/share/man/man4/natm.4.gz
 OLD_FILES+=usr/share/man/man4/natmip.4.gz
 OLD_FILES+=usr/share/man/man4/ng_atm.4.gz
 OLD_FILES+=usr/share/man/man4/patm.4.gz
 OLD_FILES+=usr/share/man/man4/utopia.4.gz
 OLD_FILES+=usr/share/man/man8/atmconfig.8.gz
 OLD_FILES+=usr/share/man/man9/utopia.9.gz
 OLD_FILES+=usr/share/snmp/defs/atm_freebsd.def
 OLD_FILES+=usr/share/snmp/defs/atm_tree.def
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM-FREEBSD-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM.txt
 # 20170420: remove GNU diff
 OLD_FILES+=usr/share/man/man7/diff.7.gz
 # 20170322: rename <x> to <x>_test to match the FreeBSD test suite name scheme
 OLD_FILES+=usr/tests/usr.bin/col/col
 OLD_FILES+=usr/tests/usr.bin/diff/diff
 OLD_FILES+=usr/tests/usr.bin/ident/ident
 OLD_FILES+=usr/tests/usr.bin/mkimg/mkimg
 OLD_FILES+=usr/tests/usr.bin/sdiff/sdiff
 OLD_FILES+=usr/tests/usr.bin/soelim/soelim
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_config
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_etcdir
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_groupadd
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_groupdel
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_groupmod
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_lock
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_useradd
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_userdel
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_usermod
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_usernext
 # 20170319: io_test requires zh_TW.Big5 locale
 OLD_FILES+=usr/tests/lib/libc/locale/io_test
 # 20170319: remove nls for non supported Big5* locales
 OLD_DIRS+=usr/share/nls/zh_HK.Big5HKSCS
 OLD_DIRS+=usr/share/nls/zh_TW.Big5
 # 20170313: move .../sys/geom/eli/... to .../sys/geom/class/eli/...
 OLD_FILES+=usr/tests/sys/geom/eli/pbkdf2/pbkdf2
 OLD_FILES+=usr/tests/sys/geom/eli/pbkdf2/Kyuafile
 OLD_FILES+=usr/tests/sys/geom/eli/Kyuafile
 OLD_DIRS+=usr/tests/sys/geom/eli/pbkdf2
 OLD_DIRS+=usr/tests/sys/geom/eli
 # 20170313: sbin/ipftest and ipresend temporarily disconnected
 OLD_FILES+=sbin/ipftest
 OLD_FILES+=sbin/ipresend
 OLD_FILES+=usr/share/man/man1/ipftest.1.gz
 OLD_FILES+=usr/share/man/man1/ipresend.1.gz
 # 20170311: Remove WITHOUT_MANDOCDB option
 OLD_FILES+=usr/share/man/man1/makewhatis.1.gz
 # 20170308: rename some tests
 OLD_FILES+=usr/tests/bin/pwait/pwait
 OLD_FILES+=usr/tests/usr.bin/timeout/timeout
 # 20170307: remove pcap-int.h
 OLD_FILES+=usr/include/pcap-int.h
 # 20170302: new libc++ import which bumps version from 3.9.1 to 4.0.0
 OLD_FILES+=usr/include/c++/v1/__undef___deallocate
 OLD_FILES+=usr/include/c++/v1/tr1/__undef___deallocate
 # 20170302: new clang import which bumps version from 3.9.1 to 4.0.0
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/3.9.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/3.9.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/3.9.1/include/msa.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/3.9.1/include
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.9.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.9.1/lib
 OLD_DIRS+=usr/lib/clang/3.9.1
 # 20170226: SVR4 compatibility removed
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/share/man/man4/streams.4
 OLD_FILES+=usr/share/man/man4/svr4.4
 .endif
 # 20170219: OpenPAM RADULA upgrade removed the libpam tests
 OLD_FILES+=usr/tests/lib/libpam/Kyuafile
 OLD_FILES+=usr/tests/lib/libpam/t_openpam_ctype
 OLD_FILES+=usr/tests/lib/libpam/t_openpam_readlinev
 OLD_FILES+=usr/tests/lib/libpam/t_openpam_readword
 OLD_DIRS+=usr/test/lib/libpam
 # 20170216: remove ahb(4)
 OLD_FILES+=usr/share/man/man4/ahb.4.gz
 # 20170216: remove fea(4)
 OLD_FILES+=usr/share/man/man4/fea.4.gz
 # 20170206: remove bdes(1)
 OLD_FILES+=usr/bin/bdes
 OLD_FILES+=usr/share/man/man1/bdes.1.gz
 # 20170206: merged projects/ipsec
 OLD_FILES+=usr/include/netinet/ip_ipsec.h
 OLD_FILES+=usr/include/netinet6/ip6_ipsec.h
 # 20170128: remove pc98 support
 OLD_FILES+=usr/include/dev/ic/i8251.h
 OLD_FILES+=usr/include/dev/ic/i8255.h
 OLD_FILES+=usr/include/dev/ic/rsa.h
 OLD_FILES+=usr/include/dev/ic/wd33c93reg.h
 OLD_FILES+=usr/include/sys/disk/pc98.h
 OLD_FILES+=usr/include/sys/diskpc98.h
 OLD_FILES+=usr/share/man/man4/i386/ct.4.gz
 OLD_FILES+=usr/share/man/man4/i386/snc.4.gz
 OLD_FILES+=usr/share/syscons/keymaps/jp.pc98.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/jp.pc98.kbd
 OLD_FILES+=usr/share/vt/keymaps/jp.pc98.iso.kbd
 OLD_FILES+=usr/share/vt/keymaps/jp.pc98.kbd
 # 20170110: Four files from ggate tests consolidated into one
 OLD_FILES+=usr/tests/sys/geom/class/gate/1_test
 OLD_FILES+=usr/tests/sys/geom/class/gate/2_test
 OLD_FILES+=usr/tests/sys/geom/class/gate/3_test
 OLD_FILES+=usr/tests/sys/geom/class/gate/conf.sh
 # 20170103: libbsnmptools.so made into an INTERNALLIB
 OLD_FILES+=usr/lib/libbsnmptools.a
 OLD_FILES+=usr/lib/libbsnmptools_p.a
 OLD_LIBS+=usr/lib/libbsnmptools.so.0
 OLD_FILES+=usr/lib/libbsnmptools.so
 # 20170102: sysdecode_getfsstat_flags() renamed to sysdecode_getfsstat_mode()
 OLD_FILES+=usr/share/man/man3/sysdecode_getfsstat_flags.3.gz
 # 20161230: libarchive ACL pax test renamed to test_acl_pax_posix1e.tar.uu
 OLD_FILES+=usr/tests/lib/libarchive/test_acl_pax.tar.uu
 # 20161229: Three files from gnop tests consolidated into one
 OLD_FILES+=usr/tests/sys/geom/class/nop/1_test
 OLD_FILES+=usr/tests/sys/geom/class/nop/2_test
 OLD_FILES+=usr/tests/sys/geom/class/nop/conf.sh
 # 20161217: new clang import which bumps version from 3.9.0 to 3.9.1
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/3.9.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/3.9.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/3.9.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/3.9.0/include
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.9.0/lib/freebsd
 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
 # 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
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/3.8.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/3.8.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/3.8.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/3.8.0/include
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.8.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.8.0/lib
 OLD_DIRS+=usr/lib/clang/3.8.0
 # 20161121: Hyper-V manuals only apply to amd64 and i386
 .if ${TARGET_ARCH} != "amd64" && ${TARGET_ARCH} != "i386"
 OLD_FILES+=usr/share/man/man4/hv_kvp.4.gz
 OLD_FILES+=usr/share/man/man4/hv_netvsc.4.gz
 OLD_FILES+=usr/share/man/man4/hv_storvsc.4.gz
 OLD_FILES+=usr/share/man/man4/hv_utils.4.gz
 OLD_FILES+=usr/share/man/man4/hv_vmbus.4.gz
 OLD_FILES+=usr/share/man/man4/hv_vss.4.gz
 .endif
 # 20161118: Remove hv_ata_pci_disengage(4)
 OLD_FILES+=usr/share/man/man4/hv_ata_pci_disengage.4.gz
 # 20161017: urtwn(4) was merged into rtwn(4)
 OLD_FILES+=usr/share/man/man4/if_urtwn.4.gz
 OLD_FILES+=usr/share/man/man4/urtwn.4.gz
 OLD_FILES+=usr/share/man/man4/urtwnfw.4.gz
 # 20161015: Remove GNU rcs
 OLD_FILES+=usr/bin/ci
 OLD_FILES+=usr/bin/co
 OLD_FILES+=usr/bin/merge
 OLD_FILES+=usr/bin/rcs
 OLD_FILES+=usr/bin/rcsclean
 OLD_FILES+=usr/bin/rcsdiff
 OLD_FILES+=usr/bin/rcsfreeze
 OLD_FILES+=usr/bin/rcsmerge
 OLD_FILES+=usr/bin/rlog
 OLD_FILES+=usr/share/doc/psd/13.rcs/paper.ascii.gz
 OLD_FILES+=usr/share/doc/psd/13.rcs/rcs_func.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/13.rcs
 OLD_FILES+=usr/share/man/man1/ci.1.gz
 OLD_FILES+=usr/share/man/man1/co.1.gz
 OLD_FILES+=usr/share/man/man1/merge.1.gz
 OLD_FILES+=usr/share/man/man1/rcs.1.gz
 OLD_FILES+=usr/share/man/man1/rcsclean.1.gz
 OLD_FILES+=usr/share/man/man1/rcsdiff.1.gz
 OLD_FILES+=usr/share/man/man1/rcsfreeze.1.gz
 OLD_FILES+=usr/share/man/man1/rcsintro.1.gz
 OLD_FILES+=usr/share/man/man1/rcsmerge.1.gz
 OLD_FILES+=usr/share/man/man1/rlog.1.gz
 OLD_FILES+=usr/share/man/man5/rcsfile.5.gz
 # 20161010: remove link to removed m_getclr(9) macro
 OLD_FILES+=usr/share/man/man9/m_getclr.9.gz
 # 20161003: MK_ELFCOPY_AS_OBJCOPY option retired
 OLD_FILES+=usr/bin/elfcopy
 OLD_FILES+=usr/share/man/man1/elfcopy.1.gz
 # 20160906: libkqueue tests moved to /usr/tests/sys/kqueue/libkqueue
 OLD_FILES+=usr/tests/sys/kqueue/kqtest
 OLD_FILES+=usr/tests/sys/kqueue/kqueue_test
 # 20160903: idle page zeroing support removed
 OLD_FILES+=usr/share/man/man9/pmap_zero_idle.9.gz
 # 20160901: Remove digi(4)
 OLD_FILES+=usr/share/man/man4/digi.4.gz
 # 20160819: Remove ie(4)
 OLD_FILES+=usr/share/man/man4/i386/ie.4.gz
 # 20160819: Remove spic(4)
 OLD_FILES+=usr/share/man/man4/spic.4.gz
 # 20160819: Remove wl(4) and wlconfig(8)
 OLD_FILES+=usr/share/man/man4/i386/wl.4.gz
 OLD_FILES+=usr/sbin/wlconfig
 OLD_FILES+=usr/share/man/man8/i386/wlconfig.8.gz
 # 20160819: Remove si(4) and sicontrol(8)
 OLD_FILES+=usr/share/man/man4/si.4.gz
 OLD_FILES+=usr/sbin/sicontrol
 OLD_FILES+=usr/share/man/man8/sicontrol.8.gz
 # 20160819: Remove scd(4)
 OLD_FILES+=usr/share/man/man4/scd.4.gz
 # 20160815: Remove mcd(4)
 OLD_FILES+=usr/share/man/man4/mcd.4.gz
 # 20160805: lockmgr_waiters(9) removed
 OLD_FILES+=usr/share/man/man9/lockmgr_waiters.9.gz
 # 20160703: POSIXify locales with variants
 OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hant_TW.UTF-8
 OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hant_TW.Big5
 OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hant_HK.UTF-8
 OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hans_CN.eucCN
 OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hans_CN.UTF-8
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hans_CN.GBK
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hans_CN.GB2312
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hans_CN.GB18030
 OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/sr_Latn_RS.UTF-8
 OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_TIME
 OLD_DIRS+=usr/share/locale/sr_Latn_RS.ISO8859-2
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/sr_Cyrl_RS.UTF-8
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_TIME
 OLD_DIRS+=usr/share/locale/sr_Cyrl_RS.ISO8859-5
 OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/mn_Cyrl_MN.UTF-8
 OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/kk_Cyrl_KZ.UTF-8
 # 20160608: removed pam_verbose_error
 OLD_LIBS+=usr/lib/libpam.so.5
 OLD_LIBS+=usr/lib/pam_chroot.so.5
 OLD_LIBS+=usr/lib/pam_deny.so.5
 OLD_LIBS+=usr/lib/pam_echo.so.5
 OLD_LIBS+=usr/lib/pam_exec.so.5
 OLD_LIBS+=usr/lib/pam_ftpusers.so.5
 OLD_LIBS+=usr/lib/pam_group.so.5
 OLD_LIBS+=usr/lib/pam_guest.so.5
 OLD_LIBS+=usr/lib/pam_krb5.so.5
 OLD_LIBS+=usr/lib/pam_ksu.so.5
 OLD_LIBS+=usr/lib/pam_lastlog.so.5
 OLD_LIBS+=usr/lib/pam_login_access.so.5
 OLD_LIBS+=usr/lib/pam_nologin.so.5
 OLD_LIBS+=usr/lib/pam_opie.so.5
 OLD_LIBS+=usr/lib/pam_opieaccess.so.5
 OLD_LIBS+=usr/lib/pam_passwdqc.so.5
 OLD_LIBS+=usr/lib/pam_permit.so.5
 OLD_LIBS+=usr/lib/pam_radius.so.5
 OLD_LIBS+=usr/lib/pam_rhosts.so.5
 OLD_LIBS+=usr/lib/pam_rootok.so.5
 OLD_LIBS+=usr/lib/pam_securetty.so.5
 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
 # 20160523: remove extranous ALTQ files
 OLD_FILES+=usr/include/altq/altq_codel.h
 OLD_FILES+=usr/include/altq/altq_fairq.h
 # 20160519: remove DTrace Toolkit from base
 OLD_FILES+=usr/sbin/dtruss
 OLD_FILES+=usr/share/dtrace/toolkit/execsnoop
 OLD_FILES+=usr/share/dtrace/toolkit/hotkernel
 OLD_FILES+=usr/share/dtrace/toolkit/hotuser
 OLD_FILES+=usr/share/dtrace/toolkit/opensnoop
 OLD_FILES+=usr/share/dtrace/toolkit/procsystime
 OLD_DIRS+=usr/share/dtrace/toolkit
 OLD_FILES+=usr/share/man/man1/dtruss.1.gz
 # 20160519: stale MLINK removed
 OLD_FILES+=usr/share/man/man9/rman_await_resource.9.gz
 # 20160517: ReiserFS removed
 OLD_FILES+=usr/share/man/man5/reiserfs.5.gz
 # 20160504: tests rework
 OLD_FILES+=usr/tests/lib/libc/regex/data/README
 # 20160430: kvm_getfiles(3) removed from kvm(3)
 OLD_LIBS+=lib/libkvm.so.6
 OLD_FILES+=usr/share/man/man3/kvm_getfiles.3.gz
 # 20160423: remove mroute6d
 OLD_FILES+=etc/rc.d/mroute6d
 # 20160419: rename units.lib -> definitions.units
 OLD_FILES+=usr/share/misc/units.lib
 # 20160419: remove Big5HKSCS locales
 OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_HK.Big5HKSCS
 OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_NUMERIC
 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
 # 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
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/3.7.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/3.7.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/3.7.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/3.7.1/include
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.7.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.7.1/lib
 OLD_DIRS+=usr/lib/clang/3.7.1
 OLD_FILES+=usr/share/man/man1/tblgen.1.gz
 # 20160301: Remove taskqueue_enqueue_fast
 OLD_FILES+=usr/share/man/man9/taskqueue_enqueue_fast.9.gz
 # 20160225: Remove casperd and libcapsicum
 OLD_FILES+=sbin/casperd
 OLD_FILES+=etc/rc.d/casperd
 OLD_FILES+=usr/share/man/man8/casperd.8.gz
 OLD_FILES+=usr/include/libcapsicum.h
 OLD_FILES+=usr/include/libcapsicum_service.h
 OLD_FILES+=usr/include/libcapsicum.h
 OLD_FILES+=usr/share/man/man3/libcapsicum.3.gz
 OLD_FILES+=usr/include/libcapsicum_dns.h
 OLD_FILES+=usr/include/libcapsicum_grp.h
 OLD_FILES+=usr/include/libcapsicum_impl.h
 OLD_FILES+=usr/include/libcapsicum_pwd.h
 OLD_FILES+=usr/include/libcapsicum_random.h
 OLD_FILES+=usr/include/libcapsicum_sysctl.h
 OLD_FILES+=libexec/casper/dns
 OLD_FILES+=libexec/casper/grp
 OLD_FILES+=libexec/casper/pwd
 OLD_FILES+=libexec/casper/random
 OLD_FILES+=libexec/casper/sysctl
 OLD_FILES+=libexec/casper/.debug/random.debug
 OLD_FILES+=libexec/casper/.debug/dns.debug
 OLD_FILES+=libexec/casper/.debug/sysctl.debug
 OLD_FILES+=libexec/casper/.debug/pwd.debug
 OLD_FILES+=libexec/casper/.debug/grp.debug
 OLD_DIRS+=libexec/casper/.debug
 OLD_DIRS+=libexec/casper
 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
 # 20160223: functionality from mkulzma(1) merged into mkuzip(1)
 OLD_FILES+=usr/bin/mkulzma
 OLD_FILES+=usr/share/man/man4/geom_uncompress.4.gz
 OLD_FILES+=usr/share/man/man8/mkulzma.8.gz
 # 20160211: Remove obsolete unbound-control-setup
 OLD_FILES+=usr/sbin/unbound-control-setup
 # 20160121: cc.h moved
 OLD_FILES+=usr/include/netinet/cc.h
 # 20160116: Update mandoc to cvs snapshot 20160116
 OLD_FILES+=usr/share/mdocml/example.style.css
 OLD_FILES+=usr/share/mdocml/style.css
 OLD_DIRS+=usr/share/mdocml
 # 20160114: SA-16:06.snmpd
 OLD_FILES+=usr/share/examples/etc/snmpd.config
 # 20160107: GNU ld installed as ld.bfd and linked as ld
 OLD_FILES+=usr/lib/debug/usr/bin/ld.debug
 # 20151225: new clang import which bumps version from 3.7.0 to 3.7.1
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/3.7.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/3.7.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/3.7.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/3.7.0/include
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.7.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.7.0/lib
 OLD_DIRS+=usr/lib/clang/3.7.0
 # 20151130: libelf moved from /usr/lib to /lib (libkvm dependency in r291406)
 MOVED_LIBS+=usr/lib/libelf.so.2
 # 20151115: Fox bad upgrade scheme
 OLD_FILES+=usr/share/locale/zh_CN.GB18030/zh_Hans_CN.GB18030
 OLD_FILES+=usr/share/locale/zh_CN.GB2312/zh_Hans_CN.GB2312
 OLD_FILES+=usr/share/locale/zh_CN.GBK/zh_Hans_CN.GBK
 OLD_FILES+=usr/share/locale/zh_CN.UTF-8/zh_Hans_CN.UTF-8
 OLD_FILES+=usr/share/locale/zh_CN.eucCN/zh_Hans_CN.eucCN
 OLD_FILES+=usr/share/locale/zh_TW.Big5/zh_Hant_TW.Big5
 OLD_FILES+=usr/share/locale/zh_TW.UTF-8/zh_Hant_TW.UTF-8
 # 20151107: String collation improvements
 OLD_FILES+=usr/share/locale/UTF-8/LC_CTYPE
 OLD_DIRS+=usr/share/locale/UTF-8
 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_COLLATE
 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_CTYPE
 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_MESSAGES
 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_MONETARY
 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_NUMERIC
 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_TIME
 OLD_DIRS+=usr/share/locale/kk_KZ.PT154/
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/la_LN.ISO8859-1
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-13/LC_COLLATE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-13/LC_CTYPE
 OLD_DIRS+=usr/share/locale/la_LN.ISO8859-13
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/la_LN.ISO8859-15
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-2/LC_TIME
 OLD_DIRS+=usr/share/locale/la_LN.ISO8859-2
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-4/LC_COLLATE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-4/LC_CTYPE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-4/LC_TIME
 OLD_DIRS+=usr/share/locale/la_LN.ISO8859-4
 OLD_FILES+=usr/share/locale/la_LN.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/la_LN.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/la_LN.US-ASCII/LC_TIME
 OLD_DIRS+=usr/share/locale/la_LN.US-ASCII
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_MESSAGES
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_TIME
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_COLLATE
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_MONETARY
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_CTYPE
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_NUMERIC
 OLD_DIRS+=usr/share/locale/lt_LT.ISO8859-4
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/no_NO.ISO8859-1
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/no_NO.ISO8859-15
 OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/no_NO.UTF-8
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_TIME
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_MONETARY
 OLD_DIRS+=usr/share/locale/sr_YU.ISO8859-2
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_TIME
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_MESSAGES
 OLD_DIRS+=usr/share/locale/sr_YU.ISO8859-5
 OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_MESSAGES
 OLD_DIRS+=usr/share/locale/sr_YU.UTF-8
 # 20151101: added missing _test suffix on multiple tests in lib/libc
 OLD_FILES+=usr/tests/lib/libc/c063/faccessat
 OLD_FILES+=usr/tests/lib/libc/c063/fchmodat
 OLD_FILES+=usr/tests/lib/libc/c063/fchownat
 OLD_FILES+=usr/tests/lib/libc/c063/fexecve
 OLD_FILES+=usr/tests/lib/libc/c063/fstatat
 OLD_FILES+=usr/tests/lib/libc/c063/linkat
 OLD_FILES+=usr/tests/lib/libc/c063/mkdirat
 OLD_FILES+=usr/tests/lib/libc/c063/mkfifoat
 OLD_FILES+=usr/tests/lib/libc/c063/mknodat
 OLD_FILES+=usr/tests/lib/libc/c063/openat
 OLD_FILES+=usr/tests/lib/libc/c063/readlinkat
 OLD_FILES+=usr/tests/lib/libc/c063/renameat
 OLD_FILES+=usr/tests/lib/libc/c063/symlinkat
 OLD_FILES+=usr/tests/lib/libc/c063/unlinkat
 OLD_FILES+=usr/tests/lib/libc/c063/utimensat
 OLD_FILES+=usr/tests/lib/libc/string/memchr
 OLD_FILES+=usr/tests/lib/libc/string/memcpy
 OLD_FILES+=usr/tests/lib/libc/string/memmem
 OLD_FILES+=usr/tests/lib/libc/string/memset
 OLD_FILES+=usr/tests/lib/libc/string/strcat
 OLD_FILES+=usr/tests/lib/libc/string/strchr
 OLD_FILES+=usr/tests/lib/libc/string/strcmp
 OLD_FILES+=usr/tests/lib/libc/string/strcpy
 OLD_FILES+=usr/tests/lib/libc/string/strcspn
 OLD_FILES+=usr/tests/lib/libc/string/strerror
 OLD_FILES+=usr/tests/lib/libc/string/strlen
 OLD_FILES+=usr/tests/lib/libc/string/strpbrk
 OLD_FILES+=usr/tests/lib/libc/string/strrchr
 OLD_FILES+=usr/tests/lib/libc/string/strspn
 OLD_FILES+=usr/tests/lib/libc/string/swab
 # 20151101: 430.status-rwho was renamed to 430.status-uptime
 OLD_FILES+=etc/periodic/daily/430.status-rwho
 # 20151030: OpenSSL 1.0.2d import
 OLD_FILES+=usr/share/openssl/man/man3/CMS_set1_signer_certs.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_ctrl.3.gz
 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
 # 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
 OLD_DIRS+=usr/tests/lib/atf/libatf-c++/.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/atf_c++_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/build_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/check_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/config_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/macros_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/tests_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/utils_test.debug
 OLD_DIRS+=usr/tests/lib/atf/libatf-c++/detail/.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/application_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/env_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/exceptions_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/fs_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/process_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/sanity_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/text_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/version_helper.debug
 OLD_DIRS+=usr/tests/lib/atf/libatf-c/.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/atf_c_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/build_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/check_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/config_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/error_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/macros_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/tc_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/tp_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/utils_test.debug
 OLD_DIRS+=usr/tests/lib/atf/libatf-c/detail/.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/dynstr_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/env_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/fs_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/list_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/map_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/process_helpers.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/process_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/sanity_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/text_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/user_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/version_helper.debug
 OLD_DIRS+=usr/tests/lib/atf/test-programs/.debug
 OLD_FILES+=usr/tests/lib/atf/test-programs/.debug/c_helpers.debug
 OLD_FILES+=usr/tests/lib/atf/test-programs/.debug/cpp_helpers.debug
 OLD_DIRS+=usr/tests/lib/libc/c063/.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/faccessat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/fchmodat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/fchownat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/fexecve.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/fstatat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/linkat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/mkdirat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/mkfifoat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/mknodat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/openat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/readlinkat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/renameat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/symlinkat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/unlinkat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/utimensat.debug
 OLD_DIRS+=usr/tests/lib/libc/db/.debug
 OLD_FILES+=usr/tests/lib/libc/db/.debug/h_db.debug
 OLD_DIRS+=usr/tests/lib/libc/gen/.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/alarm_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/arc4random_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/assert_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/basedirname_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/dir_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/floatunditf_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/fnmatch_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/fpclassify2_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/fpclassify_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/fpsetmask_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/fpsetround_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/ftok_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/getcwd_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/getgrent_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/glob_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/humanize_number_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/isnan_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/nice_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/pause_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/raise_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/realpath_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/setdomainname_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/sethostname_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/sleep_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/syslog_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/time_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/ttyname_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/vis_test.debug
 OLD_DIRS+=usr/tests/lib/libc/gen/execve/.debug
 OLD_FILES+=usr/tests/lib/libc/gen/execve/.debug/execve_test.debug
 OLD_DIRS+=usr/tests/lib/libc/gen/posix_spawn/.debug
 OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/fileactions_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/h_fileactions.debug
 OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/h_spawn.debug
 OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/h_spawnattr.debug
 OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/spawn_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/spawnattr_test.debug
 OLD_DIRS+=usr/tests/lib/libc/hash/.debug
 OLD_FILES+=usr/tests/lib/libc/hash/.debug/h_hash.debug
 OLD_FILES+=usr/tests/lib/libc/hash/.debug/sha2_test.debug
 OLD_DIRS+=usr/tests/lib/libc/inet/.debug
 OLD_FILES+=usr/tests/lib/libc/inet/.debug/inet_network_test.debug
 OLD_DIRS+=usr/tests/lib/libc/locale/.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/io_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/mbrtowc_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/mbsnrtowcs_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/mbstowcs_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/mbtowc_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/wcscspn_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/wcspbrk_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/wcsspn_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/wcstod_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/wctomb_test.debug
 OLD_DIRS+=usr/tests/lib/libc/net/.debug
 OLD_FILES+=usr/tests/lib/libc/net/.debug/ether_aton_test.debug
 OLD_FILES+=usr/tests/lib/libc/net/.debug/getprotoent_test.debug
 OLD_FILES+=usr/tests/lib/libc/net/.debug/h_dns_server.debug
 OLD_FILES+=usr/tests/lib/libc/net/.debug/h_nsd_recurse.debug
 OLD_FILES+=usr/tests/lib/libc/net/.debug/h_protoent.debug
 OLD_FILES+=usr/tests/lib/libc/net/.debug/h_servent.debug
 OLD_DIRS+=usr/tests/lib/libc/regex/.debug
 OLD_FILES+=usr/tests/lib/libc/regex/.debug/exhaust_test.debug
 OLD_FILES+=usr/tests/lib/libc/regex/.debug/h_regex.debug
 OLD_FILES+=usr/tests/lib/libc/regex/.debug/regex_att_test.debug
 OLD_DIRS+=usr/tests/lib/libc/ssp/.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_fgets.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_getcwd.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_gets.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_memcpy.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_memmove.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_memset.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_raw.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_read.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_readlink.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_snprintf.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_sprintf.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_stpcpy.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_stpncpy.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_strcat.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_strcpy.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_strncat.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_strncpy.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_vsnprintf.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_vsprintf.debug
 OLD_DIRS+=usr/tests/lib/libc/stdio/.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/clearerr_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/fflush_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/fmemopen2_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/fmemopen_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/fopen_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/fputc_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/mktemp_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/popen_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/printf_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/scanf_test.debug
 OLD_DIRS+=usr/tests/lib/libc/stdlib/.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/abs_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/atoi_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/div_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/exit_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/getenv_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/h_getopt.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/h_getopt_long.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/hsearch_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/posix_memalign_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/random_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/strtod_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/strtol_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/system_test.debug
 OLD_DIRS+=usr/tests/lib/libc/string/.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/memchr.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/memcpy.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/memmem.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/memset.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strcat.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strchr.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strcmp.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strcpy.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strcspn.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strerror.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strlen.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strpbrk.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strrchr.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strspn.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/swab.debug
 OLD_DIRS+=usr/tests/lib/libc/sys/.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/access_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/chroot_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/clock_gettime_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/connect_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/dup_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/fsync_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/getcontext_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/getgroups_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/getitimer_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/getlogin_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/getpid_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/getrusage_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/getsid_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/gettimeofday_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/issetugid_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/kevent_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/kill_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/link_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/listen_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/mincore_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/mkdir_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/mkfifo_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/mknod_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/mlock_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/mmap_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/mprotect_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/msgctl_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/msgget_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/msgrcv_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/msgsnd_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/msync_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/nanosleep_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/pipe2_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/pipe_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/poll_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/revoke_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/select_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/setrlimit_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/setuid_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/sigaction_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/sigqueue_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/sigtimedwait_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/socketpair_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/stat_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/timer_create_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/truncate_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/ucontext_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/umask_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/unlink_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/write_test.debug
 OLD_DIRS+=usr/tests/lib/libc/termios/.debug
 OLD_FILES+=usr/tests/lib/libc/termios/.debug/tcsetpgrp_test.debug
 OLD_DIRS+=usr/tests/lib/libc/tls/.debug
 OLD_FILES+=usr/tests/lib/libc/tls/.debug/h_tls_dlopen.so.debug
 OLD_FILES+=usr/tests/lib/libc/tls/.debug/libh_tls_dynamic.so.1.debug
 OLD_FILES+=usr/tests/lib/libc/tls/.debug/tls_dlopen_test.debug
 OLD_FILES+=usr/tests/lib/libc/tls/.debug/tls_dynamic_test.debug
 OLD_DIRS+=usr/tests/lib/libc/ttyio/.debug
 OLD_FILES+=usr/tests/lib/libc/ttyio/.debug/ttyio_test.debug
 OLD_DIRS+=usr/tests/lib/libcrypt/.debug
 OLD_FILES+=usr/tests/lib/libcrypt/.debug/crypt_tests.debug
 OLD_DIRS+=usr/tests/lib/libmp/.debug
 OLD_FILES+=usr/tests/lib/libmp/.debug/legacy_test.debug
 OLD_DIRS+=usr/tests/lib/libnv/.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/dnv_tests.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nv_array_tests.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nv_tests.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_add_test.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_exists_test.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_free_test.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_get_test.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_move_test.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_send_recv_test.debug
 OLD_DIRS+=usr/tests/lib/libpam/.debug
 OLD_FILES+=usr/tests/lib/libpam/.debug/t_openpam_ctype.debug
 OLD_FILES+=usr/tests/lib/libpam/.debug/t_openpam_readlinev.debug
 OLD_FILES+=usr/tests/lib/libpam/.debug/t_openpam_readword.debug
 OLD_DIRS+=usr/tests/lib/libproc/.debug
 OLD_FILES+=usr/tests/lib/libproc/.debug/proc_test.debug
 OLD_FILES+=usr/tests/lib/libproc/.debug/target_prog.debug
 OLD_DIRS+=usr/tests/lib/librt/.debug
 OLD_FILES+=usr/tests/lib/librt/.debug/sched_test.debug
 OLD_FILES+=usr/tests/lib/librt/.debug/sem_test.debug
 OLD_DIRS+=usr/tests/lib/libthr/.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/barrier_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/cond_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/condwait_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/detach_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/equal_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/fork_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/fpu_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/h_atexit.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/h_cancel.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/h_exit.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/h_resolv.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/join_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/kill_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/mutex_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/once_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/preempt_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/rwlock_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/sem_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/siglongjmp_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/sigmask_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/sigsuspend_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/sleep_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/swapcontext_test.debug
 OLD_DIRS+=usr/tests/lib/libthr/dlopen/.debug
 OLD_FILES+=usr/tests/lib/libthr/dlopen/.debug/dlopen_test.debug
 OLD_FILES+=usr/tests/lib/libthr/dlopen/.debug/h_pthread_dlopen.so.1.debug
 OLD_FILES+=usr/tests/lib/libthr/dlopen/.debug/main_pthread_create_test.debug
 OLD_DIRS+=usr/tests/lib/libutil/.debug
 OLD_FILES+=usr/tests/lib/libutil/.debug/flopen_test.debug
 OLD_FILES+=usr/tests/lib/libutil/.debug/grp_test.debug
 OLD_FILES+=usr/tests/lib/libutil/.debug/humanize_number_test.debug
 OLD_FILES+=usr/tests/lib/libutil/.debug/pidfile_test.debug
 OLD_FILES+=usr/tests/lib/libutil/.debug/trimdomain-nodomain_test.debug
 OLD_FILES+=usr/tests/lib/libutil/.debug/trimdomain_test.debug
 OLD_DIRS+=usr/tests/lib/libxo/.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/libenc_test.so.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_01.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_02.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_03.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_04.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_05.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_06.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_07.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_08.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_09.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_10.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_11.debug
 OLD_DIRS+=usr/tests/lib/msun/.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/acos_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/asin_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/atan_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/cbrt_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/ceil_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/cos_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/cosh_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/erf_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/exp_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/fmod_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/infinity_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/ldexp_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/log_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/pow_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/precision_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/round_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/scalbn_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/sin_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/sinh_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/sqrt_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/tan_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/tanh_test.debug
 OLD_DIRS+=usr/tests/libexec/rtld-elf/.debug
 OLD_FILES+=usr/tests/libexec/rtld-elf/.debug/ld_library_pathfds.debug
 OLD_FILES+=usr/tests/libexec/rtld-elf/.debug/libpythagoras.so.0.debug
 OLD_FILES+=usr/tests/libexec/rtld-elf/.debug/target.debug
 OLD_DIRS+=usr/tests/sbin/devd/.debug
 OLD_FILES+=usr/tests/sbin/devd/.debug/client_test.debug
 OLD_DIRS+=usr/tests/sbin/dhclient/.debug
 OLD_FILES+=usr/tests/sbin/dhclient/.debug/option-domain-search_test.debug
 OLD_DIRS+=usr/tests/share/examples/tests/atf/.debug
 OLD_FILES+=usr/tests/share/examples/tests/atf/.debug/printf_test.debug
 OLD_DIRS+=usr/tests/share/examples/tests/plain/.debug
 OLD_FILES+=usr/tests/share/examples/tests/plain/.debug/printf_test.debug
 OLD_DIRS+=usr/tests/sys/aio/.debug
 OLD_FILES+=usr/tests/sys/aio/.debug/aio_kqueue_test.debug
 OLD_FILES+=usr/tests/sys/aio/.debug/aio_test.debug
 OLD_FILES+=usr/tests/sys/aio/.debug/lio_kqueue_test.debug
 OLD_DIRS+=usr/tests/sys/fifo/.debug
 OLD_FILES+=usr/tests/sys/fifo/.debug/fifo_create.debug
 OLD_FILES+=usr/tests/sys/fifo/.debug/fifo_io.debug
 OLD_FILES+=usr/tests/sys/fifo/.debug/fifo_misc.debug
 OLD_FILES+=usr/tests/sys/fifo/.debug/fifo_open.debug
 OLD_DIRS+=usr/tests/sys/file/.debug
 OLD_FILES+=usr/tests/sys/file/.debug/closefrom_test.debug
 OLD_FILES+=usr/tests/sys/file/.debug/dup_test.debug
 OLD_FILES+=usr/tests/sys/file/.debug/fcntlflags_test.debug
 OLD_FILES+=usr/tests/sys/file/.debug/flock_helper.debug
 OLD_FILES+=usr/tests/sys/file/.debug/ftruncate_test.debug
 OLD_FILES+=usr/tests/sys/file/.debug/newfileops_on_fork_test.debug
 OLD_DIRS+=usr/tests/sys/kern/.debug
 OLD_FILES+=usr/tests/sys/kern/.debug/kern_descrip_test.debug
 OLD_FILES+=usr/tests/sys/kern/.debug/ptrace_test.debug
 OLD_FILES+=usr/tests/sys/kern/.debug/unix_seqpacket_test.debug
 OLD_DIRS+=usr/tests/sys/kern/execve/.debug
 OLD_FILES+=usr/tests/sys/kern/execve/.debug/execve_helper.debug
 OLD_FILES+=usr/tests/sys/kern/execve/.debug/good_aout.debug
 OLD_DIRS+=usr/tests/sys/kqueue/.debug
 OLD_FILES+=usr/tests/sys/kqueue/.debug/kqtest.debug
 OLD_DIRS+=usr/tests/sys/mqueue/.debug
 OLD_FILES+=usr/tests/sys/mqueue/.debug/mqtest1.debug
 OLD_FILES+=usr/tests/sys/mqueue/.debug/mqtest2.debug
 OLD_FILES+=usr/tests/sys/mqueue/.debug/mqtest3.debug
 OLD_FILES+=usr/tests/sys/mqueue/.debug/mqtest4.debug
 OLD_FILES+=usr/tests/sys/mqueue/.debug/mqtest5.debug
 OLD_DIRS+=usr/tests/sys/netinet/.debug
 OLD_FILES+=usr/tests/sys/netinet/.debug/udp_dontroute.debug
 OLD_DIRS+=usr/tests/sys/pjdfstest/.debug
 OLD_FILES+=usr/tests/sys/pjdfstest/.debug/pjdfstest.debug
 OLD_DIRS+=usr/tests/sys/vm/.debug
 OLD_FILES+=usr/tests/sys/vm/.debug/mmap_test.debug
 # 20151015: Rename files due to file-installed-as-dir bug
 OLD_FILES+=usr/share/doc/legal/realtek
 OLD_FILES+=usr/share/doc/legal/realtek/LICENSE
 OLD_DIRS+=usr/share/doc/legal/realtek
 OLD_DIRS+=usr/share/doc/legal/intel_ipw
 OLD_FILES+=usr/share/doc/legal/intel_ipw/LICENSE
 OLD_FILES+=usr/share/doc/legal/intel_iwn
 OLD_FILES+=usr/share/doc/legal/intel_iwn/LICENSE
 OLD_DIRS+=usr/share/doc/legal/intel_iwn
 OLD_DIRS+=usr/share/doc/legal/intel_iwi
 OLD_FILES+=usr/share/doc/legal/intel_iwi/LICENSE
 OLD_DIRS+=usr/share/doc/legal/intel_wpi
 OLD_FILES+=usr/share/doc/legal/intel_wpi/LICENSE
 # 20151006: new libc++ import
 OLD_FILES+=usr/include/c++/__tuple_03
 OLD_FILES+=usr/include/c++/v1/__tuple_03
 OLD_FILES+=usr/include/c++/v1/tr1/__tuple_03
 # 20151006: new clang import which bumps version from 3.6.1 to 3.7.0
 OLD_FILES+=usr/lib/clang/3.6.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/3.6.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/xopintrin.h
 OLD_DIRS+=usr/lib/clang/3.6.1/include
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.san-i386.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.san-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.ubsan-i386.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.ubsan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.ubsan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.ubsan_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.6.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.6.1/lib
 OLD_DIRS+=usr/lib/clang/3.6.1
 # 20150928: unused sgsmsg utility is removed
 OLD_FILES+=usr/bin/sgsmsg
 # 20150926: remove links to removed/unimplemented mbuf(9) macros
 OLD_FILES+=usr/share/man/man9/MEXT_ADD_REF.9.gz
 OLD_FILES+=usr/share/man/man9/MEXTFREE.9.gz
 OLD_FILES+=usr/share/man/man9/MEXT_IS_REF.9.gz
 OLD_FILES+=usr/share/man/man9/MEXT_REM_REF.9.gz
 OLD_FILES+=usr/share/man/man9/MFREE.9.gz
 # 20150818: *allocm() are gone in jemalloc 4.0.0
 OLD_FILES+=usr/share/man/man3/allocm.3.gz
 OLD_FILES+=usr/share/man/man3/dallocm.3.gz
 OLD_FILES+=usr/share/man/man3/nallocm.3.gz
 OLD_FILES+=usr/share/man/man3/rallocm.3.gz
 OLD_FILES+=usr/share/man/man3/sallocm.3.gz
 # 20150802: Remove netbsd's test on pw(8)
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_test
 # 20150719: Remove libarchive.pc
 OLD_FILES+=usr/libdata/pkgconfig/libarchive.pc
 # 20150705: Rename DTrace provider man pages
 OLD_FILES+=usr/share/man/man4/dtrace-io.4.gz
 OLD_FILES+=usr/share/man/man4/dtrace-ip.4.gz
 OLD_FILES+=usr/share/man/man4/dtrace-proc.4.gz
 OLD_FILES+=usr/share/man/man4/dtrace-sched.4.gz
 OLD_FILES+=usr/share/man/man4/dtrace-tcp.4.gz
 OLD_FILES+=usr/share/man/man4/dtrace-udp.4.gz
 # 20150704: nvlist private headers no longer installed
 OLD_FILES+=usr/include/sys/nv_impl.h
 OLD_FILES+=usr/include/sys/nvlist_impl.h
 OLD_FILES+=usr/include/sys/nvpair_impl.h
 # 20150624
 OLD_LIBS+=usr/lib/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
 OLD_FILES+=usr/share/man/man3/nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_stringf.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_stringv.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_clone.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_create.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_dump.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_empty.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_error.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_type.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_fdump.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_flags.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_type.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_get_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_get_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_get_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_get_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_get_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_get_parent.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_get_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_move_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_move_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_move_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_move_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_next.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_pack.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_recv.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_send.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_set_error.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_size.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_take_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_take_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_take_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_take_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_take_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_take_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_unpack.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_xfer.3.gz
 # 20150702: Remove duplicated nvlist includes
 OLD_FILES+=usr/include/dnv.h
 OLD_FILES+=usr/include/nv.h
 # 20150528: PCI IOV device driver methods moved to a separate kobj interface
 OLD_FILES+=usr/share/man/man9/PCI_ADD_VF.9.gz
 OLD_FILES+=usr/share/man/man9/PCI_INIT_IOV.9.gz
 OLD_FILES+=usr/share/man/man9/PCI_UNINIT_IOV.9.gz
 # 20150525: new clang import which bumps version from 3.6.0 to 3.6.1
 OLD_FILES+=usr/lib/clang/3.6.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/3.6.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/xopintrin.h
 OLD_DIRS+=usr/lib/clang/3.6.0/include
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.san-i386.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.san-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.ubsan-i386.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.ubsan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.ubsan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.ubsan_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.6.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.6.0/lib
 OLD_DIRS+=usr/lib/clang/3.6.0
 # 20150521
 OLD_FILES+=usr/bin/demandoc
 OLD_FILES+=usr/share/man/man1/demandoc.1.gz
 OLD_FILES+=usr/share/man/man3/mandoc.3.gz
 OLD_FILES+=usr/share/man/man3/mandoc_headers.3.gz
 # 20150520
 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
 # 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_DIRS+=usr/lib32/private
 OLD_LIBS+=usr/lib/private/libatf-c++.so.2
 OLD_LIBS+=usr/lib/private/libbsdstat.so.1
 OLD_LIBS+=usr/lib/private/libheimipcs.so.11
 OLD_LIBS+=usr/lib/private/libsqlite3.so.0
 OLD_LIBS+=usr/lib/private/libunbound.so.5
 OLD_LIBS+=usr/lib/private/libatf-c.so.1
 OLD_LIBS+=usr/lib/private/libheimipcc.so.11
 OLD_LIBS+=usr/lib/private/libldns.so.5
 OLD_LIBS+=usr/lib/private/libssh.so.5
 OLD_LIBS+=usr/lib/private/libucl.so.1
 OLD_DIRS+=usr/lib/private
 # 20150501
 OLD_FILES+=usr/bin/soeliminate
 OLD_FILES+=usr/share/man/man1/soeliminate.1.gz
 # 20150501: Remove the nvlist_.*[vf] functions manpages
 OLD_FILES+=usr/share/man/man3/nvlist_addf_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addf_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addf_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addf_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addf_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addf_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addf_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_type.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_type.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_type.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_type.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getf_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getf_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getf_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getf_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getf_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getf_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getv_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getv_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getv_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getv_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getv_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getv_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movef_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movef_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movef_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movef_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movev_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movev_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movev_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movev_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takef_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takef_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takef_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takef_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takef_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takef_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takev_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takev_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takev_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takev_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takev_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takev_string.3.gz
 # 20150429: remove never written documentation
 OLD_FILES+=usr/share/doc/papers/hwpmc.ascii.gz
 # 20150427: test/sys/kern/mmap_test moved to test/sys/vm/mmap_test
 OLD_FILES+=usr/tests/sys/kern/mmap_test
 # 20150422: zlib.c moved from net to libkern
 OLD_FILES+=usr/include/net/zlib.h
 OLD_FILES+=usr/include/net/zutil.h
 # 20150418
 OLD_FILES+=sbin/mount_oldnfs
 OLD_FILES+=usr/share/man/man8/mount_oldnfs.8.gz
 # 20150416: ALTQ moved to net/altq
 OLD_FILES+=usr/include/altq/altq_rmclass_debug.h
 OLD_FILES+=usr/include/altq/altq.h
 OLD_FILES+=usr/include/altq/altq_cdnr.h
 OLD_FILES+=usr/include/altq/altq_hfsc.h
 OLD_FILES+=usr/include/altq/altq_priq.h
 OLD_FILES+=usr/include/altq/altqconf.h
 OLD_FILES+=usr/include/altq/altq_classq.h
 OLD_FILES+=usr/include/altq/altq_red.h
 OLD_FILES+=usr/include/altq/if_altq.h
 OLD_FILES+=usr/include/altq/altq_var.h
 OLD_FILES+=usr/include/altq/altq_rmclass.h
 OLD_FILES+=usr/include/altq/altq_cbq.h
 OLD_FILES+=usr/include/altq/altq_rio.h
 OLD_DIRS+=usr/include/altq
 # 20150330: ntp 4.2.8p1
 OLD_FILES+=usr/share/doc/ntp/driver1.html
 OLD_FILES+=usr/share/doc/ntp/driver10.html
 OLD_FILES+=usr/share/doc/ntp/driver11.html
 OLD_FILES+=usr/share/doc/ntp/driver12.html
 OLD_FILES+=usr/share/doc/ntp/driver16.html
 OLD_FILES+=usr/share/doc/ntp/driver18.html
 OLD_FILES+=usr/share/doc/ntp/driver19.html
 OLD_FILES+=usr/share/doc/ntp/driver2.html
 OLD_FILES+=usr/share/doc/ntp/driver20.html
 OLD_FILES+=usr/share/doc/ntp/driver22.html
 OLD_FILES+=usr/share/doc/ntp/driver26.html
 OLD_FILES+=usr/share/doc/ntp/driver27.html
 OLD_FILES+=usr/share/doc/ntp/driver28.html
 OLD_FILES+=usr/share/doc/ntp/driver29.html
 OLD_FILES+=usr/share/doc/ntp/driver3.html
 OLD_FILES+=usr/share/doc/ntp/driver30.html
 OLD_FILES+=usr/share/doc/ntp/driver32.html
 OLD_FILES+=usr/share/doc/ntp/driver33.html
 OLD_FILES+=usr/share/doc/ntp/driver34.html
 OLD_FILES+=usr/share/doc/ntp/driver35.html
 OLD_FILES+=usr/share/doc/ntp/driver36.html
 OLD_FILES+=usr/share/doc/ntp/driver37.html
 OLD_FILES+=usr/share/doc/ntp/driver4.html
 OLD_FILES+=usr/share/doc/ntp/driver5.html
 OLD_FILES+=usr/share/doc/ntp/driver6.html
 OLD_FILES+=usr/share/doc/ntp/driver7.html
 OLD_FILES+=usr/share/doc/ntp/driver8.html
 OLD_FILES+=usr/share/doc/ntp/driver9.html
 OLD_FILES+=usr/share/doc/ntp/ldisc.html
 OLD_FILES+=usr/share/doc/ntp/measure.html
 OLD_FILES+=usr/share/doc/ntp/mx4200data.html
 OLD_FILES+=usr/share/doc/ntp/notes.html
 OLD_FILES+=usr/share/doc/ntp/patches.html
 OLD_FILES+=usr/share/doc/ntp/porting.html
 OLD_FILES+=usr/share/man/man1/sntp.1.gz
 # 20150329
 .if ${TARGET_ARCH} == "arm"
 OLD_FILES+=usr/include/bootconfig.h
 .endif
 # 20150326
 OLD_FILES+=usr/share/man/man1/pmcstudy.1.gz
 # 20150315: new clang import which bumps version from 3.5.1 to 3.6.0
 OLD_FILES+=usr/include/clang/3.5.1/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.5.1/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.5.1/altivec.h
 OLD_FILES+=usr/include/clang/3.5.1/ammintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/arm_acle.h
 OLD_FILES+=usr/include/clang/3.5.1/arm_neon.h
 OLD_FILES+=usr/include/clang/3.5.1/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.5.1/avxintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.5.1/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/cpuid.h
 OLD_FILES+=usr/include/clang/3.5.1/emmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/f16cintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.5.1/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/ia32intrin.h
 OLD_FILES+=usr/include/clang/3.5.1/immintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.5.1/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.5.1/mmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/module.modulemap
 OLD_FILES+=usr/include/clang/3.5.1/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/prfchwintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/rdseedintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/rtmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/shaintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/smmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/tbmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/x86intrin.h
 OLD_FILES+=usr/include/clang/3.5.1/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/xopintrin.h
 OLD_DIRS+=usr/include/clang/3.5.1
 OLD_DIRS+=usr/include/clang
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.san-i386.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.san-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.ubsan-i386.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.ubsan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.ubsan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.ubsan_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.5.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.5.1/lib
 OLD_DIRS+=usr/lib/clang/3.5.1
 # 20150302: binutils documentation distributed as a manpage
 OLD_FILES+=usr/share/doc/binutils/as.txt
 OLD_FILES+=usr/share/doc/binutils/ld.txt
 OLD_DIRS+=usr/share/doc/binutils
 # 20150222: Removed bcd(6) and ppt(6)
 OLD_FILES+=usr/bin/bcd
 OLD_FILES+=usr/bin/ppt
 OLD_FILES+=usr/share/man/man6/bcd.6.gz
 OLD_FILES+=usr/share/man/man6/ppt.6.gz
 # 20150217: Removed remnants of ar(4) driver
 OLD_FILES+=usr/include/dev/ic/hd64570.h
 # 20150212: /usr/games moving into /usr/bin
 OLD_FILES+=usr/games/bcd
 OLD_FILES+=usr/games/caesar
 OLD_FILES+=usr/games/factor
 OLD_FILES+=usr/games/fortune
 OLD_FILES+=usr/games/grdc
 OLD_FILES+=usr/games/morse
 OLD_FILES+=usr/games/number
 OLD_FILES+=usr/games/pom
 OLD_FILES+=usr/games/ppt
 OLD_FILES+=usr/games/primes
 OLD_FILES+=usr/games/random
 OLD_FILES+=usr/games/rot13
 OLD_FILES+=usr/games/strfile
 OLD_FILES+=usr/games/unstr
 OLD_DIRS+=usr/games
 # 20150209: liblzma header
 OLD_FILES+=usr/include/lzma/lzma.h
 # 20150124: spl.9 and friends
 OLD_FILES+=usr/share/man/man9/spl.9.gz
 OLD_FILES+=usr/share/man/man9/spl0.9.gz
 OLD_FILES+=usr/share/man/man9/splbio.9.gz
 OLD_FILES+=usr/share/man/man9/splclock.9.gz
 OLD_FILES+=usr/share/man/man9/splhigh.9.gz
 OLD_FILES+=usr/share/man/man9/splimp.9.gz
 OLD_FILES+=usr/share/man/man9/splnet.9.gz
 OLD_FILES+=usr/share/man/man9/splsoftclock.9.gz
 OLD_FILES+=usr/share/man/man9/splsofttty.9.gz
 OLD_FILES+=usr/share/man/man9/splstatclock.9.gz
 OLD_FILES+=usr/share/man/man9/spltty.9.gz
 OLD_FILES+=usr/share/man/man9/splvm.9.gz
 OLD_FILES+=usr/share/man/man9/splx.9.gz
 # 20150118: toeplitz.c moved from netinet to net
 OLD_FILES+=usr/include/netinet/toeplitz.h
 # 20150118: new clang import which bumps version from 3.5.0 to 3.5.1
 OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.5.0/altivec.h
 OLD_FILES+=usr/include/clang/3.5.0/ammintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/arm_acle.h
 OLD_FILES+=usr/include/clang/3.5.0/arm_neon.h
 OLD_FILES+=usr/include/clang/3.5.0/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.5.0/avxintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.5.0/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/cpuid.h
 OLD_FILES+=usr/include/clang/3.5.0/emmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/f16cintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.5.0/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/ia32intrin.h
 OLD_FILES+=usr/include/clang/3.5.0/immintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.5.0/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.5.0/mmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/module.modulemap
 OLD_FILES+=usr/include/clang/3.5.0/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/prfchwintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/rdseedintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/rtmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/shaintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/smmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/tbmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/x86intrin.h
 OLD_FILES+=usr/include/clang/3.5.0/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/xopintrin.h
 OLD_DIRS+=usr/include/clang/3.5.0
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.san-i386.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.san-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.ubsan-i386.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.ubsan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.ubsan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.ubsan_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.5.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.5.0/lib
 OLD_DIRS+=usr/lib/clang/3.5.0
 # 20150102: removal of asr(4)
 OLD_FILES+=usr/share/man/man4/asr.4.gz
 # 20150102: removal of texinfo
 OLD_FILES+=usr/bin/info
 OLD_FILES+=usr/bin/infokey
 OLD_FILES+=usr/bin/install-info
 OLD_FILES+=usr/bin/makeinfo
 OLD_FILES+=usr/bin/texindex
 OLD_FILES+=usr/share/info/am-utils.info.gz
 OLD_FILES+=usr/share/info/as.info.gz
 OLD_FILES+=usr/share/info/binutils.info.gz
 OLD_FILES+=usr/share/info/com_err.info.gz
 OLD_FILES+=usr/share/info/cpp.info.gz
 OLD_FILES+=usr/share/info/cppinternals.info.gz
 OLD_FILES+=usr/share/info/diff.info.gz
 OLD_FILES+=usr/share/info/dir
 OLD_FILES+=usr/share/info/gcc.info.gz
 OLD_FILES+=usr/share/info/gccint.info.gz
 OLD_FILES+=usr/share/info/gdb.info.gz
 OLD_FILES+=usr/share/info/gdbint.info.gz
 OLD_FILES+=usr/share/info/gperf.info.gz
 OLD_FILES+=usr/share/info/grep.info.gz
 OLD_FILES+=usr/share/info/groff.info.gz
 OLD_FILES+=usr/share/info/heimdal.info.gz
 OLD_FILES+=usr/share/info/history.info.gz
 OLD_FILES+=usr/share/info/info-stnd.info.gz
 OLD_FILES+=usr/share/info/info.info.gz
 OLD_FILES+=usr/share/info/ld.info.gz
 OLD_FILES+=usr/share/info/regex.info.gz
 OLD_FILES+=usr/share/info/rluserman.info.gz
 OLD_FILES+=usr/share/info/stabs.info.gz
 OLD_FILES+=usr/share/info/texinfo.info.gz
 OLD_FILES+=usr/share/man/man1/info.1.gz
 OLD_FILES+=usr/share/man/man1/infokey.1.gz
 OLD_FILES+=usr/share/man/man1/install-info.1.gz
 OLD_FILES+=usr/share/man/man1/makeinfo.1.gz
 OLD_FILES+=usr/share/man/man1/texindex.1.gz
 OLD_FILES+=usr/share/man/man5/info.5.gz
 OLD_FILES+=usr/share/man/man5/texinfo.5.gz
 OLD_DIRS+=usr/share/info
 # 20141231: new clang import which bumps version from 3.4.1 to 3.5.0
 OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.4.1/altivec.h
 OLD_FILES+=usr/include/clang/3.4.1/ammintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/arm_neon.h
 OLD_FILES+=usr/include/clang/3.4.1/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.4.1/avxintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.4.1/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/cpuid.h
 OLD_FILES+=usr/include/clang/3.4.1/emmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/f16cintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.4.1/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/immintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.4.1/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.4.1/mmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/module.map
 OLD_FILES+=usr/include/clang/3.4.1/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/prfchwintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/rdseedintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/rtmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/shaintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/smmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/tbmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/x86intrin.h
 OLD_FILES+=usr/include/clang/3.4.1/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/xopintrin.h
 OLD_DIRS+=usr/include/clang/3.4.1
 # 20141225: Remove gpib/ieee488
 OLD_FILES+=usr/include/dev/ieee488/ibfoo_int.h
 OLD_FILES+=usr/include/dev/ieee488/tnt4882.h
 OLD_FILES+=usr/include/dev/ieee488/ugpib.h
 OLD_FILES+=usr/include/dev/ieee488/upd7210.h
 OLD_DIRS+=usr/include/dev/ieee488
 OLD_FILES+=usr/include/gpib/gpib.h
 OLD_DIRS+=usr/include/gpib
 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/share/man/man3/gpib.3.gz
 OLD_FILES+=usr/share/man/man3/ibclr.3.gz
 OLD_FILES+=usr/share/man/man3/ibdev.3.gz
 OLD_FILES+=usr/share/man/man3/ibdma.3.gz
 OLD_FILES+=usr/share/man/man3/ibeos.3.gz
 OLD_FILES+=usr/share/man/man3/ibeot.3.gz
 OLD_FILES+=usr/share/man/man3/ibloc.3.gz
 OLD_FILES+=usr/share/man/man3/ibonl.3.gz
 OLD_FILES+=usr/share/man/man3/ibpad.3.gz
 OLD_FILES+=usr/share/man/man3/ibrd.3.gz
 OLD_FILES+=usr/share/man/man3/ibsad.3.gz
 OLD_FILES+=usr/share/man/man3/ibsic.3.gz
 OLD_FILES+=usr/share/man/man3/ibtmo.3.gz
 OLD_FILES+=usr/share/man/man3/ibtrg.3.gz
 OLD_FILES+=usr/share/man/man3/ibwrt.3.gz
 OLD_FILES+=usr/share/man/man4/gpib.4.gz
 OLD_FILES+=usr/share/man/man4/pcii.4.gz
 OLD_FILES+=usr/share/man/man4/tnt4882.4.gz
 # 20141224: libxo moved to /lib
 MOVED_LIBS+=usr/lib/libxo.so.0
 # 20141223: remove in6_gif.h and in_gif.h
 OLD_FILES+=usr/include/netinet/in_gif.h
 OLD_FILES+=usr/include/netinet6/in6_gif.h
 # 20141209: pw tests broken into a file per command
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_delete
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_modify
 # 20141202: update to mandoc CVS 20141201
 OLD_FILES+=usr.bin/preconv
 OLD_FILES+=usr/share/man/man1/preconv.1.gz
 # 20141129: mrouted rc.d scripts removed from base
 OLD_FILES+=etc/rc.d/mrouted
 # 20141126: convert sbin/mdconfig/tests to ATF format tests
 OLD_FILES+=usr/tests/sbin/mdconfig/legacy_test
 OLD_FILES+=usr/tests/sbin/mdconfig/mdconfig.test
 OLD_FILES+=usr/tests/sbin/mdconfig/run.pl
 # 20141126: remove xform_ipip decapsulation fallback
 OLD_FILES+=usr/include/netipsec/ipip_var.h
 # 20141122: mandoc updated to 1.13.1
 OLD_FILES+=usr/share/mdocml/external.png
 # 20141111: SF_KQUEUE code removed
 OLD_FILES+=usr/include/sys/sf_base.h
 OLD_FILES+=usr/include/sys/sf_sync.h
 # 20141109: faith/faithd removal
 OLD_FILES+=etc/rc.d/faith
 OLD_FILES+=usr/share/man/man4/faith.4.gz
 OLD_FILES+=usr/share/man/man4/if_faith.4.gz
 OLD_FILES+=usr/sbin/faithd
 OLD_FILES+=usr/share/man/man8/faithd.8.gz
 # 20141107: overhaul if_gre(4)
 OLD_FILES+=usr/include/netinet/ip_gre.h
 # 20141102: postrandom obsoleted by new /dev/random code
 OLD_FILES+=etc/rc.d/postrandom
 # 20141031: initrandom obsoleted by new /dev/random code
 OLD_FILES+=etc/rc.d/initrandom
 # 20141030: atf 0.21 import
 OLD_FILES+=usr/share/man/man3/atf-c++-api.3.gz
 # 20141028: debug files accidentally installed as directory name
 OLD_FILES+=usr/lib/debug/usr/lib/i18n
 OLD_FILES+=usr/lib/debug/usr/lib/private
 OLD_FILES+=usr/lib/debug/usr/lib32/i18n
 OLD_FILES+=usr/lib/debug/usr/lib32/private
 # 20141015: OpenSSL 1.0.1j import
 OLD_FILES+=usr/share/openssl/man/man3/CMS_sign_add1_signer.3.gz
 # 20141003: libproc version bump
 OLD_LIBS+=usr/lib/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
 # 20140917: hv_kvpd rc.d script removed in favor of devd configuration
 OLD_FILES+=etc/rc.d/hv_kvpd
 # 20140917: libnv was accidentally being installed to /usr/lib instead of /lib
 MOVED_LIBS+=usr/lib/libnv.so.0
 # 20140829: rc.d/kerberos removed
 OLD_FILES+=etc/rc.d/kerberos
 # 20140814: libopie version bump
 OLD_LIBS+=usr/lib/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/lib/private/libatf-c.a
 OLD_FILES+=usr/lib/private/libatf-c.so
 OLD_FILES+=usr/lib/private/libatf-c_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
 OLD_FILES+=usr/lib/private/libbsdstat.a
 OLD_FILES+=usr/lib/private/libbsdstat.so
 OLD_FILES+=usr/lib/private/libbsdstat_p.a
 OLD_FILES+=usr/lib/private/libheimipcc.a
 OLD_FILES+=usr/lib/private/libheimipcc.so
 OLD_FILES+=usr/lib/private/libheimipcc_p.a
 OLD_FILES+=usr/lib/private/libheimipcs.a
 OLD_FILES+=usr/lib/private/libheimipcs.so
 OLD_FILES+=usr/lib/private/libheimipcs_p.a
 OLD_FILES+=usr/lib/private/libldns.a
 OLD_FILES+=usr/lib/private/libldns.so
 OLD_FILES+=usr/lib/private/libldns_p.a
 OLD_FILES+=usr/lib/private/libssh.a
 OLD_FILES+=usr/lib/private/libssh.so
 OLD_FILES+=usr/lib/private/libssh_p.a
 OLD_FILES+=usr/lib/private/libunbound.a
 OLD_FILES+=usr/lib/private/libunbound.so
 OLD_FILES+=usr/lib/private/libunbound_p.a
 OLD_FILES+=usr/lib/private/libucl.a
 OLD_FILES+=usr/lib/private/libucl.so
 OLD_FILES+=usr/lib/private/libucl_p.a
 # 20140803: Remove an obsolete man page
 OLD_FILES+=usr/share/man/man9/pmap_change_wiring.9.gz
 # 20140731
 OLD_FILES+=usr/share/man/man9/SYSCTL_ADD_OID.9.gz
 # 20140728: libsbuf restored to old version
 OLD_LIBS+=lib/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
 OLD_FILES+=usr/share/man/man9/VOP_DESTROYVOBJECT.9.gz
 # 20140723: renamed to PCBGROUP.9
 OLD_FILES+=usr/share/man/man9/PCBGROUPS.9.gz
 # 20140722: browse_packages_ftp.sh removed
 OLD_FILES+=usr/share/examples/bsdconfig/browse_packages_ftp.sh
 # 20140718: Remove obsolete man pages
 OLD_FILES+=usr/share/man/man9/zero_copy.9.gz
 OLD_FILES+=usr/share/man/man9/zero_copy_sockets.9.gz
 # 20140718: Remove an obsolete man page
 OLD_FILES+=usr/share/man/man9/pmap_page_protect.9.gz
 # 20140717: Remove an obsolete man page
 OLD_FILES+=usr/share/man/man9/pmap_clear_reference.9.gz
 # 20140716: Remove an incorrectly named man page
 OLD_FILES+=usr/share/man/man9/pmap_ts_modified.9.gz
 # 20140712: Removal of bsd.dtrace.mk
 OLD_FILES+=usr/share/mk/bsd.dtrace.mk
 # 20140705: turn libreadline into an internal lib
 OLD_LIBS+=lib/libreadline.so.8
 OLD_FILES+=usr/lib/libreadline.a
 OLD_FILES+=usr/lib/libreadline_p.a
 OLD_FILES+=usr/lib/libreadline.so
 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/include/readline/chardefs.h
 OLD_FILES+=usr/include/readline/history.h
 OLD_FILES+=usr/include/readline/keymaps.h
 OLD_FILES+=usr/include/readline/readline.h
 OLD_FILES+=usr/include/readline/tilde.h
 OLD_FILES+=usr/include/readline/rlconf.h
 OLD_FILES+=usr/include/readline/rlstdc.h
 OLD_FILES+=usr/include/readline/rltypedefs.h
 OLD_FILES+=usr/include/readline/rltypedefs.h
 OLD_DIRS+=usr/include/readline
 OLD_FILES+=usr/share/info/readline.info.gz
 OLD_FILES+=usr/share/man/man3/readline.3.gz
 OLD_FILES+=usr/share/man/man3/rlhistory.3.gz
 # 20140625: csup removal
 OLD_FILES+=usr/bin/csup
 OLD_FILES+=usr/bin/cpasswd
 OLD_FILES+=usr/share/man/man1/csup.1.gz
 OLD_FILES+=usr/share/man/man1/cpasswd.1.gz
 OLD_FILES+=usr/share/examples/cvsup/README
 OLD_FILES+=usr/share/examples/cvsup/cvs-supfile
 OLD_FILES+=usr/share/examples/cvsup/stable-supfile
 OLD_FILES+=usr/share/examples/cvsup/standard-supfile
 OLD_DIRS+=usr/share/examples/cvsup
 # 20140614: send-pr removal
 OLD_FILES+=usr/bin/sendbug
 OLD_FILES+=usr/share/info/send-pr.info.gz
 OLD_FILES+=usr/share/man/man1/send-pr.1.gz
 OLD_FILES+=usr/share/man/man1/sendbug.1.gz
 OLD_FILES+=etc/gnats/freefall
 OLD_DIRS+=etc/gnats
 # 20140512: new clang import which bumps version from 3.4 to 3.4.1
 OLD_FILES+=usr/include/clang/3.4/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.4/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.4/altivec.h
 OLD_FILES+=usr/include/clang/3.4/ammintrin.h
 OLD_FILES+=usr/include/clang/3.4/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.4/avxintrin.h
 OLD_FILES+=usr/include/clang/3.4/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.4/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.4/cpuid.h
 OLD_FILES+=usr/include/clang/3.4/emmintrin.h
 OLD_FILES+=usr/include/clang/3.4/f16cintrin.h
 OLD_FILES+=usr/include/clang/3.4/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.4/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.4/immintrin.h
 OLD_FILES+=usr/include/clang/3.4/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.4/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.4/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.4/mmintrin.h
 OLD_FILES+=usr/include/clang/3.4/module.map
 OLD_FILES+=usr/include/clang/3.4/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.4/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.4/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.4/prfchwintrin.h
 OLD_FILES+=usr/include/clang/3.4/rdseedintrin.h
 OLD_FILES+=usr/include/clang/3.4/rtmintrin.h
 OLD_FILES+=usr/include/clang/3.4/shaintrin.h
 OLD_FILES+=usr/include/clang/3.4/smmintrin.h
 OLD_FILES+=usr/include/clang/3.4/tbmintrin.h
 OLD_FILES+=usr/include/clang/3.4/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.4/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.4/x86intrin.h
 OLD_FILES+=usr/include/clang/3.4/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.4/xopintrin.h
 OLD_FILES+=usr/include/clang/3.4/arm_neon.h
 OLD_FILES+=usr/include/clang/3.4/module.map
 OLD_DIRS+=usr/include/clang/3.4
 # 20140505: Bogusly installing src.opts.mk
 OLD_FILES+=usr/share/mk/src.opts.mk
 # 20140505: Reject PR kern/187551
 OLD_FILES+=usr/tests/sbin/ifconfig/fibs_test
 # 20140502: Removal of lindev(4)
 OLD_FILES+=usr/share/man/man4/lindev.4.gz
 # 20140425
 OLD_FILES+=usr/lib/libssp_p.a
 OLD_FILES+=usr/lib/libstand_p.a
 # 20140413: Removed NO_MANCOMPRESS from mount_fusefs
 OLD_FILES+=usr/share/man/man8/mount_fusefs.8
 # 20140314: AppleTalk
 OLD_DIRS+=usr/include/netatalk
 OLD_FILES+=usr/include/netatalk/aarp.h
 OLD_FILES+=usr/include/netatalk/at.h
 OLD_FILES+=usr/include/netatalk/at_extern.h
 OLD_FILES+=usr/include/netatalk/at_var.h
 OLD_FILES+=usr/include/netatalk/ddp.h
 OLD_FILES+=usr/include/netatalk/ddp_pcb.h
 OLD_FILES+=usr/include/netatalk/ddp_var.h
 OLD_FILES+=usr/include/netatalk/endian.h
 OLD_FILES+=usr/include/netatalk/phase2.h
 # 20140314: Remove IPX/SPX
 OLD_LIBS+=lib/libipx.so.5
 OLD_FILES+=usr/include/netipx/ipx.h
 OLD_FILES+=usr/include/netipx/ipx_if.h
 OLD_FILES+=usr/include/netipx/ipx_pcb.h
 OLD_FILES+=usr/include/netipx/ipx_var.h
 OLD_FILES+=usr/include/netipx/spx.h
 OLD_FILES+=usr/include/netipx/spx_debug.h
 OLD_FILES+=usr/include/netipx/spx_timer.h
 OLD_FILES+=usr/include/netipx/spx_var.h
 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/sbin/IPXrouted
 OLD_FILES+=usr/share/man/man3/ipx.3.gz
 OLD_FILES+=usr/share/man/man3/ipx_addr.3.gz
 OLD_FILES+=usr/share/man/man3/ipx_ntoa.3.gz
 OLD_FILES+=usr/share/man/man4/ef.4.gz
 OLD_FILES+=usr/share/man/man4/if_ef.4.gz
 OLD_FILES+=usr/share/man/man8/IPXrouted.8.gz
 # 20140314: bsdconfig usermgmt rewrite
 OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/userinput
 # 20140307: bsdconfig groupmgmt rewrite
 OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/groupinput
 # 20140223: Remove libyaml
 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
 # 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
 OLD_FILES+=usr/include/clang/3.3/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.3/altivec.h
 OLD_FILES+=usr/include/clang/3.3/ammintrin.h
 OLD_FILES+=usr/include/clang/3.3/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.3/avxintrin.h
 OLD_FILES+=usr/include/clang/3.3/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.3/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.3/cpuid.h
 OLD_FILES+=usr/include/clang/3.3/emmintrin.h
 OLD_FILES+=usr/include/clang/3.3/f16cintrin.h
 OLD_FILES+=usr/include/clang/3.3/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.3/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.3/immintrin.h
 OLD_FILES+=usr/include/clang/3.3/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.3/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.3/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.3/mmintrin.h
 OLD_FILES+=usr/include/clang/3.3/module.map
 OLD_FILES+=usr/include/clang/3.3/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.3/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.3/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.3/prfchwintrin.h
 OLD_FILES+=usr/include/clang/3.3/rdseedintrin.h
 OLD_FILES+=usr/include/clang/3.3/rtmintrin.h
 OLD_FILES+=usr/include/clang/3.3/smmintrin.h
 OLD_FILES+=usr/include/clang/3.3/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.3/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.3/x86intrin.h
 OLD_FILES+=usr/include/clang/3.3/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.3/xopintrin.h
 OLD_FILES+=usr/share/man/man1/llvm-prof.1.gz
 OLD_DIRS+=usr/include/clang/3.3
 # 20140216: nve(4) removed
 OLD_FILES+=usr/share/man/man4/if_nve.4.gz
 OLD_FILES+=usr/share/man/man4/nve.4.gz
 # 20140205: Open Firmware device moved
 OLD_FILES+=usr/include/dev/ofw/ofw_nexus.h
 # 20140128: libelf and libdwarf import
 OLD_LIBS+=usr/lib/libelf.so.1
 OLD_LIBS+=usr/lib/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
 # 20131202: libcapsicum and libcasper moved to /lib/
 MOVED_LIBS+=usr/lib/libcapsicum.so.0
 MOVED_LIBS+=usr/lib/libcasper.so.0
 # 20131109: extattr(2) mlinks fixed
 OLD_FILES+=usr/share/man/man2/extattr_delete_list.2.gz
 OLD_FILES+=usr/share/man/man2/extattr_get_list.2.gz
 # 20131107: example files removed
 OLD_FILES+=usr/share/examples/libusb20/aux.c
 OLD_FILES+=usr/share/examples/libusb20/aux.h
 # 20131103: WITH_LIBICONV_COMPAT removal
 OLD_FILES+=usr/include/_libiconv_compat.h
 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
 # 20131103: removal of utxrm(8), use 'utx rm' instead
 OLD_FILES+=usr/sbin/utxrm
 OLD_FILES+=usr/share/man/man8/utxrm.8.gz
 # 20131031: pkg_install has been removed
 OLD_FILES+=etc/periodic/daily/220.backup-pkgdb
 OLD_FILES+=etc/periodic/daily/490.status-pkg-changes
 OLD_FILES+=etc/periodic/security/460.chkportsum
 OLD_FILES+=etc/periodic/weekly/400.status-pkg
 OLD_FILES+=usr/sbin/pkg_add
 OLD_FILES+=usr/sbin/pkg_create
 OLD_FILES+=usr/sbin/pkg_delete
 OLD_FILES+=usr/sbin/pkg_info
 OLD_FILES+=usr/sbin/pkg_updating
 OLD_FILES+=usr/sbin/pkg_version
 OLD_FILES+=usr/share/man/man1/pkg_add.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_create.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_delete.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_info.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_updating.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_version.1.gz
 # 20131030: /etc/keys moved to /usr/share/keys
 OLD_DIRS+=etc/keys
 OLD_DIRS+=etc/keys/pkg
 OLD_DIRS+=etc/keys/pkg/revoked
 OLD_DIRS+=etc/keys/pkg/trusted
 OLD_FILES+=etc/keys/pkg/trusted/pkg.freebsd.org.2013102301
 # 20131028: ng_fec(4) removed
 OLD_FILES+=usr/include/netgraph/ng_fec.h
 OLD_FILES+=usr/share/man/man4/ng_fec.4.gz
 # 20131027: header moved
 OLD_FILES+=usr/include/net/pf_mtag.h
 # 20131023: remove never used iscsi directory
 OLD_DIRS+=usr/share/examples/iscsi
 # 20131021: isf(4) removed
 OLD_FILES+=usr/sbin/isfctl
 OLD_FILES+=usr/share/man/man4/isf.4.gz
 OLD_FILES+=usr/share/man/man8/isfctl.8.gz
 # 20131014: libbsdyml becomes private
 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/share/man/man3/libbsdyml.3.gz
 OLD_FILES+=usr/include/bsdyml.h
 # 20131013: Removal of the ATF tools
 OLD_FILES+=etc/atf/FreeBSD.conf
 OLD_FILES+=etc/atf/atf-run.hooks
 OLD_FILES+=etc/atf/common.conf
 OLD_FILES+=usr/bin/atf-config
 OLD_FILES+=usr/bin/atf-report
 OLD_FILES+=usr/bin/atf-run
 OLD_FILES+=usr/bin/atf-version
 OLD_FILES+=usr/share/atf/atf-run.hooks
 OLD_FILES+=usr/share/examples/atf/atf-run.hooks
 OLD_FILES+=usr/share/examples/atf/tests-results.css
 OLD_FILES+=usr/share/man/man1/atf-config.1.gz
 OLD_FILES+=usr/share/man/man1/atf-report.1.gz
 OLD_FILES+=usr/share/man/man1/atf-run.1.gz
 OLD_FILES+=usr/share/man/man1/atf-version.1.gz
 OLD_FILES+=usr/share/man/man5/atf-formats.5.gz
 OLD_FILES+=usr/share/xml/atf/tests-results.dtd
 OLD_FILES+=usr/share/xsl/atf/tests-results.xsl
 OLD_DIRS+=etc/atf
 OLD_DIRS+=usr/share/examples/atf
 OLD_DIRS+=usr/share/xml/atf
 OLD_DIRS+=usr/share/xml
 OLD_DIRS+=usr/share/xsl/atf
 OLD_DIRS+=usr/share/xsl
 # 20131009: freebsd-version moved from /libexec to /bin
 OLD_FILES+=libexec/freebsd-version
 # 20131001: ar and ranlib from binutils not used
 OLD_FILES+=usr/bin/gnu-ar
 OLD_FILES+=usr/bin/gnu-ranlib
 OLD_FILES+=usr/share/man/man1/gnu-ar.1.gz
 OLD_FILES+=usr/share/man/man1/gnu-ranlib.1.gz
 # 20130930: BIND removed from base
 OLD_FILES+=etc/mtree/BIND.chroot.dist
 OLD_FILES+=etc/namedb
 OLD_FILES+=etc/periodic/daily/470.status-named
 OLD_FILES+=usr/bin/dig
 OLD_FILES+=usr/bin/nslookup
 OLD_FILES+=usr/bin/nsupdate
 OLD_DIRS+=usr/include/lwres
 OLD_FILES+=usr/include/lwres/context.h
 OLD_FILES+=usr/include/lwres/int.h
 OLD_FILES+=usr/include/lwres/ipv6.h
 OLD_FILES+=usr/include/lwres/lang.h
 OLD_FILES+=usr/include/lwres/list.h
 OLD_FILES+=usr/include/lwres/lwbuffer.h
 OLD_FILES+=usr/include/lwres/lwpacket.h
 OLD_FILES+=usr/include/lwres/lwres.h
 OLD_FILES+=usr/include/lwres/net.h
 OLD_FILES+=usr/include/lwres/netdb.h
 OLD_FILES+=usr/include/lwres/platform.h
 OLD_FILES+=usr/include/lwres/result.h
 OLD_FILES+=usr/include/lwres/string.h
 OLD_FILES+=usr/include/lwres/version.h
 OLD_FILES+=usr/lib/liblwres.a
 OLD_FILES+=usr/lib/liblwres.so
 OLD_LIBS+=usr/lib/liblwres.so.90
 OLD_FILES+=usr/lib/liblwres_p.a
 OLD_FILES+=usr/sbin/arpaname
 OLD_FILES+=usr/sbin/ddns-confgen
 OLD_FILES+=usr/sbin/dnssec-dsfromkey
 OLD_FILES+=usr/sbin/dnssec-keyfromlabel
 OLD_FILES+=usr/sbin/dnssec-keygen
 OLD_FILES+=usr/sbin/dnssec-revoke
 OLD_FILES+=usr/sbin/dnssec-settime
 OLD_FILES+=usr/sbin/dnssec-signzone
 OLD_FILES+=usr/sbin/dnssec-verify
 OLD_FILES+=usr/sbin/genrandom
 OLD_FILES+=usr/sbin/isc-hmac-fixup
 OLD_FILES+=usr/sbin/lwresd
 OLD_FILES+=usr/sbin/named
 OLD_FILES+=usr/sbin/named-checkconf
 OLD_FILES+=usr/sbin/named-checkzone
 OLD_FILES+=usr/sbin/named-compilezone
 OLD_FILES+=usr/sbin/named-journalprint
 OLD_FILES+=usr/sbin/named.reconfig
 OLD_FILES+=usr/sbin/named.reload
 OLD_FILES+=usr/sbin/nsec3hash
 OLD_FILES+=usr/sbin/rndc
 OLD_FILES+=usr/sbin/rndc-confgen
 OLD_DIRS+=usr/share/doc/bind9
 OLD_FILES+=usr/share/doc/bind9/CHANGES
 OLD_FILES+=usr/share/doc/bind9/COPYRIGHT
 OLD_FILES+=usr/share/doc/bind9/FAQ
 OLD_FILES+=usr/share/doc/bind9/HISTORY
 OLD_FILES+=usr/share/doc/bind9/README
 OLD_DIRS+=usr/share/doc/bind9/arm
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch01.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch02.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch03.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch04.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch05.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch06.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch07.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch08.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch09.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch10.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.pdf
 OLD_FILES+=usr/share/doc/bind9/arm/man.arpaname.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.ddns-confgen.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dig.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-dsfromkey.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keyfromlabel.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keygen.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-revoke.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-settime.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-signzone.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-verify.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.genrandom.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.host.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.isc-hmac-fixup.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkconf.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkzone.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.named-journalprint.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.named.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.nsec3hash.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.nsupdate.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.rndc-confgen.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.conf.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.html
 OLD_DIRS+=usr/share/doc/bind9/misc
 OLD_FILES+=usr/share/doc/bind9/misc/dnssec
 OLD_FILES+=usr/share/doc/bind9/misc/format-options.pl
 OLD_FILES+=usr/share/doc/bind9/misc/ipv6
 OLD_FILES+=usr/share/doc/bind9/misc/migration
 OLD_FILES+=usr/share/doc/bind9/misc/migration-4to9
 OLD_FILES+=usr/share/doc/bind9/misc/options
 OLD_FILES+=usr/share/doc/bind9/misc/rfc-compliance
 OLD_FILES+=usr/share/doc/bind9/misc/roadmap
 OLD_FILES+=usr/share/doc/bind9/misc/sdb
 OLD_FILES+=usr/share/doc/bind9/misc/sort-options.pl
 OLD_FILES+=usr/share/man/man1/arpaname.1.gz
 OLD_FILES+=usr/share/man/man1/dig.1.gz
 OLD_FILES+=usr/share/man/man1/nslookup.1.gz
 OLD_FILES+=usr/share/man/man1/nsupdate.1.gz
 OLD_FILES+=usr/share/man/man3/lwres.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_addr_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_add.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_back.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_clear.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_first.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_forward.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_getmem.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint16.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint32.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint8.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_init.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_invalidate.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_putmem.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint16.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint32.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint8.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_subtract.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_conf_clear.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_conf_get.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_conf_init.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_conf_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_conf_print.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_config.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_allocmem.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_create.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_freemem.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_initserial.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_nextserial.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_sendrecv.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_endhostent.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_endhostent_r.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_freeaddrinfo.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_freehostent.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabn.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gai_strerror.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getaddrinfo.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getaddrsbyname.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr_r.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostbyname.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostbyname2.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostbyname_r.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostent.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostent_r.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getipnode.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getipnodebyaddr.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getipnodebyname.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getnamebyaddr.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getnameinfo.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getrrsetbyname.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnba.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_herror.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_hstrerror.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_inetntop.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_lwpacket_parseheader.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_lwpacket_renderheader.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_net_ntop.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_noop.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_nooprequest_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_nooprequest_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_nooprequest_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_noopresponse_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_noopresponse_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_noopresponse_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_packet.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_resutil.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_sethostent.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_sethostent_r.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_string_parse.3.gz
 OLD_FILES+=usr/share/man/man5/named.conf.5.gz
 OLD_FILES+=usr/share/man/man5/rndc.conf.5.gz
 OLD_FILES+=usr/share/man/man8/ddns-confgen.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-dsfromkey.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-keyfromlabel.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-keygen.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-revoke.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-settime.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-signzone.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-verify.8.gz
 OLD_FILES+=usr/share/man/man8/genrandom.8.gz
 OLD_FILES+=usr/share/man/man8/isc-hmac-fixup.8.gz
 OLD_FILES+=usr/share/man/man8/lwresd.8.gz
 OLD_FILES+=usr/share/man/man8/named-checkconf.8.gz
 OLD_FILES+=usr/share/man/man8/named-checkzone.8.gz
 OLD_FILES+=usr/share/man/man8/named-compilezone.8.gz
 OLD_FILES+=usr/share/man/man8/named-journalprint.8.gz
 OLD_FILES+=usr/share/man/man8/named.8.gz
 OLD_FILES+=usr/share/man/man8/named.reconfig.8.gz
 OLD_FILES+=usr/share/man/man8/named.reload.8.gz
 OLD_FILES+=usr/share/man/man8/nsec3hash.8.gz
 OLD_FILES+=usr/share/man/man8/rndc-confgen.8.gz
 OLD_FILES+=usr/share/man/man8/rndc.8.gz
 OLD_DIRS+=var/named/dev
 OLD_DIRS+=var/named/etc
 OLD_DIRS+=var/named/etc/namedb
 OLD_FILES+=var/named/etc/namedb/PROTO.localhost-v6.rev
 OLD_FILES+=var/named/etc/namedb/PROTO.localhost.rev
 OLD_DIRS+=var/named/etc/namedb/dynamic
 OLD_FILES+=var/named/etc/namedb/make-localhost
 OLD_DIRS+=var/named/etc/namedb/master
 OLD_FILES+=var/named/etc/namedb/master/empty.db
 OLD_FILES+=var/named/etc/namedb/master/localhost-forward.db
 OLD_FILES+=var/named/etc/namedb/master/localhost-reverse.db
 #OLD_FILES+=var/named/etc/namedb/named.conf	# intentionally left out
 OLD_FILES+=var/named/etc/namedb/named.root
 OLD_DIRS+=var/named/etc/namedb/working
 OLD_DIRS+=var/named/etc/namedb/slave
 OLD_DIRS+=var/named/var
 OLD_DIRS+=var/named/var/dump
 OLD_DIRS+=var/named/var/log
 OLD_DIRS+=var/named/var/run
 OLD_DIRS+=var/named/var/run/named
 OLD_DIRS+=var/named/var/stats
 OLD_DIRS+=var/run/named
 # 20130923: example moved
 OLD_FILES+=usr/share/examples/bsdconfig/browse_packages.sh
 # 20130908: libssh becomes private
 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
 # 20130903: gnupatch is no more
 OLD_FILES+=usr/bin/gnupatch
 OLD_FILES+=usr/share/man/man1/gnupatch.1.gz
 # 20130829: bsdpatch is patch unconditionally
 OLD_FILES+=usr/bin/bsdpatch
 OLD_FILES+=usr/share/man/man1/bsdpatch.1.gz
 # 20130822: bind 9.9.3-P2 import
 OLD_LIBS+=usr/lib/liblwres.so.80
 # 20130814: vm_page_busy(9)
 OLD_FILES+=usr/share/man/man9/vm_page_flash.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_io.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_io_finish.9.gz
 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
 # 20130623: dialog update from 1.1 to 1.2
 OLD_LIBS+=usr/lib/libdialog.so.7
 # 20130616: vfs_mount.9 removed
 OLD_FILES+=usr/share/man/man9/vfs_mount.9.gz
 # 20130614: remove CVS from base
 OLD_FILES+=usr/bin/cvs
 OLD_FILES+=usr/bin/cvsbug
 OLD_FILES+=usr/share/doc/psd/28.cvs/paper.ascii.gz
 OLD_FILES+=usr/share/doc/psd/28.cvs/paper.ps.gz
 OLD_DIRS+=usr/share/doc/psd/28.cvs
 OLD_FILES+=usr/share/examples/cvs/contrib/README
 OLD_FILES+=usr/share/examples/cvs/contrib/clmerge
 OLD_FILES+=usr/share/examples/cvs/contrib/cln_hist
 OLD_FILES+=usr/share/examples/cvs/contrib/commit_prep
 OLD_FILES+=usr/share/examples/cvs/contrib/cvs2vendor
 OLD_FILES+=usr/share/examples/cvs/contrib/cvs_acls
 OLD_FILES+=usr/share/examples/cvs/contrib/cvscheck
 OLD_FILES+=usr/share/examples/cvs/contrib/cvscheck.man
 OLD_FILES+=usr/share/examples/cvs/contrib/cvshelp.man
 OLD_FILES+=usr/share/examples/cvs/contrib/descend.man
 OLD_FILES+=usr/share/examples/cvs/contrib/easy-import
 OLD_FILES+=usr/share/examples/cvs/contrib/intro.doc
 OLD_FILES+=usr/share/examples/cvs/contrib/log
 OLD_FILES+=usr/share/examples/cvs/contrib/log_accum
 OLD_FILES+=usr/share/examples/cvs/contrib/mfpipe
 OLD_FILES+=usr/share/examples/cvs/contrib/rcs-to-cvs
 OLD_FILES+=usr/share/examples/cvs/contrib/rcs2log
 OLD_FILES+=usr/share/examples/cvs/contrib/rcslock
 OLD_FILES+=usr/share/examples/cvs/contrib/sccs2rcs
 OLD_DIRS+=usr/share/examples/cvs/contrib
 OLD_DIRS+=usr/share/examples/cvs
 OLD_FILES+=usr/share/info/cvs.info.gz
 OLD_FILES+=usr/share/info/cvsclient.info.gz
 OLD_FILES+=usr/share/man/man1/cvs.1.gz
 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
 # 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
 OLD_FILES+=usr/include/clang/3.2/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.2/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.2/altivec.h
 OLD_FILES+=usr/include/clang/3.2/ammintrin.h
 OLD_FILES+=usr/include/clang/3.2/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.2/avxintrin.h
 OLD_FILES+=usr/include/clang/3.2/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.2/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.2/cpuid.h
 OLD_FILES+=usr/include/clang/3.2/emmintrin.h
 OLD_FILES+=usr/include/clang/3.2/f16cintrin.h
 OLD_FILES+=usr/include/clang/3.2/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.2/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.2/immintrin.h
 OLD_FILES+=usr/include/clang/3.2/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.2/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.2/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.2/mmintrin.h
 OLD_FILES+=usr/include/clang/3.2/module.map
 OLD_FILES+=usr/include/clang/3.2/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.2/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.2/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.2/rtmintrin.h
 OLD_FILES+=usr/include/clang/3.2/smmintrin.h
 OLD_FILES+=usr/include/clang/3.2/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.2/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.2/x86intrin.h
 OLD_FILES+=usr/include/clang/3.2/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.2/xopintrin.h
 OLD_DIRS+=usr/include/clang/3.2
 # 20130404: legacy ATA stack removed
 OLD_FILES+=etc/periodic/daily/405.status-ata-raid
 OLD_FILES+=rescue/atacontrol
 OLD_FILES+=sbin/atacontrol
 OLD_FILES+=usr/share/man/man8/atacontrol.8.gz
 OLD_FILES+=usr/share/man/man4/atapicam.4.gz
 OLD_FILES+=usr/share/man/man4/ataraid.4.gz
 OLD_FILES+=usr/sbin/burncd
 OLD_FILES+=usr/share/man/man8/burncd.8.gz
 # 20130316: vinum.4 removed
 OLD_FILES+=usr/share/man/man4/vinum.4.gz
 # 20130312: fortunes-o removed
 OLD_FILES+=usr/share/games/fortune/fortunes-o
 OLD_FILES+=usr/share/games/fortune/fortunes-o.dat
 # 20130311: Ports are no more available via cvsup
 OLD_FILES+=usr/share/examples/cvsup/ports-supfile
 OLD_FILES+=usr/share/examples/cvsup/refuse
 OLD_FILES+=usr/share/examples/cvsup/refuse.README
 # 20130309: NWFS and NCP supports removed
 OLD_FILES+=usr/bin/ncplist
 OLD_FILES+=usr/bin/ncplogin
 OLD_FILES+=usr/bin/ncplogout
 OLD_FILES+=usr/include/fs/nwfs/nwfs.h
 OLD_FILES+=usr/include/fs/nwfs/nwfs_mount.h
 OLD_FILES+=usr/include/fs/nwfs/nwfs_node.h
 OLD_FILES+=usr/include/fs/nwfs/nwfs_subr.h
 OLD_DIRS+=usr/include/fs/nwfs
 OLD_FILES+=usr/include/netncp/ncp.h
 OLD_FILES+=usr/include/netncp/ncp_cfg.h
 OLD_FILES+=usr/include/netncp/ncp_conn.h
 OLD_FILES+=usr/include/netncp/ncp_file.h
 OLD_FILES+=usr/include/netncp/ncp_lib.h
 OLD_FILES+=usr/include/netncp/ncp_ncp.h
 OLD_FILES+=usr/include/netncp/ncp_nls.h
 OLD_FILES+=usr/include/netncp/ncp_rcfile.h
 OLD_FILES+=usr/include/netncp/ncp_rq.h
 OLD_FILES+=usr/include/netncp/ncp_sock.h
 OLD_FILES+=usr/include/netncp/ncp_subr.h
 OLD_FILES+=usr/include/netncp/ncp_user.h
 OLD_FILES+=usr/include/netncp/ncpio.h
 OLD_FILES+=usr/include/netncp/nwerror.h
 OLD_DIRS+=usr/include/netncp
 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/sbin/mount_nwfs
 OLD_FILES+=usr/share/examples/nwclient/dot.nwfsrc
 OLD_FILES+=usr/share/examples/nwclient/nwfs.sh.sample
 OLD_DIRS+=usr/share/examples/nwclient
 OLD_FILES+=usr/share/man/man1/ncplist.1.gz
 OLD_FILES+=usr/share/man/man1/ncplogin.1.gz
 OLD_FILES+=usr/share/man/man1/ncplogout.1.gz
 OLD_FILES+=usr/share/man/man8/mount_nwfs.8.gz
 # 20130302: NTFS support removed
 OLD_FILES+=rescue/mount_ntfs
 OLD_FILES+=sbin/mount_ntfs
 OLD_FILES+=usr/include/fs/ntfs/ntfs.h
 OLD_FILES+=usr/include/fs/ntfs/ntfs_compr.h
 OLD_FILES+=usr/include/fs/ntfs/ntfs_ihash.h
 OLD_FILES+=usr/include/fs/ntfs/ntfs_inode.h
 OLD_FILES+=usr/include/fs/ntfs/ntfs_subr.h
 OLD_FILES+=usr/include/fs/ntfs/ntfs_vfsops.h
 OLD_FILES+=usr/include/fs/ntfs/ntfsmount.h
 OLD_DIRS+=usr/include/fs/ntfs
 OLD_FILES+=usr/share/man/man8/mount_ntfs.8.gz
 # 20130302: PORTALFS support removed
 OLD_FILES+=usr/include/fs/portalfs/portal.h
 OLD_DIRS+=usr/include/fs/portalfs
 OLD_FILES+=usr/sbin/mount_portalfs
 OLD_FILES+=usr/share/examples/portal/README
 OLD_FILES+=usr/share/examples/portal/portal.conf
 OLD_DIRS+=usr/share/examples/portal
 OLD_FILES+=usr/share/man/man8/mount_portalfs.8.gz
 # 20130302: CODAFS support removed
 OLD_FILES+=usr/share/man/man4/coda.4.gz
 # 20130302: XFS support removed
 OLD_FILES+=usr/share/man/man5/xfs.5.gz
 # 20130302: Capsicum overhaul
 OLD_FILES+=usr/share/man/man2/cap_getrights.2.gz
 OLD_FILES+=usr/share/man/man2/cap_new.2.gz
 # 20130213: OpenSSL 1.0.1e import
 OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_verifyrecover.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_verifyrecover_init.3.gz
 # 20130116: removed long unused directories for .1aout section manpages
 OLD_FILES+=usr/share/man/en.ISO8859-1/man1aout
 OLD_FILES+=usr/share/man/en.UTF-8/man1aout
 OLD_DIRS+=usr/share/man/man1aout
 OLD_DIRS+=usr/share/man/cat1aout
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat1aout
 OLD_DIRS+=usr/share/man/en.UTF-8/cat1aout
 # 20130103: gnats-supfile removed
 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
 # 20121230: remove wrongly created directories for auditdistd
 OLD_DIRS+=var/dist
 OLD_DIRS+=var/remote
 # 20121022: remove harp, hfa and idt man page
 OLD_FILES+=usr/share/man/man4/harp.4.gz
 OLD_FILES+=usr/share/man/man4/hfa.4.gz
 OLD_FILES+=usr/share/man/man4/idt.4.gz
 OLD_FILES+=usr/share/man/man4/if_idt.4.gz
 # 20121022: VFS_LOCK_GIANT elimination
 OLD_FILES+=usr/share/man/man9/VFS_LOCK_GIANT.9.gz
 OLD_FILES+=usr/share/man/man9/VFS_UNLOCK_GIANT.9.gz
 # 20121004: remove incomplete unwind.h
 OLD_FILES+=usr/include/clang/3.2/unwind.h
 # 20120910: NetBSD compat shims removed
 OLD_FILES+=usr/include/cam/scsi/scsi_low_pisa.h
 OLD_FILES+=usr/include/sys/device_port.h
 # 20120909: doc and www supfiles removed
 OLD_FILES+=usr/share/examples/cvsup/doc-supfile
 OLD_FILES+=usr/share/examples/cvsup/www-supfile
 # 20120908: pf cleanup
 OLD_FILES+=usr/include/net/if_pflow.h
 # 20120816: new clang import which bumps version from 3.1 to 3.2
 OLD_FILES+=usr/bin/llvm-ld
 OLD_FILES+=usr/bin/llvm-stub
 OLD_FILES+=usr/include/clang/3.1/altivec.h
 OLD_FILES+=usr/include/clang/3.1/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.1/avxintrin.h
 OLD_FILES+=usr/include/clang/3.1/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.1/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.1/cpuid.h
 OLD_FILES+=usr/include/clang/3.1/emmintrin.h
 OLD_FILES+=usr/include/clang/3.1/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.1/immintrin.h
 OLD_FILES+=usr/include/clang/3.1/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.1/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.1/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.1/mmintrin.h
 OLD_FILES+=usr/include/clang/3.1/module.map
 OLD_FILES+=usr/include/clang/3.1/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.1/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.1/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.1/smmintrin.h
 OLD_FILES+=usr/include/clang/3.1/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.1/unwind.h
 OLD_FILES+=usr/include/clang/3.1/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.1/x86intrin.h
 OLD_FILES+=usr/include/clang/3.1/xmmintrin.h
 OLD_DIRS+=usr/include/clang/3.1
 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_FILES+=usr/include/openssl/aes_locl.h
 OLD_FILES+=usr/include/openssl/bio_lcl.h
 OLD_FILES+=usr/include/openssl/e_os.h
 OLD_FILES+=usr/include/openssl/fips.h
 OLD_FILES+=usr/include/openssl/fips_rand.h
 OLD_FILES+=usr/include/openssl/pq_compat.h
 OLD_FILES+=usr/include/openssl/tmdiff.h
 OLD_FILES+=usr/include/openssl/ui_locl.h
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_id_callback.3.gz
 # 20120621: remove old man page
 OLD_FILES+=usr/share/man/man8/vnconfig.8.gz
 # 20120619: TOE support updated
 OLD_FILES+=usr/include/netinet/toedev.h
 # 20120613: auth.conf removed
 OLD_FILES+=etc/auth.conf
 OLD_FILES+=usr/share/examples/etc/auth.conf
 OLD_FILES+=usr/share/man/man3/auth.3.gz
 OLD_FILES+=usr/share/man/man3/auth_getval.3.gz
 OLD_FILES+=usr/share/man/man5/auth.conf.5.gz
 # 20120530: kde pam lives now in ports
 OLD_FILES+=etc/pam.d/kde
 # 20120521: byacc import
 OLD_FILES+=usr/bin/yyfix
 OLD_FILES+=usr/share/man/man1/yyfix.1.gz
 # 20120505: new clang import installed a redundant internal header
 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_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
 OLD_FILES+=usr/share/man/man3/MD2FileChunk.3.gz
 OLD_FILES+=usr/share/man/man3/MD2Final.3.gz
 OLD_FILES+=usr/share/man/man3/MD2Init.3.gz
 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_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
 OLD_FILES+=usr/include/clang/3.0/avxintrin.h
 OLD_FILES+=usr/include/clang/3.0/emmintrin.h
 OLD_FILES+=usr/include/clang/3.0/immintrin.h
 OLD_FILES+=usr/include/clang/3.0/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.0/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.0/mmintrin.h
 OLD_FILES+=usr/include/clang/3.0/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.0/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.0/smmintrin.h
 OLD_FILES+=usr/include/clang/3.0/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.0/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.0/x86intrin.h
 OLD_FILES+=usr/include/clang/3.0/xmmintrin.h
 OLD_DIRS+=usr/include/clang/3.0
 # 20120412: BIND 9.8.1 release notes removed
 OLD_FILES+=usr/share/doc/bind9/RELEASE-NOTES-BIND-9.8.1.pdf
 OLD_FILES+=usr/share/doc/bind9/RELEASE-NOTES-BIND-9.8.1.txt
 OLD_FILES+=usr/share/doc/bind9/RELEASE-NOTES-BIND-9.8.1.html
 OLD_FILES+=usr/share/doc/bind9/release-notes.css
 # 20120330: legacy(4) moved to x86
 OLD_FILES+=usr/include/machine/legacyvar.h
 # 20120324: MPI headers updated
 OLD_FILES+=usr/include/dev/mpt/mpilib/mpi_inb.h
 # 20120322: hwpmc_mips24k.h removed
 OLD_FILES+=usr/include/dev/hwpmc/hwpmc_mips24k.h
 # 20120322: Update heimdal to 1.5.1
 OLD_FILES+=usr/include/krb5-v4compat.h \
 	usr/include/krb_err.h \
 	usr/include/hdb-private.h \
         usr/share/man/man3/krb5_addresses.3.gz \
         usr/share/man/man3/krb5_cc_cursor.3.gz \
         usr/share/man/man3/krb5_cc_ops.3.gz \
         usr/share/man/man3/krb5_config.3.gz \
         usr/share/man/man3/krb5_config_get_int_default.3.gz \
         usr/share/man/man3/krb5_context.3.gz \
         usr/share/man/man3/krb5_data.3.gz \
         usr/share/man/man3/krb5_err.3.gz \
         usr/share/man/man3/krb5_errx.3.gz \
         usr/share/man/man3/krb5_keyblock.3.gz \
         usr/share/man/man3/krb5_keytab_entry.3.gz \
         usr/share/man/man3/krb5_kt_cursor.3.gz \
         usr/share/man/man3/krb5_kt_ops.3.gz \
         usr/share/man/man3/krb5_set_warn_dest.3.gz \
         usr/share/man/man3/krb5_verr.3.gz \
         usr/share/man/man3/krb5_verrx.3.gz \
         usr/share/man/man3/krb5_vwarnx.3.gz \
         usr/share/man/man3/krb5_warn.3.gz \
         usr/share/man/man3/krb5_warnx.3.gz
 OLD_LIBS+=usr/lib/libasn1.so.10 \
 	usr/lib/libhdb.so.10 \
 	usr/lib/libheimntlm.so.10 \
 	usr/lib/libhx509.so.10 \
 	usr/lib/libkadm5clnt.so.10 \
 	usr/lib/libkadm5srv.so.10 \
 	usr/lib/libkafs5.so.10 \
 	usr/lib/libkrb5.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
 # 20120304: xlocale cleanup
 OLD_FILES+=usr/include/_xlocale_ctype.h
 # 20120225: libarchive 3.0.3
 OLD_FILES+=usr/share/man/man3/archive_read_data_into_buffer.3.gz \
 	usr/share/man/man3/archive_read_support_compression_all.3.gz \
 	usr/share/man/man3/archive_read_support_compression_bzip2.3.gz \
 	usr/share/man/man3/archive_read_support_compression_compress.3.gz \
 	usr/share/man/man3/archive_read_support_compression_gzip.3.gz \
 	usr/share/man/man3/archive_read_support_compression_lzma.3.gz \
 	usr/share/man/man3/archive_read_support_compression_none.3.gz \
 	usr/share/man/man3/archive_read_support_compression_program.3.gz \
 	usr/share/man/man3/archive_read_support_compression_program_signature.3.gz \
 	usr/share/man/man3/archive_read_support_compression_xz.3.gz \
 	usr/share/man/man3/archive_write_set_callbacks.3.gz \
 	usr/share/man/man3/archive_write_set_compression_bzip2.3.gz \
 	usr/share/man/man3/archive_write_set_compression_compress.3.gz \
 	usr/share/man/man3/archive_write_set_compression_gzip.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
 # 20120113: removal of wtmpcvt(1)
 OLD_FILES+=usr/bin/wtmpcvt
 OLD_FILES+=usr/share/man/man1/wtmpcvt.1.gz
 # 20111214: eventtimers(7) moved to eventtimers(4)
 OLD_FILES+=usr/share/man/man7/eventtimers.7.gz
 # 20111125: amd(4) removed
 OLD_FILES+=usr/share/man/man4/amd.4.gz
 # 20111125: libodialog removed
 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
 # 20110930: sysinstall removed
 OLD_FILES+=usr/sbin/sysinstall
 OLD_FILES+=usr/share/man/man8/sysinstall.8.gz
 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/include/ftpio.h
 OLD_FILES+=usr/share/man/man3/ftpio.3.gz
 # 20110915: rename congestion control manpages
 OLD_FILES+=usr/share/man/man9/cc.9.gz
 # 20110831: atomic page flags operations
 OLD_FILES+=usr/share/man/man9/vm_page_flag.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_flag_clear.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_flag_set.9.gz
 # 20110828: library version bump for 9.0
 OLD_LIBS+=lib/libcam.so.5
 OLD_LIBS+=lib/libpcap.so.7
 OLD_LIBS+=lib/libufs.so.5
 OLD_LIBS+=usr/lib/libbsnmp.so.5
 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
 # 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
 OLD_FILES+=usr/share/man/man4/afd.4.gz
 OLD_FILES+=usr/share/man/man4/ast.4.gz
 # 20110718: no longer useful in the age of rc.d
 OLD_FILES+=usr/sbin/named.reconfig
 OLD_FILES+=usr/sbin/named.reload
 OLD_FILES+=usr/share/man/man8/named.reconfig.8.gz
 OLD_FILES+=usr/share/man/man8/named.reload.8.gz
 # 20110716: bind 9.8.0 import
 OLD_LIBS+=usr/lib/liblwres.so.50
 OLD_FILES+=usr/share/doc/bind9/KNOWN-DEFECTS
 OLD_FILES+=usr/share/doc/bind9/NSEC3-NOTES
 OLD_FILES+=usr/share/doc/bind9/README.idnkit
 OLD_FILES+=usr/share/doc/bind9/README.pkcs11
 # 20110709: vm_map_clean.9 -> vm_map_sync.9
 OLD_FILES+=usr/share/man/man9/vm_map_clean.9.gz
 # 20110709: Catch up with removal of these functions
 OLD_FILES+=usr/share/man/man9/vm_page_copy.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_protect.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_zero_fill.9.gz
 # 20110707: script no longer needed by /etc/rc.d/nfsd
 OLD_FILES+=etc/rc.d/nfsserver
 # 20110705: files moved so both NFS clients can share them
 OLD_FILES+=usr/include/nfsclient/krpc.h
 OLD_FILES+=usr/include/nfsclient/nfsdiskless.h
 # 20110705: the switch of default NFS client to the new one
 OLD_FILES+=sbin/mount_newnfs
 OLD_FILES+=usr/share/man/man8/mount_newnfs.8.gz
 OLD_FILES+=usr/include/nfsclient/nfs_kdtrace.h
 # 20110628: calendar.msk removed
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.msk
 # 20110517: libpkg removed
 OLD_FILES+=usr/include/pkg.h
 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
 # 20110517: libsbuf version bump
 OLD_LIBS+=lib/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
 OLD_FILES+=usr/include/clang/2.9/mmintrin.h
 OLD_FILES+=usr/include/clang/2.9/pmmintrin.h
 OLD_FILES+=usr/include/clang/2.9/tmmintrin.h
 OLD_FILES+=usr/include/clang/2.9/xmmintrin.h
 OLD_DIRS+=usr/include/clang/2.9
 # 20110417: removal of Objective-C support
 OLD_FILES+=usr/include/objc/encoding.h
 OLD_FILES+=usr/include/objc/hash.h
 OLD_FILES+=usr/include/objc/NXConstStr.h
 OLD_FILES+=usr/include/objc/objc-api.h
 OLD_FILES+=usr/include/objc/objc-decls.h
 OLD_FILES+=usr/include/objc/objc-list.h
 OLD_FILES+=usr/include/objc/objc.h
 OLD_FILES+=usr/include/objc/Object.h
 OLD_FILES+=usr/include/objc/Protocol.h
 OLD_FILES+=usr/include/objc/runtime.h
 OLD_FILES+=usr/include/objc/sarray.h
 OLD_FILES+=usr/include/objc/thr.h
 OLD_FILES+=usr/include/objc/typedstream.h
 OLD_FILES+=usr/lib/libobjc.a
 OLD_FILES+=usr/lib/libobjc.so
 OLD_FILES+=usr/lib/libobjc_p.a
 OLD_FILES+=usr/libexec/cc1obj
 OLD_LIBS+=usr/lib/libobjc.so.4
 OLD_DIRS+=usr/include/objc
 # 20110331: firmware.img created at build time
 OLD_FILES+=usr/share/examples/kld/firmware/fwimage/firmware.img
 # 20110224: sticky.8 -> sticky.7
 OLD_FILES+=usr/share/man/man8/sticky.8.gz
 # 20110220: new clang import which bumps version from 2.8 to 2.9
 OLD_FILES+=usr/include/clang/2.8/emmintrin.h
 OLD_FILES+=usr/include/clang/2.8/mm_malloc.h
 OLD_FILES+=usr/include/clang/2.8/mmintrin.h
 OLD_FILES+=usr/include/clang/2.8/pmmintrin.h
 OLD_FILES+=usr/include/clang/2.8/tmmintrin.h
 OLD_FILES+=usr/include/clang/2.8/xmmintrin.h
 OLD_DIRS+=usr/include/clang/2.8
 # 20110119: netinet/sctp_cc_functions.h removed
 OLD_FILES+=usr/include/netinet/sctp_cc_functions.h
 # 20110119: Remove SYSCTL_*X* sysctl additions
 OLD_FILES+=usr/share/man/man9/SYSCTL_XINT.9.gz \
     usr/share/man/man9/SYSCTL_XLONG.9.gz
 
 # 20110112: Update dialog to new version, rename old libdialog to libodialog,
 #     removing associated man pages and header files.
 OLD_FILES+=usr/share/man/man3/draw_shadow.3.gz \
     usr/share/man/man3/draw_box.3.gz usr/share/man/man3/line_edit.3.gz \
     usr/share/man/man3/strheight.3.gz usr/share/man/man3/strwidth.3.gz \
     usr/share/man/man3/dialog_create_rc.3.gz \
     usr/share/man/man3/dialog_yesno.3.gz usr/share/man/man3/dialog_noyes.3.gz \
     usr/share/man/man3/dialog_prgbox.3.gz \
     usr/share/man/man3/dialog_textbox.3.gz usr/share/man/man3/dialog_menu.3.gz \
     usr/share/man/man3/dialog_checklist.3.gz \
     usr/share/man/man3/dialog_radiolist.3.gz \
     usr/share/man/man3/dialog_inputbox.3.gz \
     usr/share/man/man3/dialog_clear_norefresh.3.gz \
     usr/share/man/man3/dialog_clear.3.gz usr/share/man/man3/dialog_update.3.gz \
     usr/share/man/man3/dialog_fselect.3.gz \
     usr/share/man/man3/dialog_notify.3.gz \
     usr/share/man/man3/dialog_mesgbox.3.gz \
     usr/share/man/man3/dialog_gauge.3.gz usr/share/man/man3/init_dialog.3.gz \
     usr/share/man/man3/end_dialog.3.gz usr/share/man/man3/use_helpfile.3.gz \
     usr/share/man/man3/use_helpline.3.gz usr/share/man/man3/get_helpline.3.gz \
     usr/share/man/man3/restore_helpline.3.gz \
     usr/share/man/man3/dialog_msgbox.3.gz \
     usr/share/man/man3/dialog_ftree.3.gz usr/share/man/man3/dialog_tree.3.gz \
     usr/share/examples/dialog/README usr/share/examples/dialog/checklist \
     usr/share/examples/dialog/ftreebox usr/share/examples/dialog/infobox \
     usr/share/examples/dialog/inputbox usr/share/examples/dialog/menubox \
     usr/share/examples/dialog/msgbox usr/share/examples/dialog/prgbox \
     usr/share/examples/dialog/radiolist usr/share/examples/dialog/textbox \
     usr/share/examples/dialog/treebox usr/share/examples/dialog/yesno \
     usr/share/examples/libdialog/Makefile usr/share/examples/libdialog/check1.c\
     usr/share/examples/libdialog/check2.c usr/share/examples/libdialog/check3.c\
     usr/share/examples/libdialog/dselect.c \
     usr/share/examples/libdialog/fselect.c \
     usr/share/examples/libdialog/ftree1.c \
     usr/share/examples/libdialog/ftree1.test \
     usr/share/examples/libdialog/ftree2.c \
     usr/share/examples/libdialog/ftree2.test \
     usr/share/examples/libdialog/gauge.c usr/share/examples/libdialog/input1.c \
     usr/share/examples/libdialog/input2.c usr/share/examples/libdialog/menu1.c \
     usr/share/examples/libdialog/menu2.c usr/share/examples/libdialog/menu3.c \
     usr/share/examples/libdialog/msg.c usr/share/examples/libdialog/prgbox.c \
     usr/share/examples/libdialog/radio1.c usr/share/examples/libdialog/radio2.c\
     usr/share/examples/libdialog/radio3.c usr/share/examples/libdialog/text.c \
     usr/share/examples/libdialog/tree.c usr/share/examples/libdialog/yesno.c
 OLD_DIRS+=usr/share/examples/libdialog usr/share/examples/dialog
 # 20101114: Remove long-obsolete MAKEDEV.8
 OLD_FILES+=usr/share/man/man8/MAKEDEV.8.gz
 # 20101112: vgonel(9) has gone to private API a while ago
 OLD_FILES+=usr/share/man/man9/vgonel.9.gz
 # 20101112: removed gasp.info
 OLD_FILES+=usr/share/info/gasp.info.gz
 # 20101109: machine/mutex.h removed
 OLD_FILES+=usr/include/machine/mutex.h
 # 20101109: headers moved from machine/ to x86/
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/mptable.h
 .endif
 # 20101101: headers moved from machine/ to x86/
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/apicreg.h
 OLD_FILES+=usr/include/machine/mca.h
 .endif
 # 20101020: catch up with vm_page_sleep_if_busy rename
 OLD_FILES+=usr/share/man/man9/vm_page_sleep_busy.9.gz
 # 20101018: taskqueue(9) updates
 OLD_FILES+=usr/share/man/man9/taskqueue_find.9.gz
 # 20101011: removed subblock.h from liblzma
 OLD_FILES+=usr/include/lzma/subblock.h
 # 20101002: removed manpath.config
 OLD_FILES+=etc/manpath.config
 OLD_FILES+=usr/share/examples/etc/manpath.config
 # 20100910: renamed sbuf_overflowed to sbuf_error
 OLD_FILES+=usr/share/man/man9/sbuf_overflowed.9.gz
 # 20100815: retired last traces of chooseproc(9)
 OLD_FILES+=usr/share/man/man9/chooseproc.9.gz
 # 20100806: removal of unused libcompat routines
 OLD_FILES+=usr/share/man/man3/ascftime.3.gz
 OLD_FILES+=usr/share/man/man3/cfree.3.gz
 OLD_FILES+=usr/share/man/man3/cftime.3.gz
 OLD_FILES+=usr/share/man/man3/getpw.3.gz
 # 20100725: acpi_aiboost(4) removal
 OLD_FILES+=usr/share/man/man4/acpi_aiboost.4.gz
 # 20100724: nfsclient/nfs_lock.h moved to nfs/nfs_lock.h
 OLD_FILES+=usr/include/nfsclient/nfs_lock.h
 # 20100720: new clang import which bumps version from 2.0 to 2.8
 OLD_FILES+=usr/include/clang/2.0/emmintrin.h
 OLD_FILES+=usr/include/clang/2.0/mm_malloc.h
 OLD_FILES+=usr/include/clang/2.0/mmintrin.h
 OLD_FILES+=usr/include/clang/2.0/pmmintrin.h
 OLD_FILES+=usr/include/clang/2.0/tmmintrin.h
 OLD_FILES+=usr/include/clang/2.0/xmmintrin.h
 OLD_DIRS+=usr/include/clang/2.0
 # 20100706: removed pc-sysinstall's detect-vmware.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-vmware.sh
 # 20100701: [powerpc] removed <machine/intr.h>
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=usr/include/machine/intr.h
 .endif
 # 20100514: library version bump for versioned symbols for liblzma
 OLD_LIBS+=usr/lib/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
 OLD_FILES+=usr/include/mm_malloc.h
 OLD_FILES+=usr/include/pmmintrin.h
 OLD_FILES+=usr/include/xmmintrin.h
 .endif
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "arm"
 OLD_FILES+=usr/include/mmintrin.h
 .endif
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=usr/include/altivec.h
 OLD_FILES+=usr/include/ppc-asm.h
 OLD_FILES+=usr/include/spe.h
 .endif
 # 20100416: [mips] removed <machine/psl.h>
 .if ${TARGET_ARCH} == "mips"
 OLD_FILES+=usr/include/machine/psl.h
 .endif
 # 20100415: [mips] removed unused headers
 .if ${TARGET_ARCH} == "mips"
 OLD_FILES+=usr/include/machine/archtype.h
 OLD_FILES+=usr/include/machine/segments.h
 OLD_FILES+=usr/include/machine/rm7000.h
 OLD_FILES+=usr/include/machine/defs.h
 OLD_FILES+=usr/include/machine/queue.h
 .endif
 # 20100326: gcpio removal
 OLD_FILES+=usr/bin/gcpio
 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
 # 20100314: removal of regexp.h
 OLD_FILES+=usr/include/regexp.h
 OLD_FILES+=usr/share/man/man3/regexp.3.gz
 OLD_FILES+=usr/share/man/man3/regsub.3.gz
 # 20100303: actual removal of utmp.h
 OLD_FILES+=usr/include/utmp.h
 # 20100208: man pages moved
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/share/man/man4/i386/alpm.4.gz
 OLD_FILES+=usr/share/man/man4/i386/amdpm.4.gz
 OLD_FILES+=usr/share/man/man4/i386/mcd.4.gz
 OLD_FILES+=usr/share/man/man4/i386/padlock.4.gz
 OLD_FILES+=usr/share/man/man4/i386/pcf.4.gz
 OLD_FILES+=usr/share/man/man4/i386/scd.4.gz
 OLD_FILES+=usr/share/man/man4/i386/viapm.4.gz
 .endif
 # 20100122: move BSDL bc/dc USD documents to /usr/share/doc/usd
 OLD_FILES+=usr/share/doc/papers/bc.ascii.gz
 OLD_FILES+=usr/share/doc/papers/dc.ascii.gz
 # 20100120: replacing GNU bc/dc with BSDL versions
 OLD_FILES+=usr/share/examples/bc/ckbook.b
 OLD_FILES+=usr/share/examples/bc/pi.b
 OLD_FILES+=usr/share/examples/bc/primes.b
 OLD_FILES+=usr/share/examples/bc/twins.b
 OLD_FILES+=usr/share/info/dc.info.gz
 OLD_DIRS+=usr/share/examples/bc
 # 20100114: removal of ttyslot(3)
 OLD_FILES+=usr/share/man/man3/ttyslot.3.gz
 # 20100113: remove utmp.h, replace it by utmpx.h
 OLD_FILES+=usr/share/man/man3/login.3.gz
 OLD_FILES+=usr/share/man/man3/logout.3.gz
 OLD_FILES+=usr/share/man/man3/logwtmp.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_endutxent.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_getutxent.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_getutxline.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_getutxuser.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_pututxline.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_setutxent.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_setutxfile.3.gz
 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
 # 20100105: new userland semaphore implementation
 OLD_FILES+=usr/include/sys/semaphore.h
 # 20100103: ntptrace(8) removed
 OLD_FILES+=usr/sbin/ntptrace
 OLD_FILES+=usr/share/man/man8/ntptrace.8.gz
 # 20091229: remove no longer relevant examples
 OLD_FILES+=usr/share/examples/pppd/auth-down.sample
 OLD_FILES+=usr/share/examples/pppd/auth-up.sample
 OLD_FILES+=usr/share/examples/pppd/chap-secrets.sample
 OLD_FILES+=usr/share/examples/pppd/chat.sh.sample
 OLD_FILES+=usr/share/examples/pppd/ip-down.sample
 OLD_FILES+=usr/share/examples/pppd/ip-up.sample
 OLD_FILES+=usr/share/examples/pppd/options.sample
 OLD_FILES+=usr/share/examples/pppd/pap-secrets.sample
 OLD_FILES+=usr/share/examples/pppd/ppp.deny.sample
 OLD_FILES+=usr/share/examples/pppd/ppp.shells.sample
 OLD_DIRS+=usr/share/examples/pppd
 OLD_FILES+=usr/share/examples/slattach/unit-command.sh
 OLD_DIRS+=usr/share/examples/slattach
 OLD_FILES+=usr/share/examples/sliplogin/slip.hosts
 OLD_FILES+=usr/share/examples/sliplogin/slip.login
 OLD_FILES+=usr/share/examples/sliplogin/slip.logout
 OLD_FILES+=usr/share/examples/sliplogin/slip.slparms
 OLD_DIRS+=usr/share/examples/sliplogin
 OLD_FILES+=usr/share/examples/startslip/sldown.sh
 OLD_FILES+=usr/share/examples/startslip/slip.sh
 OLD_FILES+=usr/share/examples/startslip/slup.sh
 OLD_DIRS+=usr/share/examples/startslip
 # 20091202: unify rc.firewall and rc.firewall6
 OLD_FILES+=etc/rc.d/ip6fw
 OLD_FILES+=etc/rc.firewall6
 OLD_FILES+=usr/share/examples/etc/rc.firewall6
 # 20091117: removal of rc.early(8) link
 OLD_FILES+=usr/share/man/man8/rc.early.8.gz
 # 20091027: pselect.3 implemented as syscall
 OLD_FILES+=usr/share/man/man3/pselect.3.gz
 # 20091005: fusword.9 and susword.9 removed
 OLD_FILES+=usr/share/man/man9/fusword.9.gz
 OLD_FILES+=usr/share/man/man9/susword.9.gz
 # 20090909: vesa and dpms promoted to be i386/amd64 common
 OLD_FILES+=usr/include/machine/pc/vesa.h
 OLD_FILES+=usr/share/man/man4/i386/dpms.4.gz
 # 20090904: remove lukemftpd
 OLD_FILES+=usr/libexec/lukemftpd
 OLD_FILES+=usr/share/man/man5/ftpd.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ftpusers.5.gz
 OLD_FILES+=usr/share/man/man8/lukemftpd.8.gz
 # 20090902: BSD.{x11,x11-4}.dist are dead and BSD.local.dist lives in ports/
 OLD_FILES+=etc/mtree/BSD.local.dist
 OLD_FILES+=etc/mtree/BSD.x11.dist
 OLD_FILES+=etc/mtree/BSD.x11-4.dist
 # 20090812: net80211 documentation overhaul
 OLD_FILES+=usr/share/man/man9/ieee80211_add_rates.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_add_xrates.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_alloc_node.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_attach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_begin_scan.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_cfgget.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_cfgset.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_chan2ieee.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_chan2mode.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_create_ibss.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_crypto_attach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_crypto_detach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_decap.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_dump_pkt.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_dup_bss.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_encap.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_end_scan.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_find_node.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_fix_rate.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_free_allnodes.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_ieee2mhz.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_ioctl.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_lookup_node.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_media2rate.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_media_change.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_media_init.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_media_status.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_mhz2ieee.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_next_scan.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_node_attach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_node_detach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_node_lateattach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_print_essid.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_proto_attach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_proto_detach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_rate2media.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_recv_mgmt.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_send_mgmt.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_setmode.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_timeout_nodes.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_watchdog.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_wep_crypt.9.gz
 # 20090801: vimage.h removed in favour of vnet.h
 OLD_FILES+=usr/include/sys/vimage.h
 # 20101208: libbsnmp was moved to usr/lib
 MOVED_LIBS+=lib/libbsnmp.so.5
 # 20090719: library version bump for 8.0
 OLD_LIBS+=lib/libalias.so.6
 OLD_LIBS+=lib/libavl.so.1
 OLD_LIBS+=lib/libbegemot.so.3
 OLD_LIBS+=lib/libbsdxml.so.3
 OLD_LIBS+=lib/libbsnmp.so.4
 OLD_LIBS+=lib/libcam.so.4
 OLD_LIBS+=lib/libcrypt.so.4
 OLD_LIBS+=lib/libcrypto.so.5
 OLD_LIBS+=lib/libctf.so.1
 OLD_LIBS+=lib/libdevstat.so.6
 OLD_LIBS+=lib/libdtrace.so.1
 OLD_LIBS+=lib/libedit.so.6
 OLD_LIBS+=lib/libgeom.so.4
 OLD_LIBS+=lib/libipsec.so.3
 OLD_LIBS+=lib/libipx.so.4
 OLD_LIBS+=lib/libkiconv.so.3
 OLD_LIBS+=lib/libkvm.so.4
 OLD_LIBS+=lib/libmd.so.4
 OLD_LIBS+=lib/libncurses.so.7
 OLD_LIBS+=lib/libncursesw.so.7
 OLD_LIBS+=lib/libnvpair.so.1
 OLD_LIBS+=lib/libpcap.so.6
 OLD_LIBS+=lib/libreadline.so.7
 OLD_LIBS+=lib/libsbuf.so.4
 OLD_LIBS+=lib/libufs.so.4
 OLD_LIBS+=lib/libumem.so.1
 OLD_LIBS+=lib/libutil.so.7
 OLD_LIBS+=lib/libuutil.so.1
 OLD_LIBS+=lib/libz.so.4
 OLD_LIBS+=lib/libzfs.so.1
 OLD_LIBS+=lib/libzpool.so.1
 OLD_LIBS+=usr/lib/libarchive.so.4
 OLD_LIBS+=usr/lib/libauditd.so.4
 OLD_LIBS+=usr/lib/libbluetooth.so.3
 OLD_LIBS+=usr/lib/libbsm.so.2
 OLD_LIBS+=usr/lib/libbz2.so.3
 OLD_LIBS+=usr/lib/libcalendar.so.4
 OLD_LIBS+=usr/lib/libcom_err.so.4
 OLD_LIBS+=usr/lib/libdevinfo.so.4
 OLD_LIBS+=usr/lib/libdialog.so.6
 OLD_LIBS+=usr/lib/libdwarf.so.1
 OLD_LIBS+=usr/lib/libfetch.so.5
 OLD_LIBS+=usr/lib/libform.so.4
 OLD_LIBS+=usr/lib/libformw.so.4
 OLD_LIBS+=usr/lib/libftpio.so.7
 OLD_LIBS+=usr/lib/libgnuregex.so.4
 OLD_LIBS+=usr/lib/libgpib.so.2
 OLD_LIBS+=usr/lib/libhistory.so.7
 OLD_LIBS+=usr/lib/libmagic.so.3
 OLD_LIBS+=usr/lib/libmemstat.so.2
 OLD_LIBS+=usr/lib/libmenu.so.4
 OLD_LIBS+=usr/lib/libmenuw.so.4
 OLD_LIBS+=usr/lib/libmilter.so.4
 OLD_LIBS+=usr/lib/libncp.so.3
 OLD_LIBS+=usr/lib/libnetgraph.so.3
 OLD_LIBS+=usr/lib/libngatm.so.3
 OLD_LIBS+=usr/lib/libobjc.so.3
 OLD_LIBS+=usr/lib/libopie.so.5
 OLD_LIBS+=usr/lib/libpam.so.4
 OLD_LIBS+=usr/lib/libpanel.so.4
 OLD_LIBS+=usr/lib/libpanelw.so.4
 OLD_LIBS+=usr/lib/libpmc.so.4
 OLD_LIBS+=usr/lib/libproc.so.1
 OLD_LIBS+=usr/lib/libradius.so.3
 OLD_LIBS+=usr/lib/librpcsvc.so.4
 OLD_LIBS+=usr/lib/libsdp.so.3
 OLD_LIBS+=usr/lib/libsmb.so.3
 OLD_LIBS+=usr/lib/libssh.so.4
 OLD_LIBS+=usr/lib/libssl.so.5
 OLD_LIBS+=usr/lib/libtacplus.so.3
 OLD_LIBS+=usr/lib/libugidfw.so.3
 OLD_LIBS+=usr/lib/libusb.so.1
 OLD_LIBS+=usr/lib/libusbhid.so.3
 OLD_LIBS+=usr/lib/libvgl.so.5
 OLD_LIBS+=usr/lib/libwrap.so.5
 OLD_LIBS+=usr/lib/libypclnt.so.3
 OLD_LIBS+=usr/lib/pam_chroot.so.4
 OLD_LIBS+=usr/lib/pam_deny.so.4
 OLD_LIBS+=usr/lib/pam_echo.so.4
 OLD_LIBS+=usr/lib/pam_exec.so.4
 OLD_LIBS+=usr/lib/pam_ftpusers.so.4
 OLD_LIBS+=usr/lib/pam_group.so.4
 OLD_LIBS+=usr/lib/pam_guest.so.4
 OLD_LIBS+=usr/lib/pam_krb5.so.4
 OLD_LIBS+=usr/lib/pam_ksu.so.4
 OLD_LIBS+=usr/lib/pam_lastlog.so.4
 OLD_LIBS+=usr/lib/pam_login_access.so.4
 OLD_LIBS+=usr/lib/pam_nologin.so.4
 OLD_LIBS+=usr/lib/pam_opie.so.4
 OLD_LIBS+=usr/lib/pam_opieaccess.so.4
 OLD_LIBS+=usr/lib/pam_passwdqc.so.4
 OLD_LIBS+=usr/lib/pam_permit.so.4
 OLD_LIBS+=usr/lib/pam_radius.so.4
 OLD_LIBS+=usr/lib/pam_rhosts.so.4
 OLD_LIBS+=usr/lib/pam_rootok.so.4
 OLD_LIBS+=usr/lib/pam_securetty.so.4
 OLD_LIBS+=usr/lib/pam_self.so.4
 OLD_LIBS+=usr/lib/pam_ssh.so.4
 OLD_LIBS+=usr/lib/pam_tacplus.so.4
 OLD_LIBS+=usr/lib/pam_unix.so.4
 OLD_LIBS+=usr/lib/snmp_atm.so.5
 OLD_LIBS+=usr/lib/snmp_bridge.so.5
 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
 # 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)
 OLD_FILES+=usr/share/man/man9/net_add_domain.9.gz
 # 20090713: vimage container structs removed
 OLD_FILES+=usr/include/netinet/vinet.h
 OLD_FILES+=usr/include/netinet6/vinet6.h
 OLD_FILES+=usr/include/netipsec/vipsec.h
 # 20090712: ieee80211.4 -> net80211.4
 OLD_FILES+=usr/share/man/man4/ieee80211.4.gz
 # 20090711: typo fixed, kproc_resume,.9 -> kproc_resume.9
 OLD_FILES+=usr/share/man/man9/kproc_resume,.9.gz
 # 20090709: msgctl.3 msgget.3 msgrcv.3 msgsnd.3 manual pages moved
 OLD_FILES+=usr/share/man/man3/msgctl.3.gz
 OLD_FILES+=usr/share/man/man3/msgget.3.gz
 OLD_FILES+=usr/share/man/man3/msgrcv.3.gz
 OLD_FILES+=usr/share/man/man3/msgsnd.3.gz
 # 20090630: old kernel RPC implementation removal
 OLD_FILES+=usr/include/nfs/rpcv2.h
 # 20090624: update usbdi(9)
 OLD_FILES+=usr/share/man/man9/usbd_abort_default_pipe.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_abort_pipe.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_alloc_buffer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_alloc_xfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_stall.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_stall_async.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_toggle.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_close_pipe.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_device2interface_handle.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_do_request_async.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_do_request_flags_pipe.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_endpoint_count.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_find_edesc.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_find_idesc.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_free_buffer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_free_xfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_buffer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_config.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_config_desc.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_config_desc_full.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_config_descriptor.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_device_descriptor.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_endpoint_descriptor.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_interface_altindex.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_interface_descriptor.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_no_alts.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_quirks.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_speed.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_string.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_string_desc.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_xfer_status.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_interface2device_handle.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_interface2endpoint_descriptor.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_interface_count.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_open_pipe.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_open_pipe_intr.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_pipe2device_handle.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_set_config_index.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_set_config_no.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_set_interface.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_setup_default_xfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_setup_isoc_xfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_setup_xfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_sync_transfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer.9.gz
 OLD_FILES+=usr/share/man/man9/usb_find_desc.9.gz
 # 20090623: number of headers needed for a usb driver reduced
 OLD_FILES+=usr/include/dev/usb/usb_defs.h
 OLD_FILES+=usr/include/dev/usb/usb_error.h
 OLD_FILES+=usr/include/dev/usb/usb_handle_request.h
 OLD_FILES+=usr/include/dev/usb/usb_hid.h
 OLD_FILES+=usr/include/dev/usb/usb_lookup.h
 OLD_FILES+=usr/include/dev/usb/usb_mfunc.h
 OLD_FILES+=usr/include/dev/usb/usb_parse.h
 OLD_FILES+=usr/include/dev/usb/usb_revision.h
 # 20090609: devclass_add_driver is no longer public
 OLD_FILES+=usr/share/man/man9/devclass_add_driver.9.gz
 OLD_FILES+=usr/share/man/man9/devclass_delete_driver.9.gz
 OLD_FILES+=usr/share/man/man9/devclass_find_driver.9.gz
 # 20090605: removal of clists
 OLD_FILES+=usr/include/sys/clist.h
 # 20090602: removal of window(1)
 OLD_FILES+=usr/bin/window
 OLD_FILES+=usr/share/man/man1/window.1.gz
 # 20090531: bind 9.6.1rc1 import
 OLD_LIBS+=usr/lib/liblwres.so.30
 # 20090530: removal of early.sh
 OLD_FILES+=etc/rc.d/early.sh
 # 20090527: renaming of S{LIST,TAILQ}_REMOVE_NEXT() to _REMOVE_AFTER()
 OLD_FILES+=usr/share/man/man3/SLIST_REMOVE_NEXT.3.gz
 OLD_FILES+=usr/share/man/man3/STAILQ_REMOVE_NEXT.3.gz
 # 20090527: removal of legacy USB stack
 OLD_FILES+=usr/include/legacy/dev/usb/dsbr100io.h
 OLD_FILES+=usr/include/legacy/dev/usb/ehcireg.h
 OLD_FILES+=usr/include/legacy/dev/usb/ehcivar.h
 OLD_FILES+=usr/include/legacy/dev/usb/hid.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_urtwreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_urtwvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/ohcireg.h
 OLD_FILES+=usr/include/legacy/dev/usb/ohcivar.h
 OLD_FILES+=usr/include/legacy/dev/usb/rio500_usb.h
 OLD_FILES+=usr/include/legacy/dev/usb/rt2573_ucode.h
 OLD_FILES+=usr/include/legacy/dev/usb/sl811hsreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/sl811hsvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/ubser.h
 OLD_FILES+=usr/include/legacy/dev/usb/ucomvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/udbp.h
 OLD_FILES+=usr/include/legacy/dev/usb/uftdireg.h
 OLD_FILES+=usr/include/legacy/dev/usb/ugraphire_rdesc.h
 OLD_FILES+=usr/include/legacy/dev/usb/uhcireg.h
 OLD_FILES+=usr/include/legacy/dev/usb/uhcivar.h
 OLD_FILES+=usr/include/legacy/dev/usb/usb.h
 OLD_FILES+=usr/include/legacy/dev/usb/usb_mem.h
 OLD_FILES+=usr/include/legacy/dev/usb/usb_port.h
 OLD_FILES+=usr/include/legacy/dev/usb/usb_quirks.h
 OLD_FILES+=usr/include/legacy/dev/usb/usbcdc.h
 OLD_FILES+=usr/include/legacy/dev/usb/usbdi.h
 OLD_FILES+=usr/include/legacy/dev/usb/usbdi_util.h
 OLD_FILES+=usr/include/legacy/dev/usb/usbdivar.h
 OLD_FILES+=usr/include/legacy/dev/usb/usbhid.h
 OLD_FILES+=usr/include/legacy/dev/usb/uxb360gp_rdesc.h
 OLD_DIRS+=usr/include/legacy/dev/usb
 OLD_DIRS+=usr/include/legacy/dev
 OLD_DIRS+=usr/include/legacy
 # 20090526: removal of makekey(8)
 OLD_FILES+=usr/libexec/makekey
 OLD_FILES+=usr/share/man/man8/makekey.8.gz
 # 20090522: removal of University of Michigan NFSv4 client
 OLD_FILES+=etc/rc.d/idmapd
 OLD_FILES+=sbin/idmapd
 OLD_FILES+=sbin/mount_nfs4
 OLD_FILES+=usr/share/man/man8/idmapd.8.gz
 OLD_FILES+=usr/share/man/man8/mount_nfs4.8.gz
 # 20090513: removal of legacy versions of USB network interface drivers
 OLD_FILES+=usr/include/legacy/dev/usb/if_upgtvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/usb_ethersubr.h
 # 20090417: removal of legacy versions of USB network interface drivers
 OLD_FILES+=usr/include/legacy/dev/usb/if_auereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_axereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_cdcereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_cuereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_kuereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_ruereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_rumreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_rumvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_udavreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_uralreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_uralvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_zydfw.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_zydreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/kue_fw.h
 # 20090416: removal of ar(4), ray(4), sr(4), raycontrol(8)
 OLD_FILES+=usr/sbin/raycontrol
 OLD_FILES+=usr/share/man/man4/i386/ar.4.gz
 OLD_FILES+=usr/share/man/man4/i386/ray.4.gz
 OLD_FILES+=usr/share/man/man4/i386/sr.4.gz
 OLD_FILES+=usr/share/man/man8/raycontrol.8.gz
 # 20090410: VOP_LEASE.9 removed
 OLD_FILES+=usr/share/man/man9/VOP_LEASE.9.gz
 # 20090406: usb_sw_transfer.h removed
 OLD_FILES+=usr/include/dev/usb/usb_sw_transfer.h
 # 20090405: removal of if_ppp(4) and if_sl(4)
 OLD_FILES+=sbin/slattach rescue/slattach
 OLD_FILES+=sbin/startslip rescue/startslip
 OLD_FILES+=usr/include/net/if_ppp.h
 OLD_FILES+=usr/include/net/if_pppvar.h
 OLD_FILES+=usr/include/net/if_slvar.h
 OLD_FILES+=usr/include/net/ppp_comp.h
 OLD_FILES+=usr/include/net/slip.h
 OLD_FILES+=usr/sbin/sliplogin
 OLD_FILES+=usr/sbin/slstat
 OLD_FILES+=usr/sbin/pppd
 OLD_FILES+=usr/sbin/pppstats
 OLD_FILES+=usr/share/man/man1/startslip.1.gz
 OLD_FILES+=usr/share/man/man4/if_ppp.4.gz
 OLD_FILES+=usr/share/man/man4/if_sl.4.gz
 OLD_FILES+=usr/share/man/man4/ppp.4.gz
 OLD_FILES+=usr/share/man/man4/sl.4.gz
 OLD_FILES+=usr/share/man/man8/pppd.8.gz
 OLD_FILES+=usr/share/man/man8/pppstats.8.gz
 OLD_FILES+=usr/share/man/man8/slattach.8.gz
 OLD_FILES+=usr/share/man/man8/slip.8.gz
 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
 # 20090319: uscanner(4) has been removed
 OLD_FILES+=usr/share/man/man4/uscanner.4.gz
 # 20090313: k8temp(4) renamed to amdtemp(4)
 OLD_FILES+=usr/share/man/man4/k8temp.4.gz
 # 20090308: libusb.so.1 renamed
 OLD_LIBS+=usr/lib/libusb20.so.1
 OLD_FILES+=usr/lib/libusb20.a
 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
 # 20090226: libmp(3) functions renamed
 OLD_LIBS+=usr/lib/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
 OLD_FILES+=usr/include/dev/usb2/include/usb2_cdc.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_defs.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_devid.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_devtable.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_endian.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_error.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_hid.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_ioctl.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_mfunc.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_revision.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_standard.h
 OLD_DIRS+=usr/include/dev/usb2/include
 OLD_DIRS+=usr/include/dev/usb2
 OLD_FILES+=usr/include/dev/usb/dsbr100io.h
 OLD_FILES+=usr/include/dev/usb/ehcireg.h
 OLD_FILES+=usr/include/dev/usb/ehcivar.h
 OLD_FILES+=usr/include/dev/usb/hid.h
 OLD_FILES+=usr/include/dev/usb/if_auereg.h
 OLD_FILES+=usr/include/dev/usb/if_axereg.h
 OLD_FILES+=usr/include/dev/usb/if_cdcereg.h
 OLD_FILES+=usr/include/dev/usb/if_cuereg.h
 OLD_FILES+=usr/include/dev/usb/if_kuereg.h
 OLD_FILES+=usr/include/dev/usb/if_ruereg.h
 OLD_FILES+=usr/include/dev/usb/if_rumreg.h
 OLD_FILES+=usr/include/dev/usb/if_rumvar.h
 OLD_FILES+=usr/include/dev/usb/if_udavreg.h
 OLD_FILES+=usr/include/dev/usb/if_upgtvar.h
 OLD_FILES+=usr/include/dev/usb/if_uralreg.h
 OLD_FILES+=usr/include/dev/usb/if_uralvar.h
 OLD_FILES+=usr/include/dev/usb/if_urtwreg.h
 OLD_FILES+=usr/include/dev/usb/if_urtwvar.h
 OLD_FILES+=usr/include/dev/usb/if_zydfw.h
 OLD_FILES+=usr/include/dev/usb/if_zydreg.h
 OLD_FILES+=usr/include/dev/usb/kue_fw.h
 OLD_FILES+=usr/include/dev/usb/ohcireg.h
 OLD_FILES+=usr/include/dev/usb/ohcivar.h
 OLD_FILES+=usr/include/dev/usb/rio500_usb.h
 OLD_FILES+=usr/include/dev/usb/rt2573_ucode.h
 OLD_FILES+=usr/include/dev/usb/sl811hsreg.h
 OLD_FILES+=usr/include/dev/usb/sl811hsvar.h
 OLD_FILES+=usr/include/dev/usb/ubser.h
 OLD_FILES+=usr/include/dev/usb/ucomvar.h
 OLD_FILES+=usr/include/dev/usb/udbp.h
 OLD_FILES+=usr/include/dev/usb/uftdireg.h
 OLD_FILES+=usr/include/dev/usb/ugraphire_rdesc.h
 OLD_FILES+=usr/include/dev/usb/uhcireg.h
 OLD_FILES+=usr/include/dev/usb/uhcivar.h
 OLD_FILES+=usr/include/dev/usb/usb_ethersubr.h
 OLD_FILES+=usr/include/dev/usb/usb_mem.h
 OLD_FILES+=usr/include/dev/usb/usb_port.h
 OLD_FILES+=usr/include/dev/usb/usb_quirks.h
 OLD_FILES+=usr/include/dev/usb/usbcdc.h
 OLD_FILES+=usr/include/dev/usb/usbdivar.h
 OLD_FILES+=usr/include/dev/usb/uxb360gp_rdesc.h
 OLD_FILES+=usr/sbin/usbdevs
 OLD_FILES+=usr/share/man/man8/usbdevs.8.gz
 # 20090203: removal of pccard header files
 OLD_FILES+=usr/include/pccard/cardinfo.h
 OLD_FILES+=usr/include/pccard/cis.h
 OLD_DIRS+=usr/include/pccard
 # 20090203: adding_user.8 moved to adding_user.7
 OLD_FILES+=usr/share/man/man8/adding_user.8.gz
 # 20090102: file 4.26 import
 OLD_FILES+=usr/share/misc/magic.mime
 OLD_FILES+=usr/share/misc/magic.mime.mgc
 # 20081223: bind 9.4.3 import, nsupdate.8 moved to nsupdate.1
 OLD_FILES+=usr/share/man/man8/nsupdate.8.gz
 # 20081223: ipprotosw.h removed
 OLD_FILES+=usr/include/netinet/ipprotosw.h
 # 20081123: vfs_mountedon.9 removed
 OLD_FILES+=usr/share/man/man9/vfs_mountedon.9.gz
 # 20081023: FREE.9 and MALLOC.9 removed
 OLD_FILES+=usr/share/man/man9/FREE.9.gz
 OLD_FILES+=usr/share/man/man9/MALLOC.9.gz
 # 20080928: removal of inaccurate device_ids(9) manual page
 OLD_FILES+=usr/share/man/man9/device_ids.9.gz
 OLD_FILES+=usr/share/man/man9/major.9.gz
 OLD_FILES+=usr/share/man/man9/minor.9.gz
 OLD_FILES+=usr/share/man/man9/umajor.9.gz
 OLD_FILES+=usr/share/man/man9/uminor.9.gz
 # 20080917: removal of manpage for axed kernel primitive suser(9)
 OLD_FILES+=usr/share/man/man9/suser.9.gz
 OLD_FILES+=usr/share/man/man9/suser_cred.9.gz
 # 20080913: pax removed from rescue
 OLD_FILES+=rescue/pax
 # 20080823: removal of unneeded pt_chown, to implement grantpt(3)
 OLD_FILES+=usr/libexec/pt_chown
 # 20080822: ntp 4.2.4p5 import
 OLD_FILES+=usr/share/doc/ntp/driver23.html
 OLD_FILES+=usr/share/doc/ntp/driver24.html
 # 20080821: several man pages moved from man4.i386 to man4
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/share/man/man4/i386/acpi_aiboost.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_asus.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_fujitsu.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_ibm.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_panasonic.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_sony.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_toshiba.4.gz
 OLD_FILES+=usr/share/man/man4/i386/ichwd.4.gz
 OLD_FILES+=usr/share/man/man4/i386/if_ndis.4.gz
 OLD_FILES+=usr/share/man/man4/i386/io.4.gz
 OLD_FILES+=usr/share/man/man4/i386/linux.4.gz
 OLD_FILES+=usr/share/man/man4/i386/ndis.4.gz
 .endif
 # 20080820: MPSAFE TTY layer integrated
 OLD_FILES+=usr/include/sys/linedisc.h
 OLD_FILES+=usr/share/man/man3/posix_openpt.3.gz
 # 20080725: sgtty.h removed
 OLD_FILES+=usr/include/sgtty.h
 # 20080706: bsdlabel(8) removed on powerpc
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=sbin/bsdlabel
 OLD_FILES+=usr/share/man/man8/bsdlabel.8.gz
 .endif
 # 20080704: sbsh(4) removed
 OLD_FILES+=usr/share/man/man4/if_sbsh.4.gz
 OLD_FILES+=usr/share/man/man4/sbsh.4.gz
 # 20080704: cnw(4) removed
 OLD_FILES+=usr/share/man/man4/if_cnw.4.gz
 OLD_FILES+=usr/share/man/man4/cnw.4.gz
 # 20080704: oltr(4) removed
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/share/man/man4/i386/if_oltr.4.gz
 OLD_FILES+=usr/share/man/man4/i386/oltr.4.gz
 .endif
 # 20080704: arl(4) removed
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/sbin/arlcontrol
 OLD_FILES+=usr/share/man/man4/i386/arl.4.gz
 OLD_FILES+=usr/share/man/man8/arlcontrol.8.gz
 .endif
 # 20080703: sunlabel only for sparc64
 .if ${TARGET_ARCH} != "sparc64"
 OLD_FILES+=sbin/sunlabel
 OLD_FILES+=usr/share/man/man8/sunlabel.8.gz
 .endif
 # 20080701: wpa_supplicant.conf moved to share/examples/etc/
 OLD_FILES+=usr/share/examples/wpa_supplicant/wpa_supplicant.conf
 OLD_DIRS+=usr/share/examples/wpa_supplicant
 # 20080614: pecoff image activator removed
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/pecoff_machdep.h
 .endif
 # 20080614: sgtty removed
 OLD_FILES+=usr/include/sys/ttychars.h
 OLD_FILES+=usr/include/sys/ttydev.h
 OLD_FILES+=usr/share/man/man3/gtty.3.gz
 OLD_FILES+=usr/share/man/man3/stty.3.gz
 # 20080609: gpt(8) removed
 OLD_FILES+=sbin/gpt
 OLD_FILES+=usr/share/man/man8/gpt.8.gz
 # 20080525: I4B removed
 OLD_FILES+=etc/isdn/answer
 OLD_FILES+=etc/isdn/isdntel
 OLD_FILES+=etc/isdn/record
 OLD_FILES+=etc/isdn/tell
 OLD_FILES+=etc/isdn/tell-record
 OLD_FILES+=etc/isdn/unknown_incoming
 OLD_FILES+=etc/isdn/holidays.D
 OLD_FILES+=etc/isdn/isdnd.rates.A
 OLD_FILES+=etc/isdn/isdnd.rates.D
 OLD_FILES+=etc/isdn/isdnd.rates.F
 OLD_FILES+=etc/isdn/isdnd.rates.L
 OLD_FILES+=etc/isdn/isdnd.rates.UK.BT
 OLD_FILES+=etc/isdn/isdnd.rc.sample
 OLD_FILES+=etc/isdn/isdntel.alias.sample
 OLD_DIRS+=etc/isdn
 OLD_FILES+=etc/rc.d/isdnd
 OLD_FILES+=usr/include/i4b/i4b_cause.h
 OLD_FILES+=usr/include/i4b/i4b_debug.h
 OLD_FILES+=usr/include/i4b/i4b_ioctl.h
 OLD_FILES+=usr/include/i4b/i4b_rbch_ioctl.h
 OLD_FILES+=usr/include/i4b/i4b_tel_ioctl.h
 OLD_FILES+=usr/include/i4b/i4b_trace.h
 OLD_DIRS+=usr/include/i4b
 OLD_FILES+=usr/sbin/dtmfdecode
 OLD_FILES+=usr/sbin/g711conv
 OLD_FILES+=usr/sbin/isdnd
 OLD_FILES+=usr/sbin/isdndebug
 OLD_FILES+=usr/sbin/isdndecode
 OLD_FILES+=usr/sbin/isdnmonitor
 OLD_FILES+=usr/sbin/isdnphone
 OLD_FILES+=usr/sbin/isdntel
 OLD_FILES+=usr/sbin/isdntelctl
 OLD_FILES+=usr/sbin/isdntrace
 OLD_FILES+=usr/share/isdn/0.al
 OLD_FILES+=usr/share/isdn/1.al
 OLD_FILES+=usr/share/isdn/2.al
 OLD_FILES+=usr/share/isdn/3.al
 OLD_FILES+=usr/share/isdn/4.al
 OLD_FILES+=usr/share/isdn/5.al
 OLD_FILES+=usr/share/isdn/6.al
 OLD_FILES+=usr/share/isdn/7.al
 OLD_FILES+=usr/share/isdn/8.al
 OLD_FILES+=usr/share/isdn/9.al
 OLD_FILES+=usr/share/isdn/beep.al
 OLD_FILES+=usr/share/isdn/msg.al
 OLD_DIRS+=usr/share/isdn
 OLD_FILES+=usr/share/man/man1/dtmfdecode.1.gz
 OLD_FILES+=usr/share/man/man1/g711conv.1.gz
 OLD_FILES+=usr/share/man/man4/i4b.4.gz
 OLD_FILES+=usr/share/man/man4/i4bcapi.4.gz
 OLD_FILES+=usr/share/man/man4/i4bctl.4.gz
 OLD_FILES+=usr/share/man/man4/i4bing.4.gz
 OLD_FILES+=usr/share/man/man4/i4bipr.4.gz
 OLD_FILES+=usr/share/man/man4/i4bisppp.4.gz
 OLD_FILES+=usr/share/man/man4/i4bq921.4.gz
 OLD_FILES+=usr/share/man/man4/i4bq931.4.gz
 OLD_FILES+=usr/share/man/man4/i4brbch.4.gz
 OLD_FILES+=usr/share/man/man4/i4btel.4.gz
 OLD_FILES+=usr/share/man/man4/i4btrc.4.gz
 OLD_FILES+=usr/share/man/man4/iavc.4.gz
 OLD_FILES+=usr/share/man/man4/isic.4.gz
 OLD_FILES+=usr/share/man/man4/ifpi.4.gz
 OLD_FILES+=usr/share/man/man4/ifpi2.4.gz
 OLD_FILES+=usr/share/man/man4/ifpnp.4.gz
 OLD_FILES+=usr/share/man/man4/ihfc.4.gz
 OLD_FILES+=usr/share/man/man4/itjc.4.gz
 OLD_FILES+=usr/share/man/man4/iwic.4.gz
 OLD_FILES+=usr/share/man/man5/isdnd.rc.5.gz
 OLD_FILES+=usr/share/man/man5/isdnd.rates.5.gz
 OLD_FILES+=usr/share/man/man5/isdnd.acct.5.gz
 OLD_FILES+=usr/share/man/man8/isdnd.8.gz
 OLD_FILES+=usr/share/man/man8/isdndebug.8.gz
 OLD_FILES+=usr/share/man/man8/isdndecode.8.gz
 OLD_FILES+=usr/share/man/man8/isdnmonitor.8.gz
 OLD_FILES+=usr/share/man/man8/isdnphone.8.gz
 OLD_FILES+=usr/share/man/man8/isdntel.8.gz
 OLD_FILES+=usr/share/man/man8/isdntelctl.8.gz
 OLD_FILES+=usr/share/man/man8/isdntrace.8.gz
 OLD_FILES+=usr/share/examples/isdn/contrib/README
 OLD_FILES+=usr/share/examples/isdn/contrib/anleitung.ppp
 OLD_FILES+=usr/share/examples/isdn/contrib/answer.c
 OLD_FILES+=usr/share/examples/isdn/contrib/answer.sh
 OLD_FILES+=usr/share/examples/isdn/contrib/convert.sh
 OLD_FILES+=usr/share/examples/isdn/contrib/hplay.c
 OLD_FILES+=usr/share/examples/isdn/contrib/i4b-ppp-newbie.txt
 OLD_FILES+=usr/share/examples/isdn/contrib/isdnctl
 OLD_FILES+=usr/share/examples/isdn/contrib/isdnd_acct
 OLD_FILES+=usr/share/examples/isdn/contrib/isdnd_acct.pl
 OLD_FILES+=usr/share/examples/isdn/contrib/isdntelmux.c
 OLD_FILES+=usr/share/examples/isdn/contrib/mrtg-isp0.sh
 OLD_FILES+=usr/share/examples/isdn/i4brunppp/Makefile
 OLD_FILES+=usr/share/examples/isdn/i4brunppp/README
 OLD_FILES+=usr/share/examples/isdn/i4brunppp/i4brunppp-isdnd.rc
 OLD_FILES+=usr/share/examples/isdn/i4brunppp/i4brunppp.8
 OLD_FILES+=usr/share/examples/isdn/i4brunppp/i4brunppp.c
 OLD_FILES+=usr/share/examples/isdn/v21/Makefile
 OLD_FILES+=usr/share/examples/isdn/v21/README
 OLD_FILES+=usr/share/examples/isdn/v21/v21modem.c
 OLD_FILES+=usr/share/examples/isdn/FAQ
 OLD_FILES+=usr/share/examples/isdn/KERNEL
 OLD_FILES+=usr/share/examples/isdn/Overview
 OLD_FILES+=usr/share/examples/isdn/README
 OLD_FILES+=usr/share/examples/isdn/ROADMAP
 OLD_FILES+=usr/share/examples/isdn/ReleaseNotes
 OLD_FILES+=usr/share/examples/isdn/Resources
 OLD_FILES+=usr/share/examples/isdn/SupportedCards
 OLD_FILES+=usr/share/examples/isdn/ThankYou
 OLD_DIRS+=usr/share/examples/isdn/contrib
 OLD_DIRS+=usr/share/examples/isdn/i4brunppp
 OLD_DIRS+=usr/share/examples/isdn/v21
 OLD_DIRS+=usr/share/examples/isdn
 OLD_FILES+=usr/share/examples/ppp/isdnd.rc
 OLD_FILES+=usr/share/examples/ppp/ppp.conf.isdn
 # 20080525: ng_atmpif removed
 OLD_FILES+=usr/include/netgraph/atm/ng_atmpif.h
 OLD_FILES+=usr/share/man/man4/ng_atmpif.4.gz
 # 20080522: pmap_addr_hint removed
 OLD_FILES+=usr/share/man/man9/pmap_addr_hint.9.gz
 # 20080517: ipsec_osdep.h removed
 OLD_FILES+=usr/include/netipsec/ipsec_osdep.h
 # 20080507: heimdal 1.1 import
 OLD_LIBS+=usr/lib/libasn1.so.9
 OLD_LIBS+=usr/lib/libgssapi.so.9
 OLD_LIBS+=usr/lib/libgssapi_krb5.so.9
 OLD_LIBS+=usr/lib/libhdb.so.9
 OLD_LIBS+=usr/lib/libkadm5clnt.so.9
 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
 # 20080420: Symbol card support dropped
 OLD_FILES+=usr/include/dev/wi/spectrum24t_cf.h
 # 20080420: awi removal
 OLD_FILES+=usr/share/man/man4/awi.4.gz
 OLD_FILES+=usr/share/man/man4/if_awi.4.gz
 # 20080331: pkg_sign has been removed
 OLD_FILES+=usr/sbin/pkg_check
 OLD_FILES+=usr/sbin/pkg_sign
 OLD_FILES+=usr/share/man/man1/pkg_check.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_sign.1.gz
 # 20080314: stack_print(9) mlink fixed
 OLD_FILES+=usr/share/man/man9/stack_printf.9.gz
 # 20080312: libkse removal
 OLD_FILES+=usr/include/sys/kse.h
 OLD_FILES+=usr/lib/libkse.so
 OLD_LIBS+=usr/lib/libkse.so.3
 OLD_FILES+=usr/share/man/man2/kse.2.gz
 OLD_FILES+=usr/share/man/man2/kse_create.2.gz
 OLD_FILES+=usr/share/man/man2/kse_exit.2.gz
 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
 # 20080225: bsdar/bsdranlib rename to ar/ranlib
 OLD_FILES+=usr/bin/bsdar
 OLD_FILES+=usr/bin/bsdranlib
 OLD_FILES+=usr/share/man/man1/bsdar.1.gz
 OLD_FILES+=usr/share/man/man1/bsdranlib.1.gz
 # 20080220: geom_lvm rename to geom_linux_lvm
 OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz
 # 20080126: oldcard.4 removal
 OLD_FILES+=usr/share/man/man4/card.4.gz
 OLD_FILES+=usr/share/man/man4/oldcard.4.gz
 # 20080122: Removed from the tree
 OLD_FILES+=usr/share/man/man9/BUF_REFCNT.9.gz
 # 20080108: Moved to section 2
 OLD_FILES+=usr/share/man/man3/shm_open.3.gz
 OLD_FILES+=usr/share/man/man3/shm_unlink.3.gz
 # 20071207: Merged with fortunes-o.real
 OLD_FILES+=usr/share/games/fortune/fortunes2-o
 OLD_FILES+=usr/share/games/fortune/fortunes2-o.dat
 # 20071201: Removal of XRPU driver
 OLD_FILES+=usr/include/sys/xrpuio.h
 # 20071129: Disabled static versions of libkse by default
 OLD_FILES+=usr/lib/libkse.a
 OLD_FILES+=usr/lib/libkse_p.a
 OLD_FILES+=usr/lib/libkse_pic.a
 # 20071129: Removed a Solaris compatibility header
 OLD_FILES+=usr/include/sys/_elf_solaris.h
 # 20071125: Renamed to pmc_get_msr()
 OLD_FILES+=usr/share/man/man3/pmc_x86_get_msr.3.gz
 # 20071108: Removed very crunch OLDCARD support file
 OLD_FILES+=etc/defaults/pccard.conf
 # 20071025: rc.d/nfslocking superseded by rc.d/lockd and rc.d/statd
 OLD_FILES+=etc/rc.d/nfslocking
 # 20070930: rename of cached to nscd
 OLD_FILES+=etc/cached.conf
 OLD_FILES+=etc/rc.d/cached
 OLD_FILES+=usr/sbin/cached
 OLD_FILES+=usr/share/man/man5/cached.conf.5.gz
 OLD_FILES+=usr/share/man/man8/cached.8.gz
 # 20070807: removal of PowerPC specific header file
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=usr/include/machine/interruptvar.h
 .endif
 # 20070801: fast_ipsec.4 gone
 OLD_FILES+=usr/share/man/man4/fast_ipsec.4.gz
 # 20070715: netatm temporarily disconnected (removed 20080525)
 OLD_FILES+=rescue/atm
 OLD_FILES+=rescue/fore_dnld
 OLD_FILES+=rescue/ilmid
 OLD_FILES+=sbin/atm
 OLD_FILES+=sbin/fore_dnld
 OLD_FILES+=sbin/ilmid
 OLD_FILES+=usr/include/libatm.h
 OLD_FILES+=usr/include/netatm/atm.h
 OLD_FILES+=usr/include/netatm/atm_cm.h
 OLD_FILES+=usr/include/netatm/atm_if.h
 OLD_FILES+=usr/include/netatm/atm_ioctl.h
 OLD_FILES+=usr/include/netatm/atm_pcb.h
 OLD_FILES+=usr/include/netatm/atm_sap.h
 OLD_FILES+=usr/include/netatm/atm_sigmgr.h
 OLD_FILES+=usr/include/netatm/atm_stack.h
 OLD_FILES+=usr/include/netatm/atm_sys.h
 OLD_FILES+=usr/include/netatm/atm_var.h
 OLD_FILES+=usr/include/netatm/atm_vc.h
 OLD_FILES+=usr/include/netatm/ipatm/ipatm.h
 OLD_FILES+=usr/include/netatm/ipatm/ipatm_serv.h
 OLD_FILES+=usr/include/netatm/ipatm/ipatm_var.h
 OLD_FILES+=usr/include/netatm/port.h
 OLD_FILES+=usr/include/netatm/queue.h
 OLD_FILES+=usr/include/netatm/sigpvc/sigpvc_var.h
 OLD_FILES+=usr/include/netatm/spans/spans_cls.h
 OLD_FILES+=usr/include/netatm/spans/spans_kxdr.h
 OLD_FILES+=usr/include/netatm/spans/spans_var.h
 OLD_FILES+=usr/include/netatm/uni/sscf_uni.h
 OLD_FILES+=usr/include/netatm/uni/sscf_uni_var.h
 OLD_FILES+=usr/include/netatm/uni/sscop.h
 OLD_FILES+=usr/include/netatm/uni/sscop_misc.h
 OLD_FILES+=usr/include/netatm/uni/sscop_pdu.h
 OLD_FILES+=usr/include/netatm/uni/sscop_var.h
 OLD_FILES+=usr/include/netatm/uni/uni.h
 OLD_FILES+=usr/include/netatm/uni/uniip_var.h
 OLD_FILES+=usr/include/netatm/uni/unisig.h
 OLD_FILES+=usr/include/netatm/uni/unisig_decode.h
 OLD_FILES+=usr/include/netatm/uni/unisig_mbuf.h
 OLD_FILES+=usr/include/netatm/uni/unisig_msg.h
 OLD_FILES+=usr/include/netatm/uni/unisig_print.h
 OLD_FILES+=usr/include/netatm/uni/unisig_var.h
 OLD_FILES+=usr/lib/libatm.a
 OLD_FILES+=usr/lib/libatm_p.a
 OLD_FILES+=usr/sbin/atmarpd
 OLD_FILES+=usr/sbin/scspd
 OLD_FILES+=usr/share/man/en.ISO8859-1/man8/atm.8.gz
 OLD_FILES+=usr/share/man/en.ISO8859-1/man8/atmarpd.8.gz
 OLD_FILES+=usr/share/man/en.ISO8859-1/man8/fore_dnld.8.gz
 OLD_FILES+=usr/share/man/en.ISO8859-1/man8/ilmid.8.gz
 OLD_FILES+=usr/share/man/en.ISO8859-1/man8/scspd.8.gz
 OLD_FILES+=usr/share/man/man8/atm.8.gz
 OLD_FILES+=usr/share/man/man8/atmarpd.8.gz
 OLD_FILES+=usr/share/man/man8/fore_dnld.8.gz
 OLD_FILES+=usr/share/man/man8/ilmid.8.gz
 OLD_FILES+=usr/share/man/man8/scspd.8.gz
 OLD_FILES+=usr/share/examples/atm/NOTES
 OLD_FILES+=usr/share/examples/atm/README
 OLD_FILES+=usr/share/examples/atm/Startup
 OLD_FILES+=usr/share/examples/atm/atm-config.sh
 OLD_FILES+=usr/share/examples/atm/atm-sockets.txt
 OLD_FILES+=usr/share/examples/atm/cpcs-design.txt
 OLD_FILES+=usr/share/examples/atm/fore-microcode.txt
 OLD_FILES+=usr/share/examples/atm/sscf-design.txt
 OLD_FILES+=usr/share/examples/atm/sscop-design.txt
 OLD_LIBS+=lib/libatm.so.5
 OLD_FILES+=usr/lib/libatm.so
 OLD_DIRS+=usr/include/netatm/sigpvc
 OLD_DIRS+=usr/include/netatm/spans
 OLD_DIRS+=usr/include/netatm/ipatm
 OLD_DIRS+=usr/include/netatm/uni
 OLD_DIRS+=usr/include/netatm
 OLD_DIRS+=usr/share/examples/atm
 # 20070705: I4B headers repo-copied to include/i4b/
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/i4b_cause.h
 OLD_FILES+=usr/include/machine/i4b_debug.h
 OLD_FILES+=usr/include/machine/i4b_ioctl.h
 OLD_FILES+=usr/include/machine/i4b_rbch_ioctl.h
 OLD_FILES+=usr/include/machine/i4b_tel_ioctl.h
 OLD_FILES+=usr/include/machine/i4b_trace.h
 .endif
 # 20070703: pf 4.1 import
 OLD_FILES+=usr/libexec/ftp-proxy
 # 20070701: KAME IPSec removal
 OLD_FILES+=usr/include/netinet6/ah.h
 OLD_FILES+=usr/include/netinet6/ah6.h
 OLD_FILES+=usr/include/netinet6/ah_aesxcbcmac.h
 OLD_FILES+=usr/include/netinet6/esp.h
 OLD_FILES+=usr/include/netinet6/esp6.h
 OLD_FILES+=usr/include/netinet6/esp_aesctr.h
 OLD_FILES+=usr/include/netinet6/esp_camellia.h
 OLD_FILES+=usr/include/netinet6/esp_rijndael.h
 OLD_FILES+=usr/include/netinet6/ipsec.h
 OLD_FILES+=usr/include/netinet6/ipsec6.h
 OLD_FILES+=usr/include/netinet6/ipcomp.h
 OLD_FILES+=usr/include/netinet6/ipcomp6.h
 OLD_FILES+=usr/include/netkey/key.h
 OLD_FILES+=usr/include/netkey/key_debug.h
 OLD_FILES+=usr/include/netkey/key_var.h
 OLD_FILES+=usr/include/netkey/keydb.h
 OLD_FILES+=usr/include/netkey/keysock.h
 OLD_DIRS+=usr/include/netkey
 # 20070701: remove wicontrol
 OLD_FILES+=usr/sbin/wicontrol
 OLD_FILES+=usr/share/man/man8/wicontrol.8.gz
 # 20070625: umapfs removal
 OLD_FILES+=rescue/mount_umapfs
 OLD_FILES+=sbin/mount_umapfs
 OLD_FILES+=usr/include/fs/umapfs/umap.h
 OLD_FILES+=usr/share/man/man8/mount_umapfs.8.gz
 OLD_DIRS+=usr/include/fs/umapfs
 # 20070618: Removal of the PROTO.localhost* files
 OLD_FILES+=etc/namedb/PROTO.localhost-v6.rev
 OLD_FILES+=etc/namedb/PROTO.localhost.rev
 OLD_FILES+=etc/namedb/make-localhost
 # 20070618: shared library version bump
 OLD_LIBS+=lib/libalias.so.5
 OLD_LIBS+=lib/libbsnmp.so.3
 OLD_LIBS+=lib/libncurses.so.6
 OLD_LIBS+=lib/libncursesw.so.6
 OLD_LIBS+=lib/libreadline.so.6
 OLD_LIBS+=usr/lib/libdialog.so.5
 OLD_LIBS+=usr/lib/libgnuregex.so.3
 OLD_LIBS+=usr/lib/libhistory.so.6
 OLD_LIBS+=usr/lib/libpam.so.3
 OLD_LIBS+=usr/lib/libssh.so.3
 OLD_LIBS+=usr/lib/pam_chroot.so.3
 OLD_LIBS+=usr/lib/pam_deny.so.3
 OLD_LIBS+=usr/lib/pam_echo.so.3
 OLD_LIBS+=usr/lib/pam_exec.so.3
 OLD_LIBS+=usr/lib/pam_ftpusers.so.3
 OLD_LIBS+=usr/lib/pam_group.so.3
 OLD_LIBS+=usr/lib/pam_guest.so.3
 OLD_LIBS+=usr/lib/pam_krb5.so.3
 OLD_LIBS+=usr/lib/pam_ksu.so.3
 OLD_LIBS+=usr/lib/pam_lastlog.so.3
 OLD_LIBS+=usr/lib/pam_login_access.so.3
 OLD_LIBS+=usr/lib/pam_nologin.so.3
 OLD_LIBS+=usr/lib/pam_opie.so.3
 OLD_LIBS+=usr/lib/pam_opieaccess.so.3
 OLD_LIBS+=usr/lib/pam_passwdqc.so.3
 OLD_LIBS+=usr/lib/pam_permit.so.3
 OLD_LIBS+=usr/lib/pam_radius.so.3
 OLD_LIBS+=usr/lib/pam_rhosts.so.3
 OLD_LIBS+=usr/lib/pam_rootok.so.3
 OLD_LIBS+=usr/lib/pam_securetty.so.3
 OLD_LIBS+=usr/lib/pam_self.so.3
 OLD_LIBS+=usr/lib/pam_ssh.so.3
 OLD_LIBS+=usr/lib/pam_tacplus.so.3
 OLD_LIBS+=usr/lib/pam_unix.so.3
 OLD_LIBS+=usr/lib/snmp_atm.so.4
 OLD_LIBS+=usr/lib/snmp_bridge.so.4
 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
 # 20070613: IPX over IP tunnel removal
 OLD_FILES+=usr/include/netipx/ipx_ip.h
 # 20070605: sched_core removal
 OLD_FILES+=usr/share/man/man4/sched_core.4.gz
 # 20070603: BIND 9.4.1 import
 OLD_LIBS+=usr/lib/liblwres.so.10
 # 20070521: shared library version bump
 OLD_LIBS+=lib/libatm.so.4
 OLD_LIBS+=lib/libbegemot.so.2
 OLD_LIBS+=lib/libbsdxml.so.2
 OLD_LIBS+=lib/libcam.so.3
 OLD_LIBS+=lib/libcrypt.so.3
 OLD_LIBS+=lib/libdevstat.so.5
 OLD_LIBS+=lib/libedit.so.5
 OLD_LIBS+=lib/libgeom.so.3
 OLD_LIBS+=lib/libipsec.so.2
 OLD_LIBS+=lib/libipx.so.3
 OLD_LIBS+=lib/libkiconv.so.2
 OLD_LIBS+=lib/libkse.so.2
 OLD_LIBS+=lib/libkvm.so.3
 OLD_LIBS+=lib/libm.so.4
 OLD_LIBS+=lib/libmd.so.3
 OLD_LIBS+=lib/libpcap.so.4
 OLD_LIBS+=lib/libpthread.so.2
 OLD_LIBS+=lib/libsbuf.so.3
 OLD_LIBS+=lib/libthr.so.2
 OLD_LIBS+=lib/libufs.so.3
 OLD_LIBS+=lib/libutil.so.6
 OLD_LIBS+=lib/libz.so.3
 OLD_LIBS+=usr/lib/libbluetooth.so.2
 OLD_LIBS+=usr/lib/libbsm.so.1
 OLD_LIBS+=usr/lib/libbz2.so.2
 OLD_LIBS+=usr/lib/libcalendar.so.3
 OLD_LIBS+=usr/lib/libcom_err.so.3
 OLD_LIBS+=usr/lib/libdevinfo.so.3
 OLD_LIBS+=usr/lib/libfetch.so.4
 OLD_LIBS+=usr/lib/libform.so.3
 OLD_LIBS+=usr/lib/libformw.so.3
 OLD_LIBS+=usr/lib/libftpio.so.6
 OLD_LIBS+=usr/lib/libgpib.so.1
 OLD_LIBS+=usr/lib/libkse.so.2
 OLD_LIBS+=usr/lib/libmagic.so.2
 OLD_LIBS+=usr/lib/libmemstat.so.1
 OLD_LIBS+=usr/lib/libmenu.so.3
 OLD_LIBS+=usr/lib/libmenuw.so.3
 OLD_LIBS+=usr/lib/libmilter.so.3
 OLD_LIBS+=usr/lib/libmp.so.5
 OLD_LIBS+=usr/lib/libncp.so.2
 OLD_LIBS+=usr/lib/libnetgraph.so.2
 OLD_LIBS+=usr/lib/libngatm.so.2
 OLD_LIBS+=usr/lib/libopie.so.4
 OLD_LIBS+=usr/lib/libpanel.so.3
 OLD_LIBS+=usr/lib/libpanelw.so.3
 OLD_LIBS+=usr/lib/libpmc.so.3
 OLD_LIBS+=usr/lib/libradius.so.2
 OLD_LIBS+=usr/lib/librpcsvc.so.3
 OLD_LIBS+=usr/lib/libsdp.so.2
 OLD_LIBS+=usr/lib/libsmb.so.2
 OLD_LIBS+=usr/lib/libstdc++.so.5
 OLD_LIBS+=usr/lib/libtacplus.so.2
 OLD_LIBS+=usr/lib/libthr.so.2
 OLD_LIBS+=usr/lib/libthread_db.so.2
 OLD_LIBS+=usr/lib/libugidfw.so.2
 OLD_LIBS+=usr/lib/libusbhid.so.2
 OLD_LIBS+=usr/lib/libvgl.so.4
 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
 # 20070519: GCC 4.2
 OLD_FILES+=usr/bin/f77
 OLD_FILES+=usr/bin/protoize
 OLD_FILES+=usr/include/g2c.h
 OLD_FILES+=usr/libexec/f771
 OLD_FILES+=usr/share/info/g77.info.gz
 OLD_FILES+=usr/share/man/man1/f77.1.gz
 OLD_FILES+=usr/include/c++/3.4/algorithm
 OLD_FILES+=usr/include/c++/3.4/backward/algo.h
 OLD_FILES+=usr/include/c++/3.4/backward/algobase.h
 OLD_FILES+=usr/include/c++/3.4/backward/alloc.h
 OLD_FILES+=usr/include/c++/3.4/backward/backward_warning.h
 OLD_FILES+=usr/include/c++/3.4/backward/bvector.h
 OLD_FILES+=usr/include/c++/3.4/backward/complex.h
 OLD_FILES+=usr/include/c++/3.4/backward/defalloc.h
 OLD_FILES+=usr/include/c++/3.4/backward/deque.h
 OLD_FILES+=usr/include/c++/3.4/backward/fstream.h
 OLD_FILES+=usr/include/c++/3.4/backward/function.h
 OLD_FILES+=usr/include/c++/3.4/backward/hash_map.h
 OLD_FILES+=usr/include/c++/3.4/backward/hash_set.h
 OLD_FILES+=usr/include/c++/3.4/backward/hashtable.h
 OLD_FILES+=usr/include/c++/3.4/backward/heap.h
 OLD_FILES+=usr/include/c++/3.4/backward/iomanip.h
 OLD_FILES+=usr/include/c++/3.4/backward/iostream.h
 OLD_FILES+=usr/include/c++/3.4/backward/istream.h
 OLD_FILES+=usr/include/c++/3.4/backward/iterator.h
 OLD_FILES+=usr/include/c++/3.4/backward/list.h
 OLD_FILES+=usr/include/c++/3.4/backward/map.h
 OLD_FILES+=usr/include/c++/3.4/backward/multimap.h
 OLD_FILES+=usr/include/c++/3.4/backward/multiset.h
 OLD_FILES+=usr/include/c++/3.4/backward/new.h
 OLD_FILES+=usr/include/c++/3.4/backward/ostream.h
 OLD_FILES+=usr/include/c++/3.4/backward/pair.h
 OLD_FILES+=usr/include/c++/3.4/backward/queue.h
 OLD_FILES+=usr/include/c++/3.4/backward/rope.h
 OLD_FILES+=usr/include/c++/3.4/backward/set.h
 OLD_FILES+=usr/include/c++/3.4/backward/slist.h
 OLD_FILES+=usr/include/c++/3.4/backward/stack.h
 OLD_FILES+=usr/include/c++/3.4/backward/stream.h
 OLD_FILES+=usr/include/c++/3.4/backward/streambuf.h
 OLD_FILES+=usr/include/c++/3.4/backward/strstream
 OLD_FILES+=usr/include/c++/3.4/backward/tempbuf.h
 OLD_FILES+=usr/include/c++/3.4/backward/tree.h
 OLD_FILES+=usr/include/c++/3.4/backward/vector.h
 OLD_FILES+=usr/include/c++/3.4/bits/allocator.h
 OLD_FILES+=usr/include/c++/3.4/bits/atomic_word.h
 OLD_FILES+=usr/include/c++/3.4/bits/atomicity.h
 OLD_FILES+=usr/include/c++/3.4/bits/basic_file.h
 OLD_FILES+=usr/include/c++/3.4/bits/basic_ios.h
 OLD_FILES+=usr/include/c++/3.4/bits/basic_ios.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/basic_string.h
 OLD_FILES+=usr/include/c++/3.4/bits/basic_string.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/boost_concept_check.h
 OLD_FILES+=usr/include/c++/3.4/bits/c++allocator.h
 OLD_FILES+=usr/include/c++/3.4/bits/c++config.h
 OLD_FILES+=usr/include/c++/3.4/bits/c++io.h
 OLD_FILES+=usr/include/c++/3.4/bits/c++locale.h
 OLD_FILES+=usr/include/c++/3.4/bits/c++locale_internal.h
 OLD_FILES+=usr/include/c++/3.4/bits/char_traits.h
 OLD_FILES+=usr/include/c++/3.4/bits/cmath.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/codecvt.h
 OLD_FILES+=usr/include/c++/3.4/bits/codecvt_specializations.h
 OLD_FILES+=usr/include/c++/3.4/bits/concept_check.h
 OLD_FILES+=usr/include/c++/3.4/bits/concurrence.h
 OLD_FILES+=usr/include/c++/3.4/bits/cpp_type_traits.h
 OLD_FILES+=usr/include/c++/3.4/bits/ctype_base.h
 OLD_FILES+=usr/include/c++/3.4/bits/ctype_inline.h
 OLD_FILES+=usr/include/c++/3.4/bits/ctype_noninline.h
 OLD_FILES+=usr/include/c++/3.4/bits/deque.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/fstream.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/functexcept.h
 OLD_FILES+=usr/include/c++/3.4/bits/gslice.h
 OLD_FILES+=usr/include/c++/3.4/bits/gslice_array.h
 OLD_FILES+=usr/include/c++/3.4/bits/gthr-default.h
 OLD_FILES+=usr/include/c++/3.4/bits/gthr-posix.h
 OLD_FILES+=usr/include/c++/3.4/bits/gthr-single.h
 OLD_FILES+=usr/include/c++/3.4/bits/gthr.h
 OLD_FILES+=usr/include/c++/3.4/bits/indirect_array.h
 OLD_FILES+=usr/include/c++/3.4/bits/ios_base.h
 OLD_FILES+=usr/include/c++/3.4/bits/istream.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/list.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/locale_classes.h
 OLD_FILES+=usr/include/c++/3.4/bits/locale_facets.h
 OLD_FILES+=usr/include/c++/3.4/bits/locale_facets.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/localefwd.h
 OLD_FILES+=usr/include/c++/3.4/bits/mask_array.h
 OLD_FILES+=usr/include/c++/3.4/bits/messages_members.h
 OLD_FILES+=usr/include/c++/3.4/bits/os_defines.h
 OLD_FILES+=usr/include/c++/3.4/bits/ostream.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/postypes.h
 OLD_FILES+=usr/include/c++/3.4/bits/slice_array.h
 OLD_FILES+=usr/include/c++/3.4/bits/sstream.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/stl_algo.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_algobase.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_bvector.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_construct.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_deque.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_function.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_heap.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_iterator.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_iterator_base_funcs.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_iterator_base_types.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_list.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_map.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_multimap.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_multiset.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_numeric.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_pair.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_queue.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_raw_storage_iter.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_relops.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_set.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_stack.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_tempbuf.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_threads.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_tree.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_uninitialized.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_vector.h
 OLD_FILES+=usr/include/c++/3.4/bits/stream_iterator.h
 OLD_FILES+=usr/include/c++/3.4/bits/streambuf.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/streambuf_iterator.h
 OLD_FILES+=usr/include/c++/3.4/bits/stringfwd.h
 OLD_FILES+=usr/include/c++/3.4/bits/time_members.h
 OLD_FILES+=usr/include/c++/3.4/bits/type_traits.h
 OLD_FILES+=usr/include/c++/3.4/bits/valarray_after.h
 OLD_FILES+=usr/include/c++/3.4/bits/valarray_array.h
 OLD_FILES+=usr/include/c++/3.4/bits/valarray_array.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/valarray_before.h
 OLD_FILES+=usr/include/c++/3.4/bits/vector.tcc
 OLD_FILES+=usr/include/c++/3.4/bitset
 OLD_FILES+=usr/include/c++/3.4/cassert
 OLD_FILES+=usr/include/c++/3.4/cctype
 OLD_FILES+=usr/include/c++/3.4/cerrno
 OLD_FILES+=usr/include/c++/3.4/cfloat
 OLD_FILES+=usr/include/c++/3.4/ciso646
 OLD_FILES+=usr/include/c++/3.4/climits
 OLD_FILES+=usr/include/c++/3.4/clocale
 OLD_FILES+=usr/include/c++/3.4/cmath
 OLD_FILES+=usr/include/c++/3.4/complex
 OLD_FILES+=usr/include/c++/3.4/csetjmp
 OLD_FILES+=usr/include/c++/3.4/csignal
 OLD_FILES+=usr/include/c++/3.4/cstdarg
 OLD_FILES+=usr/include/c++/3.4/cstddef
 OLD_FILES+=usr/include/c++/3.4/cstdio
 OLD_FILES+=usr/include/c++/3.4/cstdlib
 OLD_FILES+=usr/include/c++/3.4/cstring
 OLD_FILES+=usr/include/c++/3.4/ctime
 OLD_FILES+=usr/include/c++/3.4/cwchar
 OLD_FILES+=usr/include/c++/3.4/cwctype
 OLD_FILES+=usr/include/c++/3.4/cxxabi.h
 OLD_FILES+=usr/include/c++/3.4/debug/bitset
 OLD_FILES+=usr/include/c++/3.4/debug/debug.h
 OLD_FILES+=usr/include/c++/3.4/debug/deque
 OLD_FILES+=usr/include/c++/3.4/debug/formatter.h
 OLD_FILES+=usr/include/c++/3.4/debug/hash_map
 OLD_FILES+=usr/include/c++/3.4/debug/hash_map.h
 OLD_FILES+=usr/include/c++/3.4/debug/hash_multimap.h
 OLD_FILES+=usr/include/c++/3.4/debug/hash_multiset.h
 OLD_FILES+=usr/include/c++/3.4/debug/hash_set
 OLD_FILES+=usr/include/c++/3.4/debug/hash_set.h
 OLD_FILES+=usr/include/c++/3.4/debug/list
 OLD_FILES+=usr/include/c++/3.4/debug/map
 OLD_FILES+=usr/include/c++/3.4/debug/map.h
 OLD_FILES+=usr/include/c++/3.4/debug/multimap.h
 OLD_FILES+=usr/include/c++/3.4/debug/multiset.h
 OLD_FILES+=usr/include/c++/3.4/debug/safe_base.h
 OLD_FILES+=usr/include/c++/3.4/debug/safe_iterator.h
 OLD_FILES+=usr/include/c++/3.4/debug/safe_iterator.tcc
 OLD_FILES+=usr/include/c++/3.4/debug/safe_sequence.h
 OLD_FILES+=usr/include/c++/3.4/debug/set
 OLD_FILES+=usr/include/c++/3.4/debug/set.h
 OLD_FILES+=usr/include/c++/3.4/debug/string
 OLD_FILES+=usr/include/c++/3.4/debug/vector
 OLD_FILES+=usr/include/c++/3.4/deque
 OLD_FILES+=usr/include/c++/3.4/exception
 OLD_FILES+=usr/include/c++/3.4/exception_defines.h
 OLD_FILES+=usr/include/c++/3.4/ext/algorithm
 OLD_FILES+=usr/include/c++/3.4/ext/bitmap_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/debug_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/enc_filebuf.h
 OLD_FILES+=usr/include/c++/3.4/ext/functional
 OLD_FILES+=usr/include/c++/3.4/ext/hash_fun.h
 OLD_FILES+=usr/include/c++/3.4/ext/hash_map
 OLD_FILES+=usr/include/c++/3.4/ext/hash_set
 OLD_FILES+=usr/include/c++/3.4/ext/hashtable.h
 OLD_FILES+=usr/include/c++/3.4/ext/iterator
 OLD_FILES+=usr/include/c++/3.4/ext/malloc_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/memory
 OLD_FILES+=usr/include/c++/3.4/ext/mt_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/new_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/numeric
 OLD_FILES+=usr/include/c++/3.4/ext/pod_char_traits.h
 OLD_FILES+=usr/include/c++/3.4/ext/pool_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/rb_tree
 OLD_FILES+=usr/include/c++/3.4/ext/rope
 OLD_FILES+=usr/include/c++/3.4/ext/ropeimpl.h
 OLD_FILES+=usr/include/c++/3.4/ext/slist
 OLD_FILES+=usr/include/c++/3.4/ext/stdio_filebuf.h
 OLD_FILES+=usr/include/c++/3.4/ext/stdio_sync_filebuf.h
 OLD_FILES+=usr/include/c++/3.4/fstream
 OLD_FILES+=usr/include/c++/3.4/functional
 OLD_FILES+=usr/include/c++/3.4/iomanip
 OLD_FILES+=usr/include/c++/3.4/ios
 OLD_FILES+=usr/include/c++/3.4/iosfwd
 OLD_FILES+=usr/include/c++/3.4/iostream
 OLD_FILES+=usr/include/c++/3.4/istream
 OLD_FILES+=usr/include/c++/3.4/iterator
 OLD_FILES+=usr/include/c++/3.4/limits
 OLD_FILES+=usr/include/c++/3.4/list
 OLD_FILES+=usr/include/c++/3.4/locale
 OLD_FILES+=usr/include/c++/3.4/map
 OLD_FILES+=usr/include/c++/3.4/memory
 OLD_FILES+=usr/include/c++/3.4/new
 OLD_FILES+=usr/include/c++/3.4/numeric
 OLD_FILES+=usr/include/c++/3.4/ostream
 OLD_FILES+=usr/include/c++/3.4/queue
 OLD_FILES+=usr/include/c++/3.4/set
 OLD_FILES+=usr/include/c++/3.4/sstream
 OLD_FILES+=usr/include/c++/3.4/stack
 OLD_FILES+=usr/include/c++/3.4/stdexcept
 OLD_FILES+=usr/include/c++/3.4/streambuf
 OLD_FILES+=usr/include/c++/3.4/string
 OLD_FILES+=usr/include/c++/3.4/typeinfo
 OLD_FILES+=usr/include/c++/3.4/utility
 OLD_FILES+=usr/include/c++/3.4/valarray
 OLD_FILES+=usr/include/c++/3.4/vector
 OLD_DIRS+=usr/include/c++/3.4/backward
 OLD_DIRS+=usr/include/c++/3.4/bits
 OLD_DIRS+=usr/include/c++/3.4/debug
 OLD_DIRS+=usr/include/c++/3.4/ext
 OLD_DIRS+=usr/include/c++/3.4
 # 20070510: zpool/zfs moved to /sbin
 OLD_FILES+=usr/sbin/zfs
 OLD_FILES+=usr/sbin/zpool
 # 20070423: rc.bluetooth (examples) removed
 OLD_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth
 OLD_DIRS+=usr/share/examples/netgraph/bluetooth
 # 20070421: worm.4 removed
 OLD_FILES+=usr/share/man/man4/worm.4.gz
 # 20070417: trunk(4) renamed to lagg(4)
 OLD_FILES+=usr/include/net/if_trunk.h
 # 20070409: uuidgen moved to /bin/
 OLD_FILES+=usr/bin/uuidgen
 # 20070328: bzip2 1.0.4
 OLD_FILES+=usr/share/info/bzip2.info.gz
 # 20070303: libarchive 2.0
 OLD_LIBS+=usr/lib/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
 # 20070225: vm_page_unmanage() removed
 OLD_FILES+=usr/share/man/man9/vm_page_unmanage.9.gz
 # 20070216: VFS_VPTOFH(9) -> VOP_VPTOFH(9)
 OLD_FILES+=usr/share/man/man9/VFS_VPTOFH.9.gz
 # 20070212: kame.4 removed
 OLD_FILES+=usr/share/man/man4/kame.4.gz
 # 20070201: remove libmytinfo link
 OLD_FILES+=usr/lib/libmytinfo.a
 OLD_FILES+=usr/lib/libmytinfo.so
 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
 # 20070128: remove vnconfig
 OLD_FILES+=usr/sbin/vnconfig
 # 20070127: remove bpf_compat.h
 OLD_FILES+=usr/include/net/bpf_compat.h
 # 20070125: objformat bites the dust
 OLD_FILES+=usr/bin/objformat
 OLD_FILES+=usr/share/man/man1/objformat.1.gz
 OLD_FILES+=usr/include/objformat.h
 OLD_FILES+=usr/share/man/man3/getobjformat.3.gz
 # 20061008: rename *.so.4 libalias modules to *.so and move to /lib
 # This uses MOVED_LIBS because the new files are libraries even though
 # the old files to remove are symlinks
 MOVED_LIBS+=usr/lib/libalias_cuseeme.so
 MOVED_LIBS+=usr/lib/libalias_dummy.so
 MOVED_LIBS+=usr/lib/libalias_ftp.so
 MOVED_LIBS+=usr/lib/libalias_irc.so
 MOVED_LIBS+=usr/lib/libalias_nbt.so
 MOVED_LIBS+=usr/lib/libalias_pptp.so
 MOVED_LIBS+=usr/lib/libalias_skinny.so
 MOVED_LIBS+=usr/lib/libalias_smedia.so
 OLD_LIBS+=lib/libalias_cuseeme.so.4
 OLD_LIBS+=lib/libalias_dummy.so.4
 OLD_LIBS+=lib/libalias_ftp.so.4
 OLD_LIBS+=lib/libalias_irc.so.4
 OLD_LIBS+=lib/libalias_nbt.so.4
 OLD_LIBS+=lib/libalias_pptp.so.4
 OLD_LIBS+=lib/libalias_skinny.so.4
 OLD_LIBS+=lib/libalias_smedia.so.4
 # 20061126: remove old man page
 OLD_FILES+=usr/share/man/man3/archive_read_set_bytes_per_block.3.gz
 # 20061125: remove old man page
 OLD_FILES+=usr/share/man/man9/devsw.9.gz
 # 20061122: remove obsolete mount programs
 OLD_FILES+=sbin/mount_devfs
 OLD_FILES+=sbin/mount_ext2fs
 OLD_FILES+=sbin/mount_fdescfs
 OLD_FILES+=sbin/mount_linprocfs
 OLD_FILES+=sbin/mount_procfs
 OLD_FILES+=sbin/mount_std
 OLD_FILES+=rescue/mount_devfs
 OLD_FILES+=rescue/mount_ext2fs
 OLD_FILES+=rescue/mount_fdescfs
 OLD_FILES+=rescue/mount_linprocfs
 OLD_FILES+=rescue/mount_procfs
 OLD_FILES+=rescue/mount_std
 OLD_FILES+=usr/share/man/man8/mount_devfs.8.gz
 OLD_FILES+=usr/share/man/man8/mount_ext2fs.8.gz
 OLD_FILES+=usr/share/man/man8/mount_fdescfs.8.gz
 OLD_FILES+=usr/share/man/man8/mount_linprocfs.8.gz
 OLD_FILES+=usr/share/man/man8/mount_procfs.8.gz
 OLD_FILES+=usr/share/man/man8/mount_std.8.gz
 # 20061116: uhidev.4 removed
 OLD_FILES+=usr/share/man/man4/uhidev.4.gz
 # 20061106: archive_write_prepare.3 removed
 OLD_FILES+=usr/share/man/man3/archive_write_prepare.3.gz
 # 20061018: pccardc removed
 OLD_FILES+=usr/sbin/pccardc usr/share/man/man8/pccardc.8.gz
 # 20060930: demangle.h from contrib/libstdc++/include/ext/
 OLD_FILES+=usr/include/c++/3.4/ext/demangle.h
 # 20060929: mrouted removed
 OLD_FILES+=usr/sbin/map-mbone
 OLD_FILES+=usr/sbin/mrinfo
 OLD_FILES+=usr/sbin/mrouted
 OLD_FILES+=usr/sbin/mtrace
 OLD_FILES+=usr/share/man/man8/map-mbone.8.gz
 OLD_FILES+=usr/share/man/man8/mrinfo.8.gz
 OLD_FILES+=usr/share/man/man8/mrouted.8.gz
 OLD_FILES+=usr/share/man/man8/mtrace.8.gz
 # 20060924: tcpslice removed
 OLD_FILES+=usr/sbin/tcpslice
 OLD_FILES+=usr/share/man/man1/tcpslice.1.gz
 # 20060829: kvmdb cleanup script removed
 OLD_FILES+=etc/periodic/weekly/120.clean-kvmdb
 # 20060822: ramdisk{,-own} have been replaced by mdconfig{,2}
 OLD_FILES+=etc/rc.d/ramdisk
 OLD_FILES+=etc/rc.d/ramdisk-own
 # 20060729: OpenSSL 0.9.7e -> 0.9.8b upgrade
 OLD_FILES+=usr/include/openssl/eng_int.h
 OLD_FILES+=usr/include/openssl/hw_4758_cca_err.h
 OLD_FILES+=usr/include/openssl/hw_aep_err.h
 OLD_FILES+=usr/include/openssl/hw_atalla_err.h
 OLD_FILES+=usr/include/openssl/hw_cswift_err.h
 OLD_FILES+=usr/include/openssl/hw_ncipher_err.h
 OLD_FILES+=usr/include/openssl/hw_nuron_err.h
 OLD_FILES+=usr/include/openssl/hw_sureware_err.h
 OLD_FILES+=usr/include/openssl/hw_ubsec_err.h
 # 20060713: mount_linsysfs(8) never existed in 7.x
 OLD_FILES+=sbin/mount_linsysfs
 OLD_FILES+=usr/share/man/man8/mount_linsysfs.8.gz
 # 20060704: KAME compat file net_osdep.h removed
 OLD_FILES+=usr/include/net/net_osdep.h
 # 20060605: man page links removed by OpenBSM 1.0 alpha 6 import
 OLD_FILES+=usr/share/man/man3/au_to_socket.3.gz
 OLD_FILES+=usr/share/man/man3/au_to_socket_ex_128.3.gz
 OLD_FILES+=usr/share/man/man3/au_to_socket_ex_32.3.gz
 # 20060517: pcvt removed
 OLD_FILES+=usr/share/pcvt/README.FIRST
 OLD_FILES+=usr/share/pcvt/Etc/xmodmap-german
 OLD_FILES+=usr/share/pcvt/Etc/pcvt.sh
 OLD_FILES+=usr/share/pcvt/Etc/pcvt.el
 OLD_FILES+=usr/share/pcvt/Etc/Terminfo
 OLD_FILES+=usr/share/pcvt/Etc/Termcap
 OLD_DIRS+=usr/share/pcvt/Etc
 OLD_FILES+=usr/share/pcvt/Doc/NotesAndHints
 OLD_FILES+=usr/share/pcvt/Doc/Keyboard.VT
 OLD_FILES+=usr/share/pcvt/Doc/Keyboard.HP
 OLD_FILES+=usr/share/pcvt/Doc/EscapeSequences
 OLD_FILES+=usr/share/pcvt/Doc/Charsets
 OLD_FILES+=usr/share/pcvt/Doc/CharGen
 OLD_FILES+=usr/share/pcvt/Doc/Bibliography
 OLD_FILES+=usr/share/pcvt/Doc/Acknowledgements
 OLD_DIRS+=usr/share/pcvt/Doc
 OLD_DIRS+=usr/share/pcvt
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.816
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.814
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.810
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.808
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.816
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.814
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.810
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.808
 OLD_DIRS+=usr/share/misc/pcvtfonts
 OLD_FILES+=usr/share/misc/keycap.pcvt
 OLD_FILES+=usr/share/man/man8/ispcvt.8.gz
 OLD_FILES+=usr/share/man/man5/keycap.5.gz
 OLD_FILES+=usr/share/man/man4/pcvt.4.gz
 OLD_FILES+=usr/share/man/man3/kgetstr.3.gz
 OLD_FILES+=usr/share/man/man3/kgetnum.3.gz
 OLD_FILES+=usr/share/man/man3/kgetflag.3.gz
 OLD_FILES+=usr/share/man/man3/kgetent.3.gz
 OLD_FILES+=usr/share/man/man3/keycap.3.gz
 OLD_FILES+=usr/share/man/man1/vt220keys.1.gz
 OLD_FILES+=usr/share/man/man1/scon.1.gz
 OLD_FILES+=usr/share/man/man1/loadfont.1.gz
 OLD_FILES+=usr/share/man/man1/kcon.1.gz
 OLD_FILES+=usr/share/man/man1/fontedit.1.gz
 OLD_FILES+=usr/share/man/man1/cursor.1.gz
 OLD_FILES+=usr/sbin/vt220keys
 OLD_FILES+=usr/sbin/scon
 OLD_FILES+=usr/sbin/loadfont
 OLD_FILES+=usr/sbin/kcon
 OLD_FILES+=usr/sbin/ispcvt
 OLD_FILES+=usr/sbin/fontedit
 OLD_FILES+=usr/sbin/cursor
 OLD_FILES+=usr/lib/libkeycap_p.a
 OLD_FILES+=usr/lib/libkeycap.a
 OLD_FILES+=usr/include/machine/pcvt_ioctl.h
 # 20060514: lnc(4) replaced by le(4)
 OLD_FILES+=usr/share/man/man4/i386/lnc.4.gz
 # 20060512: remove ip6fw
 OLD_FILES+=etc/periodic/security/600.ip6fwdenied
 OLD_FILES+=etc/periodic/security/650.ip6fwlimit
 OLD_FILES+=sbin/ip6fw
 OLD_FILES+=usr/include/netinet6/ip6_fw.h
 OLD_FILES+=usr/share/man/man8/ip6fw.8.gz
 # 20060424: sab(4) removed
 OLD_FILES+=usr/share/man/man4/sab.4.gz
 # 20060328: remove redundant rc.d script
 OLD_FILES+=etc/rc.d/ike
 # 20060127: revert libdisk to static-only
 OLD_FILES+=usr/lib/libdisk.so
 # 20060115: sys/pccard includes cleanup
 OLD_FILES+=usr/include/pccard/driver.h
 OLD_FILES+=usr/include/pccard/i82365.h
 OLD_FILES+=usr/include/pccard/meciareg.h
 OLD_FILES+=usr/include/pccard/pccard_nbk.h
 OLD_FILES+=usr/include/pccard/pcic_pci.h
 OLD_FILES+=usr/include/pccard/pcicvar.h
 OLD_FILES+=usr/include/pccard/slot.h
 # 20051215: rescue/nextboot.sh renamed to rescue/nextboot
 OLD_FILES+=rescue/nextboot.sh
 # 20051214: usbd(8) removed
 OLD_FILES+=etc/rc.d/usbd
 OLD_FILES+=etc/usbd.conf
 OLD_FILES+=usr/sbin/usbd
 OLD_FILES+=usr/share/man/man8/usbd.8.gz
 # 20051029: rc.d/ppp-user renamed to rc.d/ppp for convenience
 OLD_FILES+=etc/rc.d/ppp-user
 # 20051012: setkey(8) moved to /sbin/
 OLD_FILES+=usr/sbin/setkey
 # 20050930: pccardd(8) removed
 OLD_FILES+=usr/sbin/pccardd
 OLD_FILES+=usr/share/man/man5/pccard.conf.5.gz
 OLD_FILES+=usr/share/man/man8/pccardd.8.gz
 # 20050927: bridge(4) replaced by if_bridge(4)
 OLD_FILES+=usr/include/net/bridge.h
 # 20050831: not implemented
 OLD_FILES+=usr/share/man/man3/getino.3.gz
 OLD_FILES+=usr/share/man/man3/putino.3.gz
 # 20050825: T/TCP retired several months ago
 OLD_FILES+=usr/share/man/man4/ttcp.4.gz
 # 20050805 tn3270 retired long ago
 OLD_FILES+=usr/share/misc/map3270
 # 20050801: too old to be interesting here
 OLD_FILES+=usr/share/doc/papers/px.ps.gz
 # 20050721: moved to ports
 OLD_FILES+=usr/sbin/vttest
 OLD_FILES+=usr/share/man/man1/vttest.1.gz
 # 20050617: wpa man pages moved to section 8
 OLD_FILES+=usr/share/man/man1/hostapd.1.gz
 OLD_FILES+=usr/share/man/man1/hostapd_cli.1.gz
 OLD_FILES+=usr/share/man/man1/wpa_cli.1.gz
 OLD_FILES+=usr/share/man/man1/wpa_supplicant.1.gz
 # 20050610: rexecd (insecure by design)
 OLD_FILES+=etc/pam.d/rexecd
 OLD_FILES+=usr/share/man/man8/rexecd.8.gz
 OLD_FILES+=usr/libexec/rexecd
 # 20050606: OpenBSD dhclient replaces ISC one
 OLD_FILES+=bin/omshell
 OLD_FILES+=sbin/omshell
 OLD_FILES+=usr/share/man/man1/omshell.1.gz
 OLD_FILES+=usr/share/man/man5/dhcp-eval.5.gz
 # 200504XX: ipf tools moved from /usr to /
 OLD_FILES+=rescue/ipfs
 OLD_FILES+=rescue/ipfstat
 OLD_FILES+=rescue/ipmon
 OLD_FILES+=rescue/ipnat
 OLD_FILES+=usr/sbin/ipftest
 OLD_FILES+=usr/sbin/ipresend
 OLD_FILES+=usr/sbin/ipsend
 OLD_FILES+=usr/sbin/iptest
 OLD_FILES+=usr/share/man/man1/ipnat.1.gz
 OLD_FILES+=usr/share/man/man1/ipsend.1.gz
 OLD_FILES+=usr/share/man/man1/iptest.1.gz
 OLD_FILES+=usr/share/man/man5/ipsend.5.gz
 # 200503XX: bsdtar takes over gtar
 OLD_FILES+=usr/bin/gtar
 OLD_FILES+=usr/share/man/man1/gtar.1.gz
 # 200503XX
 OLD_FILES+=usr/share/man/man3/exp10.3.gz
 OLD_FILES+=usr/share/man/man3/exp10f.3.gz
 OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz
 # 20050324: updated release infrastructure
 OLD_FILES+=usr/share/man/man5/drivers.conf.5.gz
 # 20050317: removed from BIND 9 distribution
 OLD_FILES+=usr/share/doc/bind9/KNOWN_DEFECTS
 # 2005XXXX:
 OLD_FILES+=sbin/mount_autofs
 OLD_FILES+=usr/lib/libautofs.a
 OLD_FILES+=usr/lib/libautofs.so
 OLD_FILES+=usr/share/man/man8/mount_autofs.8.gz
 # 20050203: Merged with fortunes
 OLD_FILES+=usr/share/games/fortune/fortunes2
 OLD_FILES+=usr/share/games/fortune/fortunes2.dat
 # 200501XX:
 OLD_FILES+=usr/libexec/getNAME
 # 200411XX: gvinum replaces vinum
 OLD_FILES+=bin/vinum
 OLD_FILES+=rescue/vinum
 OLD_FILES+=sbin/vinum
 OLD_FILES+=usr/share/man/man8/vinum.8.gz
 # 200411XX: libxpg4 removal
 OLD_FILES+=usr/lib/libxpg4.a
 OLD_FILES+=usr/lib/libxpg4.so
 OLD_FILES+=usr/lib/libxpg4_p.a
 # 20041109: replaced by em(4)
 OLD_FILES+=usr/share/man/man4/gx.4.gz
 OLD_FILES+=usr/share/man/man4/if_gx.4.gz
 # 20041017: rune interface removed
 OLD_FILES+=usr/include/rune.h
 OLD_FILES+=usr/share/man/man3/fgetrune.3.gz
 OLD_FILES+=usr/share/man/man3/fputrune.3.gz
 OLD_FILES+=usr/share/man/man3/fungetrune.3.gz
 OLD_FILES+=usr/share/man/man3/mbrrune.3.gz
 OLD_FILES+=usr/share/man/man3/mbrune.3.gz
 OLD_FILES+=usr/share/man/man3/rune.3.gz
 OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz
 OLD_FILES+=usr/share/man/man3/sgetrune.3.gz
 OLD_FILES+=usr/share/man/man3/sputrune.3.gz
 # 20040925: bind9 import
 OLD_FILES+=usr/bin/dnskeygen
 OLD_FILES+=usr/bin/dnsquery
 OLD_FILES+=usr/lib/libisc.a
 OLD_FILES+=usr/lib/libisc.so
 OLD_FILES+=usr/lib/libisc_p.a
 OLD_FILES+=usr/libexec/named-xfer
 OLD_FILES+=usr/sbin/named.restart
 OLD_FILES+=usr/sbin/ndc
 OLD_FILES+=usr/sbin/nslookup
 OLD_FILES+=usr/sbin/nsupdate
 OLD_FILES+=usr/share/doc/bind/html/acl.html
 OLD_FILES+=usr/share/doc/bind/html/address_list.html
 OLD_FILES+=usr/share/doc/bind/html/comments.html
 OLD_FILES+=usr/share/doc/bind/html/config.html
 OLD_FILES+=usr/share/doc/bind/html/controls.html
 OLD_FILES+=usr/share/doc/bind/html/docdef.html
 OLD_FILES+=usr/share/doc/bind/html/example.html
 OLD_FILES+=usr/share/doc/bind/html/include.html
 OLD_FILES+=usr/share/doc/bind/html/index.html
 OLD_FILES+=usr/share/doc/bind/html/key.html
 OLD_FILES+=usr/share/doc/bind/html/logging.html
 OLD_FILES+=usr/share/doc/bind/html/master.html
 OLD_FILES+=usr/share/doc/bind/html/options.html
 OLD_FILES+=usr/share/doc/bind/html/server.html
 OLD_FILES+=usr/share/doc/bind/html/trusted-keys.html
 OLD_FILES+=usr/share/doc/bind/html/zone.html
 OLD_FILES+=usr/share/doc/bind/misc/DynamicUpdate
 OLD_FILES+=usr/share/doc/bind/misc/FAQ.1of2
 OLD_FILES+=usr/share/doc/bind/misc/FAQ.2of2
 OLD_FILES+=usr/share/doc/bind/misc/rfc2317-notes.txt
 OLD_FILES+=usr/share/doc/bind/misc/style.txt
 OLD_FILES+=usr/share/man/man1/dnskeygen.1.gz
 OLD_FILES+=usr/share/man/man1/dnsquery.1.gz
 OLD_FILES+=usr/share/man/man8/named-bootconf.8.gz
 OLD_FILES+=usr/share/man/man8/named-xfer.8.gz
 OLD_FILES+=usr/share/man/man8/named.restart.8.gz
 OLD_FILES+=usr/share/man/man8/ndc.8.gz
 OLD_FILES+=usr/share/man/man8/nslookup.8.gz
 # 200409XX
 OLD_FILES+=usr/share/man/man3/ENSURE.3.gz
 OLD_FILES+=usr/share/man/man3/ENSURE_ERR.3.gz
 OLD_FILES+=usr/share/man/man3/INSIST.3.gz
 OLD_FILES+=usr/share/man/man3/INSIST_ERR.3.gz
 OLD_FILES+=usr/share/man/man3/INVARIANT.3.gz
 OLD_FILES+=usr/share/man/man3/INVARIANT_ERR.3.gz
 OLD_FILES+=usr/share/man/man3/REQUIRE.3.gz
 OLD_FILES+=usr/share/man/man3/REQUIRE_ERR.3.gz
 OLD_FILES+=usr/share/man/man3/assertion_type_to_text.3.gz
 OLD_FILES+=usr/share/man/man3/assertions.3.gz
 OLD_FILES+=usr/share/man/man3/bitncmp.3.gz
 OLD_FILES+=usr/share/man/man3/evAddTime.3.gz
 OLD_FILES+=usr/share/man/man3/evCancelConn.3.gz
 OLD_FILES+=usr/share/man/man3/evCancelRW.3.gz
 OLD_FILES+=usr/share/man/man3/evClearIdleTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evClearTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evCmpTime.3.gz
 OLD_FILES+=usr/share/man/man3/evConnFunc.3.gz
 OLD_FILES+=usr/share/man/man3/evConnect.3.gz
 OLD_FILES+=usr/share/man/man3/evConsIovec.3.gz
 OLD_FILES+=usr/share/man/man3/evConsTime.3.gz
 OLD_FILES+=usr/share/man/man3/evCreate.3.gz
 OLD_FILES+=usr/share/man/man3/evDefer.3.gz
 OLD_FILES+=usr/share/man/man3/evDeselectFD.3.gz
 OLD_FILES+=usr/share/man/man3/evDestroy.3.gz
 OLD_FILES+=usr/share/man/man3/evDispatch.3.gz
 OLD_FILES+=usr/share/man/man3/evDo.3.gz
 OLD_FILES+=usr/share/man/man3/evDrop.3.gz
 OLD_FILES+=usr/share/man/man3/evFileFunc.3.gz
 OLD_FILES+=usr/share/man/man3/evGetNext.3.gz
 OLD_FILES+=usr/share/man/man3/evHold.3.gz
 OLD_FILES+=usr/share/man/man3/evInitID.3.gz
 OLD_FILES+=usr/share/man/man3/evLastEventTime.3.gz
 OLD_FILES+=usr/share/man/man3/evListen.3.gz
 OLD_FILES+=usr/share/man/man3/evMainLoop.3.gz
 OLD_FILES+=usr/share/man/man3/evNowTime.3.gz
 OLD_FILES+=usr/share/man/man3/evPrintf.3.gz
 OLD_FILES+=usr/share/man/man3/evRead.3.gz
 OLD_FILES+=usr/share/man/man3/evResetTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evSelectFD.3.gz
 OLD_FILES+=usr/share/man/man3/evSetDebug.3.gz
 OLD_FILES+=usr/share/man/man3/evSetIdleTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evSetTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evStreamFunc.3.gz
 OLD_FILES+=usr/share/man/man3/evSubTime.3.gz
 OLD_FILES+=usr/share/man/man3/evTestID.3.gz
 OLD_FILES+=usr/share/man/man3/evTimeRW.3.gz
 OLD_FILES+=usr/share/man/man3/evTimeSpec.3.gz
 OLD_FILES+=usr/share/man/man3/evTimeVal.3.gz
 OLD_FILES+=usr/share/man/man3/evTimerFunc.3.gz
 OLD_FILES+=usr/share/man/man3/evTouchIdleTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evTryAccept.3.gz
 OLD_FILES+=usr/share/man/man3/evUnhold.3.gz
 OLD_FILES+=usr/share/man/man3/evUntimeRW.3.gz
 OLD_FILES+=usr/share/man/man3/evUnwait.3.gz
 OLD_FILES+=usr/share/man/man3/evWaitFor.3.gz
 OLD_FILES+=usr/share/man/man3/evWaitFunc.3.gz
 OLD_FILES+=usr/share/man/man3/evWrite.3.gz
 OLD_FILES+=usr/share/man/man3/eventlib.3.gz
 OLD_FILES+=usr/share/man/man3/heap.3.gz
 OLD_FILES+=usr/share/man/man3/heap_decreased.3.gz
 OLD_FILES+=usr/share/man/man3/heap_delete.3.gz
 OLD_FILES+=usr/share/man/man3/heap_element.3.gz
 OLD_FILES+=usr/share/man/man3/heap_for_each.3.gz
 OLD_FILES+=usr/share/man/man3/heap_free.3.gz
 OLD_FILES+=usr/share/man/man3/heap_increased.3.gz
 OLD_FILES+=usr/share/man/man3/heap_insert.3.gz
 OLD_FILES+=usr/share/man/man3/heap_new.3.gz
 OLD_FILES+=usr/share/man/man3/log_add_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_category_is_active.3.gz
 OLD_FILES+=usr/share/man/man3/log_close_stream.3.gz
 OLD_FILES+=usr/share/man/man3/log_dec_references.3.gz
 OLD_FILES+=usr/share/man/man3/log_free_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_free_context.3.gz
 OLD_FILES+=usr/share/man/man3/log_get_filename.3.gz
 OLD_FILES+=usr/share/man/man3/log_get_stream.3.gz
 OLD_FILES+=usr/share/man/man3/log_inc_references.3.gz
 OLD_FILES+=usr/share/man/man3/log_new_context.3.gz
 OLD_FILES+=usr/share/man/man3/log_new_file_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_new_null_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_new_syslog_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_open_stream.3.gz
 OLD_FILES+=usr/share/man/man3/log_option.3.gz
 OLD_FILES+=usr/share/man/man3/log_remove_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_set_file_owner.3.gz
 OLD_FILES+=usr/share/man/man3/log_vwrite.3.gz
 OLD_FILES+=usr/share/man/man3/log_write.3.gz
 OLD_FILES+=usr/share/man/man3/logging.3.gz
 OLD_FILES+=usr/share/man/man3/memcluster.3.gz
 OLD_FILES+=usr/share/man/man3/memget.3.gz
 OLD_FILES+=usr/share/man/man3/memput.3.gz
 OLD_FILES+=usr/share/man/man3/memstats.3.gz
 OLD_FILES+=usr/share/man/man3/set_assertion_failure_callback.3.
 OLD_FILES+=usr/share/man/man3/sigwait.3.gz
 OLD_FILES+=usr/share/man/man3/tree_add.3.gz
 OLD_FILES+=usr/share/man/man3/tree_delete.3.gz
 OLD_FILES+=usr/share/man/man3/tree_init.3.gz
 OLD_FILES+=usr/share/man/man3/tree_mung.3.gz
 OLD_FILES+=usr/share/man/man3/tree_srch.3.gz
 OLD_FILES+=usr/share/man/man3/tree_trav.3.gz
 # 2004XXYY: OS internal libs, no ports use them, no need to use OLD_LIBS
 OLD_LIBS+=lib/geom/geom_concat.so.1
 OLD_LIBS+=lib/geom/geom_label.so.1
 OLD_LIBS+=lib/geom/geom_nop.so.1
 OLD_LIBS+=lib/geom/geom_stripe.so.1
 # 20040728: GCC 3.4.2
 OLD_DIRS+=usr/include/c++/3.3
 OLD_FILES+=usr/include/c++/3.3/FlexLexer.h
 OLD_FILES+=usr/include/c++/3.3/algorithm
 OLD_FILES+=usr/include/c++/3.3/backward/algo.h
 OLD_FILES+=usr/include/c++/3.3/backward/algobase.h
 OLD_FILES+=usr/include/c++/3.3/backward/alloc.h
 OLD_FILES+=usr/include/c++/3.3/backward/backward_warning.h
 OLD_FILES+=usr/include/c++/3.3/backward/bvector.h
 OLD_FILES+=usr/include/c++/3.3/backward/complex.h
 OLD_FILES+=usr/include/c++/3.3/backward/defalloc.h
 OLD_FILES+=usr/include/c++/3.3/backward/deque.h
 OLD_FILES+=usr/include/c++/3.3/backward/fstream.h
 OLD_FILES+=usr/include/c++/3.3/backward/function.h
 OLD_FILES+=usr/include/c++/3.3/backward/hash_map.h
 OLD_FILES+=usr/include/c++/3.3/backward/hash_set.h
 OLD_FILES+=usr/include/c++/3.3/backward/hashtable.h
 OLD_FILES+=usr/include/c++/3.3/backward/heap.h
 OLD_FILES+=usr/include/c++/3.3/backward/iomanip.h
 OLD_FILES+=usr/include/c++/3.3/backward/iostream.h
 OLD_FILES+=usr/include/c++/3.3/backward/istream.h
 OLD_FILES+=usr/include/c++/3.3/backward/iterator.h
 OLD_FILES+=usr/include/c++/3.3/backward/list.h
 OLD_FILES+=usr/include/c++/3.3/backward/map.h
 OLD_FILES+=usr/include/c++/3.3/backward/multimap.h
 OLD_FILES+=usr/include/c++/3.3/backward/multiset.h
 OLD_FILES+=usr/include/c++/3.3/backward/new.h
 OLD_FILES+=usr/include/c++/3.3/backward/ostream.h
 OLD_FILES+=usr/include/c++/3.3/backward/pair.h
 OLD_FILES+=usr/include/c++/3.3/backward/queue.h
 OLD_FILES+=usr/include/c++/3.3/backward/rope.h
 OLD_FILES+=usr/include/c++/3.3/backward/set.h
 OLD_FILES+=usr/include/c++/3.3/backward/slist.h
 OLD_FILES+=usr/include/c++/3.3/backward/stack.h
 OLD_FILES+=usr/include/c++/3.3/backward/stream.h
 OLD_FILES+=usr/include/c++/3.3/backward/streambuf.h
 OLD_FILES+=usr/include/c++/3.3/backward/strstream
 OLD_FILES+=usr/include/c++/3.3/backward/strstream.h
 OLD_FILES+=usr/include/c++/3.3/backward/tempbuf.h
 OLD_FILES+=usr/include/c++/3.3/backward/tree.h
 OLD_FILES+=usr/include/c++/3.3/backward/vector.h
 OLD_DIRS+=usr/include/c++/3.3/backward
 OLD_FILES+=usr/include/c++/3.3/bits/atomicity.h
 OLD_FILES+=usr/include/c++/3.3/bits/basic_file.h
 OLD_FILES+=usr/include/c++/3.3/bits/basic_ios.h
 OLD_FILES+=usr/include/c++/3.3/bits/basic_ios.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/basic_string.h
 OLD_FILES+=usr/include/c++/3.3/bits/basic_string.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/boost_concept_check.h
 OLD_FILES+=usr/include/c++/3.3/bits/c++config.h
 OLD_FILES+=usr/include/c++/3.3/bits/c++io.h
 OLD_FILES+=usr/include/c++/3.3/bits/c++locale.h
 OLD_FILES+=usr/include/c++/3.3/bits/c++locale_internal.h
 OLD_FILES+=usr/include/c++/3.3/bits/char_traits.h
 OLD_FILES+=usr/include/c++/3.3/bits/cmath.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/codecvt.h
 OLD_FILES+=usr/include/c++/3.3/bits/codecvt_specializations.h
 OLD_FILES+=usr/include/c++/3.3/bits/concept_check.h
 OLD_FILES+=usr/include/c++/3.3/bits/cpp_type_traits.h
 OLD_FILES+=usr/include/c++/3.3/bits/ctype_base.h
 OLD_FILES+=usr/include/c++/3.3/bits/ctype_inline.h
 OLD_FILES+=usr/include/c++/3.3/bits/ctype_noninline.h
 OLD_FILES+=usr/include/c++/3.3/bits/deque.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/fpos.h
 OLD_FILES+=usr/include/c++/3.3/bits/fstream.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/functexcept.h
 OLD_FILES+=usr/include/c++/3.3/bits/generic_shadow.h
 OLD_FILES+=usr/include/c++/3.3/bits/gslice.h
 OLD_FILES+=usr/include/c++/3.3/bits/gslice_array.h
 OLD_FILES+=usr/include/c++/3.3/bits/gthr-default.h
 OLD_FILES+=usr/include/c++/3.3/bits/gthr-posix.h
 OLD_FILES+=usr/include/c++/3.3/bits/gthr-single.h
 OLD_FILES+=usr/include/c++/3.3/bits/gthr.h
 OLD_FILES+=usr/include/c++/3.3/bits/indirect_array.h
 OLD_FILES+=usr/include/c++/3.3/bits/ios_base.h
 OLD_FILES+=usr/include/c++/3.3/bits/istream.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/list.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/locale_classes.h
 OLD_FILES+=usr/include/c++/3.3/bits/locale_facets.h
 OLD_FILES+=usr/include/c++/3.3/bits/locale_facets.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/localefwd.h
 OLD_FILES+=usr/include/c++/3.3/bits/mask_array.h
 OLD_FILES+=usr/include/c++/3.3/bits/messages_members.h
 OLD_FILES+=usr/include/c++/3.3/bits/os_defines.h
 OLD_FILES+=usr/include/c++/3.3/bits/ostream.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/pthread_allocimpl.h
 OLD_FILES+=usr/include/c++/3.3/bits/slice.h
 OLD_FILES+=usr/include/c++/3.3/bits/slice_array.h
 OLD_FILES+=usr/include/c++/3.3/bits/sstream.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/stl_algo.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_algobase.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_alloc.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_bvector.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_construct.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_deque.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_function.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_heap.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator_base_funcs.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator_base_types.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_list.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_map.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_multimap.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_multiset.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_numeric.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_pair.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_pthread_alloc.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_queue.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_raw_storage_iter.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_relops.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_set.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_stack.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_tempbuf.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_threads.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_tree.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_uninitialized.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_vector.h
 OLD_FILES+=usr/include/c++/3.3/bits/stream_iterator.h
 OLD_FILES+=usr/include/c++/3.3/bits/streambuf.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/streambuf_iterator.h
 OLD_FILES+=usr/include/c++/3.3/bits/stringfwd.h
 OLD_FILES+=usr/include/c++/3.3/bits/time_members.h
 OLD_FILES+=usr/include/c++/3.3/bits/type_traits.h
 OLD_FILES+=usr/include/c++/3.3/bits/valarray_array.h
 OLD_FILES+=usr/include/c++/3.3/bits/valarray_array.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/valarray_meta.h
 OLD_FILES+=usr/include/c++/3.3/bits/vector.tcc
 OLD_DIRS+=usr/include/c++/3.3/bits
 OLD_FILES+=usr/include/c++/3.3/bitset
 OLD_FILES+=usr/include/c++/3.3/cassert
 OLD_FILES+=usr/include/c++/3.3/cctype
 OLD_FILES+=usr/include/c++/3.3/cerrno
 OLD_FILES+=usr/include/c++/3.3/cfloat
 OLD_FILES+=usr/include/c++/3.3/ciso646
 OLD_FILES+=usr/include/c++/3.3/climits
 OLD_FILES+=usr/include/c++/3.3/clocale
 OLD_FILES+=usr/include/c++/3.3/cmath
 OLD_FILES+=usr/include/c++/3.3/complex
 OLD_FILES+=usr/include/c++/3.3/csetjmp
 OLD_FILES+=usr/include/c++/3.3/csignal
 OLD_FILES+=usr/include/c++/3.3/cstdarg
 OLD_FILES+=usr/include/c++/3.3/cstddef
 OLD_FILES+=usr/include/c++/3.3/cstdio
 OLD_FILES+=usr/include/c++/3.3/cstdlib
 OLD_FILES+=usr/include/c++/3.3/cstring
 OLD_FILES+=usr/include/c++/3.3/ctime
 OLD_FILES+=usr/include/c++/3.3/cwchar
 OLD_FILES+=usr/include/c++/3.3/cwctype
 OLD_FILES+=usr/include/c++/3.3/cxxabi.h
 OLD_FILES+=usr/include/c++/3.3/deque
 OLD_FILES+=usr/include/c++/3.3/exception
 OLD_FILES+=usr/include/c++/3.3/exception_defines.h
 OLD_FILES+=usr/include/c++/3.3/ext/algorithm
 OLD_FILES+=usr/include/c++/3.3/ext/enc_filebuf.h
 OLD_FILES+=usr/include/c++/3.3/ext/functional
 OLD_FILES+=usr/include/c++/3.3/ext/hash_map
 OLD_FILES+=usr/include/c++/3.3/ext/hash_set
 OLD_FILES+=usr/include/c++/3.3/ext/iterator
 OLD_FILES+=usr/include/c++/3.3/ext/memory
 OLD_FILES+=usr/include/c++/3.3/ext/numeric
 OLD_FILES+=usr/include/c++/3.3/ext/rb_tree
 OLD_FILES+=usr/include/c++/3.3/ext/rope
 OLD_FILES+=usr/include/c++/3.3/ext/ropeimpl.h
 OLD_FILES+=usr/include/c++/3.3/ext/slist
 OLD_FILES+=usr/include/c++/3.3/ext/stdio_filebuf.h
 OLD_FILES+=usr/include/c++/3.3/ext/stl_hash_fun.h
 OLD_FILES+=usr/include/c++/3.3/ext/stl_hashtable.h
 OLD_FILES+=usr/include/c++/3.3/ext/stl_rope.h
 OLD_DIRS+=usr/include/c++/3.3/ext
 OLD_FILES+=usr/include/c++/3.3/fstream
 OLD_FILES+=usr/include/c++/3.3/functional
 OLD_FILES+=usr/include/c++/3.3/iomanip
 OLD_FILES+=usr/include/c++/3.3/ios
 OLD_FILES+=usr/include/c++/3.3/iosfwd
 OLD_FILES+=usr/include/c++/3.3/iostream
 OLD_FILES+=usr/include/c++/3.3/istream
 OLD_FILES+=usr/include/c++/3.3/iterator
 OLD_FILES+=usr/include/c++/3.3/limits
 OLD_FILES+=usr/include/c++/3.3/list
 OLD_FILES+=usr/include/c++/3.3/locale
 OLD_FILES+=usr/include/c++/3.3/map
 OLD_FILES+=usr/include/c++/3.3/memory
 OLD_FILES+=usr/include/c++/3.3/new
 OLD_FILES+=usr/include/c++/3.3/numeric
 OLD_FILES+=usr/include/c++/3.3/ostream
 OLD_FILES+=usr/include/c++/3.3/queue
 OLD_FILES+=usr/include/c++/3.3/set
 OLD_FILES+=usr/include/c++/3.3/sstream
 OLD_FILES+=usr/include/c++/3.3/stack
 OLD_FILES+=usr/include/c++/3.3/stdexcept
 OLD_FILES+=usr/include/c++/3.3/streambuf
 OLD_FILES+=usr/include/c++/3.3/string
 OLD_FILES+=usr/include/c++/3.3/typeinfo
 OLD_FILES+=usr/include/c++/3.3/utility
 OLD_FILES+=usr/include/c++/3.3/valarray
 OLD_FILES+=usr/include/c++/3.3/vector
 # 20040713: fla(4) removed
 OLD_FILES+=usr/share/man/man4/fla.4.gz
 # 200407XX
 OLD_FILES+=usr/sbin/kernbb
 OLD_FILES+=usr/sbin/ntp-genkeys
 OLD_FILES+=usr/sbin/ntptimeset
 OLD_FILES+=usr/share/man/man8/kernbb.8.gz
 OLD_FILES+=usr/share/man/man8/ntp-genkeys.8.gz
 # 20040627: usbdevs.h and usbdevs_data.h removal
 OLD_FILES+=usr/include/dev/usb/usbdevs.h
 OLD_FILES+=usr/include/dev/usb/usbdevs_data.h
 # 200406XX
 OLD_FILES+=usr/bin/gasp
 OLD_FILES+=usr/bin/gdbreplay
 OLD_FILES+=usr/share/man/man1/gasp.1.gz
 OLD_FILES+=sbin/mountd
 OLD_FILES+=sbin/mount_fdesc
 OLD_FILES+=sbin/mount_umap
 OLD_FILES+=sbin/mount_union
 OLD_FILES+=sbin/mount_msdos
 OLD_FILES+=sbin/mount_null
 OLD_FILES+=sbin/mount_kernfs
 # 200405XX: arl
 OLD_FILES+=usr/sbin/arlconfig
 OLD_FILES+=usr/share/man/man8/arlconfig.8.gz
 # 200403XX
 OLD_FILES+=bin/raidctl
 OLD_FILES+=sbin/raidctl
 OLD_FILES+=usr/bin/sasc
 OLD_FILES+=usr/sbin/sgsc
 OLD_FILES+=usr/sbin/stlload
 OLD_FILES+=usr/sbin/stlstats
 OLD_FILES+=usr/share/man/man1/sasc.1.gz
 OLD_FILES+=usr/share/man/man1/sgsc.1.gz
 OLD_FILES+=usr/share/man/man4/i386/stl.4.gz
 OLD_FILES+=usr/share/man/man8/raidctl.8.gz
 # 20040229: clean_environment() was removed after 3 days
 OLD_FILES+=usr/share/man/man3/clean_environment.3.gz
 # 20040119: installed as `isdntel' in newer systems
 OLD_FILES+=etc/isdn/isdntel.sh
 # 200XYYZZ: /lib transition clitches
 OLD_FILES+=lib/libalias.so
 OLD_FILES+=lib/libatm.so
 OLD_FILES+=lib/libbsdxml.so
 OLD_FILES+=lib/libc.so
 OLD_FILES+=lib/libcam.so
 OLD_FILES+=lib/libcrypt.so
 OLD_FILES+=lib/libcrypto.so
 OLD_FILES+=lib/libdevstat.so
 OLD_FILES+=lib/libedit.so
 OLD_FILES+=lib/libgeom.so
 OLD_FILES+=lib/libipsec.so
 OLD_FILES+=lib/libipx.so
 OLD_FILES+=lib/libkvm.so
 OLD_FILES+=lib/libm.so
 OLD_FILES+=lib/libmd.so
 OLD_FILES+=lib/libncurses.so
 OLD_FILES+=lib/libreadline.so
 OLD_FILES+=lib/libsbuf.so
 OLD_FILES+=lib/libufs.so
 OLD_FILES+=lib/libz.so
 # 200312XX
 OLD_FILES+=bin/cxconfig
 OLD_FILES+=sbin/cxconfig
 OLD_FILES+=usr/share/man/man8/cxconfig.8.gz
 # 20031016: MULTI_DRIVER_MODULE macro removed
 OLD_FILES+=usr/share/man/man9/MULTI_DRIVER_MODULE.9.gz
 # 200309XX
 OLD_FILES+=usr/bin/symorder
 OLD_FILES+=usr/share/man/man1/symorder.1.gz
 # 200308XX
 OLD_FILES+=usr/sbin/amldb
 OLD_FILES+=usr/share/man/man8/amldb.8.gz
 # 200307XX
 OLD_FILES+=sbin/mount_nwfs
 OLD_FILES+=sbin/mount_portalfs
 OLD_FILES+=sbin/mount_smbfs
 # 200306XX
 OLD_FILES+=usr/sbin/dev_mkdb
 OLD_FILES+=usr/share/man/man8/dev_mkdb.8.gz
 # 200304XX
 OLD_FILES+=usr/lib/libcipher.a
 OLD_FILES+=usr/lib/libcipher.so
 OLD_FILES+=usr/lib/libcipher_p.a
 OLD_FILES+=usr/lib/libgmp.a
 OLD_FILES+=usr/lib/libgmp.so
 OLD_FILES+=usr/lib/libgmp_p.a
 OLD_FILES+=usr/lib/libperl.a
 OLD_FILES+=usr/lib/libperl.so
 OLD_FILES+=usr/lib/libperl_p.a
 OLD_FILES+=usr/lib/libposix1e.a
 OLD_FILES+=usr/lib/libposix1e.so
 OLD_FILES+=usr/lib/libposix1e_p.a
 OLD_FILES+=usr/lib/libskey.a
 OLD_FILES+=usr/lib/libskey.so
 OLD_FILES+=usr/lib/libskey_p.a
 OLD_FILES+=usr/libexec/tradcpp0
 OLD_FILES+=usr/libexec/cpp0
 # 200304XX: removal of xten
 OLD_FILES+=usr/libexec/xtend
 OLD_FILES+=usr/sbin/xten
 OLD_FILES+=usr/share/man/man1/xten.1.gz
 OLD_FILES+=usr/share/man/man8/xtend.8.gz
 # 200303XX
 OLD_FILES+=usr/lib/libacl.so
 OLD_FILES+=usr/lib/libdescrypt.so
 OLD_FILES+=usr/lib/libf2c.so
 OLD_FILES+=usr/lib/libg++.so
 OLD_FILES+=usr/lib/libkdb.so
 OLD_FILES+=usr/lib/librsaINTL.so
 OLD_FILES+=usr/lib/libscrypt.so
 OLD_FILES+=usr/lib/libss.so
 # 200302XX
 OLD_FILES+=usr/lib/libacl.a
 OLD_FILES+=usr/lib/libacl_p.a
 OLD_FILES+=usr/lib/libkadm.a
 OLD_FILES+=usr/lib/libkadm.so
 OLD_FILES+=usr/lib/libkadm_p.a
 OLD_FILES+=usr/lib/libkafs.a
 OLD_FILES+=usr/lib/libkafs.so
 OLD_FILES+=usr/lib/libkafs_p.a
 OLD_FILES+=usr/lib/libkdb.a
 OLD_FILES+=usr/lib/libkdb_p.a
 OLD_FILES+=usr/lib/libkrb.a
 OLD_FILES+=usr/lib/libkrb.so
 OLD_FILES+=usr/lib/libkrb_p.a
 OLD_FILES+=usr/share/man/man3/SSL_CIPHER_get_name.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_COMP_add_compression_method.3
 OLD_FILES+=usr/share/man/man3/SSL_CTX_add_extra_chain_cert.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_add_session.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_ctrl.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_flush_sessions.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_free.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_get_verify_mode.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_load_verify_locations.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_new.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_sess_number.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_sess_set_cache_size.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_sess_set_get_cb.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_sessions.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_cert_store.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_cert_verify_callback.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_cipher_list.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_client_CA_list.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_client_cert_cb.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_default_passwd_cb.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_generate_session_id.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_info_callback.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_max_cert_list.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_mode.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_msg_callback.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_options.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_quiet_shutdown.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_session_cache_mode.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_session_id_context.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_ssl_version.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_timeout.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_tmp_dh_callback.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_tmp_rsa_callback.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_verify.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_use_certificate.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_SESSION_free.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_SESSION_get_ex_new_index.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_SESSION_get_time.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_accept.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_alert_type_string.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_clear.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_connect.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_do_handshake.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_free.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_SSL_CTX.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_ciphers.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_client_CA_list.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_current_cipher.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_default_timeout.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_error.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_ex_data_X509_STORE_CTX_idx.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_fd.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_peer_cert_chain.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_peer_certificate.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_rbio.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_session.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_verify_result.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_version.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_library_init.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_load_client_CA_file.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_new.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_pending.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_read.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_rstate_string.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_session_reused.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_set_bio.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_set_connect_state.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_set_fd.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_set_session.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_set_shutdown.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_set_verify_result.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_shutdown.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_state_string.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_want.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_write.3.gz
 OLD_FILES+=usr/share/man/man3/d2i_SSL_SESSION.3.gz
 # 200301XX
 OLD_FILES+=usr/share/man/man3/des_3cbc_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/des_3ecb_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/des_cbc_cksum.3.gz
 OLD_FILES+=usr/share/man/man3/des_cbc_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/des_cfb_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/des_ecb_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/des_enc_read.3.gz
 OLD_FILES+=usr/share/man/man3/des_enc_write.3.gz
 OLD_FILES+=usr/share/man/man3/des_is_weak_key.3.gz
 OLD_FILES+=usr/share/man/man3/des_key_sched.3.gz
 OLD_FILES+=usr/share/man/man3/des_ofb_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/des_pcbc_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/des_quad_cksum.3.gz
 OLD_FILES+=usr/share/man/man3/des_random_key.3.gz
 OLD_FILES+=usr/share/man/man3/des_read_2password.3.gz
 OLD_FILES+=usr/share/man/man3/des_read_password.3.gz
 OLD_FILES+=usr/share/man/man3/des_read_pw_string.3.gz
 OLD_FILES+=usr/share/man/man3/des_set_key.3.gz
 OLD_FILES+=usr/share/man/man3/des_set_odd_parity.3.gz
 OLD_FILES+=usr/share/man/man3/des_string_to_2key.3.gz
 OLD_FILES+=usr/share/man/man3/des_string_to_key.3.gz
 # 200212XX
 OLD_FILES+=usr/sbin/kenv
 OLD_FILES+=usr/bin/kenv
 OLD_FILES+=usr/sbin/elf2aout
 # 200210XX
 OLD_FILES+=usr/include/libusbhid.h
 OLD_FILES+=usr/share/man/man3/All_FreeBSD.3.gz
 OLD_FILES+=usr/share/man/man3/CheckRules.3.gz
 OLD_FILES+=usr/share/man/man3/ChunkCanBeRoot.3.gz
 OLD_FILES+=usr/share/man/man3/Clone_Disk.3.gz
 OLD_FILES+=usr/share/man/man3/Collapse_Chunk.3.gz
 OLD_FILES+=usr/share/man/man3/Collapse_Disk.3.gz
 OLD_FILES+=usr/share/man/man3/Create_Chunk.3.gz
 OLD_FILES+=usr/share/man/man3/Create_Chunk_DWIM.3.gz
 OLD_FILES+=usr/share/man/man3/Cyl_Aligned.3.gz
 OLD_FILES+=usr/share/man/man3/Debug_Disk.3.gz
 OLD_FILES+=usr/share/man/man3/Delete_Chunk.3.gz
 OLD_FILES+=usr/share/man/man3/Disk_Names.3.gz
 OLD_FILES+=usr/share/man/man3/Free_Disk.3.gz
 OLD_FILES+=usr/share/man/man3/MakeDev.3.gz
 OLD_FILES+=usr/share/man/man3/MakeDevDisk.3.gz
 OLD_FILES+=usr/share/man/man3/Next_Cyl_Aligned.3.gz
 OLD_FILES+=usr/share/man/man3/Next_Track_Aligned.3.gz
 OLD_FILES+=usr/share/man/man3/Open_Disk.3.gz
 OLD_FILES+=usr/share/man/man3/Prev_Cyl_Aligned.3.gz
 OLD_FILES+=usr/share/man/man3/Prev_Track_Aligned.3.gz
 OLD_FILES+=usr/share/man/man3/Set_Bios_Geom.3.gz
 OLD_FILES+=usr/share/man/man3/Set_Boot_Blocks.3.gz
 OLD_FILES+=usr/share/man/man3/Set_Boot_Mgr.3.gz
 OLD_FILES+=usr/share/man/man3/ShowChunkFlags.3.gz
 OLD_FILES+=usr/share/man/man3/Track_Aligned.3.gz
 OLD_FILES+=usr/share/man/man3/Write_Disk.3.gz
 OLD_FILES+=usr/share/man/man3/slice_type_name.3.gz
 # 200210XX: most games moved to ports
 OLD_FILES+=usr/share/man/man6/adventure.6.gz
 OLD_FILES+=usr/share/man/man6/arithmetic.6.gz
 OLD_FILES+=usr/share/man/man6/atc.6.gz
 OLD_FILES+=usr/share/man/man6/backgammon.6.gz
 OLD_FILES+=usr/share/man/man6/battlestar.6.gz
 OLD_FILES+=usr/share/man/man6/bs.6.gz
 OLD_FILES+=usr/share/man/man6/canfield.6.gz
 OLD_FILES+=usr/share/man/man6/cfscores.6.gz
 OLD_FILES+=usr/share/man/man6/cribbage.6.gz
 OLD_FILES+=usr/share/man/man6/fish.6.gz
 OLD_FILES+=usr/share/man/man6/hack.6.gz
 OLD_FILES+=usr/share/man/man6/hangman.6.gz
 OLD_FILES+=usr/share/man/man6/larn.6.gz
 OLD_FILES+=usr/share/man/man6/mille.6.gz
 OLD_FILES+=usr/share/man/man6/phantasia.6.gz
 OLD_FILES+=usr/share/man/man6/piano.6.gz
 OLD_FILES+=usr/share/man/man6/pig.6.gz
 OLD_FILES+=usr/share/man/man6/quiz.6.gz
 OLD_FILES+=usr/share/man/man6/rain.6.gz
 OLD_FILES+=usr/share/man/man6/robots.6.gz
 OLD_FILES+=usr/share/man/man6/rogue.6.gz
 OLD_FILES+=usr/share/man/man6/sail.6.gz
 OLD_FILES+=usr/share/man/man6/snake.6.gz
 OLD_FILES+=usr/share/man/man6/snscore.6.gz
 OLD_FILES+=usr/share/man/man6/trek.6.gz
 OLD_FILES+=usr/share/man/man6/wargames.6.gz
 OLD_FILES+=usr/share/man/man6/worm.6.gz
 OLD_FILES+=usr/share/man/man6/worms.6.gz
 OLD_FILES+=usr/share/man/man6/wump.6.gz
 # 200207XX
 OLD_FILES+=usr/share/man/man1aout/ar.1aout.gz
 OLD_FILES+=usr/share/man/man1aout/as.1aout.gz
 OLD_FILES+=usr/share/man/man1aout/ld.1aout.gz
 OLD_FILES+=usr/share/man/man1aout/nm.1aout.gz
 OLD_FILES+=usr/share/man/man1aout/ranlib.1aout.gz
 OLD_FILES+=usr/share/man/man1aout/size.1aout.gz
 OLD_FILES+=usr/share/man/man1aout/strings.1aout.gz
 OLD_FILES+=usr/share/man/man1aout/strip.1aout.gz
 OLD_FILES+=bin/mountd
 OLD_FILES+=bin/nfsd
 # 20020707 sbin/nfsd -> usr.sbin/nfsd
 OLD_FILES+=sbin/nfsd
 # 200206XX
 OLD_FILES+=usr/lib/libpam_ssh.a
 OLD_FILES+=usr/lib/libpam_ssh_p.a
 OLD_FILES+=usr/bin/help
 OLD_FILES+=usr/bin/sccs
 .if ${TARGET_ARCH} != "amd64" && ${TARGET} != "arm" && ${TARGET_ARCH} != "i386" && ${TARGET} != "powerpc"
 OLD_FILES+=usr/bin/gdbserver
 .endif
 OLD_FILES+=usr/bin/ssh-keysign
 OLD_FILES+=usr/sbin/gifconfig
 OLD_FILES+=usr/sbin/prefix
 # 200205XX
 OLD_FILES+=usr/bin/doscmd
 # 200204XX
 OLD_FILES+=usr/bin/a2p
 OLD_FILES+=usr/bin/ptx
 OLD_FILES+=usr/bin/pod2text
 OLD_FILES+=usr/bin/pod2man
 OLD_FILES+=usr/bin/pod2latex
 OLD_FILES+=usr/bin/pod2html
 OLD_FILES+=usr/bin/h2ph
 OLD_FILES+=usr/bin/dprofpp
 OLD_FILES+=usr/bin/c2ph
 OLD_FILES+=usr/bin/h2xs
 OLD_FILES+=usr/bin/pl2pm
 OLD_FILES+=usr/bin/splain
 OLD_FILES+=usr/bin/s2p
 OLD_FILES+=usr/bin/find2perl
 OLD_FILES+=usr/sbin/pkg_update
 OLD_FILES+=usr/sbin/scriptdump
 # 20020409 GC kget(1), userconfig is long dead.
 OLD_FILES+=sbin/kget
 OLD_FILES+=usr/share/man/man8/kget.8.gz
 # 200203XX
 OLD_FILES+=usr/lib/libss.a
 OLD_FILES+=usr/lib/libss_p.a
 OLD_FILES+=usr/lib/libtelnet.a
 OLD_FILES+=usr/lib/libtelnet_p.a
 OLD_FILES+=usr/sbin/diskpart
 # 200202XX
 OLD_FILES+=usr/bin/gprof4
 # 200201XX
 OLD_FILES+=usr/sbin/linux
 # 2001XXXX
 OLD_FILES+=usr/bin/joy
 OLD_FILES+=usr/sbin/ibcs2
 OLD_FILES+=usr/sbin/svr4
 OLD_FILES+=usr/bin/chflags
 OLD_FILES+=usr/sbin/uuconv
 OLD_FILES+=usr/sbin/uuchk
 OLD_FILES+=usr/sbin/portmap
 OLD_FILES+=usr/sbin/pmap_set
 OLD_FILES+=usr/sbin/pmap_dump
 OLD_FILES+=usr/sbin/mcon
 OLD_FILES+=usr/sbin/stlstty
 OLD_FILES+=usr/sbin/ispppcontrol
 OLD_FILES+=usr/sbin/rndcontrol
 # 20011001: UUCP migration to ports
 OLD_FILES+=usr/bin/uucp
 OLD_FILES+=usr/bin/uulog
 OLD_FILES+=usr/bin/uuname
 OLD_FILES+=usr/bin/uupick
 OLD_FILES+=usr/bin/uusched
 OLD_FILES+=usr/bin/uustat
 OLD_FILES+=usr/bin/uuto
 OLD_FILES+=usr/bin/uux
 OLD_FILES+=usr/libexec/uucp/uucico
 OLD_FILES+=usr/libexec/uucp/uuxqt
 OLD_FILES+=usr/libexec/uucpd
 OLD_FILES+=usr/share/man/man1/uuconv.1.gz
 OLD_FILES+=usr/share/man/man1/uucp.1.gz
 OLD_FILES+=usr/share/man/man1/uulog.1.gz
 OLD_FILES+=usr/share/man/man1/uuname.1.gz
 OLD_FILES+=usr/share/man/man1/uupick.1.gz
 OLD_FILES+=usr/share/man/man1/uustat.1.gz
 OLD_FILES+=usr/share/man/man1/uuto.1.gz
 OLD_FILES+=usr/share/man/man1/uux.1.gz
 OLD_FILES+=usr/share/man/man8/uuchk.8.gz
 OLD_FILES+=usr/share/man/man8/uucico.8.gz
 OLD_FILES+=usr/share/man/man8/uucpd.8.gz
 OLD_FILES+=usr/share/man/man8/uusched.8.gz
 OLD_FILES+=usr/share/man/man8/uuxqt.8.gz
 # 20010523 mount_portal -> mount_portalfs
 OLD_FILES+=sbin/mount_portal
 OLD_FILES+=usr/share/man/man8/mount_portal.8.gz
 # 200104XX
 OLD_FILES+=usr/lib/libdescrypt.a
 OLD_FILES+=usr/lib/libscrypt.a
 OLD_FILES+=usr/lib/libscrypt_p.a
 OLD_FILES+=usr/sbin/pim6stat
 OLD_FILES+=usr/sbin/pim6sd
 OLD_FILES+=usr/sbin/pim6dd
 # 20010217
 OLD_FILES+=usr/share/doc/bind/misc/dns-setup
 # 20001200
 OLD_FILES+=usr/lib/libgcc_r_pic.a
 # 200009XX
 OLD_FILES+=usr/lib/libRSAglue.a
 OLD_FILES+=usr/lib/libRSAglue.so
 OLD_FILES+=usr/lib/librsaINTL.a
 OLD_FILES+=usr/lib/librsaUSA.a
 OLD_FILES+=usr/lib/librsaUSA.so
 # 200002XX ?
 OLD_FILES+=usr/lib/libf2c.a
 OLD_FILES+=usr/lib/libf2c_p.a
 OLD_FILES+=usr/lib/libg++.a
 OLD_FILES+=usr/lib/libg++_p.a
 # 20001006
 OLD_FILES+=usr/bin/miniperl
 # 20000810
 OLD_FILES+=usr/bin/sperl
 # 200001XX
 OLD_FILES+=usr/sbin/apmconf
 ## unsorted
 # do we still support aout builds?
 #OLD_FILES+=usr/lib/aout/c++rt0.o
 #OLD_FILES+=usr/lib/aout/crt0.o
 #OLD_FILES+=usr/lib/aout/gcrt0.o
 #OLD_FILES+=usr/lib/aout/scrt0.o
 #OLD_FILES+=usr/lib/aout/sgcrt0.o
 OLD_FILES+=usr/lib/pam_ftp.so
 OLD_FILES+=usr/share/man/man1/CA.pl.1.gz
 OLD_FILES+=usr/share/man/man1/asn1parse.1.gz
 OLD_FILES+=usr/share/man/man1/ca.1.gz
 OLD_FILES+=usr/share/man/man1/ciphers.1.gz
 OLD_FILES+=usr/share/man/man1/config.1.gz
 OLD_FILES+=usr/share/man/man1/crl.1.gz
 OLD_FILES+=usr/share/man/man1/crl2pkcs7.1.gz
 OLD_FILES+=usr/share/man/man1/dgst.1.gz
 OLD_FILES+=usr/share/man/man1/dhparam.1.gz
 OLD_FILES+=usr/share/man/man1/doscmd.1.gz
 OLD_FILES+=usr/share/man/man1/dsa.1.gz
 OLD_FILES+=usr/share/man/man1/dsaparam.1.gz
 OLD_FILES+=usr/share/man/man1/enc.1.gz
 OLD_FILES+=usr/share/man/man1/gendsa.1.gz
 OLD_FILES+=usr/share/man/man1/genrsa.1.gz
 OLD_FILES+=usr/share/man/man1/getNAME.1.gz
 OLD_FILES+=usr/share/man/man1/nseq.1.gz
 OLD_FILES+=usr/share/man/man1/ocsp.1.gz
 OLD_FILES+=usr/share/man/man1/openssl.1.gz
 OLD_FILES+=usr/share/man/man1/pkcs12.1.gz
 OLD_FILES+=usr/share/man/man1/pkcs7.1.gz
 OLD_FILES+=usr/share/man/man1/pkcs8.1.gz
 OLD_FILES+=usr/share/man/man1/rand.1.gz
 OLD_FILES+=usr/share/man/man1/req.1.gz
 OLD_FILES+=usr/share/man/man1/rsa.1.gz
 OLD_FILES+=usr/share/man/man1/rsautl.1.gz
 OLD_FILES+=usr/share/man/man1/s_client.1.gz
 OLD_FILES+=usr/share/man/man1/s_server.1.gz
 OLD_FILES+=usr/share/man/man1/sess_id.1.gz
 OLD_FILES+=usr/share/man/man1/smime.1.gz
 OLD_FILES+=usr/share/man/man1/speed.1.gz
 OLD_FILES+=usr/share/man/man1/spkac.1.gz
 OLD_FILES+=usr/share/man/man1/verify.1.gz
 OLD_FILES+=usr/share/man/man1/version.1.gz
 OLD_FILES+=usr/share/man/man1/x509.1.gz
 OLD_FILES+=usr/share/man/man3/SSL_COMP_add_compression_method.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_get_ex_new_index.3.gz
 OLD_FILES+=usr/share/man/man3/archive_entry_dup.3.gz
 OLD_FILES+=usr/share/man/man3/archive_entry_set_tartype.3.gz
 OLD_FILES+=usr/share/man/man3/archive_entry_tartype.3.gz
 OLD_FILES+=usr/share/man/man3/archive_read_data_into_file.3.gz
 OLD_FILES+=usr/share/man/man3/archive_read_open_tar.3.gz
 OLD_FILES+=usr/share/man/man3/archive_read_support_format_gnutar.3.gz
 OLD_FILES+=usr/share/man/man3/cipher.3.gz
 OLD_FILES+=usr/share/man/man3/des_cipher.3.gz
 OLD_FILES+=usr/share/man/man3/des_setkey.3.gz
 OLD_FILES+=usr/share/man/man3/encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/endvfsent.3.gz
 OLD_FILES+=usr/share/man/man3/getvfsbytype.3.gz
 OLD_FILES+=usr/share/man/man3/getvfsent.3.gz
 OLD_FILES+=usr/share/man/man3/isnanf.3.gz
 OLD_FILES+=usr/share/man/man3/libautofs.3.gz
 OLD_FILES+=usr/share/man/man3/pthread_attr_setsstack.3.gz
 OLD_FILES+=usr/share/man/man3/pthread_getcancelstate.3.gz
 OLD_FILES+=usr/share/man/man3/set_assertion_failure_callback.3.gz
 OLD_FILES+=usr/share/man/man3/setkey.3.gz
 OLD_FILES+=usr/share/man/man3/setvfsent.3.gz
 OLD_FILES+=usr/share/man/man3/ssl.3.gz
 OLD_FILES+=usr/share/man/man3/vfsisloadable.3.gz
 OLD_FILES+=usr/share/man/man3/vfsload.3.gz
 OLD_FILES+=usr/share/man/man4/als4000.4.gz
 OLD_FILES+=usr/share/man/man4/csa.4.gz
 OLD_FILES+=usr/share/man/man4/emu10k1.4.gz
 OLD_FILES+=usr/share/man/man4/euc.4.gz
 OLD_FILES+=usr/share/man/man4/gusc.4.gz
 OLD_FILES+=usr/share/man/man4/if_fwp.4.gz
 OLD_FILES+=usr/share/man/man4/lomac.4.gz
 OLD_FILES+=usr/share/man/man4/maestro3.4.gz
 OLD_FILES+=usr/share/man/man4/raid.4.gz
 OLD_FILES+=usr/share/man/man4/sbc.4.gz
 OLD_FILES+=usr/share/man/man4/sd.4.gz
 OLD_FILES+=usr/share/man/man4/snc.4.gz
 OLD_FILES+=usr/share/man/man4/st.4.gz
 OLD_FILES+=usr/share/man/man4/uaudio.4.gz
 OLD_FILES+=usr/share/man/man4/utf2.4.gz
 OLD_FILES+=usr/share/man/man4/vinumdebug.4.gz
 OLD_FILES+=usr/share/man/man5/disklabel.5.gz
 OLD_FILES+=usr/share/man/man5/dm.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ranlib.5.gz
 OLD_FILES+=usr/share/man/man5/utf2.5.gz
 OLD_FILES+=usr/share/man/man7/groff_mwww.7.gz
 OLD_FILES+=usr/share/man/man7/mmroff.7.gz
 OLD_FILES+=usr/share/man/man7/mwww.7.gz
 OLD_FILES+=usr/share/man/man8/dm.8.gz
 OLD_FILES+=usr/share/man/man8/pam_ftp.8.gz
 OLD_FILES+=usr/share/man/man8/pam_wheel.8.gz
 OLD_FILES+=usr/share/man/man8/ssl.8.gz
 OLD_FILES+=usr/share/man/man8/wlconfig.8.gz
 OLD_FILES+=usr/share/man/man9/CURSIG.9.gz
 OLD_FILES+=usr/share/man/man9/VFS_INIT.9.gz
 OLD_FILES+=usr/share/man/man9/at_exit.9.gz
 OLD_FILES+=usr/share/man/man9/at_fork.9.gz
 OLD_FILES+=usr/share/man/man9/cdevsw_add.9.gz
 OLD_FILES+=usr/share/man/man9/cdevsw_remove.9.gz
 OLD_FILES+=usr/share/man/man9/cv_waitq_empty.9.gz
 OLD_FILES+=usr/share/man/man9/cv_waitq_remove.9.gz
 OLD_FILES+=usr/share/man/man9/endtsleep.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_freem.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_pg_alloc.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_pg_free.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_pg_steal.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_phys_to_kva.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_vm_init.9.gz
 OLD_FILES+=usr/share/man/man9/mac_biba.9.gz
 OLD_FILES+=usr/share/man/man9/mac_bsdextended.9.gz
 OLD_FILES+=usr/share/man/man9/mono_time.9.gz
 OLD_FILES+=usr/share/man/man9/p1003_1b.9.gz
 OLD_FILES+=usr/share/man/man9/pmap_prefault.9.gz
 OLD_FILES+=usr/share/man/man9/posix4.9.gz
 OLD_FILES+=usr/share/man/man9/resource_query_name.9.gz
 OLD_FILES+=usr/share/man/man9/resource_query_string.9.gz
 OLD_FILES+=usr/share/man/man9/resource_query_unit.9.gz
 OLD_FILES+=usr/share/man/man9/rm_at_exit.9.gz
 OLD_FILES+=usr/share/man/man9/rm_at_fork.9.gz
 OLD_FILES+=usr/share/man/man9/runtime.9.gz
 OLD_FILES+=usr/share/man/man9/sleepinit.9.gz
 OLD_FILES+=usr/share/man/man9/unsleep.9.gz
 OLD_FILES+=usr/share/games/atc/Game_List
 OLD_FILES+=usr/share/games/atc/Killer
 OLD_FILES+=usr/share/games/atc/crossover
 OLD_FILES+=usr/share/games/atc/default
 OLD_FILES+=usr/share/games/atc/easy
 OLD_FILES+=usr/share/games/atc/game_2
 OLD_FILES+=usr/share/games/larn/larnmaze
 OLD_FILES+=usr/share/games/larn/larnopts
 OLD_FILES+=usr/share/games/larn/larn.help
 OLD_FILES+=usr/share/games/quiz.db/africa
 OLD_FILES+=usr/share/games/quiz.db/america
 OLD_FILES+=usr/share/games/quiz.db/areas
 OLD_FILES+=usr/share/games/quiz.db/arith
 OLD_FILES+=usr/share/games/quiz.db/asia
 OLD_FILES+=usr/share/games/quiz.db/babies
 OLD_FILES+=usr/share/games/quiz.db/bard
 OLD_FILES+=usr/share/games/quiz.db/chinese
 OLD_FILES+=usr/share/games/quiz.db/collectives
 OLD_FILES+=usr/share/games/quiz.db/ed
 OLD_FILES+=usr/share/games/quiz.db/elements
 OLD_FILES+=usr/share/games/quiz.db/europe
 OLD_FILES+=usr/share/games/quiz.db/flowers
 OLD_FILES+=usr/share/games/quiz.db/greek
 OLD_FILES+=usr/share/games/quiz.db/inca
 OLD_FILES+=usr/share/games/quiz.db/index
 OLD_FILES+=usr/share/games/quiz.db/latin
 OLD_FILES+=usr/share/games/quiz.db/locomotive
 OLD_FILES+=usr/share/games/quiz.db/midearth
 OLD_FILES+=usr/share/games/quiz.db/morse
 OLD_FILES+=usr/share/games/quiz.db/murders
 OLD_FILES+=usr/share/games/quiz.db/poetry
 OLD_FILES+=usr/share/games/quiz.db/posneg
 OLD_FILES+=usr/share/games/quiz.db/pres
 OLD_FILES+=usr/share/games/quiz.db/province
 OLD_FILES+=usr/share/games/quiz.db/seq-easy
 OLD_FILES+=usr/share/games/quiz.db/seq-hard
 OLD_FILES+=usr/share/games/quiz.db/sexes
 OLD_FILES+=usr/share/games/quiz.db/sov
 OLD_FILES+=usr/share/games/quiz.db/spell
 OLD_FILES+=usr/share/games/quiz.db/state
 OLD_FILES+=usr/share/games/quiz.db/trek
 OLD_FILES+=usr/share/games/quiz.db/ucc
 OLD_FILES+=usr/share/games/cribbage.instr
 OLD_FILES+=usr/share/games/fish.instr
 OLD_FILES+=usr/share/games/wump.info
 OLD_FILES+=usr/games/hide/adventure
 OLD_FILES+=usr/games/hide/arithmetic
 OLD_FILES+=usr/games/hide/atc
 OLD_FILES+=usr/games/hide/backgammon
 OLD_FILES+=usr/games/hide/teachgammon
 OLD_FILES+=usr/games/hide/battlestar
 OLD_FILES+=usr/games/hide/bs
 OLD_FILES+=usr/games/hide/canfield
 OLD_FILES+=usr/games/hide/cribbage
 OLD_FILES+=usr/games/hide/fish
 OLD_FILES+=usr/games/hide/hack
 OLD_FILES+=usr/games/hide/hangman
 OLD_FILES+=usr/games/hide/larn
 OLD_FILES+=usr/games/hide/mille
 OLD_FILES+=usr/games/hide/phantasia
 OLD_FILES+=usr/games/hide/quiz
 OLD_FILES+=usr/games/hide/robots
 OLD_FILES+=usr/games/hide/rogue
 OLD_FILES+=usr/games/hide/sail
 OLD_FILES+=usr/games/hide/snake
 OLD_FILES+=usr/games/hide/trek
 OLD_FILES+=usr/games/hide/worm
 OLD_FILES+=usr/games/hide/wump
 OLD_FILES+=usr/games/adventure
 OLD_FILES+=usr/games/arithmetic
 OLD_FILES+=usr/games/atc
 OLD_FILES+=usr/games/backgammon
 OLD_FILES+=usr/games/teachgammon
 OLD_FILES+=usr/games/battlestar
 OLD_FILES+=usr/games/bs
 OLD_FILES+=usr/games/canfield
 OLD_FILES+=usr/games/cfscores
 OLD_FILES+=usr/games/cribbage
 OLD_FILES+=usr/games/dm
 OLD_FILES+=usr/games/fish
 OLD_FILES+=usr/games/hack
 OLD_FILES+=usr/games/hangman
 OLD_FILES+=usr/games/larn
 OLD_FILES+=usr/games/mille
 OLD_FILES+=usr/games/phantasia
 OLD_FILES+=usr/games/piano
 OLD_FILES+=usr/games/pig
 OLD_FILES+=usr/games/quiz
 OLD_FILES+=usr/games/rain
 OLD_FILES+=usr/games/robots
 OLD_FILES+=usr/games/rogue
 OLD_FILES+=usr/games/sail
 OLD_FILES+=usr/games/snake
 OLD_FILES+=usr/games/snscore
 OLD_FILES+=usr/games/trek
 OLD_FILES+=usr/games/wargames
 OLD_FILES+=usr/games/worm
 OLD_FILES+=usr/games/worms
 OLD_FILES+=usr/games/wump
 OLD_FILES+=sbin/mount_reiserfs
 OLD_FILES+=usr/include/cam/cam_extend.h
 OLD_FILES+=usr/include/dev/wi/wi_hostap.h
 OLD_FILES+=usr/include/disktab.h
 OLD_FILES+=usr/include/g++/FlexLexer.h
 OLD_FILES+=usr/include/g++/PlotFile.h
 OLD_FILES+=usr/include/g++/SFile.h
 OLD_FILES+=usr/include/g++/_G_config.h
 OLD_FILES+=usr/include/g++/algo.h
 OLD_FILES+=usr/include/g++/algobase.h
 OLD_FILES+=usr/include/g++/algorithm
 OLD_FILES+=usr/include/g++/alloc.h
 OLD_FILES+=usr/include/g++/bitset
 OLD_FILES+=usr/include/g++/builtinbuf.h
 OLD_FILES+=usr/include/g++/bvector.h
 OLD_FILES+=usr/include/g++/cassert
 OLD_FILES+=usr/include/g++/cctype
 OLD_FILES+=usr/include/g++/cerrno
 OLD_FILES+=usr/include/g++/cfloat
 OLD_FILES+=usr/include/g++/ciso646
 OLD_FILES+=usr/include/g++/climits
 OLD_FILES+=usr/include/g++/clocale
 OLD_FILES+=usr/include/g++/cmath
 OLD_FILES+=usr/include/g++/complex
 OLD_FILES+=usr/include/g++/complex.h
 OLD_FILES+=usr/include/g++/csetjmp
 OLD_FILES+=usr/include/g++/csignal
 OLD_FILES+=usr/include/g++/cstdarg
 OLD_FILES+=usr/include/g++/cstddef
 OLD_FILES+=usr/include/g++/cstdio
 OLD_FILES+=usr/include/g++/cstdlib
 OLD_FILES+=usr/include/g++/cstring
 OLD_FILES+=usr/include/g++/ctime
 OLD_FILES+=usr/include/g++/cwchar
 OLD_FILES+=usr/include/g++/cwctype
 OLD_FILES+=usr/include/g++/defalloc.h
 OLD_FILES+=usr/include/g++/deque
 OLD_FILES+=usr/include/g++/deque.h
 OLD_FILES+=usr/include/g++/editbuf.h
 OLD_FILES+=usr/include/g++/exception
 OLD_FILES+=usr/include/g++/floatio.h
 OLD_FILES+=usr/include/g++/fstream
 OLD_FILES+=usr/include/g++/fstream.h
 OLD_FILES+=usr/include/g++/function.h
 OLD_FILES+=usr/include/g++/functional
 OLD_FILES+=usr/include/g++/hash_map
 OLD_FILES+=usr/include/g++/hash_map.h
 OLD_FILES+=usr/include/g++/hash_set
 OLD_FILES+=usr/include/g++/hash_set.h
 OLD_FILES+=usr/include/g++/hashtable.h
 OLD_FILES+=usr/include/g++/heap.h
 OLD_FILES+=usr/include/g++/indstream.h
 OLD_FILES+=usr/include/g++/iolibio.h
 OLD_FILES+=usr/include/g++/iomanip
 OLD_FILES+=usr/include/g++/iomanip.h
 OLD_FILES+=usr/include/g++/iosfwd
 OLD_FILES+=usr/include/g++/iostdio.h
 OLD_FILES+=usr/include/g++/iostream
 OLD_FILES+=usr/include/g++/iostream.h
 OLD_FILES+=usr/include/g++/iostreamP.h
 OLD_FILES+=usr/include/g++/istream.h
 OLD_FILES+=usr/include/g++/iterator
 OLD_FILES+=usr/include/g++/iterator.h
 OLD_FILES+=usr/include/g++/libio.h
 OLD_FILES+=usr/include/g++/libioP.h
 OLD_FILES+=usr/include/g++/list
 OLD_FILES+=usr/include/g++/list.h
 OLD_FILES+=usr/include/g++/map
 OLD_FILES+=usr/include/g++/map.h
 OLD_FILES+=usr/include/g++/memory
 OLD_FILES+=usr/include/g++/multimap.h
 OLD_FILES+=usr/include/g++/multiset.h
 OLD_FILES+=usr/include/g++/new
 OLD_FILES+=usr/include/g++/new.h
 OLD_FILES+=usr/include/g++/numeric
 OLD_FILES+=usr/include/g++/ostream.h
 OLD_FILES+=usr/include/g++/pair.h
 OLD_FILES+=usr/include/g++/parsestream.h
 OLD_FILES+=usr/include/g++/pfstream.h
 OLD_FILES+=usr/include/g++/procbuf.h
 OLD_FILES+=usr/include/g++/pthread_alloc
 OLD_FILES+=usr/include/g++/pthread_alloc.h
 OLD_FILES+=usr/include/g++/queue
 OLD_FILES+=usr/include/g++/rope
 OLD_FILES+=usr/include/g++/rope.h
 OLD_FILES+=usr/include/g++/ropeimpl.h
 OLD_FILES+=usr/include/g++/set
 OLD_FILES+=usr/include/g++/set.h
 OLD_FILES+=usr/include/g++/slist
 OLD_FILES+=usr/include/g++/slist.h
 OLD_FILES+=usr/include/g++/sstream
 OLD_FILES+=usr/include/g++/stack
 OLD_FILES+=usr/include/g++/stack.h
 OLD_FILES+=usr/include/g++/std/bastring.cc
 OLD_FILES+=usr/include/g++/std/bastring.h
 OLD_FILES+=usr/include/g++/std/complext.cc
 OLD_FILES+=usr/include/g++/std/complext.h
 OLD_FILES+=usr/include/g++/std/dcomplex.h
 OLD_FILES+=usr/include/g++/std/fcomplex.h
 OLD_FILES+=usr/include/g++/std/gslice.h
 OLD_FILES+=usr/include/g++/std/gslice_array.h
 OLD_FILES+=usr/include/g++/std/indirect_array.h
 OLD_FILES+=usr/include/g++/std/ldcomplex.h
 OLD_FILES+=usr/include/g++/std/mask_array.h
 OLD_FILES+=usr/include/g++/std/slice.h
 OLD_FILES+=usr/include/g++/std/slice_array.h
 OLD_FILES+=usr/include/g++/std/std_valarray.h
 OLD_FILES+=usr/include/g++/std/straits.h
 OLD_FILES+=usr/include/g++/std/valarray_array.h
 OLD_FILES+=usr/include/g++/std/valarray_array.tcc
 OLD_FILES+=usr/include/g++/std/valarray_meta.h
 OLD_FILES+=usr/include/g++/stdexcept
 OLD_FILES+=usr/include/g++/stdiostream.h
 OLD_FILES+=usr/include/g++/stl.h
 OLD_FILES+=usr/include/g++/stl_algo.h
 OLD_FILES+=usr/include/g++/stl_algobase.h
 OLD_FILES+=usr/include/g++/stl_alloc.h
 OLD_FILES+=usr/include/g++/stl_bvector.h
 OLD_FILES+=usr/include/g++/stl_config.h
 OLD_FILES+=usr/include/g++/stl_construct.h
 OLD_FILES+=usr/include/g++/stl_deque.h
 OLD_FILES+=usr/include/g++/stl_function.h
 OLD_FILES+=usr/include/g++/stl_hash_fun.h
 OLD_FILES+=usr/include/g++/stl_hash_map.h
 OLD_FILES+=usr/include/g++/stl_hash_set.h
 OLD_FILES+=usr/include/g++/stl_hashtable.h
 OLD_FILES+=usr/include/g++/stl_heap.h
 OLD_FILES+=usr/include/g++/stl_iterator.h
 OLD_FILES+=usr/include/g++/stl_list.h
 OLD_FILES+=usr/include/g++/stl_map.h
 OLD_FILES+=usr/include/g++/stl_multimap.h
 OLD_FILES+=usr/include/g++/stl_multiset.h
 OLD_FILES+=usr/include/g++/stl_numeric.h
 OLD_FILES+=usr/include/g++/stl_pair.h
 OLD_FILES+=usr/include/g++/stl_queue.h
 OLD_FILES+=usr/include/g++/stl_raw_storage_iter.h
 OLD_FILES+=usr/include/g++/stl_relops.h
 OLD_FILES+=usr/include/g++/stl_rope.h
 OLD_FILES+=usr/include/g++/stl_set.h
 OLD_FILES+=usr/include/g++/stl_slist.h
 OLD_FILES+=usr/include/g++/stl_stack.h
 OLD_FILES+=usr/include/g++/stl_tempbuf.h
 OLD_FILES+=usr/include/g++/stl_tree.h
 OLD_FILES+=usr/include/g++/stl_uninitialized.h
 OLD_FILES+=usr/include/g++/stl_vector.h
 OLD_FILES+=usr/include/g++/stream.h
 OLD_FILES+=usr/include/g++/streambuf.h
 OLD_FILES+=usr/include/g++/strfile.h
 OLD_FILES+=usr/include/g++/string
 OLD_FILES+=usr/include/g++/strstream
 OLD_FILES+=usr/include/g++/strstream.h
 OLD_FILES+=usr/include/g++/tempbuf.h
 OLD_FILES+=usr/include/g++/tree.h
 OLD_FILES+=usr/include/g++/type_traits.h
 OLD_FILES+=usr/include/g++/typeinfo
 OLD_FILES+=usr/include/g++/utility
 OLD_FILES+=usr/include/g++/valarray
 OLD_FILES+=usr/include/g++/vector
 OLD_FILES+=usr/include/g++/vector.h
 OLD_FILES+=usr/include/gmp.h
 OLD_FILES+=usr/include/isc/assertions.h
 OLD_FILES+=usr/include/isc/ctl.h
 OLD_FILES+=usr/include/isc/dst.h
 OLD_FILES+=usr/include/isc/eventlib.h
 OLD_FILES+=usr/include/isc/heap.h
 OLD_FILES+=usr/include/isc/irpmarshall.h
 OLD_FILES+=usr/include/isc/list.h
 OLD_FILES+=usr/include/isc/logging.h
 OLD_FILES+=usr/include/isc/memcluster.h
 OLD_FILES+=usr/include/isc/misc.h
 OLD_FILES+=usr/include/isc/tree.h
 OLD_FILES+=usr/include/machine/ansi.h
 OLD_FILES+=usr/include/machine/apic.h
 OLD_FILES+=usr/include/machine/asc_ioctl.h
 OLD_FILES+=usr/include/machine/asnames.h
 OLD_FILES+=usr/include/machine/bus_at386.h
 OLD_FILES+=usr/include/machine/bus_memio.h
 OLD_FILES+=usr/include/machine/bus_pc98.h
 OLD_FILES+=usr/include/machine/bus_pio.h
 OLD_FILES+=usr/include/machine/cdk.h
 OLD_FILES+=usr/include/machine/comstats.h
 OLD_FILES+=usr/include/machine/console.h
 OLD_FILES+=usr/include/machine/critical.h
 OLD_FILES+=usr/include/machine/cronyx.h
 OLD_FILES+=usr/include/machine/dvcfg.h
 OLD_FILES+=usr/include/machine/globaldata.h
 OLD_FILES+=usr/include/machine/globals.h
 OLD_FILES+=usr/include/machine/gsc.h
 OLD_FILES+=usr/include/machine/i4b_isppp.h
 OLD_FILES+=usr/include/machine/if_wavelan_ieee.h
 OLD_FILES+=usr/include/machine/iic.h
 OLD_FILES+=usr/include/machine/ioctl_ctx.h
 OLD_FILES+=usr/include/machine/ioctl_fd.h
 OLD_FILES+=usr/include/machine/ipl.h
 OLD_FILES+=usr/include/machine/lock.h
 OLD_FILES+=usr/include/machine/mouse.h
 OLD_FILES+=usr/include/machine/mpapic.h
 OLD_FILES+=usr/include/machine/mtpr.h
 OLD_FILES+=usr/include/machine/pc/msdos.h
 OLD_FILES+=usr/include/machine/physio_proc.h
 OLD_FILES+=usr/include/machine/smb.h
 OLD_FILES+=usr/include/machine/spigot.h
 OLD_FILES+=usr/include/machine/types.h
 OLD_FILES+=usr/include/machine/uc_device.h
 OLD_FILES+=usr/include/machine/ultrasound.h
 OLD_FILES+=usr/include/machine/wtio.h
 OLD_FILES+=usr/include/msdosfs/bootsect.h
 OLD_FILES+=usr/include/msdosfs/bpb.h
 OLD_FILES+=usr/include/msdosfs/denode.h
 OLD_FILES+=usr/include/msdosfs/direntry.h
 OLD_FILES+=usr/include/msdosfs/fat.h
 OLD_FILES+=usr/include/msdosfs/msdosfsmount.h
 OLD_FILES+=usr/include/net/hostcache.h
 OLD_FILES+=usr/include/net/if_faith.h
 OLD_FILES+=usr/include/net/if_ieee80211.h
 OLD_FILES+=usr/include/net/if_tunvar.h
 OLD_FILES+=usr/include/net/intrq.h
 OLD_FILES+=usr/include/netatm/kern_include.h
 OLD_FILES+=usr/include/netinet/if_fddi.h
 OLD_FILES+=usr/include/netinet/in_hostcache.h
 OLD_FILES+=usr/include/netinet/ip_flow.h
 OLD_FILES+=usr/include/netinet/ip_fw2.h
 OLD_FILES+=usr/include/netinet6/in6_prefix.h
 OLD_FILES+=usr/include/netns/idp.h
 OLD_FILES+=usr/include/netns/idp_var.h
 OLD_FILES+=usr/include/netns/ns.h
 OLD_FILES+=usr/include/netns/ns_error.h
 OLD_FILES+=usr/include/netns/ns_if.h
 OLD_FILES+=usr/include/netns/ns_pcb.h
 OLD_FILES+=usr/include/netns/sp.h
 OLD_FILES+=usr/include/netns/spidp.h
 OLD_FILES+=usr/include/netns/spp_debug.h
 OLD_FILES+=usr/include/netns/spp_timer.h
 OLD_FILES+=usr/include/netns/spp_var.h
 OLD_FILES+=usr/include/nfs/nfs.h
 OLD_FILES+=usr/include/nfs/nfsm_subs.h
 OLD_FILES+=usr/include/nfs/nfsmount.h
 OLD_FILES+=usr/include/nfs/nfsnode.h
 OLD_FILES+=usr/include/nfs/nfsrtt.h
 OLD_FILES+=usr/include/nfs/nfsrvcache.h
 OLD_FILES+=usr/include/nfs/nfsv2.h
 OLD_FILES+=usr/include/nfs/nqnfs.h
 OLD_FILES+=usr/include/ntfs/ntfs.h
 OLD_FILES+=usr/include/ntfs/ntfs_compr.h
 OLD_FILES+=usr/include/ntfs/ntfs_ihash.h
 OLD_FILES+=usr/include/ntfs/ntfs_inode.h
 OLD_FILES+=usr/include/ntfs/ntfs_subr.h
 OLD_FILES+=usr/include/ntfs/ntfs_vfsops.h
 OLD_FILES+=usr/include/ntfs/ntfsmount.h
 OLD_FILES+=usr/include/nwfs/nwfs.h
 OLD_FILES+=usr/include/nwfs/nwfs_mount.h
 OLD_FILES+=usr/include/nwfs/nwfs_node.h
 OLD_FILES+=usr/include/nwfs/nwfs_subr.h
 OLD_FILES+=usr/include/posix4/_semaphore.h
 OLD_FILES+=usr/include/posix4/aio.h
 OLD_FILES+=usr/include/posix4/ksem.h
 OLD_FILES+=usr/include/posix4/mqueue.h
 OLD_FILES+=usr/include/posix4/posix4.h
 OLD_FILES+=usr/include/posix4/sched.h
 OLD_FILES+=usr/include/posix4/semaphore.h
 OLD_DIRS+=usr/include/posix4
 OLD_FILES+=usr/include/security/_pam_compat.h
 OLD_FILES+=usr/include/security/_pam_macros.h
 OLD_FILES+=usr/include/security/_pam_types.h
 OLD_FILES+=usr/include/security/pam_malloc.h
 OLD_FILES+=usr/include/security/pam_misc.h
 OLD_FILES+=usr/include/skey.h
 OLD_FILES+=usr/include/strhash.h
 OLD_FILES+=usr/include/struct.h
 OLD_FILES+=usr/include/sys/_label.h
 OLD_FILES+=usr/include/sys/_posix.h
 OLD_FILES+=usr/include/sys/bus_private.h
 OLD_FILES+=usr/include/sys/ccdvar.h
 OLD_FILES+=usr/include/sys/diskslice.h
 OLD_FILES+=usr/include/sys/dmap.h
 OLD_FILES+=usr/include/sys/inttypes.h
 OLD_FILES+=usr/include/sys/jumbo.h
 OLD_FILES+=usr/include/sys/mac_policy.h
 OLD_FILES+=usr/include/sys/pbioio.h
 OLD_FILES+=usr/include/sys/syscall-hide.h
 OLD_FILES+=usr/include/sys/tprintf.h
 OLD_FILES+=usr/include/sys/vnioctl.h
 OLD_FILES+=usr/include/sys/wormio.h
 OLD_FILES+=usr/include/telnet.h
 OLD_FILES+=usr/include/ufs/mfs/mfs_extern.h
 OLD_FILES+=usr/include/ufs/mfs/mfsnode.h
 OLD_FILES+=usr/include/values.h
 OLD_FILES+=usr/include/vm/vm_zone.h
 OLD_FILES+=usr/share/examples/etc/usbd.conf
 OLD_FILES+=usr/share/examples/meteor/README
 OLD_FILES+=usr/share/examples/meteor/rgb16.c
 OLD_FILES+=usr/share/examples/meteor/rgb24.c
 OLD_FILES+=usr/share/examples/meteor/test-n.c
 OLD_FILES+=usr/share/examples/meteor/yuvpk.c
 OLD_FILES+=usr/share/examples/meteor/yuvpl.c
 OLD_FILES+=usr/share/examples/worm/README
 OLD_FILES+=usr/share/examples/worm/makecdfs.sh
 OLD_FILES+=usr/share/groff_font/devlj4/Makefile
 OLD_FILES+=usr/share/groff_font/devlj4/text.map
 OLD_FILES+=usr/share/groff_font/devlj4/special.map
 OLD_FILES+=usr/share/misc/nslookup.help
 OLD_FILES+=usr/share/sendmail/cf/feature/nodns.m4
 OLD_FILES+=usr/share/syscons/keymaps/lat-amer.kbd
 OLD_FILES+=usr/share/vi/catalog/ru_SU.KOI8-R
 OLD_FILES+=usr/share/zoneinfo/SystemV/YST9
 OLD_FILES+=usr/share/zoneinfo/SystemV/PST8
 OLD_FILES+=usr/share/zoneinfo/SystemV/EST5EDT
 OLD_FILES+=usr/share/zoneinfo/SystemV/CST6CDT
 OLD_FILES+=usr/share/zoneinfo/SystemV/MST7MDT
 OLD_FILES+=usr/share/zoneinfo/SystemV/PST8PDT
 OLD_FILES+=usr/share/zoneinfo/SystemV/YST9YDT
 OLD_FILES+=usr/share/zoneinfo/SystemV/HST10
 OLD_FILES+=usr/share/zoneinfo/SystemV/MST7
 OLD_FILES+=usr/share/zoneinfo/SystemV/EST5
 OLD_FILES+=usr/share/zoneinfo/SystemV/AST4ADT
 OLD_FILES+=usr/share/zoneinfo/SystemV/CST6
 OLD_FILES+=usr/share/zoneinfo/SystemV/AST4
 OLD_DIRS+=usr/share/zoneinfo/SystemV
 OLD_FILES+=usr/share/doc/ntp/accopt.htm
 OLD_FILES+=usr/share/doc/ntp/assoc.htm
 OLD_FILES+=usr/share/doc/ntp/audio.htm
 OLD_FILES+=usr/share/doc/ntp/authopt.htm
 OLD_FILES+=usr/share/doc/ntp/biblio.htm
 OLD_FILES+=usr/share/doc/ntp/build.htm
 OLD_FILES+=usr/share/doc/ntp/clockopt.htm
 OLD_FILES+=usr/share/doc/ntp/config.htm
 OLD_FILES+=usr/share/doc/ntp/confopt.htm
 OLD_FILES+=usr/share/doc/ntp/copyright.htm
 OLD_FILES+=usr/share/doc/ntp/debug.htm
 OLD_FILES+=usr/share/doc/ntp/driver1.htm
 OLD_FILES+=usr/share/doc/ntp/driver10.htm
 OLD_FILES+=usr/share/doc/ntp/driver11.htm
 OLD_FILES+=usr/share/doc/ntp/driver12.htm
 OLD_FILES+=usr/share/doc/ntp/driver16.htm
 OLD_FILES+=usr/share/doc/ntp/driver18.htm
 OLD_FILES+=usr/share/doc/ntp/driver19.htm
 OLD_FILES+=usr/share/doc/ntp/driver2.htm
 OLD_FILES+=usr/share/doc/ntp/driver20.htm
 OLD_FILES+=usr/share/doc/ntp/driver22.htm
 OLD_FILES+=usr/share/doc/ntp/driver23.htm
 OLD_FILES+=usr/share/doc/ntp/driver24.htm
 OLD_FILES+=usr/share/doc/ntp/driver26.htm
 OLD_FILES+=usr/share/doc/ntp/driver27.htm
 OLD_FILES+=usr/share/doc/ntp/driver28.htm
 OLD_FILES+=usr/share/doc/ntp/driver29.htm
 OLD_FILES+=usr/share/doc/ntp/driver3.htm
 OLD_FILES+=usr/share/doc/ntp/driver30.htm
 OLD_FILES+=usr/share/doc/ntp/driver32.htm
 OLD_FILES+=usr/share/doc/ntp/driver33.htm
 OLD_FILES+=usr/share/doc/ntp/driver34.htm
 OLD_FILES+=usr/share/doc/ntp/driver35.htm
 OLD_FILES+=usr/share/doc/ntp/driver36.htm
 OLD_FILES+=usr/share/doc/ntp/driver37.htm
 OLD_FILES+=usr/share/doc/ntp/driver4.htm
 OLD_FILES+=usr/share/doc/ntp/driver5.htm
 OLD_FILES+=usr/share/doc/ntp/driver6.htm
 OLD_FILES+=usr/share/doc/ntp/driver7.htm
 OLD_FILES+=usr/share/doc/ntp/driver8.htm
 OLD_FILES+=usr/share/doc/ntp/driver9.htm
 OLD_FILES+=usr/share/doc/ntp/exec.htm
 OLD_FILES+=usr/share/doc/ntp/extern.htm
 OLD_FILES+=usr/share/doc/ntp/gadget.htm
 OLD_FILES+=usr/share/doc/ntp/hints.htm
 OLD_FILES+=usr/share/doc/ntp/howto.htm
 OLD_FILES+=usr/share/doc/ntp/htmlprimer.htm
 OLD_FILES+=usr/share/doc/ntp/index.htm
 OLD_FILES+=usr/share/doc/ntp/kern.htm
 OLD_FILES+=usr/share/doc/ntp/kernpps.htm
 OLD_FILES+=usr/share/doc/ntp/ldisc.htm
 OLD_FILES+=usr/share/doc/ntp/measure.htm
 OLD_FILES+=usr/share/doc/ntp/miscopt.htm
 OLD_FILES+=usr/share/doc/ntp/monopt.htm
 OLD_FILES+=usr/share/doc/ntp/mx4200data.htm
 OLD_FILES+=usr/share/doc/ntp/notes.htm
 OLD_FILES+=usr/share/doc/ntp/ntpd.htm
 OLD_FILES+=usr/share/doc/ntp/ntpdate.htm
 OLD_FILES+=usr/share/doc/ntp/ntpdc.htm
 OLD_FILES+=usr/share/doc/ntp/ntpq.htm
 OLD_FILES+=usr/share/doc/ntp/ntptime.htm
 OLD_FILES+=usr/share/doc/ntp/ntptrace.htm
 OLD_FILES+=usr/share/doc/ntp/parsedata.htm
 OLD_FILES+=usr/share/doc/ntp/parsenew.htm
 OLD_FILES+=usr/share/doc/ntp/patches.htm
 OLD_FILES+=usr/share/doc/ntp/porting.htm
 OLD_FILES+=usr/share/doc/ntp/pps.htm
 OLD_FILES+=usr/share/doc/ntp/prefer.htm
 OLD_FILES+=usr/share/doc/ntp/qth.htm
 OLD_FILES+=usr/share/doc/ntp/quick.htm
 OLD_FILES+=usr/share/doc/ntp/rdebug.htm
 OLD_FILES+=usr/share/doc/ntp/refclock.htm
 OLD_FILES+=usr/share/doc/ntp/release.htm
 OLD_FILES+=usr/share/doc/ntp/tickadj.htm
 OLD_FILES+=usr/share/doc/papers/nqnfs.ascii.gz
 OLD_FILES+=usr/share/doc/papers/px.ascii.gz
 OLD_FILES+=usr/share/man/man3/exp10.3.gz
 OLD_FILES+=usr/share/man/man3/exp10f.3.gz
 OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz
 OLD_FILES+=usr/share/man/man3/gss_krb5_compat_des3_mic.3.gz
 OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz
 OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz
 OLD_FILES+=usr/share/man/man3/mbmb.3.gz
 OLD_FILES+=usr/share/man/man3/setrunelocale.3.gz
 OLD_FILES+=usr/share/man/man5/usbd.conf.5.gz
 .if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64"
 OLD_FILES+=usr/share/man/man8/boot_i386.8.gz
 .endif
 OLD_FILES+=usr/share/man/man8/mount_reiserfs.8.gz
 OLD_FILES+=usr/share/man/man9/VFS_START.9.gz
 OLD_FILES+=usr/share/man/man9/cpu_critical_exit.9.gz
 OLD_FILES+=usr/share/man/man9/cpu_critical_enter.9.gz
 OLD_FILES+=usr/share/info/annotate.info.gz
 OLD_FILES+=usr/share/info/tar.info.gz
 OLD_FILES+=usr/share/bsnmp/defs/tree.def
 OLD_FILES+=usr/share/bsnmp/defs/mibII_tree.def
 OLD_FILES+=usr/share/bsnmp/defs/netgraph_tree.def
 OLD_FILES+=usr/share/bsnmp/mibs/FOKUS-MIB.txt
 OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-MIB.txt
 OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-SNMPD.txt
 OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-NETGRAPH.txt
 OLD_FILES+=usr/libdata/msdosfs/iso22dos
 OLD_FILES+=usr/libdata/msdosfs/iso72dos
 OLD_FILES+=usr/libdata/msdosfs/koi2dos
 OLD_FILES+=usr/libdata/msdosfs/koi8u2dos
 # The following files are *not* obsolete, they just don't get touched at
 # install, so don't add them:
 #  - boot/loader.rc
 #  - usr/share/tmac/man.local
 #  - usr/share/tmac/mm/locale
 #  - usr/share/tmac/mm/se_locale
 #  - var/yp/Makefile
 
 # Early entries split OLD_FILES, OLD_LIBS, and OLD_DIRS into separate sections
 # in this file, but this practice was abandoned in the mid-2000s.
 #
 # 20071120: shared library version bump
 OLD_LIBS+=usr/lib/libasn1.so.8
 OLD_LIBS+=usr/lib/libgssapi.so.8
 OLD_LIBS+=usr/lib/libgssapi_krb5.so.8
 OLD_LIBS+=usr/lib/libhdb.so.8
 OLD_LIBS+=usr/lib/libkadm5clnt.so.8
 OLD_LIBS+=usr/lib/libkadm5srv.so.8
 OLD_LIBS+=usr/lib/libkafs5.so.8
 OLD_LIBS+=usr/lib/libkrb5.so.8
 OLD_LIBS+=usr/lib/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
 # 20060729: OpenSSL 0.9.7e -> 0.9.8b upgrade
 OLD_LIBS+=lib/libcrypto.so.4
 OLD_LIBS+=usr/lib/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
 # 20060413: shared library moved to /usr/lib
 MOVED_LIBS+=lib/libgpib.so.1
 # 20060413: libpcap.so.4 moved to /lib/
 MOVED_LIBS+=usr/lib/libpcap.so.4
 # 20060412: libpthread.so.2 moved to /lib/
 MOVED_LIBS+=usr/lib/libpthread.so.2
 # 20060127: revert libdisk to static-only
 OLD_LIBS+=usr/lib/libdisk.so.3
 # 20051027: libc_r discontinued (removed 20101113)
 OLD_FILES+=usr/lib/libc_r.a
 OLD_FILES+=usr/lib/libc_r.so
 OLD_LIBS+=usr/lib/libc_r.so.7
 OLD_FILES+=usr/lib/libc_r_p.a
 # 20050722: bump for 6.0-RELEASE
 OLD_LIBS+=lib/libalias.so.4
 OLD_LIBS+=lib/libatm.so.2
 OLD_LIBS+=lib/libbegemot.so.1
 OLD_LIBS+=lib/libbsdxml.so.1
 OLD_LIBS+=lib/libbsnmp.so.2
 OLD_LIBS+=lib/libc.so.5
 OLD_LIBS+=lib/libcam.so.2
 OLD_LIBS+=lib/libcrypt.so.2
 OLD_LIBS+=lib/libcrypto.so.3
 OLD_LIBS+=lib/libdevstat.so.4
 OLD_LIBS+=lib/libedit.so.4
 OLD_LIBS+=lib/libgeom.so.2
 OLD_LIBS+=lib/libgpib.so.0
 OLD_LIBS+=lib/libipsec.so.1
 OLD_LIBS+=lib/libipx.so.2
 OLD_LIBS+=lib/libkiconv.so.1
 OLD_LIBS+=lib/libkvm.so.2
 OLD_LIBS+=lib/libm.so.3
 OLD_LIBS+=lib/libmd.so.2
 OLD_LIBS+=lib/libncurses.so.5
 OLD_LIBS+=lib/libreadline.so.5
 OLD_LIBS+=lib/libsbuf.so.2
 OLD_LIBS+=lib/libufs.so.2
 OLD_LIBS+=lib/libutil.so.4
 OLD_LIBS+=lib/libz.so.2
 OLD_LIBS+=usr/lib/libarchive.so.1
 OLD_LIBS+=usr/lib/libasn1.so.7
 OLD_LIBS+=usr/lib/libbluetooth.so.1
 OLD_LIBS+=usr/lib/libbz2.so.1
 OLD_LIBS+=usr/lib/libc_r.so.5
 OLD_LIBS+=usr/lib/libcalendar.so.2
 OLD_LIBS+=usr/lib/libcom_err.so.2
 OLD_LIBS+=usr/lib/libdevinfo.so.2
 OLD_LIBS+=usr/lib/libdialog.so.4
 OLD_LIBS+=usr/lib/libfetch.so.3
 OLD_LIBS+=usr/lib/libform.so.2
 OLD_LIBS+=usr/lib/libftpio.so.5
 OLD_LIBS+=usr/lib/libg2c.so.1
 OLD_LIBS+=usr/lib/libgnuregex.so.2
 OLD_LIBS+=usr/lib/libgssapi.so.7
 OLD_LIBS+=usr/lib/libhdb.so.7
 OLD_LIBS+=usr/lib/libhistory.so.5
 OLD_LIBS+=usr/lib/libkadm5clnt.so.7
 OLD_LIBS+=usr/lib/libkadm5srv.so.7
 OLD_LIBS+=usr/lib/libkafs5.so.7
 OLD_LIBS+=usr/lib/libkrb5.so.7
 OLD_LIBS+=usr/lib/libmagic.so.1
 OLD_LIBS+=usr/lib/libmenu.so.2
 OLD_LIBS+=usr/lib/libmilter.so.2
 OLD_LIBS+=usr/lib/libmp.so.4
 OLD_LIBS+=usr/lib/libncp.so.1
 OLD_LIBS+=usr/lib/libnetgraph.so.1
 OLD_LIBS+=usr/lib/libngatm.so.1
 OLD_LIBS+=usr/lib/libobjc.so.1
 OLD_LIBS+=usr/lib/libopie.so.3
 OLD_LIBS+=usr/lib/libpam.so.2
 OLD_LIBS+=usr/lib/libpanel.so.2
 OLD_LIBS+=usr/lib/libpcap.so.3
 OLD_LIBS+=usr/lib/libpmc.so.2
 OLD_LIBS+=usr/lib/libpthread.so.1
 OLD_LIBS+=usr/lib/libradius.so.1
 OLD_LIBS+=usr/lib/libroken.so.7
 OLD_LIBS+=usr/lib/librpcsvc.so.2
 OLD_LIBS+=usr/lib/libsdp.so.1
 OLD_LIBS+=usr/lib/libsmb.so.1
 OLD_LIBS+=usr/lib/libssh.so.2
 OLD_LIBS+=usr/lib/libssl.so.3
 OLD_LIBS+=usr/lib/libstdc++.so.4
 OLD_LIBS+=usr/lib/libtacplus.so.1
 OLD_LIBS+=usr/lib/libthr.so.1
 OLD_LIBS+=usr/lib/libthread_db.so.1
 OLD_LIBS+=usr/lib/libugidfw.so.1
 OLD_LIBS+=usr/lib/libusbhid.so.1
 OLD_LIBS+=usr/lib/libvgl.so.3
 OLD_LIBS+=usr/lib/libwrap.so.3
 OLD_LIBS+=usr/lib/libypclnt.so.1
 OLD_LIBS+=usr/lib/pam_chroot.so.2
 OLD_LIBS+=usr/lib/pam_deny.so.2
 OLD_LIBS+=usr/lib/pam_echo.so.2
 OLD_LIBS+=usr/lib/pam_exec.so.2
 OLD_LIBS+=usr/lib/pam_ftpusers.so.2
 OLD_LIBS+=usr/lib/pam_group.so.2
 OLD_LIBS+=usr/lib/pam_guest.so.2
 OLD_LIBS+=usr/lib/pam_krb5.so.2
 OLD_LIBS+=usr/lib/pam_ksu.so.2
 OLD_LIBS+=usr/lib/pam_lastlog.so.2
 OLD_LIBS+=usr/lib/pam_login_access.so.2
 OLD_LIBS+=usr/lib/pam_nologin.so.2
 OLD_LIBS+=usr/lib/pam_opie.so.2
 OLD_LIBS+=usr/lib/pam_opieaccess.so.2
 OLD_LIBS+=usr/lib/pam_passwdqc.so.2
 OLD_LIBS+=usr/lib/pam_permit.so.2
 OLD_LIBS+=usr/lib/pam_radius.so.2
 OLD_LIBS+=usr/lib/pam_rhosts.so.2
 OLD_LIBS+=usr/lib/pam_rootok.so.2
 OLD_LIBS+=usr/lib/pam_securetty.so.2
 OLD_LIBS+=usr/lib/pam_self.so.2
 OLD_LIBS+=usr/lib/pam_ssh.so.2
 OLD_LIBS+=usr/lib/pam_tacplus.so.2
 OLD_LIBS+=usr/lib/pam_unix.so.2
 OLD_LIBS+=usr/lib/snmp_atm.so.3
 OLD_LIBS+=usr/lib/snmp_mibII.so.3
 OLD_LIBS+=usr/lib/snmp_netgraph.so.3
 OLD_LIBS+=usr/lib/snmp_pf.so.3
 # 200505XX: ?
 OLD_LIBS+=usr/lib/snmp_atm.so.2
 OLD_LIBS+=usr/lib/snmp_mibII.so.2
 OLD_LIBS+=usr/lib/snmp_netgraph.so.2
 OLD_LIBS+=usr/lib/snmp_pf.so.2
 # 2005XXXX: not ready for primetime yet
 OLD_LIBS+=usr/lib/libautofs.so.1
 # 200411XX: libxpg4 removal
 OLD_LIBS+=usr/lib/libxpg4.so.3
 # 200410XX: libm compatibility fix
 OLD_LIBS+=lib/libm.so.2
 # 20041001: version bump
 OLD_LIBS+=lib/libreadline.so.4
 OLD_LIBS+=usr/lib/libhistory.so.4
 OLD_LIBS+=usr/lib/libopie.so.2
 OLD_LIBS+=usr/lib/libpcap.so.2
 # 20040925: bind9 import
 OLD_LIBS+=usr/lib/libisc.so.1
 # 200408XX
 OLD_LIBS+=usr/lib/snmp_netgraph.so.1
 # 200404XX
 OLD_LIBS+=usr/lib/libsnmp.so.1
 OLD_LIBS+=usr/lib/snmp_mibII.so.1
 # 200309XX
 OLD_LIBS+=usr/lib/libasn1.so.6
 OLD_LIBS+=usr/lib/libhdb.so.6
 OLD_LIBS+=usr/lib/libkadm5clnt.so.6
 OLD_LIBS+=usr/lib/libkadm5srv.so.6
 OLD_LIBS+=usr/lib/libkrb5.so.6
 OLD_LIBS+=usr/lib/libroken.so.6
 # 200304XX
 OLD_LIBS+=usr/lib/libc.so.4
 OLD_LIBS+=usr/lib/libc_r.so.4
 OLD_LIBS+=usr/lib/libdevstat.so.2
 OLD_LIBS+=usr/lib/libedit.so.3
 OLD_LIBS+=usr/lib/libgmp.so.3
 OLD_LIBS+=usr/lib/libmp.so.3
 OLD_LIBS+=usr/lib/libpam.so.1
 OLD_LIBS+=usr/lib/libposix1e.so.2
 OLD_LIBS+=usr/lib/libskey.so.2
 OLD_LIBS+=usr/lib/libusbhid.so.0
 OLD_LIBS+=usr/lib/libvgl.so.2
 # 20030218: OpenSSL 0.9.7 import
 OLD_FILES+=usr/include/des.h
 OLD_FILES+=usr/lib/libdes.a
 OLD_FILES+=usr/lib/libdes.so
 OLD_LIBS+=usr/lib/libdes.so.3
 OLD_FILES+=usr/lib/libdes_p.a
 # 200302XX
 OLD_LIBS+=usr/lib/libacl.so.3
 OLD_LIBS+=usr/lib/libasn1.so.5
 OLD_LIBS+=usr/lib/libcrypto.so.2
 OLD_LIBS+=usr/lib/libgssapi.so.5
 OLD_LIBS+=usr/lib/libhdb.so.5
 OLD_LIBS+=usr/lib/libkadm.so.3
 OLD_LIBS+=usr/lib/libkadm5clnt.so.5
 OLD_LIBS+=usr/lib/libkadm5srv.so.5
 OLD_LIBS+=usr/lib/libkafs.so.3
 OLD_LIBS+=usr/lib/libkafs5.so.5
 OLD_LIBS+=usr/lib/libkdb.so.3
 OLD_LIBS+=usr/lib/libkrb.so.3
 OLD_LIBS+=usr/lib/libroken.so.5
 OLD_LIBS+=usr/lib/libssl.so.2
 OLD_LIBS+=usr/lib/pam_kerberosIV.so
 # 200208XX
 OLD_LIBS+=usr/lib/libgssapi.so.4
 # 200203XX
 OLD_LIBS+=usr/lib/libss.so.3
 OLD_LIBS+=usr/lib/libusb.so.0
 # 200112XX
 OLD_LIBS+=usr/lib/libfetch.so.2
 # 200110XX
 OLD_LIBS+=usr/lib/libgssapi.so.3
 # 200104XX
 OLD_LIBS+=usr/lib/libdescrypt.so.2
 OLD_LIBS+=usr/lib/libscrypt.so.2
 # 200102XX
 OLD_LIBS+=usr/lib/libcrypto.so.1
 OLD_LIBS+=usr/lib/libssl.so.1
 # 200009XX
 OLD_LIBS+=usr/lib/libRSAglue.so.1
 OLD_LIBS+=usr/lib/librsaINTL.so.1
 OLD_LIBS+=usr/lib/librsaUSA.so.1
 # 200006XX
 OLD_LIBS+=usr/lib/libalias.so.3
 OLD_LIBS+=usr/lib/libfetch.so.1
 OLD_LIBS+=usr/lib/libipsec.so.0
 # 200005XX
 OLD_LIBS+=usr/lib/libxpg4.so.2
 # 200002XX
 OLD_LIBS+=usr/lib/libc.so.3
 OLD_LIBS+=usr/lib/libcurses.so.2
 OLD_LIBS+=usr/lib/libdialog.so.3
 OLD_LIBS+=usr/lib/libedit.so.2
 OLD_LIBS+=usr/lib/libf2c.so.2
 OLD_LIBS+=usr/lib/libftpio.so.4
 OLD_LIBS+=usr/lib/libg++.so.4
 OLD_LIBS+=usr/lib/libhistory.so.3
 OLD_LIBS+=usr/lib/libmytinfo.so.2
 OLD_LIBS+=usr/lib/libncurses.so.3
 OLD_LIBS+=usr/lib/libreadline.so.3
 OLD_LIBS+=usr/lib/libss.so.2
 OLD_LIBS+=usr/lib/libtermcap.so.2
 OLD_LIBS+=usr/lib/libutil.so.2
 OLD_LIBS+=usr/lib/libvgl.so.1
 OLD_LIBS+=usr/lib/libwrap.so.2
 # ???
 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/lib/libcipher.so.2
 OLD_LIBS+=usr/lib/libgssapi.so.6
 OLD_LIBS+=usr/lib/libkse.so.1
 OLD_LIBS+=usr/lib/liblwres.so.3
 OLD_LIBS+=usr/lib/pam_ftp.so.2
 
 # 20040925: bind9 import
 OLD_DIRS+=usr/share/doc/bind/html
 OLD_DIRS+=usr/share/doc/bind/misc
 OLD_DIRS+=usr/share/doc/bind/
 # ???
 OLD_DIRS+=usr/include/g++/std
 OLD_DIRS+=usr/include/msdosfs
 OLD_DIRS+=usr/include/ntfs
 OLD_DIRS+=usr/include/nwfs
 OLD_DIRS+=usr/include/ufs/mfs
 # 20011001: UUCP migration to ports
 OLD_DIRS+=usr/libexec/uucp
 
 
 .include "tools/build/mk/OptionalObsoleteFiles.inc"
diff --git a/lib/libpmc/Makefile b/lib/libpmc/Makefile
index 5deff06270f7..f4c02968e806 100644
--- a/lib/libpmc/Makefile
+++ b/lib/libpmc/Makefile
@@ -1,116 +1,115 @@
 
 LIB_CXX= pmc
 
 SRCS=	libpmc.c pmclog.c libpmc_pmu_util.c libpmc_json.cc
 INCS=	pmc.h pmclog.h pmcformat.h
 
 CFLAGS+= -I${SRCTOP}/${RELDIR:H}/libpmcstat
 
 .if ${MACHINE_CPUARCH} == "aarch64"
 EVENT_ARCH="arm64"
 .elif ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
 EVENT_ARCH="x86"
 .elif ${MACHINE_CPUARCH} == "powerpc" && ${MACHINE_ARCH:Mpowerpc64*} != ""
 EVENT_ARCH="powerpc"
 .else
 # This will generate an empty events table
 EVENT_ARCH="none"
 .endif
 
 .if ${MK_DIRDEPS_BUILD} == "yes"
 # avoid circular dependency
 GENDIRDEPS_FILTER+= N${RELDIR:H}/libpmcstat
 JEVENTS?= ${HOST_OBJTOP}/${RELDIR}/pmu-events/jevents
 .else
 JEVENTS= ${BTOOLSPATH:U.}/pmu-events/jevents
 
 # This file is built in a subdirectory so never try to rebuild it here.
 ${JEVENTS}: .PHONY
 .if make(*clean*)
 SUBDIR+= pmu-events
 .endif
 .endif
 
 libpmc_events.c: ${JEVENTS} .META
 	${JEVENTS} ${EVENT_ARCH} ${.CURDIR}/pmu-events/arch ${.TARGET}.tmp
 	if [ ! -e ${.TARGET} ] || ! cmp -s ${.TARGET} ${.TARGET}.tmp; then \
 		mv -f ${.TARGET}.tmp ${.TARGET}; \
 	fi
 CLEANFILES+=	libpmc_events.c libpmc_events.c.tmp
 SRCS+=	libpmc_events.c
 
 WARNS?=	3
 
 CFLAGS+= -I${.CURDIR} -I${SRCTOP}/sys
 CWARNFLAGS.gcc+= -Wno-shadow -Wno-cast-align
 
 MAN=	pmc.3
 MAN+=	pmc_allocate.3
 MAN+=	pmc_attach.3
 MAN+=	pmc_capabilities.3
 MAN+=	pmc_configure_logfile.3
 MAN+=	pmc_disable.3
 MAN+=	pmc_event_names_of_class.3
 MAN+=	pmc_get_driver_stats.3
 MAN+=	pmc_get_msr.3
 MAN+=	pmc_init.3
 MAN+=	pmc_name_of_capability.3
 MAN+=	pmc_read.3
 MAN+=	pmc_set.3
 MAN+=	pmc_start.3
 MAN+=	pmclog.3
 MAN+=	pmc.soft.3
 
 # PMC-dependent manual pages
 MAN+=	pmc.atom.3
 MAN+=	pmc.atomsilvermont.3
 MAN+=	pmc.cmn-600.3
 MAN+=	pmc.core.3
 MAN+=	pmc.core2.3
 MAN+=	pmc.corei7.3
 MAN+=	pmc.corei7uc.3
 MAN+=	pmc.dmc-620.3
 MAN+=	pmc.haswell.3
 MAN+=	pmc.haswelluc.3
 MAN+=	pmc.haswellxeon.3
 MAN+=	pmc.iaf.3
 MAN+=	pmc.ivybridge.3
 MAN+=	pmc.ivybridgexeon.3
-MAN+=	pmc.k7.3
 MAN+=	pmc.k8.3
 MAN+=	pmc.sandybridge.3
 MAN+=	pmc.sandybridgeuc.3
 MAN+=	pmc.sandybridgexeon.3
 MAN+=	pmc.tsc.3
 MAN+=	pmc.ucf.3
 MAN+=	pmc.westmere.3
 MAN+=	pmc.westmereuc.3
 
 MLINKS+= \
 	pmc_allocate.3 pmc_release.3 \
 	pmc_attach.3 pmc_detach.3 \
 	pmc_capabilities.3 pmc_ncpu.3 \
 	pmc_capabilities.3 pmc_npmc.3 \
 	pmc_capabilities.3 pmc_pmcinfo.3 \
 	pmc_capabilities.3 pmc_cpuinfo.3 \
 	pmc_capabilities.3 pmc_width.3 \
 	pmc_configure_logfile.3 pmc_flush_logfile.3 \
 	pmc_configure_logfile.3 pmc_writelog.3 \
 	pmc_disable.3 pmc_enable.3 \
 	pmc_name_of_capability.3 pmc_name_of_class.3 \
 	pmc_name_of_capability.3 pmc_name_of_cputype.3 \
 	pmc_name_of_capability.3 pmc_name_of_disposition.3 \
 	pmc_name_of_capability.3 pmc_name_of_event.3 \
 	pmc_name_of_capability.3 pmc_name_of_mode.3 \
 	pmc_name_of_capability.3 pmc_name_of_state.3 \
 	pmc_read.3 pmc_rw.3 \
 	pmc_read.3 pmc_write.3 \
 	pmc_start.3 pmc_stop.3
 
 MLINKS+= \
 	pmclog.3 pmclog_open.3 \
 	pmclog.3 pmclog_close.3 \
 	pmclog.3 pmclog_feed.3 \
 	pmclog.3 pmclog_read.3
 
 .include <bsd.lib.mk>
diff --git a/lib/libpmc/pmc.3 b/lib/libpmc/pmc.3
index d2be8f6c3a6d..25e534e52b23 100644
--- a/lib/libpmc/pmc.3
+++ b/lib/libpmc/pmc.3
@@ -1,589 +1,580 @@
 .\" Copyright (c) 2003-2008 Joseph Koshy.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd June 16, 2023
+.Dd June 23, 2023
 .Dt PMC 3
 .Os
 .Sh NAME
 .Nm pmc
 .Nd library for accessing hardware performance monitoring counters
 .Sh LIBRARY
 .Lb libpmc
 .Sh SYNOPSIS
 .In pmc.h
 .Sh DESCRIPTION
 The
 .Lb libpmc
 provides a programming interface that allows applications to use
 hardware performance counters to gather performance data about
 specific processes or for the system as a whole.
 The library is implemented using the lower-level facilities offered by
 the
 .Xr hwpmc 4
 driver.
 .Ss Key Concepts
 Performance monitoring counters (PMCs) are represented by the library
 using a software abstraction.
 These
 .Dq abstract
 PMCs can have two scopes:
 .Bl -bullet
 .It
 System scope.
 These PMCs measure events in a whole-system manner, i.e., independent
 of the currently executing thread.
 System scope PMCs are allocated on specific CPUs and do not
 migrate between CPUs.
 Non-privileged process are allowed to allocate system scope PMCs if the
 .Xr hwpmc 4
 sysctl tunable:
 .Va security.bsd.unprivileged_syspmcs
 is non-zero.
 .It
 Process scope.
 These PMCs only measure hardware events when the processes they are
 attached to are executing on a CPU.
 In an SMP system, process scope PMCs migrate between CPUs along with
 their target processes.
 .El
 .Pp
 Orthogonal to PMC scope, PMCs may be allocated in one of two
 operational modes:
 .Bl -bullet
 .It
 Counting PMCs measure events according to their scope
 (system or process).
 The application needs to explicitly read these counters
 to retrieve their value.
 .It
 Sampling PMCs cause the CPU to be periodically interrupted
 and information about its state of execution to be collected.
 Sampling PMCs are used to profile specific processes and kernel
 threads or to profile the system as a whole.
 .El
 .Pp
 The scope and operational mode for a software PMC are specified at
 PMC allocation time.
 An application is allowed to allocate multiple PMCs subject
 to availability of hardware resources.
 .Pp
 The library uses human-readable strings to name the event being
 measured by hardware.
 The syntax used for specifying a hardware event along with additional
 event specific qualifiers (if any) is described in detail in section
 .Sx "EVENT SPECIFIERS"
 below.
 .Pp
 PMCs are associated with the process that allocated them and
 will be automatically reclaimed by the system when the process exits.
 Additionally, process-scope PMCs have to be attached to one or more
 target processes before they can perform measurements.
 A process-scope PMC may be attached to those target processes
 that its owner process would otherwise be permitted to debug.
 An owner process may attach PMCs to itself allowing
 it to measure its own behavior.
 Additionally, on some machine architectures, such self-attached PMCs
 may be read cheaply using specialized instructions supported by the
 processor.
 .Pp
 Certain kinds of PMCs require that a log file be configured before
 they may be started.
 These include:
 .Bl -bullet
 .It
 System scope sampling PMCs.
 .It
 Process scope sampling PMCs.
 .It
 Process scope counting PMCs that have been configured to report PMC
 readings on process context switches or process exits.
 .El
 .Pp
 Up to one log file may be configured per owner process.
 Events logged to a log file may be subsequently analyzed using the
 .Xr pmclog 3
 family of functions.
 .Ss Supported CPUs
 The CPUs known to the PMC library are named by the
 .Vt "enum pmc_cputype"
 enumeration.
 Supported CPUs include:
 .Pp
 .Bl -tag -width "Li PMC_CPU_ARMV7_CORTEX_A15" -compact
-.It Li PMC_CPU_AMD_K7
-.Tn "AMD Athlon"
-CPUs.
 .It Li PMC_CPU_AMD_K8
 .Tn "AMD Athlon64"
 CPUs.
 .It Li PMC_CPU_ARMV7_CORTEX_A5
 .Tn ARMv7
 .Tn Cortex A5
 CPUs.
 .It Li PMC_CPU_ARMV7_CORTEX_A7
 .Tn ARMv7
 .Tn Cortex A7
 CPUs.
 .It Li PMC_CPU_ARMV7_CORTEX_A8
 .Tn ARMv7
 .Tn Cortex A8
 CPUs.
 .It Li PMC_CPU_ARMV7_CORTEX_A9
 .Tn ARMv7
 .Tn Cortex A9
 CPUs.
 .It Li PMC_CPU_ARMV7_CORTEX_A15
 .Tn ARMv7 Cortex A15
 CPUs.
 .It Li PMC_CPU_ARMV7_CORTEX_A17
 .Tn ARMv7
 .Tn Cortex A17
 CPUs.
 .It Li PMC_CPU_ARMV8_CORTEX_A53
 ARMv8
 .Tn Cortex A53
 CPUs.
 .It Li PMC_CPU_ARMV8_CORTEX_A57
 ARMv8
 .Tn Cortex A57
 CPUs.
 .It Li PMC_CPU_ARMV8_CORTEX_A76
 ARMv8
 .Tn Cortex A76
 CPUs.
 .It Li GENERIC
 Generic
 .It Li PMC_CPU_INTEL_ATOM
 .Tn Intel
 .Tn Atom
 CPUs and other CPUs conforming to version 3 of the
 .Tn Intel
 performance measurement architecture.
 .It Li PMC_CPU_INTEL_CORE
 .Tn Intel
 .Tn Core Solo
 and
 .Tn Core Duo
 CPUs, and other CPUs conforming to version 1 of the
 .Tn Intel
 performance measurement architecture.
 .It Li PMC_CPU_INTEL_CORE2
 .Tn Intel
 .Tn "Core2 Solo" ,
 .Tn "Core2 Duo"
 and
 .Tn "Core2 Extreme"
 CPUs, and other CPUs conforming to version 2 of the
 .Tn Intel
 performance measurement architecture.
 .It Li PMC_CPU_PPC_7450
 .Tn PowerPC
 MPC7450 CPUs.
 .It Li PMC_CPU_PPC_970
 .Tn IBM
 .Tn PowerPC
 970 CPUs.
 .It Li PMC_CPU_PPC_E500
 .Tn PowerPC
 e500 Core CPUs.
 .It Li PMC_CPU_PPC_POWER8
 .Tn IBM
 .Tn POWER8 and
 .Tn POWER9
 CPUs.
 .El
 .Ss Supported PMCs
 PMCs supported by this library are named by the
 .Vt enum pmc_class
 enumeration.
 Supported PMC classes include:
 .Pp
 .Bl -tag -width "Li PMC_CLASS_POWER8" -compact
 .It Li PMC_CLASS_IAF
 Fixed function hardware counters presents in CPUs conforming to the
 .Tn Intel
 performance measurement architecture version 2 and later.
 .It Li PMC_CLASS_IAP
 Programmable hardware counters present in CPUs conforming to the
 .Tn Intel
 performance measurement architecture version 1 and later.
-.It Li PMC_CLASS_K7
-Programmable hardware counters present in
-.Tn "AMD Athlon"
-CPUs.
 .It Li PMC_CLASS_K8
 Programmable hardware counters present in
 .Tn "AMD Athlon64"
 CPUs.
 .It Li PMC_CLASS_TSC
 The timestamp counter on i386 and amd64 architecture CPUs.
 .It Li PMC_CLASS_ARMV7
 .Tn ARMv7
 .It Li PMC_CLASS_ARMV8
 .Tn ARMv8
 .It Li PMC_CLASS_PPC970
 .Tn IBM
 .Tn PowerPC
 970 class.
 .It Li PMC_CLASS_POWER8
 .Tn IBM
 .Tn POWER8
 class.
 .It Li PMC_CLASS_SOFT
 Software events.
 .El
 .Ss PMC Capabilities
 Capabilities of performance monitoring hardware are denoted using
 the
 .Vt "enum pmc_caps"
 enumeration.
 Supported capabilities include:
 .Pp
 .Bl -tag -width "Li PMC_CAP_INTERRUPT" -compact
 .It Li PMC_CAP_CASCADE
 The ability to cascade counters.
 .It Li PMC_CAP_DOMWIDE
 Separate counters tied to each NUMA domain.
 .It Li PMC_CAP_EDGE
 The ability to count negated to asserted transitions of the hardware
 conditions being probed for.
 .It Li PMC_CAP_INTERRUPT
 The ability to interrupt the CPU.
 .It Li PMC_CAP_INVERT
 The ability to invert the sense of the hardware conditions being
 measured.
 .It Li PMC_CAP_PRECISE
 The ability to perform precise sampling.
 .It Li PMC_CAP_QUALIFIER
 The hardware allows monitored to be further qualified in some
 system dependent way.
 .It Li PMC_CAP_READ
 The ability to read from performance counters.
 .It Li PMC_CAP_SYSTEM
 The ability to restrict counting of hardware events to when the CPU is
 running privileged code.
 .It Li PMC_CAP_SYSWIDE
 A single counter aggregating events for the whole system.
 .It Li PMC_CAP_THRESHOLD
 The ability to ignore simultaneous hardware events below a
 programmable threshold.
 .It Li PMC_CAP_USER
 The ability to restrict counting of hardware events to those when the
 CPU is running unprivileged code.
 .It Li PMC_CAP_WRITE
 The ability to write to performance counters.
 .El
 .Ss CPU Naming Conventions
 CPUs are named using small integers from zero up to, but
 excluding, the value returned by function
 .Fn pmc_ncpu .
 On platforms supporting sparsely numbered CPUs not all the numbers in
 this range will denote valid CPUs.
 Operations on non-existent CPUs will return an error.
 .Ss Functional Grouping of the API
 This section contains a brief overview of the available functionality
 in the PMC library.
 Each function listed here is described further in its own manual page.
 .Bl -tag -width 2n
 .It Administration
 .Bl -tag -width 6n -compact
 .It Fn pmc_disable , Fn pmc_enable
 Administratively disable (enable) specific performance monitoring
 counter hardware.
 Counters that are disabled will not be available to applications to
 use.
 .El
 .It "Convenience Functions"
 .Bl -tag -width 6n -compact
 .It Fn pmc_event_names_of_class
 Returns a list of event names supported by a given PMC type.
 .It Fn pmc_name_of_capability
 Convert a
 .Dv PMC_CAP_*
 flag to a human-readable string.
 .It Fn pmc_name_of_class
 Convert a
 .Dv PMC_CLASS_*
 constant to a human-readable string.
 .It Fn pmc_name_of_cputype
 Return a human-readable name for a CPU type.
 .It Fn pmc_name_of_disposition
 Return a human-readable string describing a PMC's disposition.
 .It Fn pmc_name_of_event
 Convert a numeric event code to a human-readable string.
 .It Fn pmc_name_of_mode
 Convert a
 .Dv PMC_MODE_*
 constant to a human-readable name.
 .It Fn pmc_name_of_state
 Return a human-readable string describing a PMC's current state.
 .El
 .It "Library Initialization"
 .Bl -tag -width 6n -compact
 .It Fn pmc_init
 Initialize the library.
 This function must be called before any other library function.
 .El
 .It "Log File Handling"
 .Bl -tag -width 6n -compact
 .It Fn pmc_configure_logfile
 Configure a log file for
 .Xr hwpmc 4
 to write logged events to.
 .It Fn pmc_flush_logfile
 Flush all pending log data in
 .Xr hwpmc 4 Ns Ap s
 buffers.
 .It Fn pmc_close_logfile
 Flush all pending log data and close
 .Xr hwpmc 4 Ns Ap s
 side of the stream.
 .It Fn pmc_writelog
 Append arbitrary user data to the current log file.
 .El
 .It "PMC Management"
 .Bl -tag -width 6n -compact
 .It Fn pmc_allocate , Fn pmc_release
 Allocate (free) a PMC.
 .It Fn pmc_attach , Fn pmc_detach
 Attach (detach) a process scope PMC to a target.
 .It Fn pmc_read , Fn pmc_write , Fn pmc_rw
 Read (write) a value from (to) a PMC.
 .It Fn pmc_start , Fn pmc_stop
 Start (stop) a software PMC.
 .It Fn pmc_set
 Set the reload value for a sampling PMC.
 .El
 .It "Queries"
 .Bl -tag -width 6n -compact
 .It Fn pmc_capabilities
 Retrieve the capabilities for a given PMC.
 .It Fn pmc_cpuinfo
 Retrieve information about the CPUs and PMC hardware present in the
 system.
 .It Fn pmc_get_driver_stats
 Retrieve statistics maintained by
 .Xr hwpmc 4 .
 .It Fn pmc_ncpu
 Determine the greatest possible CPU number on the system.
 .It Fn pmc_npmc
 Return the number of hardware PMCs present in a given CPU.
 .It Fn pmc_pmcinfo
 Return information about the state of a given CPU's PMCs.
 .It Fn pmc_width
 Determine the width of a hardware counter in bits.
 .El
 .It "x86 Architecture Specific API"
 .Bl -tag -width 6n -compact
 .It Fn pmc_get_msr
 Returns the processor model specific register number
 associated with
 .Fa pmc .
 Applications may then use the x86
 .Ic RDPMC
 instruction to directly read the contents of the PMC.
 .El
 .El
 .Ss Signal Handling Requirements
 Applications using PMCs are required to handle the following signals:
 .Bl -tag -width ".Dv SIGBUS"
 .It Dv SIGBUS
 When the
 .Xr hwpmc 4
 module is unloaded using
 .Xr kldunload 8 ,
 processes that have PMCs allocated to them will be sent a
 .Dv SIGBUS
 signal.
 .It Dv SIGIO
 The
 .Xr hwpmc 4
 driver will send a PMC owning process a
 .Dv SIGIO
 signal if:
 .Bl -bullet
 .It
 any process-mode PMC allocated by it loses all its
 target processes.
 .It
 the driver encounters an error when writing log data to a
 configured log file.
 This error may be retrieved by a subsequent call to
 .Fn pmc_flush_logfile .
 .El
 .El
 .Ss Typical Program Flow
 .Bl -enum
 .It
 An application would first invoke function
 .Fn pmc_init
 to allow the library to initialize itself.
 .It
 Signal handling would then be set up.
 .It
 Next the application would allocate the PMCs it desires using function
 .Fn pmc_allocate .
 .It
 Initial values for PMCs may be set using function
 .Fn pmc_set .
 .It
 If a log file is necessary for the PMCs to work, it would
 be configured using function
 .Fn pmc_configure_logfile .
 .It
 Process scope PMCs would then be attached to their target processes
 using function
 .Fn pmc_attach .
 .It
 The PMCs would then be started using function
 .Fn pmc_start .
 .It
 Once started, the values of counting PMCs may be read using function
 .Fn pmc_read .
 For PMCs that write events to the log file, this logged data would be
 read and parsed using the
 .Xr pmclog 3
 family of functions.
 .It
 PMCs are stopped using function
 .Fn pmc_stop ,
 and process scope PMCs are detached from their targets using
 function
 .Fn pmc_detach .
 .It
 Before the process exits, it may release its PMCs using function
 .Fn pmc_release .
 Any configured log file may be closed using function
 .Fn pmc_configure_logfile .
 .El
 .Sh EVENT SPECIFIERS
 Event specifiers are strings comprising of an event name, followed by
 optional parameters modifying the semantics of the hardware event
 being probed.
 Event names are PMC architecture dependent, but the PMC library defines
 machine independent aliases for commonly used events.
 .Pp
 Event specifiers spellings are case-insensitive and space characters,
 periods, underscores and hyphens are considered equivalent to each other.
 Thus the event specifiers
 .Qq "Example Event" ,
 .Qq "example-event" ,
 and
 .Qq "EXAMPLE_EVENT"
 are equivalent.
 .Ss PMC Architecture Dependent Events
 PMC architecture dependent event specifiers are described in the
 following manual pages:
 .Bl -column " PMC_CLASS_TSC " "MANUAL PAGE "
 .It Em "PMC Class"      Ta Em "Manual Page"
 .It Li PMC_CLASS_IAF    Ta Xr pmc.iaf 3
 .It Li PMC_CLASS_IAP    Ta Xr pmc.atom 3 , Xr pmc.core 3 , Xr pmc.core2 3
-.It Li PMC_CLASS_K7     Ta Xr pmc.k7 3
 .It Li PMC_CLASS_K8     Ta Xr pmc.k8 3
 .It Li PMC_CLASS_TSC    Ta Xr pmc.tsc 3
 .El
 .Ss Event Name Aliases
 Event name aliases are PMC-independent names for commonly used events.
 The following aliases are known to this version of the
 .Nm pmc
 library:
 .Bl -tag -width indent
 .It Li branches
 Measure the number of branches retired.
 .It Li branch-mispredicts
 Measure the number of retired branches that were mispredicted.
 .It Li cycles
 Measure processor cycles.
 This event is implemented using the processor's Time Stamp Counter
 register.
 .It Li dc-misses
 Measure the number of data cache misses.
 .It Li ic-misses
 Measure the number of instruction cache misses.
 .It Li instructions
 Measure the number of instructions retired.
 .It Li interrupts
 Measure the number of interrupts seen.
 .It Li unhalted-cycles
 Measure the number of cycles the processor is not in a halted
 or sleep state.
 .El
 .Sh COMPATIBILITY
 The interface between the
 .Nm pmc
 library and the
 .Xr hwpmc 4
 driver is intended to be private to the implementation and may
 change.
 In order to ease forward compatibility with future versions of the
 .Xr hwpmc 4
 driver, applications are urged to dynamically link with the
 .Nm pmc
 library.
 Doing otherwise is unsupported.
 .Sh SEE ALSO
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.core2 3 ,
 .Xr pmc.haswell 3 ,
 .Xr pmc.haswelluc 3 ,
 .Xr pmc.haswellxeon 3 ,
 .Xr pmc.iaf 3 ,
 .Xr pmc.ivybridge 3 ,
 .Xr pmc.ivybridgexeon 3 ,
-.Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.sandybridge 3 ,
 .Xr pmc.sandybridgeuc 3 ,
 .Xr pmc.sandybridgexeon 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
 .Xr pmc.westmere 3 ,
 .Xr pmc.westmereuc 3 ,
 .Xr pmc_allocate 3 ,
 .Xr pmc_attach 3 ,
 .Xr pmc_capabilities 3 ,
 .Xr pmc_configure_logfile 3 ,
 .Xr pmc_disable 3 ,
 .Xr pmc_event_names_of_class 3 ,
 .Xr pmc_get_driver_stats 3 ,
 .Xr pmc_get_msr 3 ,
 .Xr pmc_init 3 ,
 .Xr pmc_name_of_capability 3 ,
 .Xr pmc_read 3 ,
 .Xr pmc_set 3 ,
 .Xr pmc_start 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4 ,
 .Xr pmccontrol 8 ,
 .Xr pmcstat 8
 .Sh HISTORY
 The
 .Nm pmc
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
 The
 .Lb libpmc
 library was written by
 .An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/lib/libpmc/pmc.atom.3 b/lib/libpmc/pmc.atom.3
index 34cd4a646e6c..0819525321f4 100644
--- a/lib/libpmc/pmc.atom.3
+++ b/lib/libpmc/pmc.atom.3
@@ -1,1189 +1,1188 @@
 .\" Copyright (c) 2008 Joseph Koshy.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .Dd March 20, 2014
 .Dt PMC.ATOM 3
 .Os
 .Sh NAME
 .Nm pmc.atom
 .Nd measurement events for
 .Tn Intel
 .Tn Atom
 family CPUs
 .Sh LIBRARY
 .Lb libpmc
 .Sh SYNOPSIS
 .In pmc.h
 .Sh DESCRIPTION
 .Tn Intel
 .Tn Atom
 CPUs contain PMCs conforming to version 3 of the
 .Tn Intel
 performance measurement architecture.
 These CPUs contains two classes of PMCs:
 .Bl -tag -width "Li PMC_CLASS_IAP"
 .It Li PMC_CLASS_IAF
 Fixed-function counters that count only one hardware event per counter.
 .It Li PMC_CLASS_IAP
 Programmable counters that may be configured to count one of a defined
 set of hardware events.
 .El
 .Pp
 The number of PMCs available in each class and their widths need to be
 determined at run time by calling
 .Xr pmc_cpuinfo 3 .
 .Pp
 Intel Atom PMCs are documented in
 .Rs
 .%B "IA-32 Intel(R) Architecture Software Developer's Manual"
 .%T "Volume 3: System Programming Guide"
 .%N "Order Number 253669-027US"
 .%D July 2008
 .%Q "Intel Corporation"
 .Re
 .Ss ATOM FIXED FUNCTION PMCS
 These PMCs and their supported events are documented in
 .Xr pmc.iaf 3 .
 .Ss ATOM PROGRAMMABLE PMCS
 The programmable PMCs support the following capabilities:
 .Bl -column "PMC_CAP_INTERRUPT" "Support"
 .It Em Capability Ta Em Support
 .It PMC_CAP_CASCADE Ta \&No
 .It PMC_CAP_EDGE Ta Yes
 .It PMC_CAP_INTERRUPT Ta Yes
 .It PMC_CAP_INVERT Ta Yes
 .It PMC_CAP_READ Ta Yes
 .It PMC_CAP_PRECISE Ta \&No
 .It PMC_CAP_SYSTEM Ta Yes
 .It PMC_CAP_TAGGING Ta \&No
 .It PMC_CAP_THRESHOLD Ta Yes
 .It PMC_CAP_USER Ta Yes
 .It PMC_CAP_WRITE Ta Yes
 .El
 .Ss Event Qualifiers
 Event specifiers for these PMCs support the following common
 qualifiers:
 .Bl -tag -width indent
 .It Li any
 Count matching events seen on any logical processor in a package.
 .It Li cmask= Ns Ar value
 Configure the PMC to increment only if the number of configured
 events measured in a cycle is greater than or equal to
 .Ar value .
 .It Li edge
 Configure the PMC to count the number of de-asserted to asserted
 transitions of the conditions expressed by the other qualifiers.
 If specified, the counter will increment only once whenever a
 condition becomes true, irrespective of the number of clocks during
 which the condition remains true.
 .It Li inv
 Invert the sense of comparison when the
 .Dq Li cmask
 qualifier is present, making the counter increment when the number of
 events per cycle is less than the value specified by the
 .Dq Li cmask
 qualifier.
 .It Li os
 Configure the PMC to count events happening at processor privilege
 level 0.
 .It Li usr
 Configure the PMC to count events occurring at privilege levels 1, 2
 or 3.
 .El
 .Pp
 If neither of the
 .Dq Li os
 or
 .Dq Li usr
 qualifiers are specified, the default is to enable both.
 .Pp
 Events that require core-specificity to be specified use a
 additional qualifier
 .Dq Li core= Ns Ar core ,
 where argument
 .Ar core
 is one of:
 .Bl -tag -width indent
 .It Li all
 Measure event conditions on all cores.
 .It Li this
 Measure event conditions on this core.
 .El
 .Pp
 The default is
 .Dq Li this .
 .Pp
 Events that require an agent qualifier to be specified use an
 additional qualifier
 .Dq Li agent= Ns agent ,
 where argument
 .Ar agent
 is one of:
 .Bl -tag -width indent
 .It Li this
 Measure events associated with this bus agent.
 .It Li any
 Measure events caused by any bus agent.
 .El
 .Pp
 The default is
 .Dq Li this .
 .Pp
 Events that require a hardware prefetch qualifier to be specified use an
 additional qualifier
 .Dq Li prefetch= Ns Ar prefetch ,
 where argument
 .Ar prefetch
 is one of:
 .Bl -tag -width "exclude"
 .It Li both
 Include all prefetches.
 .It Li only
 Only count hardware prefetches.
 .It Li exclude
 Exclude hardware prefetches.
 .El
 .Pp
 The default is
 .Dq Li both .
 .Pp
 Events that require a cache coherence qualifier to be specified use an
 additional qualifier
 .Dq Li cachestate= Ns Ar state ,
 where argument
 .Ar state
 contains one or more of the following letters:
 .Bl -tag -width indent
 .It Li e
 Count cache lines in the exclusive state.
 .It Li i
 Count cache lines in the invalid state.
 .It Li m
 Count cache lines in the modified state.
 .It Li s
 Count cache lines in the shared state.
 .El
 .Pp
 The default is
 .Dq Li eims .
 .Pp
 Events that require a snoop response qualifier to be specified use an
 additional qualifier
 .Dq Li snoopresponse= Ns Ar response ,
 where argument
 .Ar response
 comprises of the following keywords separated by
 .Dq +
 signs:
 .Bl -tag -width indent
 .It Li clean
 Measure CLEAN responses.
 .It Li hit
 Measure HIT responses.
 .It Li hitm
 Measure HITM responses.
 .El
 .Pp
 The default is to measure all the above responses.
 .Pp
 Events that require a snoop type qualifier use an additional qualifier
 .Dq Li snooptype= Ns Ar type ,
 where argument
 .Ar type
 comprises the one of the following keywords:
 .Bl -tag -width indent
 .It Li cmp2i
 Measure CMP2I snoops.
 .It Li cmp2s
 Measure CMP2S snoops.
 .El
 .Pp
 The default is to measure both snoops.
 .Ss Event Specifiers (Programmable PMCs)
 Atom programmable PMCs support the following events:
 .Bl -tag -width indent
 .It Li BACLEARS
 .Pq Event E6H , Umask 01H
 The number of times the front end is resteered.
 .It Li BOGUS_BR
 .Pq Event E4H , Umask 00H
 The number of byte sequences mistakenly detected as taken branch
 instructions.
 .It Li BR_BAC_MISSP_EXEC
 .Pq Event 8AH , Umask 00H
 The number of branch instructions that were mispredicted when
 decoded.
 .It Li BR_CALL_MISSP_EXEC
 .Pq Event 93H , Umask 00H
 The number of mispredicted
 .Li CALL
 instructions that were executed.
 .It Li BR_CALL_EXEC
 .Pq Event 92H , Umask 00H
 The number of
 .Li CALL
 instructions executed.
 .It Li BR_CND_EXEC
 .Pq Event 8BH , Umask 00H
 The number of conditional branches executed, but not necessarily retired.
 .It Li BR_CND_MISSP_EXEC
 .Pq Event 8CH , Umask 00H
 The number of mispredicted conditional branches executed.
 .It Li BR_IND_CALL_EXEC
 .Pq Event 94H , Umask 00H
 The number of indirect
 .Li CALL
 instructions executed.
 .It Li BR_IND_EXEC
 .Pq Event 8DH , Umask 00H
 The number of indirect branch instructions executed.
 .It Li BR_IND_MISSP_EXEC
 .Pq Event 8EH , Umask 00H
 The number of mispredicted indirect branch instructions executed.
 .It Li BR_INST_DECODED
 .Pq Event E0H , Umask 01H
 The number of branch instructions decoded.
 .It Li BR_INST_EXEC
 .Pq Event 88H , Umask 00H
 The number of branches executed, but not necessarily retired.
 .It Li BR_INST_RETIRED.ANY
 .Pq Event C4H , Umask 00H
 .Pq Alias Qq "Branch Instruction Retired"
 The number of branch instructions retired.
 This is an architectural performance event.
 .It Li BR_INST_RETIRED.ANY1
 .Pq Event C4H , Umask 0FH
 The number of branch instructions retired that were mispredicted.
 .It Li BR_INST_RETIRED.MISPRED
 .Pq Event C5H , Umask 00H
 .Pq Alias Qq "Branch Misses Retired"
 The number of mispredicted branch instructions retired.
 This is an architectural performance event.
 .It Li BR_INST_RETIRED.MISPRED_NOT_TAKEN
 .Pq Event C4H , Umask 02H
 The number of not taken branch instructions retired that were
 mispredicted.
 .It Li BR_INST_RETIRED.MISPRED_TAKEN
 .Pq Event C4H , Umask 08H
 The number taken branch instructions retired that were mispredicted.
 .It Li BR_INST_RETIRED.PRED_NOT_TAKEN
 .Pq Event C4H , Umask 01H
 The number of not taken branch instructions retired that were
 correctly predicted.
 .It Li BR_INST_RETIRED.PRED_TAKEN
 .Pq Event C4H , Umask 04H
 The number of taken branch instructions retired that were correctly
 predicted.
 .It Li BR_INST_RETIRED.TAKEN
 .Pq Event C4H , Umask 0CH
 The number of taken branch instructions retired.
 .It Li BR_MISSP_EXEC
 .Pq Event 89H , Umask 00H
 The number of mispredicted branch instructions that were executed.
 .It Li BR_RET_MISSP_EXEC
 .Pq Event 90H , Umask 00H
 The number of mispredicted
 .Li RET
 instructions executed.
 .It Li BR_RET_BAC_MISSP_EXEC
 .Pq Event 91H , Umask 00H
 The number of
 .Li RET
 instructions executed that were mispredicted at decode time.
 .It Li BR_RET_EXEC
 .Pq Event 8FH , Umask 00H
 The number of
 .Li RET
 instructions executed.
 .It Li BR_TKN_BUBBLE_1
 .Pq Event 97H , Umask 00H
 The number of branch predicted taken with bubble 1.
 .It Li BR_TKN_BUBBLE_2
 .Pq Event 98H , Umask 00H
 The number of branch predicted taken with bubble 2.
 .It Li BUSQ_EMPTY Op ,core= Ns Ar core
 .Pq Event 7DH
 The number of cycles during which the core did not have any pending
 transactions in the bus queue.
 .It Li BUS_BNR_DRV Op ,agent= Ns Ar agent
 .Pq Event 61H
 The number of Bus Not Ready signals asserted on the bus.
 This event is thread-independent.
 .It Li BUS_DATA_RCV Op ,core= Ns Ar core
 .Pq Event 64H
 The number of bus cycles during which the processor is receiving data.
 This event is thread-independent.
 .It Li BUS_DRDY_CLOCKS Op ,agent= Ns Ar agent
 .Pq Event 62H
 The number of bus cycles during which the Data Ready signal is asserted
 on the bus.
 This event is thread-independent.
 .It Li BUS_HIT_DRV Op ,agent= Ns Ar agent
 .Pq Event 7AH
 The number of bus cycles during which the processor drives the
 .Li HIT#
 pin.
 This event is thread-independent.
 .It Li BUS_HITM_DRV Op ,agent= Ns Ar agent
 .Pq Event 7BH
 The number of bus cycles during which the processor drives the
 .Li HITM#
 pin.
 This event is thread-independent.
 .It Li BUS_IO_WAIT Op ,core= Ns Ar core
 .Pq Event 7FH
 The number of core cycles during which I/O requests wait in the bus
 queue.
 .It Li BUS_LOCK_CLOCKS Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 63H
 The number of bus cycles during which the
 .Li LOCK
 signal was asserted on the bus.
 This event is thread independent.
 .It Li BUS_REQUEST_OUTSTANDING Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 60H
 The number of pending full cache line read transactions on the bus
 occurring in each cycle.
 This event is thread independent.
 .It Li BUS_TRANS_P Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 6BH
 The number of partial bus transactions.
 .It Li BUS_TRANS_IFETCH Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 68H
 The number of instruction fetch full cache line bus transactions.
 .It Li BUS_TRANS_INVAL Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 69H
 The number of invalidate bus transactions.
 .It Li BUS_TRANS_PWR Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 6AH
 The number of partial write bus transactions.
 .It Li BUS_TRANS_DEF Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 6DH
 The number of deferred bus transactions.
 .It Li BUS_TRANS_BURST Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 6EH
 The number of burst transactions.
 .It Li BUS_TRANS_MEM Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 6FH
 The number of memory bus transactions.
 .It Li BUS_TRANS_ANY Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 70H
 The number of bus transactions of any kind.
 .It Li BUS_TRANS_BRD Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 65H
 The number of burst read transactions.
 .It Li BUS_TRANS_IO Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 6CH
 The number of completed I/O bus transactions due to
 .Li IN
 and
 .Li OUT
 instructions.
 .It Li BUS_TRANS_RFO Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 66H
 The number of Read For Ownership bus transactions.
 .It Li BUS_TRANS_WB Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 67H
 The number explicit write-back bus transactions due to dirty line
 evictions.
 .It Li CMP_SNOOP Xo
 .Op ,core= Ns Ar core
 .Op ,snooptype= Ns Ar snoop
 .Xc
 .Pq Event 78H
 The number of times the L1 data cache is snooped by the other core in
 the same processor.
 .It Li CPU_CLK_UNHALTED.BUS
 .Pq Event 3CH , Umask 01H
 .Pq Alias Qq "Unhalted Reference Cycles"
 The number of bus cycles when the core is not in the halt state.
 This is an architectural performance event.
 .It Li CPU_CLK_UNHALTED.CORE_P
 .Pq Event 3CH , Umask 00H
 .Pq Alias Qq "Unhalted Core Cycles"
 The number of core cycles while the core is not in a halt state.
 This is an architectural performance event.
 .It Li CPU_CLK_UNHALTED.NO_OTHER
 .Pq Event 3CH , Umask 02H
 The number of bus cycles during which the core remains unhalted and
 the other core is halted.
 .It Li CYCLES_DIV_BUSY
 .Pq Event 14H , Umask 01H
 The number of cycles the divider is busy.
 .It Li CYCLES_INT_MASKED.CYCLES_INT_MASKED
 .Pq Event C6H , Umask 01H
 The number of cycles during which interrupts are disabled.
 .It Li CYCLES_INT_MASKED.CYCLES_INT_PENDING_AND_MASKED
 .Pq Event C6H , Umask 02H
 The number of cycles during which there were pending interrupts while
 interrupts were disabled.
 .It Li CYCLES_L1I_MEM_STALLED
 .Pq Event 86H , Umask 00H
 The number of cycles for which an instruction fetch stalls.
 .It Li DATA_TLB_MISSES.DTLB_MISS
 .Pq Event 08H , Umask 07H
 The number of memory access that missed the Data TLB
 .It Li DATA_TLB_MISSES.DTLB_MISS_LD
 .Pq Event 08H , Umask 05H
 The number of loads that missed the Data TLB.
 .It Li DATA_TLB_MISSES.DTLB_MISS_ST
 .Pq Event 08H , Umask 06H
 The number of stores that missed the Data TLB.
 .It Li DATA_TLB_MISSES.UTLB_MISS_LD
 .Pq Event 08H , Umask 09H
 The number of loads that missed the UTLB.
 .It Li DELAYED_BYPASS.FP
 .Pq Event 19H , Umask 00H
 The number of floating point operations that used data immediately
 after the data was generated by a non floating point execution unit.
 .It Li DELAYED_BYPASS.LOAD
 .Pq Event 19H , Umask 01H
 The number of delayed bypass penalty cycles that a load operation incurred.
 .It Li DELAYED_BYPASS.SIMD
 .Pq Event 19H , Umask 02H
 The number of times SIMD operations use data immediately after data,
 was generated by a non-SIMD execution unit.
 .It Li DIV
 .Pq Event 13H , Umask 00H
 The number of divide operations executed.
 This event is only available on PMC1.
 .It Li DIV.AR
 .Pq Event 13H , Umask 81H
 The number of divide operations retired.
 .It Li DIV.S
 .Pq Event 13H , Umask 01H
 The number of divide operations executed.
 .It Li DTLB_MISSES.ANY
 .Pq Event 08H , Umask 01H
 The number of Data TLB misses, including misses that result from
 speculative accesses.
 .It Li DTLB_MISSES.L0_MISS_LD
 .Pq Event 08H , Umask 04H
 The number of level 0 DTLB misses due to load operations.
 .It Li DTLB_MISSES.MISS_LD
 .Pq Event 08H , Umask 02H
 The number of Data TLB misses due to load operations.
 .It Li DTLB_MISSES.MISS_ST
 .Pq Event 08H , Umask 08H
 The number of Data TLB misses due to store operations.
 .It Li EIST_TRANS
 .Pq Event 3AH , Umask 00H
 The number of Enhanced Intel SpeedStep Technology transitions.
 .It Li ESP.ADDITIONS
 .Pq Event ABH , Umask 02H
 The number of automatic additions to the
 .Li %esp
 register.
 .It Li ESP.SYNCH
 .Pq Event ABH , Umask 01H
 The number of times the
 .Li %esp
 register was explicitly used in an address expression after
 it is implicitly used by a
 .Li PUSH
 or
 .Li POP
 instruction.
 .It Li EXT_SNOOP Xo
 .Op ,agent= Ns Ar agent
 .Op ,snoopresponse= Ns Ar response
 .Xc
 .Pq Event 77H
 The number of snoop responses to bus transactions.
 .It Li FP_ASSIST
 .Pq Event 11H , Umask 01H
 The number of floating point operations executed that needed
 a microcode assist, including speculatively executed instructions.
 .It Li FP_ASSIST.AR
 .Pq Event 11H , Umask 81H
 The number of floating point operations retired that needed
 a microcode assist.
 .It Li FP_COMP_OPS_EXE
 .Pq Event 10H , Umask 00H
 The number of floating point computational micro-ops executed.
 The event is available only on PMC0.
 .It Li FP_MMX_TRANS_TO_FP
 .Pq Event CCH , Umask 02H
 The number of transitions from MMX instructions to floating point
 instructions.
 .It Li FP_MMX_TRANS_TO_MMX
 .Pq Event CCH , Umask 01H
 The number of transitions from floating point instructions to MMX
 instructions.
 .It Li HW_INT_RCV
 .Pq Event C8H , Umask 00H
 The number of hardware interrupts received.
 .It Li ICACHE.ACCESSES
 .Pq Event 80H , Umask 03H
 The number of instruction fetches.
 .It Li ICACHE.MISSES
 .Pq Event 80H , Umask 02H
 The number of instruction fetches that miss the instruction cache.
 .It Li IDLE_DURING_DIV
 .Pq Event 18H , Umask 00H
 The number of cycles the divider is busy and no other execution unit
 or load operation was in progress.
 This event is available only on PMC0.
 .It Li ILD_STALL
 .Pq Event 87H , Umask 00H
 The number of cycles the instruction length decoder stalled due to a
 length changing prefix.
 .It Li INST_QUEUE.FULL
 .Pq Event 83H , Umask 02H
 The number of cycles during which the instruction queue is full.
 .It Li INST_RETIRED.ANY_P
 .Pq Event C0H , Umask 00H
 .Pq Alias Qq "Instruction Retired"
 The number of instructions retired.
 This is an architectural performance event.
 .It Li INST_RETIRED.LOADS
 .Pq Event C0H , Umask 01H
 The number of instructions retired that contained a load operation.
 .It Li INST_RETIRED.OTHER
 .Pq Event C0H , Umask 04H
 The number of instructions retired that did not contain a load or a
 store operation.
 .It Li INST_RETIRED.STORES
 .Pq Event C0H , Umask 02H
 The number of instructions retired that contained a store operation.
 .It Li ITLB.FLUSH
 .Pq Event 82H , Umask 04H
 The number of ITLB flushes.
 .It Li ITLB.LARGE_MISS
 .Pq Event 82H , Umask 10H
 The number of instruction fetches from large pages that miss the
 ITLB.
 .It Li ITLB.MISSES
 .Pq Event 82H , Umask 02H
 The number of instruction fetches from both large and small pages that
 miss the ITLB.
 .It Li ITLB.SMALL_MISS
 .Pq Event 82H , Umask 02H
 The number of instruction fetches from small pages that miss the ITLB.
 .It Li ITLB_MISS_RETIRED
 .Pq Event C9H , Umask 00H
 The number of retired instructions that missed the ITLB when they were
 fetched.
 .It Li L1D_ALL_REF
 .Pq Event 43H , Umask 01H
 The number of references to L1 data cache counting loads and stores of
 to all memory types.
 .It Li L1D_ALL_CACHE_REF
 .Pq Event 43H , Umask 02H
 The number of data reads and writes to cacheable memory.
 .It Li L1D_CACHE_LOCK Op ,cachestate= Ns Ar state
 .Pq Event 42H
 The number of locked reads from cacheable memory.
 .It Li L1D_CACHE_LOCK_DURATION
 .Pq Event 42H , Umask 10H
 The number of cycles during which any cache line is locked by any
 locking instruction.
 .It Li L1D_CACHE.LD
 .Pq Event 40H , Umask 21H
 The number of data reads from cacheable memory.
 .It Li L1D_CACHE.ST
 .Pq Event 41H , Umask 22H
 The number of data writes to cacheable memory.
 .It Li L1D_M_EVICT
 .Pq Event 47H , Umask 00H
 The number of modified cache lines evicted from L1 data cache.
 .It Li L1D_M_REPL
 .Pq Event 46H , Umask 00H
 The number of modified lines allocated in L1 data cache.
 .It Li L1D_PEND_MISS
 .Pq Event 48H , Umask 00H
 The total number of outstanding L1 data cache misses at any clock.
 .It Li L1D_PREFETCH.REQUESTS
 .Pq Event 4EH , Umask 10H
 The number of times L1 data cache requested to prefetch a data cache
 line.
 .It Li L1D_REPL
 .Pq Event 45H , Umask 0FH
 The number of lines brought into L1 data cache.
 .It Li L1D_SPLIT.LOADS
 .Pq Event 49H , Umask 01H
 The number of load operations that span two cache lines.
 .It Li L1D_SPLIT.STORES
 .Pq Event 49H , Umask 02H
 The number of store operations that span two cache lines.
 .It Li L1I_MISSES
 .Pq Event 81H , Umask 00H
 The number of instruction fetch unit misses.
 .It Li L1I_READS
 .Pq Event 80H , Umask 00H
 The number of instruction fetches.
 .It Li L2_ADS Op ,core= Ns core
 .Pq Event 21H
 The number of cycles that the L2 address bus is in use.
 .It Li L2_DBUS_BUSY_RD Op ,core= Ns core
 .Pq Event 23H
 The number of core cycles during which the L2 data bus is busy
 transferring data to the core.
 .It Li L2_IFETCH Xo
 .Op ,cachestate= Ns Ar state
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 28H
 The number of instruction cache line requests from the instruction
 fetch unit.
 .It Li L2_LD Xo
 .Op ,cachestate= Ns Ar state
 .Op ,core= Ns Ar core
 .Op ,prefetch= Ns Ar prefetch
 .Xc
 .Pq Event 29H
 The number of L2 cache read requests from L1 cache and L2
 prefetchers.
 .It Li L2_LINES_IN Xo
 .Op ,core= Ns Ar core
 .Op ,prefetch= Ns Ar prefetch
 .Xc
 .Pq Event 24H
 The number of cache lines allocated in L2 cache.
 .It Li L2_LINES_OUT Xo
 .Op ,core= Ns Ar core
 .Op ,prefetch= Ns Ar prefetch
 .Xc
 .Pq Event 26H
 The number of L2 cache lines evicted.
 .It Li L2_LOCK Xo
 .Op ,cachestate= Ns Ar state
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 2BH
 The number of locked accesses to cache lines that miss L1 data
 cache.
 .It Li L2_M_LINES_IN Op ,core= Ns Ar core
 .Pq Event 25H
 The number of L2 cache line modifications.
 .It Li L2_M_LINES_OUT Xo
 .Op ,core= Ns Ar core
 .Op ,prefetch= Ns Ar prefetch
 .Xc
 .Pq Event 27H
 The number of modified lines evicted from L2 cache.
 .It Li L2_NO_REQ Op ,core= Ns Ar core
 .Pq Event 32H
 The number of cycles during which no L2 cache requests were pending
 from a core.
 .It Li L2_REJECT_BUSQ Xo
 .Op ,cachestate= Ns Ar state
 .Op ,core= Ns Ar core
 .Op ,prefetch= Ns Ar prefetch
 .Xc
 .Pq Event 30H
 The number of L2 cache requests that were rejected.
 .It Li L2_RQSTS Xo
 .Op ,cachestate= Ns Ar state
 .Op ,core= Ns Ar core
 .Op ,prefetch= Ns Ar prefetch
 .Xc
 .Pq Event 2EH
 The number of completed L2 cache requests.
 .It Li L2_RQSTS.SELF.DEMAND.I_STATE
 .Pq Event 2EH , Umask 41H
 .Pq Alias Qq "LLC Misses"
 The number of completed L2 cache demand requests from this core that
 missed the L2 cache.
 This is an architectural performance event.
 .It Li L2_RQSTS.SELF.DEMAND.MESI
 .Pq Event 2EH , Umask 4FH
 .Pq Alias Qq "LLC References"
 The number of completed L2 cache demand requests from this core.
 .It Li L2_ST Xo
 .Op ,cachestate= Ns Ar state
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 2AH
 The number of store operations that miss the L1 cache and request data
 from the L2 cache.
 .It Li LOAD_BLOCK.L1D
 .Pq Event 03H , Umask 20H
 The number of loads blocked by the L1 data cache.
 .It Li LOAD_BLOCK.OVERLAP_STORE
 .Pq Event 03H , Umask 08H
 The number of loads that partially overlap an earlier store or are
 aliased with a previous store.
 .It Li LOAD_BLOCK.STA
 .Pq Event 03H , Umask 02H
 The number of loads blocked by preceding stores whose address is yet
 to be calculated.
 .It Li LOAD_BLOCK.STD
 .Pq Event 03H , Umask 04H
 The number of loads blocked by preceding stores to the same address
 whose data value is not known.
 .It Li LOAD_BLOCK.UNTIL_RETIRE
 .Pq Event 03H , Umask 10H
 The number of load operations that were blocked until retirement.
 .It Li LOAD_HIT_PRE
 .Pq Event 4CH , Umask 00H
 The number of load operations that conflicted with an prefetch to the
 same cache line.
 .It Li MACHINE_CLEARS.SMC
 .Pq Event C3H , Umask 01H
 The number of times a program writes to a code section.
 .It Li MACHINE_NUKES.MEM_ORDER
 .Pq Event C3H , Umask 04H
 The number of times the execution pipeline was restarted due to a
 memory ordering conflict or memory disambiguation misprediction.
 .It Li MACRO_INSTS.ALL_DECODED
 .Pq Event AAH , Umask 03H
 The number of instructions decoded.
 .It Li MACRO_INSTS.CISC_DECODED
 .Pq Event AAH , Umask 02H
 The number of complex instructions decoded.
 .It Li MEMORY_DISAMBIGUATION.RESET
 .Pq Event 09H , Umask 01H
 The number of cycles during which memory disambiguation misprediction
 occurs.
 .It Li MEMORY_DISAMBIGUATION.SUCCESS
 .Pq Event 09H , Umask 02H
 The number of load operations that were successfully disambiguated.
 .It Li MEM_LOAD_RETIRED.DTLB_MISS
 .Pq Event CBH , Umask 04H
 The number of retired load operations that missed the DTLB.
 .It Li MEM_LOAD_RETIRED.L2_MISS
 .Pq Event CBH , Umask 02H
 The number of retired load operations that miss L2 cache.
 .It Li MEM_LOAD_RETIRED.L2_HIT
 .Pq Event CBH , Umask 01H
 The number of retired load operations that hit L2 cache.
 .It Li MEM_LOAD_RETIRED.L2_LINE_MISS
 .Pq Event CBH , Umask 08H
 The number of load operations that missed L2 cache and that caused a
 bus request.
 .It Li MUL
 .Pq Event 12H , Umask 00H
 The number of multiply operations executed.
 This event is only available on PMC1.
 .It Li MUL.AR
 .Pq Event 12H , Umask 81H
 The number of multiply operations retired.
 .It Li MUL.S
 .Pq Event 12H , Umask 01H
 The number of multiply operations executed.
 .It Li PAGE_WALKS.WALKS
 .Pq Event 0CH , Umask 03H
 The number of page walks executed due to an ITLB or DTLB miss.
 .It Li PAGE_WALKS.CYCLES
 .Pq Event 0CH , Umask 03H
 .\" XXX Clarify.  Identical event umask/event numbers.
 The number of cycles spent in a page walk caused by an ITLB or DTLB
 miss.
 .It Li PREF_RQSTS_DN
 .Pq Event F8H , Umask 00H
 The number of downward prefetches issued from the Data Prefetch Logic
 unit to L2 cache.
 .It Li PREF_RQSTS_UP
 .Pq Event F0H , Umask 00H
 The number of upward prefetches issued from the Data Prefetch Logic
 unit to L2 cache.
 .It Li PREFETCH.PREFETCHNTA
 .Pq Event 07H , Umask 08H
 The number of
 .Li PREFETCHNTA
 instructions executed.
 .It Li PREFETCH.PREFETCHT0
 .Pq Event 07H , Umask 01H
 The number of
 .Li PREFETCHT0
 instructions executed.
 .It Li PREFETCH.SW_L2
 .Pq Event 07H , Umask 06H
 The number of
 .Li PREFETCHT1
 and
 .Li PREFETCHT2
 instructions executed.
 .It Li RAT_STALLS.ANY
 .Pq Event D2H , Umask 0FH
 The number of stall cycles due to any of
 .Li RAT_STALLS.FLAGS
 .Li RAT_STALLS.FPSW ,
 .Li RAT_STALLS.PARTIAL
 and
 .Li RAT_STALLS.ROB_READ_PORT .
 .It Li RAT_STALLS.FLAGS
 .Pq Event D2H , Umask 04H
 The number of cycles execution stalled due to a flag register induced
 stall.
 .It Li RAT_STALLS.FPSW
 .Pq Event D2H , Umask 08H
 The number of times the floating point status word was written.
 .It Li RAT_STALLS.PARTIAL_CYCLES
 .Pq Event D2H , Umask 02H
 The number of cycles of added instruction execution latency due to the
 use of a register that was partially written by previous instructions.
 .It Li RAT_STALLS.ROB_READ_PORT
 .Pq Event D2H , Umask 01H
 The number of cycles when ROB read port stalls occurred.
 .It Li RESOURCE_STALLS.ANY
 .Pq Event DCH , Umask 1FH
 The number of cycles during which any resource related stall
 occurred.
 .It Li RESOURCE_STALLS.BR_MISS_CLEAR
 .Pq Event DCH , Umask 10H
 The number of cycles stalled due to branch misprediction.
 .It Li RESOURCE_STALLS.FPCW
 .Pq Event DCH , Umask 08H
 The number of cycles stalled due to writing the floating point control
 word.
 .It Li RESOURCE_STALLS.LD_ST
 .Pq Event DCH , Umask 04H
 The number of cycles during which the number of loads and stores in
 the pipeline exceeded their limits.
 .It Li RESOURCE_STALLS.ROB_FULL
 .Pq Event DCH , Umask 01H
 The number of cycles when the reorder buffer was full.
 .It Li RESOURCE_STALLS.RS_FULL
 .Pq Event DCH , Umask 02H
 The number of cycles during which the RS was full.
 .It Li RS_UOPS_DISPATCHED
 .Pq Event A0H , Umask 00H
 The number of micro-ops dispatched for execution.
 .It Li RS_UOPS_DISPATCHED.PORT0
 .Pq Event A1H , Umask 01H
 The number of cycles micro-ops were dispatched for execution on port
 0.
 .It Li RS_UOPS_DISPATCHED.PORT1
 .Pq Event A1H , Umask 02H
 The number of cycles micro-ops were dispatched for execution on port
 1.
 .It Li RS_UOPS_DISPATCHED.PORT2
 .Pq Event A1H , Umask 04H
 The number of cycles micro-ops were dispatched for execution on port
 2.
 .It Li RS_UOPS_DISPATCHED.PORT3
 .Pq Event A1H , Umask 08H
 The number of cycles micro-ops were dispatched for execution on port
 3.
 .It Li RS_UOPS_DISPATCHED.PORT4
 .Pq Event A1H , Umask 10H
 The number of cycles micro-ops were dispatched for execution on port
 4.
 .It Li RS_UOPS_DISPATCHED.PORT5
 .Pq Event A1H , Umask 20H
 The number of cycles micro-ops were dispatched for execution on port
 5.
 .It Li SB_DRAIN_CYCLES
 .Pq Event 04H , Umask 01H
 The number of cycles while the store buffer is draining.
 .It Li SEGMENT_REG_LOADS.ANY
 .Pq Event 06H , Umask 00H
 The number of segment register loads.
 .It Li SEG_REG_RENAMES.ANY
 .Pq Event D5H , Umask 0FH
 The number of times the any segment register was renamed.
 .It Li SEG_REG_RENAMES.DS
 .Pq Event D5H , Umask 02H
 The number of times the
 .Li %ds
 register is renamed.
 .It Li SEG_REG_RENAMES.ES
 .Pq Event D5H , Umask 01H
 The number of times the
 .Li %es
 register is renamed.
 .It Li SEG_REG_RENAMES.FS
 .Pq Event D5H , Umask 04H
 The number of times the
 .Li %fs
 register is renamed.
 .It Li SEG_REG_RENAMES.GS
 .Pq Event D5H , Umask 08H
 The number of times the
 .Li %gs
 register is renamed.
 .It Li SEG_RENAME_STALLS.ANY
 .Pq Event D4H , Umask 0FH
 The number of stalls due to lack of resource to rename any segment
 register.
 .It Li SEG_RENAME_STALLS.DS
 .Pq Event D4H , Umask 02H
 The number of stalls due to lack of renaming resources for the
 .Li %ds
 register.
 .It Li SEG_RENAME_STALLS.ES
 .Pq Event D4H , Umask 01H
 The number of stalls due to lack of renaming resources for the
 .Li %es
 register.
 .It Li SEG_RENAME_STALLS.FS
 .Pq Event D4H , Umask 04H
 The number of stalls due to lack of renaming resources for the
 .Li %fs
 register.
 .It Li SEG_RENAME_STALLS.GS
 .Pq Event D4H , Umask 08H
 The number of stalls due to lack of renaming resources for the
 .Li %gs
 register.
 .It Li SIMD_ASSIST
 .Pq Event CDH , Umask 00H
 The number SIMD assists invoked.
 .It Li SIMD_COMP_INST_RETIRED.PACKED_DOUBLE
 .Pq Event CAH , Umask 04H
 Then number of computational SSE2 packed double precision instructions
 retired.
 .It Li SIMD_COMP_INST_RETIRED.PACKED_SINGLE
 .Pq Event CAH , Umask 01H
 Then number of computational SSE2 packed single precision instructions
 retired.
 .It Li SIMD_COMP_INST_RETIRED.SCALAR_DOUBLE
 .Pq Event CAH , Umask 08H
 Then number of computational SSE2 scalar double precision instructions
 retired.
 .It Li SIMD_COMP_INST_RETIRED.SCALAR_SINGLE
 .Pq Event CAH , Umask 02H
 Then number of computational SSE2 scalar single precision instructions
 retired.
 .It Li SIMD_INSTR_RETIRED
 .Pq Event CEH , Umask 00H
 The number of retired SIMD instructions that use MMX registers.
 .It Li SIMD_INST_RETIRED.ANY
 .Pq Event C7H , Umask 1FH
 The number of streaming SIMD instructions retired.
 .It Li SIMD_INST_RETIRED.PACKED_DOUBLE
 .Pq Event C7H , Umask 04H
 The number of SSE2 packed double precision instructions retired.
 .It Li SIMD_INST_RETIRED.PACKED_SINGLE
 .Pq Event C7H , Umask 01H
 The number of SSE packed single precision instructions retired.
 .It Li SIMD_INST_RETIRED.SCALAR_DOUBLE
 .Pq Event C7H , Umask 08H
 The number of SSE2 scalar double precision instructions retired.
 .It Li SIMD_INST_RETIRED.SCALAR_SINGLE
 .Pq Event C7H , Umask 02H
 The number of SSE scalar single precision instructions retired.
 .It Li SIMD_INST_RETIRED.VECTOR
 .Pq Event C7H , Umask 10H
 The number of SSE2 vector instructions retired.
 .It Li SIMD_SAT_INSTR_RETIRED
 .Pq Event CFH , Umask 00H
 The number of saturated arithmetic SIMD instructions retired.
 .It Li SIMD_SAT_UOP_EXEC.AR
 .Pq Event B1H , Umask 80H
 The number of SIMD saturated arithmetic micro-ops retired.
 .It Li SIMD_SAT_UOP_EXEC.S
 .Pq Event B1H , Umask 00H
 The number of SIMD saturated arithmetic micro-ops executed.
 .It Li SIMD_UOPS_EXEC.AR
 .Pq Event B0H , Umask 80H
 The number of SIMD micro-ops retired.
 .It Li SIMD_UOPS_EXEC.S
 .Pq Event B0H , Umask 00H
 The number of SIMD micro-ops executed.
 .It Li SIMD_UOP_TYPE_EXEC.ARITHMETIC.AR
 .Pq Event B3H , Umask A0H
 The number of SIMD packed arithmetic micro-ops executed.
 .It Li SIMD_UOP_TYPE_EXEC.ARITHMETIC.S
 .Pq Event B3H , Umask 20H
 The number of SIMD packed arithmetic micro-ops executed.
 .It Li SIMD_UOP_TYPE_EXEC.LOGICAL.AR
 .Pq Event B3H , Umask 90H
 The number of SIMD packed logical micro-ops executed.
 .It Li SIMD_UOP_TYPE_EXEC.LOGICAL.S
 .Pq Event B3H , Umask 10H
 The number of SIMD packed logical micro-ops executed.
 .It Li SIMD_UOP_TYPE_EXEC.MUL.AR
 .Pq Event B3H , Umask 81H
 The number of SIMD packed multiply micro-ops retired.
 .It Li SIMD_UOP_TYPE_EXEC.MUL.S
 .Pq Event B3H , Umask 01H
 The number of SIMD packed multiply micro-ops executed.
 .It Li SIMD_UOP_TYPE_EXEC.PACK.AR
 .Pq Event B3H , Umask 84H
 The number of SIMD pack micro-ops retired.
 .It Li SIMD_UOP_TYPE_EXEC.PACK.S
 .Pq Event B3H , Umask 04H
 The number of SIMD pack micro-ops executed.
 .It Li SIMD_UOP_TYPE_EXEC.SHIFT.AR
 .Pq Event B3H , Umask 82H
 The number of SIMD packed shift micro-ops retired.
 .It Li SIMD_UOP_TYPE_EXEC.SHIFT.S
 .Pq Event B3H , Umask 02H
 The number of SIMD packed shift micro-ops executed.
 .It Li SIMD_UOP_TYPE_EXEC.UNPACK.AR
 .Pq Event B3H , Umask 88H
 The number of SIMD unpack micro-ops executed.
 .It Li SIMD_UOP_TYPE_EXEC.UNPACK.S
 .Pq Event B3H , Umask 08H
 The number of SIMD unpack micro-ops executed.
 .It Li SNOOP_STALL_DRV Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 7EH
 The number of times the bus stalled for snoops.
 This event is thread-independent.
 .It Li SSE_PRE_EXEC.L2
 .Pq Event 07H , Umask 02H
 The number of
 .Li PREFETCHT1
 instructions executed.
 .It Li SSE_PRE_EXEC.STORES
 .Pq Event 07H , Umask 03H
 The number of times SSE non-temporal store instructions were executed.
 .It Li SSE_PRE_MISS.L1
 .Pq Event 4BH , Umask 01H
 The number of times the
 .Li PREFETCHT0
 instruction executed and missed all cache levels.
 .It Li SSE_PRE_MISS.L2
 .Pq Event 4BH , Umask 02H
 The number of times the
 .Li PREFETCHT1
 instruction executed and missed all cache levels.
 .It Li SSE_PRE_MISS.NTA
 .Pq Event 4BH , Umask 00H
 The number of times the
 .Li PREFETCHNTA
 instruction executed and missed all cache levels.
 .It Li STORE_BLOCK.ORDER
 .Pq Event 04H , Umask 02H
 The number of cycles while a store was waiting for another store to be
 globally observed.
 .It Li STORE_BLOCK.SNOOP
 .Pq Event 04H , Umask 08H
 The number of cycles while a store was blocked due to a conflict with
 an internal or external snoop.
 .It Li STORE_FORWARDS.GOOD
 .Pq Event 02H , Umask 81H
 The number of times stored data was forwarded directly to a load.
 .It Li THERMAL_TRIP
 .Pq Event 3BH , Umask C0H
 The number of thermal trips.
 .It Li UOPS_RETIRED.LD_IND_BR
 .Pq Event C2H , Umask 01H
 The number of micro-ops retired that fused a load with another
 operation.
 .It Li UOPS_RETIRED.STD_STA
 .Pq Event C2H , Umask 02H
 The number of store address calculations that fused into one micro-op.
 .It Li UOPS_RETIRED.MACRO_FUSION
 .Pq Event C2H , Umask 04H
 The number of times retired instruction pairs were fused into one
 micro-op.
 .It Li UOPS_RETIRED.FUSED
 .Pq Event C2H , Umask 07H
 The number of fused micro-ops retired.
 .It Li UOPS_RETIRED.NON_FUSED
 .Pq Event C2H , Umask 8H
 The number of non-fused micro-ops retired.
 .It Li UOPS_RETIRED.ANY
 .Pq Event C2H , Umask 10H
 The number of micro-ops retired.
 .It Li X87_COMP_OPS_EXE.ANY.AR
 .Pq Event 10H , Umask 81H
 The number of x87 floating-point computational micro-ops retired.
 .It Li X87_COMP_OPS_EXE.ANY.S
 .Pq Event 10H , Umask 01H
 The number of x87 floating-point computational micro-ops executed.
 .It Li X87_OPS_RETIRED.ANY
 .Pq Event C1H , Umask FEH
 The number of floating point computational instructions retired.
 .It Li X87_OPS_RETIRED.FXCH
 .Pq Event C1H , Umask 01H
 The number of
 .Li FXCH
 instructions retired.
 .El
 .Ss Event Name Aliases
 The following table shows the mapping between the PMC-independent
 aliases supported by
 .Lb libpmc
 and the underlying hardware events used on these CPUs.
 .Bl -column "branch-mispredicts" "cpu_clk_unhalted.core_p" "PMC Class"
 .It Em Alias Ta Em Event Ta Em PMC Class
 .It Li branches Ta Li BR_INST_RETIRED.ANY Ta Li PMC_CLASS_IAP
 .It Li branch-mispredicts Ta Li BR_INST_RETIRED.MISPRED Ta Li PMC_CLASS_IAP
 .It Li ic-misses Ta Li ICACHE.MISSES Ta Li PMC_CLASS_IAP
 .It Li instructions Ta Li INST_RETIRED.ANY_P Ta Li PMC_CLASS_IAF
 .It Li interrupts Ta Li HW_INT_RCV Ta Li PMC_CLASS_IAP
 .It Li unhalted-cycles Ta Li CPU_CLK_UNHALTED.CORE_P Ta Li PMC_CLASS_IAF
 .El
 .Sh SEE ALSO
 .Xr pmc 3 ,
 .Xr pmc.atomsilvermont 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.core2 3 ,
 .Xr pmc.iaf 3 ,
-.Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
 .Sh HISTORY
 The
 .Nm pmc
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
 The
 .Lb libpmc
 library was written by
 .An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/lib/libpmc/pmc.atomsilvermont.3 b/lib/libpmc/pmc.atomsilvermont.3
index 975e4310e61a..72baa6453565 100644
--- a/lib/libpmc/pmc.atomsilvermont.3
+++ b/lib/libpmc/pmc.atomsilvermont.3
@@ -1,531 +1,530 @@
 .\" Copyright (c) 2014 Hiren Panchasara <hiren@FreeBSD.org>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .Dd April 6, 2017
 .Dt PMC.ATOMSILVERMONT 3
 .Os
 .Sh NAME
 .Nm pmc.atomsilvermont
 .Nd measurement events for
 .Tn Intel
 .Tn Atom Silvermont
 family CPUs
 .Sh LIBRARY
 .Lb libpmc
 .Sh SYNOPSIS
 .In pmc.h
 .Sh DESCRIPTION
 .Tn Intel
 .Tn Atom Silvermont
 CPUs contain PMCs conforming to version 3 of the
 .Tn Intel
 performance measurement architecture.
 These CPUs contains two classes of PMCs:
 .Bl -tag -width "Li PMC_CLASS_IAP"
 .It Li PMC_CLASS_IAF
 Fixed-function counters that count only one hardware event per counter.
 .It Li PMC_CLASS_IAP
 Programmable counters that may be configured to count one of a defined
 set of hardware events.
 .El
 .Pp
 The number of PMCs available in each class and their widths need to be
 determined at run time by calling
 .Xr pmc_cpuinfo 3 .
 .Pp
 Intel Atom Silvermont PMCs are documented in
 .Rs
 .%B "Intel 64 and IA-32 Intel(R) Architecture Software Developer's Manual"
 .%T "Combined Volumes"
 .%N "Order Number 325462-050US"
 .%D February 2014
 .%Q "Intel Corporation"
 .Re
 .Ss ATOM SILVERMONT FIXED FUNCTION PMCS
 These PMCs and their supported events are documented in
 .Xr pmc.iaf 3 .
 .Ss ATOM SILVERMONT PROGRAMMABLE PMCS
 The programmable PMCs support the following capabilities:
 .Bl -column "PMC_CAP_INTERRUPT" "Support"
 .It Em Capability Ta Em Support
 .It PMC_CAP_CASCADE Ta \&No
 .It PMC_CAP_EDGE Ta Yes
 .It PMC_CAP_INTERRUPT Ta Yes
 .It PMC_CAP_INVERT Ta Yes
 .It PMC_CAP_READ Ta Yes
 .It PMC_CAP_PRECISE Ta \&No
 .It PMC_CAP_SYSTEM Ta Yes
 .It PMC_CAP_TAGGING Ta \&No
 .It PMC_CAP_THRESHOLD Ta Yes
 .It PMC_CAP_USER Ta Yes
 .It PMC_CAP_WRITE Ta Yes
 .El
 .Ss Event Qualifiers
 Event specifiers for these PMCs support the following common
 qualifiers:
 .Bl -tag -width indent
 .It Li any
 Count matching events seen on any logical processor in a package.
 .It Li cmask= Ns Ar value
 Configure the PMC to increment only if the number of configured
 events measured in a cycle is greater than or equal to
 .Ar value .
 .It Li edge
 Configure the PMC to count the number of de-asserted to asserted
 transitions of the conditions expressed by the other qualifiers.
 If specified, the counter will increment only once whenever a
 condition becomes true, irrespective of the number of clocks during
 which the condition remains true.
 .It Li inv
 Invert the sense of comparison when the
 .Dq Li cmask
 qualifier is present, making the counter increment when the number of
 events per cycle is less than the value specified by the
 .Dq Li cmask
 qualifier.
 .It Li os
 Configure the PMC to count events happening at processor privilege
 level 0.
 .It Li usr
 Configure the PMC to count events occurring at privilege levels 1, 2
 or 3.
 .El
 .Pp
 If neither of the
 .Dq Li os
 or
 .Dq Li usr
 qualifiers are specified, the default is to enable both.
 .Pp
 Events that require core-specificity to be specified use a
 additional qualifier
 .Dq Li core= Ns Ar core ,
 where argument
 .Ar core
 is one of:
 .Bl -tag -width indent
 .It Li all
 Measure event conditions on all cores.
 .It Li this
 Measure event conditions on this core.
 .El
 .Pp
 The default is
 .Dq Li this .
 .Pp
 Events that require an agent qualifier to be specified use an
 additional qualifier
 .Dq Li agent= Ns agent ,
 where argument
 .Ar agent
 is one of:
 .Bl -tag -width indent
 .It Li this
 Measure events associated with this bus agent.
 .It Li any
 Measure events caused by any bus agent.
 .El
 .Pp
 The default is
 .Dq Li this .
 .Pp
 Events that require a hardware prefetch qualifier to be specified use an
 additional qualifier
 .Dq Li prefetch= Ns Ar prefetch ,
 where argument
 .Ar prefetch
 is one of:
 .Bl -tag -width "exclude"
 .It Li both
 Include all prefetches.
 .It Li only
 Only count hardware prefetches.
 .It Li exclude
 Exclude hardware prefetches.
 .El
 .Pp
 The default is
 .Dq Li both .
 .Pp
 Events that require a cache coherence qualifier to be specified use an
 additional qualifier
 .Dq Li cachestate= Ns Ar state ,
 where argument
 .Ar state
 contains one or more of the following letters:
 .Bl -tag -width indent
 .It Li e
 Count cache lines in the exclusive state.
 .It Li i
 Count cache lines in the invalid state.
 .It Li m
 Count cache lines in the modified state.
 .It Li s
 Count cache lines in the shared state.
 .El
 .Pp
 The default is
 .Dq Li eims .
 .Pp
 Events that require a snoop response qualifier to be specified use an
 additional qualifier
 .Dq Li snoopresponse= Ns Ar response ,
 where argument
 .Ar response
 comprises of the following keywords separated by
 .Dq +
 signs:
 .Bl -tag -width indent
 .It Li clean
 Measure CLEAN responses.
 .It Li hit
 Measure HIT responses.
 .It Li hitm
 Measure HITM responses.
 .El
 .Pp
 The default is to measure all the above responses.
 .Pp
 Events that require a snoop type qualifier use an additional qualifier
 .Dq Li snooptype= Ns Ar type ,
 where argument
 .Ar type
 comprises the one of the following keywords:
 .Bl -tag -width indent
 .It Li cmp2i
 Measure CMP2I snoops.
 .It Li cmp2s
 Measure CMP2S snoops.
 .El
 .Pp
 The default is to measure both snoops.
 .Ss Event Specifiers (Programmable PMCs)
 Atom Silvermont programmable PMCs support the following events:
 .Bl -tag -width indent
 .It Li REHABQ.LD_BLOCK_ST_FORWARD
 .Pq Event 03H , Umask 01H
 The number of retired loads that were
 prohibited from receiving forwarded data from the store
 because of address mismatch.
 .It Li REHABQ.LD_BLOCK_STD_NOTREADY
 .Pq Event 03H , Umask 02H
 The cases where a forward was technically possible,
 but did not occur because the store data was not available
 at the right time.
 .It Li REHABQ.ST_SPLITS
 .Pq Event 03H , Umask 04H
 The number of retire stores that experienced.
 cache line boundary splits.
 .It Li REHABQ.LD_SPLITS
 .Pq Event 03H , Umask 08H
 The number of retire loads that experienced.
 cache line boundary splits.
 .It Li REHABQ.LOCK
 .Pq Event 03H , Umask 10H
 The number of retired memory operations with lock semantics.
 These are either implicit locked instructions such as the
 XCHG instruction or instructions with an explicit LOCK
 prefix (0xF0).
 .It Li REHABQ.STA_FULL
 .Pq Event 03H , Umask 20H
 The number of retired stores that are delayed
 because there is not a store address buffer available.
 .It Li REHABQ.ANY_LD
 .Pq Event 03H , Umask 40H
 The number of load uops reissued from Rehabq.
 .It Li REHABQ.ANY_ST
 .Pq Event 03H , Umask 80H
 The number of store uops reissued from Rehabq.
 .It Li MEM_UOPS_RETIRED.L1_MISS_LOADS
 .Pq Event 04H , Umask 01H
 The number of load ops retired that miss in L1
 Data cache.
 Note that prefetch misses will not be counted.
 .It Li MEM_UOPS_RETIRED.L2_HIT_LOADS
 .Pq Event 04H , Umask 02H
 The number of load micro-ops retired that hit L2.
 .It Li MEM_UOPS_RETIRED.L2_MISS_LOADS
 .Pq Event 04H , Umask 04H
 The number of load micro-ops retired that missed L2.
 .It Li MEM_UOPS_RETIRED.DTLB_MISS_LOADS
 .Pq Event 04H , Umask 08H
 The number of load ops retired that had DTLB miss.
 .It Li MEM_UOPS_RETIRED.UTLB_MISS
 .Pq Event 04H , Umask 10H
 The number of load ops retired that had UTLB miss.
 .It Li MEM_UOPS_RETIRED.HITM
 .Pq Event 04H , Umask 20H
 The number of load ops retired that got data
 from the other core or from the other module.
 .It Li MEM_UOPS_RETIRED.ALL_LOADS
 .Pq Event 04H , Umask 40H
 The number of load ops retired.
 .It Li MEM_UOP_RETIRED.ALL_STORES
 .Pq Event 04H , Umask 80H
 The number of store ops retired.
 .It Li PAGE_WALKS.D_SIDE_CYCLES
 .Pq Event 05H , Umask 01H
 Every cycle when a D-side (walks due to a load) page walk is in progress.
 Page walk duration divided by number of page walks is the average duration of
 page-walks.
 Edge trigger bit must be cleared.
 Set Edge to count the number of page walks.
 .It Li PAGE_WALKS.I_SIDE_CYCLES
 .Pq Event 05H , Umask 02H
 Every cycle when a I-side (walks due to an instruction fetch) page walk is in
 progress.
 Page walk duration divided by number of page walks is the average duration of
 page-walks.
 .It Li PAGE_WALKS.WALKS
 .Pq Event 05H , Umask 03H
 The number of times a data (D) page walk or an instruction (I) page walk is
 completed or started.
 Since a page walk implies a TLB miss, the number of TLB misses can be counted
 by counting the number of pagewalks.
 .It Li LONGEST_LAT_CACHE.MISS
 .Pq Event 2EH , Umask 41H
 the total number of L2 cache references and the number of L2 cache misses
 respectively.
 L3 is not supported in Silvermont microarchitecture.
 .It Li LONGEST_LAT_CACHE.REFERENCE
 .Pq Event 2EH , Umask 4FH
 The number of requests originating from the core that
 references a cache line in the L2 cache.
 L3 is not supported in Silvermont microarchitecture.
 .It Li L2_REJECT_XQ.ALL
 .Pq Event 30H , Umask 00H
 The number of demand and prefetch
 transactions that the L2 XQ rejects due to a full or near full
 condition which likely indicates back pressure from the IDI link.
 The XQ may reject transactions from the L2Q (non-cacheable
 requests), BBS (L2 misses) and WOB (L2 write-back victims)
 .It Li CORE_REJECT_L2Q.ALL
 .Pq Event 31H , Umask 00H
 The number of demand and L1 prefetcher
 requests rejected by the L2Q due to a full or nearly full condition which
 likely indicates back pressure from L2Q.
 It also counts requests that would have gone directly to the XQ, but are
 rejected due to a full or nearly full condition, indicating back pressure from
 the IDI link.
 The L2Q may also reject transactions from a core to insure fairness between
 cores, or to delay a core's dirty eviction when the address conflicts incoming
 external snoops.
 (Note that L2 prefetcher requests that are dropped are not counted by this
 event).
 .It Li CPU_CLK_UNHALTED.CORE_P
 .Pq Event 3CH , Umask 00H
 The number of core cycles while the core is not in a halt state.
 The core enters the halt state when it is running the HLT instruction.
 In mobile systems the core frequency may change from time to time.
 For this reason this event may have a changing ratio with regards to time.
 .It Li CPU_CLK_UNHALTED.REF_P
 .Pq Event 3CH , Umask 01H
 The number of reference cycles that the core is not in a halt state.
 The core enters the halt state when it is running the HLT instruction.
 In mobile systems the core frequency may change from time.
 This event is not affected by core frequency changes but counts as if the core
 is running at the maximum frequency all the time.
 .It Li ICACHE.HIT
 .Pq Event 80H , Umask 01H
 The number of instruction fetches from the instruction cache.
 .It Li ICACHE.MISSES
 .Pq Event 80H , Umask 02H
 The number of instruction fetches that miss the Instruction cache or produce
 memory requests.
 This includes uncacheable fetches.
 An instruction fetch miss is counted only once and not once for every cycle
 it is outstanding.
 .It Li ICACHE.ACCESSES
 .Pq Event 80H , Umask 03H
 The number of instruction fetches, including uncacheable fetches.
 .It Li NIP_STALL.ICACHE_MISS
 .Pq Event B6H , Umask 04H
 The number of cycles the NIP stalls because of an icache miss.
 This is a cumulative count of cycles the NIP stalled for all
 icache misses.
 .It Li OFFCORE_RESPONSE_0
 .Pq Event B7H , Umask 01H
 Requires MSR_OFFCORE_RESP0 to specify request type and response.
 .It Li OFFCORE_RESPONSE_1
 .Pq Event B7H , Umask 02H
 Requires MSR_OFFCORE_RESP  to specify request type and response.
 .It Li INST_RETIRED.ANY_P
 .Pq Event C0H , Umask 00H
 The number of instructions that retire execution.
 For instructions that consist of multiple micro-ops, this event counts the
 retirement of the last micro-op of the instruction.
 The counter continues counting during hardware interrupts, traps, and inside
 interrupt handlers.
 .It Li UOPS_RETIRED.MS
 .Pq Event C2H , Umask 01H
 The number of micro-ops retired that were supplied from MSROM.
 .It Li UOPS_RETIRED.ALL
 .Pq Event C2H , Umask 10H
 The number of micro-ops retired.
 .It Li MACHINE_CLEARS.SMC
 .Pq Event C3H , Umask 01H
 The number of times that a program writes to a code section.
 Self-modifying code causes a severe penalty in all Intel
 architecture processors.
 .It Li MACHINE_CLEARS.MEMORY_ORDERING
 .Pq Event C3H , Umask 02H
 The number of times that pipeline was cleared due to memory
 ordering issues.
 .It Li MACHINE_CLEARS.FP_ASSIST
 .Pq Event C3H , Umask 04H
 The number of times that pipeline stalled due to FP operations
 needing assists.
 .It Li MACHINE_CLEARS.ALL
 .Pq Event C3H , Umask 08H
 The number of times that pipeline stalled due to due to any causes
 (including SMC, MO, FP assist, etc).
 .It Li BR_INST_RETIRED.ALL_BRANCHES
 .Pq Event C4H , Umask 00H
 The number of branch instructions retired.
 .It Li BR_INST_RETIRED.JCC
 .Pq Event C4H , Umask 7EH
 The number of branch instructions retired that were conditional
 jumps.
 .It Li BR_INST_RETIRED.FAR_BRANCH
 .Pq Event C4H , Umask BFH
 The number of far branch instructions retired.
 .It Li BR_INST_RETIRED.NON_RETURN_IND
 .Pq Event C4H , Umask EBH
 The number of branch instructions retired that were near indirect
 call or near indirect jmp.
 .It Li BR_INST_RETIRED.RETURN
 .Pq Event C4H , Umask F7H
 The number of near RET branch instructions retired.
 .It Li BR_INST_RETIRED.CALL
 .Pq Event C4H , Umask F9H
 The number of near CALL branch instructions retired.
 .It Li BR_INST_RETIRED.IND_CALL
 .Pq Event C4H , Umask FBH
 The number of near indirect CALL branch instructions retired.
 .It Li BR_INST_RETIRED.REL_CALL
 .Pq Event C4H , Umask FDH
 The number of near relative CALL branch instructions retired.
 .It Li BR_INST_RETIRED.TAKEN_JCC
 .Pq Event C4H , Umask FEH
 The number of branch instructions retired that were conditional
 jumps and predicted taken.
 .It Li BR_MISP_RETIRED.ALL_BRANCHES
 .Pq Event C5H , Umask 00H
 The number of mispredicted branch instructions retired.
 .It Li BR_MISP_RETIRED.JCC
 .Pq Event C5H , Umask 7EH
 The number of mispredicted branch instructions retired that were
 conditional jumps.
 .It Li BR_MISP_RETIRED.FAR
 .Pq Event C5H , Umask BFH
 The number of mispredicted far branch instructions retired.
 .It Li BR_MISP_RETIRED.NON_RETURN_IND
 .Pq Event C5H , Umask EBH
 The number of mispredicted branch instructions retired that were
 near indirect call or near indirect jmp.
 .It Li BR_MISP_RETIRED.RETURN
 .Pq Event C5H , Umask F7H
 The number of mispredicted near RET branch instructions retired.
 .It Li BR_MISP_RETIRED.CALL
 .Pq Event C5H , Umask F9H
 The number of mispredicted near CALL branch instructions retired.
 .It Li BR_MISP_RETIRED.IND_CALL
 .Pq Event C5H , Umask FBH
 The number of mispredicted near indirect CALL branch instructions
 retired.
 .It Li BR_MISP_RETIRED.REL_CALL
 .Pq Event C5H , Umask FDH
 The number of mispredicted near relative CALL branch instructions
 retired.
 .It Li BR_MISP_RETIRED.TAKEN_JCC
 .Pq Event C5H , Umask FEH
 The number of mispredicted branch instructions retired that were
 conditional jumps and predicted taken.
 .It Li NO_ALLOC_CYCLES.ROB_FULL
 .Pq Event CAH , Umask 01H
 The number of cycles when no uops are allocated and the ROB is full
 (less than 2 entries available).
 .It Li NO_ALLOC_CYCLES.RAT_STALL
 .Pq Event CAH , Umask 20H
 The number of cycles when no uops are allocated and a RATstall is
 asserted.
 .It Li NO_ALLOC_CYCLES.ALL
 .Pq Event CAH , Umask 3FH
 The number of cycles when the front-end does not provide any
 instructions to be allocated for any reason.
 .It Li NO_ALLOC_CYCLES.NOT_DELIVERED
 .Pq Event CAH , Umask 50H
 The number of cycles when the front-end does not provide any
 instructions to be allocated but the back end is not stalled.
 .It Li RS_FULL_STALL.MEC
 .Pq Event CBH , Umask 01H
 The number of cycles the allocation pipe line stalled due to
 the RS for the MEC cluster is full.
 .It Li RS_FULL_STALL.ALL
 .Pq Event CBH , Umask 1FH
 The number of cycles that the allocation pipe line stalled due
 to any one of the RS is full.
 .It Li CYCLES_DIV_BUSY.ANY
 .Pq Event CDH , Umask 01H
 The number of cycles the divider is busy.
 .It Li BACLEARS.ALL
 .Pq Event E6H , Umask 01H
 The number of baclears for any type of branch.
 .It Li BACLEARS.RETURN
 .Pq Event E6H , Umask 08H
 The number of baclears for return branches.
 .It Li BACLEARS.COND
 .Pq Event E6H , Umask 10H
 The number of baclears for conditional branches.
 .It Li MS_DECODED.MS_ENTRY
 .Pq Event E7H , Umask 01H)
 The number of times the MSROM starts a flow of UOPS.
 .El
 .Sh SEE ALSO
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.core2 3 ,
 .Xr pmc.iaf 3 ,
-.Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
 .Sh HISTORY
 The
 .Nm pmc
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
 .An -nosplit
 The
 .Lb libpmc
 library was written by
 .An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
 The support for the Atom Silvermont
 microarchitecture was written by
 .An Hiren Panchasara Aq Mt hiren@FreeBSD.org .
diff --git a/lib/libpmc/pmc.cmn-600.3 b/lib/libpmc/pmc.cmn-600.3
index fc137d2df48e..1fa75a674c0b 100644
--- a/lib/libpmc/pmc.cmn-600.3
+++ b/lib/libpmc/pmc.cmn-600.3
@@ -1,592 +1,591 @@
 .\" Copyright (c) 2021 ARM Ltd.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .Dd December 19, 2021
 .Dt PMC.CMN-600 3
 .Os
 .Sh NAME
 .Nm pmc.cmn-600
 .Nd Library for accessing the Arm CoreLink CMN-600 Coherent Mesh Network
 Controller performance counter events
 .Sh LIBRARY
 .Lb libpmc
 .Sh SYNOPSIS
 .In pmc.h
 .Sh DESCRIPTION
 CMN-600 PMU counters may be configured to count any one of a defined set of
 hardware events.
 Unlike other performance counters, counters for the CMN-600 require the
 node ID to set up.
 .Pp
 Node ID information currently can be obtained one of two ways.
 Using bootverbose, for example set sysctl debug.bootverbose=1 and then load the
 .Xr hwpmc 4
 KLD module.
 The cmn600 module will be loaded automatically as a dependency:
 .Dl $ sysctl debug.bootverbose=1
 .Dl $ kldload hwpmc
 Another way is to use sysctl to trigger
 dump of nodes tree to system console:
 .Dl $ sysctl dev.cmn600.0.dump_nodes=1
 .Pp
 Some BIOS versions of dual-socket machines have no NUMA domain information in
 ACPI.
 In such cases, to get more accurate events statistics, set the kernel
 environment variable hint.cmn600.{unit}.domain={value}.
 Where {unit} is a cmn600 device unit number and {value} is the NUMA domain of
 the CPU package containing that CMN-600 controller.
 Example:
 .Dl $ kenv hint.cmn600.0.domain=0
 .Dl $ kenv hint.cmn600.1.domain=1
 .Dl $ kldunload hwpmc cmn600
 .Dl $ kldload hwpmc
 .Pp
 Arm CoreLink CMN-600 Coherent Mesh Network Controller performance counters are
 documented in
 .Rs
 .%B "Arm CoreLink CMN-600 Coherent Mesh Network Technical Reference Manual"
 .%T "Revision: r3p2"
 .%D 2020
 .%Q "ARM Limited"
 .Re
 .Ss PMC Capabilities
 CMN-600 PMU counters support the following capabilities:
 .Bl -column "PMC_CAP_INTERRUPT" "Support"
 .It Sy Capability Ta Em Support
 .It PMC_CAP_CASCADE Ta \&No
 .It PMC_CAP_EDGE Ta \&No
 .It PMC_CAP_INTERRUPT Ta Yes
 .It PMC_CAP_INVERT Ta \&No
 .It PMC_CAP_READ Ta Yes
 .It PMC_CAP_PRECISE Ta \&No
 .It PMC_CAP_SYSTEM Ta Yes
 .It PMC_CAP_TAGGING Ta \&No
 .It PMC_CAP_THRESHOLD Ta Yes
 .It PMC_CAP_USER Ta \&No
 .It PMC_CAP_WRITE Ta Yes
 .El
 .Ss Event Qualifiers
 Event specifiers for these PMCs support the following common
 qualifiers:
 .Bl -tag -width indent
 .It Li nodeid= Ns Ar nodeid
 Request counting for specific event at node
 .Ar nodeid .
 .It Li occupancy= Ns Ar value
 Filtering by occupancy type.
 .It Li xpport= Ns Ar port
 Count only events matched by
 .Ar port .
 (East, West, North, South, devport0, devport1 or numeric 0 to 5)
 .It Li xpchannel= Ns Ar channel
 Filter events by XP node channel.
 (REQ, RSP, SNP, DAT or 0, 1, 2, 3)
 .El
 .Ss Class Name Prefix
 These PMCs are named using a class name prefix of
 .Dq Li CMN600_PMU_ .
 .Ss Event Specifiers
 The following list of PMC events are available:
 .Ss DVM node events
 .Bl -tag -width indent
 .It Sy dn_rxreq_dvmop
 Number of DVMOP requests received.
 This includes all the sub-types include TLB invalidate, Branch predictor
 invalidate, instruction cache (physical and virtual) invalidate.
 .It Sy dn_rxreq_dvmsync
 Number of DVM Sync requests received.
 .It Sy dn_rxreq_dvmop_vmid_filtered
 Number of incoming DVMOP requests that are subject to VMID based filtering.
 This is a measure of the effectiveness of VMID based filtering and potential
 reduction in DVM snoops.
 .It Sy dn_rxreq_retried
 Number of incoming requests that are retried.
 This is a measure of the retry rate.
 .It Sy dn_rxreq_trk_occupancy
 Counts the tracker occupancy in DN. "occupancy": All, dvmop, dvmsync
 .It Sy dn_rxreq_tlbi_dvmop
 Number of DVMOP TLB invalidate requests received.
 .It Sy dn_rxreq_bpi_dvmop
 Number of DVMOP Branch predictor invalidate requests received.
 .It Sy dn_rxreq_pici_dvmop
 Number of DVMOP physical instruction cache invalidate requests received.
 .It Sy dn_rxreq_vivi_dvmop
 Number of DVMOP virtual instruction cache invalidate requests received.
 .It Sy dn_rxreq_dvmop_other_filtered
 Number of DVM op requests to RNDs, BPI or PICI/VICI, that were filtered
 .It Sy dn_rxreq_snp_sent
 Number of SNPs sent to RNs
 .It Sy dn_rxreq_snp_stalled
 Number of SNPs stalled to RNs due to lack of Crds
 .It Sy dn_rxreq_trk_full
 DVM tracker full counter
 .El
 .Ss HN-F node events
 .Bl -tag -width indent
 .It Sy hnf_cache_miss
 Counts total cache misses in first lookup result (high priority)
 .It Sy hnf_slc_sf_cache_access
 Counts number of cache accesses in first access (high priority)
 .It Sy hnf_cache_fill
 Counts total allocations in HN SLC (all cache line allocations to SLC)
 .It Sy hnf_pocq_retry
 Counts number of retried requests
 .It Sy hnf_pocq_reqs_recvd
 Counts number of requests received by HN
 .It Sy hnf_sf_hit
 Counts number of SF hits
 .It Sy hnf_sf_evictions
 Counts number of SF eviction cache invalidations initiated
 .It Sy hnf_dir_snoops_sent
 Counts number of directed snoops sent (not including SF back invalidation)
 .It Sy hnf_brd_snoops_sent
 Counts number of multicast snoops sent (not including SF back invalidation)
 .It Sy hnf_slc_eviction
 Counts number of SLC evictions (dirty only)
 .It Sy hnf_slc_fill_invalid_way
 Counts number of SLC fills to an invalid way
 .It Sy hnf_mc_retries
 Counts number of retried transactions by the MC
 .It Sy hnf_mc_reqs
 Counts number of requests sent to MC
 .It Sy hnf_qos_hh_retry
 Counts number of times a HighHigh priority request is protocol-retried at the
 HN-F
 .It Sy hnf_qos_pocq
 Counts the POCQ occupancy in HN-F.
 Support argument "occupancy". Accept: All, Read, Write, Atomic, Stash.
 Default: All.
 .It Sy hnf_pocq_addrhaz
 Counts number of POCQ address hazards upon allocation
 .It Sy hnf_pocq_atomic_addrhaz
 Counts number of POCQ address hazards upon allocation for atomic operations
 .It Sy hnf_ld_st_swp_adq_full
 Counts number of times ADQ is full for Ld/St/SWP type atomic operations while
 POCQ has pending operations
 .It Sy hnf_cmp_adq_full
 Counts number of times ADQ is full for CMP type atomic operations while POCQ
 has pending operations
 .It Sy hnf_txdat_stall
 Counts number of times HN-F has a pending TXDAT flit but no credits to upload
 .It Sy hnf_txrsp_stall
 Counts number of times HN-F has a pending TXRSP flit but no credits to upload
 .It Sy hnf_seq_full
 Counts number of times requests are replayed in SLC pipe due to SEQ being full
 .It Sy hnf_seq_hit
 Counts number of times a request in SLC hit a pending SF eviction in SEQ
 .It Sy hnf_snp_sent
 Counts number of snoops sent including directed, multicast, and SF back
 invalidation
 .It Sy hnf_sfbi_dir_snp_sent
 Counts number of times directed snoops were sent due to SF back invalidation
 .It Sy hnf_sfbi_brd_snp_sent
 Counts number of times multicast snoops were sent due to SF back invalidation
 .It Sy hnf_snp_sent_untrk
 Counts number of times snooped were sent due to untracked RNF's
 .It Sy hnf_intv_dirty
 Counts number of times SF back invalidation resulted in dirty line intervention
 from the RN
 .It Sy hnf_stash_snp_sent
 Counts number of times stash snoops were sent
 .It Sy hnf_stash_data_pull
 Counts number of times stash snoops resulted in data pull from the RN
 .It Sy hnf_snp_fwded
 Counts number of times data forward snoops were sent
 .El
 .Ss HN-I node events
 .Bl -tag -width indent
 .It Sy hni_rrt_rd_occ_cnt_ovfl
 RRT read occupancy count overflow
 .It Sy hni_rrt_wr_occ_cnt_ovfl
 RRT write occupancy count overflow
 .It Sy hni_rdt_rd_occ_cnt_ovfl
 RDT read occupancy count overflow
 .It Sy hni_rdt_wr_occ_cnt_ovfl
 RDT write occupancy count overflow
 .It Sy hni_wdb_occ_cnt_ovfl
 WDB occupancy count overflow
 .It Sy hni_rrt_rd_alloc
 RRT read allocation
 .It Sy hni_rrt_wr_alloc
 RRT write allocation
 .It Sy hni_rdt_rd_alloc
 RDT read allocation
 .It Sy hni_rdt_wr_alloc
 RDT write allocation
 .It Sy hni_wdb_alloc
 WDB allocation
 .It Sy hni_txrsp_retryack
 RETRYACK TXRSP flit sent
 .It Sy hni_arvalid_no_arready
 ARVALID set without ARREADY event
 .It Sy hni_arready_no_arvalid
 ARREADY set without ARVALID event
 .It Sy hni_awvalid_no_awready
 AWVALID set without AWREADY event
 .It Sy hni_awready_no_awvalid
 AWREADY set without AWVALID event
 .It Sy hni_wvalid_no_wready
 WVALID set without WREADY event
 .It Sy hni_txdat_stall
 TXDAT stall (TXDAT valid but no link credit available)
 .It Sy hni_nonpcie_serialization
 Non-PCIe serialization event
 .It Sy hni_pcie_serialization
 PCIe serialization event
 .El
 .Ss XP node events
 .Bl -tag -width indent
 .It Sy xp_txflit_valid
 Number of flits transmitted on a specified port and CHI channel.
 This is a measure of the flit transfer bandwidth from an XP.
 Note: On device ports, this event also includes link flit transfers.
 .It Sy xp_txflit_stall
 Number of cycles when a flit is stalled at an XP waiting for link credits at a
 specified port and CHI channel.
 This is a measure of the flit traffic congestion on the mesh and at the flit
 download ports.
 .It Sy xp_partial_dat_flit
 Number of times when a partial DAT flit is uploaded onto the mesh from a
 RN-F_CHIA port.
 Partial DAT flit transmission occurs when XP is not able to combine two 128b
 DAT flits and send them over the 256b DAT channel.
 This can happen under 2 circumstances:
 1. Only one 128b DAT flit is received within a transmission time window.
 2. Two 128b DAT flits are received but they are not two halves of a
    single 256b word.
 .El
 .Ss SBSX node events
 .Bl -tag -width indent
 .It Sy sbsx_rd_req
 Read request
 .It Sy sbsx_wr_req
 Write request
 .It Sy sbsx_cmo_req
 CMO request
 .It Sy sbsx_txrsp_retryack
 RETRYACK TXRSP flit sent
 .It Sy sbsx_txdat_flitv
 TXDAT flit seen
 .It Sy sbsx_txrsp_flitv
 TXRSP flit seen
 .It Sy sbsx_rd_req_trkr_occ_cnt_ovfl
 Read request tracker occupancy count overflow
 .It Sy sbsx_wr_req_trkr_occ_cnt_ovfl
 Write request tracker occupancy count overflow
 .It Sy sbsx_cmo_req_trkr_occ_cnt_ovfl
 CMO request tracker occupancy count overflow
 .It Sy sbsx_wdb_occ_cnt_ovfl
 WDB occupancy count overflow
 .It Sy sbsx_rd_axi_trkr_occ_cnt_ovfl
 Read AXI pending tracker occupancy count overflow
 .It Sy sbsx_cmo_axi_trkr_occ_cnt_ovfl
 CMO AXI pending tracker occupancy count overflow
 .It Sy sbsx_arvalid_no_arready
 ARVALID set without ARREADY
 .It Sy sbsx_awvalid_no_awready
 AWVALID set without AWREADY
 .It Sy sbsx_wvalid_no_wready
 WVALID set without WREADY
 .It Sy sbsx_txdat_stall
 TXDAT stall (TXDAT valid but no link credit available)
 .It Sy sbsx_txrsp_stall
 TXRSP stall (TXRSP valid but no link credit available)
 .El
 .Ss RN-D node events
 .Bl -tag -width indent
 .It Sy rnd_s0_rdata_beats
 Number of RData beats, RVALID and RREADY, dispatched on port 0.
 This is a measure of the read bandwidth, including CMO responses.
 .It Sy rnd_s1_rdata_beats
 Number of RData beats, RVALID and RREADY, dispatched on port 1.
 This is a measure of the read bandwidth, including CMO responses.
 .It Sy rnd_s2_rdata_beats
 Number of RData beats, RVALID and RREADY, dispatched on port 2.
 This is a measure of the read bandwidth, including CMO responses.
 .It Sy rnd_rxdat_flits
 Number of RXDAT flits received.
 This is a measure of the true read data bandwidth, excluding CMOs.
 .It Sy rnd_txdat_flits
 Number of TXDAT flits dispatched.
 This is a measure of the write bandwidth.
 .It Sy rnd_txreq_flits_total
 Number of TXREQ flits dispatched.
 This is a measure of the total request
 bandwidth.
 .It Sy rnd_txreq_flits_retried
 Number of retried TXREQ flits dispatched.
 This is a measure of the retry rate.
 .It Sy rnd_rrt_occ_ovfl
 All entries in the read request tracker are occupied.
 This is a measure of oversubscription in the read request tracker.
 .It Sy rnd_wrt_occ_ovfl
 All entries in the write request tracker are occupied.
 This is a measure of oversubscription in the write request tracker.
 .It Sy rnd_txreq_flits_replayed
 Number of replayed TXREQ flits.
 This is the measure of replay rate.
 .It Sy rnd_wrcancel_sent
 Number of write data cancels sent.
 This is the measure of write cancel rate.
 .It Sy rnd_s0_wdata_beats
 Number of WData beats, WVALID and WREADY, dispatched on port 0.
 This is a measure of write bandwidth on AXI port 0.
 .It Sy rnd_s1_wdata_beats
 Number of WData beats, WVALID and WREADY, dispatched on port 1.
 This is a measure of write bandwidth on AXI port 1.
 .It Sy rnd_s2_wdata_beats
 Number of WData beats, WVALID and WREADY, dispatched on port 2.
 This is a measure of write bandwidth on AXI port 2.
 .It Sy rnd_rrt_alloc
 Number of allocations in the read request tracker.
 This is a measure of read transaction count.
 .It Sy rnd_wrt_alloc
 Number of allocations in the write request tracker.
 This is a measure of write transaction count.
 .It Sy rnd_rdb_unord
 Number of cycles for which Read Data Buffer state machine is in Unordered Mode.
 .It Sy rnd_rdb_replay
 Number of cycles for which Read Data Buffer state machine is in Replay mode
 .It Sy rnd_rdb_hybrid
 Number of cycles for which Read Data Buffer state machine is in hybrid mode.
 Hybrid mode is where there is mix of ordered/unordered traffic.
 .It Sy rnd_rdb_ord
 Number of cycles for which Read Data Buffer state machine is in ordered Mode.
 .El
 .Ss RN-I node events
 .Bl -tag -width indent
 .It Sy rni_s0_rdata_beats
 Number of RData beats, RVALID and RREADY, dispatched on port 0.
 This is a measure of the read bandwidth, including CMO responses.
 .It Sy rni_s1_rdata_beats
 Number of RData beats, RVALID and RREADY, dispatched on port 1.
 This is a measure of the read bandwidth, including CMO responses.
 .It Sy rni_s2_rdata_beats
 Number of RData beats, RVALID and RREADY, dispatched on port 2.
 This is a measure of the read bandwidth, including CMO responses.
 .It Sy rni_rxdat_flits
 Number of RXDAT flits received.
 This is a measure of the true read data bandwidth, excluding CMOs.
 .It Sy rni_txdat_flits
 Number of TXDAT flits dispatched.
 This is a measure of the write bandwidth.
 .It Sy rni_txreq_flits_total
 Number of TXREQ flits dispatched.
 This is a measure of the total request bandwidth.
 .It Sy rni_txreq_flits_retried
 Number of retried TXREQ flits dispatched.
 This is a measure of the retry rate.
 .It Sy rni_rrt_occ_ovfl
 All entries in the read request tracker are occupied.
 This is a measure of oversubscription in the read request tracker.
 .It Sy rni_wrt_occ_ovfl
 All entries in the write request tracker are occupied.
 This is a measure of oversubscription in the write request tracker.
 .It Sy rni_txreq_flits_replayed
 Number of replayed TXREQ flits.
 This is the measure of replay rate.
 .It Sy rni_wrcancel_sent
 Number of write data cancels sent.
 This is the measure of write cancel rate
 .It Sy rni_s0_wdata_beats
 Number of WData beats, WVALID and WREADY, dispatched on port 0.
 This is a measure of write bandwidth on AXI port 0.
 .It Sy rni_s1_wdata_beats
 Number of WData beats, WVALID and WREADY, dispatched on port 1.
 This is a measure of write bandwidth on AXI port 1.
 .It Sy rni_s2_wdata_beats
 Number of WData beats, WVALID and WREADY, dispatched on port 2.
 This is a measure of write bandwidth on AXI port 2.
 .It Sy rni_rrt_alloc
 Number of allocations in the read request tracker.
 This is a measure of read transaction count.
 .It Sy rni_wrt_alloc
 Number of allocations in the write request tracker.
 This is a measure of write transaction count
 .It Sy rni_rdb_unord
 Number of cycles for which Read Data Buffer state machine is in Unordered Mode.
 .It Sy rni_rdb_replay
 Number of cycles for which Read Data Buffer state machine is in Replay mode
 .It Sy rni_rdb_hybrid
 Number of cycles for which Read Data Buffer state machine is in hybrid mode.
 Hybrid mode is where there is mix of ordered/unordered traffic.
 .It Sy rni_rdb_ord
 Number of cycles for which Read Data Buffer state machine is in ordered Mode.
 .El
 .Ss CXHA node events
 .Pq Note: CXHA events descriptions are guessed
 .Bl -tag -width indent
 .It Sy cxha_rddatbyp
 Number of Read DAT Bypass
 .It Sy cxha_chirsp_up_stall
 Number of CHI RSP up Stall
 .It Sy cxha_chidat_up_stall
 Number of CHI DAT up Stall
 .It Sy cxha_snppcrd_lnk0_stall
 Number of Snoop Pcrd Stall on Link 0
 .It Sy cxha_snppcrd_lnk1_stall
 Number of Snoop Pcrd Stall on Link 1
 .It Sy cxha_snppcrd_lnk2_stall
 Number of Snoop Pcrd Stall on Link 2
 .It Sy cxha_reqtrk_occ
 Request Tracker Occupancy
 .It Sy cxha_rdb_occ
 Read Data Buffer Occupancy
 .It Sy cxha_rdbbyp_occ
 Read Data Buffer Bypass Occupancy
 .It Sy cxha_wdb_occ
 Write Data Buffer Occupancy
 .It Sy cxha_snptrk_occ
 Snoop Tracker Occupancy
 .It Sy cxha_sdb_occ
 SDB Occupancy
 .It Sy cxha_snphaz_occ
 Snoop Hazard Occupancy
 .El
 .Ss CXRA node events
 .Bl -tag -width indent
 .It Sy cxra_req_trk_occ
 Request tracker occupancy
 .It Sy cxra_snp_trk_occ
 Snoop tracker occupancy
 .It Sy cxra_rd_dat_buf_occ
 Read data buffer occupancy
 .It Sy cxra_wr_dat_buf_occ
 Write data buffer occupancy
 .It Sy cxra_snp_sink_buf_occ
 Snoop sink buffer occupancy
 .It Sy cxra_snp_bcasts
 Snoop broadcasts
 .It Sy cxra_req_chains
 Number of request chains formed larger than one
 .It Sy cxra_req_chain_avg_len
 Average size of request chains, only for chain sizes larger than one
 .It Sy cxra_chi_rsp_upload_stalls
 Local RA upload stalls to CHI because of contention with HA
 .It Sy cxra_chi_dat_upload_stalls
 Local RA upload stalls to CHI because of contention with HA
 .It Sy cxra_dat_pcrd_stalls_lnk0
 Memory Data Request available, but no DAT Pcrd to send over CCIX per LinkEnd 0
 .It Sy cxra_dat_pcrd_stalls_lnk1
 Memory Data Request available, but no DAT Pcrd to send over CCIX per LinkEnd 1
 .It Sy cxra_dat_pcrd_stalls_lnk2
 Memory Data Request available, but no DAT Pcrd to send over CCIX per LinkEnd 2
 .It Sy cxra_req_pcrd_stalls_lnk0
 Memory Data Request available but no Req Pcrd to send over CCIX per LinkEnd 0
 .It Sy cxra_req_pcrd_stalls_lnk1
 Memory Data Request available but no Req Pcrd to send over CCIX per LinkEnd 1
 .It Sy cxra_req_pcrd_stalls_lnk2
 Memory Data Request available but no Req Pcrd to send over CCIX per LinkEnd 2
 .It Sy cxra_ext_rsp_stall
 CHI external RSP stall
 .It Sy cxra_ext_dat_stall
 CHI external DAT stall
 .El
 .Ss CXLA node events
 .Bl -tag -width indent
 .It Sy cxla_rx_tlp_link0
 RX TLP for Link 0
 .It Sy cxla_rx_tlp_link1
 RX TLP for Link 1
 .It Sy cxla_rx_tlp_link2
 RX TLP for Link 2
 .It Sy cxla_tx_tlp_link0
 TX TLP for Link 0
 .It Sy cxla_tx_tlp_link1
 TX TLP for Link 1
 .It Sy cxla_tx_tlp_link2
 TX TLP for Link 2
 .It Sy cxla_rx_cxs_link0
 RX CXS for Link 0
 .It Sy cxla_rx_cxs_link1
 RX CXS for Link 1
 .It Sy cxla_rx_cxs_link2
 RX CXS for Link 2
 .It Sy cxla_tx_cxs_link0
 TX CXS for Link 0
 .It Sy cxla_tx_cxs_link1
 TX CXS for Link 1
 .It Sy cxla_tx_cxs_link2
 TX CXS for Link 2
 .It Sy cxla_avg_rx_tlp_sz_dws
 Average RX TLP size in DWs
 .It Sy cxla_avg_tx_tlp_sz_dws
 Average TX TLP size in DWs
 .It Sy cxla_avg_rx_tlp_sz_ccix_msg
 Average RX TLP size in CCIX messages
 .It Sy cxla_avg_tx_tlp_sz_ccix_msg
 Average TX TLP size in CCIX messages
 .It Sy cxla_avg_sz_rx_cxs_dw_beat
 Average size of RX CXS in DWs within a beat
 .It Sy cxla_avg_sz_tx_cxs_dw_beat
 Average size of TX CXS in DWs within a beat
 .It Sy cxla_tx_cxs_link_credit_backpressure
 TX CXS link credit backpressure
 .It Sy cxla_rx_tlp_buffer_full
 RX TLP buffer full and backpressured
 .It Sy cxla_tx_tlp_buffer_full
 TX TLP buffer full and backpressured
 .It Sy cxla_avg_latency_process_rx_tlp
 Average latency to process an RX TLP
 .It Sy cxla_avg_latency_form_tx_tlp
 Average latency to form a TX TLP
 .El
 .Sh SEE ALSO
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.core2 3 ,
 .Xr pmc.corei7 3 ,
 .Xr pmc.corei7uc 3 ,
 .Xr pmc.iaf 3 ,
 .Xr pmc.iaf 3 ,
-.Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
 .Xr pmc.westmere 3 ,
 .Xr pmc.westmereuc 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
 .Sh HISTORY
 The
 .Nm pmc
 library first appeared in
 .Fx 6.0 .
 .br
 The
 .Nm pmc.cmn-600
 driver was added in
 .Fx 14.0 .
 .Sh AUTHORS
 .An -nosplit
 The
 .Lb libpmc
 library was written by
 .An Joseph Koshy Aq Mt jkoshy@FreeBSD.org ,
 .An Oleksandr Rybalko Aq Mt ray@FreeBSD.org .
 .br
 The CMN-600 PMU driver was sponsored by ARM Ltd.
 This manual page was written by
 .An Oleksandr Rybalko Aq Mt ray@FreeBSD.org .
diff --git a/lib/libpmc/pmc.core.3 b/lib/libpmc/pmc.core.3
index 43a46633806f..4ee4b4c9235d 100644
--- a/lib/libpmc/pmc.core.3
+++ b/lib/libpmc/pmc.core.3
@@ -1,803 +1,802 @@
 .\" Copyright (c) 2008 Joseph Koshy.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .Dd November 12, 2008
 .Dt PMC.CORE 3
 .Os
 .Sh NAME
 .Nm pmc.core
 .Nd measurement events for
 .Tn Intel
 .Tn Core Solo
 and
 .Tn Core Duo
 family CPUs
 .Sh LIBRARY
 .Lb libpmc
 .Sh SYNOPSIS
 .In pmc.h
 .Sh DESCRIPTION
 .Tn Intel
 .Tn "Core Solo"
 and
 .Tn "Core Duo"
 CPUs contain PMCs conforming to version 1 of the
 .Tn Intel
 performance measurement architecture.
 .Pp
 These PMCs are documented in
 .Rs
 .%B IA-32 Intel\(rg Architecture Software Developer's Manual
 .%T Volume 3: System Programming Guide
 .%N Order Number 253669-027US
 .%D July 2008
 .%Q Intel Corporation
 .Re
 .Ss PMC Features
 CPUs conforming to version 1 of the
 .Tn Intel
 performance measurement architecture contain two programmable PMCs of
 class
 .Li PMC_CLASS_IAP .
 The PMCs are 40 bits width and offer the following capabilities:
 .Bl -column "PMC_CAP_INTERRUPT" "Support"
 .It Em Capability Ta Em Support
 .It PMC_CAP_CASCADE Ta \&No
 .It PMC_CAP_EDGE Ta Yes
 .It PMC_CAP_INTERRUPT Ta Yes
 .It PMC_CAP_INVERT Ta Yes
 .It PMC_CAP_READ Ta Yes
 .It PMC_CAP_PRECISE Ta \&No
 .It PMC_CAP_SYSTEM Ta Yes
 .It PMC_CAP_TAGGING Ta \&No
 .It PMC_CAP_THRESHOLD Ta Yes
 .It PMC_CAP_USER Ta Yes
 .It PMC_CAP_WRITE Ta Yes
 .El
 .Ss Event Qualifiers
 Event specifiers for these PMCs support the following common
 qualifiers:
 .Bl -tag -width indent
 .It Li cmask= Ns Ar value
 Configure the PMC to increment only if the number of configured
 events measured in a cycle is greater than or equal to
 .Ar value .
 .It Li edge
 Configure the PMC to count the number of de-asserted to asserted
 transitions of the conditions expressed by the other qualifiers.
 If specified, the counter will increment only once whenever a
 condition becomes true, irrespective of the number of clocks during
 which the condition remains true.
 .It Li inv
 Invert the sense of comparison when the
 .Dq Li cmask
 qualifier is present, making the counter increment when the number of
 events per cycle is less than the value specified by the
 .Dq Li cmask
 qualifier.
 .It Li os
 Configure the PMC to count events happening at processor privilege
 level 0.
 .It Li usr
 Configure the PMC to count events occurring at privilege levels 1, 2
 or 3.
 .El
 .Pp
 If neither of the
 .Dq Li os
 or
 .Dq Li usr
 qualifiers are specified, the default is to enable both.
 .Pp
 Events that require core-specificity to be specified use a
 additional qualifier
 .Dq Li core= Ns Ar value ,
 where argument
 .Ar value
 is one of:
 .Bl -tag -width indent -compact
 .It Li all
 Measure event conditions on all cores.
 .It Li this
 Measure event conditions on this core.
 .El
 The default is
 .Dq Li this .
 .Pp
 Events that require an agent qualifier to be specified use an
 additional qualifier
 .Dq Li agent= Ns value ,
 where argument
 .Ar value
 is one of:
 .Bl -tag -width indent -compact
 .It Li this
 Measure events associated with this bus agent.
 .It Li any
 Measure events caused by any bus agent.
 .El
 The default is
 .Dq Li this .
 .Pp
 Events that require a hardware prefetch qualifier to be specified use an
 additional qualifier
 .Dq Li prefetch= Ns Ar value ,
 where argument
 .Ar value
 is one of:
 .Bl -tag -width "exclude" -compact
 .It Li both
 Include all prefetches.
 .It Li only
 Only count hardware prefetches.
 .It Li exclude
 Exclude hardware prefetches.
 .El
 The default is
 .Dq Li both .
 .Pp
 Events that require a cache coherence qualifier to be specified use an
 additional qualifier
 .Dq Li cachestate= Ns Ar value ,
 where argument
 .Ar value
 contains one or more of the following letters:
 .Bl -tag -width indent -compact
 .It Li e
 Count cache lines in the exclusive state.
 .It Li i
 Count cache lines in the invalid state.
 .It Li m
 Count cache lines in the modified state.
 .It Li s
 Count cache lines in the shared state.
 .El
 The default is
 .Dq Li eims .
 .Ss Event Specifiers
 The following event names are case insensitive.
 Whitespace, hyphens and underscore characters in these names are
 ignored.
 .Pp
 Core PMCs support the following events:
 .Bl -tag -width indent
 .It Li BAClears
 .Pq Event E6H , Umask 00H
 The number of BAClear conditions asserted.
 .It Li BTB_Misses
 .Pq Event E2H , Umask 00H
 The number of branches for which the branch table buffer did not
 produce a prediction.
 .It Li Br_BAC_Missp_Exec
 .Pq Event 8AH , Umask 00H
 The number of branch instructions executed that were mispredicted at
 the front end.
 .It Li Br_Bogus
 .Pq Event E4H , Umask 00H
 The number of bogus branches.
 .It Li Br_Call_Exec
 .Pq Event 92H , Umask 00H
 The number of
 .Li CALL
 instructions executed.
 .It Li Br_Call_Missp_Exec
 .Pq Event 93H , Umask 00H
 The number of
 .Li CALL
 instructions executed that were mispredicted.
 .It Li Br_Cnd_Exec
 .Pq Event 8BH , Umask 00H
 The number of conditional branch instructions executed.
 .It Li Br_Cnd_Missp_Exec
 .Pq Event 8CH , Umask 00H
 The number of conditional branch instructions executed that were mispredicted.
 .It Li Br_Ind_Call_Exec
 .Pq Event 94H , Umask 00H
 The number of indirect
 .Li CALL
 instructions executed.
 .It Li Br_Ind_Exec
 .Pq Event 8DH , Umask 00H
 The number of indirect branches executed.
 .It Li Br_Ind_Missp_Exec
 .Pq Event 8EH , Umask 00H
 The number of indirect branch instructions executed that were mispredicted.
 .It Li Br_Inst_Exec
 .Pq Event 88H , Umask 00H
 The number of branch instructions executed including speculative branches.
 .It Li Br_Instr_Decoded
 .Pq Event E0H , Umask 00H
 The number of branch instructions decoded.
 .It Li Br_Instr_Ret
 .Pq Event C4H , Umask 00H
 .Pq Alias Qq "Branch Instruction Retired"
 The number of branch instructions retired.
 This is an architectural performance event.
 .It Li Br_MisPred_Ret
 .Pq Event C5H , Umask 00H
 .Pq Alias Qq "Branch Misses Retired"
 The number of mispredicted branch instructions retired.
 This is an architectural performance event.
 .It Li Br_MisPred_Taken_Ret
 .Pq Event CAH , Umask 00H
 The number of taken and mispredicted branches retired.
 .It Li Br_Missp_Exec
 .Pq Event 89H , Umask 00H
 The number of branch instructions executed and mispredicted at
 execution including branches that were not predicted.
 .It Li Br_Ret_BAC_Missp_Exec
 .Pq Event 91H , Umask 00H
 The number of return branch instructions that were mispredicted at the
 front end.
 .It Li Br_Ret_Exec
 .Pq Event 8FH , Umask 00H
 The number of return branch instructions executed.
 .It Li Br_Ret_Missp_Exec
 .Pq Event 90H , Umask 00H
 The number of return branch instructions executed that were mispredicted.
 .It Li Br_Taken_Ret
 .Pq Event C9H , Umask 00H
 The number of taken branches retired.
 .It Li Bus_BNR_Clocks
 .Pq Event 61H , Umask 00H
 The number of external bus cycles while BNR (bus not ready) was asserted.
 .It Li Bus_DRDY_Clocks Op ,agent= Ns Ar agent
 .Pq Event 62H , Umask 00H
 The number of external bus cycles while DRDY was asserted.
 .It Li Bus_Data_Rcv
 .Pq Event 64H , Umask 40H
 .\" XXX Using the description in Core2 PMC documentation.
 The number of cycles during which the processor is busy receiving data.
 .It Li Bus_Locks_Clocks Op ,core= Ns Ar core
 .Pq Event 63H
 The number of external bus cycles while the bus lock signal was asserted.
 .It Li Bus_Not_In_Use Op ,core= Ns Ar core
 .Pq Event 7DH
 The number of cycles when there is no transaction from the core.
 .It Li Bus_Req_Outstanding Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 60H
 The weighted cycles of cacheable bus data read requests
 from the data cache unit or hardware prefetcher.
 .It Li Bus_Snoop_Stall
 .Pq Event 7EH , Umask 00H
 The number bus cycles while a bus snoop is stalled.
 .It Li Bus_Snoops Xo
 .Op ,agent= Ns Ar agent
 .Op ,cachestate= Ns Ar mesi
 .Xc
 .Pq Event 77H
 .\" XXX Using the description in Core2 PMC documentation.
 The number of snoop responses to bus transactions.
 .It Li Bus_Trans_Any Op ,agent= Ns Ar agent
 .Pq Event 70H
 The number of completed bus transactions.
 .It Li Bus_Trans_Brd Op ,core= Ns Ar core
 .Pq Event 65H
 The number of read bus transactions.
 .It Li Bus_Trans_Burst Op ,agent= Ns Ar agent
 .Pq Event 6EH
 The number of completed burst transactions.
 Retried transactions may be counted more than once.
 .It Li Bus_Trans_Def Op ,core= Ns Ar core
 .Pq Event 6DH
 The number of completed deferred transactions.
 .It Li Bus_Trans_IO Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 6CH
 The number of completed I/O transactions counting both reads and
 writes.
 .It Li Bus_Trans_Ifetch Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 68H
 Completed instruction fetch transactions.
 .It Li Bus_Trans_Inval Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 69H
 The number completed invalidate transactions.
 .It Li Bus_Trans_Mem Op ,agent= Ns Ar agent
 .Pq Event 6FH
 The number of completed memory transactions.
 .It Li Bus_Trans_P Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 6BH
 The number of completed partial transactions.
 .It Li Bus_Trans_Pwr Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 6AH
 The number of completed partial write transactions.
 .It Li Bus_Trans_RFO Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 66H
 The number of completed read-for-ownership transactions.
 .It Li Bus_Trans_WB Op ,agent= Ns Ar agent
 .Pq Event 67H
 The number of completed write-back transactions from the data cache
 unit, excluding L2 write-backs.
 .It Li Cycles_Div_Busy
 .Pq Event 14H , Umask 00H
 The number of cycles the divider is busy.
 The event is only available on PMC0.
 .It Li Cycles_Int_Masked
 .Pq Event C6H , Umask 00H
 The number of cycles while interrupts were disabled.
 .It Li Cycles_Int_Pending_Masked
 .Pq Event C7H , Umask 00H
 The number of cycles while interrupts were disabled and interrupts
 were pending.
 .It Li DCU_Snoop_To_Share Op ,core= Ns core
 .Pq Event 78H
 The number of data cache unit snoops to L1 cache lines in the shared
 state.
 .It Li DCache_Cache_Lock Op ,cachestate= Ns Ar mesi
 .\" XXX needs clarification
 .Pq Event 42H
 The number of cacheable locked read operations to invalid state.
 .It Li DCache_Cache_LD Op ,cachestate= Ns Ar mesi
 .Pq Event 40H
 The number of cacheable L1 data read operations.
 .It Li DCache_Cache_ST Op ,cachestate= Ns Ar mesi
 .Pq Event 41H
 The number cacheable L1 data write operations.
 .It Li DCache_M_Evict
 .Pq Event 47H , Umask 00H
 The number of M state data cache lines that were evicted.
 .It Li DCache_M_Repl
 .Pq Event 46H , Umask 00H
 The number of M state data cache lines that were allocated.
 .It Li DCache_Pend_Miss
 .Pq Event 48H , Umask 00H
 The weighted cycles an L1 miss was outstanding.
 .It Li DCache_Repl
 .Pq Event 45H , Umask 0FH
 The number of data cache line replacements.
 .It Li Data_Mem_Cache_Ref
 .Pq Event 44H , Umask 02H
 The number of cacheable read and write operations to L1 data cache.
 .It Li Data_Mem_Ref
 .Pq Event 43H , Umask 01H
 The number of L1 data reads and writes, both cacheable and
 un-cacheable.
 .It Li Dbus_Busy Op ,core= Ns Ar core
 .Pq Event 22H
 The number of core cycles during which the data bus was busy.
 .It Li Dbus_Busy_Rd Op ,core= Ns Ar core
 .Pq Event 23H
 The number of cycles during which the data bus was busy transferring
 data to a core.
 .It Li Div
 .Pq Event 13H , Umask 00H
 The number of divide operations including speculative operations for
 integer and floating point divides.
 This event can only be counted on PMC1.
 .It Li Dtlb_Miss
 .Pq Event 49H , Umask 00H
 The number of data references that missed the TLB.
 .It Li ESP_Uops
 .Pq Event D7H , Umask 00H
 The number of ESP folding instructions decoded.
 .It Li EST_Trans Op ,trans= Ns Ar transition
 .Pq Event 3AH
 Count the number of Intel Enhanced SpeedStep transitions.
 The argument
 .Ar transition
 can be one of the following values:
 .Bl -tag -width indent -compact
 .It Li any
 (Umask 00H) Count all transitions.
 .It Li frequency
 (Umask 01H) Count frequency transitions.
 .El
 The default is
 .Dq Li any .
 .It Li FP_Assist
 .Pq Event 11H , Umask 00H
 The number of floating point operations that required microcode
 assists.
 The event is only available on PMC1.
 .It Li FP_Comp_Instr_Ret
 .Pq Event C1H , Umask 00H
 The number of X87 floating point compute instructions retired.
 The event is only available on PMC0.
 .It Li FP_Comps_Op_Exe
 .Pq Event 10H , Umask 00H
 The number of floating point computational instructions executed.
 .It Li FP_MMX_Trans
 .Pq Event CCH , Umask 01H
 The number of transitions from X87 to MMX.
 .It Li Fused_Ld_Uops_Ret
 .Pq Event DAH , Umask 01H
 The number of fused load uops retired.
 .It Li Fused_St_Uops_Ret
 .Pq Event DAH , Umask 02H
 The number of fused store uops retired.
 .It Li Fused_Uops_Ret
 .Pq Event DAH , Umask 00H
 The number of fused uops retired.
 .It Li HW_Int_Rx
 .Pq Event C8H , Umask 00H
 The number of hardware interrupts received.
 .It Li ICache_Misses
 .Pq Event 81H , Umask 00H
 The number of instruction fetch misses in the instruction cache and
 streaming buffers.
 .It Li ICache_Reads
 .Pq Event 80H , Umask 00H
 The number of instruction fetches from the instruction cache and
 streaming buffers counting both cacheable and un-cacheable fetches.
 .It Li IFU_Mem_Stall
 .Pq Event 86H , Umask 00H
 The number of cycles the instruction fetch unit was stalled while
 waiting for data from memory.
 .It Li ILD_Stall
 .Pq Event 87H , Umask 00H
 The number of instruction length decoder stalls.
 .It Li ITLB_Misses
 .Pq Event 85H , Umask 00H
 The number of instruction TLB misses.
 .It Li Instr_Decoded
 .Pq Event D0H , Umask 00H
 The number of instructions decoded.
 .It Li Instr_Ret
 .Pq Event C0H , Umask 00H
 .Pq Alias Qq "Instruction Retired"
 The number of instructions retired.
 This is an architectural performance event.
 .It Li L1_Pref_Req
 .Pq Event 4FH , Umask 00H
 The number of L1 prefetch request due to data cache misses.
 .It Li L2_ADS Op ,core= Ns core
 .Pq Event 21H
 The number of L2 address strobes.
 .It Li L2_IFetch Xo
 .Op ,cachestate= Ns Ar mesi
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 28H
 The number of instruction fetches by the instruction fetch unit from
 L2 cache including speculative fetches.
 .It Li L2_LD Xo
 .Op ,cachestate= Ns Ar mesi
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 29H
 The number of L2 cache reads.
 .It Li L2_Lines_In Xo
 .Op ,core= Ns Ar core
 .Op ,prefetch= Ns Ar prefetch
 .Xc
 .Pq Event 24H
 The number of L2 cache lines allocated.
 .It Li L2_Lines_Out Xo
 .Op ,core= Ns Ar core
 .Op ,prefetch= Ns Ar prefetch
 .Xc
 .Pq Event 26H
 The number of L2 cache lines evicted.
 .It Li L2_M_Lines_In Op ,core= Ns Ar core
 .Pq Event 25H
 The number of L2 M state cache lines allocated.
 .It Li L2_M_Lines_Out Xo
 .Op ,core= Ns Ar core
 .Op ,prefetch= Ns Ar prefetch
 .Xc
 .Pq Event 27H
 The number of L2 M state cache lines evicted.
 .It Li L2_No_Request_Cycles Xo
 .Op ,cachestate= Ns Ar mesi
 .Op ,core= Ns Ar core
 .Op ,prefetch= Ns Ar prefetch
 .Xc
 .Pq Event 32H
 The number of cycles there was no request to access L2 cache.
 .It Li L2_Reject_Cycles Xo
 .Op ,cachestate= Ns Ar mesi
 .Op ,core= Ns Ar core
 .Op ,prefetch= Ns Ar prefetch
 .Xc
 .Pq Event 30H
 The number of cycles the L2 cache was busy and rejecting new requests.
 .It Li L2_Rqsts Xo
 .Op ,cachestate= Ns Ar mesi
 .Op ,core= Ns Ar core
 .Op ,prefetch= Ns Ar prefetch
 .Xc
 .Pq Event 2EH
 The number of L2 cache requests.
 .It Li L2_ST Xo
 .Op ,cachestate= Ns Ar mesi
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 2AH
 The number of L2 cache writes including speculative writes.
 .It Li LD_Blocks
 .Pq Event 03H , Umask 00H
 The number of load operations delayed due to store buffer blocks.
 .It Li LLC_Misses
 .Pq Event 2EH , Umask 41H
 The number of cache misses for references to the last level cache,
 excluding misses due to hardware prefetches.
 This is an architectural performance event.
 .It Li LLC_Reference
 The number of references to the last level cache,
 excluding those due to hardware prefetches.
 This is an architectural performance event.
 .Pq Event 2EH , Umask 4FH
 This is an architectural performance event.
 .It Li MMX_Assist
 .Pq Event CDH , Umask 00H
 The number of EMMX instructions executed.
 .It Li MMX_FP_Trans
 .Pq Event CCH , Umask 00H
 The number of transitions from MMX to X87.
 .It Li MMX_Instr_Exec
 .Pq Event B0H , Umask 00H
 The number of MMX instructions executed excluding
 .Li MOVQ
 and
 .Li MOVD
 stores.
 .It Li MMX_Instr_Ret
 .Pq Event CEH , Umask 00H
 The number of MMX instructions retired.
 .It Li Misalign_Mem_Ref
 .Pq Event 05H , Umask 00H
 The number of misaligned data memory references, counting loads and
 stores.
 .It Li Mul
 .Pq Event 12H , Umask 00H
 The number of multiply operations include speculative floating point
 and integer multiplies.
 This event is available on PMC1 only.
 .It Li NonHlt_Ref_Cycles
 .Pq Event 3CH , Umask 01H
 .Pq Alias Qq "Unhalted Reference Cycles"
 The number of non-halted bus cycles.
 This is an architectural performance event.
 .It Li Pref_Rqsts_Dn
 .Pq Event F8H , Umask 00H
 The number of hardware prefetch requests issued in backward streams.
 .It Li Pref_Rqsts_Up
 .Pq Event F0H , Umask 00H
 The number of hardware prefetch requests issued in forward streams.
 .It Li Resource_Stall
 .Pq Event A2H , Umask 00H
 The number of cycles where there is a resource related stall.
 .It Li SD_Drains
 .Pq Event 04H , Umask 00H
 The number of cycles while draining store buffers.
 .It Li SIMD_FP_DP_P_Ret
 .Pq Event D8H , Umask 02H
 The number of SSE/SSE2 packed double precision instructions retired.
 .It Li SIMD_FP_DP_P_Comp_Ret
 .Pq Event D9H , Umask 02H
 The number of SSE/SSE2 packed double precision compute instructions
 retired.
 .It Li SIMD_FP_DP_S_Ret
 .Pq Event D8H , Umask 03H
 The number of SSE/SSE2 scalar double precision instructions retired.
 .It Li SIMD_FP_DP_S_Comp_Ret
 .Pq Event D9H , Umask 03H
 The number of SSE/SSE2 scalar double precision compute instructions
 retired.
 .It Li SIMD_FP_SP_P_Comp_Ret
 .Pq Event D9H , Umask 00H
 The number of SSE/SSE2 packed single precision compute instructions
 retired.
 .It Li SIMD_FP_SP_Ret
 .Pq Event D8H , Umask 00H
 The number of SSE/SSE2 scalar single precision instructions retired,
 both packed and scalar.
 .It Li SIMD_FP_SP_S_Ret
 .Pq Event D8H , Umask 01H
 The number of SSE/SSE2 scalar single precision instructions retired.
 .It Li SIMD_FP_SP_S_Comp_Ret
 .Pq Event D9H , Umask 01H
 The number of SSE/SSE2 single precision compute instructions retired.
 .It Li SIMD_Int_128_Ret
 .Pq Event D8H , Umask 04H
 The number of SSE2 128-bit integer instructions retired.
 .It Li SIMD_Int_Pari_Exec
 .Pq Event B3H , Umask 20H
 The number of SIMD integer packed arithmetic instructions executed.
 .It Li SIMD_Int_Pck_Exec
 .Pq Event B3H , Umask 04H
 The number of SIMD integer pack operations instructions executed.
 .It Li SIMD_Int_Plog_Exec
 .Pq Event B3H , Umask 10H
 The number of SIMD integer packed logical instructions executed.
 .It Li SIMD_Int_Pmul_Exec
 .Pq Event B3H , Umask 01H
 The number of SIMD integer packed multiply instructions executed.
 .It Li SIMD_Int_Psft_Exec
 .Pq Event B3H , Umask 02H
 The number of SIMD integer packed shift instructions executed.
 .It Li SIMD_Int_Sat_Exec
 .Pq Event B1H , Umask 00H
 The number of SIMD integer saturating instructions executed.
 .It Li SIMD_Int_Upck_Exec
 .Pq Event B3H , Umask 08H
 The number of SIMD integer unpack instructions executed.
 .It Li SMC_Detected
 .Pq Event C3H , Umask 00H
 The number of times self-modifying code was detected.
 .It Li SSE_NTStores_Miss
 .Pq Event 4BH , Umask 03H
 The number of times an SSE streaming store instruction missed all caches.
 .It Li SSE_NTStores_Ret
 .Pq Event 07H , Umask 03H
 The number of SSE streaming store instructions executed.
 .It Li SSE_PrefNta_Miss
 .Pq Event 4BH , Umask 00H
 The number of times
 .Li PREFETCHNTA
 missed all caches.
 .It Li SSE_PrefNta_Ret
 .Pq Event 07H , Umask 00H
 The number of
 .Li PREFETCHNTA
 instructions retired.
 .It Li SSE_PrefT1_Miss
 .Pq Event 4BH , Umask 01H
 The number of times
 .Li PREFETCHT1
 missed all caches.
 .It Li SSE_PrefT1_Ret
 .Pq Event 07H , Umask 01H
 The number of
 .Li PREFETCHT1
 instructions retired.
 .It Li SSE_PrefT2_Miss
 .Pq Event 4BH , Umask 02H
 The number of times
 .Li PREFETCHNT2
 missed all caches.
 .It Li SSE_PrefT2_Ret
 .Pq Event 07H , Umask 02H
 The number of
 .Li PREFETCHT2
 instructions retired.
 .It Li Seg_Reg_Loads
 .Pq Event 06H , Umask 00H
 The number of segment register loads.
 .It Li Serial_Execution_Cycles
 .Pq Event 3CH , Umask 02H
 The number of non-halted bus cycles of this code while the other core
 was halted.
 .It Li Thermal_Trip
 .Pq Event 3BH , Umask C0H
 The duration in a thermal trip based on the current core clock.
 .It Li Unfusion
 .Pq Event DBH , Umask 00H
 The number of unfusion events.
 .It Li Unhalted_Core_Cycles
 .Pq Event 3CH , Umask 00H
 The number of core clock cycles when the clock signal on a specific
 core is not halted.
 This is an architectural performance event.
 .It Li Uops_Ret
 .Pq Event C2H , Umask 00H
 The number of micro-ops retired.
 .El
 .Ss Event Name Aliases
 The following table shows the mapping between the PMC-independent
 aliases supported by
 .Lb libpmc
 and the underlying hardware events used.
 .Bl -column "branch-mispredicts" "Description"
 .It Em Alias Ta Em Event
 .It Li branches Ta Li Br_Instr_Ret
 .It Li branch-mispredicts Ta Li Br_MisPred_Ret
 .It Li dc-misses Ta (unsupported)
 .It Li ic-misses Ta Li ICache_Misses
 .It Li instructions Ta Li Instr_Ret
 .It Li interrupts Ta Li HW_Int_Rx
 .It Li unhalted-cycles Ta (unsupported)
 .El
 .Sh PROCESSOR ERRATA
 The following errata affect performance measurement on these
 processors.
 These errata are documented in
 .Rs
 .%B Specification Update
 .%T Intel\(rg CoreTM Duo Processor and Intel\(rg CoreTM Solo Processor on 65 nm Process
 .%N Order Number 309222-017
 .%D July 2008
 .%Q Intel Corporation
 .Re
 .Bl -tag -width indent -compact
 .It AE19
 Data prefetch performance monitoring events can only be enabled
 on a single core.
 .It AE25
 Performance monitoring counters that count external bus events
 may report incorrect values after processor power state transitions.
 .It AE28
 Performance monitoring events for retired floating point operations
 (C1H) may not be accurate.
 .It AE29
 DR3 address match on MOVD/MOVQ/MOVNTQ memory store
 instruction may incorrectly increment performance monitoring count
 for saturating SIMD instructions retired (Event CFH).
 .It AE33
 Hardware prefetch performance monitoring events may be counted
 inaccurately.
 .It AE36
 The
 .Li CPU_CLK_UNHALTED
 performance monitoring event (Event 3CH) counts
 clocks when the processor is in the C1/C2 processor power states.
 .It AE39
 Certain performance monitoring counters related to bus, L2 cache
 and power management are inaccurate.
 .It AE51
 Performance monitoring events for retired instructions (Event C0H) may
 not be accurate.
 .It AE67
 Performance monitoring event
 .Li FP_ASSIST
 may not be accurate.
 .It AE78
 Performance monitoring event for hardware prefetch requests (Event
 4EH) and hardware prefetch request cache misses (Event 4FH) may not be
 accurate.
 .It AE82
 Performance monitoring event
 .Li FP_MMX_TRANS_TO_MMX
 may not count some transitions.
 .El
 .Sh SEE ALSO
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core2 3 ,
 .Xr pmc.iaf 3 ,
-.Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
 .Sh HISTORY
 The
 .Nm pmc
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
 The
 .Lb libpmc
 library was written by
 .An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/lib/libpmc/pmc.core2.3 b/lib/libpmc/pmc.core2.3
index 201867bd9ed8..45e4a4c7916d 100644
--- a/lib/libpmc/pmc.core2.3
+++ b/lib/libpmc/pmc.core2.3
@@ -1,1119 +1,1118 @@
 .\" Copyright (c) 2008,2009 Joseph Koshy.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .Dd June 8, 2009
 .Dt PMC.CORE2 3
 .Os
 .Sh NAME
 .Nm pmc.core2
 .Nd measurement events for
 .Tn Intel
 .Tn Core2
 family CPUs
 .Sh LIBRARY
 .Lb libpmc
 .Sh SYNOPSIS
 .In pmc.h
 .Sh DESCRIPTION
 .Tn Intel
 .Tn "Core2"
 CPUs contain PMCs conforming to version 2 of the
 .Tn Intel
 performance measurement architecture.
 These CPUs may contain up to two classes of PMCs:
 .Bl -tag -width "Li PMC_CLASS_IAP"
 .It Li PMC_CLASS_IAF
 Fixed-function counters that count only one hardware event per counter.
 .It Li PMC_CLASS_IAP
 Programmable counters that may be configured to count one of a defined
 set of hardware events.
 .El
 .Pp
 The number of PMCs available in each class and their widths need to be
 determined at run time by calling
 .Xr pmc_cpuinfo 3 .
 .Pp
 Intel Core2 PMCs are documented in
 .Rs
 .%B "IA-32 Intel(R) Architecture Software Developer's Manual"
 .%T "Volume 3: System Programming Guide"
 .%N "Order Number 253669-027US"
 .%D July 2008
 .%Q "Intel Corporation"
 .Re
 .Ss CORE2 FIXED FUNCTION PMCS
 These PMCs and their supported events are documented in
 .Xr pmc.iaf 3 .
 Not all CPUs in this family implement fixed-function counters.
 .Ss CORE2 PROGRAMMABLE PMCS
 The programmable PMCs support the following capabilities:
 .Bl -column "PMC_CAP_INTERRUPT" "Support"
 .It Em Capability Ta Em Support
 .It PMC_CAP_CASCADE Ta \&No
 .It PMC_CAP_EDGE Ta Yes
 .It PMC_CAP_INTERRUPT Ta Yes
 .It PMC_CAP_INVERT Ta Yes
 .It PMC_CAP_READ Ta Yes
 .It PMC_CAP_PRECISE Ta \&No
 .It PMC_CAP_SYSTEM Ta Yes
 .It PMC_CAP_TAGGING Ta \&No
 .It PMC_CAP_THRESHOLD Ta Yes
 .It PMC_CAP_USER Ta Yes
 .It PMC_CAP_WRITE Ta Yes
 .El
 .Ss Event Qualifiers
 Event specifiers for these PMCs support the following common
 qualifiers:
 .Bl -tag -width indent
 .It Li cmask= Ns Ar value
 Configure the PMC to increment only if the number of configured
 events measured in a cycle is greater than or equal to
 .Ar value .
 .It Li edge
 Configure the PMC to count the number of de-asserted to asserted
 transitions of the conditions expressed by the other qualifiers.
 If specified, the counter will increment only once whenever a
 condition becomes true, irrespective of the number of clocks during
 which the condition remains true.
 .It Li inv
 Invert the sense of comparison when the
 .Dq Li cmask
 qualifier is present, making the counter increment when the number of
 events per cycle is less than the value specified by the
 .Dq Li cmask
 qualifier.
 .It Li os
 Configure the PMC to count events happening at processor privilege
 level 0.
 .It Li usr
 Configure the PMC to count events occurring at privilege levels 1, 2
 or 3.
 .El
 .Pp
 If neither of the
 .Dq Li os
 or
 .Dq Li usr
 qualifiers are specified, the default is to enable both.
 .Pp
 Events that require core-specificity to be specified use a
 additional qualifier
 .Dq Li core= Ns Ar core ,
 where argument
 .Ar core
 is one of:
 .Bl -tag -width indent
 .It Li all
 Measure event conditions on all cores.
 .It Li this
 Measure event conditions on this core.
 .El
 .Pp
 The default is
 .Dq Li this .
 .Pp
 Events that require an agent qualifier to be specified use an
 additional qualifier
 .Dq Li agent= Ns agent ,
 where argument
 .Ar agent
 is one of:
 .Bl -tag -width indent
 .It Li this
 Measure events associated with this bus agent.
 .It Li any
 Measure events caused by any bus agent.
 .El
 .Pp
 The default is
 .Dq Li this .
 .Pp
 Events that require a hardware prefetch qualifier to be specified use an
 additional qualifier
 .Dq Li prefetch= Ns Ar prefetch ,
 where argument
 .Ar prefetch
 is one of:
 .Bl -tag -width "exclude"
 .It Li both
 Include all prefetches.
 .It Li only
 Only count hardware prefetches.
 .It Li exclude
 Exclude hardware prefetches.
 .El
 .Pp
 The default is
 .Dq Li both .
 .Pp
 Events that require a cache coherence qualifier to be specified use an
 additional qualifier
 .Dq Li cachestate= Ns Ar state ,
 where argument
 .Ar state
 contains one or more of the following letters:
 .Bl -tag -width indent
 .It Li e
 Count cache lines in the exclusive state.
 .It Li i
 Count cache lines in the invalid state.
 .It Li m
 Count cache lines in the modified state.
 .It Li s
 Count cache lines in the shared state.
 .El
 .Pp
 The default is
 .Dq Li eims .
 .Pp
 Events that require a snoop response qualifier to be specified use an
 additional qualifier
 .Dq Li snoopresponse= Ns Ar response ,
 where argument
 .Ar response
 comprises of the following keywords separated by
 .Dq +
 signs:
 .Bl -tag -width indent
 .It Li clean
 Measure CLEAN responses.
 .It Li hit
 Measure HIT responses.
 .It Li hitm
 Measure HITM responses.
 .El
 .Pp
 The default is to measure all the above responses.
 .Pp
 Events that require a snoop type qualifier use an additional qualifier
 .Dq Li snooptype= Ns Ar type ,
 where argument
 .Ar type
 comprises the one of the following keywords:
 .Bl -tag -width indent
 .It Li cmp2i
 Measure CMP2I snoops.
 .It Li cmp2s
 Measure CMP2S snoops.
 .El
 .Pp
 The default is to measure both snoops.
 .Ss Event Specifiers (Programmable PMCs)
 Core2 programmable PMCs support the following events:
 .Bl -tag -width indent
 .It Li BACLEARS
 .Pq Event E6H , Umask 00H
 The number of times the front end is resteered.
 .It Li BOGUS_BR
 .Pq Event E4H , Umask 00H
 The number of byte sequences mistakenly detected as taken branch
 instructions.
 .It Li BR_BAC_MISSP_EXEC
 .Pq Event 8AH , Umask 00H
 The number of branch instructions that were mispredicted when
 decoded.
 .It Li BR_CALL_MISSP_EXEC
 .Pq Event 93H , Umask 00H
 The number of mispredicted
 .Li CALL
 instructions that were executed.
 .It Li BR_CALL_EXEC
 .Pq Event 92H , Umask 00H
 The number of
 .Li CALL
 instructions executed.
 .It Li BR_CND_EXEC
 .Pq Event 8BH , Umask 00H
 The number of conditional branches executed, but not necessarily retired.
 .It Li BR_CND_MISSP_EXEC
 .Pq Event 8CH , Umask 00H
 The number of mispredicted conditional branches executed.
 .It Li BR_IND_CALL_EXEC
 .Pq Event 94H , Umask 00H
 The number of indirect
 .Li CALL
 instructions executed.
 .It Li BR_IND_EXEC
 .Pq Event 8DH , Umask 00H
 The number of indirect branch instructions executed.
 .It Li BR_IND_MISSP_EXEC
 .Pq Event 8EH , Umask 00H
 The number of mispredicted indirect branch instructions executed.
 .It Li BR_INST_DECODED
 .Pq Event E0H , Umask 00H
 The number of branch instructions decoded.
 .It Li BR_INST_EXEC
 .Pq Event 88H , Umask 00H
 The number of branches executed, but not necessarily retired.
 .It Li BR_INST_RETIRED.ANY
 .Pq Event C4H , Umask 00H
 .Pq Alias Qq "Branch Instruction Retired"
 The number of branch instructions retired.
 This is an architectural performance event.
 .It Li BR_INST_RETIRED.MISPRED
 .Pq Event C5H , Umask 00H
 .Pq Alias Qq "Branch Misses Retired"
 The number of mispredicted branch instructions retired.
 This is an architectural performance event.
 .It Li BR_INST_RETIRED.MISPRED_NOT_TAKEN
 .Pq Event C4H , Umask 02H
 The number of not taken branch instructions retired that were
 mispredicted.
 .It Li BR_INST_RETIRED.MISPRED_TAKEN
 .Pq Event C4H , Umask 08H
 The number taken branch instructions retired that were mispredicted.
 .It Li BR_INST_RETIRED.PRED_NOT_TAKEN
 .Pq Event C4H , Umask 01H
 The number of not taken branch instructions retired that were
 correctly predicted.
 .It Li BR_INST_RETIRED.PRED_TAKEN
 .Pq Event C4H , Umask 04H
 The number of taken branch instructions retired that were correctly
 predicted.
 .It Li BR_INST_RETIRED.TAKEN
 .Pq Event C4H , Umask 0CH
 The number of taken branch instructions retired.
 .It Li BR_MISSP_EXEC
 .Pq Event 89H , Umask 00H
 The number of mispredicted branch instructions that were executed.
 .It Li BR_RET_MISSP_EXEC
 .Pq Event 90H , Umask 00H
 The number of mispredicted
 .Li RET
 instructions executed.
 .It Li BR_RET_BAC_MISSP_EXEC
 .Pq Event 91H , Umask 00H
 The number of
 .Li RET
 instructions executed that were mispredicted at decode time.
 .It Li BR_RET_EXEC
 .Pq Event 8FH , Umask 00H
 The number of
 .Li RET
 instructions executed.
 .It Li BR_TKN_BUBBLE_1
 .Pq Event 97H , Umask 00H
 The number of branch predicted taken with bubble 1.
 .It Li BR_TKN_BUBBLE_2
 .Pq Event 98H , Umask 00H
 The number of branch predicted taken with bubble 2.
 .It Li BUSQ_EMPTY Op ,core= Ns Ar core
 .Pq Event 7DH
 The number of cycles during which the core did not have any pending
 transactions in the bus queue.
 .It Li BUS_BNR_DRV Op ,agent= Ns Ar agent
 .Pq Event 61H
 The number of Bus Not Ready signals asserted on the bus.
 .It Li BUS_DATA_RCV Op ,core= Ns Ar core
 .Pq Event 64H
 The number of bus cycles during which the processor is receiving data.
 .It Li BUS_DRDY_CLOCKS Op ,agent= Ns Ar agent
 .Pq Event 62H
 The number of bus cycles during which the Data Ready signal is asserted
 on the bus.
 .It Li BUS_HIT_DRV Op ,agent= Ns Ar agent
 .Pq Event 7AH
 The number of bus cycles during which the processor drives the
 .Li HIT#
 pin.
 .It Li BUS_HITM_DRV Op ,agent= Ns Ar agent
 .Pq Event 7BH
 The number of bus cycles during which the processor drives the
 .Li HITM#
 pin.
 .It Li BUS_IO_WAIT Op ,core= Ns Ar core
 .Pq Event 7FH
 The number of core cycles during which I/O requests wait in the bus
 queue.
 .It Li BUS_LOCK_CLOCKS Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 63H
 The number of bus cycles during which the
 .Li LOCK
 signal was asserted on the bus.
 .It Li BUS_REQUEST_OUTSTANDING Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 60H
 The number of pending full cache line read transactions on the bus
 occurring in each cycle.
 .It Li BUS_TRANS_P Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 6BH
 The number of partial bus transactions.
 .It Li BUS_TRANS_IFETCH Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 68H
 The number of instruction fetch full cache line bus transactions.
 .It Li BUS_TRANS_INVAL Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 69H
 The number of invalidate bus transactions.
 .It Li BUS_TRANS_PWR Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 6AH
 The number of partial write bus transactions.
 .It Li BUS_TRANS_DEF Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 6DH
 The number of deferred bus transactions.
 .It Li BUS_TRANS_BURST Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 6EH
 The number of burst transactions.
 .It Li BUS_TRANS_MEM Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 6FH
 The number of memory bus transactions.
 .It Li BUS_TRANS_ANY Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 70H
 The number of bus transactions of any kind.
 .It Li BUS_TRANS_BRD Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 65H
 The number of burst read transactions.
 .It Li BUS_TRANS_IO Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 6CH
 The number of completed I/O bus transactions due to
 .Li IN
 and
 .Li OUT
 instructions.
 .It Li BUS_TRANS_RFO Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 66H
 The number of Read For Ownership bus transactions.
 .It Li BUS_TRANS_WB Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 67H
 The number explicit write-back bus transactions due to dirty line
 evictions.
 .It Li CMP_SNOOP Xo
 .Op ,core= Ns Ar core
 .Op ,snooptype= Ns Ar snoop
 .Xc
 .Pq Event 78H
 The number of times the L1 data cache is snooped by the other core in
 the same processor.
 .It Li CPU_CLK_UNHALTED.BUS
 .Pq Event 3CH , Umask 01H
 .Pq Alias Qq "Unhalted Reference Cycles"
 The number of bus cycles when the core is not in the halt state.
 This is an architectural performance event.
 .It Li CPU_CLK_UNHALTED.CORE_P
 .Pq Event 3CH , Umask 00H
 .Pq Alias Qq "Unhalted Core Cycles"
 The number of core cycles while the core is not in a halt state.
 This is an architectural performance event.
 .It Li CPU_CLK_UNHALTED.NO_OTHER
 .Pq Event 3CH , Umask 02H
 The number of bus cycles during which the core remains unhalted and
 the other core is halted.
 .It Li CYCLES_DIV_BUSY
 .Pq Event 14H , Umask 00H
 The number of cycles the divider is busy.
 This event is only available on PMC0.
 .It Li CYCLES_INT_MASKED
 .Pq Event C6H , Umask 01H
 The number of cycles during which interrupts are disabled.
 .It Li CYCLES_INT_PENDING_AND_MASKED
 .Pq Event C6H , Umask 02H
 The number of cycles during which there were pending interrupts while
 interrupts were disabled.
 .It Li CYCLES_L1I_MEM_STALLED
 .Pq Event 86H , Umask 00H
 The number of cycles for which an instruction fetch stalls.
 .It Li DELAYED_BYPASS.FP
 .Pq Event 19H , Umask 00H
 The number of floating point operations that used data immediately
 after the data was generated by a non floating point execution unit.
 .It Li DELAYED_BYPASS.LOAD
 .Pq Event 19H , Umask 01H
 The number of delayed bypass penalty cycles that a load operation incurred.
 .It Li DELAYED_BYPASS.SIMD
 .Pq Event 19H , Umask 02H
 The number of times SIMD operations use data immediately after data,
 was generated by a non-SIMD execution unit.
 .It Li DIV
 .Pq Event 13H , Umask 00H
 The number of divide operations executed.
 This event is only available on PMC1.
 .It Li DTLB_MISSES.ANY
 .Pq Event 08H , Umask 01H
 The number of Data TLB misses, including misses that result from
 speculative accesses.
 .It Li DTLB_MISSES.L0_MISS_LD
 .Pq Event 08H , Umask 04H
 The number of level 0 DTLB misses due to load operations.
 .It Li DTLB_MISSES.MISS_LD
 .Pq Event 08H , Umask 02H
 The number of Data TLB misses due to load operations.
 .It Li DTLB_MISSES.MISS_ST
 .Pq Event 08H , Umask 08H
 The number of Data TLB misses due to store operations.
 .It Li EIST_TRANS
 .Pq Event 3AH , Umask 00H
 The number of Enhanced Intel SpeedStep Technology transitions.
 .It Li ESP.ADDITIONS
 .Pq Event ABH , Umask 02H
 The number of automatic additions to the
 .Li %esp
 register.
 .It Li ESP.SYNCH
 .Pq Event ABH , Umask 01H
 The number of times the
 .Li %esp
 register was explicitly used in an address expression after
 it is implicitly used by a
 .Li PUSH
 or
 .Li POP
 instruction.
 .It Li EXT_SNOOP Xo
 .Op ,agent= Ns Ar agent
 .Op ,snoopresponse= Ns Ar response
 .Xc
 .Pq Event 77H
 The number of snoop responses to bus transactions.
 .It Li FP_ASSIST
 .Pq Event 11H , Umask 00H
 The number of floating point operations executed that needed
 a microcode assist.
 .It Li FP_COMP_OPS_EXE
 .Pq Event 10H , Umask 00H
 The number of floating point computational micro-ops executed.
 The event is available only on PMC0.
 .It Li FP_MMX_TRANS_TO_FP
 .Pq Event CCH , Umask 02H
 The number of transitions from MMX instructions to floating point
 instructions.
 .It Li FP_MMX_TRANS_TO_MMX
 .Pq Event CCH , Umask 01H
 The number of transitions from floating point instructions to MMX
 instructions.
 .It Li HW_INT_RCV
 .Pq Event C8H , Umask 00H
 The number of hardware interrupts received.
 .It Li IDLE_DURING_DIV
 .Pq Event 18H , Umask 00H
 The number of cycles the divider is busy and no other execution unit
 or load operation was in progress.
 This event is available only on PMC0.
 .It Li ILD_STALL
 .Pq Event 87H , Umask 00H
 The number of cycles the instruction length decoder stalled due to a
 length changing prefix.
 .It Li INST_QUEUE.FULL
 .Pq Event 83H , Umask 02H
 The number of cycles during which the instruction queue is full.
 .It Li INST_RETIRED.ANY_P
 .Pq Event C0H , Umask 00H
 .Pq Alias Qq "Instruction Retired"
 The number of instructions retired.
 This is an architectural performance event.
 .It Li INST_RETIRED.LOADS
 .Pq Event C0H , Umask 01H
 The number of instructions retired that contained a load operation.
 .It Li INST_RETIRED.OTHER
 .Pq Event C0H , Umask 04H
 The number of instructions retired that did not contain a load or a
 store operation.
 .It Li INST_RETIRED.STORES
 .Pq Event C0H , Umask 02H
 The number of instructions retired that contained a store operation.
 .It Li INST_RETIRED.VM_H
 .Pq Event C0H , Umask 08H
 .Pq Tn Core2Extreme
 The number of instructions retired while in VMX root operation.
 .It Li ITLB.FLUSH
 .Pq Event 82H , Umask 40H
 The number of ITLB flushes.
 .It Li ITLB.LARGE_MISS
 .Pq Event 82H , Umask 10H
 The number of instruction fetches from large pages that miss the
 ITLB.
 .It Li ITLB.MISSES
 .Pq Event 82H , Umask 12H
 The number of instruction fetches from both large and small pages that
 miss the ITLB.
 .It Li ITLB.SMALL_MISS
 .Pq Event 82H , Umask 02H
 The number of instruction fetches from small pages that miss the ITLB.
 .It Li ITLB_MISS_RETIRED
 .Pq Event C9H , Umask 00H
 The number of retired instructions that missed the ITLB when they were
 fetched.
 .It Li L1D_ALL_REF
 .Pq Event 43H , Umask 01H
 The number of references to L1 data cache counting loads and stores of
 to all memory types.
 .It Li L1D_ALL_CACHE_REF
 .Pq Event 43H , Umask 02H
 The number of data reads and writes to cacheable memory.
 .It Li L1D_CACHE_LOCK Op ,cachestate= Ns Ar state
 .Pq Event 42H
 The number of locked reads from cacheable memory.
 .It Li L1D_CACHE_LOCK_DURATION
 .Pq Event 42H , Umask 10H
 The number of cycles during which any cache line is locked by any
 locking instruction.
 .It Li L1D_CACHE_LD Op ,cachestate= Ns Ar state
 .Pq Event 40H
 The number of data reads from cacheable memory excluding locked
 reads.
 .It Li L1D_CACHE_ST Op ,cachestate= Ns Ar state
 .Pq Event 41H
 The number of data writes to cacheable memory excluding locked
 writes.
 .It Li L1D_M_EVICT
 .Pq Event 47H , Umask 00H
 The number of modified cache lines evicted from L1 data cache.
 .It Li L1D_M_REPL
 .Pq Event 46H , Umask 00H
 The number of modified lines allocated in L1 data cache.
 .It Li L1D_PEND_MISS
 .Pq Event 48H , Umask 00H
 The total number of outstanding L1 data cache misses at any clock.
 .It Li L1D_PREFETCH.REQUESTS
 .Pq Event 4EH , Umask 10H
 The number of times L1 data cache requested to prefetch a data cache
 line.
 .It Li L1D_REPL
 .Pq Event 45H , Umask 0FH
 The number of lines brought into L1 data cache.
 .It Li L1D_SPLIT.LOADS
 .Pq Event 49H , Umask 01H
 The number of load operations that span two cache lines.
 .It Li L1D_SPLIT.STORES
 .Pq Event 49H , Umask 02H
 The number of store operations that span two cache lines.
 .It Li L1I_MISSES
 .Pq Event 81H , Umask 00H
 The number of instruction fetch unit misses.
 .It Li L1I_READS
 .Pq Event 80H , Umask 00H
 The number of instruction fetches.
 .It Li L2_ADS Op ,core= Ns core
 .Pq Event 21H
 The number of cycles that the L2 address bus is in use.
 .It Li L2_DBUS_BUSY_RD Op ,core= Ns core
 .Pq Event 23H
 The number of cycles during which the L2 data bus is busy transferring
 data to the core.
 .It Li L2_IFETCH Xo
 .Op ,cachestate= Ns Ar state
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 28H
 The number of instruction cache line requests from the instruction
 fetch unit.
 .It Li L2_LD Xo
 .Op ,cachestate= Ns Ar state
 .Op ,core= Ns Ar core
 .Op ,prefetch= Ns Ar prefetch
 .Xc
 .Pq Event 29H
 The number of L2 cache read requests from L1 cache and L2
 prefetchers.
 .It Li L2_LINES_IN Xo
 .Op ,core= Ns Ar core
 .Op ,prefetch= Ns Ar prefetch
 .Xc
 .Pq Event 24H
 The number of cache lines allocated in L2 cache.
 .It Li L2_LINES_OUT Xo
 .Op ,core= Ns Ar core
 .Op ,prefetch= Ns Ar prefetch
 .Xc
 .Pq Event 26H
 The number of L2 cache lines evicted.
 .It Li L2_LOCK Xo
 .Op ,cachestate= Ns Ar state
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 2BH
 The number of locked accesses to cache lines that miss L1 data
 cache.
 .It Li L2_M_LINES_IN Op ,core= Ns Ar core
 .Pq Event 25H
 The number of L2 cache line modifications.
 .It Li L2_M_LINES_OUT Xo
 .Op ,core= Ns Ar core
 .Op ,prefetch= Ns Ar prefetch
 .Xc
 .Pq Event 27H
 The number of modified lines evicted from L2 cache.
 .It Li L2_NO_REQ Op ,core= Ns Ar core
 .Pq Event 32H
 The number of cycles during which no L2 cache requests were pending
 from a core.
 .It Li L2_REJECT_BUSQ Xo
 .Op ,cachestate= Ns Ar state
 .Op ,core= Ns Ar core
 .Op ,prefetch= Ns Ar prefetch
 .Xc
 .Pq Event 30H
 The number of L2 cache requests that were rejected.
 .It Li L2_RQSTS Xo
 .Op ,cachestate= Ns Ar state
 .Op ,core= Ns Ar core
 .Op ,prefetch= Ns Ar prefetch
 .Xc
 .Pq Event 2EH
 The number of completed L2 cache requests.
 .It Li L2_RQSTS.SELF.DEMAND.I_STATE
 .Pq Event 2EH , Umask 41H
 .Pq Alias Qq "LLC Misses"
 The number of completed L2 cache demand requests from this core that
 missed the L2 cache.
 This is an architectural performance event.
 .It Li L2_RQSTS.SELF.DEMAND.MESI
 .Pq Event 2EH , Umask 4FH
 .Pq Alias Qq "LLC References"
 The number of completed L2 cache demand requests from this core.
 This is an architectural performance event.
 .It Li L2_ST Xo
 .Op ,cachestate= Ns Ar state
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 2AH
 The number of store operations that miss the L1 cache and request data
 from the L2 cache.
 .It Li LOAD_BLOCK.L1D
 .Pq Event 03H , Umask 20H
 The number of loads blocked by the L1 data cache.
 .It Li LOAD_BLOCK.OVERLAP_STORE
 .Pq Event 03H , Umask 08H
 The number of loads that partially overlap an earlier store or are
 aliased with a previous store.
 .It Li LOAD_BLOCK.STA
 .Pq Event 03H , Umask 02H
 The number of loads blocked by preceding stores whose address is yet
 to be calculated.
 .It Li LOAD_BLOCK.STD
 .Pq Event 03H , Umask 04H
 The number of loads blocked by preceding stores to the same address
 whose data value is not known.
 .It Li LOAD_BLOCK.UNTIL_RETIRE
 .Pq Event 03H , Umask 10H
 The number of load operations that were blocked until retirement.
 .It Li LOAD_HIT_PRE
 .Pq Event 4CH , Umask 00H
 The number of load operations that conflicted with an prefetch to the
 same cache line.
 .It Li MACHINE_NUKES.SMC
 .Pq Event C3H , Umask 01H
 The number of times a program writes to a code section.
 .It Li MACHINE_NUKES.MEM_ORDER
 .Pq Event C3H , Umask 04H
 The number of times the execution pipeline was restarted due to a
 memory ordering conflict or memory disambiguation misprediction.
 .It Li MACRO_INSTS.CISC_DECODED
 .Pq Event AAH , Umask 08H
 The number of complex instructions decoded.
 .It Li MACRO_INSTS.DECODED
 .Pq Event AAH , Umask 01H
 The number of instructions decoded.
 .It Li MEMORY_DISAMBIGUATION.RESET
 .Pq Event 09H , Umask 01H
 The number of cycles during which memory disambiguation misprediction
 occurs.
 .It Li MEMORY_DISAMBIGUATION.SUCCESS
 .Pq Event 09H , Umask 02H
 The number of load operations that were successfully disambiguated.
 .It Li MEM_LOAD_RETIRED.DTLB_MISS
 .Pq Event CBH , Umask 10H
 The number of retired loads that missed the DTLB.
 .It Li MEM_LOAD_RETIRED.L1D_LINE_MISS
 .Pq Event CBH , Umask 02H
 The number of retired load operations that missed L1 data cache and
 that sent a request to L2 cache.
 This event is only available on PMC0.
 .It Li MEM_LOAD_RETIRED.L1D_MISS
 .Pq Event CBH , Umask 01H
 The number of retired load operations that missed L1 data cache.
 This event is only available on PMC0.
 .It Li MEM_LOAD_RETIRED.L2_LINE_MISS
 .Pq Event CBH , Umask 08H
 The number of load operations that missed L2 cache and that caused a
 bus request.
 .It Li MEM_LOAD_RETIRED.L2_MISS
 .Pq Event CBH , Umask 04H
 The number of load operations that missed L2 cache.
 .It Li MUL
 .Pq Event 12H , Umask 00H
 The number of multiply operations executed.
 This event is only available on PMC1.
 .It Li PAGE_WALKS.COUNT
 .Pq Event 0CH , Umask 01H
 The number of page walks executed due to an ITLB or DTLB miss.
 .It Li PAGE_WALKS.CYCLES
 .Pq Event 0CH , Umask 02H
 The number of cycles spent in a page walk caused by an ITLB or DTLB
 miss.
 .It Li PREF_RQSTS_DN
 .Pq Event F8H , Umask 00H
 The number of downward prefetches issued from the Data Prefetch Logic
 unit to L2 cache.
 .It Li PREF_RQSTS_UP
 .Pq Event F0H , Umask 00H
 The number of upward prefetches issued from the Data Prefetch Logic
 unit to L2 cache.
 .It Li RAT_STALLS.ANY
 .Pq Event D2H , Umask 0FH
 The number of stall cycles due to any of
 .Li RAT_STALLS.FLAGS
 .Li RAT_STALLS.FPSW ,
 .Li RAT_STALLS.PARTIAL
 and
 .Li RAT_STALLS.ROB_READ_PORT .
 .It Li RAT_STALLS.FLAGS
 .Pq Event D2H , Umask 04H
 The number of cycles execution stalled due to a flag register induced
 stall.
 .It Li RAT_STALLS.FPSW
 .Pq Event D2H , Umask 08H
 The number of times the floating point status word was written.
 .It Li RAT_STALLS.OTHER_SERIALIZATION_STALLS
 .Pq Event D2H , Umask 10H , Tn Core2Extreme
 The number of stalls due to other RAT resource serialization not
 counted by umask 0FH.
 .It Li RAT_STALLS.PARTIAL_CYCLES
 .Pq Event D2H , Umask 02H
 The number of cycles of added instruction execution latency due to the
 use of a register that was partially written by previous instructions.
 .It Li RAT_STALLS.ROB_READ_PORT
 .Pq Event D2H , Umask 01H
 The number of cycles when ROB read port stalls occurred.
 .It Li RESOURCE_STALLS.ANY
 .Pq Event DCH , Umask 1FH
 The number of cycles during which any resource related stall
 occurred.
 .It Li RESOURCE_STALLS.BR_MISS_CLEAR
 .Pq Event DCH , Umask 10H
 The number of cycles stalled due to branch misprediction.
 .It Li RESOURCE_STALLS.FPCW
 .Pq Event DCH , Umask 08H
 The number of cycles stalled due to writing the floating point control
 word.
 .It Li RESOURCE_STALLS.LD_ST
 .Pq Event DCH , Umask 04H
 The number of cycles during which the number of loads and stores in
 the pipeline exceeded their limits.
 .It Li RESOURCE_STALLS.ROB_FULL
 .Pq Event DCH , Umask 01H
 The number of cycles when the reorder buffer was full.
 .It Li RESOURCE_STALLS.RS_FULL
 .Pq Event DCH , Umask 02H
 The number of cycles during which the RS was full.
 .It Li RS_UOPS_DISPATCHED
 .Pq Event A0H , Umask 00H
 The number of micro-ops dispatched for execution.
 .It Li RS_UOPS_DISPATCHED.PORT0
 .Pq Event A1H , Umask 01H
 The number of cycles micro-ops were dispatched for execution on port
 0.
 .It Li RS_UOPS_DISPATCHED.PORT1
 .Pq Event A1H , Umask 02H
 The number of cycles micro-ops were dispatched for execution on port
 1.
 .It Li RS_UOPS_DISPATCHED.PORT2
 .Pq Event A1H , Umask 04H
 The number of cycles micro-ops were dispatched for execution on port
 2.
 .It Li RS_UOPS_DISPATCHED.PORT3
 .Pq Event A1H , Umask 08H
 The number of cycles micro-ops were dispatched for execution on port
 3.
 .It Li RS_UOPS_DISPATCHED.PORT4
 .Pq Event A1H , Umask 10H
 The number of cycles micro-ops were dispatched for execution on port
 4.
 .It Li RS_UOPS_DISPATCHED.PORT5
 .Pq Event A1H , Umask 20H
 The number of cycles micro-ops were dispatched for execution on port
 5.
 .It Li SB_DRAIN_CYCLES
 .Pq Event 04H , Umask 01H
 The number of cycles while the store buffer is draining.
 .It Li SEGMENT_REG_LOADS
 .Pq Event 06H , Umask 00H
 The number of segment register loads.
 .It Li SEG_REG_RENAMES.ANY
 .Pq Event D5H , Umask 0FH
 The number of times the any segment register was renamed.
 .It Li SEG_REG_RENAMES.DS
 .Pq Event D5H , Umask 02H
 The number of times the
 .Li %ds
 register is renamed.
 .It Li SEG_REG_RENAMES.ES
 .Pq Event D5H , Umask 01H
 The number of times the
 .Li %es
 register is renamed.
 .It Li SEG_REG_RENAMES.FS
 .Pq Event D5H , Umask 04H
 The number of times the
 .Li %fs
 register is renamed.
 .It Li SEG_REG_RENAMES.GS
 .Pq Event D5H , Umask 08H
 The number of times the
 .Li %gs
 register is renamed.
 .It Li SEG_RENAME_STALLS.ANY
 .Pq Event D4H , Umask 0FH
 The number of stalls due to lack of resource to rename any segment
 register.
 .It Li SEG_RENAME_STALLS.DS
 .Pq Event D4H , Umask 02H
 The number of stalls due to lack of renaming resources for the
 .Li %ds
 register.
 .It Li SEG_RENAME_STALLS.ES
 .Pq Event D4H , Umask 01H
 The number of stalls due to lack of renaming resources for the
 .Li %es
 register.
 .It Li SEG_RENAME_STALLS.FS
 .Pq Event D4H , Umask 04H
 The number of stalls due to lack of renaming resources for the
 .Li %fs
 register.
 .It Li SEG_RENAME_STALLS.GS
 .Pq Event D4H , Umask 08H
 The number of stalls due to lack of renaming resources for the
 .Li %gs
 register.
 .It Li SIMD_ASSIST
 .Pq Event CDH , Umask 00H
 The number SIMD assists invoked.
 .It Li SIMD_COMP_INST_RETIRED.PACKED_DOUBLE
 .Pq Event CAH , Umask 04H
 Then number of computational SSE2 packed double precision instructions
 retired.
 .It Li SIMD_COMP_INST_RETIRED.PACKED_SINGLE
 .Pq Event CAH , Umask 01H
 Then number of computational SSE2 packed single precision instructions
 retired.
 .It Li SIMD_COMP_INST_RETIRED.SCALAR_DOUBLE
 .Pq Event CAH , Umask 08H
 Then number of computational SSE2 scalar double precision instructions
 retired.
 .It Li SIMD_COMP_INST_RETIRED.SCALAR_SINGLE
 .Pq Event CAH , Umask 02H
 Then number of computational SSE2 scalar single precision instructions
 retired.
 .It Li SIMD_INSTR_RETIRED
 .Pq Event CEH , Umask 00H
 The number of retired SIMD instructions that use MMX registers.
 .It Li SIMD_INST_RETIRED.ANY
 .Pq Event C7H , Umask 1FH
 The number of streaming SIMD instructions retired.
 .It Li SIMD_INST_RETIRED.PACKED_DOUBLE
 .Pq Event C7H , Umask 04H
 The number of SSE2 packed double precision instructions retired.
 .It Li SIMD_INST_RETIRED.PACKED_SINGLE
 .Pq Event C7H , Umask 01H
 The number of SSE packed single precision instructions retired.
 .It Li SIMD_INST_RETIRED.SCALAR_DOUBLE
 .Pq Event C7H , Umask 08H
 The number of SSE2 scalar double precision instructions retired.
 .It Li SIMD_INST_RETIRED.SCALAR_SINGLE
 .Pq Event C7H , Umask 02H
 The number of SSE scalar single precision instructions retired.
 .It Li SIMD_INST_RETIRED.VECTOR
 .Pq Event C7H , Umask 10H
 The number of SSE2 vector instructions retired.
 .It Li SIMD_SAT_INSTR_RETIRED
 .Pq Event CFH , Umask 00H
 The number of saturated arithmetic SIMD instructions retired.
 .It Li SIMD_SAT_UOP_EXEC
 .Pq Event B1H , Umask 00H
 The number of SIMD saturated arithmetic micro-ops executed.
 .It Li SIMD_UOPS_EXEC
 .Pq Event B0H , Umask 00H
 The number of SIMD micro-ops executed.
 .It Li SIMD_UOP_TYPE_EXEC.ARITHMETIC
 .Pq Event B3H , Umask 20H
 The number of SIMD packed arithmetic micro-ops executed.
 .It Li SIMD_UOP_TYPE_EXEC.LOGICAL
 .Pq Event B3H , Umask 10H
 The number of SIMD packed logical micro-ops executed.
 .It Li SIMD_UOP_TYPE_EXEC.MUL
 .Pq Event B3H , Umask 01H
 The number of SIMD packed multiply micro-ops executed.
 .It Li SIMD_UOP_TYPE_EXEC.PACK
 .Pq Event B3H , Umask 04H
 The number of SIMD pack micro-ops executed.
 .It Li SIMD_UOP_TYPE_EXEC.SHIFT
 .Pq Event B3H , Umask 02H
 The number of SIMD packed shift micro-ops executed.
 .It Li SIMD_UOP_TYPE_EXEC.UNPACK
 .Pq Event B3H , Umask 08H
 The number of SIMD unpack micro-ops executed.
 .It Li SNOOP_STALL_DRV Xo
 .Op ,agent= Ns Ar agent
 .Op ,core= Ns Ar core
 .Xc
 .Pq Event 7EH
 The number of times the bus stalled for snoops.
 .It Li SSE_PRE_EXEC.L1
 .Pq Event 07H , Umask 01H
 The number of
 .Li PREFETCHT0
 instructions executed.
 .It Li SSE_PRE_EXEC.L2
 .Pq Event 07H , Umask 02H
 The number of
 .Li PREFETCHT1
 instructions executed.
 .It Li SSE_PRE_EXEC.NTA
 .Pq Event 07H , Umask 00H
 The number of
 .Li PREFETCHNTA
 instructions executed.
 .It Li SSE_PRE_EXEC.STORES
 .Pq Event 07H , Umask 03H
 The number of times SSE non-temporal store instructions were executed.
 .It Li SSE_PRE_MISS.L1
 .Pq Event 4BH , Umask 01H
 The number of times the
 .Li PREFETCHT0
 instruction executed and missed all cache levels.
 .It Li SSE_PRE_MISS.L2
 .Pq Event 4BH , Umask 02H
 The number of times the
 .Li PREFETCHT1
 instruction executed and missed all cache levels.
 .It Li SSE_PRE_MISS.NTA
 .Pq Event 4BH , Umask 00H
 The number of times the
 .Li PREFETCHNTA
 instruction executed and missed all cache levels.
 .It Li STORE_BLOCK.ORDER
 .Pq Event 04H , Umask 02H
 The number of cycles while a store was waiting for another store to be
 globally observed.
 .It Li STORE_BLOCK.SNOOP
 .Pq Event 04H , Umask 08H
 The number of cycles while a store was blocked due to a conflict with
 an internal or external snoop.
 .It Li THERMAL_TRIP
 .Pq Event 3BH , Umask C0H
 The number of thermal trips.
 .It Li UOPS_RETIRED.LD_IND_BR
 .Pq Event C2H , Umask 01H
 The number of micro-ops retired that fused a load with another
 operation.
 .It Li UOPS_RETIRED.STD_STA
 .Pq Event C2H , Umask 02H
 The number of store address calculations that fused into one micro-op.
 .It Li UOPS_RETIRED.MACRO_FUSION
 .Pq Event C2H , Umask 04H
 The number of times retired instruction pairs were fused into one
 micro-op.
 .It Li UOPS_RETIRED.FUSED
 .Pq Event C2H , Umask 07H
 The number of fused micro-ops retired.
 .It Li UOPS_RETIRED.NON_FUSED
 .Pq Event C2H , Umask 8H
 The number of non-fused micro-ops retired.
 .It Li UOPS_RETIRED.ANY
 .Pq Event C2H , Umask 0FH
 The number of micro-ops retired.
 .It Li X87_OPS_RETIRED.ANY
 .Pq Event C1H , Umask FEH
 The number of floating point computational instructions retired.
 .It Li X87_OPS_RETIRED.FXCH
 .Pq Event C1H , Umask 01H
 The number of
 .Li FXCH
 instructions retired.
 .El
 .Ss Event Name Aliases
 The following table shows the mapping between the PMC-independent
 aliases supported by
 .Lb libpmc
 and the underlying hardware events used.
 .Bl -column "branch-mispredicts" "cpu_clk_unhalted.core_p" "PMC Class"
 .It Em Alias Ta Em Event Ta Em PMC Class
 .It Li branches Ta Li BR_INST_RETIRED.ANY Ta Li PMC_CLASS_IAP
 .It Li branch-mispredicts Ta Li BR_INST_RETIRED.MISPRED Ta Li PMC_CLASS_IAP
 .It Li ic-misses Ta Li L1I_MISSES Ta Li PMC_CLASS_IAP
 .It Li instructions Ta Li INST_RETIRED.ANY_P Ta Li PMC_CLASS_IAF
 .It Li interrupts Ta Li HW_INT_RCV Ta Li PMC_CLASS_IAP
 .It Li unhalted-cycles Ta Li CPU_CLK_UNHALTED.CORE_P Ta Li PMC_CLASS_IAF
 .El
 .Sh SEE ALSO
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.iaf 3 ,
-.Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
 .Sh HISTORY
 The
 .Nm pmc
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
 The
 .Lb libpmc
 library was written by
 .An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/lib/libpmc/pmc.corei7.3 b/lib/libpmc/pmc.corei7.3
index 5f5436745478..ab7a47e79846 100644
--- a/lib/libpmc/pmc.corei7.3
+++ b/lib/libpmc/pmc.corei7.3
@@ -1,1601 +1,1600 @@
 .\" Copyright (c) 2010 Fabien Thomas.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .Dd March 24, 2010
 .Dt PMC.COREI7 3
 .Os
 .Sh NAME
 .Nm pmc.corei7
 .Nd measurement events for
 .Tn Intel
 .Tn Core i7 and Xeon 5500
 family CPUs
 .Sh LIBRARY
 .Lb libpmc
 .Sh SYNOPSIS
 .In pmc.h
 .Sh DESCRIPTION
 .Tn Intel
 .Tn "Core i7"
 CPUs contain PMCs conforming to version 2 of the
 .Tn Intel
 performance measurement architecture.
 These CPUs may contain up to three classes of PMCs:
 .Bl -tag -width "Li PMC_CLASS_IAP"
 .It Li PMC_CLASS_IAF
 Fixed-function counters that count only one hardware event per counter.
 .It Li PMC_CLASS_IAP
 Programmable counters that may be configured to count one of a defined
 set of hardware events.
 .El
 .Pp
 The number of PMCs available in each class and their widths need to be
 determined at run time by calling
 .Xr pmc_cpuinfo 3 .
 .Pp
 Intel Core i7 and Xeon 5500 PMCs are documented in
 .Rs
 .%B "Intel(R) 64 and IA-32 Architectures Software Developes Manual"
 .%T "Volume 3B: System Programming Guide, Part 2"
 .%N "Order Number: 253669-033US"
 .%D December 2009
 .%Q "Intel Corporation"
 .Re
 .Ss COREI7 AND XEON 5500 FIXED FUNCTION PMCS
 These PMCs and their supported events are documented in
 .Xr pmc.iaf 3 .
 Not all CPUs in this family implement fixed-function counters.
 .Ss COREI7 AND XEON 5500 PROGRAMMABLE PMCS
 The programmable PMCs support the following capabilities:
 .Bl -column "PMC_CAP_INTERRUPT" "Support"
 .It Em Capability Ta Em Support
 .It PMC_CAP_CASCADE Ta \&No
 .It PMC_CAP_EDGE Ta Yes
 .It PMC_CAP_INTERRUPT Ta Yes
 .It PMC_CAP_INVERT Ta Yes
 .It PMC_CAP_READ Ta Yes
 .It PMC_CAP_PRECISE Ta \&No
 .It PMC_CAP_SYSTEM Ta Yes
 .It PMC_CAP_TAGGING Ta \&No
 .It PMC_CAP_THRESHOLD Ta Yes
 .It PMC_CAP_USER Ta Yes
 .It PMC_CAP_WRITE Ta Yes
 .El
 .Ss Event Qualifiers
 Event specifiers for these PMCs support the following common
 qualifiers:
 .Bl -tag -width indent
 .It Li rsp= Ns Ar value
 Configure the Off-core Response bits.
 .Bl -tag -width indent
 .It Li DMND_DATA_RD
 Counts the number of demand and DCU prefetch data reads of full
 and partial cachelines as well as demand data page table entry
 cacheline reads.
 Does not count L2 data read prefetches or instruction fetches.
 .It Li DMND_RFO
 Counts the number of demand and DCU prefetch reads for ownership
 (RFO) requests generated by a write to data cacheline.
 Does not count L2 RFO.
 .It Li DMND_IFETCH
 Counts the number of demand and DCU prefetch instruction cacheline
 reads.
 Does not count L2 code read prefetches.
 WB Counts the number of writeback (modified to exclusive) transactions.
 .It Li PF_DATA_RD
 Counts the number of data cacheline reads generated by L2 prefetchers.
 .It Li PF_RFO
 Counts the number of RFO requests generated by L2 prefetchers.
 .It Li PF_IFETCH
 Counts the number of code reads generated by L2 prefetchers.
 .It Li OTHER
 Counts one of the following transaction types, including L3 invalidate,
 I/O, full or partial writes, WC or non-temporal stores, CLFLUSH, Fences,
 lock, unlock, split lock.
 .It Li UNCORE_HIT
 L3 Hit: local or remote home requests that hit L3 cache in the uncore
 with no coherency actions required (snooping).
 .It Li OTHER_CORE_HIT_SNP
 L3 Hit: local or remote home requests that hit L3 cache in the uncore
 and was serviced by another core with a cross core snoop where no modified
 copies were found (clean).
 .It Li OTHER_CORE_HITM
 L3 Hit: local or remote home requests that hit L3 cache in the uncore
 and was serviced by another core with a cross core snoop where modified
 copies were found (HITM).
 .It Li REMOTE_CACHE_FWD
 L3 Miss: local homed requests that missed the L3 cache and was serviced
 by forwarded data following a cross package snoop where no modified
 copies found. (Remote home requests are not counted)
 .It Li REMOTE_DRAM
 L3 Miss: remote home requests that missed the L3 cache and were serviced
 by remote DRAM.
 .It Li LOCAL_DRAM
 L3 Miss: local home requests that missed the L3 cache and were serviced
 by local DRAM.
 .It Li NON_DRAM
 Non-DRAM requests that were serviced by IOH.
 .El
 .It Li cmask= Ns Ar value
 Configure the PMC to increment only if the number of configured
 events measured in a cycle is greater than or equal to
 .Ar value .
 .It Li edge
 Configure the PMC to count the number of de-asserted to asserted
 transitions of the conditions expressed by the other qualifiers.
 If specified, the counter will increment only once whenever a
 condition becomes true, irrespective of the number of clocks during
 which the condition remains true.
 .It Li inv
 Invert the sense of comparison when the
 .Dq Li cmask
 qualifier is present, making the counter increment when the number of
 events per cycle is less than the value specified by the
 .Dq Li cmask
 qualifier.
 .It Li os
 Configure the PMC to count events happening at processor privilege
 level 0.
 .It Li usr
 Configure the PMC to count events occurring at privilege levels 1, 2
 or 3.
 .El
 .Pp
 If neither of the
 .Dq Li os
 or
 .Dq Li usr
 qualifiers are specified, the default is to enable both.
 .Ss Event Specifiers (Programmable PMCs)
 Core i7 and Xeon 5500 programmable PMCs support the following events:
 .Bl -tag -width indent
 .It Li SB_DRAIN.ANY
 .Pq Event 04H , Umask 07H
 Counts the number of store buffer drains.
 .It Li STORE_BLOCKS.AT_RET
 .Pq Event 06H , Umask 04H
 Counts number of loads delayed with at-Retirement block code.
 The following loads need to be executed at retirement and wait for all
 senior stores on the same thread to be drained: load splitting across
 4K boundary (page split), load accessing uncacheable
 (UC or USWC) memory, load lock, and load with page table in UC or USWC memory region.
 .It Li STORE_BLOCKS.L1D_BLOCK
 .Pq Event 06H , Umask 08H
 Cacheable loads delayed with L1D block code
 .It Li PARTIAL_ADDRESS_ALIAS
 .Pq Event 07H , Umask 01H
 Counts false dependency due to partial address aliasing
 .It Li DTLB_LOAD_MISSES.ANY
 .Pq Event 08H , Umask 01H
 Counts all load misses that cause a page walk
 .It Li DTLB_LOAD_MISSES.WALK_COMPLETED
 .Pq Event 08H , Umask 02H
 Counts number of completed page walks due to load miss in the STLB.
 .It Li DTLB_LOAD_MISSES.STLB_HIT
 .Pq Event 08H , Umask 10H
 Number of cache load STLB hits
 .It Li DTLB_LOAD_MISSES.PDE_MISS
 .Pq Event 08H , Umask 20H
 Number of DTLB cache load misses where the low part of the linear to
 physical address translation was missed.
 .It Li DTLB_LOAD_MISSES.LARGE_WALK_COMPLETED
 .Pq Event 08H , Umask 80H
 Counts number of completed large page walks due to load miss in the STLB.
 .It Li MEM_INST_RETIRED.LOADS
 .Pq Event 0BH , Umask 01H
 Counts the number of instructions with an architecturally-visible store
 retired on the architected path.
 In conjunction with ld_lat facility
 .It Li MEM_INST_RETIRED.STORES
 .Pq Event 0BH , Umask 02H
 Counts the number of instructions with an architecturally-visible store
 retired on the architected path.
 In conjunction with ld_lat facility
 .It Li MEM_INST_RETIRED.LATENCY_ABOVE_THRESHOLD
 .Pq Event 0BH , Umask 10H
 Counts the number of instructions exceeding the latency specified with
 ld_lat facility.
 In conjunction with ld_lat facility
 .It Li MEM_STORE_RETIRED.DTLB_MISS
 .Pq Event 0CH , Umask 01H
 The event counts the number of retired stores that missed the DTLB.
 The DTLB miss is not counted if the store operation causes a fault.
 Does not counter prefetches.
 Counts both primary and secondary misses to the TLB
 .It Li UOPS_ISSUED.ANY
 .Pq Event 0EH , Umask 01H
 Counts the number of Uops issued by the Register Allocation Table to the
 Reservation Station, i.e. the UOPs issued from the front end to the back
 end.
 .It Li UOPS_ISSUED.STALLED_CYCLES
 .Pq Event 0EH , Umask 01H
 Counts the number of cycles no Uops issued by the Register Allocation Table
 to the Reservation Station, i.e. the UOPs issued from the front end to the
 back end.
 set invert=1, cmask = 1
 .It Li UOPS_ISSUED.FUSED
 .Pq Event 0EH , Umask 02H
 Counts the number of fused Uops that were issued from the Register
 Allocation Table to the Reservation Station.
 .It Li MEM_UNCORE_RETIRED.L3_DATA_MISS_UNKNOWN
 .Pq Event 0FH , Umask 01H
 Counts number of memory load instructions retired where the memory reference
 missed L3 and data source is unknown.
 Available only for CPUID signature 06_2EH
 .It Li MEM_UNCORE_RETIRED.OTHER_CORE_L2_HITM
 .Pq Event 0FH , Umask 02H
 Counts number of memory load instructions retired where the memory reference
 hit modified data in a sibling core residing on the same socket.
 .It Li MEM_UNCORE_RETIRED.REMOTE_CACHE_LOCAL_HOME_HIT
 .Pq Event 0FH , Umask 08H
 Counts number of memory load instructions retired where the memory reference
 missed the L1, L2 and L3 caches and HIT in a remote socket's cache.
 Only counts locally homed lines.
 .It Li MEM_UNCORE_RETIRED.REMOTE_DRAM
 .Pq Event 0FH , Umask 10H
 Counts number of memory load instructions retired where the memory reference
 missed the L1, L2 and L3 caches and was remotely homed.
 This includes both DRAM access and HITM in a remote socket's cache
 for remotely homed lines.
 .It Li MEM_UNCORE_RETIRED.LOCAL_DRAM
 .Pq Event 0FH , Umask 20H
 Counts number of memory load instructions retired where the memory reference
 missed the L1, L2 and L3 caches and required a local socket memory
 reference.
 This includes locally homed cachelines that were in a modified
 state in another socket.
 .It Li MEM_UNCORE_RETIRED.UNCACHEABLE
 .Pq Event 0FH , Umask 80H
 Counts number of memory load instructions retired where the memory reference
 missed the L1, L2 and L3 caches and to perform I/O.
 Available only for CPUID signature 06_2EH
 .It Li FP_COMP_OPS_EXE.X87
 .Pq Event 10H , Umask 01H
 Counts the number of FP Computational Uops Executed.
 The number of FADD, FSUB, FCOM, FMULs, integer MULsand IMULs, FDIVs, FPREMs, FSQRTS, integer
 DIVs, and IDIVs.
 This event does not distinguish an FADD used in the middle of a transcendental flow from a separate FADD instruction.
 .It Li FP_COMP_OPS_EXE.MMX
 .Pq Event 10H , Umask 02H
 Counts number of MMX Uops executed.
 .It Li FP_COMP_OPS_EXE.SSE_FP
 .Pq Event 10H , Umask 04H
 Counts number of SSE and SSE2 FP uops executed.
 .It Li FP_COMP_OPS_EXE.SSE2_INTEGER
 .Pq Event 10H , Umask 08H
 Counts number of SSE2 integer uops executed.
 .It Li FP_COMP_OPS_EXE.SSE_FP_PACKED
 .Pq Event 10H , Umask 10H
 Counts number of SSE FP packed uops executed.
 .It Li FP_COMP_OPS_EXE.SSE_FP_SCALAR
 .Pq Event 10H , Umask 20H
 Counts number of SSE FP scalar uops executed.
 .It Li FP_COMP_OPS_EXE.SSE_SINGLE_PRECISION
 .Pq Event 10H , Umask 40H
 Counts number of SSE* FP single precision uops executed.
 .It Li FP_COMP_OPS_EXE.SSE_DOUBLE_PRECISION
 .Pq Event 10H , Umask 80H
 Counts number of SSE* FP double precision uops executed.
 .It Li SIMD_INT_128.PACKED_MPY
 .Pq Event 12H , Umask 01H
 Counts number of 128 bit SIMD integer multiply operations.
 .It Li SIMD_INT_128.PACKED_SHIFT
 .Pq Event 12H , Umask 02H
 Counts number of 128 bit SIMD integer shift operations.
 .It Li SIMD_INT_128.PACK
 .Pq Event 12H , Umask 04H
 Counts number of 128 bit SIMD integer pack operations.
 .It Li SIMD_INT_128.UNPACK
 .Pq Event 12H , Umask 08H
 Counts number of 128 bit SIMD integer unpack operations.
 .It Li SIMD_INT_128.PACKED_LOGICAL
 .Pq Event 12H , Umask 10H
 Counts number of 128 bit SIMD integer logical operations.
 .It Li SIMD_INT_128.PACKED_ARITH
 .Pq Event 12H , Umask 20H
 Counts number of 128 bit SIMD integer arithmetic operations.
 .It Li SIMD_INT_128.SHUFFLE_MOVE
 .Pq Event 12H , Umask 40H
 Counts number of 128 bit SIMD integer shuffle and move operations.
 .It Li LOAD_DISPATCH.RS
 .Pq Event 13H , Umask 01H
 Counts number of loads dispatched from the Reservation Station that bypass
 the Memory Order Buffer.
 .It Li LOAD_DISPATCH.RS_DELAYED
 .Pq Event 13H , Umask 02H
 Counts the number of delayed RS dispatches at the stage latch.
 If an RS dispatch can not bypass to LB, it has another chance to dispatch from the
 one-cycle delayed staging latch before it is written into the LB.
 .It Li LOAD_DISPATCH.MOB
 .Pq Event 13H , Umask 04H
 Counts the number of loads dispatched from the Reservation Station to the
 Memory Order Buffer.
 .It Li LOAD_DISPATCH.ANY
 .Pq Event 13H , Umask 07H
 Counts all loads dispatched from the Reservation Station.
 .It Li ARITH.CYCLES_DIV_BUSY
 .Pq Event 14H , Umask 01H
 Counts the number of cycles the divider is busy executing divide or square
 root operations.
 The divide can be integer, X87 or Streaming SIMD Extensions (SSE).
 The square root operation can be either X87 or SSE.
 Set 'edge =1, invert=1, cmask=1' to count the number of divides.
 Count may be incorrect When SMT is on.
 .It Li ARITH.MUL
 .Pq Event 14H , Umask 02H
 Counts the number of multiply operations executed.
 This includes integer as well as floating point multiply operations but excludes DPPS mul and MPSAD.
 Count may be incorrect When SMT is on
 .It Li INST_QUEUE_WRITES
 .Pq Event 17H , Umask 01H
 Counts the number of instructions written into the instruction queue every
 cycle.
 .It Li INST_DECODED.DEC0
 .Pq Event 18H , Umask 01H
 Counts number of instructions that require decoder 0 to be decoded.
 Usually, this means that the instruction maps to more than 1 uop
 .It Li TWO_UOP_INSTS_DECODED
 .Pq Event 19H , Umask 01H
 An instruction that generates two uops was decoded
 .It Li INST_QUEUE_WRITE_CYCLES
 .Pq Event 1EH , Umask 01H
 This event counts the number of cycles during which instructions are written
 to the instruction queue.
 Dividing this counter by the number of instructions written to the
 instruction queue (INST_QUEUE_WRITES) yields the average number of
 instructions decoded each cycle.
 If this number is less than four and the pipe stalls, this indicates that the decoder is failing to
 decode enough instructions per cycle to sustain the 4-wide pipeline.
 If SSE* instructions that are 6 bytes or longer arrive one after another,
 then front end throughput may limit execution speed.
 In such case,
 .It Li LSD_OVERFLOW
 .Pq Event 20H , Umask 01H
 Counts number of loops that cant stream from the instruction queue.
 .It Li L2_RQSTS.LD_HIT
 .Pq Event 24H , Umask 01H
 Counts number of loads that hit the L2 cache.
 L2 loads include both L1D demand misses as well as L1D prefetches.
 L2 loads can be rejected for various reasons.
 Only non rejected loads are counted.
 .It Li L2_RQSTS.LD_MISS
 .Pq Event 24H , Umask 02H
 Counts the number of loads that miss the L2 cache.
 L2 loads include both L1D demand misses as well as L1D prefetches.
 .It Li L2_RQSTS.LOADS
 .Pq Event 24H , Umask 03H
 Counts all L2 load requests.
 L2 loads include both L1D demand misses as well as L1D prefetches.
 .It Li L2_RQSTS.RFO_HIT
 .Pq Event 24H , Umask 04H
 Counts the number of store RFO requests that hit the L2 cache.
 L2 RFO requests include both L1D demand RFO misses as well as L1D RFO prefetches.
 Count includes WC memory requests, where the data is not fetched but the
 permission to write the line is required.
 .It Li L2_RQSTS.RFO_MISS
 .Pq Event 24H , Umask 08H
 Counts the number of store RFO requests that miss the L2 cache.
 L2 RFO requests include both L1D demand RFO misses as well as L1D RFO prefetches.
 .It Li L2_RQSTS.RFOS
 .Pq Event 24H , Umask 0CH
 Counts all L2 store RFO requests.
 L2 RFO requests include both L1D demand RFO misses as well as L1D RFO prefetches.
 .It Li L2_RQSTS.IFETCH_HIT
 .Pq Event 24H , Umask 10H
 Counts number of instruction fetches that hit the L2 cache.
 L2 instruction fetches include both L1I demand misses as well as L1I instruction
 prefetches.
 .It Li L2_RQSTS.IFETCH_MISS
 .Pq Event 24H , Umask 20H
 Counts number of instruction fetches that miss the L2 cache.
 L2 instruction fetches include both L1I demand misses as well as L1I instruction
 prefetches.
 .It Li L2_RQSTS.IFETCHES
 .Pq Event 24H , Umask 30H
 Counts all instruction fetches.
 L2 instruction fetches include both L1I demand misses as well as L1I instruction prefetches.
 .It Li L2_RQSTS.PREFETCH_HIT
 .Pq Event 24H , Umask 40H
 Counts L2 prefetch hits for both code and data.
 .It Li L2_RQSTS.PREFETCH_MISS
 .Pq Event 24H , Umask 80H
 Counts L2 prefetch misses for both code and data.
 .It Li L2_RQSTS.PREFETCHES
 .Pq Event 24H , Umask C0H
 Counts all L2 prefetches for both code and data.
 .It Li L2_RQSTS.MISS
 .Pq Event 24H , Umask AAH
 Counts all L2 misses for both code and data.
 .It Li L2_RQSTS.REFERENCES
 .Pq Event 24H , Umask FFH
 Counts all L2 requests for both code and data.
 .It Li L2_DATA_RQSTS.DEMAND.I_STATE
 .Pq Event 26H , Umask 01H
 Counts number of L2 data demand loads where the cache line to be loaded is
 in the I (invalid) state, i.e. a cache miss.
 L2 demand loads are both L1D demand misses and L1D prefetches.
 .It Li L2_DATA_RQSTS.DEMAND.S_STATE
 .Pq Event 26H , Umask 02H
 Counts number of L2 data demand loads where the cache line to be loaded is
 in the S (shared) state.
 L2 demand loads are both L1D demand misses and L1D prefetches.
 .It Li L2_DATA_RQSTS.DEMAND.E_STATE
 .Pq Event 26H , Umask 04H
 Counts number of L2 data demand loads where the cache line to be loaded is
 in the E (exclusive) state.
 L2 demand loads are both L1D demand misses and L1D prefetches.
 .It Li L2_DATA_RQSTS.DEMAND.M_STATE
 .Pq Event 26H , Umask 08H
 Counts number of L2 data demand loads where the cache line to be loaded is
 in the M (modified) state.
 L2 demand loads are both L1D demand misses and L1D prefetches.
 .It Li L2_DATA_RQSTS.DEMAND.MESI
 .Pq Event 26H , Umask 0FH
 Counts all L2 data demand requests.
 L2 demand loads are both L1D demand misses and L1D prefetches.
 .It Li L2_DATA_RQSTS.PREFETCH.I_STATE
 .Pq Event 26H , Umask 10H
 Counts number of L2 prefetch data loads where the cache line to be loaded is
 in the I (invalid) state, i.e. a cache miss.
 .It Li L2_DATA_RQSTS.PREFETCH.S_STATE
 .Pq Event 26H , Umask 20H
 Counts number of L2 prefetch data loads where the cache line to be loaded is
 in the S (shared) state.
 A prefetch RFO will miss on an S state line, while a prefetch read will
 hit on an S state line.
 .It Li L2_DATA_RQSTS.PREFETCH.E_STATE
 .Pq Event 26H , Umask 40H
 Counts number of L2 prefetch data loads where the cache line to be loaded is
 in the E (exclusive) state.
 .It Li L2_DATA_RQSTS.PREFETCH.M_STATE
 .Pq Event 26H , Umask 80H
 Counts number of L2 prefetch data loads where the cache line to be loaded is
 in the M (modified) state.
 .It Li L2_DATA_RQSTS.PREFETCH.MESI
 .Pq Event 26H , Umask F0H
 Counts all L2 prefetch requests.
 .It Li L2_DATA_RQSTS.ANY
 .Pq Event 26H , Umask FFH
 Counts all L2 data requests.
 .It Li L2_WRITE.RFO.I_STATE
 .Pq Event 27H , Umask 01H
 Counts number of L2 demand store RFO requests where the cache line to be
 loaded is in the I (invalid) state, i.e, a cache miss.
 The L1D prefetcher does not issue a RFO prefetch.
 This is a demand RFO request
 .It Li L2_WRITE.RFO.S_STATE
 .Pq Event 27H , Umask 02H
 Counts number of L2 store RFO requests where the cache line to be loaded is
 in the S (shared) state.
 The L1D prefetcher does not issue a RFO prefetch.
 This is a demand RFO request
 .It Li L2_WRITE.RFO.M_STATE
 .Pq Event 27H , Umask 08H
 Counts number of L2 store RFO requests where the cache line to be loaded is
 in the M (modified) state.
 The L1D prefetcher does not issue a RFO prefetch.
 This is a demand RFO request
 .It Li L2_WRITE.RFO.HIT
 .Pq Event 27H , Umask 0EH
 Counts number of L2 store RFO requests where the cache line to be loaded is
 in either the S, E or M states.
 The L1D prefetcher does not issue a RFO prefetch.
 This is a demand RFO request
 .It Li L2_WRITE.RFO.MESI
 .Pq Event 27H , Umask 0FH
 Counts all L2 store RFO requests.
 The L1D prefetcher does not issue a RFO prefetch.
 This is a demand RFO request
 .It Li L2_WRITE.LOCK.I_STATE
 .Pq Event 27H , Umask 10H
 Counts number of L2 demand lock RFO requests where the cache line to be
 loaded is in the I (invalid) state, i.e. a cache miss.
 .It Li L2_WRITE.LOCK.S_STATE
 .Pq Event 27H , Umask 20H
 Counts number of L2 lock RFO requests where the cache line to be loaded is
 in the S (shared) state.
 .It Li L2_WRITE.LOCK.E_STATE
 .Pq Event 27H , Umask 40H
 Counts number of L2 demand lock RFO requests where the cache line to be
 loaded is in the E (exclusive) state.
 .It Li L2_WRITE.LOCK.M_STATE
 .Pq Event 27H , Umask 80H
 Counts number of L2 demand lock RFO requests where the cache line to be
 loaded is in the M (modified) state.
 .It Li L2_WRITE.LOCK.HIT
 .Pq Event 27H , Umask E0H
 Counts number of L2 demand lock RFO requests where the cache line to be
 loaded is in either the S, E, or M state.
 .It Li L2_WRITE.LOCK.MESI
 .Pq Event 27H , Umask F0H
 Counts all L2 demand lock RFO requests.
 .It Li L1D_WB_L2.I_STATE
 .Pq Event 28H , Umask 01H
 Counts number of L1 writebacks to the L2 where the cache line to be written
 is in the I (invalid) state, i.e. a cache miss.
 .It Li L1D_WB_L2.S_STATE
 .Pq Event 28H , Umask 02H
 Counts number of L1 writebacks to the L2 where the cache line to be written
 is in the S state.
 .It Li L1D_WB_L2.E_STATE
 .Pq Event 28H , Umask 04H
 Counts number of L1 writebacks to the L2 where the cache line to be written
 is in the E (exclusive) state.
 .It Li L1D_WB_L2.M_STATE
 .Pq Event 28H , Umask 08H
 Counts number of L1 writebacks to the L2 where the cache line to be written
 is in the M (modified) state.
 .It Li L1D_WB_L2.MESI
 .Pq Event 28H , Umask 0FH
 Counts all L1 writebacks to the L2.
 .It Li L3_LAT_CACHE.REFERENCE
 .Pq Event 2EH , Umask 4FH
 This event counts requests originating from the core that reference a cache
 line in the last level cache.
 The event count includes speculative traffic but excludes cache line fills
 due to a L2 hardware-prefetch.
 Because cache hierarchy, cache sizes and other implementation-specific
 characteristics; value comparison to estimate performance differences is not recommended.
 see Table A-1
 .It Li L3_LAT_CACHE.MISS
 .Pq Event 2EH , Umask 41H
 This event counts each cache miss condition for references to the last level
 cache.
 The event count may include speculative traffic but excludes cache
 line fills due to L2 hardware-prefetches.
 Because cache hierarchy, cache sizes and other implementation-specific
 characteristics; value comparison to estimate performance differences is not recommended.
 see Table A-1
 .It Li CPU_CLK_UNHALTED.THREAD_P
 .Pq Event 3CH , Umask 00H
 Counts the number of thread cycles while the thread is not in a halt state.
 The thread enters the halt state when it is running the HLT instruction.
 The core frequency may change from time to time due to power or thermal throttling.
 see Table A-1
 .It Li CPU_CLK_UNHALTED.REF_P
 .Pq Event 3CH , Umask 01H
 Increments at the frequency of TSC when not halted.
 see Table A-1
 .It Li L1D_CACHE_LD.I_STATE
 .Pq Event 40H , Umask 01H
 Counts L1 data cache read requests where the cache line to be loaded is in
 the I (invalid) state, i.e. the read request missed the cache.
 Counter 0, 1 only
 .It Li L1D_CACHE_LD.S_STATE
 .Pq Event 40H , Umask 02H
 Counts L1 data cache read requests where the cache line to be loaded is in
 the S (shared) state.
 Counter 0, 1 only
 .It Li L1D_CACHE_LD.E_STATE
 .Pq Event 40H , Umask 04H
 Counts L1 data cache read requests where the cache line to be loaded is in
 the E (exclusive) state.
 Counter 0, 1 only
 .It Li L1D_CACHE_LD.M_STATE
 .Pq Event 40H , Umask 08H
 Counts L1 data cache read requests where the cache line to be loaded is in
 the M (modified) state.
 Counter 0, 1 only
 .It Li L1D_CACHE_LD.MESI
 .Pq Event 40H , Umask 0FH
 Counts L1 data cache read requests.
 Counter 0, 1 only
 .It Li L1D_CACHE_ST.S_STATE
 .Pq Event 41H , Umask 02H
 Counts L1 data cache store RFO requests where the cache line to be loaded is
 in the S (shared) state.
 Counter 0, 1 only
 .It Li L1D_CACHE_ST.E_STATE
 .Pq Event 41H , Umask 04H
 Counts L1 data cache store RFO requests where the cache line to be loaded is
 in the E (exclusive) state.
 Counter 0, 1 only
 .It Li L1D_CACHE_ST.M_STATE
 .Pq Event 41H , Umask 08H
 Counts L1 data cache store RFO requests where cache line to be loaded is in
 the M (modified) state.
 Counter 0, 1 only
 .It Li L1D_CACHE_LOCK.HIT
 .Pq Event 42H , Umask 01H
 Counts retired load locks that hit in the L1 data cache or hit in an already
 allocated fill buffer.
 The lock portion of the load lock transaction must hit in the L1D.
 The initial load will pull the lock into the L1 data cache.
 Counter 0, 1 only
 .It Li L1D_CACHE_LOCK.S_STATE
 .Pq Event 42H , Umask 02H
 Counts L1 data cache retired load locks that hit the target cache line in
 the shared state.
 Counter 0, 1 only
 .It Li L1D_CACHE_LOCK.E_STATE
 .Pq Event 42H , Umask 04H
 Counts L1 data cache retired load locks that hit the target cache line in
 the exclusive state.
 Counter 0, 1 only
 .It Li L1D_CACHE_LOCK.M_STATE
 .Pq Event 42H , Umask 08H
 Counts L1 data cache retired load locks that hit the target cache line in
 the modified state.
 Counter 0, 1 only
 .It Li L1D_ALL_REF.ANY
 .Pq Event 43H , Umask 01H
 Counts all references (uncached, speculated and retired) to the L1 data
 cache, including all loads and stores with any memory types.
 The event counts memory accesses only when they are actually performed.
 For example, a load blocked by unknown store address and later performed
 is only counted once.
 The event does not include non- memory accesses, such as I/O accesses.
 Counter 0, 1 only
 .It Li L1D_ALL_REF.CACHEABLE
 .Pq Event 43H , Umask 02H
 Counts all data reads and writes (speculated and retired) from cacheable
 memory, including locked operations.
 Counter 0, 1 only
 .It Li DTLB_MISSES.ANY
 .Pq Event 49H , Umask 01H
 Counts the number of misses in the STLB which causes a page walk.
 .It Li DTLB_MISSES.WALK_COMPLETED
 .Pq Event 49H , Umask 02H
 Counts number of misses in the STLB which resulted in a completed page walk.
 .It Li DTLB_MISSES.STLB_HIT
 .Pq Event 49H , Umask 10H
 Counts the number of DTLB first level misses that hit in the second level TLB.
 This event is only relevant if the core contains multiple DTLB levels.
 .It Li DTLB_MISSES.PDE_MISS
 .Pq Event 49H , Umask 20H
 Number of DTLB misses caused by low part of address, includes references to 2M pages because 2M pages do not use the PDE.
 .It Li DTLB_MISSES.LARGE_WALK_COMPLETED
 .Pq Event 49H , Umask 80H
 Counts number of misses in the STLB which resulted in a completed page walk for large pages.
 .It Li LOAD_HIT_PRE
 .Pq Event 4CH , Umask 01H
 Counts load operations sent to the L1 data cache while a previous SSE
 prefetch instruction to the same cache line has started prefetching but has
 not yet finished.
 .It Li L1D_PREFETCH.REQUESTS
 .Pq Event 4EH , Umask 01H
 Counts number of hardware prefetch requests dispatched out of the prefetch
 FIFO.
 .It Li L1D_PREFETCH.MISS
 .Pq Event 4EH , Umask 02H
 Counts number of hardware prefetch requests that miss the L1D.
 There are two prefetchers in the L1D.
 A streamer, which predicts lines sequentially after this one should be fetched,
 and the IP prefetcher that remembers access patterns for the current instruction.
 The streamer prefetcher stops on an L1D hit, while the IP prefetcher does not.
 .It Li L1D_PREFETCH.TRIGGERS
 .Pq Event 4EH , Umask 04H
 Counts number of prefetch requests triggered by the Finite State Machine and
 pushed into the prefetch FIFO.
 Some of the prefetch requests are dropped due to overwrites or competition between
 the IP index prefetcher and streamer prefetcher.
 The prefetch FIFO contains 4 entries.
 .It Li L1D.REPL
 .Pq Event 51H , Umask 01H
 Counts the number of lines brought into the L1 data cache.
 Counter 0, 1 only
 .It Li L1D.M_REPL
 .Pq Event 51H , Umask 02H
 Counts the number of modified lines brought into the L1 data cache.
 Counter 0, 1 only
 .It Li L1D.M_EVICT
 .Pq Event 51H , Umask 04H
 Counts the number of modified lines evicted from the L1 data cache due to
 replacement.
 Counter 0, 1 only
 .It Li L1D.M_SNOOP_EVICT
 .Pq Event 51H , Umask 08H
 Counts the number of modified lines evicted from the L1 data cache due to
 snoop HITM intervention.
 Counter 0, 1 only
 .It Li L1D_CACHE_PREFETCH_LOCK_FB_HIT
 .Pq Event 52H , Umask 01H
 Counts the number of cacheable load lock speculated instructions accepted
 into the fill buffer.
 .It Li L1D_CACHE_LOCK_FB_HIT
 .Pq Event 53H , Umask 01H
 Counts the number of cacheable load lock speculated or retired instructions
 accepted into the fill buffer.
 .It Li CACHE_LOCK_CYCLES.L1D_L2
 .Pq Event 63H , Umask 01H
 Cycle count during which the L1D and L2 are locked.
 A lock is asserted when there is a locked memory access, due to uncacheable memory, a locked
 operation that spans two cache lines, or a page walk from an uncacheable
 page table.
 Counter 0, 1 only.
 L1D and L2 locks have a very high performance penalty and it is highly recommended to
 avoid such accesses.
 .It Li CACHE_LOCK_CYCLES.L1D
 .Pq Event 63H , Umask 02H
 Counts the number of cycles that cacheline in the L1 data cache unit is
 locked.
 Counter 0, 1 only.
 .It Li IO_TRANSACTIONS
 .Pq Event 6CH , Umask 01H
 Counts the number of completed I/O transactions.
 .It Li L1I.HITS
 .Pq Event 80H , Umask 01H
 Counts all instruction fetches that hit the L1 instruction cache.
 .It Li L1I.MISSES
 .Pq Event 80H , Umask 02H
 Counts all instruction fetches that miss the L1I cache.
 This includes instruction cache misses, streaming buffer misses, victim cache misses and
 uncacheable fetches.
 An instruction fetch miss is counted only once and not once for every cycle
 it is outstanding.
 .It Li L1I.READS
 .Pq Event 80H , Umask 03H
 Counts all instruction fetches, including uncacheable fetches that bypass
 the L1I.
 .It Li L1I.CYCLES_STALLED
 .Pq Event 80H , Umask 04H
 Cycle counts for which an instruction fetch stalls due to a L1I cache miss,
 ITLB miss or ITLB fault.
 .It Li LARGE_ITLB.HIT
 .Pq Event 82H , Umask 01H
 Counts number of large ITLB hits.
 .It Li ITLB_MISSES.ANY
 .Pq Event 85H , Umask 01H
 Counts the number of misses in all levels of the ITLB which causes a page
 walk.
 .It Li ITLB_MISSES.WALK_COMPLETED
 .Pq Event 85H , Umask 02H
 Counts number of misses in all levels of the ITLB which resulted in a
 completed page walk.
 .It Li ILD_STALL.LCP
 .Pq Event 87H , Umask 01H
 Cycles Instruction Length Decoder stalls due to length changing prefixes:
 66, 67 or REX.W (for EM64T) instructions which change the length of the
 decoded instruction.
 .It Li ILD_STALL.MRU
 .Pq Event 87H , Umask 02H
 Instruction Length Decoder stall cycles due to Brand Prediction Unit (PBU)
 Most Recently Used (MRU) bypass.
 .It Li ILD_STALL.IQ_FULL
 .Pq Event 87H , Umask 04H
 Stall cycles due to a full instruction queue.
 .It Li ILD_STALL.REGEN
 .Pq Event 87H , Umask 08H
 Counts the number of regen stalls.
 .It Li ILD_STALL.ANY
 .Pq Event 87H , Umask 0FH
 Counts any cycles the Instruction Length Decoder is stalled.
 .It Li BR_INST_EXEC.COND
 .Pq Event 88H , Umask 01H
 Counts the number of conditional near branch instructions executed, but not
 necessarily retired.
 .It Li BR_INST_EXEC.DIRECT
 .Pq Event 88H , Umask 02H
 Counts all unconditional near branch instructions excluding calls and
 indirect branches.
 .It Li BR_INST_EXEC.INDIRECT_NON_CALL
 .Pq Event 88H , Umask 04H
 Counts the number of executed indirect near branch instructions that are not
 calls.
 .It Li BR_INST_EXEC.NON_CALLS
 .Pq Event 88H , Umask 07H
 Counts all non call near branch instructions executed, but not necessarily
 retired.
 .It Li BR_INST_EXEC.RETURN_NEAR
 .Pq Event 88H , Umask 08H
 Counts indirect near branches that have a return mnemonic.
 .It Li BR_INST_EXEC.DIRECT_NEAR_CALL
 .Pq Event 88H , Umask 10H
 Counts unconditional near call branch instructions, excluding non call
 branch, executed.
 .It Li BR_INST_EXEC.INDIRECT_NEAR_CALL
 .Pq Event 88H , Umask 20H
 Counts indirect near calls, including both register and memory indirect,
 executed.
 .It Li BR_INST_EXEC.NEAR_CALLS
 .Pq Event 88H , Umask 30H
 Counts all near call branches executed, but not necessarily retired.
 .It Li BR_INST_EXEC.TAKEN
 .Pq Event 88H , Umask 40H
 Counts taken near branches executed, but not necessarily retired.
 .It Li BR_INST_EXEC.ANY
 .Pq Event 88H , Umask 7FH
 Counts all near executed branches (not necessarily retired).
 This includes only instructions and not micro-op branches.
 Frequent branching is not necessarily a major performance issue.
 However frequent branch mispredictions may be a problem.
 .It Li BR_MISP_EXEC.COND
 .Pq Event 89H , Umask 01H
 Counts the number of mispredicted conditional near branch instructions
 executed, but not necessarily retired.
 .It Li BR_MISP_EXEC.DIRECT
 .Pq Event 89H , Umask 02H
 Counts mispredicted macro unconditional near branch instructions, excluding
 calls and indirect branches (should always be 0).
 .It Li BR_MISP_EXEC.INDIRECT_NON_CALL
 .Pq Event 89H , Umask 04H
 Counts the number of executed mispredicted indirect near branch instructions
 that are not calls.
 .It Li BR_MISP_EXEC.NON_CALLS
 .Pq Event 89H , Umask 07H
 Counts mispredicted non call near branches executed, but not necessarily
 retired.
 .It Li BR_MISP_EXEC.RETURN_NEAR
 .Pq Event 89H , Umask 08H
 Counts mispredicted indirect branches that have a rear return mnemonic.
 .It Li BR_MISP_EXEC.DIRECT_NEAR_CALL
 .Pq Event 89H , Umask 10H
 Counts mispredicted non-indirect near calls executed, (should always be 0).
 .It Li BR_MISP_EXEC.INDIRECT_NEAR_CALL
 .Pq Event 89H , Umask 20H
 Counts mispredicted indirect near calls executed, including both register
 and memory indirect.
 .It Li BR_MISP_EXEC.NEAR_CALLS
 .Pq Event 89H , Umask 30H
 Counts all mispredicted near call branches executed, but not necessarily
 retired.
 .It Li BR_MISP_EXEC.TAKEN
 .Pq Event 89H , Umask 40H
 Counts executed mispredicted near branches that are taken, but not
 necessarily retired.
 .It Li BR_MISP_EXEC.ANY
 .Pq Event 89H , Umask 7FH
 Counts the number of mispredicted near branch instructions that were
 executed, but not necessarily retired.
 .It Li RESOURCE_STALLS.ANY
 .Pq Event A2H , Umask 01H
 Counts the number of Allocator resource related stalls.
 Includes register renaming buffer entries, memory buffer entries.
 In addition to resource related stalls, this event counts some other events.
 Includes stalls arising during branch misprediction recovery, such as if retirement of the
 mispredicted branch is delayed and stalls arising while store buffer is
 draining from synchronizing operations.
 Does not include stalls due to SuperQ (off core) queue full, too many cache
 misses, etc.
 .It Li RESOURCE_STALLS.LOAD
 .Pq Event A2H , Umask 02H
 Counts the cycles of stall due to lack of load buffer for load operation.
 .It Li RESOURCE_STALLS.RS_FULL
 .Pq Event A2H , Umask 04H
 This event counts the number of cycles when the number of instructions in
 the pipeline waiting for execution reaches the limit the processor can handle.
 A high count of this event indicates that there are long latency
 operations in the pipe (possibly load and store operations that miss the L2
 cache, or instructions dependent upon instructions further down the pipeline
 that have yet to retire.
 When RS is full, new instructions can not enter the reservation station and
 start execution.
 .It Li RESOURCE_STALLS.STORE
 .Pq Event A2H , Umask 08H
 This event counts the number of cycles that a resource related stall will
 occur due to the number of store instructions reaching the limit of the
 pipeline, (i.e. all store buffers are used).
 The stall ends when a store instruction commits its data to the cache or memory.
 .It Li RESOURCE_STALLS.ROB_FULL
 .Pq Event A2H , Umask 10H
 Counts the cycles of stall due to re- order buffer full.
 .It Li RESOURCE_STALLS.FPCW
 .Pq Event A2H , Umask 20H
 Counts the number of cycles while execution was stalled due to writing the
 floating-point unit (FPU) control word.
 .It Li RESOURCE_STALLS.MXCSR
 .Pq Event A2H , Umask 40H
 Stalls due to the MXCSR register rename occurring to close to a previous
 MXCSR rename.
 The MXCSR provides control and status for the MMX registers.
 .It Li RESOURCE_STALLS.OTHER
 .Pq Event A2H , Umask 80H
 Counts the number of cycles while execution was stalled due to other
 resource issues.
 .It Li MACRO_INSTS.FUSIONS_DECODED
 .Pq Event A6H , Umask 01H
 Counts the number of instructions decoded that are macro-fused but not
 necessarily executed or retired.
 .It Li BACLEAR_FORCE_IQ
 .Pq Event A7H , Umask 01H
 Counts number of times a BACLEAR was forced by the Instruction Queue.
 The IQ is also responsible for providing conditional branch prediction direction
 based on a static scheme and dynamic data provided by the L2 Branch
 Prediction Unit.
 If the conditional branch target is not found in the Target Array and the IQ
 predicts that the branch is taken, then the IQ will force
 the Branch Address Calculator to issue a BACLEAR.
 Each BACLEAR asserted by the BAC generates approximately an 8 cycle bubble
 in the instruction fetch pipeline.
 .It Li LSD.UOPS
 .Pq Event A8H , Umask 01H
 Counts the number of micro-ops delivered by loop stream detector
 Use cmask=1 and invert to count cycles
 .It Li ITLB_FLUSH
 .Pq Event AEH , Umask 01H
 Counts the number of ITLB flushes
 .It Li OFFCORE_REQUESTS.L1D_WRITEBACK
 .Pq Event B0H , Umask 40H
 Counts number of L1D writebacks to the uncore.
 .It Li UOPS_EXECUTED.PORT0
 .Pq Event B1H , Umask 01H
 Counts number of Uops executed that were issued on port 0.
 Port 0 handles integer arithmetic, SIMD and FP add Uops.
 .It Li UOPS_EXECUTED.PORT1
 .Pq Event B1H , Umask 02H
 Counts number of Uops executed that were issued on port 1.
 Port 1 handles integer arithmetic, SIMD, integer shift, FP multiply and FP divide Uops.
 .It Li UOPS_EXECUTED.PORT2_CORE
 .Pq Event B1H , Umask 04H
 Counts number of Uops executed that were issued on port 2.
 Port 2 handles the load Uops.
 This is a core count only and can not be collected per thread.
 .It Li UOPS_EXECUTED.PORT3_CORE
 .Pq Event B1H , Umask 08H
 Counts number of Uops executed that were issued on port 3.
 Port 3 handles store Uops.
 This is a core count only and can not be collected per thread.
 .It Li UOPS_EXECUTED.PORT4_CORE
 .Pq Event B1H , Umask 10H
 Counts number of Uops executed that where issued on port 4.
 Port 4 handles the value to be stored for the store Uops issued on port 3.
 This is a core count only and can not be collected per thread.
 .It Li UOPS_EXECUTED.CORE_ACTIVE_CYCLES_NO_PORT5
 .Pq Event B1H , Umask 1FH
 Counts cycles when the Uops executed were issued from any ports except port
 5.
 Use Cmask=1 for active cycles; Cmask=0 for weighted cycles; Use CMask=1,
 Invert=1 to count P0-4 stalled cycles Use Cmask=1, Edge=1, Invert=1 to count
 P0-4 stalls.
 .It Li UOPS_EXECUTED.PORT5
 .Pq Event B1H , Umask 20H
 Counts number of Uops executed that where issued on port 5.
 .It Li UOPS_EXECUTED.CORE_ACTIVE_CYCLES
 .Pq Event B1H , Umask 3FH
 Counts cycles when the Uops are executing.
 Use Cmask=1 for active cycles; Cmask=0 for weighted cycles; Use CMask=1, Invert=1 to count P0-4 stalled
 cycles Use Cmask=1, Edge=1, Invert=1 to count P0-4 stalls.
 .It Li UOPS_EXECUTED.PORT015
 .Pq Event B1H , Umask 40H
 Counts number of Uops executed that where issued on port 0, 1, or 5.
 use cmask=1, invert=1 to count stall cycles
 .It Li UOPS_EXECUTED.PORT234
 .Pq Event B1H , Umask 80H
 Counts number of Uops executed that where issued on port 2, 3, or 4.
 .It Li OFFCORE_REQUESTS_SQ_FULL
 .Pq Event B2H , Umask 01H
 Counts number of cycles the SQ is full to handle off-core requests.
 .It Li OFF_CORE_RESPONSE_0
 .Pq Event B7H , Umask 01H
 see Section 30.6.1.3, Off-core Response Performance Monitoring in the
 Processor Core
 Requires programming MSR 01A6H
 .It Li SNOOP_RESPONSE.HIT
 .Pq Event B8H , Umask 01H
 Counts HIT snoop response sent by this thread in response to a snoop
 request.
 .It Li SNOOP_RESPONSE.HITE
 .Pq Event B8H , Umask 02H
 Counts HIT E snoop response sent by this thread in response to a snoop
 request.
 .It Li SNOOP_RESPONSE.HITM
 .Pq Event B8H , Umask 04H
 Counts HIT M snoop response sent by this thread in response to a snoop
 request.
 .It Li OFF_CORE_RESPONSE_1
 .Pq Event BBH , Umask 01H
 see Section 30.6.1.3, Off-core Response Performance Monitoring in the
 Processor Core
 Requires programming MSR 01A7H
 .It Li INST_RETIRED.ANY_P
 .Pq Event C0H , Umask 01H
 See Table A-1
 Notes: INST_RETIRED.ANY is counted by a designated fixed counter.
 INST_RETIRED.ANY_P is counted by a programmable counter and is an
 architectural performance event.
 Event is supported if CPUID.A.EBX[1] = 0.
 Counting: Faulting executions of GETSEC/VM entry/VM Exit/MWait will not
 count as retired instructions.
 .It Li INST_RETIRED.X87
 .Pq Event C0H , Umask 02H
 Counts the number of MMX instructions retired.
 .It Li INST_RETIRED.MMX
 .Pq Event C0H , Umask 04H
 Counts the number of floating point computational operations retired:
 floating point computational operations executed by the assist handler and
 sub-operations of complex floating point instructions like transcendental
 instructions.
 .It Li UOPS_RETIRED.ANY
 .Pq Event C2H , Umask 01H
 Counts the number of micro-ops retired, (macro-fused=1, micro- fused=2,
 others=1; maximum count of 8 per cycle).
 Most instructions are composed of one or two micro-ops.
 Some instructions are decoded into longer sequences such as repeat instructions,
 floating point transcendental instructions, and assists.
 Use cmask=1 and invert to count active cycles or stalled cycles
 .It Li UOPS_RETIRED.RETIRE_SLOTS
 .Pq Event C2H , Umask 02H
 Counts the number of retirement slots used each cycle
 .It Li UOPS_RETIRED.MACRO_FUSED
 .Pq Event C2H , Umask 04H
 Counts number of macro-fused uops retired.
 .It Li MACHINE_CLEARS.CYCLES
 .Pq Event C3H , Umask 01H
 Counts the cycles machine clear is asserted.
 .It Li MACHINE_CLEARS.MEM_ORDER
 .Pq Event C3H , Umask 02H
 Counts the number of machine clears due to memory order conflicts.
 .It Li MACHINE_CLEARS.SMC
 .Pq Event C3H , Umask 04H
 Counts the number of times that a program writes to a code section.
 Self-modifying code causes a sever penalty in all Intel 64 and IA-32
 processors.
 The modified cache line is written back to the L2 and L3caches.
 .It Li BR_INST_RETIRED.ALL_BRANCHES
 .Pq Event C4H , Umask 00H
 See Table A-1
 .It Li BR_INST_RETIRED.CONDITIONAL
 .Pq Event C4H , Umask 01H
 Counts the number of conditional branch instructions retired.
 .It Li BR_INST_RETIRED.NEAR_CALL
 .Pq Event C4H , Umask 02H
 Counts the number of direct & indirect near unconditional calls retired
 .It Li BR_INST_RETIRED.ALL_BRANCHES
 .Pq Event C4H , Umask 04H
 Counts the number of branch instructions retired
 .It Li BR_MISP_RETIRED.ALL_BRANCHES
 .Pq Event C5H , Umask 00H
 See Table A-1
 .It Li BR_MISP_RETIRED.NEAR_CALL
 .Pq Event C5H , Umask 02H
 Counts mispredicted direct & indirect near unconditional retired calls.
 .It Li SSEX_UOPS_RETIRED.PACKED_SINGLE
 .Pq Event C7H , Umask 01H
 Counts SIMD packed single-precision floating point Uops retired.
 .It Li SSEX_UOPS_RETIRED.SCALAR_SINGLE
 .Pq Event C7H , Umask 02H
 Counts SIMD calar single-precision floating point Uops retired.
 .It Li SSEX_UOPS_RETIRED.PACKED_DOUBLE
 .Pq Event C7H , Umask 04H
 Counts SIMD packed double- precision floating point Uops retired.
 .It Li SSEX_UOPS_RETIRED.SCALAR_DOUBLE
 .Pq Event C7H , Umask 08H
 Counts SIMD scalar double-precision floating point Uops retired.
 .It Li SSEX_UOPS_RETIRED.VECTOR_INTEGER
 .Pq Event C7H , Umask 10H
 Counts 128-bit SIMD vector integer Uops retired.
 .It Li ITLB_MISS_RETIRED
 .Pq Event C8H , Umask 20H
 Counts the number of retired instructions that missed the ITLB when the
 instruction was fetched.
 .It Li MEM_LOAD_RETIRED.L1D_HIT
 .Pq Event CBH , Umask 01H
 Counts number of retired loads that hit the L1 data cache.
 .It Li MEM_LOAD_RETIRED.L2_HIT
 .Pq Event CBH , Umask 02H
 Counts number of retired loads that hit the L2 data cache.
 .It Li MEM_LOAD_RETIRED.L3_UNSHARED_HIT
 .Pq Event CBH , Umask 04H
 Counts number of retired loads that hit their own, unshared lines in the L3
 cache.
 .It Li MEM_LOAD_RETIRED.OTHER_CORE_L2_HIT_HITM
 .Pq Event CBH , Umask 08H
 Counts number of retired loads that hit in a sibling core's L2 (on die core).
 Since the L3 is inclusive of all cores on the package, this is an L3 hit.
 This counts both clean or modified hits.
 .It Li MEM_LOAD_RETIRED.L3_MISS
 .Pq Event CBH , Umask 10H
 Counts number of retired loads that miss the L3 cache.
 The load was satisfied by a remote socket, local memory or an IOH.
 .It Li MEM_LOAD_RETIRED.HIT_LFB
 .Pq Event CBH , Umask 40H
 Counts number of retired loads that miss the L1D and the address is located
 in an allocated line fill buffer and will soon be committed to cache.
 This is counting secondary L1D misses.
 .It Li MEM_LOAD_RETIRED.DTLB_MISS
 .Pq Event CBH , Umask 80H
 Counts the number of retired loads that missed the DTLB.
 The DTLB miss is not counted if the load operation causes a fault.
 This event counts loads from cacheable memory only.
 The event does not count loads by software prefetches.
 Counts both primary and secondary misses to the TLB.
 .It Li FP_MMX_TRANS.TO_FP
 .Pq Event CCH , Umask 01H
 Counts the first floating-point instruction following any MMX instruction.
 You can use this event to estimate the penalties for the transitions between
 floating-point and MMX technology states.
 .It Li FP_MMX_TRANS.TO_MMX
 .Pq Event CCH , Umask 02H
 Counts the first MMX instruction following a floating-point instruction.
 You can use this event to estimate the penalties for the transitions between
 floating-point and MMX technology states.
 .It Li FP_MMX_TRANS.ANY
 .Pq Event CCH , Umask 03H
 Counts all transitions from floating point to MMX instructions and from MMX
 instructions to floating point instructions.
 You can use this event to estimate the penalties for the transitions between
 floating-point and MMX technology states.
 .It Li MACRO_INSTS.DECODED
 .Pq Event D0H , Umask 01H
 Counts the number of instructions decoded, (but not necessarily executed or
 retired).
 .It Li UOPS_DECODED.MS
 .Pq Event D1H , Umask 02H
 Counts the number of Uops decoded by the Microcode Sequencer, MS.
 The MS delivers uops when the instruction is more than 4 uops long or a microcode
 assist is occurring.
 .It Li UOPS_DECODED.ESP_FOLDING
 .Pq Event D1H , Umask 04H
 Counts number of stack pointer (ESP) instructions decoded: push , pop , call
 , ret, etc.
 ESP instructions do not generate a Uop to increment or decrement ESP.
 Instead, they update an ESP_Offset register that keeps track of the
 delta to the current value of the ESP register.
 .It Li UOPS_DECODED.ESP_SYNC
 .Pq Event D1H , Umask 08H
 Counts number of stack pointer (ESP) sync operations where an ESP
 instruction is corrected by adding the ESP offset register to the current
 value of the ESP register.
 .It Li RAT_STALLS.FLAGS
 .Pq Event D2H , Umask 01H
 Counts the number of cycles during which execution stalled due to several
 reasons, one of which is a partial flag register stall.
 A partial register stall may occur when two conditions are met: 1) an instruction modifies
 some, but not all, of the flags in the flag register and 2) the next
 instruction, which depends on flags, depends on flags that were not modified
 by this instruction.
 .It Li RAT_STALLS.REGISTERS
 .Pq Event D2H , Umask 02H
 This event counts the number of cycles instruction execution latency became
 longer than the defined latency because the instruction used a register that
 was partially written by previous instruction.
 .It Li RAT_STALLS.ROB_READ_PORT
 .Pq Event D2H , Umask 04H
 Counts the number of cycles when ROB read port stalls occurred, which did
 not allow new micro-ops to enter the out-of-order pipeline.
 Note that, at this stage in the pipeline, additional stalls may occur at
 the same cycle and prevent the stalled micro-ops from entering the pipe.
 In such a case, micro-ops retry entering the execution pipe in the next
 cycle and the ROB-read port stall is counted again.
 .It Li RAT_STALLS.SCOREBOARD
 .Pq Event D2H , Umask 08H
 Counts the cycles where we stall due to microarchitecturally required
 serialization.
 Microcode scoreboarding stalls.
 .It Li RAT_STALLS.ANY
 .Pq Event D2H , Umask 0FH
 Counts all Register Allocation Table stall cycles due to: Cycles when ROB
 read port stalls occurred, which did not allow new micro-ops to enter the
 execution pipe.
 Cycles when partial register stalls occurred Cycles when flag stalls occurred
 Cycles floating-point unit (FPU) status word stalls occurred.
 To count each of these conditions separately use the events:
 RAT_STALLS.ROB_READ_PORT, RAT_STALLS.PARTIAL, RAT_STALLS.FLAGS, and
 RAT_STALLS.FPSW.
 .It Li SEG_RENAME_STALLS
 .Pq Event D4H , Umask 01H
 Counts the number of stall cycles due to the lack of renaming resources for
 the ES, DS, FS, and GS segment registers.
 If a segment is renamed but not retired and a second update to the same
 segment occurs, a stall occurs in the front-end of the pipeline until the
 renamed segment retires.
 .It Li ES_REG_RENAMES
 .Pq Event D5H , Umask 01H
 Counts the number of times the ES segment register is renamed.
 .It Li UOP_UNFUSION
 .Pq Event DBH , Umask 01H
 Counts unfusion events due to floating point exception to a fused uop.
 .It Li BR_INST_DECODED
 .Pq Event E0H , Umask 01H
 Counts the number of branch instructions decoded.
 .It Li BPU_MISSED_CALL_RET
 .Pq Event E5H , Umask 01H
 Counts number of times the Branch Prediction Unit missed predicting a call
 or return branch.
 .It Li BACLEAR.CLEAR
 .Pq Event E6H , Umask 01H
 Counts the number of times the front end is resteered, mainly when the
 Branch Prediction Unit cannot provide a correct prediction and this is
 corrected by the Branch Address Calculator at the front end.
 This can occur if the code has many branches such that they cannot be
 consumed by the BPU.
 Each BACLEAR asserted by the BAC generates approximately an 8 cycle bubble
 in the instruction fetch pipeline.
 The effect on total execution time depends on the surrounding code.
 .It Li BACLEAR.BAD_TARGET
 .Pq Event E6H , Umask 02H
 Counts number of Branch Address Calculator clears (BACLEAR) asserted due to
 conditional branch instructions in which there was a target hit but the
 direction was wrong.
 Each BACLEAR asserted by the BAC generates approximately an 8 cycle bubble in
 the instruction fetch pipeline.
 .It Li BPU_CLEARS.EARLY
 .Pq Event E8H , Umask 01H
 Counts early (normal) Branch Prediction Unit clears: BPU predicted a taken
 branch after incorrectly assuming that it was not taken.
 The BPU clear leads to 2 cycle bubble in the Front End.
 .It Li BPU_CLEARS.LATE
 .Pq Event E8H , Umask 02H
 Counts late Branch Prediction Unit clears due to Most Recently Used conflicts.
 The PBU clear leads to a 3 cycle bubble in the Front End.
 .It Li L2_TRANSACTIONS.LOAD
 .Pq Event F0H , Umask 01H
 Counts L2 load operations due to HW prefetch or demand loads.
 .It Li L2_TRANSACTIONS.RFO
 .Pq Event F0H , Umask 02H
 Counts L2 RFO operations due to HW prefetch or demand RFOs.
 .It Li L2_TRANSACTIONS.IFETCH
 .Pq Event F0H , Umask 04H
 Counts L2 instruction fetch operations due to HW prefetch or demand ifetch.
 .It Li L2_TRANSACTIONS.PREFETCH
 .Pq Event F0H , Umask 08H
 Counts L2 prefetch operations.
 .It Li L2_TRANSACTIONS.L1D_WB
 .Pq Event F0H , Umask 10H
 Counts L1D writeback operations to the L2.
 .It Li L2_TRANSACTIONS.FILL
 .Pq Event F0H , Umask 20H
 Counts L2 cache line fill operations due to load, RFO, L1D writeback or
 prefetch.
 .It Li L2_TRANSACTIONS.WB
 .Pq Event F0H , Umask 40H
 Counts L2 writeback operations to the L3.
 .It Li L2_TRANSACTIONS.ANY
 .Pq Event F0H , Umask 80H
 Counts all L2 cache operations.
 .It Li L2_LINES_IN.S_STATE
 .Pq Event F1H , Umask 02H
 Counts the number of cache lines allocated in the L2 cache in the S (shared)
 state.
 .It Li L2_LINES_IN.E_STATE
 .Pq Event F1H , Umask 04H
 Counts the number of cache lines allocated in the L2 cache in the E
 (exclusive) state.
 .It Li L2_LINES_IN.ANY
 .Pq Event F1H , Umask 07H
 Counts the number of cache lines allocated in the L2 cache.
 .It Li L2_LINES_OUT.DEMAND_CLEAN
 .Pq Event F2H , Umask 01H
 Counts L2 clean cache lines evicted by a demand request.
 .It Li L2_LINES_OUT.DEMAND_DIRTY
 .Pq Event F2H , Umask 02H
 Counts L2 dirty (modified) cache lines evicted by a demand request.
 .It Li L2_LINES_OUT.PREFETCH_CLEAN
 .Pq Event F2H , Umask 04H
 Counts L2 clean cache line evicted by a prefetch request.
 .It Li L2_LINES_OUT.PREFETCH_DIRTY
 .Pq Event F2H , Umask 08H
 Counts L2 modified cache line evicted by a prefetch request.
 .It Li L2_LINES_OUT.ANY
 .Pq Event F2H , Umask 0FH
 Counts all L2 cache lines evicted for any reason.
 .It Li SQ_MISC.SPLIT_LOCK
 .Pq Event F4H , Umask 10H
 Counts the number of SQ lock splits across a cache line.
 .It Li SQ_FULL_STALL_CYCLES
 .Pq Event F6H , Umask 01H
 Counts cycles the Super Queue is full.
 Neither of the threads on this core will be able to access the uncore.
 .It Li FP_ASSIST.ALL
 .Pq Event F7H , Umask 01H
 Counts the number of floating point operations executed that required
 micro-code assist intervention.
 Assists are required in the following cases:
 SSE instructions, (Denormal input when the DAZ flag is off or Underflow
 result when the FTZ flag is off): x87 instructions, (NaN or denormal are
 loaded to a register or used as input from memory, Division by 0 or
 Underflow output).
 .It Li FP_ASSIST.OUTPUT
 .Pq Event F7H , Umask 02H
 Counts number of floating point micro-code assist when the output value
 (destination register) is invalid.
 .It Li FP_ASSIST.INPUT
 .Pq Event F7H , Umask 04H
 Counts number of floating point micro-code assist when the input value (one
 of the source operands to an FP instruction) is invalid.
 .It Li SIMD_INT_64.PACKED_MPY
 .Pq Event FDH , Umask 01H
 Counts number of SID integer 64 bit packed multiply operations.
 .It Li SIMD_INT_64.PACKED_SHIFT
 .Pq Event FDH , Umask 02H
 Counts number of SID integer 64 bit packed shift operations.
 .It Li SIMD_INT_64.PACK
 .Pq Event FDH , Umask 04H
 Counts number of SID integer 64 bit pack operations.
 .It Li SIMD_INT_64.UNPACK
 .Pq Event FDH , Umask 08H
 Counts number of SID integer 64 bit unpack operations.
 .It Li SIMD_INT_64.PACKED_LOGICAL
 .Pq Event FDH , Umask 10H
 Counts number of SID integer 64 bit logical operations.
 .It Li SIMD_INT_64.PACKED_ARITH
 .Pq Event FDH , Umask 20H
 Counts number of SID integer 64 bit arithmetic operations.
 .It Li SIMD_INT_64.SHUFFLE_MOVE
 .Pq Event FDH , Umask 40H
 Counts number of SID integer 64 bit shift or move operations.
 .El
 .Ss Event Specifiers (Programmable PMCs)
 Core i7 and Xeon 5500 programmable PMCs support the following events as
 June 2009 document (removed in December 2009):
 .Bl -tag -width indent
 .It Li SB_FORWARD.ANY
 .Pq Event 02H , Umask 01H
 Counts the number of store forwards.
 .It Li LOAD_BLOCK.STD
 .Pq Event 03H , Umask 01H
 Counts the number of loads blocked by a preceding store with unknown data.
 .It Li LOAD_BLOCK.ADDRESS_OFFSET
 .Pq Event 03H , Umask 04H
 Counts the number of loads blocked by a preceding store address.
 .It Li LOAD_BLOCK.ADDRESS_OFFSET
 .Pq Event 01H , Umask 04H
 Counts the cycles of store buffer drains.
 .It Li MISALIGN_MEM_REF.LOAD
 .Pq Event 05H , Umask 01H
 Counts the number of misaligned load references
 .It Li MISALIGN_MEM_REF.STORE
 .Pq Event 05H , Umask 02H
 Counts the number of misaligned store references
 .It Li MISALIGN_MEM_REF.ANY
 .Pq Event 05H , Umask 03H
 Counts the number of misaligned memory references
 .It Li STORE_BLOCKS.NOT_STA
 .Pq Event 06H , Umask 01H
 This event counts the number of load operations delayed caused by preceding
 stores whose addresses are known but whose data is unknown, and preceding
 stores that conflict with the load but which incompletely overlap the load.
 .It Li STORE_BLOCKS.STA
 .Pq Event 06H , Umask 02H
 This event counts load operations delayed caused by preceding stores whose
 addresses are unknown (STA block).
 .It Li STORE_BLOCKS.ANY
 .Pq Event 06H , Umask 0FH
 All loads delayed due to store blocks
 .It Li MEMORY_DISAMBIGURATION.RESET
 .Pq Event 09H , Umask 01H
 Counts memory disambiguration reset cycles
 .It Li MEMORY_DISAMBIGURATION.SUCCESS
 .Pq Event 09H , Umask 02H
 Counts the number of loads that memory disambiguration succeeded
 .It Li MEMORY_DISAMBIGURATION.WATCHDOG
 .Pq Event 09H , Umask 04H
 Counts the number of times the memory disambiguration watchdog kicked in.
 .It Li MEMORY_DISAMBIGURATION.WATCH_CYCLES
 .Pq Event 09H , Umask 08H
 Counts the cycles that the memory disambiguration watchdog is active.
 set invert=1, cmask = 1
 .It Li HW_INT.RCV
 .Pq Event 1DH , Umask 01H
 Number of interrupt received
 .It Li HW_INT.CYCLES_MASKED
 .Pq Event 1DH , Umask 02H
 Number of cycles interrupt are masked
 .It Li HW_INT.CYCLES_PENDING_AND_MASKED
 .Pq Event 1DH , Umask 04H
 Number of cycles interrupts are pending and masked
 .It Li HW_INT.CYCLES_PENDING_AND_MASKED
 .Pq Event 04H , Umask 04H
 Counts number of L2 store RFO requests where the cache line to be loaded is
 in the E (exclusive) state.
 The L1D prefetcher does not issue a RFO prefetch.
 This is a demand RFO request
 .It Li HW_INT.CYCLES_PENDING_AND_MASKED
 .Pq Event 27H , Umask 04H
 LONGEST_LAT_CACH E.MISS
 .It Li UOPS_DECODED.DEC0
 .Pq Event 3DH , Umask 01H
 Counts micro-ops decoded by decoder 0.
 .It Li UOPS_DECODED.DEC0
 .Pq Event 01H , Umask 01H
 Counts L1 data cache store RFO requests where the cache line to be loaded is
 in the I state.
 Counter 0, 1 only
 .It Li 0FH
 .Pq Event 41H , Umask 41H
 L1D_CACHE_ST.MESI
 Counts L1 data cache store RFO requests.
 Counter 0, 1 only
 .It Li DTLB_MISSES.PDE_MISS
 .Pq Event 49H , Umask 20H
 Number of DTLB cache misses where the low part of the linear to physical
 address translation was missed.
 .It Li DTLB_MISSES.PDP_MISS
 .Pq Event 49H , Umask 40H
 Number of DTLB misses where the high part of the linear to physical address
 translation was missed.
 .It Li DTLB_MISSES.LARGE_WALK_COMPLETED
 .Pq Event 49H , Umask 80H
 Counts number of completed large page walks due to misses in the STLB.
 .It Li SSE_MEM_EXEC.NTA
 .Pq Event 4BH , Umask 01H
 Counts number of SSE NTA prefetch/weakly-ordered instructions which missed
 the L1 data cache.
 .It Li SSE_MEM_EXEC.STREAMING_STORES
 .Pq Event 4BH , Umask 08H
 Counts number of SSE non temporal stores
 .It Li SFENCE_CYCLES
 .Pq Event 4DH , Umask 01H
 Counts store fence cycles
 .It Li EPT.EPDE_MISS
 .Pq Event 4FH , Umask 02H
 Counts Extended Page Directory Entry misses.
 The Extended Page Directory cache is used by Virtual Machine operating
 systems while the guest operating systems use the standard TLB caches.
 .It Li EPT.EPDPE_HIT
 .Pq Event 4FH , Umask 04H
 Counts Extended Page Directory Pointer Entry hits.
 .It Li EPT.EPDPE_MISS
 .Pq Event 4FH , Umask 08H
 Counts Extended Page Directory Pointer Entry misses.
 .It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND.READ_DATA
 .Pq Event 60H , Umask 01H
 Counts weighted cycles of offcore demand data read requests.
 Does not include L2 prefetch requests.
 counter 0
 .It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND.READ_CODE
 .Pq Event 60H , Umask 02H
 Counts weighted cycles of offcore demand code read requests.
 Does not include L2 prefetch requests.
 counter 0
 .It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND.RFO
 .Pq Event 60H , Umask 04H
 Counts weighted cycles of offcore demand RFO requests.
 Does not include L2 prefetch requests.
 counter 0
 .It Li OFFCORE_REQUESTS_OUTSTANDING.ANY.READ
 .Pq Event 60H , Umask 08H
 Counts weighted cycles of offcore read requests of any kind.
 Include L2 prefetch requests.
 counter 0
 .It Li IFU_IVC.FULL
 .Pq Event 81H , Umask 01H
 Instruction Fetche unit victim cache full.
 .It Li IFU_IVC.L1I_EVICTION
 .Pq Event 81H , Umask 02H
 L1 Instruction cache evictions.
 .It Li L1I_OPPORTUNISTIC_HITS
 .Pq Event 83H , Umask 01H
 Opportunistic hits in streaming.
 .It Li ITLB_MISSES.WALK_CYCLES
 .Pq Event 85H , Umask 04H
 Counts ITLB miss page walk cycles.
 .It Li ITLB_MISSES.PMH_BUSY_CYCLES
 .Pq Event 85H , Umask 04H
 Counts PMH busy cycles.
 .It Li ITLB_MISSES.STLB_HIT
 .Pq Event 85H , Umask 10H
 Counts the number of ITLB misses that hit in the second level TLB.
 .It Li ITLB_MISSES.PDE_MISS
 .Pq Event 85H , Umask 20H
 Number of ITLB misses where the low part of the linear to physical address
 translation was missed.
 .It Li ITLB_MISSES.PDP_MISS
 .Pq Event 85H , Umask 40H
 Number of ITLB misses where the high part of the linear to physical address
 translation was missed.
 .It Li ITLB_MISSES.LARGE_WALK_COMPLETED
 .Pq Event 85H , Umask 80H
 Counts number of completed large page walks due to misses in the STLB.
 .It Li ITLB_MISSES.LARGE_WALK_COMPLETED
 .Pq Event 01H , Umask 80H
 Counts number of offcore demand data read requests.
 Does not count L2 prefetch requests.
 .It Li OFFCORE_REQUESTS.DEMAND.READ_CODE
 .Pq Event B0H , Umask 02H
 Counts number of offcore demand code read requests.
 Does not count L2 prefetch requests.
 .It Li OFFCORE_REQUESTS.DEMAND.RFO
 .Pq Event B0H , Umask 04H
 Counts number of offcore demand RFO requests.
 Does not count L2 prefetch requests.
 .It Li OFFCORE_REQUESTS.ANY.READ
 .Pq Event B0H , Umask 08H
 Counts number of offcore read requests.
 Includes L2 prefetch requests.
 .It Li OFFCORE_REQUESTS.ANY.RFO
 .Pq Event B0H , Umask 10H
 Counts number of offcore RFO requests.
 Includes L2 prefetch requests.
 .It Li OFFCORE_REQUESTS.UNCACHED_MEM
 .Pq Event B0H , Umask 20H
 Counts number of offcore uncached memory requests.
 .It Li OFFCORE_REQUESTS.ANY
 .Pq Event B0H , Umask 80H
 Counts all offcore requests.
 .It Li SNOOPQ_REQUESTS_OUTSTANDING.DATA
 .Pq Event B3H , Umask 01H
 Counts weighted cycles of snoopq requests for data.
 Counter 0 only Use cmask=1 to count cycles not empty.
 .It Li SNOOPQ_REQUESTS_OUTSTANDING.INVALIDATE
 .Pq Event B3H , Umask 02H
 Counts weighted cycles of snoopq invalidate requests.
 Counter 0 only Use cmask=1 to count cycles not empty.
 .It Li SNOOPQ_REQUESTS_OUTSTANDING.CODE
 .Pq Event B3H , Umask 04H
 Counts weighted cycles of snoopq requests for code.
 Counter 0 only Use cmask=1 to count cycles not empty.
 .It Li SNOOPQ_REQUESTS_OUTSTANDING.CODE
 .Pq Event BAH , Umask 04H
 Counts number of TPR reads
 .It Li PIC_ACCESSES.TPR_WRITES
 .Pq Event BAH , Umask 02H
 Counts number of TPR writes one or two micro-ops.
 Some instructions are decoded into longer sequences
 .It Li MACHINE_CLEARS.FUSION_ASSIST
 .Pq Event C3H , Umask 10H
 Counts the number of macro-fusion assists
 Counts SIMD packed single- precision floating point Uops retired.
 .It Li BOGUS_BR
 .Pq Event E4H , Umask 01H
 Counts the number of bogus branches.
 .It Li L2_HW_PREFETCH.HIT
 .Pq Event F3H , Umask 01H
 Count L2 HW prefetcher detector hits
 .It Li L2_HW_PREFETCH.ALLOC
 .Pq Event F3H , Umask 02H
 Count L2 HW prefetcher allocations
 .It Li L2_HW_PREFETCH.DATA_TRIGGER
 .Pq Event F3H , Umask 04H
 Count L2 HW data prefetcher triggered
 .It Li L2_HW_PREFETCH.CODE_TRIGGER
 .Pq Event F3H , Umask 08H
 Count L2 HW code prefetcher triggered
 .It Li L2_HW_PREFETCH.DCA_TRIGGER
 .Pq Event F3H , Umask 10H
 Count L2 HW DCA prefetcher triggered
 .It Li L2_HW_PREFETCH.KICK_START
 .Pq Event F3H , Umask 20H
 Count L2 HW prefetcher kick started
 .It Li SQ_MISC.PROMOTION
 .Pq Event F4H , Umask 01H
 Counts the number of L2 secondary misses that hit the Super Queue.
 .It Li SQ_MISC.PROMOTION_POST_GO
 .Pq Event F4H , Umask 02H
 Counts the number of L2 secondary misses during the Super Queue filling L2.
 .It Li SQ_MISC.LRU_HINTS
 .Pq Event F4H , Umask 04H
 Counts number of Super Queue LRU hints sent to L3.
 .It Li SQ_MISC.FILL_DROPPED
 .Pq Event F4H , Umask 08H
 Counts the number of SQ L2 fills dropped due to L2 busy.
 .It Li SEGMENT_REG_LOADS
 .Pq Event F8H , Umask 01H
 Counts number of segment register loads.
 .El
 .Sh SEE ALSO
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.corei7uc 3 ,
 .Xr pmc.iaf 3 ,
-.Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
 .Xr pmc.ucf 3 ,
 .Xr pmc.westmere 3 ,
 .Xr pmc.westmereuc 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
 .Sh HISTORY
 The
 .Nm pmc
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
 The
 .Lb libpmc
 library was written by
 .An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/lib/libpmc/pmc.corei7uc.3 b/lib/libpmc/pmc.corei7uc.3
index e062302a4e43..ca4283e38c90 100644
--- a/lib/libpmc/pmc.corei7uc.3
+++ b/lib/libpmc/pmc.corei7uc.3
@@ -1,904 +1,903 @@
 .\" Copyright (c) 2010 Fabien Thomas.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .Dd March 24, 2010
 .Dt PMC.COREI7UC 3
 .Os
 .Sh NAME
 .Nm pmc.corei7uc
 .Nd uncore measurement events for
 .Tn Intel
 .Tn Core i7 and Xeon 5500
 family CPUs
 .Sh LIBRARY
 .Lb libpmc
 .Sh SYNOPSIS
 .In pmc.h
 .Sh DESCRIPTION
 .Tn Intel
 .Tn "Core i7"
 CPUs contain PMCs conforming to version 2 of the
 .Tn Intel
 performance measurement architecture.
 These CPUs contain 2 classes of PMCs:
 .Bl -tag -width "Li PMC_CLASS_UCP"
 .It Li PMC_CLASS_UCF
 Fixed-function counters that count only one hardware event per counter.
 .It Li PMC_CLASS_UCP
 Programmable counters that may be configured to count one of a defined
 set of hardware events.
 .El
 .Pp
 The number of PMCs available in each class and their widths need to be
 determined at run time by calling
 .Xr pmc_cpuinfo 3 .
 .Pp
 Intel Core i7 and Xeon 5500 PMCs are documented in
 .Rs
 .%B "Intel(R) 64 and IA-32 Architectures Software Developes Manual"
 .%T "Volume 3B: System Programming Guide, Part 2"
 .%N "Order Number: 253669-033US"
 .%D December 2009
 .%Q "Intel Corporation"
 .Re
 .Ss COREI7 AND XEON 5500 UNCORE FIXED FUNCTION PMCS
 These PMCs and their supported events are documented in
 .Xr pmc.ucf 3 .
 .Ss COREI7 AND XEON 5500 UNCORE PROGRAMMABLE PMCS
 The programmable PMCs support the following capabilities:
 .Bl -column "PMC_CAP_INTERRUPT" "Support"
 .It Em Capability Ta Em Support
 .It PMC_CAP_CASCADE Ta \&No
 .It PMC_CAP_EDGE Ta Yes
 .It PMC_CAP_INTERRUPT Ta \&No
 .It PMC_CAP_INVERT Ta Yes
 .It PMC_CAP_READ Ta Yes
 .It PMC_CAP_PRECISE Ta \&No
 .It PMC_CAP_SYSTEM Ta \&No
 .It PMC_CAP_TAGGING Ta \&No
 .It PMC_CAP_THRESHOLD Ta Yes
 .It PMC_CAP_USER Ta \&No
 .It PMC_CAP_WRITE Ta Yes
 .El
 .Ss Event Qualifiers
 Event specifiers for these PMCs support the following common
 qualifiers:
 .Bl -tag -width indent
 .It Li cmask= Ns Ar value
 Configure the PMC to increment only if the number of configured
 events measured in a cycle is greater than or equal to
 .Ar value .
 .It Li edge
 Configure the PMC to count the number of de-asserted to asserted
 transitions of the conditions expressed by the other qualifiers.
 If specified, the counter will increment only once whenever a
 condition becomes true, irrespective of the number of clocks during
 which the condition remains true.
 .It Li inv
 Invert the sense of comparison when the
 .Dq Li cmask
 qualifier is present, making the counter increment when the number of
 events per cycle is less than the value specified by the
 .Dq Li cmask
 qualifier.
 .El
 .Ss Event Specifiers (Programmable PMCs)
 Core i7 and Xeon 5500 uncore programmable PMCs support the following events:
 .Bl -tag -width indent
 .It Li GQ_CYCLES_FULL.READ_TRACKER
 .Pq Event 00H , Umask 01H
 Uncore cycles Global Queue read tracker is full.
 .It Li GQ_CYCLES_FULL.WRITE_TRACKER
 .Pq Event 00H , Umask 02H
 Uncore cycles Global Queue write tracker is full.
 .It Li GQ_CYCLES_FULL.PEER_PROBE_TRACKER
 .Pq Event 00H , Umask 04H
 Uncore cycles Global Queue peer probe tracker is full.
 The peer probe tracker queue tracks snoops from the IOH and remote sockets.
 .It Li GQ_CYCLES_NOT_EMPTY.READ_TRACKER
 .Pq Event 01H , Umask 01H
 Uncore cycles were Global Queue read tracker has at least one valid entry.
 .It Li GQ_CYCLES_NOT_EMPTY.WRITE_TRACKER
 .Pq Event 01H , Umask 02H
 Uncore cycles were Global Queue write tracker has at least one valid entry.
 .It Li GQ_CYCLES_NOT_EMPTY.PEER_PROBE_TRACKER
 .Pq Event 01H , Umask 04H
 Uncore cycles were Global Queue peer probe tracker has at least one valid entry.
 The peer probe tracker queue tracks IOH and remote socket snoops.
 .It Li GQ_ALLOC.READ_TRACKER
 .Pq Event 03H , Umask 01H
 Counts the number of tread tracker allocate to deallocate entries.
 The GQ read tracker allocate to deallocate occupancy count is divided
 by the count to obtain the average read tracker latency.
 .It Li GQ_ALLOC.RT_L3_MISS
 .Pq Event 03H , Umask 02H
 Counts the number GQ read tracker entries for which a full cache line read
 has missed the L3.
 The GQ read tracker L3 miss to fill occupancy count is divided by this count
 to obtain the average cache line read L3 miss latency.
 The latency represents the time after which the L3 has determined that the
 cache line has missed.
 The time between a GQ read tracker allocation and the L3 determining that the
 cache line has missed is the average L3 hit latency.
 The total L3 cache line read miss latency is the hit latency + L3 miss
 latency.
 .It Li GQ_ALLOC.RT_TO_L3_RESP
 .Pq Event 03H , Umask 04H
 Counts the number of GQ read tracker entries that are allocated in the read
 tracker queue that hit or miss the L3.
 The GQ read tracker L3 hit occupancy count is divided by this count to obtain
 the average L3 hit latency.
 .It Li GQ_ALLOC.RT_TO_RTID_ACQUIRED
 .Pq Event 03H , Umask 08H
 Counts the number of GQ read tracker entries that are allocated in the read
 tracker, have missed in the L3 and have not acquired a Request Transaction ID.
 The GQ read tracker L3 miss to RTID acquired occupancy count is
 divided by this count to obtain the average latency for a read L3 miss to
 acquire an RTID.
 .It Li GQ_ALLOC.WT_TO_RTID_ACQUIRED
 .Pq Event 03H , Umask 10H
 Counts the number of GQ write tracker entries that are allocated in the
 write tracker, have missed in the L3 and have not acquired a Request
 Transaction ID.
 The GQ write tracker L3 miss to RTID occupancy count is divided by this count
 to obtain the average latency for a write L3 miss to acquire an RTID.
 .It Li GQ_ALLOC.WRITE_TRACKER
 .Pq Event 03H , Umask 20H
 Counts the number of GQ write tracker entries that are allocated in the
 write tracker queue that miss the L3.
 The GQ write tracker occupancy count is divided by the this count to obtain the average L3 write miss latency.
 .It Li GQ_ALLOC.PEER_PROBE_TRACKER
 .Pq Event 03H , Umask 40H
 Counts the number of GQ peer probe tracker (snoop) entries that are
 allocated in the peer probe tracker queue that miss the L3.
 The GQ peer probe occupancy count is divided by this count to obtain the average L3 peer
 probe miss latency.
 .It Li GQ_DATA.FROM_QPI
 .Pq Event 04H , Umask 01H
 Cycles Global Queue Quickpath Interface input data port is busy importing
 data from the Quickpath Interface.
 Each cycle the input port can transfer 8 or 16 bytes of data.
 .It Li GQ_DATA.FROM_QMC
 .Pq Event 04H , Umask 02H
 Cycles Global Queue Quickpath Memory Interface input data port is busy
 importing data from the Quickpath Memory Interface.
 Each cycle the input port can transfer 8 or 16 bytes of data.
 .It Li GQ_DATA.FROM_L3
 .Pq Event 04H , Umask 04H
 Cycles GQ L3 input data port is busy importing data from the Last Level Cache.
 Each cycle the input port can transfer 32 bytes of data.
 .It Li GQ_DATA.FROM_CORES_02
 .Pq Event 04H , Umask 08H
 Cycles GQ Core 0 and 2 input data port is busy importing data from processor
 cores 0 and 2.
 Each cycle the input port can transfer 32 bytes of data.
 .It Li GQ_DATA.FROM_CORES_13
 .Pq Event 04H , Umask 10H
 Cycles GQ Core 1 and 3 input data port is busy importing data from processor
 cores 1 and 3.
 Each cycle the input port can transfer 32 bytes of data.
 .It Li GQ_DATA.TO_QPI_QMC
 .Pq Event 05H , Umask 01H
 Cycles GQ QPI and QMC output data port is busy sending data to the Quickpath
 Interface or Quickpath Memory Interface.
 Each cycle the output port can transfer 32 bytes of data.
 .It Li GQ_DATA.TO_L3
 .Pq Event 05H , Umask 02H
 Cycles GQ L3 output data port is busy sending data to the Last Level Cache.
 Each cycle the output port can transfer 32 bytes of data.
 .It Li GQ_DATA.TO_CORES
 .Pq Event 05H , Umask 04H
 Cycles GQ Core output data port is busy sending data to the Cores.
 Each cycle the output port can transfer 32 bytes of data.
 .It Li SNP_RESP_TO_LOCAL_HOME.I_STATE
 .Pq Event 06H , Umask 01H
 Number of snoop responses to the local home that L3 does not have the
 referenced cache line.
 .It Li SNP_RESP_TO_LOCAL_HOME.S_STATE
 .Pq Event 06H , Umask 02H
 Number of snoop responses to the local home that L3 has the referenced line
 cached in the S state.
 .It Li SNP_RESP_TO_LOCAL_HOME.FWD_S_STATE
 .Pq Event 06H , Umask 04H
 Number of responses to code or data read snoops to the local home that the
 L3 has the referenced cache line in the E state.
 The L3 cache line state is changed to the S state and the line is
 forwarded to the local home in the S state.
 .It Li SNP_RESP_TO_LOCAL_HOME.FWD_I_STATE
 .Pq Event 06H , Umask 08H
 Number of responses to read invalidate snoops to the local home that the L3
 has the referenced cache line in the M state.
 The L3 cache line state is invalidated and the line is forwarded to the
 local home in the M state.
 .It Li SNP_RESP_TO_LOCAL_HOME.CONFLICT
 .Pq Event 06H , Umask 10H
 Number of conflict snoop responses sent to the local home.
 .It Li SNP_RESP_TO_LOCAL_HOME.WB
 .Pq Event 06H , Umask 20H
 Number of responses to code or data read snoops to the local home that the
 L3 has the referenced line cached in the M state.
 .It Li SNP_RESP_TO_REMOTE_HOME.I_STATE
 .Pq Event 07H , Umask 01H
 Number of snoop responses to a remote home that L3 does not have the
 referenced cache line.
 .It Li SNP_RESP_TO_REMOTE_HOME.S_STATE
 .Pq Event 07H , Umask 02H
 Number of snoop responses to a remote home that L3 has the referenced line
 cached in the S state.
 .It Li SNP_RESP_TO_REMOTE_HOME.FWD_S_STATE
 .Pq Event 07H , Umask 04H
 Number of responses to code or data read snoops to a remote home that the L3
 has the referenced cache line in the E state.
 The L3 cache line state is changed to the S state and the line is forwarded to
 the remote home in the S state.
 .It Li SNP_RESP_TO_REMOTE_HOME.FWD_I_STATE
 .Pq Event 07H , Umask 08H
 Number of responses to read invalidate snoops to a remote home that the L3
 has the referenced cache line in the M state.
 The L3 cache line state is invalidated and the line is forwarded to the
 remote home in the M state.
 .It Li SNP_RESP_TO_REMOTE_HOME.CONFLICT
 .Pq Event 07H , Umask 10H
 Number of conflict snoop responses sent to the local home.
 .It Li SNP_RESP_TO_REMOTE_HOME.WB
 .Pq Event 07H , Umask 20H
 Number of responses to code or data read snoops to a remote home that the L3
 has the referenced line cached in the M state.
 .It Li SNP_RESP_TO_REMOTE_HOME.HITM
 .Pq Event 07H , Umask 24H
 Number of HITM snoop responses to a remote home
 .It Li L3_HITS.READ
 .Pq Event 08H , Umask 01H
 Number of code read, data read and RFO requests that hit in the L3
 .It Li L3_HITS.WRITE
 .Pq Event 08H , Umask 02H
 Number of writeback requests that hit in the L3.
 Writebacks from the cores will always result in L3 hits due to the inclusive property of the L3.
 .It Li L3_HITS.PROBE
 .Pq Event 08H , Umask 04H
 Number of snoops from IOH or remote sockets that hit in the L3.
 .It Li L3_HITS.ANY
 .Pq Event 08H , Umask 03H
 Number of reads and writes that hit the L3.
 .It Li L3_MISS.READ
 .Pq Event 09H , Umask 01H
 Number of code read, data read and RFO requests that miss the L3.
 .It Li L3_MISS.WRITE
 .Pq Event 09H , Umask 02H
 Number of writeback requests that miss the L3.
 Should always be zero as writebacks from the cores will always result in
 L3 hits due to the inclusive property of the L3.
 .It Li L3_MISS.PROBE
 .Pq Event 09H , Umask 04H
 Number of snoops from IOH or remote sockets that miss the L3.
 .It Li L3_MISS.ANY
 .Pq Event 09H , Umask 03H
 Number of reads and writes that miss the L3.
 .It Li L3_LINES_IN.M_STATE
 .Pq Event 0AH , Umask 01H
 Counts the number of L3 lines allocated in M state.
 The only time a cache line is allocated in the M state is when the line
 was forwarded in M state is forwarded due to a Snoop Read Invalidate Own request.
 .It Li L3_LINES_IN.E_STATE
 .Pq Event 0AH , Umask 02H
 Counts the number of L3 lines allocated in E state.
 .It Li L3_LINES_IN.S_STATE
 .Pq Event 0AH , Umask 04H
 Counts the number of L3 lines allocated in S state.
 .It Li L3_LINES_IN.F_STATE
 .Pq Event 0AH , Umask 08H
 Counts the number of L3 lines allocated in F state.
 .It Li L3_LINES_IN.ANY
 .Pq Event 0AH , Umask 0FH
 Counts the number of L3 lines allocated in any state.
 .It Li L3_LINES_OUT.M_STATE
 .Pq Event 0BH , Umask 01H
 Counts the number of L3 lines victimized that were in the M state.
 When the victim cache line is in M state, the line is written to its home cache agent
 which can be either local or remote.
 .It Li L3_LINES_OUT.E_STATE
 .Pq Event 0BH , Umask 02H
 Counts the number of L3 lines victimized that were in the E state.
 .It Li L3_LINES_OUT.S_STATE
 .Pq Event 0BH , Umask 04H
 Counts the number of L3 lines victimized that were in the S state.
 .It Li L3_LINES_OUT.I_STATE
 .Pq Event 0BH , Umask 08H
 Counts the number of L3 lines victimized that were in the I state.
 .It Li L3_LINES_OUT.F_STATE
 .Pq Event 0BH , Umask 10H
 Counts the number of L3 lines victimized that were in the F state.
 .It Li L3_LINES_OUT.ANY
 .Pq Event 0BH , Umask 1FH
 Counts the number of L3 lines victimized in any state.
 .It Li QHL_REQUESTS.IOH_READS
 .Pq Event 20H , Umask 01H
 Counts number of Quickpath Home Logic read requests from the IOH.
 .It Li QHL_REQUESTS.IOH_WRITES
 .Pq Event 20H , Umask 02H
 Counts number of Quickpath Home Logic write requests from the IOH.
 .It Li QHL_REQUESTS.REMOTE_READS
 .Pq Event 20H , Umask 04H
 Counts number of Quickpath Home Logic read requests from a remote socket.
 .It Li QHL_REQUESTS.REMOTE_WRITES
 .Pq Event 20H , Umask 08H
 Counts number of Quickpath Home Logic write requests from a remote socket.
 .It Li QHL_REQUESTS.LOCAL_READS
 .Pq Event 20H , Umask 10H
 Counts number of Quickpath Home Logic read requests from the local socket.
 .It Li QHL_REQUESTS.LOCAL_WRITES
 .Pq Event 20H , Umask 20H
 Counts number of Quickpath Home Logic write requests from the local socket.
 .It Li QHL_CYCLES_FULL.IOH
 .Pq Event 21H , Umask 01H
 Counts uclk cycles all entries in the Quickpath Home Logic IOH are full.
 .It Li QHL_CYCLES_FULL.REMOTE
 .Pq Event 21H , Umask 02H
 Counts uclk cycles all entries in the Quickpath Home Logic remote tracker
 are full.
 .It Li QHL_CYCLES_FULL.LOCAL
 .Pq Event 21H , Umask 04H
 Counts uclk cycles all entries in the Quickpath Home Logic local tracker are
 full.
 .It Li QHL_CYCLES_NOT_EMPTY.IOH
 .Pq Event 22H , Umask 01H
 Counts uclk cycles all entries in the Quickpath Home Logic IOH is busy.
 .It Li QHL_CYCLES_NOT_EMPTY.REMOTE
 .Pq Event 22H , Umask 02H
 Counts uclk cycles all entries in the Quickpath Home Logic remote tracker is
 busy.
 .It Li QHL_CYCLES_NOT_EMPTY.LOCAL
 .Pq Event 22H , Umask 04H
 Counts uclk cycles all entries in the Quickpath Home Logic local tracker is
 busy.
 .It Li QHL_OCCUPANCY.IOH
 .Pq Event 23H , Umask 01H
 QHL IOH tracker allocate to deallocate read occupancy.
 .It Li QHL_OCCUPANCY.REMOTE
 .Pq Event 23H , Umask 02H
 QHL remote tracker allocate to deallocate read occupancy.
 .It Li QHL_OCCUPANCY.LOCAL
 .Pq Event 23H , Umask 04H
 QHL local tracker allocate to deallocate read occupancy.
 .It Li QHL_ADDRESS_CONFLICTS.2WAY
 .Pq Event 24H , Umask 02H
 Counts number of QHL Active Address Table (AAT) entries that saw a max of 2
 conflicts.
 The AAT is a structure that tracks requests that are in conflict.
 The requests themselves are in the home tracker entries.
 The count is reported when an AAT entry deallocates.
 .It Li QHL_ADDRESS_CONFLICTS.3WAY
 .Pq Event 24H , Umask 04H
 Counts number of QHL Active Address Table (AAT) entries that saw a max of 3
 conflicts.
 The AAT is a structure that tracks requests that are in conflict.
 The requests themselves are in the home tracker entries.
 The count is reported when an AAT entry deallocates.
 .It Li QHL_CONFLICT_CYCLES.IOH
 .Pq Event 25H , Umask 01H
 Counts cycles the Quickpath Home Logic IOH Tracker contains two or more
 requests with an address conflict.
 A max of 3 requests can be in conflict.
 .It Li QHL_CONFLICT_CYCLES.REMOTE
 .Pq Event 25H , Umask 02H
 Counts cycles the Quickpath Home Logic Remote Tracker contains two or more
 requests with an address conflict.
 A max of 3 requests can be in conflict.
 .It Li QHL_CONFLICT_CYCLES.LOCAL
 .Pq Event 25H , Umask 04H
 Counts cycles the Quickpath Home Logic Local Tracker contains two or more
 requests with an address conflict.
 A max of 3 requests can be in conflict.
 .It Li QHL_TO_QMC_BYPASS
 .Pq Event 26H , Umask 01H
 Counts number or requests to the Quickpath Memory Controller that bypass the
 Quickpath Home Logic.
 All local accesses can be bypassed.
 For remote requests, only read requests can be bypassed.
 .It Li QMC_NORMAL_FULL.READ.CH0
 .Pq Event 27H , Umask 01H
 Uncore cycles all the entries in the DRAM channel 0 medium or low priority
 queue are occupied with read requests.
 .It Li QMC_NORMAL_FULL.READ.CH1
 .Pq Event 27H , Umask 02H
 Uncore cycles all the entries in the DRAM channel 1 medium or low priority
 queue are occupied with read requests.
 .It Li QMC_NORMAL_FULL.READ.CH2
 .Pq Event 27H , Umask 04H
 Uncore cycles all the entries in the DRAM channel 2 medium or low priority
 queue are occupied with read requests.
 .It Li QMC_NORMAL_FULL.WRITE.CH0
 .Pq Event 27H , Umask 08H
 Uncore cycles all the entries in the DRAM channel 0 medium or low priority
 queue are occupied with write requests.
 .It Li QMC_NORMAL_FULL.WRITE.CH1
 .Pq Event 27H , Umask 10H
 Counts cycles all the entries in the DRAM channel 1 medium or low priority
 queue are occupied with write requests.
 .It Li QMC_NORMAL_FULL.WRITE.CH2
 .Pq Event 27H , Umask 20H
 Uncore cycles all the entries in the DRAM channel 2 medium or low priority
 queue are occupied with write requests.
 .It Li QMC_ISOC_FULL.READ.CH0
 .Pq Event 28H , Umask 01H
 Counts cycles all the entries in the DRAM channel 0 high priority queue are
 occupied with isochronous read requests.
 .It Li QMC_ISOC_FULL.READ.CH1
 .Pq Event 28H , Umask 02H
 Counts cycles all the entries in the DRAM channel 1 high priority queue are
 occupied with isochronous read requests.
 .It Li QMC_ISOC_FULL.READ.CH2
 .Pq Event 28H , Umask 04H
 Counts cycles all the entries in the DRAM channel 2 high priority queue are
 occupied with isochronous read requests.
 .It Li QMC_ISOC_FULL.WRITE.CH0
 .Pq Event 28H , Umask 08H
 Counts cycles all the entries in the DRAM channel 0 high priority queue are
 occupied with isochronous write requests.
 .It Li QMC_ISOC_FULL.WRITE.CH1
 .Pq Event 28H , Umask 10H
 Counts cycles all the entries in the DRAM channel 1 high priority queue are
 occupied with isochronous write requests.
 .It Li QMC_ISOC_FULL.WRITE.CH2
 .Pq Event 28H , Umask 20H
 Counts cycles all the entries in the DRAM channel 2 high priority queue are
 occupied with isochronous write requests.
 .It Li QMC_BUSY.READ.CH0
 .Pq Event 29H , Umask 01H
 Counts cycles where Quickpath Memory Controller has at least 1 outstanding
 read request to DRAM channel 0.
 .It Li QMC_BUSY.READ.CH1
 .Pq Event 29H , Umask 02H
 Counts cycles where Quickpath Memory Controller has at least 1 outstanding
 read request to DRAM channel 1.
 .It Li QMC_BUSY.READ.CH2
 .Pq Event 29H , Umask 04H
 Counts cycles where Quickpath Memory Controller has at least 1 outstanding
 read request to DRAM channel 2.
 .It Li QMC_BUSY.WRITE.CH0
 .Pq Event 29H , Umask 08H
 Counts cycles where Quickpath Memory Controller has at least 1 outstanding
 write request to DRAM channel 0.
 .It Li QMC_BUSY.WRITE.CH1
 .Pq Event 29H , Umask 10H
 Counts cycles where Quickpath Memory Controller has at least 1 outstanding
 write request to DRAM channel 1.
 .It Li QMC_BUSY.WRITE.CH2
 .Pq Event 29H , Umask 20H
 Counts cycles where Quickpath Memory Controller has at least 1 outstanding
 write request to DRAM channel 2.
 .It Li QMC_OCCUPANCY.CH0
 .Pq Event 2AH , Umask 01H
 IMC channel 0 normal read request occupancy.
 .It Li QMC_OCCUPANCY.CH1
 .Pq Event 2AH , Umask 02H
 IMC channel 1 normal read request occupancy.
 .It Li QMC_OCCUPANCY.CH2
 .Pq Event 2AH , Umask 04H
 IMC channel 2 normal read request occupancy.
 .It Li QMC_ISSOC_OCCUPANCY.CH0
 .Pq Event 2BH , Umask 01H
 IMC channel 0 issoc read request occupancy.
 .It Li QMC_ISSOC_OCCUPANCY.CH1
 .Pq Event 2BH , Umask 02H
 IMC channel 1 issoc read request occupancy.
 .It Li QMC_ISSOC_OCCUPANCY.CH2
 .Pq Event 2BH , Umask 04H
 IMC channel 2 issoc read request occupancy.
 .It Li QMC_ISSOC_READS.ANY
 .Pq Event 2BH , Umask 07H
 IMC issoc read request occupancy.
 .It Li QMC_NORMAL_READS.CH0
 .Pq Event 2CH , Umask 01H
 Counts the number of Quickpath Memory Controller channel 0 medium and low
 priority read requests.
 The QMC channel 0 normal read occupancy divided by this count provides the
 average QMC channel 0 read latency.
 .It Li QMC_NORMAL_READS.CH1
 .Pq Event 2CH , Umask 02H
 Counts the number of Quickpath Memory Controller channel 1 medium and low
 priority read requests.
 The QMC channel 1 normal read occupancy divided by this count provides the
 average QMC channel 1 read latency.
 .It Li QMC_NORMAL_READS.CH2
 .Pq Event 2CH , Umask 04H
 Counts the number of Quickpath Memory Controller channel 2 medium and low
 priority read requests.
 The QMC channel 2 normal read occupancy divided by this count provides the
 average QMC channel 2 read latency.
 .It Li QMC_NORMAL_READS.ANY
 .Pq Event 2CH , Umask 07H
 Counts the number of Quickpath Memory Controller medium and low priority
 read requests.
 The QMC normal read occupancy divided by this count provides the average
 QMC read latency.
 .It Li QMC_HIGH_PRIORITY_READS.CH0
 .Pq Event 2DH , Umask 01H
 Counts the number of Quickpath Memory Controller channel 0 high priority
 isochronous read requests.
 .It Li QMC_HIGH_PRIORITY_READS.CH1
 .Pq Event 2DH , Umask 02H
 Counts the number of Quickpath Memory Controller channel 1 high priority
 isochronous read requests.
 .It Li QMC_HIGH_PRIORITY_READS.CH2
 .Pq Event 2DH , Umask 04H
 Counts the number of Quickpath Memory Controller channel 2 high priority
 isochronous read requests.
 .It Li QMC_HIGH_PRIORITY_READS.ANY
 .Pq Event 2DH , Umask 07H
 Counts the number of Quickpath Memory Controller high priority isochronous
 read requests.
 .It Li QMC_CRITICAL_PRIORITY_READS.CH0
 .Pq Event 2EH , Umask 01H
 Counts the number of Quickpath Memory Controller channel 0 critical priority
 isochronous read requests.
 .It Li QMC_CRITICAL_PRIORITY_READS.CH1
 .Pq Event 2EH , Umask 02H
 Counts the number of Quickpath Memory Controller channel 1 critical priority
 isochronous read requests.
 .It Li QMC_CRITICAL_PRIORITY_READS.CH2
 .Pq Event 2EH , Umask 04H
 Counts the number of Quickpath Memory Controller channel 2 critical priority
 isochronous read requests.
 .It Li QMC_CRITICAL_PRIORITY_READS.ANY
 .Pq Event 2EH , Umask 07H
 Counts the number of Quickpath Memory Controller critical priority
 isochronous read requests.
 .It Li QMC_WRITES.FULL.CH0
 .Pq Event 2FH , Umask 01H
 Counts number of full cache line writes to DRAM channel 0.
 .It Li QMC_WRITES.FULL.CH1
 .Pq Event 2FH , Umask 02H
 Counts number of full cache line writes to DRAM channel 1.
 .It Li QMC_WRITES.FULL.CH2
 .Pq Event 2FH , Umask 04H
 Counts number of full cache line writes to DRAM channel 2.
 .It Li QMC_WRITES.FULL.ANY
 .Pq Event 2FH , Umask 07H
 Counts number of full cache line writes to DRAM.
 .It Li QMC_WRITES.PARTIAL.CH0
 .Pq Event 2FH , Umask 08H
 Counts number of partial cache line writes to DRAM channel 0.
 .It Li QMC_WRITES.PARTIAL.CH1
 .Pq Event 2FH , Umask 10H
 Counts number of partial cache line writes to DRAM channel 1.
 .It Li QMC_WRITES.PARTIAL.CH2
 .Pq Event 2FH , Umask 20H
 Counts number of partial cache line writes to DRAM channel 2.
 .It Li QMC_WRITES.PARTIAL.ANY
 .Pq Event 2FH , Umask 38H
 Counts number of partial cache line writes to DRAM.
 .It Li QMC_CANCEL.CH0
 .Pq Event 30H , Umask 01H
 Counts number of DRAM channel 0 cancel requests.
 .It Li QMC_CANCEL.CH1
 .Pq Event 30H , Umask 02H
 Counts number of DRAM channel 1 cancel requests.
 .It Li QMC_CANCEL.CH2
 .Pq Event 30H , Umask 04H
 Counts number of DRAM channel 2 cancel requests.
 .It Li QMC_CANCEL.ANY
 .Pq Event 30H , Umask 07H
 Counts number of DRAM cancel requests.
 .It Li QMC_PRIORITY_UPDATES.CH0
 .Pq Event 31H , Umask 01H
 Counts number of DRAM channel 0 priority updates.
 A priority update occurs when an ISOC high or critical request
 is received by the QHL and there is a matching request with normal priority
 that has already been issued to the QMC.
 In this instance, the QHL will send a priority update to QMC to expedite the request.
 .It Li QMC_PRIORITY_UPDATES.CH1
 .Pq Event 31H , Umask 02H
 Counts number of DRAM channel 1 priority updates.
 A priority update occurs when an ISOC high or critical request is received by
 the QHL and there is a matching request with normal priority that has
 already been issued to the QMC.
 In this instance, the QHL will send a priority update to QMC to expedite the request.
 .It Li QMC_PRIORITY_UPDATES.CH2
 .Pq Event 31H , Umask 04H
 Counts number of DRAM channel 2 priority updates.
 A priority update occurs when an ISOC high or critical request is received by
 the QHL and there is a matching request with normal priority that has
 already been issued to the QMC.
 In this instance, the QHL will send a priority update to QMC to expedite the request.
 .It Li QMC_PRIORITY_UPDATES.ANY
 .Pq Event 31H , Umask 07H
 Counts number of DRAM priority updates.
 A priority update occurs when an ISOC high or critical request is received by
 the QHL and there is a matching request with normal priority that has
 already been issued to the QMC.
 In this instance, the QHL will send a priority update to QMC to expedite the request.
 .It Li QHL_FRC_ACK_CNFLTS.LOCAL
 .Pq Event 33H , Umask 04H
 Counts number of Force Acknowledge Conflict messages sent by the Quickpath
 Home Logic to the local home.
 .It Li QPI_TX_STALLED_SINGLE_FLIT.HOME.LINK_0
 .Pq Event 40H , Umask 01H
 Counts cycles the Quickpath outbound link 0 HOME virtual channel is stalled
 due to lack of a VNA and VN0 credit.
 Note that this event does not filter out when a flit would not have been
 selected for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_SINGLE_FLIT.SNOOP.LINK_0
 .Pq Event 40H , Umask 02H
 Counts cycles the Quickpath outbound link 0 SNOOP virtual channel is stalled
 due to lack of a VNA and VN0 credit.
 Note that this event does not filter out when a flit would not have been
 selected for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_SINGLE_FLIT.NDR.LINK_0
 .Pq Event 40H , Umask 04H
 Counts cycles the Quickpath outbound link 0 non-data response virtual
 channel is stalled due to lack of a VNA and VN0 credit.
 Note that this event does not filter out when a flit would not have been
 selected for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_SINGLE_FLIT.HOME.LINK_1
 .Pq Event 40H , Umask 08H
 Counts cycles the Quickpath outbound link 1 HOME virtual channel is stalled
 due to lack of a VNA and VN0 credit.
 Note that this event does not filter out when a flit would not have been
 selected for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_SINGLE_FLIT.SNOOP.LINK_1
 .Pq Event 40H , Umask 10H
 Counts cycles the Quickpath outbound link 1 SNOOP virtual channel is stalled
 due to lack of a VNA and VN0 credit.
 Note that this event does not filter out when a flit would not have been
 selected for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_SINGLE_FLIT.NDR.LINK_1
 .Pq Event 40H , Umask 20H
 Counts cycles the Quickpath outbound link 1 non-data response virtual
 channel is stalled due to lack of a VNA and VN0 credit.
 Note that this event does not filter out when a flit would not have been
 selected for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_SINGLE_FLIT.LINK_0
 .Pq Event 40H , Umask 07H
 Counts cycles the Quickpath outbound link 0 virtual channels are stalled due
 to lack of a VNA and VN0 credit.
 Note that this event does not filter out when a flit would not have been
 selected for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_SINGLE_FLIT.LINK_1
 .Pq Event 40H , Umask 38H
 Counts cycles the Quickpath outbound link 1 virtual channels are stalled due
 to lack of a VNA and VN0 credit.
 Note that this event does not filter out when a flit would not have been
 selected for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_MULTI_FLIT.DRS.LINK_0
 .Pq Event 41H , Umask 01H
 Counts cycles the Quickpath outbound link 0 Data ResponSe virtual channel is
 stalled due to lack of VNA and VN0 credits.
 Note that this event does not filter out when a flit would not have been
 selected for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_MULTI_FLIT.NCB.LINK_0
 .Pq Event 41H , Umask 02H
 Counts cycles the Quickpath outbound link 0 Non-Coherent Bypass virtual
 channel is stalled due to lack of VNA and VN0 credits.
 Note that this event does not filter out when a flit would not have been
 selected for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_MULTI_FLIT.NCS.LINK_0
 .Pq Event 41H , Umask 04H
 Counts cycles the Quickpath outbound link 0 Non-Coherent Standard virtual
 channel is stalled due to lack of VNA and VN0 credits.
 Note that this event does not filter out when a flit would not have been
 selected for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_MULTI_FLIT.DRS.LINK_1
 .Pq Event 41H , Umask 08H
 Counts cycles the Quickpath outbound link 1 Data ResponSe virtual channel is
 stalled due to lack of VNA and VN0 credits.
 Note that this event does not filter out when a flit would not have been
 selected for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_MULTI_FLIT.NCB.LINK_1
 .Pq Event 41H , Umask 10H
 Counts cycles the Quickpath outbound link 1 Non-Coherent Bypass virtual
 channel is stalled due to lack of VNA and VN0 credits.
 Note that this event does not filter out when a flit would not have been
 selected for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_MULTI_FLIT.NCS.LINK_1
 .Pq Event 41H , Umask 20H
 Counts cycles the Quickpath outbound link 1 Non-Coherent Standard virtual
 channel is stalled due to lack of VNA and VN0 credits.
 Note that this event does not filter out when a flit would not have been
 selected for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_MULTI_FLIT.LINK_0
 .Pq Event 41H , Umask 07H
 Counts cycles the Quickpath outbound link 0 virtual channels are stalled due
 to lack of VNA and VN0 credits.
 Note that this event does not filter out when a flit would not have been
 selected for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_MULTI_FLIT.LINK_1
 .Pq Event 41H , Umask 38H
 Counts cycles the Quickpath outbound link 1 virtual channels are stalled due
 to lack of VNA and VN0 credits.
 Note that this event does not filter out when a flit would not have been
 selected for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_HEADER.BUSY.LINK_0
 .Pq Event 42H , Umask 02H
 Number of cycles that the header buffer in the Quickpath Interface outbound
 link 0 is busy.
 .It Li QPI_TX_HEADER.BUSY.LINK_1
 .Pq Event 42H , Umask 08H
 Number of cycles that the header buffer in the Quickpath Interface outbound
 link 1 is busy.
 .It Li QPI_RX_NO_PPT_CREDIT.STALLS.LINK_0
 .Pq Event 43H , Umask 01H
 Number of cycles that snoop packets incoming to the Quickpath Interface link
 0 are stalled and not sent to the GQ because the GQ Peer Probe Tracker (PPT)
 does not have any available entries.
 .It Li QPI_RX_NO_PPT_CREDIT.STALLS.LINK_1
 .Pq Event 43H , Umask 02H
 Number of cycles that snoop packets incoming to the Quickpath Interface link
 1 are stalled and not sent to the GQ because the GQ Peer Probe Tracker (PPT)
 does not have any available entries.
 .It Li DRAM_OPEN.CH0
 .Pq Event 60H , Umask 01H
 Counts number of DRAM Channel 0 open commands issued either for read or write.
 To read or write data, the referenced DRAM page must first be opened.
 .It Li DRAM_OPEN.CH1
 .Pq Event 60H , Umask 02H
 Counts number of DRAM Channel 1 open commands issued either for read or write.
 To read or write data, the referenced DRAM page must first be opened.
 .It Li DRAM_OPEN.CH2
 .Pq Event 60H , Umask 04H
 Counts number of DRAM Channel 2 open commands issued either for read or write.
 To read or write data, the referenced DRAM page must first be opened.
 .It Li DRAM_PAGE_CLOSE.CH0
 .Pq Event 61H , Umask 01H
 DRAM channel 0 command issued to CLOSE a page due to page idle timer
 expiration.
 Closing a page is done by issuing a precharge.
 .It Li DRAM_PAGE_CLOSE.CH1
 .Pq Event 61H , Umask 02H
 DRAM channel 1 command issued to CLOSE a page due to page idle timer
 expiration.
 Closing a page is done by issuing a precharge.
 .It Li DRAM_PAGE_CLOSE.CH2
 .Pq Event 61H , Umask 04H
 DRAM channel 2 command issued to CLOSE a page due to page idle timer
 expiration.
 Closing a page is done by issuing a precharge.
 .It Li DRAM_PAGE_MISS.CH0
 .Pq Event 62H , Umask 01H
 Counts the number of precharges (PRE) that were issued to DRAM channel 0
 because there was a page miss.
 A page miss refers to a situation in which a page is currently open and
 another page from the same bank needs to be opened.
 The new page experiences a page miss.
 Closing of the old page is done by issuing a precharge.
 .It Li DRAM_PAGE_MISS.CH1
 .Pq Event 62H , Umask 02H
 Counts the number of precharges (PRE) that were issued to DRAM channel 1
 because there was a page miss.
 A page miss refers to a situation in which a page is currently open and
 another page from the same bank needs to be opened.
 The new page experiences a page miss.
 Closing of the old page is done by issuing a precharge.
 .It Li DRAM_PAGE_MISS.CH2
 .Pq Event 62H , Umask 04H
 Counts the number of precharges (PRE) that were issued to DRAM channel 2
 because there was a page miss.
 A page miss refers to a situation in which a page is currently open and
 another page from the same bank needs to be opened.
 The new page experiences a page miss.
 Closing of the old page is done by issuing a precharge.
 .It Li DRAM_READ_CAS.CH0
 .Pq Event 63H , Umask 01H
 Counts the number of times a read CAS command was issued on DRAM channel 0.
 .It Li DRAM_READ_CAS.AUTOPRE_CH0
 .Pq Event 63H , Umask 02H
 Counts the number of times a read CAS command was issued on DRAM channel 0
 where the command issued used the auto-precharge (auto page close) mode.
 .It Li DRAM_READ_CAS.CH1
 .Pq Event 63H , Umask 04H
 Counts the number of times a read CAS command was issued on DRAM channel 1.
 .It Li DRAM_READ_CAS.AUTOPRE_CH1
 .Pq Event 63H , Umask 08H
 Counts the number of times a read CAS command was issued on DRAM channel 1
 where the command issued used the auto-precharge (auto page close) mode.
 .It Li DRAM_READ_CAS.CH2
 .Pq Event 63H , Umask 10H
 Counts the number of times a read CAS command was issued on DRAM channel 2.
 .It Li DRAM_READ_CAS.AUTOPRE_CH2
 .Pq Event 63H , Umask 20H
 Counts the number of times a read CAS command was issued on DRAM channel 2
 where the command issued used the auto-precharge (auto page close) mode.
 .It Li DRAM_WRITE_CAS.CH0
 .Pq Event 64H , Umask 01H
 Counts the number of times a write CAS command was issued on DRAM channel 0.
 .It Li DRAM_WRITE_CAS.AUTOPRE_CH0
 .Pq Event 64H , Umask 02H
 Counts the number of times a write CAS command was issued on DRAM channel 0
 where the command issued used the auto-precharge (auto page close) mode.
 .It Li DRAM_WRITE_CAS.CH1
 .Pq Event 64H , Umask 04H
 Counts the number of times a write CAS command was issued on DRAM channel 1.
 .It Li DRAM_WRITE_CAS.AUTOPRE_CH1
 .Pq Event 64H , Umask 08H
 Counts the number of times a write CAS command was issued on DRAM channel 1
 where the command issued used the auto-precharge (auto page close) mode.
 .It Li DRAM_WRITE_CAS.CH2
 .Pq Event 64H , Umask 10H
 Counts the number of times a write CAS command was issued on DRAM channel 2.
 .It Li DRAM_WRITE_CAS.AUTOPRE_CH2
 .Pq Event 64H , Umask 20H
 Counts the number of times a write CAS command was issued on DRAM channel 2
 where the command issued used the auto-precharge (auto page close) mode.
 .It Li DRAM_REFRESH.CH0
 .Pq Event 65H , Umask 01H
 Counts number of DRAM channel 0 refresh commands.
 DRAM loses data content over time.
 In order to keep correct data content, the data values have to be
 refreshed periodically.
 .It Li DRAM_REFRESH.CH1
 .Pq Event 65H , Umask 02H
 Counts number of DRAM channel 1 refresh commands.
 DRAM loses data content over time.
 In order to keep correct data content, the data values have to be
 refreshed periodically.
 .It Li DRAM_REFRESH.CH2
 .Pq Event 65H , Umask 04H
 Counts number of DRAM channel 2 refresh commands.
 DRAM loses data content over time.
 In order to keep correct data content, the data values have to be
 refreshed periodically.
 .It Li DRAM_PRE_ALL.CH0
 .Pq Event 66H , Umask 01H
 Counts number of DRAM Channel 0 precharge-all (PREALL) commands that close
 all open pages in a rank.
 PREALL is issued when the DRAM needs to be refreshed or needs to go
 into a power down mode.
 .It Li DRAM_PRE_ALL.CH1
 .Pq Event 66H , Umask 02H
 Counts number of DRAM Channel 1 precharge-all (PREALL) commands that close
 all open pages in a rank.
 PREALL is issued when the DRAM needs to be refreshed or needs to go
 into a power down mode.
 .It Li DRAM_PRE_ALL.CH2
 .Pq Event 66H , Umask 04H
 Counts number of DRAM Channel 2 precharge-all (PREALL) commands that close
 all open pages in a rank.
 PREALL is issued when the DRAM needs to be refreshed or needs to go
 into a power down mode.
 .El
 .Sh SEE ALSO
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.corei7 3 ,
 .Xr pmc.iaf 3 ,
-.Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
 .Xr pmc.ucf 3 ,
 .Xr pmc.westmere 3 ,
 .Xr pmc.westmereuc 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
 .Sh HISTORY
 The
 .Nm pmc
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
 The
 .Lb libpmc
 library was written by
 .An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/lib/libpmc/pmc.dmc-620.3 b/lib/libpmc/pmc.dmc-620.3
index 568ff3fab6f0..1fcd6ae9c733 100644
--- a/lib/libpmc/pmc.dmc-620.3
+++ b/lib/libpmc/pmc.dmc-620.3
@@ -1,162 +1,161 @@
 .\" Copyright (c) 2022 Ampere Computing.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .Dd Jul 22, 2022
 .Dt PMC.DMC-620 3
 .Os
 .Sh NAME
 .Nm pmc.dmc-620
 .Nd measure the
 .Tn Arm
 .Tn DMC-620
 Dynamic Memory Controller performance counter events.
 .Sh LIBRARY
 .Lb libpmc
 .Sh SYNOPSIS
 .In pmc.h
 .Sh DESCRIPTION
 .Tn DMC-620
 PMU counters may be configured to count any one of a defined set of hardware
 events.
 .Pp
 .Tn Arm
 .Tn CoreLink
 .Tn DMC-620 Dynamic Memory Controller performance counters are documented in
 .Rs
 .%B "ARM CoreLink DMC-620 Dynamic Memory Controller Technical Reference Manual"
 .%T "Revision: r0p0"
 .%D 2017
 .%Q "ARM Limited"
 .Re
 .Ss PMC Capabilities
 .Tn DMC-620
 PMU counters support the following capabilities:
 .Bl -column "PMC_CAP_INTERRUPT" "Support"
 .It Sy Capability Ta Em Support
 .It PMC_CAP_CASCADE Ta \&No
 .It PMC_CAP_EDGE Ta \&No
 .It PMC_CAP_INTERRUPT Ta Yes
 .It PMC_CAP_INVERT Ta Yes
 .It PMC_CAP_READ Ta Yes
 .It PMC_CAP_PRECISE Ta \&No
 .It PMC_CAP_SYSTEM Ta Yes
 .It PMC_CAP_TAGGING Ta \&No
 .It PMC_CAP_THRESHOLD Ta Yes
 .It PMC_CAP_USER Ta \&No
 .It PMC_CAP_WRITE Ta Yes
 .El
 .Ss Event Qualifiers
 Event specifiers for these PMCs support the following common
 qualifiers:
 .Bl -tag -width indent
 .It Li inc= Ns Ar value
 Two-bit value that controls direction of count for PMC.
 Behavior depend on selected event.
 .It Li inv
 Invert the sense of comparison.
 .It Li match= Ns Ar value
 Count only events matched by
 .Ar value.
 .It Li mask= Ns Ar qualifier
 Allow to apply
 .Ar qualifier
 mask to compared
 .Ar value .
 .El
 .Ss Class Name Prefix
 These PMCs use a class name prefix of
 .Dq Li DMC620_CD2_
 or
 .Dq Li DMC620_C_ .
 .Ss Event Specifiers
 The following PMC events are available:
 .Bl -column
 .It Sy clkdiv2_cycle_count
 .It Sy clkdiv2_allocate
 .It Sy clkdiv2_queue_depth
 .It Sy clkdiv2_waiting_for_wr_data
 .It Sy clkdiv2_read_backlog
 .It Sy clkdiv2_waiting_for_mi
 .It Sy clkdiv2_hazard_resolution
 .It Sy clkdiv2_enqueue
 .It Sy clkdiv2_arbitrate
 .It Sy clkdiv2_lrank_turnaround_activate
 .It Sy clkdiv2_prank_turnaround_activate
 .It Sy clkdiv2_read_depth
 .It Sy clkdiv2_write_depth
 .It Sy clkdiv2_highhigh_qos_depth
 .It Sy clkdiv2_high_qos_depth
 .It Sy clkdiv2_medium_qos_depth
 .It Sy clkdiv2_low_qos_depth
 .It Sy clkdiv2_activate
 .It Sy clkdiv2_rdwr
 .It Sy clkdiv2_refresh
 .It Sy clkdiv2_training_request
 .It Sy clkdiv2_t_mac_tracker
 .It Sy clkdiv2_bk_fsm_tracker
 .It Sy clkdiv2_bk_open_tracker
 .It Sy clkdiv2_ranks_in_pwr_down
 .It Sy clkdiv2_ranks_in_sref
 .It Sy clk_cycle_count
 .It Sy clk_request
 .It Sy clk_upload_stall
 .El
 .Sh SEE ALSO
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.core2 3 ,
 .Xr pmc.corei7 3 ,
 .Xr pmc.corei7uc 3 ,
 .Xr pmc.iaf 3 ,
 .Xr pmc.iaf 3 ,
-.Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
 .Xr pmc.westmere 3 ,
 .Xr pmc.westmereuc 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
 .Sh HISTORY
 The
 .Nm pmc
 library first appeared in
 .Fx 6.0 .
 .br
 The
 .Nm pmc.dmc-620
 driver was added in
 .Fx 14.0 .
 .Sh AUTHORS
 .An -nosplit
 The
 .Lb libpmc
 library was written by
 .An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
 .An Oleksandr Rybalko Aq Mt ray@FreeBSD.org .
 .br
 The DMC-620 PMU driver was sponsored by Ampere Computing LLC.
 This manual page was written by
 .An Oleksandr Rybalko Aq Mt ray@FreeBSD.org .
diff --git a/lib/libpmc/pmc.haswell.3 b/lib/libpmc/pmc.haswell.3
index 736440612886..0e1a4623eda6 100644
--- a/lib/libpmc/pmc.haswell.3
+++ b/lib/libpmc/pmc.haswell.3
@@ -1,946 +1,945 @@
 .\" Copyright (c) 2013 Hiren Panchasara <hiren.panchasara@gmail.com>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .Dd March 22, 2013
 .Dt PMC.HASWELL 3
 .Os
 .Sh NAME
 .Nm pmc.haswell
 .Nd measurement events for
 .Tn Intel
 .Tn Haswell
 family CPUs
 .Sh LIBRARY
 .Lb libpmc
 .Sh SYNOPSIS
 .In pmc.h
 .Sh DESCRIPTION
 .Tn Intel
 .Tn "Haswell"
 CPUs contain PMCs conforming to version 2 of the
 .Tn Intel
 performance measurement architecture.
 These CPUs may contain up to two classes of PMCs:
 .Bl -tag -width "Li PMC_CLASS_IAP"
 .It Li PMC_CLASS_IAF
 Fixed-function counters that count only one hardware event per counter.
 .It Li PMC_CLASS_IAP
 Programmable counters that may be configured to count one of a defined
 set of hardware events.
 .El
 .Pp
 The number of PMCs available in each class and their widths need to be
 determined at run time by calling
 .Xr pmc_cpuinfo 3 .
 .Pp
 Intel Haswell PMCs are documented in
 .Rs
 .%B "Intel(R) 64 and IA-32 Architectures Software Developer's Manual"
 .%T "Combined Volumes: 1, 2A, 2B, 2C, 3A, 3B and 3C"
 .%N "Order Number: 325462-045US"
 .%D January 2013
 .%Q "Intel Corporation"
 .Re
 .Ss HASWELL FIXED FUNCTION PMCS
 These PMCs and their supported events are documented in
 .Xr pmc.iaf 3 .
 .Ss HASWELL PROGRAMMABLE PMCS
 The programmable PMCs support the following capabilities:
 .Bl -column "PMC_CAP_INTERRUPT" "Support"
 .It Em Capability Ta Em Support
 .It PMC_CAP_CASCADE Ta \&No
 .It PMC_CAP_EDGE Ta Yes
 .It PMC_CAP_INTERRUPT Ta Yes
 .It PMC_CAP_INVERT Ta Yes
 .It PMC_CAP_READ Ta Yes
 .It PMC_CAP_PRECISE Ta \&No
 .It PMC_CAP_SYSTEM Ta Yes
 .It PMC_CAP_TAGGING Ta \&No
 .It PMC_CAP_THRESHOLD Ta Yes
 .It PMC_CAP_USER Ta Yes
 .It PMC_CAP_WRITE Ta Yes
 .El
 .Ss Event Qualifiers
 Event specifiers for these PMCs support the following common
 qualifiers:
 .Bl -tag -width indent
 .It Li rsp= Ns Ar value
 Configure the Off-core Response bits.
 .Bl -tag -width indent
 .It Li DMND_DATA_RD
 Counts the number of demand and DCU prefetch data reads of full
 and partial cachelines as well as demand data page table entry
 cacheline reads.
 Does not count L2 data read prefetches or instruction fetches.
 .It Li REQ_DMND_RFO
 Counts the number of demand and DCU prefetch reads for ownership (RFO)
 requests generated by a write to data cacheline.
 Does not count L2 RFO prefetches.
 .It Li REQ_DMND_IFETCH
 Counts the number of demand and DCU prefetch instruction cacheline reads.
 Does not count L2 code read prefetches.
 .It Li REQ_WB
 Counts the number of writeback (modified to exclusive) transactions.
 .It Li REQ_PF_DATA_RD
 Counts the number of data cacheline reads generated by L2 prefetchers.
 .It Li REQ_PF_RFO
 Counts the number of RFO requests generated by L2 prefetchers.
 .It Li REQ_PF_IFETCH
 Counts the number of code reads generated by L2 prefetchers.
 .It Li REQ_PF_LLC_DATA_RD
 L2 prefetcher to L3 for loads.
 .It Li REQ_PF_LLC_RFO
 RFO requests generated by L2 prefetcher
 .It Li REQ_PF_LLC_IFETCH
 L2 prefetcher to L3 for instruction fetches.
 .It Li REQ_BUS_LOCKS
 Bus lock and split lock requests.
 .It Li REQ_STRM_ST
 Streaming store requests.
 .It Li REQ_OTHER
 Any other request that crosses IDI, including I/O.
 .It Li RES_ANY
 Catch all value for any response types.
 .It Li RES_SUPPLIER_NO_SUPP
 No Supplier Information available.
 .It Li RES_SUPPLIER_LLC_HITM
 M-state initial lookup stat in L3.
 .It Li RES_SUPPLIER_LLC_HITE
 E-state.
 .It Li RES_SUPPLIER_LLC_HITS
 S-state.
 .It Li RES_SUPPLIER_LLC_HITF
 F-state.
 .It Li RES_SUPPLIER_LOCAL
 Local DRAM Controller.
 .It Li RES_SNOOP_SNP_NONE
 No details on snoop-related information.
 .It Li RES_SNOOP_SNP_NO_NEEDED
 No snoop was needed to satisfy the request.
 .It Li RES_SNOOP_SNP_MISS
 A snoop was needed and it missed all snooped caches:
 -For LLC Hit, ReslHitl was returned by all cores
 -For LLC Miss, Rspl was returned by all sockets and data was returned from
 DRAM.
 .It Li RES_SNOOP_HIT_NO_FWD
 A snoop was needed and it hits in at least one snooped cache.
 Hit denotes a cache-line was valid before snoop effect.
 This includes:
 -Snoop Hit w/ Invalidation (LLC Hit, RFO)
 -Snoop Hit, Left Shared (LLC Hit/Miss, IFetch/Data_RD)
 -Snoop Hit w/ Invalidation and No Forward (LLC Miss, RFO Hit S)
 In the LLC Miss case, data is returned from DRAM.
 .It Li RES_SNOOP_HIT_FWD
 A snoop was needed and data was forwarded from a remote socket.
 This includes:
 -Snoop Forward Clean, Left Shared (LLC Hit/Miss, IFetch/Data_RD/RFT).
 .It Li RES_SNOOP_HITM
 A snoop was needed and it HitM-ed in local or remote cache.
 HitM denotes a cache-line was in modified state before effect as a results of snoop.
 This includes:
 -Snoop HitM w/ WB (LLC miss, IFetch/Data_RD)
 -Snoop Forward Modified w/ Invalidation (LLC Hit/Miss, RFO)
 -Snoop MtoS (LLC Hit, IFetch/Data_RD).
 .It Li RES_NON_DRAM
 Target was non-DRAM system address.
 This includes MMIO transactions.
 .El
 .It Li cmask= Ns Ar value
 Configure the PMC to increment only if the number of configured
 events measured in a cycle is greater than or equal to
 .Ar value .
 .It Li edge
 Configure the PMC to count the number of de-asserted to asserted
 transitions of the conditions expressed by the other qualifiers.
 If specified, the counter will increment only once whenever a
 condition becomes true, irrespective of the number of clocks during
 which the condition remains true.
 .It Li inv
 Invert the sense of comparison when the
 .Dq Li cmask
 qualifier is present, making the counter increment when the number of
 events per cycle is less than the value specified by the
 .Dq Li cmask
 qualifier.
 .It Li os
 Configure the PMC to count events happening at processor privilege
 level 0.
 .It Li usr
 Configure the PMC to count events occurring at privilege levels 1, 2
 or 3.
 .El
 .Pp
 If neither of the
 .Dq Li os
 or
 .Dq Li usr
 qualifiers are specified, the default is to enable both.
 .Ss Event Specifiers (Programmable PMCs)
 Haswell programmable PMCs support the following events:
 .Bl -tag -width indent
 .It Li LD_BLOCKS.STORE_FORWARD
 .Pq Event 03H , Umask 02H
 Loads blocked by overlapping with store buffer that
 cannot be forwarded.
 .It Li MISALIGN_MEM_REF.LOADS
 .Pq Event 05H , Umask 01H
 Speculative cache-line split load uops dispatched to
 L1D.
 .It Li MISALIGN_MEM_REF.STORES
 .Pq Event 05H , Umask 02H
 Speculative cache-line split Store-address uops
 dispatched to L1D.
 .It Li LD_BLOCKS_PARTIAL.ADDRESS_ALIAS
 .Pq Event 07H , Umask 01H
 False dependencies in MOB due to partial compare
 on address.
 .It Li DTLB_LOAD_MISSES.MISS_CAUSES_A_WALK
 .Pq Event 08H , Umask 01H
 Misses in all TLB levels that cause a page walk of any
 page size.
 .It Li DTLB_LOAD_MISSES.WALK_COMPLETED_4K
 .Pq Event 08H , Umask 02H
 Completed page walks due to demand load misses
 that caused 4K page walks in any TLB levels.
 .It Li DTLB_LOAD_MISSES.WALK_COMPLETED_2M_4K
 .Pq Event 08H , Umask 02H
 Completed page walks due to demand load misses
 that caused 2M/4M page walks in any TLB levels.
 .It Li DTLB_LOAD_MISSES.WALK_COMPLETED
 .Pq Event 08H , Umask 0EH
 Completed page walks in any TLB of any page size
 due to demand load misses
 .It Li DTLB_LOAD_MISSES.WALK_DURATION
 .Pq Event 08H , Umask 10H
 Cycle PMH is busy with a walk.
 .It Li DTLB_LOAD_MISSES.STLB_HIT_4K
 .Pq Event 08H , Umask 20H
 Load misses that missed DTLB but hit STLB (4K).
 .It Li DTLB_LOAD_MISSES.STLB_HIT_2M
 .Pq Event 08H , Umask 40H
 Load misses that missed DTLB but hit STLB (2M).
 .It Li DTLB_LOAD_MISSES.STLB_HIT
 .Pq Event 08H , Umask 60H
 Number of cache load STLB hits.
 No page walk.
 .It Li DTLB_LOAD_MISSES.PDE_CACHE_MISS
 .Pq Event 08H , Umask 80H
 DTLB demand load misses with low part of linear-to-
 physical address translation missed
 .It Li INT_MISC.RECOVERY_CYCLES
 .Pq Event 0DH , Umask 03H
 Cycles waiting to recover after Machine Clears
 except JEClear.
 Set Cmask= 1.
 .It Li UOPS_ISSUED.ANY
 .Pq Event 0EH , Umask 01H
 ncrements each cycle the # of Uops issued by the
 RAT to RS.
 Set Cmask = 1, Inv = 1, Any= 1to count stalled cycles
 of this core.
 .It Li UOPS_ISSUED.FLAGS_MERGE
 .Pq Event 0EH , Umask 10H
 Number of flags-merge uops allocated.
 Such uops adds delay.
 .It Li UOPS_ISSUED.SLOW_LEA
 .Pq Event 0EH , Umask 20H
 Number of slow LEA or similar uops allocated.
 Such uop has 3 sources (e.g. 2 sources + immediate)
 regardless if as a result of LEA instruction or not.
 .It Li UOPS_ISSUED.SiNGLE_MUL
 .Pq Event 0EH , Umask 40H
 Number of multiply packed/scalar single precision
 uops allocated.
 .It Li L2_RQSTS.DEMAND_DATA_RD_MISS
 .Pq Event 24H , Umask 21H
 Demand Data Read requests that missed L2, no
 rejects.
 .It Li L2_RQSTS.DEMAND_DATA_RD_HIT
 .Pq Event 24H , Umask 41H
 Demand Data Read requests that hit L2 cache.
 .It Li L2_RQSTS.ALL_DEMAND_DATA_RD
 .Pq Event 24H , Umask E1H
 Counts any demand and L1 HW prefetch data load
 requests to L2.
 .It Li L2_RQSTS.RFO_HIT
 .Pq Event 24H , Umask 42H
 Counts the number of store RFO requests that hit
 the L2 cache.
 .It Li L2_RQSTS.RFO_MISS
 .Pq Event 24H , Umask 22H
 Counts the number of store RFO requests that miss
 the L2 cache.
 .It Li L2_RQSTS.ALL_RFO
 .Pq Event 24H , Umask E2H
 Counts all L2 store RFO requests.
 .It Li L2_RQSTS.CODE_RD_HIT
 .Pq Event 24H , Umask 44H
 Number of instruction fetches that hit the L2 cache.
 .It Li L2_RQSTS.CODE_RD_MISS
 .Pq Event 24H , Umask 24H
 Number of instruction fetches that missed the L2
 cache.
 .It Li L2_RQSTS.ALL_DEMAND_MISS
 .Pq Event 24H , Umask 27H
 Demand requests that miss L2 cache.
 .It Li L2_RQSTS.ALL_DEMAND_REFERENCES
 .Pq Event 24H , Umask E7H
 Demand requests to L2 cache.
 .It Li L2_RQSTS.ALL_CODE_RD
 .Pq Event 24H , Umask E4H
 Counts all L2 code requests.
 .It Li L2_RQSTS.L2_PF_HIT
 .Pq Event 24H , Umask 50H
 Counts all L2 HW prefetcher requests that hit L2.
 .It Li L2_RQSTS.L2_PF_MISS
 .Pq Event 24H , Umask 30H
 Counts all L2 HW prefetcher requests that missed
 L2.
 .It Li L2_RQSTS.ALL_PF
 .Pq Event 24H , Umask F8H
 Counts all L2 HW prefetcher requests.
 .It Li L2_RQSTS.MISS
 .Pq Event 24H , Umask 3FH
 All requests that missed L2.
 .It Li L2_RQSTS.REFERENCES
 .Pq Event 24H , Umask FFH
 All requests to L2 cache.
 .It Li L2_DEMAND_RQSTS.WB_HIT
 .Pq Event 27H , Umask 50H
 Not rejected writebacks that hit L2 cache
 .It Li LONGEST_LAT_CACHE.REFERENCE
 .Pq Event 2EH , Umask 4FH
 This event counts requests originating from the core
 that reference a cache line in the last level cache.
 .It Li LONGEST_LAT_CACHE.MISS
 .Pq Event 2EH , Umask 41H
 This event counts each cache miss condition for
 references to the last level cache.
 .It Li CPU_CLK_UNHALTED.THREAD_P
 .Pq Event 3CH , Umask 00H
 Counts the number of thread cycles while the thread is not in a halt state.
 The thread enters the halt state when it is running the HLT instruction.
 The core frequency may change from time to time due to power or thermal throttling.
 .It Li CPU_CLK_THREAD_UNHALTED.REF_XCLK
 .Pq Event 3CH , Umask 01H
 Increments at the frequency of XCLK (100 MHz)
 when not halted.
 .It Li L1D_PEND_MISS.PENDING
 .Pq Event 48H , Umask 01H
 Increments the number of outstanding L1D misses every cycle.
 Set Cmaks = 1 and Edge =1 to count occurrences.
 .It Li DTLB_STORE_MISSES.MISS_CAUSES_A_WALK
 .Pq Event 49H , Umask 01H
 Miss in all TLB levels causes an page walk of any
 page size (4K/2M/4M/1G).
 .It Li DTLB_STORE_MISSES.WALK_COMPLETED_4K
 .Pq Event 49H , Umask 02H
 Completed page walks due to store misses in one or
 more TLB levels of 4K page structure.
 .It Li DTLB_STORE_MISSES.WALK_COMPLETED_2M_4M
 .Pq Event 49H , Umask 04H
 Completed page walks due to store misses in one or
 more TLB levels of 2M/4M page structure.
 .It Li DTLB_STORE_MISSES.WALK_COMPLETED
 .Pq Event 49H , Umask 0EH
 Completed page walks due to store miss in any TLB
 levels of any page size (4K/2M/4M/1G).
 .It Li DTLB_STORE_MISSES.WALK_DURATION
 .Pq Event 49H , Umask 10H
 Cycles PMH is busy with this walk.
 .It Li DTLB_STORE_MISSES.STLB_HIT_4K
 .Pq Event 49H , Umask 20H
 Store misses that missed DTLB but hit STLB (4K).
 .It Li DTLB_STORE_MISSES.STLB_HIT_2M
 .Pq Event 49H , Umask 40H
 Store misses that missed DTLB but hit STLB (2M).
 .It Li DTLB_STORE_MISSES.STLB_HIT
 .Pq Event 49H , Umask 60H
 Store operations that miss the first TLB level but hit
 the second and do not cause page walks.
 .It Li DTLB_STORE_MISSES.PDE_CACHE_MISS
 .Pq Event 49H , Umask 80H
 DTLB store misses with low part of linear-to-physical
 address translation missed.
 .It Li LOAD_HIT_PRE.SW_PF
 .Pq Event 4CH , Umask 01H
 Non-SW-prefetch load dispatches that hit fill buffer
 allocated for S/W prefetch.
 .It Li LOAD_HIT_PRE.HW_PF
 .Pq Event 4CH , Umask 02H
 Non-SW-prefetch load dispatches that hit fill buffer
 allocated for H/W prefetch.
 .It Li L1D.REPLACEMENT
 .Pq Event 51H , Umask 01H
 Counts the number of lines brought into the L1 data
 cache.
 .It Li MOVE_ELIMINATION.INT_NOT_ELIMINATED
 .Pq Event 58H , Umask 04H
 Number of integer Move Elimination candidate uops
 that were not eliminated.
 .It Li MOVE_ELIMINATION.SMID_NOT_ELIMINATED
 .Pq Event 58H , Umask 08H
 Number of SIMD Move Elimination candidate uops
 that were not eliminated.
 .It Li MOVE_ELIMINATION.INT_ELIMINATED
 .Pq Event 58H , Umask 01H
 Unhalted core cycles when the thread is in ring 0.
 .It Li MOVE_ELIMINATION.SMID_ELIMINATED
 .Pq Event 58H , Umask 02H
 Number of SIMD Move Elimination candidate uops
 that were eliminated.
 .It Li CPL_CYCLES.RING0
 .Pq Event 5CH , Umask 02H
 Unhalted core cycles when the thread is in ring 0.
 .It Li CPL_CYCLES.RING123
 .Pq Event 5CH , Umask 01H
 Unhalted core cycles when the thread is not in ring 0.
 .It Li RS_EVENTS.EMPTY_CYCLES
 .Pq Event 5EH , Umask 01H
 Cycles the RS is empty for the thread.
 .It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND_DATA_RD
 .Pq Event 60H , Umask 01H
 Offcore outstanding Demand Data Read transactions in SQ to uncore.
 Set Cmask=1 to count cycles.
 .It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND_CORE_RD
 .Pq Event 60H , Umask 02H
 Offcore outstanding Demand code Read transactions in SQ to uncore.
 Set Cmask=1 to count cycles.
 .It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND_RFO
 .Pq Event 60H , Umask 04H
 Offcore outstanding RFO store transactions in SQ to uncore.
 Set Cmask=1 to count cycles.
 .It Li OFFCORE_REQUESTS_OUTSTANDING.ALL_DATA_RD
 .Pq Event 60H , Umask 08H
 Offcore outstanding cacheable data read transactions in SQ to uncore.
 Set Cmask=1 to count cycles.
 .It Li LOCK_CYCLES.SPLIT_LOCK_UC_LOCK_DURATION
 .Pq Event 63H , Umask 01H
 Cycles in which the L1D and L2 are locked, due to a UC lock or split lock.
 .It Li LOCK_CYCLES.CACHE_LOCK_DURATION
 .Pq Event 63H , Umask 02H
 Cycles in which the L1D is locked.
 .It Li IDQ.EMPTY
 .Pq Event 79H , Umask 02H
 Counts cycles the IDQ is empty.
 .It Li IDQ.MITE_UOPS
 .Pq Event 79H , Umask 04H
 Increment each cycle # of uops delivered to IDQ from MITE path.
 Set Cmask = 1 to count cycles.
 .It Li IDQ.DSB_UOPS
 .Pq Event 79H , Umask 08H
 Increment each cycle. # of uops delivered to IDQ
 from DSB path.
 Set Cmask = 1 to count cycles.
 .It Li IDQ.MS_DSB_UOPS
 .Pq Event 79H , Umask 10H
 Increment each cycle # of uops delivered to IDQ when MS_busy by DSB.
 Set Cmask = 1 to count cycles.
 Add Edge=1 to count # of delivery.
 .It Li IDQ.MS_MITE_UOPS
 .Pq Event 79H , Umask 20H
 ncrement each cycle # of uops delivered to IDQ when MS_busy by MITE.
 Set Cmask = 1 to count cycles.
 .It Li IDQ.MS_UOPS
 .Pq Event 79H , Umask 30H
 Increment each cycle # of uops delivered to IDQ from MS by either DSB or MITE.
 Set Cmask = 1 to count cycles.
 .It Li IDQ.ALL_DSB_CYCLES_ANY_UOPS
 .Pq Event 79H , Umask 18H
 Counts cycles DSB is delivered at least one uops.
 Set Cmask = 1.
 .It Li IDQ.ALL_DSB_CYCLES_4_UOPS
 .Pq Event 79H , Umask 18H
 Counts cycles DSB is delivered four uops.
 Set Cmask=4.
 .It Li IDQ.ALL_MITE_CYCLES_ANY_UOPS
 .Pq Event 79H , Umask 24H
 Counts cycles MITE is delivered at least one uops.
 Set Cmask = 1.
 .It Li IDQ.ALL_MITE_CYCLES_4_UOPS
 .Pq Event 79H , Umask 24H
 Counts cycles MITE is delivered four uops.
 Set Cmask =4.
 .It Li IDQ.MITE_ALL_UOPS
 .Pq Event 79H , Umask 3CH
 # of uops delivered to IDQ from any path.
 .It Li ICACHE.MISSES
 .Pq Event 80H , Umask 02H
 Number of Instruction Cache, Streaming Buffer and Victim Cache Misses.
 Includes UC accesses.
 .It Li ITLB_MISSES.MISS_CAUSES_A_WALK
 .Pq Event 85H , Umask 01H
 Misses in ITLB that causes a page walk of any page
 size.
 .It Li ITLB_MISSES.WALK_COMPLETED_4K
 .Pq Event 85H , Umask 02H
 Completed page walks due to misses in ITLB 4K page
 entries.
 .It Li TLB_MISSES.WALK_COMPLETED_2M_4M
 .Pq Event 85H , Umask 04H
 Completed page walks due to misses in ITLB 2M/4M
 page entries.
 .It Li ITLB_MISSES.WALK_COMPLETED
 .Pq Event 85H , Umask 0EH
 Completed page walks in ITLB of any page size.
 .It Li ITLB_MISSES.WALK_DURATION
 .Pq Event 85H , Umask 10H
 Cycle PMH is busy with a walk.
 .It Li ITLB_MISSES.STLB_HIT_4K
 .Pq Event 85H , Umask 20H
 ITLB misses that hit STLB (4K).
 .It Li ITLB_MISSES.STLB_HIT_2M
 .Pq Event 85H , Umask 40H
 ITLB misses that hit STLB (2K).
 .It Li ITLB_MISSES.STLB_HIT
 .Pq Event 85H , Umask 60H
 TLB misses that hit STLB.
 No page walk.
 .It Li ILD_STALL.LCP
 .Pq Event 87H , Umask 01H
 Stalls caused by changing prefix length of the
 instruction.
 .It Li ILD_STALL.IQ_FULL
 .Pq Event 87H , Umask 04H
 Stall cycles due to IQ is full.
 .It Li BR_INST_EXEC.NONTAKEN_COND
 .Pq Event 88H , Umask 41H
 Count conditional near branch instructions that were executed (but not
 necessarily retired) and not taken.
 .It Li BR_INST_EXEC.TAKEN_COND
 .Pq Event 88H , Umask 81H
 Count conditional near branch instructions that were executed (but not
 necessarily retired) and taken.
 .It Li BR_INST_EXEC.DIRECT_JMP
 .Pq Event 88H , Umask 82H
 Count all unconditional near branch instructions excluding calls and
 indirect branches.
 .It Li BR_INST_EXEC.INDIRECT_JMP_NON_CALL_RET
 .Pq Event 88H , Umask 84H
 Count executed indirect near branch instructions that are not calls nor
 returns.
 .It Li BR_INST_EXEC.RETURN_NEAR
 .Pq Event 88H , Umask 88H
 Count indirect near branches that have a return mnemonic.
 .It Li BR_INST_EXEC.DIRECT_NEAR_CALL
 .Pq Event 88H , Umask 90H
 Count unconditional near call branch instructions, excluding non call
 branch, executed.
 .It Li BR_INST_EXEC.INDIRECT_NEAR_CALL
 .Pq Event 88H , Umask A0H
 Count indirect near calls, including both register and memory indirect,
 executed.
 .It Li BR_INST_EXEC.ALL_BRANCHES
 .Pq Event 88H , Umask FFH
 Counts all near executed branches (not necessarily retired).
 .It Li BR_MISP_EXEC.NONTAKEN_COND
 .Pq Event 89H , Umask 41H
 Count conditional near branch instructions mispredicted as nontaken.
 .It Li BR_MISP_EXEC.TAKEN_COND
 .Pq Event 89H , Umask 81H
 Count conditional near branch instructions mispredicted as taken.
 .It Li BR_MISP_EXEC.INDIRECT_JMP_NON_CALL_RET
 .Pq Event 89H , Umask 84H
 Count mispredicted indirect near branch instructions that are not calls
 nor returns.
 .It Li BR_MISP_EXEC.RETURN_NEAR
 .Pq Event 89H , Umask 88H
 Count mispredicted indirect near branches that have a return mnemonic.
 .It Li BR_MISP_EXEC.DIRECT_NEAR_CALL
 .Pq Event 89H , Umask 90H
 Count mispredicted unconditional near call branch instructions, excluding
 non call branch, executed.
 .It Li BR_MISP_EXEC.INDIRECT_NEAR_CALL
 .Pq Event 89H , Umask A0H
 Count mispredicted indirect near calls, including both register and memory
 indirect, executed.
 .It Li BR_MISP_EXEC.ALL_BRANCHES
 .Pq Event 89H , Umask FFH
 Counts all mispredicted near executed branches (not necessarily retired).
 .It Li IDQ_UOPS_NOT_DELIVERED.CORE
 .Pq Event 9CH , Umask 01H
 Count number of non-delivered uops to RAT per
 thread.
 .It Li UOPS_EXECUTED_PORT.PORT_0
 .Pq Event A1H , Umask 01H
 Cycles which a Uop is dispatched on port 0 in this
 thread.
 .It Li UOPS_EXECUTED_PORT.PORT_1
 .Pq Event A1H , Umask 02H
 Cycles which a Uop is dispatched on port 1 in this
 thread.
 .It Li UOPS_EXECUTED_PORT.PORT_2
 .Pq Event A1H , Umask 04H
 Cycles which a Uop is dispatched on port 2 in this
 thread.
 .It Li UOPS_EXECUTED_PORT.PORT_3
 .Pq Event A1H , Umask 08H
 Cycles which a Uop is dispatched on port 3 in this
 thread.
 .It Li UOPS_EXECUTED_PORT.PORT_4
 .Pq Event A1H , Umask 10H
 Cycles which a Uop is dispatched on port 4 in this
 thread.
 .It Li UOPS_EXECUTED_PORT.PORT_5
 .Pq Event A1H , Umask 20H
 Cycles which a Uop is dispatched on port 5 in this
 thread.
 .It Li UOPS_EXECUTED_PORT.PORT_6
 .Pq Event A1H , Umask 40H
 Cycles which a Uop is dispatched on port 6 in this
 thread.
 .It Li UOPS_EXECUTED_PORT.PORT_7
 .Pq Event A1H , Umask 80H
 Cycles which a Uop is dispatched on port 7 in this
 thread.
 .It Li RESOURCE_STALLS.ANY
 .Pq Event A2H , Umask 01H
 Cycles Allocation is stalled due to Resource Related
 reason.
 .It Li RESOURCE_STALLS.RS
 .Pq Event A2H , Umask 04H
 Cycles stalled due to no eligible RS entry available.
 .It Li RESOURCE_STALLS.SB
 .Pq Event A2H , Umask 08H
 Cycles stalled due to no store buffers available (not
 including draining form sync).
 .It Li RESOURCE_STALLS.ROB
 .Pq Event A2H , Umask 10H
 Cycles stalled due to re-order buffer full.
 .It Li CYCLE_ACTIVITY.CYCLES_L2_PENDING
 .Pq Event A3H , Umask 01H
 Cycles with pending L2 miss loads.
 Set Cmask=2 to count cycle.
 .It Li CYCLE_ACTIVITY.CYCLES_LDM_PENDING
 .Pq Event A3H , Umask 02H
 Cycles with pending memory loads.
 Set Cmask=2 to count cycle.
 .It Li CYCLE_ACTIVITY.STALLS_L2_PENDING
 .Pq Event A3H , Umask 05H
 Number of loads missed L2.
 .It Li CYCLE_ACTIVITY.CYCLES_L1D_PENDING
 .Pq Event A3H , Umask 08H
 Cycles with pending L1 cache miss loads.
 Set Cmask=8 to count cycle.
 .It Li ITLB.ITLB_FLUSH
 .Pq Event AEH , Umask 01H
 Counts the number of ITLB flushes, includes
 4k/2M/4M pages.
 .It Li OFFCORE_REQUESTS.DEMAND_DATA_RD
 .Pq Event B0H , Umask 01H
 Demand data read requests sent to uncore.
 .It Li OFFCORE_REQUESTS.DEMAND_CODE_RD
 .Pq Event B0H , Umask 02H
 Demand code read requests sent to uncore.
 .It Li OFFCORE_REQUESTS.DEMAND_RFO
 .Pq Event B0H , Umask 04H
 Demand RFO read requests sent to uncore, including
 regular RFOs, locks, ItoM.
 .It Li OFFCORE_REQUESTS.ALL_DATA_RD
 .Pq Event B0H , Umask 08H
 Data read requests sent to uncore (demand and
 prefetch).
 .It Li UOPS_EXECUTED.CORE
 .Pq Event B1H , Umask 02H
 Counts total number of uops to be executed per-core
 each cycle.
 .It Li OFF_CORE_RESPONSE_0
 .Pq Event B7H , Umask 01H
 Requires MSR 01A6H
 .It Li OFF_CORE_RESPONSE_1
 .Pq Event BBH , Umask 01H
 Requires MSR 01A7H
 .It Li PAGE_WALKER_LOADS.DTLB_L1
 .Pq Event BCH , Umask 11H
 Number of DTLB page walker loads that hit in the
 L1+FB.
 .It Li PAGE_WALKER_LOADS.ITLB_L1
 .Pq Event BCH , Umask 21H
 Number of ITLB page walker loads that hit in the
 L1+FB.
 .It Li PAGE_WALKER_LOADS.DTLB_L2
 .Pq Event BCH , Umask 12H
 Number of DTLB page walker loads that hit in the L2.
 .It Li PAGE_WALKER_LOADS.ITLB_L2
 .Pq Event BCH , Umask 22H
 Number of ITLB page walker loads that hit in the L2.
 .It Li PAGE_WALKER_LOADS.DTLB_L3
 .Pq Event BCH , Umask 14H
 Number of DTLB page walker loads that hit in the L3.
 .It Li PAGE_WALKER_LOADS.ITLB_L3
 .Pq Event BCH , Umask 24H
 Number of ITLB page walker loads that hit in the L3.
 .It Li PAGE_WALKER_LOADS.DTLB_MEMORY
 .Pq Event BCH , Umask 18H
 Number of DTLB page walker loads from memory.
 .It Li PAGE_WALKER_LOADS.ITLB_MEMORY
 .Pq Event BCH , Umask 28H
 Number of ITLB page walker loads from memory.
 .It Li TLB_FLUSH.DTLB_THREAD
 .Pq Event BDH , Umask 01H
 DTLB flush attempts of the thread-specific entries.
 .It Li TLB_FLUSH.STLB_ANY
 .Pq Event BDH , Umask 20H
 Count number of STLB flush attempts.
 .It Li INST_RETIRED.ANY_P
 .Pq Event C0H , Umask 00H
 Number of instructions at retirement.
 .It Li INST_RETIRED.ALL
 .Pq Event C0H , Umask 01H
 Precise instruction retired event with HW to reduce
 effect of PEBS shadow in IP distribution.
 .It Li OTHER_ASSISTS.AVX_TO_SSE
 .Pq Event C1H , Umask 08H
 Number of transitions from AVX-256 to legacy SSE
 when penalty applicable.
 .It Li OTHER_ASSISTS.SSE_TO_AVX
 .Pq Event C1H , Umask 10H
 Number of transitions from SSE to AVX-256 when
 penalty applicable.
 .It Li OTHER_ASSISTS.ANY_WB_ASSIST
 .Pq Event C1H , Umask 40H
 Number of microcode assists invoked by HW upon
 uop writeback.
 .It Li UOPS_RETIRED.ALL
 .Pq Event C2H , Umask 01H
 Counts the number of micro-ops retired, Use
 cmask=1 and invert to count active cycles or stalled
 cycles.
 .It Li UOPS_RETIRED.RETIRE_SLOTS
 .Pq Event C2H , Umask 02H
 Counts the number of retirement slots used each
 cycle.
 .It Li MACHINE_CLEARS.MEMORY_ORDERING
 .Pq Event C3H , Umask 02H
 Counts the number of machine clears due to memory
 order conflicts.
 .It Li MACHINE_CLEARS.SMC
 .Pq Event C3H , Umask 04H
 Number of self-modifying-code machine clears
 detected.
 .It Li MACHINE_CLEARS.MASKMOV
 .Pq Event C3H , Umask 20H
 Counts the number of executed AVX masked load
 operations that refer to an illegal address range with
 the mask bits set to 0.
 .It Li BR_INST_RETIRED.ALL_BRANCHES
 .Pq Event C4H , Umask 00H
 Branch instructions at retirement.
 .It Li BR_INST_RETIRED.CONDITIONAL
 .Pq Event C4H , Umask 01H
 Counts the number of conditional branch instructions Supports PEBS
 retired.
 .It Li BR_INST_RETIRED.NEAR_CALL
 .Pq Event C4H , Umask 02H
 Direct and indirect near call instructions retired.
 .It Li BR_INST_RETIRED.ALL_BRANCHES
 .Pq Event C4H , Umask 04H
 Counts the number of branch instructions retired.
 .It Li BR_INST_RETIRED.NEAR_RETURN
 .Pq Event C4H , Umask 08H
 Counts the number of near return instructions
 retired.
 .It Li BR_INST_RETIRED.NOT_TAKEN
 .Pq Event C4H , Umask 10H
 Counts the number of not taken branch instructions
 retired.
  It Li BR_INST_RETIRED.NEAR_TAKEN
 .Pq Event C4H , Umask 20H
 Number of near taken branches retired.
 .It Li BR_INST_RETIRED.FAR_BRANCH
 .Pq Event C4H , Umask 40H
 Number of far branches retired.
 .It Li BR_MISP_RETIRED.ALL_BRANCHES
 .Pq Event C5H , Umask 00H
 Mispredicted branch instructions at retirement
 .It Li BR_MISP_RETIRED.CONDITIONAL
 .Pq Event C5H , Umask 01H
 Mispredicted conditional branch instructions retired.
 .It Li BR_MISP_RETIRED.CONDITIONAL
 .Pq Event C5H , Umask 04H
 Mispredicted macro branch instructions retired.
 .It Li FP_ASSIST.X87_OUTPUT
 .Pq Event CAH , Umask 02H
 Number of X87 FP assists due to Output values.
 .It Li FP_ASSIST.X87_INPUT
 .Pq Event CAH , Umask 04H
 Number of X87 FP assists due to input values.
 .It Li FP_ASSIST.SIMD_OUTPUT
 .Pq Event CAH , Umask 08H
 Number of SIMD FP assists due to Output values.
 .It Li FP_ASSIST.SIMD_INPUT
 .Pq Event CAH , Umask 10H
 Number of SIMD FP assists due to input values.
 .It Li FP_ASSIST.ANY
 .Pq Event CAH , Umask 1EH
 Cycles with any input/output SSE* or FP assists.
 .It Li ROB_MISC_EVENTS.LBR_INSERTS
 .Pq Event CCH , Umask 20H
 Count cases of saving new LBR records by hardware.
 .It Li MEM_TRANS_RETIRED.LOAD_LATENCY
 .Pq Event CDH , Umask 01H
 Randomly sampled loads whose latency is above a user defined threshold.
 A small fraction of the overall loads are sampled due to randomization.
 .It Li MEM_UOPS_RETIRED.STLB_MISS_LOADS
 .Pq Event D0H , Umask 11H
 Count retired load uops that missed the STLB.
 .It Li MEM_UOPS_RETIRED.STLB_MISS_STORES
 .Pq Event D0H , Umask 12H
 Count retired store uops that missed the STLB.
 .It Li MEM_UOPS_RETIRED.SPLIT_LOADS
 .Pq Event D0H , Umask 41H
 Count retired load uops that were split across a cache line.
 .It Li MEM_UOPS_RETIRED.SPLIT_STORES
 .Pq Event D0H , Umask 42H
 Count retired store uops that were split across a cache line.
 .It Li MEM_UOPS_RETIRED.ALL_LOADS
 .Pq Event D0H , Umask 81H
 Count all retired load uops.
 .It Li MEM_UOPS_RETIRED.ALL_STORES
 .Pq Event D0H , Umask 82H
 Count all retired store uops.
 .It Li MEM_LOAD_UOPS_RETIRED.L1_HIT
 .Pq Event D1H , Umask 01H
 Retired load uops with L1 cache hits as data sources.
 .It Li MEM_LOAD_UOPS_RETIRED.L2_HIT
 .Pq Event D1H , Umask 02H
 Retired load uops with L2 cache hits as data sources.
 .It Li MEM_LOAD_UOPS_RETIRED.LLC_HIT
 .Pq Event D1H , Umask 04H
 Retired load uops with LLC cache hits as data
 sources.
 .It Li MEM_LOAD_UOPS_RETIRED.L2_MISS
 .Pq Event D1H , Umask 10H
 Retired load uops missed L2.
 Unknown data source excluded.
 .It Li MEM_LOAD_UOPS_RETIRED.HIT_LFB
 .Pq Event D1H , Umask 40H
 Retired load uops which data sources were load uops
 missed L1 but hit FB due to preceding miss to the
 same cache line with data not ready.
 .It Li MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_MISS
 .Pq Event D2H , Umask 01H
 Retired load uops which data sources were LLC hit
 and cross-core snoop missed in on-pkg core cache.
 .It Li MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HIT
 .Pq Event D2H , Umask 02H
 Retired load uops which data sources were LLC and
 cross-core snoop hits in on-pkg core cache.
 .It Li MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HITM
 .Pq Event D2H , Umask 04H
 Retired load uops which data sources were HitM
 responses from shared LLC.
 .It Li MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_NONE
 .Pq Event D2H , Umask 08H
 Retired load uops which data sources were hits in
 LLC without snoops required.
 .It Li MEM_LOAD_UOPS_LLC_MISS_RETIRED.LOCAL_DRAM
 .Pq Event D3H , Umask 01H
 Retired load uops which data sources missed LLC but
 serviced from local dram.
 .It Li BACLEARS.ANY
 .Pq Event E6H , Umask 1FH
 Number of front end re-steers due to BPU
 misprediction.
 .It Li L2_TRANS.DEMAND_DATA_RD
 .Pq Event F0H , Umask 01H
 Demand Data Read requests that access L2 cache.
 .It Li L2_TRANS.RFO
 .Pq Event F0H , Umask 02H
 RFO requests that access L2 cache.
 .It Li L2_TRANS.CODE_RD
 .Pq Event F0H , Umask 04H
 L2 cache accesses when fetching instructions.
 .It Li L2_TRANS.ALL_PF
 .Pq Event F0H , Umask 08H
 Any MLC or LLC HW prefetch accessing L2, including
 rejects.
 .It Li L2_TRANS.L1D_WB
 .Pq Event F0H , Umask 10H
 L1D writebacks that access L2 cache.
 .It Li L2_TRANS.L2_FILL
 .Pq Event F0H , Umask 20H
 L2 fill requests that access L2 cache.
 .It Li L2_TRANS.L2_WB
 .Pq Event F0H , Umask 40H
 L2 writebacks that access L2 cache.
 .It Li L2_TRANS.ALL_REQUESTS
 .Pq Event F0H , Umask 80H
 Transactions accessing L2 pipe.
 .It Li L2_LINES_IN.I
 .Pq Event F1H , Umask 01H
 L2 cache lines in I state filling L2.
 .It Li L2_LINES_IN.S
 .Pq Event F1H , Umask 02H
 L2 cache lines in S state filling L2.
 .It Li L2_LINES_IN.E
 .Pq Event F1H , Umask 04H
 L2 cache lines in E state filling L2.
 .It Li L2_LINES_IN.ALL
 .Pq Event F1H , Umask 07H
 L2 cache lines filling L2.
 .It Li L2_LINES_OUT.DEMAND_CLEAN
 .Pq Event F2H , Umask 05H
 Clean L2 cache lines evicted by demand.
 .It Li L2_LINES_OUT.DEMAND_DIRTY
 .Pq Event F2H , Umask 06H
 Dirty L2 cache lines evicted by demand.
 .El
 .Sh SEE ALSO
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.corei7 3 ,
 .Xr pmc.corei7uc 3 ,
 .Xr pmc.haswelluc 3 ,
 .Xr pmc.iaf 3 ,
 .Xr pmc.ivybridge 3 ,
 .Xr pmc.ivybridgexeon 3 ,
-.Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.sandybridge 3 ,
 .Xr pmc.sandybridgeuc 3 ,
 .Xr pmc.sandybridgexeon 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
 .Xr pmc.ucf 3 ,
 .Xr pmc.westmere 3 ,
 .Xr pmc.westmereuc 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
 .Sh HISTORY
 The
 .Nm pmc
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
 .An -nosplit
 The
 .Lb libpmc
 library was written by
 .An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
 The support for the Haswell
 microarchitecture was written by
 .An Hiren Panchasara Aq Mt hiren.panchasara@gmail.com .
diff --git a/lib/libpmc/pmc.haswelluc.3 b/lib/libpmc/pmc.haswelluc.3
index 42d379a0cb9f..03c37995a41b 100644
--- a/lib/libpmc/pmc.haswelluc.3
+++ b/lib/libpmc/pmc.haswelluc.3
@@ -1,230 +1,229 @@
 .\" Copyright (c) 2013 Hiren Panchasara <hiren.panchasara@gmail.com>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .Dd March 22, 2013
 .Dt PMC.HASWELLUC 3
 .Os
 .Sh NAME
 .Nm pmc.haswelluc
 .Nd uncore measurement events for
 .Tn Intel
 .Tn Haswell
 family CPUs
 .Sh LIBRARY
 .Lb libpmc
 .Sh SYNOPSIS
 .In pmc.h
 .Sh DESCRIPTION
 .Tn Intel
 .Tn "Haswell"
 CPUs contain PMCs conforming to version 3 of the
 .Tn Intel
 performance measurement architecture.
 These CPUs contain two classes of PMCs:
 .Bl -tag -width "Li PMC_CLASS_UCP"
 .It Li PMC_CLASS_UCF
 Fixed-function counters that count only one hardware event per counter.
 .It Li PMC_CLASS_UCP
 Programmable counters that may be configured to count one of a defined
 set of hardware events.
 .El
 .Pp
 The number of PMCs available in each class and their widths need to be
 determined at run time by calling
 .Xr pmc_cpuinfo 3 .
 .Pp
 Intel Haswell PMCs are documented in
 .Rs
 .%B "Intel(R) 64 and IA-32 Architectures Software Developers Manual"
 .%T "Combined Volumes: 1, 2A, 2B, 2C, 3A, 3B and 3C"
 .%N "Order Number: 325462-045US"
 .%D January 2013
 .%Q "Intel Corporation"
 .Re
 .Ss HASWELL UNCORE FIXED FUNCTION PMCS
 These PMCs and their supported events are documented in
 .Xr pmc.ucf 3 .
 Not all CPUs in this family implement fixed-function counters.
 .Ss HASWELL UNCORE PROGRAMMABLE PMCS
 The programmable PMCs support the following capabilities:
 .Bl -column "PMC_CAP_INTERRUPT" "Support"
 .It Em Capability Ta Em Support
 .It PMC_CAP_CASCADE Ta \&No
 .It PMC_CAP_EDGE Ta Yes
 .It PMC_CAP_INTERRUPT Ta \&No
 .It PMC_CAP_INVERT Ta Yes
 .It PMC_CAP_READ Ta Yes
 .It PMC_CAP_PRECISE Ta \&No
 .It PMC_CAP_SYSTEM Ta \&No
 .It PMC_CAP_TAGGING Ta \&No
 .It PMC_CAP_THRESHOLD Ta Yes
 .It PMC_CAP_USER Ta \&No
 .It PMC_CAP_WRITE Ta Yes
 .El
 .Ss Event Qualifiers
 Event specifiers for these PMCs support the following common
 qualifiers:
 .Bl -tag -width indent
 .It Li cmask= Ns Ar value
 Configure the PMC to increment only if the number of configured
 events measured in a cycle is greater than or equal to
 .Ar value .
 .It Li edge
 Configure the PMC to count the number of de-asserted to asserted
 transitions of the conditions expressed by the other qualifiers.
 If specified, the counter will increment only once whenever a
 condition becomes true, irrespective of the number of clocks during
 which the condition remains true.
 .It Li inv
 Invert the sense of comparison when the
 .Dq Li cmask
 qualifier is present, making the counter increment when the number of
 events per cycle is less than the value specified by the
 .Dq Li cmask
 qualifier.
 .El
 .Ss Event Specifiers (Programmable PMCs)
 Haswell programmable PMCs support the following events:
 .Bl -tag -width indent
 .It Li UNC_CBO_XSNP_RESPONSE.MISS
 .Pq Event 22H , Umask 01H
 A snoop misses in some processor core.
 .It Li UNC_CBO_XSNP_RESPONSE.INVAL
 .Pq Event 22H , Umask 02H
 A snoop invalidates a non-modified line in some
 processor core.
 .It Li UNC_CBO_XSNP_RESPONSE.HIT
 .Pq Event 22H , Umask 04H
 A snoop hits a non-modified line in some processor
 core.
 .It Li UNC_CBO_XSNP_RESPONSE.HITM
 .Pq Event 22H , Umask 08H
 A snoop hits a modified line in some processor core.
 .It Li UNC_CBO_XSNP_RESPONSE.INVAL_M
 .Pq Event 22H , Umask 10H
 A snoop invalidates a modified line in some processor
 core.
 .It Li UNC_CBO_XSNP_RESPONSE.EXTERNAL_FILTER
 .Pq Event 22H , Umask 20H
 Filter on cross-core snoops initiated by this Cbox due
 to external snoop request.
 .It Li UNC_CBO_XSNP_RESPONSE.XCORE_FILTER
 .Pq Event 22H , Umask 40H
 Filter on cross-core snoops initiated by this Cbox due
 to processor core memory request.
 .It Li UNC_CBO_XSNP_RESPONSE.EVICTION_FILTER
 .Pq Event 22H , Umask 80H
 Filter on cross-core snoops initiated by this Cbox due
 to LLC eviction.
 .It Li UNC_CBO_CACHE_LOOKUP.M
 .Pq Event 34H , Umask 01H
 LLC lookup request that access cache and found line in
 M-state.
 .It Li UNC_CBO_CACHE_LOOKUP.ES
 .Pq Event 34H , Umask 06H
 LLC lookup request that access cache and found line in
 E or S state.
 .It Li UNC_CBO_CACHE_LOOKUP.I
 .Pq Event 34H , Umask 08H
 LLC lookup request that access cache and found line in
 I-state.
 .It Li UNC_CBO_CACHE_LOOKUP.READ_FILTER
 .Pq Event 34H , Umask 10H
 Filter on processor core initiated cacheable read
 requests.
 Must combine with at least one of 01H, 02H, 04H, 08H.
 .It Li UNC_CBO_CACHE_LOOKUP.WRITE_FILTER
 .Pq Event 34H , Umask 20H
 Filter on processor core initiated cacheable write requests.
 Must combine with at least one of 01H, 02H, 04H, 08H.
 .It Li UNC_CBO_CACHE_LOOKUP.EXTSNP_FILTER
 .Pq Event 34H , Umask 40H
 Filter on external snoop requests.
 Must combine with at least one of 01H, 02H, 04H, 08H.
 .It Li UNC_CBO_CACHE_LOOKUP.ANY_REQUEST_FILTER
 .Pq Event 34H , Umask 80H
 Filter on any IRQ or IPQ initiated requests including
 uncacheable, non-coherent requests.
 Must combine with at least one of 01H, 02H, 04H, 08H.
 .It Li UNC_ARB_TRK_OCCUPANCY.ALL
 .Pq Event 80H , Umask 01H
 Counts cycles weighted by the number of requests
 waiting for data returning from the memory controller.
 Accounts for coherent and non-coherent requests
 initiated by IA cores, processor graphic units, or LLC.
 .It Li UNC_ARB_TRK_REQUEST.ALL
 .Pq Event 81H , Umask 01H
 Counts the number of coherent and in-coherent
 requests initiated by IA cores, processor graphic units,
 or LLC.
 .It Li UNC_ARB_TRK_REQUEST.WRITES
 .Pq Event 81H , Umask 20H
 Counts the number of allocated write entries, include
 full, partial, and LLC evictions.
 .It Li UNC_ARB_TRK_REQUEST.EVICTIONS
 .Pq Event 81H , Umask 80H
 Counts the number of LLC evictions allocated.
 .It Li UNC_ARB_COH , Umask TRK_OCCUPANCY.ALL
 .Pq Event 83H , Umask 01H
 Cycles weighted by number of requests pending in
 Coherency Tracker.
 .It Li UNC_ARB_COH , Umask TRK_REQUEST.ALL
 .Pq Event 84H , Umask 01H
 Number of requests allocated in Coherency Tracker.
 .El
 .Sh SEE ALSO
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.corei7 3 ,
 .Xr pmc.corei7uc 3 ,
 .Xr pmc.haswell 3 ,
 .Xr pmc.iaf 3 ,
-.Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.sandybridge 3 ,
 .Xr pmc.sandybridgeuc 3 ,
 .Xr pmc.sandybridgexeon 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
 .Xr pmc.ucf 3 ,
 .Xr pmc.westmere 3 ,
 .Xr pmc.westmereuc 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
 .Sh HISTORY
 The
 .Nm pmc
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
 .An -nosplit
 The
 .Lb libpmc
 library was written by
 .An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
 The support for the Haswell
 microarchitecture was added by
 .An Hiren Panchasara Aq Mt hiren.panchasara@gmail.com .
diff --git a/lib/libpmc/pmc.haswellxeon.3 b/lib/libpmc/pmc.haswellxeon.3
index 55ff8d061c3a..cd6c71fd6606 100644
--- a/lib/libpmc/pmc.haswellxeon.3
+++ b/lib/libpmc/pmc.haswellxeon.3
@@ -1,959 +1,958 @@
 .\"
 .\" Copyright (c) 2013 Hiren Panchasara <hiren.panchasara@gmail.com>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .Dd November 21, 2014
 .Dt PMC.HASWELLXEON 3
 .Os
 .Sh NAME
 .Nm pmc.haswellxeon
 .Nd measurement events for
 .Tn Intel
 .Tn Haswell Xeon
 family CPUs
 .Sh LIBRARY
 .Lb libpmc
 .Sh SYNOPSIS
 .In pmc.h
 .Sh DESCRIPTION
 .Tn Intel
 .Tn "Haswell"
 CPUs contain PMCs conforming to version 2 of the
 .Tn Intel
 performance measurement architecture.
 These CPUs may contain up to two classes of PMCs:
 .Bl -tag -width "Li PMC_CLASS_IAP"
 .It Li PMC_CLASS_IAF
 Fixed-function counters that count only one hardware event per counter.
 .It Li PMC_CLASS_IAP
 Programmable counters that may be configured to count one of a defined
 set of hardware events.
 .El
 .Pp
 The number of PMCs available in each class and their widths need to be
 determined at run time by calling
 .Xr pmc_cpuinfo 3 .
 .Pp
 Intel Haswell Xeon PMCs are documented in
 .Rs
 .%B "Intel(R) 64 and IA-32 Architectures Software Developer's Manual"
 .%T "Combined Volumes: 1, 2A, 2B, 2C, 3A, 3B and 3C"
 .%N "Order Number: 325462-052US"
 .%D September 2014
 .%Q "Intel Corporation"
 .Re
 .Ss HASWELL FIXED FUNCTION PMCS
 These PMCs and their supported events are documented in
 .Xr pmc.iaf 3 .
 .Ss HASWELL PROGRAMMABLE PMCS
 The programmable PMCs support the following capabilities:
 .Bl -column "PMC_CAP_INTERRUPT" "Support"
 .It Em Capability Ta Em Support
 .It PMC_CAP_CASCADE Ta \&No
 .It PMC_CAP_EDGE Ta Yes
 .It PMC_CAP_INTERRUPT Ta Yes
 .It PMC_CAP_INVERT Ta Yes
 .It PMC_CAP_READ Ta Yes
 .It PMC_CAP_PRECISE Ta \&No
 .It PMC_CAP_SYSTEM Ta Yes
 .It PMC_CAP_TAGGING Ta \&No
 .It PMC_CAP_THRESHOLD Ta Yes
 .It PMC_CAP_USER Ta Yes
 .It PMC_CAP_WRITE Ta Yes
 .El
 .Ss Event Qualifiers
 Event specifiers for these PMCs support the following common
 qualifiers:
 .Bl -tag -width indent
 .It Li rsp= Ns Ar value
 Configure the Off-core Response bits.
 .Bl -tag -width indent
 .It Li DMND_DATA_RD
 Counts the number of demand and DCU prefetch data reads of full
 and partial cachelines as well as demand data page table entry
 cacheline reads.
 Does not count L2 data read prefetches or instruction fetches.
 .It Li REQ_DMND_RFO
 Counts the number of demand and DCU prefetch reads for ownership (RFO)
 requests generated by a write to data cacheline.
 Does not count L2 RFO prefetches.
 .It Li REQ_DMND_IFETCH
 Counts the number of demand and DCU prefetch instruction cacheline reads.
 Does not count L2 code read prefetches.
 .It Li REQ_WB
 Counts the number of writeback (modified to exclusive) transactions.
 .It Li REQ_PF_DATA_RD
 Counts the number of data cacheline reads generated by L2 prefetchers.
 .It Li REQ_PF_RFO
 Counts the number of RFO requests generated by L2 prefetchers.
 .It Li REQ_PF_IFETCH
 Counts the number of code reads generated by L2 prefetchers.
 .It Li REQ_PF_LLC_DATA_RD
 L2 prefetcher to L3 for loads.
 .It Li REQ_PF_LLC_RFO
 RFO requests generated by L2 prefetcher
 .It Li REQ_PF_LLC_IFETCH
 L2 prefetcher to L3 for instruction fetches.
 .It Li REQ_BUS_LOCKS
 Bus lock and split lock requests.
 .It Li REQ_STRM_ST
 Streaming store requests.
 .It Li REQ_OTHER
 Any other request that crosses IDI, including I/O.
 .It Li RES_ANY
 Catch all value for any response types.
 .It Li RES_SUPPLIER_NO_SUPP
 No Supplier Information available.
 .It Li RES_SUPPLIER_LLC_HITM
 M-state initial lookup stat in L3.
 .It Li RES_SUPPLIER_LLC_HITE
 E-state.
 .It Li RES_SUPPLIER_LLC_HITS
 S-state.
 .It Li RES_SUPPLIER_LLC_HITF
 F-state.
 .It Li RES_SUPPLIER_LOCAL
 Local DRAM Controller.
 .It Li RES_SNOOP_SNP_NONE
 No details on snoop-related information.
 .It Li RES_SNOOP_SNP_NO_NEEDED
 No snoop was needed to satisfy the request.
 .It Li RES_SNOOP_SNP_MISS
 A snoop was needed and it missed all snooped caches:
 -For LLC Hit, ReslHitl was returned by all cores
 -For LLC Miss, Rspl was returned by all sockets and data was returned from
 DRAM.
 .It Li RES_SNOOP_HIT_NO_FWD
 A snoop was needed and it hits in at least one snooped cache.
 Hit denotes a cache-line was valid before snoop effect.
 This includes:
 -Snoop Hit w/ Invalidation (LLC Hit, RFO)
 -Snoop Hit, Left Shared (LLC Hit/Miss, IFetch/Data_RD)
 -Snoop Hit w/ Invalidation and No Forward (LLC Miss, RFO Hit S)
 In the LLC Miss case, data is returned from DRAM.
 .It Li RES_SNOOP_HIT_FWD
 A snoop was needed and data was forwarded from a remote socket.
 This includes:
 -Snoop Forward Clean, Left Shared (LLC Hit/Miss, IFetch/Data_RD/RFT).
 .It Li RES_SNOOP_HITM
 A snoop was needed and it HitM-ed in local or remote cache.
 HitM denotes a cache-line was in modified state before effect as a results of snoop.
 This includes:
 -Snoop HitM w/ WB (LLC miss, IFetch/Data_RD)
 -Snoop Forward Modified w/ Invalidation (LLC Hit/Miss, RFO)
 -Snoop MtoS (LLC Hit, IFetch/Data_RD).
 .It Li RES_NON_DRAM
 Target was non-DRAM system address.
 This includes MMIO transactions.
 .El
 .It Li cmask= Ns Ar value
 Configure the PMC to increment only if the number of configured
 events measured in a cycle is greater than or equal to
 .Ar value .
 .It Li edge
 Configure the PMC to count the number of de-asserted to asserted
 transitions of the conditions expressed by the other qualifiers.
 If specified, the counter will increment only once whenever a
 condition becomes true, irrespective of the number of clocks during
 which the condition remains true.
 .It Li inv
 Invert the sense of comparison when the
 .Dq Li cmask
 qualifier is present, making the counter increment when the number of
 events per cycle is less than the value specified by the
 .Dq Li cmask
 qualifier.
 .It Li os
 Configure the PMC to count events happening at processor privilege
 level 0.
 .It Li usr
 Configure the PMC to count events occurring at privilege levels 1, 2
 or 3.
 .El
 .Pp
 If neither of the
 .Dq Li os
 or
 .Dq Li usr
 qualifiers are specified, the default is to enable both.
 .Ss Event Specifiers (Programmable PMCs)
 Haswell programmable PMCs support the following events:
 .Bl -tag -width indent
 .It Li LD_BLOCKS.STORE_FORWARD
 .Pq Event 03H , Umask 02H
 Loads blocked by overlapping with store buffer that
 cannot be forwarded.
 .It Li MISALIGN_MEM_REF.LOADS
 .Pq Event 05H , Umask 01H
 Speculative cache-line split load uops dispatched to
 L1D.
 .It Li MISALIGN_MEM_REF.STORES
 .Pq Event 05H , Umask 02H
 Speculative cache-line split Store-address uops
 dispatched to L1D.
 .It Li LD_BLOCKS_PARTIAL.ADDRESS_ALIAS
 .Pq Event 07H , Umask 01H
 False dependencies in MOB due to partial compare
 on address.
 .It Li DTLB_LOAD_MISSES.MISS_CAUSES_A_WALK
 .Pq Event 08H , Umask 01H
 Misses in all TLB levels that cause a page walk of any
 page size.
 .It Li DTLB_LOAD_MISSES.WALK_COMPLETED_4K
 .Pq Event 08H , Umask 02H
 Completed page walks due to demand load misses
 that caused 4K page walks in any TLB levels.
 .It Li DTLB_LOAD_MISSES.WALK_COMPLETED_2M_4K
 .Pq Event 08H , Umask 02H
 Completed page walks due to demand load misses
 that caused 2M/4M page walks in any TLB levels.
 .It Li DTLB_LOAD_MISSES.WALK_COMPLETED
 .Pq Event 08H , Umask 0EH
 Completed page walks in any TLB of any page size
 due to demand load misses
 .It Li DTLB_LOAD_MISSES.WALK_DURATION
 .Pq Event 08H , Umask 10H
 Cycle PMH is busy with a walk.
 .It Li DTLB_LOAD_MISSES.STLB_HIT_4K
 .Pq Event 08H , Umask 20H
 Load misses that missed DTLB but hit STLB (4K).
 .It Li DTLB_LOAD_MISSES.STLB_HIT_2M
 .Pq Event 08H , Umask 40H
 Load misses that missed DTLB but hit STLB (2M).
 .It Li DTLB_LOAD_MISSES.STLB_HIT
 .Pq Event 08H , Umask 60H
 Number of cache load STLB hits.
 No page walk.
 .It Li DTLB_LOAD_MISSES.PDE_CACHE_MISS
 .Pq Event 08H , Umask 80H
 DTLB demand load misses with low part of linear-to-
 physical address translation missed
 .It Li INT_MISC.RECOVERY_CYCLES
 .Pq Event 0DH , Umask 03H
 Cycles waiting to recover after Machine Clears
 except JEClear.
 Set Cmask= 1.
 .It Li UOPS_ISSUED.ANY
 .Pq Event 0EH , Umask 01H
 ncrements each cycle the # of Uops issued by the
 RAT to RS.
 Set Cmask = 1, Inv = 1, Any= 1to count stalled cycles
 of this core.
 .It Li UOPS_ISSUED.FLAGS_MERGE
 .Pq Event 0EH , Umask 10H
 Number of flags-merge uops allocated.
 Such uops adds delay.
 .It Li UOPS_ISSUED.SLOW_LEA
 .Pq Event 0EH , Umask 20H
 Number of slow LEA or similar uops allocated.
 Such uop has 3 sources (e.g. 2 sources + immediate)
 regardless if as a result of LEA instruction or not.
 .It Li UOPS_ISSUED.SiNGLE_MUL
 .Pq Event 0EH , Umask 40H
 Number of multiply packed/scalar single precision
 uops allocated.
 .It Li L2_RQSTS.DEMAND_DATA_RD_MISS
 .Pq Event 24H , Umask 21H
 Demand Data Read requests that missed L2, no
 rejects.
 .It Li L2_RQSTS.DEMAND_DATA_RD_HIT
 .Pq Event 24H , Umask 41H
 Demand Data Read requests that hit L2 cache.
 .It Li L2_RQSTS.ALL_DEMAND_DATA_RD
 .Pq Event 24H , Umask E1H
 Counts any demand and L1 HW prefetch data load
 requests to L2.
 .It Li L2_RQSTS.RFO_HIT
 .Pq Event 24H , Umask 42H
 Counts the number of store RFO requests that hit
 the L2 cache.
 .It Li L2_RQSTS.RFO_MISS
 .Pq Event 24H , Umask 22H
 Counts the number of store RFO requests that miss
 the L2 cache.
 .It Li L2_RQSTS.ALL_RFO
 .Pq Event 24H , Umask E2H
 Counts all L2 store RFO requests.
 .It Li L2_RQSTS.CODE_RD_HIT
 .Pq Event 24H , Umask 44H
 Number of instruction fetches that hit the L2 cache.
 .It Li L2_RQSTS.CODE_RD_MISS
 .Pq Event 24H , Umask 24H
 Number of instruction fetches that missed the L2
 cache.
 .It Li L2_RQSTS.ALL_DEMAND_MISS
 .Pq Event 24H , Umask 27H
 Demand requests that miss L2 cache.
 .It Li L2_RQSTS.ALL_DEMAND_REFERENCES
 .Pq Event 24H , Umask E7H
 Demand requests to L2 cache.
 .It Li L2_RQSTS.ALL_CODE_RD
 .Pq Event 24H , Umask E4H
 Counts all L2 code requests.
 .It Li L2_RQSTS.L2_PF_HIT
 .Pq Event 24H , Umask 50H
 Counts all L2 HW prefetcher requests that hit L2.
 .It Li L2_RQSTS.L2_PF_MISS
 .Pq Event 24H , Umask 30H
 Counts all L2 HW prefetcher requests that missed
 L2.
 .It Li L2_RQSTS.ALL_PF
 .Pq Event 24H , Umask F8H
 Counts all L2 HW prefetcher requests.
 .It Li L2_RQSTS.MISS
 .Pq Event 24H , Umask 3FH
 All requests that missed L2.
 .It Li L2_RQSTS.REFERENCES
 .Pq Event 24H , Umask FFH
 All requests to L2 cache.
 .It Li L2_DEMAND_RQSTS.WB_HIT
 .Pq Event 27H , Umask 50H
 Not rejected writebacks that hit L2 cache
 .It Li LONGEST_LAT_CACHE.REFERENCE
 .Pq Event 2EH , Umask 4FH
 This event counts requests originating from the core
 that reference a cache line in the last level cache.
 .It Li LONGEST_LAT_CACHE.MISS
 .Pq Event 2EH , Umask 41H
 This event counts each cache miss condition for
 references to the last level cache.
 .It Li CPU_CLK_UNHALTED.THREAD_P
 .Pq Event 3CH , Umask 00H
 Counts the number of thread cycles while the thread
 is not in a halt state.
 The thread enters the halt state when it is running the HLT instruction.
 The core frequency may change from time to time due to
 power or thermal throttling.
 .It Li CPU_CLK_THREAD_UNHALTED.REF_XCLK
 .Pq Event 3CH , Umask 01H
 Increments at the frequency of XCLK (100 MHz)
 when not halted.
 .It Li L1D_PEND_MISS.PENDING
 .Pq Event 48H , Umask 01H
 Increments the number of outstanding L1D misses
 every cycle.
 Set Cmaks = 1 and Edge =1 to count occurrences.
 .It Li DTLB_STORE_MISSES.MISS_CAUSES_A_WALK
 .Pq Event 49H , Umask 01H
 Miss in all TLB levels causes an page walk of any
 page size (4K/2M/4M/1G).
 .It Li DTLB_STORE_MISSES.WALK_COMPLETED_4K
 .Pq Event 49H , Umask 02H
 Completed page walks due to store misses in one or
 more TLB levels of 4K page structure.
 .It Li DTLB_STORE_MISSES.WALK_COMPLETED_2M_4M
 .Pq Event 49H , Umask 04H
 Completed page walks due to store misses in one or
 more TLB levels of 2M/4M page structure.
 .It Li DTLB_STORE_MISSES.WALK_COMPLETED
 .Pq Event 49H , Umask 0EH
 Completed page walks due to store miss in any TLB
 levels of any page size (4K/2M/4M/1G).
 .It Li DTLB_STORE_MISSES.WALK_DURATION
 .Pq Event 49H , Umask 10H
 Cycles PMH is busy with this walk.
 .It Li DTLB_STORE_MISSES.STLB_HIT_4K
 .Pq Event 49H , Umask 20H
 Store misses that missed DTLB but hit STLB (4K).
 .It Li DTLB_STORE_MISSES.STLB_HIT_2M
 .Pq Event 49H , Umask 40H
 Store misses that missed DTLB but hit STLB (2M).
 .It Li DTLB_STORE_MISSES.STLB_HIT
 .Pq Event 49H , Umask 60H
 Store operations that miss the first TLB level but hit
 the second and do not cause page walks.
 .It Li DTLB_STORE_MISSES.PDE_CACHE_MISS
 .Pq Event 49H , Umask 80H
 DTLB store misses with low part of linear-to-physical
 address translation missed.
 .It Li LOAD_HIT_PRE.SW_PF
 .Pq Event 4CH , Umask 01H
 Non-SW-prefetch load dispatches that hit fill buffer
 allocated for S/W prefetch.
 .It Li LOAD_HIT_PRE.HW_PF
 .Pq Event 4CH , Umask 02H
 Non-SW-prefetch load dispatches that hit fill buffer
 allocated for H/W prefetch.
 .It Li L1D.REPLACEMENT
 .Pq Event 51H , Umask 01H
 Counts the number of lines brought into the L1 data
 cache.
 .It Li MOVE_ELIMINATION.INT_NOT_ELIMINATED
 .Pq Event 58H , Umask 04H
 Number of integer Move Elimination candidate uops
 that were not eliminated.
 .It Li MOVE_ELIMINATION.SMID_NOT_ELIMINATED
 .Pq Event 58H , Umask 08H
 Number of SIMD Move Elimination candidate uops
 that were not eliminated.
 .It Li MOVE_ELIMINATION.INT_ELIMINATED
 .Pq Event 58H , Umask 01H
 Unhalted core cycles when the thread is in ring 0.
 .It Li MOVE_ELIMINATION.SMID_ELIMINATED
 .Pq Event 58H , Umask 02H
 Number of SIMD Move Elimination candidate uops
 that were eliminated.
 .It Li CPL_CYCLES.RING0
 .Pq Event 5CH , Umask 02H
 Unhalted core cycles when the thread is in ring 0.
 .It Li CPL_CYCLES.RING123
 .Pq Event 5CH , Umask 01H
 Unhalted core cycles when the thread is not in ring 0.
 .It Li RS_EVENTS.EMPTY_CYCLES
 .Pq Event 5EH , Umask 01H
 Cycles the RS is empty for the thread.
 .It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND_DATA_RD
 .Pq Event 60H , Umask 01H
 Offcore outstanding Demand Data Read transactions
 in SQ to uncore.
 Set Cmask=1 to count cycles.
 .It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND_CORE_RD
 .Pq Event 60H , Umask 02H
 Offcore outstanding Demand code Read transactions
 in SQ to uncore.
 Set Cmask=1 to count cycles.
 .It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND_RFO
 .Pq Event 60H , Umask 04H
 Offcore outstanding RFO store transactions in SQ to uncore.
 Set Cmask=1 to count cycles.
 .It Li OFFCORE_REQUESTS_OUTSTANDING.ALL_DATA_RD
 .Pq Event 60H , Umask 08H
 Offcore outstanding cacheable data read
 transactions in SQ to uncore.
 Set Cmask=1 to count cycles.
 .It Li LOCK_CYCLES.SPLIT_LOCK_UC_LOCK_DURATION
 .Pq Event 63H , Umask 01H
 Cycles in which the L1D and L2 are locked, due to a
 UC lock or split lock.
 .It Li LOCK_CYCLES.CACHE_LOCK_DURATION
 .Pq Event 63H , Umask 02H
 Cycles in which the L1D is locked.
 .It Li IDQ.EMPTY
 .Pq Event 79H , Umask 02H
 Counts cycles the IDQ is empty.
 .It Li IDQ.MITE_UOPS
 .Pq Event 79H , Umask 04H
 Increment each cycle # of uops delivered to IDQ from
 MITE path.
 Set Cmask = 1 to count cycles.
 .It Li IDQ.DSB_UOPS
 .Pq Event 79H , Umask 08H
 Increment each cycle. # of uops delivered to IDQ
 from DSB path.
 Set Cmask = 1 to count cycles.
 .It Li IDQ.MS_DSB_UOPS
 .Pq Event 79H , Umask 10H
 Increment each cycle # of uops delivered to IDQ
 when MS_busy by DSB.
 Set Cmask = 1 to count cycles.
 Add Edge=1 to count # of delivery.
 .It Li IDQ.MS_MITE_UOPS
 .Pq Event 79H , Umask 20H
 ncrement each cycle # of uops delivered to IDQ
 when MS_busy by MITE.
 Set Cmask = 1 to count cycles.
 .It Li IDQ.MS_UOPS
 .Pq Event 79H , Umask 30H
 Increment each cycle # of uops delivered to IDQ from
 MS by either DSB or MITE.
 Set Cmask = 1 to count cycles.
 .It Li IDQ.ALL_DSB_CYCLES_ANY_UOPS
 .Pq Event 79H , Umask 18H
 Counts cycles DSB is delivered at least one uops.
 Set Cmask = 1.
 .It Li IDQ.ALL_DSB_CYCLES_4_UOPS
 .Pq Event 79H , Umask 18H
 Counts cycles DSB is delivered four uops.
 Set Cmask =4.
 .It Li IDQ.ALL_MITE_CYCLES_ANY_UOPS
 .Pq Event 79H , Umask 24H
 Counts cycles MITE is delivered at least one uops.
 Set Cmask = 1.
 .It Li IDQ.ALL_MITE_CYCLES_4_UOPS
 .Pq Event 79H , Umask 24H
 Counts cycles MITE is delivered four uops.
 Set Cmask =4.
 .It Li IDQ.MITE_ALL_UOPS
 .Pq Event 79H , Umask 3CH
 # of uops delivered to IDQ from any path.
 .It Li ICACHE.MISSES
 .Pq Event 80H , Umask 02H
 Number of Instruction Cache, Streaming Buffer and
 Victim Cache Misses.
 Includes UC accesses.
 .It Li ITLB_MISSES.MISS_CAUSES_A_WALK
 .Pq Event 85H , Umask 01H
 Misses in ITLB that causes a page walk of any page
 size.
 .It Li ITLB_MISSES.WALK_COMPLETED_4K
 .Pq Event 85H , Umask 02H
 Completed page walks due to misses in ITLB 4K page
 entries.
 .It Li TLB_MISSES.WALK_COMPLETED_2M_4M
 .Pq Event 85H , Umask 04H
 Completed page walks due to misses in ITLB 2M/4M
 page entries.
 .It Li ITLB_MISSES.WALK_COMPLETED
 .Pq Event 85H , Umask 0EH
 Completed page walks in ITLB of any page size.
 .It Li ITLB_MISSES.WALK_DURATION
 .Pq Event 85H , Umask 10H
 Cycle PMH is busy with a walk.
 .It Li ITLB_MISSES.STLB_HIT_4K
 .Pq Event 85H , Umask 20H
 ITLB misses that hit STLB (4K).
 .It Li ITLB_MISSES.STLB_HIT_2M
 .Pq Event 85H , Umask 40H
 ITLB misses that hit STLB (2K).
 .It Li ITLB_MISSES.STLB_HIT
 .Pq Event 85H , Umask 60H
 TLB misses that hit STLB.
 No page walk.
 .It Li ILD_STALL.LCP
 .Pq Event 87H , Umask 01H
 Stalls caused by changing prefix length of the
 instruction.
 .It Li ILD_STALL.IQ_FULL
 .Pq Event 87H , Umask 04H
 Stall cycles due to IQ is full.
 .It Li BR_INST_EXEC.NONTAKEN_COND
 .Pq Event 88H , Umask 41H
 Count conditional near branch instructions that were executed (but not
 necessarily retired) and not taken.
 .It Li BR_INST_EXEC.TAKEN_COND
 .Pq Event 88H , Umask 81H
 Count conditional near branch instructions that were executed (but not
 necessarily retired) and taken.
 .It Li BR_INST_EXEC.DIRECT_JMP
 .Pq Event 88H , Umask 82H
 Count all unconditional near branch instructions excluding calls and
 indirect branches.
 .It Li BR_INST_EXEC.INDIRECT_JMP_NON_CALL_RET
 .Pq Event 88H , Umask 84H
 Count executed indirect near branch instructions that are not calls nor
 returns.
 .It Li BR_INST_EXEC.RETURN_NEAR
 .Pq Event 88H , Umask 88H
 Count indirect near branches that have a return mnemonic.
 .It Li BR_INST_EXEC.DIRECT_NEAR_CALL
 .Pq Event 88H , Umask 90H
 Count unconditional near call branch instructions, excluding non call
 branch, executed.
 .It Li BR_INST_EXEC.INDIRECT_NEAR_CALL
 .Pq Event 88H , Umask A0H
 Count indirect near calls, including both register and memory indirect,
 executed.
 .It Li BR_INST_EXEC.ALL_BRANCHES
 .Pq Event 88H , Umask FFH
 Counts all near executed branches (not necessarily retired).
 .It Li BR_MISP_EXEC.NONTAKEN_COND
 .Pq Event 89H , Umask 41H
 Count conditional near branch instructions mispredicted as nontaken.
 .It Li BR_MISP_EXEC.TAKEN_COND
 .Pq Event 89H , Umask 81H
 Count conditional near branch instructions mispredicted as taken.
 .It Li BR_MISP_EXEC.INDIRECT_JMP_NON_CALL_RET
 .Pq Event 89H , Umask 84H
 Count mispredicted indirect near branch instructions that are not calls
 nor returns.
 .It Li BR_MISP_EXEC.RETURN_NEAR
 .Pq Event 89H , Umask 88H
 Count mispredicted indirect near branches that have a return mnemonic.
 .It Li BR_MISP_EXEC.DIRECT_NEAR_CALL
 .Pq Event 89H , Umask 90H
 Count mispredicted unconditional near call branch instructions, excluding
 non call branch, executed.
 .It Li BR_MISP_EXEC.INDIRECT_NEAR_CALL
 .Pq Event 89H , Umask A0H
 Count mispredicted indirect near calls, including both register and memory
 indirect, executed.
 .It Li BR_MISP_EXEC.ALL_BRANCHES
 .Pq Event 89H , Umask FFH
 Counts all mispredicted near executed branches (not necessarily retired).
 .It Li IDQ_UOPS_NOT_DELIVERED.CORE
 .Pq Event 9CH , Umask 01H
 Count number of non-delivered uops to RAT per
 thread.
 .It Li UOPS_EXECUTED_PORT.PORT_0
 .Pq Event A1H , Umask 01H
 Cycles which a Uop is dispatched on port 0 in this
 thread.
 .It Li UOPS_EXECUTED_PORT.PORT_1
 .Pq Event A1H , Umask 02H
 Cycles which a Uop is dispatched on port 1 in this
 thread.
 .It Li UOPS_EXECUTED_PORT.PORT_2
 .Pq Event A1H , Umask 04H
 Cycles which a Uop is dispatched on port 2 in this
 thread.
 .It Li UOPS_EXECUTED_PORT.PORT_3
 .Pq Event A1H , Umask 08H
 Cycles which a Uop is dispatched on port 3 in this
 thread.
 .It Li UOPS_EXECUTED_PORT.PORT_4
 .Pq Event A1H , Umask 10H
 Cycles which a Uop is dispatched on port 4 in this
 thread.
 .It Li UOPS_EXECUTED_PORT.PORT_5
 .Pq Event A1H , Umask 20H
 Cycles which a Uop is dispatched on port 5 in this
 thread.
 .It Li UOPS_EXECUTED_PORT.PORT_6
 .Pq Event A1H , Umask 40H
 Cycles which a Uop is dispatched on port 6 in this
 thread.
 .It Li UOPS_EXECUTED_PORT.PORT_7
 .Pq Event A1H , Umask 80H
 Cycles which a Uop is dispatched on port 7 in this
 thread.
 .It Li RESOURCE_STALLS.ANY
 .Pq Event A2H , Umask 01H
 Cycles Allocation is stalled due to Resource Related
 reason.
 .It Li RESOURCE_STALLS.RS
 .Pq Event A2H , Umask 04H
 Cycles stalled due to no eligible RS entry available.
 .It Li RESOURCE_STALLS.SB
 .Pq Event A2H , Umask 08H
 Cycles stalled due to no store buffers available (not
 including draining form sync).
 .It Li RESOURCE_STALLS.ROB
 .Pq Event A2H , Umask 10H
 Cycles stalled due to re-order buffer full.
 .It Li CYCLE_ACTIVITY.CYCLES_L2_PENDING
 .Pq Event A3H , Umask 01H
 Cycles with pending L2 miss loads.
 Set Cmask=2 to count cycle.
 .It Li CYCLE_ACTIVITY.CYCLES_LDM_PENDING
 .Pq Event A3H , Umask 02H
 Cycles with pending memory loads.
 Set Cmask=2 to count cycle.
 .It Li CYCLE_ACTIVITY.STALLS_L2_PENDING
 .Pq Event A3H , Umask 05H
 Number of loads missed L2.
 .It Li CYCLE_ACTIVITY.CYCLES_L1D_PENDING
 .Pq Event A3H , Umask 08H
 Cycles with pending L1 cache miss loads.
 Set Cmask=8 to count cycle.
 .It Li ITLB.ITLB_FLUSH
 .Pq Event AEH , Umask 01H
 Counts the number of ITLB flushes, includes
 4k/2M/4M pages.
 .It Li OFFCORE_REQUESTS.DEMAND_DATA_RD
 .Pq Event B0H , Umask 01H
 Demand data read requests sent to uncore.
 .It Li OFFCORE_REQUESTS.DEMAND_CODE_RD
 .Pq Event B0H , Umask 02H
 Demand code read requests sent to uncore.
 .It Li OFFCORE_REQUESTS.DEMAND_RFO
 .Pq Event B0H , Umask 04H
 Demand RFO read requests sent to uncore, including
 regular RFOs, locks, ItoM.
 .It Li OFFCORE_REQUESTS.ALL_DATA_RD
 .Pq Event B0H , Umask 08H
 Data read requests sent to uncore (demand and prefetch).
 .It Li UOPS_EXECUTED.CORE
 .Pq Event B1H , Umask 02H
 Counts total number of uops to be executed per-core
 each cycle.
 .It Li OFF_CORE_RESPONSE_0
 .Pq Event B7H , Umask 01H
 Requires MSR 01A6H
 .It Li OFF_CORE_RESPONSE_1
 .Pq Event BBH , Umask 01H
 Requires MSR 01A7H
 .It Li PAGE_WALKER_LOADS.DTLB_L1
 .Pq Event BCH , Umask 11H
 Number of DTLB page walker loads that hit in the
 L1+FB.
 .It Li PAGE_WALKER_LOADS.ITLB_L1
 .Pq Event BCH , Umask 21H
 Number of ITLB page walker loads that hit in the
 L1+FB.
 .It Li PAGE_WALKER_LOADS.DTLB_L2
 .Pq Event BCH , Umask 12H
 Number of DTLB page walker loads that hit in the L2.
 .It Li PAGE_WALKER_LOADS.ITLB_L2
 .Pq Event BCH , Umask 22H
 Number of ITLB page walker loads that hit in the L2.
 .It Li PAGE_WALKER_LOADS.DTLB_L3
 .Pq Event BCH , Umask 14H
 Number of DTLB page walker loads that hit in the L3.
 .It Li PAGE_WALKER_LOADS.ITLB_L3
 .Pq Event BCH , Umask 24H
 Number of ITLB page walker loads that hit in the L3.
 .It Li PAGE_WALKER_LOADS.DTLB_MEMORY
 .Pq Event BCH , Umask 18H
 Number of DTLB page walker loads from memory.
 .It Li PAGE_WALKER_LOADS.ITLB_MEMORY
 .Pq Event BCH , Umask 28H
 Number of ITLB page walker loads from memory.
 .It Li TLB_FLUSH.DTLB_THREAD
 .Pq Event BDH , Umask 01H
 DTLB flush attempts of the thread-specific entries.
 .It Li TLB_FLUSH.STLB_ANY
 .Pq Event BDH , Umask 20H
 Count number of STLB flush attempts.
 .It Li INST_RETIRED.ANY_P
 .Pq Event C0H , Umask 00H
 Number of instructions at retirement.
 .It Li INST_RETIRED.ALL
 .Pq Event C0H , Umask 01H
 Precise instruction retired event with HW to reduce
 effect of PEBS shadow in IP distribution.
 .It Li OTHER_ASSISTS.AVX_TO_SSE
 .Pq Event C1H , Umask 08H
 Number of transitions from AVX-256 to legacy SSE
 when penalty applicable.
 .It Li OTHER_ASSISTS.SSE_TO_AVX
 .Pq Event C1H , Umask 10H
 Number of transitions from SSE to AVX-256 when
 penalty applicable.
 .It Li OTHER_ASSISTS.ANY_WB_ASSIST
 .Pq Event C1H , Umask 40H
 Number of microcode assists invoked by HW upon
 uop writeback.
 .It Li UOPS_RETIRED.ALL
 .Pq Event C2H , Umask 01H
 Counts the number of micro-ops retired, Use
 cmask=1 and invert to count active cycles or stalled
 cycles.
 .It Li UOPS_RETIRED.RETIRE_SLOTS
 .Pq Event C2H , Umask 02H
 Counts the number of retirement slots used each
 cycle.
 .It Li MACHINE_CLEARS.MEMORY_ORDERING
 .Pq Event C3H , Umask 02H
 Counts the number of machine clears due to memory
 order conflicts.
 .It Li MACHINE_CLEARS.SMC
 .Pq Event C3H , Umask 04H
 Number of self-modifying-code machine clears
 detected.
 .It Li MACHINE_CLEARS.MASKMOV
 .Pq Event C3H , Umask 20H
 Counts the number of executed AVX masked load
 operations that refer to an illegal address range with
 the mask bits set to 0.
 .It Li BR_INST_RETIRED.ALL_BRANCHES
 .Pq Event C4H , Umask 00H
 Branch instructions at retirement.
 .It Li BR_INST_RETIRED.CONDITIONAL
 .Pq Event C4H , Umask 01H
 Counts the number of conditional branch instructions Supports PEBS
 retired.
 .It Li BR_INST_RETIRED.NEAR_CALL
 .Pq Event C4H , Umask 02H
 Direct and indirect near call instructions retired.
 .It Li BR_INST_RETIRED.ALL_BRANCHES
 .Pq Event C4H , Umask 04H
 Counts the number of branch instructions retired.
 .It Li BR_INST_RETIRED.NEAR_RETURN
 .Pq Event C4H , Umask 08H
 Counts the number of near return instructions
 retired.
 .It Li BR_INST_RETIRED.NOT_TAKEN
 .Pq Event C4H , Umask 10H
 Counts the number of not taken branch instructions
 retired.
  It Li BR_INST_RETIRED.NEAR_TAKEN
 .Pq Event C4H , Umask 20H
 Number of near taken branches retired.
 .It Li BR_INST_RETIRED.FAR_BRANCH
 .Pq Event C4H , Umask 40H
 Number of far branches retired.
 .It Li BR_MISP_RETIRED.ALL_BRANCHES
 .Pq Event C5H , Umask 00H
 Mispredicted branch instructions at retirement
 .It Li BR_MISP_RETIRED.CONDITIONAL
 .Pq Event C5H , Umask 01H
 Mispredicted conditional branch instructions retired.
 .It Li BR_MISP_RETIRED.CONDITIONAL
 .Pq Event C5H , Umask 04H
 Mispredicted macro branch instructions retired.
 .It Li FP_ASSIST.X87_OUTPUT
 .Pq Event CAH , Umask 02H
 Number of X87 FP assists due to Output values.
 .It Li FP_ASSIST.X87_INPUT
 .Pq Event CAH , Umask 04H
 Number of X87 FP assists due to input values.
 .It Li FP_ASSIST.SIMD_OUTPUT
 .Pq Event CAH , Umask 08H
 Number of SIMD FP assists due to Output values.
 .It Li FP_ASSIST.SIMD_INPUT
 .Pq Event CAH , Umask 10H
 Number of SIMD FP assists due to input values.
 .It Li FP_ASSIST.ANY
 .Pq Event CAH , Umask 1EH
 Cycles with any input/output SSE* or FP assists.
 .It Li ROB_MISC_EVENTS.LBR_INSERTS
 .Pq Event CCH , Umask 20H
 Count cases of saving new LBR records by hardware.
 .It Li MEM_TRANS_RETIRED.LOAD_LATENCY
 .Pq Event CDH , Umask 01H
 Randomly sampled loads whose latency is above a
 user defined threshold.
 A small fraction of the overall loads are sampled due to randomization.
 .It Li MEM_UOPS_RETIRED.STLB_MISS_LOADS
 .Pq Event D0H , Umask 11H
 Count retired load uops that missed the STLB.
 .It Li MEM_UOPS_RETIRED.STLB_MISS_STORES
 .Pq Event D0H , Umask 12H
 Count retired store uops that missed the STLB.
 .It Li MEM_UOPS_RETIRED.SPLIT_LOADS
 .Pq Event D0H , Umask 41H
 Count retired load uops that were split across a cache line.
 .It Li MEM_UOPS_RETIRED.SPLIT_STORES
 .Pq Event D0H , Umask 42H
 Count retired store uops that were split across a cache line.
 .It Li MEM_UOPS_RETIRED.ALL_LOADS
 .Pq Event D0H , Umask 81H
 Count all retired load uops.
 .It Li MEM_UOPS_RETIRED.ALL_STORES
 .Pq Event D0H , Umask 82H
 Count all retired store uops.
 .It Li MEM_LOAD_UOPS_RETIRED.L1_HIT
 .Pq Event D1H , Umask 01H
 Retired load uops with L1 cache hits as data sources.
 .It Li MEM_LOAD_UOPS_RETIRED.L2_HIT
 .Pq Event D1H , Umask 02H
 Retired load uops with L2 cache hits as data sources.
 .It Li MEM_LOAD_UOPS_RETIRED.LLC_HIT
 .Pq Event D1H , Umask 04H
 Retired load uops with LLC cache hits as data
 sources.
 .It Li MEM_LOAD_UOPS_RETIRED.L2_MISS
 .Pq Event D1H , Umask 10H
 Retired load uops missed L2.
 Unknown data source excluded.
 .It Li MEM_LOAD_UOPS_RETIRED.HIT_LFB
 .Pq Event D1H , Umask 40H
 Retired load uops which data sources were load uops
 missed L1 but hit FB due to preceding miss to the
 same cache line with data not ready.
 .It Li MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_MISS
 .Pq Event D2H , Umask 01H
 Retired load uops which data sources were LLC hit
 and cross-core snoop missed in on-pkg core cache.
 .It Li MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HIT
 .Pq Event D2H , Umask 02H
 Retired load uops which data sources were LLC and
 cross-core snoop hits in on-pkg core cache.
 .It Li MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HITM
 .Pq Event D2H , Umask 04H
 Retired load uops which data sources were HitM
 responses from shared LLC.
 .It Li MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_NONE
 .Pq Event D2H , Umask 08H
 Retired load uops which data sources were hits in
 LLC without snoops required.
 .It Li MEM_LOAD_UOPS_LLC_MISS_RETIRED.LOCAL_DRAM
 .Pq Event D3H , Umask 01H
 Retired load uops which data sources missed LLC but
 serviced from local dram.
 .It Li BACLEARS.ANY
 .Pq Event E6H , Umask 1FH
 Number of front end re-steers due to BPU
 misprediction.
 .It Li L2_TRANS.DEMAND_DATA_RD
 .Pq Event F0H , Umask 01H
 Demand Data Read requests that access L2 cache.
 .It Li L2_TRANS.RFO
 .Pq Event F0H , Umask 02H
 RFO requests that access L2 cache.
 .It Li L2_TRANS.CODE_RD
 .Pq Event F0H , Umask 04H
 L2 cache accesses when fetching instructions.
 .It Li L2_TRANS.ALL_PF
 .Pq Event F0H , Umask 08H
 Any MLC or LLC HW prefetch accessing L2, including
 rejects.
 .It Li L2_TRANS.L1D_WB
 .Pq Event F0H , Umask 10H
 L1D writebacks that access L2 cache.
 .It Li L2_TRANS.L2_FILL
 .Pq Event F0H , Umask 20H
 L2 fill requests that access L2 cache.
 .It Li L2_TRANS.L2_WB
 .Pq Event F0H , Umask 40H
 L2 writebacks that access L2 cache.
 .It Li L2_TRANS.ALL_REQUESTS
 .Pq Event F0H , Umask 80H
 Transactions accessing L2 pipe.
 .It Li L2_LINES_IN.I
 .Pq Event F1H , Umask 01H
 L2 cache lines in I state filling L2.
 .It Li L2_LINES_IN.S
 .Pq Event F1H , Umask 02H
 L2 cache lines in S state filling L2.
 .It Li L2_LINES_IN.E
 .Pq Event F1H , Umask 04H
 L2 cache lines in E state filling L2.
 .It Li L2_LINES_IN.ALL
 .Pq Event F1H , Umask 07H
 L2 cache lines filling L2.
 .It Li L2_LINES_OUT.DEMAND_CLEAN
 .Pq Event F2H , Umask 05H
 Clean L2 cache lines evicted by demand.
 .It Li L2_LINES_OUT.DEMAND_DIRTY
 .Pq Event F2H , Umask 06H
 Dirty L2 cache lines evicted by demand.
 .El
 .Sh SEE ALSO
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.corei7 3 ,
 .Xr pmc.corei7uc 3 ,
 .Xr pmc.haswell 3 ,
 .Xr pmc.haswelluc 3 ,
 .Xr pmc.iaf 3 ,
 .Xr pmc.ivybridge 3 ,
 .Xr pmc.ivybridgexeon 3 ,
-.Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.sandybridge 3 ,
 .Xr pmc.sandybridgeuc 3 ,
 .Xr pmc.sandybridgexeon 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
 .Xr pmc.ucf 3 ,
 .Xr pmc.westmere 3 ,
 .Xr pmc.westmereuc 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
 .Sh HISTORY
 Support for the Haswell Xeon microarchitecture first appeared in
 .Fx 10.2 .
 .Sh AUTHORS
 The
 .Lb libpmc
 library was written by
 .An "Joseph Koshy"
 .Aq jkoshy@FreeBSD.org .
 The support for the Haswell Xeon
 microarchitecture was written by
 .An "Randall Stewart"
 .Aq rrs@FreeBSD.org .
diff --git a/lib/libpmc/pmc.iaf.3 b/lib/libpmc/pmc.iaf.3
index b407f4b650c9..0757795c95af 100644
--- a/lib/libpmc/pmc.iaf.3
+++ b/lib/libpmc/pmc.iaf.3
@@ -1,143 +1,142 @@
 .\" Copyright (c) 2008 Joseph Koshy.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .Dd November 14, 2008
 .Dt PMC.IAF 3
 .Os
 .Sh NAME
 .Nm pmc.iaf
 .Nd measurement events for
 .Tn Intel
 fixed function performance counters.
 .Sh LIBRARY
 .Lb libpmc
 .Sh SYNOPSIS
 .In pmc.h
 .Sh DESCRIPTION
 .Tn Intel
 fixed-function PMCs are present in CPUs that conform to version 2 or
 later of the
 .Tn Intel
 Performance Measurement Architecture.
 Each fixed-function PMC measures a specific hardware event.
 The number of fixed-function PMCs implemented in a CPU can vary.
 The number of fixed-function PMCs present can be determined at runtime
 by using function
 .Xr pmc_cpuinfo 3 .
 .Pp
 Intel fixed-function PMCs are documented in
 .Rs
 .%B "IA-32 Intel(R) Architecture Software Developer's Manual"
 .%T "Volume 3: System Programming Guide"
 .%N "Order Number 253669-027US"
 .%D July 2008
 .%Q "Intel Corporation"
 .Re
 .Ss PMC Capabilities
 Fixed-function PMCs support the following capabilities:
 .Bl -column "PMC_CAP_INTERRUPT" "Support"
 .It Em Capability Ta Em Support
 .It PMC_CAP_CASCADE Ta \&No
 .It PMC_CAP_EDGE Ta \&No
 .It PMC_CAP_INTERRUPT Ta Yes
 .It PMC_CAP_INVERT Ta \&No
 .It PMC_CAP_READ Ta Yes
 .It PMC_CAP_PRECISE Ta \&No
 .It PMC_CAP_SYSTEM Ta Yes
 .It PMC_CAP_TAGGING Ta \&No
 .It PMC_CAP_THRESHOLD Ta \&No
 .It PMC_CAP_USER Ta Yes
 .It PMC_CAP_WRITE Ta Yes
 .El
 .Ss Class Name Prefix
 These PMCs are named using a class name prefix of
 .Dq Li iaf- .
 .Ss Event Qualifiers (Fixed Function PMCs)
 These PMCs support the following modifiers:
 .Bl -tag -width indent
 .It Li os
 Configure the PMC to count events occurring at ring level 0.
 .It Li usr
 Configure the PMC to count events occurring at ring levels 1, 2
 or 3.
 .It Li anythread
 .Pq Tn Atom CPUs
 Configure the PMC to count events on all logical processors sharing a
 processor core.
 The default is to count events on the current logical processor.
 .El
 .Pp
 If neither of the
 .Dq Li os
 or
 .Dq Li usr
 qualifiers are specified, the default is to enable both.
 .Ss Event Specifiers (Fixed Function PMCs)
 The fixed function PMCs are selectable using the following
 event names:
 .Bl -tag -width indent
 .It Li INSTR_RETIRED.ANY
 .Pq Fixed Function Counter 0
 The number of instructions retired.
 .It Li CPU_CLK_UNHALTED.CORE
 .Pq Fixed Function Counter 1
 The number of core cycles for which the core is not halted.
 .It Li CPU_CLK_UNHALTED.REF
 .Pq Fixed Function Counter 2
 The number of reference cycles for which the core is not halted.
 .El
 .Sh EXAMPLES
 To measure the number of core cycles for which the core was not halted
 use the event specifier
 .Qq iaf-cpu-clk-unhalted.core .
 .Pp
 To measure the number of user instructions retired use the event specifier
 .Qq iaf-instr-retired.any,usr .
 .Pp
 To measure the number of user instructions retired on all logical processors
 in an
 .Tn Atom
 CPU, use the event specifier
 .Qq iaf-instr-retired.any,usr,anythread .
 .Sh SEE ALSO
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.core2 3 ,
-.Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
 .Sh HISTORY
 The
 .Nm pmc
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
 The
 .Lb libpmc
 library was written by
 .An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/lib/libpmc/pmc.ivybridge.3 b/lib/libpmc/pmc.ivybridge.3
index 95e4e0800650..4b88f95be21c 100644
--- a/lib/libpmc/pmc.ivybridge.3
+++ b/lib/libpmc/pmc.ivybridge.3
@@ -1,858 +1,857 @@
 .\" Copyright (c) 2012 Fabien Thomas.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .Dd October 19, 2012
 .Dt PMC.IVYBRIDGE 3
 .Os
 .Sh NAME
 .Nm pmc.ivybridge
 .Nd measurement events for
 .Tn Intel
 .Tn Ivy Bridge
 family CPUs
 .Sh LIBRARY
 .Lb libpmc
 .Sh SYNOPSIS
 .In pmc.h
 .Sh DESCRIPTION
 .Tn Intel
 .Tn "Ivy Bridge"
 CPUs contain PMCs conforming to version 2 of the
 .Tn Intel
 performance measurement architecture.
 These CPUs may contain up to three classes of PMCs:
 .Bl -tag -width "Li PMC_CLASS_IAP"
 .It Li PMC_CLASS_IAF
 Fixed-function counters that count only one hardware event per counter.
 .It Li PMC_CLASS_IAP
 Programmable counters that may be configured to count one of a defined
 set of hardware events.
 .El
 .Pp
 The number of PMCs available in each class and their widths need to be
 determined at run time by calling
 .Xr pmc_cpuinfo 3 .
 .Pp
 Intel Ivy Bridge PMCs are documented in
 .Rs
 .%B "Intel(R) 64 and IA-32 Architectures Software Developer's Manual"
 .%T "Volume 3B: System Programming Guide, Part 2"
 .%N "Order Number: 253669-043US"
 .%D May 2012
 .%Q "Intel Corporation"
 .Re
 .Ss IVYBRIDGE FIXED FUNCTION PMCS
 These PMCs and their supported events are documented in
 .Xr pmc.iaf 3 .
 .Ss IVYBRIDGE PROGRAMMABLE PMCS
 The programmable PMCs support the following capabilities:
 .Bl -column "PMC_CAP_INTERRUPT" "Support"
 .It Em Capability Ta Em Support
 .It PMC_CAP_CASCADE Ta \&No
 .It PMC_CAP_EDGE Ta Yes
 .It PMC_CAP_INTERRUPT Ta Yes
 .It PMC_CAP_INVERT Ta Yes
 .It PMC_CAP_READ Ta Yes
 .It PMC_CAP_PRECISE Ta \&No
 .It PMC_CAP_SYSTEM Ta Yes
 .It PMC_CAP_TAGGING Ta \&No
 .It PMC_CAP_THRESHOLD Ta Yes
 .It PMC_CAP_USER Ta Yes
 .It PMC_CAP_WRITE Ta Yes
 .El
 .Ss Event Qualifiers
 Event specifiers for these PMCs support the following common
 qualifiers:
 .Bl -tag -width indent
 .It Li rsp= Ns Ar value
 Configure the Off-core Response bits.
 .Bl -tag -width indent
 .It Li REQ_DMND_DATA_RD
 Counts the number of demand and DCU prefetch data reads of full and partial
 cachelines as well as demand data page table entry cacheline reads.
 Does not count L2 data read prefetches or instruction fetches.
 .It Li REQ_DMND_RFO
 Counts the number of demand and DCU prefetch reads for ownership (RFO)
 requests generated by a write to data cacheline.
 Does not count L2 RFO prefetches.
 .It Li REQ_DMND_IFETCH
 Counts the number of demand and DCU prefetch instruction cacheline reads.
 Does not count L2 code read prefetches.
 .It Li REQ_WB
 Counts the number of writeback (modified to exclusive) transactions.
 .It Li REQ_PF_DATA_RD
 Counts the number of data cacheline reads generated by L2 prefetchers.
 .It Li REQ_PF_RFO
 Counts the number of RFO requests generated by L2 prefetchers.
 .It Li REQ_PF_IFETCH
 Counts the number of code reads generated by L2 prefetchers.
 .It Li REQ_PF_LLC_DATA_RD
 L2 prefetcher to L3 for loads.
 .It Li REQ_PF_LLC_RFO
 RFO requests generated by L2 prefetcher
 .It Li REQ_PF_LLC_IFETCH
 L2 prefetcher to L3 for instruction fetches.
 .It Li REQ_BUS_LOCKS
 Bus lock and split lock requests.
 .It Li REQ_STRM_ST
 Streaming store requests.
 .It Li REQ_OTHER
 Any other request that crosses IDI, including I/O.
 .It Li RES_ANY
 Catch all value for any response types.
 .It Li RES_SUPPLIER_NO_SUPP
 No Supplier Information available.
 .It Li RES_SUPPLIER_LLC_HITM
 M-state initial lookup stat in L3.
 .It Li RES_SUPPLIER_LLC_HITE
 E-state.
 .It Li RES_SUPPLIER_LLC_HITS
 S-state.
 .It Li RES_SUPPLIER_LLC_HITF
 F-state.
 .It Li RES_SUPPLIER_LOCAL
 Local DRAM Controller.
 .It Li RES_SNOOP_SNP_NONE
 No details on snoop-related information.
 .It Li RES_SNOOP_SNP_NO_NEEDED
 No snoop was needed to satisfy the request.
 .It Li RES_SNOOP_SNP_MISS
 A snoop was needed and it missed all snooped caches:
 -For LLC Hit, ReslHitl was returned by all cores
 -For LLC Miss, Rspl was returned by all sockets and data was returned from
 DRAM.
 .It Li RES_SNOOP_HIT_NO_FWD
 A snoop was needed and it hits in at least one snooped cache.
 Hit denotes a cache-line was valid before snoop effect.
 This includes:
 -Snoop Hit w/ Invalidation (LLC Hit, RFO)
 -Snoop Hit, Left Shared (LLC Hit/Miss, IFetch/Data_RD)
 -Snoop Hit w/ Invalidation and No Forward (LLC Miss, RFO Hit S)
 In the LLC Miss case, data is returned from DRAM.
 .It Li RES_SNOOP_HIT_FWD
 A snoop was needed and data was forwarded from a remote socket.
 This includes:
 -Snoop Forward Clean, Left Shared (LLC Hit/Miss, IFetch/Data_RD/RFT).
 .It Li RES_SNOOP_HITM
 A snoop was needed and it HitM-ed in local or remote cache.
 HitM denotes a cache-line was in modified state before effect as a results of snoop.
 This includes:
 -Snoop HitM w/ WB (LLC miss, IFetch/Data_RD)
 -Snoop Forward Modified w/ Invalidation (LLC Hit/Miss, RFO)
 -Snoop MtoS (LLC Hit, IFetch/Data_RD).
 .It Li RES_NON_DRAM
 Target was non-DRAM system address.
 This includes MMIO transactions.
 .El
 .It Li cmask= Ns Ar value
 Configure the PMC to increment only if the number of configured
 events measured in a cycle is greater than or equal to
 .Ar value .
 .It Li edge
 Configure the PMC to count the number of de-asserted to asserted
 transitions of the conditions expressed by the other qualifiers.
 If specified, the counter will increment only once whenever a
 condition becomes true, irrespective of the number of clocks during
 which the condition remains true.
 .It Li inv
 Invert the sense of comparison when the
 .Dq Li cmask
 qualifier is present, making the counter increment when the number of
 events per cycle is less than the value specified by the
 .Dq Li cmask
 qualifier.
 .It Li os
 Configure the PMC to count events happening at processor privilege
 level 0.
 .It Li usr
 Configure the PMC to count events occurring at privilege levels 1, 2
 or 3.
 .El
 .Pp
 If neither of the
 .Dq Li os
 or
 .Dq Li usr
 qualifiers are specified, the default is to enable both.
 .Ss Event Specifiers (Programmable PMCs)
 Ivy Bridge programmable PMCs support the following events:
 .Bl -tag -width indent
 .It Li LD_BLOCKS.STORE_FORWARD
 .Pq Event 03H , Umask 02H
 loads blocked by overlapping with store buffer that cannot be forwarded .
 .It Li MISALIGN_MEM_REF.LOADS
 .Pq Event 05H , Umask 01H
 Speculative cache-line split load uops dispatched to L1D.
 .It Li MISALIGN_MEM_REF.STORES
 .Pq Event 05H , Umask 02H
 Speculative cache-line split Store- address uops dispatched to L1D.
 .It Li LD_BLOCKS_PARTIAL.ADDRESS_ALIAS
 .Pq Event 07H , Umask 01H
 False dependencies in MOB due to partial compare on address.
 .It Li DTLB_LOAD_MISSES.DEMAND_LD_MISS_CAUSES_A_WALK
 .Pq Event 08H , Umask 81H
 Misses in all TLB levels that cause a page walk of any page size from demand loads.
 .It Li DTLB_LOAD_MISSES.DEMAND_LD_WALK_COMPLETED
 .Pq Event 08H , Umask 82H
 Misses in all TLB levels that caused page walk completed of any size by demand loads.
 .It Li DTLB_LOAD_MISSES.DEMAND_LD_WALK_DURATION
 .Pq Event 08H , Umask 84H
 Cycle PMH is busy with a walk due to demand loads.
 .It Li UOPS_ISSUED.ANY
 .Pq Event 0EH , Umask 01H
 Increments each cycle the # of Uops issued by the RAT to RS.
 Set Cmask = 1, Inv = 1to count stalled cycles.
 Set Cmask = 1, Inv = 1, Any= 1to count stalled cycles of this core.
 .It Li UOPS_ISSUED.FLAGS_MERGE
 .Pq Event 0EH , Umask 10H
 Number of flags-merge uops allocated.
 Such uops adds delay.
 .It Li UOPS_ISSUED.SLOW_LEA
 .Pq Event 0EH , Umask 20H
 Number of slow LEA or similar uops allocated.
 Such uop has 3 sources (e.g. 2 sources + immediate) regardless if as a result of LEA instruction or not.
 .It Li UOPS_ISSUED.SINGLE_MUL
 .Pq Event 0EH , Umask 40H
 Number of multiply packed/scalar single precision uops allocated.
 .It Li ARITH.FPU_DIV_ACTIVE
 .Pq Event 14H , Umask 01H
 Cycles that the divider is active, includes INT and FP.
 Set 'edge =1, cmask=1' to count the number of divides.
 .It Li L2_RQSTS.DEMAND_DATA_RD_HIT
 .Pq Event 24H , Umask 01H
 Demand Data Read requests that hit L2 cache.
 .It Li L2_RQSTS.ALL_DEMAND_DATA_RD
 .Pq Event 24H , Umask 03H
 Counts any demand and L1 HW prefetch data load requests to L2.
 .It Li L2_RQSTS.RFO_HITS
 .Pq Event 24H , Umask 04H
 Counts the number of store RFO requests that hit the L2 cache.
 .It Li L2_RQSTS.RFO_MISS
 .Pq Event 24H , Umask 08H
 Counts the number of store RFO requests that miss the L2 cache.
 .It Li L2_RQSTS.ALL_RFO
 .Pq Event 24H , Umask 0CH
 Counts all L2 store RFO requests.
 .It Li L2_RQSTS.CODE_RD_HIT
 .Pq Event 24H , Umask 10H
 Number of instruction fetches that hit the L2 cache.
 .It Li L2_RQSTS.CODE_RD_MISS
 .Pq Event 24H , Umask 20H
 Number of instruction fetches that missed the L2 cache.
 .It Li L2_RQSTS.ALL_CODE_RD
 .Pq Event 24H , Umask 30H
 Counts all L2 code requests.
 .It Li L2_RQSTS.PF_HIT
 .Pq Event 24H , Umask 40H
 Counts all L2 HW prefetcher requests that hit L2.
 .It Li L2_RQSTS.PF_MISS
 .Pq Event 24H , Umask 80H
 Counts all L2 HW prefetcher requests that missed L2.
 .It Li L2_RQSTS.ALL_PF
 .Pq Event 24H , Umask C0H
 Counts all L2 HW prefetcher requests.
 .It Li L2_STORE_LOCK_RQSTS.MISS
 .Pq Event 27H , Umask 01H
 RFOs that miss cache lines.
 .It Li L2_STORE_LOCK_RQSTS.HIT_M
 .Pq Event 27H , Umask 08H
 RFOs that hit cache lines in M state.
 .It Li L2_STORE_LOCK_RQSTS.ALL
 .Pq Event 27H , Umask 0FH
 RFOs that access cache lines in any state.
 .It Li L2_L1D_WB_RQSTS.MISS
 .Pq Event 28H , Umask 01H
 Not rejected writebacks that missed LLC.
 .It Li L2_L1D_WB_RQSTS.HIT_E
 .Pq Event 28H , Umask 04H
 Not rejected writebacks from L1D to L2 cache lines in E state.
 .It Li L2_L1D_WB_RQSTS.HIT_M
 .Pq Event 28H , Umask 08H
 Not rejected writebacks from L1D to L2 cache lines in M state.
 .It Li L2_L1D_WB_RQSTS.ALL
 .Pq Event 28H , Umask 0FH
 Not rejected writebacks from L1D to L2 cache lines in any state.
 .It Li LONGEST_LAT_CACHE.REFERENCE
 .Pq Event 2EH , Umask 4FH
 This event counts requests originating from the core that reference a cache
 line in the last level cache.
 .It Li LONGEST_LAT_CACHE.MISS
 .Pq Event 2EH , Umask 41H
 This event counts each cache miss condition for references to the last level
 cache.
 .It Li CPU_CLK_UNHALTED.THREAD_P
 .Pq Event 3CH , Umask 00H
 Counts the number of thread cycles while the thread is not in a halt state.
 The thread enters the halt state when it is running the HLT instruction.
 The core frequency may change from time to time due to power or thermal
 throttling.
 .It Li CPU_CLK_THREAD_UNHALTED.REF_XCLK
 .Pq Event 3CH , Umask 01H
 Increments at the frequency of XCLK (100 MHz) when not halted.
 .It Li L1D_PEND_MISS.PENDING
 .Pq Event 48H , Umask 01H
 Increments the number of outstanding L1D misses every cycle.
 Set Cmaks = 1 and Edge =1 to count occurrences.
 Counter 2 only.
 Set Cmask = 1 to count cycles.
 .It Li DTLB_STORE_MISSES.MISS_CAUSES_A_WALK
 .Pq Event 49H , Umask 01H
 Miss in all TLB levels causes an page walk of any page size (4K/2M/4M/1G).
 .It Li DTLB_STORE_MISSES.WALK_COMPLETED
 .Pq Event 49H , Umask 02H
 Miss in all TLB levels causes a page walk that completes of any page size
 (4K/2M/4M/1G).
 .It Li DTLB_STORE_MISSES.WALK_DURATION
 .Pq Event 49H , Umask 04H
 Cycles PMH is busy with this walk.
 .It Li DTLB_STORE_MISSES.STLB_HIT
 .Pq Event 49H , Umask 10H
 Store operations that miss the first TLB level but hit the second and do not
 cause page walks.
 .It Li LOAD_HIT_PRE.SW_PF
 .Pq Event 4CH , Umask 01H
 Non-SW-prefetch load dispatches that hit fill buffer allocated for S/W prefetch.
 .It Li LOAD_HIT_PRE.HW_PF
 .Pq Event 4CH , Umask 02H
 Non-SW-prefetch load dispatches that hit fill buffer allocated for H/W prefetch.
 .It Li L1D.REPLACEMENT
 .Pq Event 51H , Umask 01H
 Counts the number of lines brought into the L1 data cache.
 .It Li MOVE_ELIMINATION.INT_NOT_ELIMINATED
 .Pq Event 58H , Umask 01H
 Number of integer Move Elimination candidate uops that were not eliminated.
 .It Li MOVE_ELIMINATION.SIMD_NOT_ELIMINATED
 .Pq Event 58H , Umask 02H
 Number of SIMD Move Elimination candidate uops that were not eliminated.
 .It Li MOVE_ELIMINATION.INT_ELIMINATED
 .Pq Event 58H , Umask 04H
 Number of integer Move Elimination candidate uops that were eliminated.
 .It Li MOVE_ELIMINATION.SIMD_ELIMINATED
 .Pq Event 58H , Umask 08H
 Number of SIMD Move Elimination candidate uops that were eliminated.
 .It Li CPL_CYCLES.RING0
 .Pq Event 5CH , Umask 01H
 Unhalted core cycles when the thread is in ring 0.
 Use Edge to count transition.
 .It Li CPL_CYCLES.RING123
 .Pq Event 5CH , Umask 02H
 Unhalted core cycles when the thread is not in ring 0.
 .It Li RS_EVENTS.EMPTY_CYCLES
 .Pq Event 5EH , Umask 01H
 Cycles the RS is empty for the thread.
 .It Li TLB_ACCESS.LOAD_STLB_HIT
 .Pq Event 5FH , Umask 01H
 Counts load operations that missed 1st level DTLB but hit the 2nd level.
 .It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND_DATA_RD
 .Pq Event 60H , Umask 01H
 Offcore outstanding Demand Data Read transactions in SQ to uncore.
 Set Cmask=1 to count cycles.
 .It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND_CODE_RD
 .Pq Event 60H , Umask 02H
 Offcore outstanding Demand Code Read transactions in SQ to uncore.
 Set Cmask=1 to count cycles.
 .It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND_RFO
 .Pq Event 60H , Umask 04H
 Offcore outstanding RFO store transactions in SQ to uncore.
 Set Cmask=1 to count cycles.
 .It Li OFFCORE_REQUESTS_OUTSTANDING.ALL_DATA_RD
 .Pq Event 60H , Umask 08H
 Offcore outstanding cacheable data read transactions in SQ to uncore.
 Set Cmask=1 to count cycles.
 .It Li LOCK_CYCLES.SPLIT_LOCK_UC_LOCK_DURATION
 .Pq Event 63H , Umask 01H
 Cycles in which the L1D and L2 are locked, due to a UC lock or split lock.
 .It Li LOCK_CYCLES.CACHE_LOCK_DURATION
 .Pq Event 63H , Umask 02H
 Cycles in which the L1D is locked.
 .It Li IDQ.EMPTY
 .Pq Event 79H , Umask 02H
 Counts cycles the IDQ is empty.
 .It Li IDQ.MITE_UOPS
 .Pq Event 79H , Umask 04H
 Increment each cycle # of uops delivered to IDQ from MITE path.
 Can combine Umask 04H and 20H.
 Set Cmask = 1 to count cycles.
 .It Li IDQ.DSB_UOPS
 .Pq Event 79H , Umask 08H
 Increment each cycle. # of uops delivered to IDQ from DSB path.
 Can combine Umask 08H and 10H
 Set Cmask = 1 to count cycles.
 .It Li IDQ.MS_DSB_UOPS
 .Pq Event 79H , Umask 10H
 Increment each cycle # of uops delivered to IDQ when MS_busy by DSB.
 Set Cmask = 1 to count cycles.
 Add Edge=1 to count # of delivery.
 Can combine Umask 04H, 08H.
 .It Li IDQ.MS_MITE_UOPS
 .Pq Event 79H , Umask 20H
 Increment each cycle # of uops delivered to IDQ when MS_busy by MITE.
 Set Cmask = 1 to count cycles.
 Can combine Umask 04H, 08H.
 .It Li IDQ.MS_UOPS
 .Pq Event 79H , Umask 30H
 Increment each cycle # of uops delivered to IDQ from MS by either DSB or
 MITE.
 Set Cmask = 1 to count cycles.
 Can combine Umask 04H, 08H.
 .It Li IDQ.ALL_DSB_CYCLES_ANY_UOPS
 .Pq Event 79H , Umask 18H
 Counts cycles DSB is delivered at least one uops.
 Set Cmask = 1.
 .It Li IDQ.ALL_DSB_CYCLES_4_UOPS
 .Pq Event 79H , Umask 18H
 Counts cycles DSB is delivered four uops.
 Set Cmask = 4.
 .It Li IDQ.ALL_MITE_CYCLES_ANY_UOPS
 .Pq Event 79H , Umask 24H
 Counts cycles MITE is delivered at least one uops.
 Set Cmask = 1.
 .It Li IDQ.ALL_MITE_CYCLES_4_UOPS
 .Pq Event 79H , Umask 24H
 Counts cycles MITE is delivered four uops.
 Set Cmask = 4.
 .It Li IDQ.MITE_ALL_UOPS
 .Pq Event 79H , Umask 3CH
 # of uops delivered to IDQ from any path.
 .It Li ICACHE.MISSES
 .Pq Event 80H , Umask 02H
 Number of Instruction Cache, Streaming Buffer and Victim Cache Misses.
 Includes UC accesses.
 .It Li ITLB_MISSES.MISS_CAUSES_A_WALK
 .Pq Event 85H , Umask 01H
 Misses in all ITLB levels that cause page walks.
 .It Li ITLB_MISSES.WALK_COMPLETED
 .Pq Event 85H , Umask 02H
 Misses in all ITLB levels that cause completed page walks.
 .It Li ITLB_MISSES.WALK_DURATION
 .Pq Event 85H , Umask 04H
 Cycle PMH is busy with a walk.
 .It Li ITLB_MISSES.STLB_HIT
 .Pq Event 85H , Umask 10H
 Number of cache load STLB hits.
 No page walk.
 .It Li ILD_STALL.LCP
 .Pq Event 87H , Umask 01H
 Stalls caused by changing prefix length of the instruction.
 .It Li ILD_STALL.IQ_FULL
 .Pq Event 87H , Umask 04H
 Stall cycles due to IQ is full.
 .It Li BR_INST_EXEC.NONTAKEN_COND
 .Pq Event 88H , Umask 41H
 Count conditional near branch instructions that were executed (but not
 necessarily retired) and not taken.
 .It Li BR_INST_EXEC.TAKEN_COND
 .Pq Event 88H , Umask 81H
 Count conditional near branch instructions that were executed (but not
 necessarily retired) and taken.
 .It Li BR_INST_EXEC.DIRECT_JMP
 .Pq Event 88H , Umask 82H
 Count all unconditional near branch instructions excluding calls and
 indirect branches.
 .It Li BR_INST_EXEC.INDIRECT_JMP_NON_CALL_RET
 .Pq Event 88H , Umask 84H
 Count executed indirect near branch instructions that are not calls nor
 returns.
 .It Li BR_INST_EXEC.RETURN_NEAR
 .Pq Event 88H , Umask 88H
 Count indirect near branches that have a return mnemonic.
 .It Li BR_INST_EXEC.DIRECT_NEAR_CALL
 .Pq Event 88H , Umask 90H
 Count unconditional near call branch instructions, excluding non call
 branch, executed.
 .It Li BR_INST_EXEC.INDIRECT_NEAR_CALL
 .Pq Event 88H , Umask A0H
 Count indirect near calls, including both register and memory indirect,
 executed.
 .It Li BR_INST_EXEC.ALL_BRANCHES
 .Pq Event 88H , Umask FFH
 Counts all near executed branches (not necessarily retired).
 .It Li BR_MISP_EXEC.NONTAKEN_COND
 .Pq Event 89H , Umask 41H
 Count conditional near branch instructions mispredicted as nontaken.
 .It Li BR_MISP_EXEC.TAKEN_COND
 .Pq Event 89H , Umask 81H
 Count conditional near branch instructions mispredicted as taken.
 .It Li BR_MISP_EXEC.INDIRECT_JMP_NON_CALL_RET
 .Pq Event 89H , Umask 84H
 Count mispredicted indirect near branch instructions that are not calls
 nor returns.
 .It Li BR_MISP_EXEC.RETURN_NEAR
 .Pq Event 89H , Umask 88H
 Count mispredicted indirect near branches that have a return mnemonic.
 .It Li BR_MISP_EXEC.DIRECT_NEAR_CALL
 .Pq Event 89H , Umask 90H
 Count mispredicted unconditional near call branch instructions, excluding
 non call branch, executed.
 .It Li BR_MISP_EXEC.INDIRECT_NEAR_CALL
 .Pq Event 89H , Umask A0H
 Count mispredicted indirect near calls, including both register and memory
 indirect, executed.
 .It Li BR_MISP_EXEC.ALL_BRANCHES
 .Pq Event 89H , Umask FFH
 Counts all mispredicted near executed branches (not necessarily retired).
 .It Li IDQ_UOPS_NOT_DELIVERED.CORE
 .Pq Event 9CH , Umask 01H
 Count number of non-delivered uops to RAT per thread.
 Use Cmask to qualify uop b/w.
 .It Li UOPS_DISPATCHED_PORT.PORT_0
 .Pq Event A1H , Umask 01H
 Cycles which a Uop is dispatched on port 0.
 .It Li UOPS_DISPATCHED_PORT.PORT_1
 .Pq Event A1H , Umask 02H
 Cycles which a Uop is dispatched on port 1.
 .It Li UOPS_DISPATCHED_PORT.PORT_2_LD
 .Pq Event A1H , Umask 04H
 Cycles which a load uop is dispatched on port 2.
 .It Li UOPS_DISPATCHED_PORT.PORT_2_STA
 .Pq Event A1H , Umask 08H
 Cycles which a store address uop is dispatched on port 2.
 .It Li UOPS_DISPATCHED_PORT.PORT_2
 .Pq Event A1H , Umask 0CH
 Cycles which a Uop is dispatched on port 2.
 .It Li UOPS_DISPATCHED_PORT.PORT_3_LD
 .Pq Event A1H , Umask 10H
 Cycles which a load uop is dispatched on port 3.
 .It Li UOPS_DISPATCHED_PORT.PORT_3_STA
 .Pq Event A1H , Umask 20H
 Cycles which a store address uop is dispatched on port 3.
 .It Li UOPS_DISPATCHED_PORT.PORT_3
 .Pq Event A1H , Umask 30H
 Cycles which a Uop is dispatched on port 3.
 .It Li UOPS_DISPATCHED_PORT.PORT_4
 .Pq Event A1H , Umask 40H
 Cycles which a Uop is dispatched on port 4.
 .It Li UOPS_DISPATCHED_PORT.PORT_5
 .Pq Event A1H , Umask 80H
 Cycles which a Uop is dispatched on port 5.
 .It Li RESOURCE_STALLS.ANY
 .Pq Event A2H , Umask 01H
 Cycles Allocation is stalled due to Resource Related reason.
 .It Li RESOURCE_STALLS.RS
 .Pq Event A2H , Umask 04H
 Cycles stalled due to no eligible RS entry available.
 .It Li RESOURCE_STALLS.SB
 .Pq Event A2H , Umask 08H
 Cycles stalled due to no store buffers available. (not including draining
 form sync).
 .It Li RESOURCE_STALLS.ROB
 .Pq Event A2H , Umask 10H
 Cycles stalled due to re-order buffer full.
 .It Li DSB2MITE_SWITCHES.COUNT
 .Pq Event ABH , Umask 01H
 Number of DSB to MITE switches.
 .It Li DSB2MITE_SWITCHES.PENALTY_CYCLES
 .Pq Event ABH , Umask 02H
 Cycles DSB to MITE switches caused delay.
 .It Li DSB_FILL.EXCEED_DSB_LINES
 .Pq Event ACH , Umask 08H
 DSB Fill encountered > 3 DSB lines.
 .It Li ITLB.ITLB_FLUSH
 .Pq Event AEH , Umask 01H
 Counts the number of ITLB flushes, includes 4k/2M/4M pages.
 .It Li OFFCORE_REQUESTS.DEMAND_DATA_RD
 .Pq Event B0H , Umask 01H
 Demand data read requests sent to uncore.
 .It Li OFFCORE_REQUESTS.DEMAND_CODE_RD
 .Pq Event B0H , Umask 02H
 Demand code read requests sent to uncore.
 .It Li OFFCORE_REQUESTS.DEMAND_RFO
 .Pq Event B0H , Umask 04H
 Demand RFO read requests sent to uncore, including regular RFOs, locks,
 ItoM.
 .It Li OFFCORE_REQUESTS.ALL_DATA_RD
 .Pq Event B0H , Umask 08H
 Data read requests sent to uncore (demand and prefetch).
 .It Li UOPS_EXECUTED.THREAD
 .Pq Event B1H , Umask 01H
 Counts total number of uops to be executed per-thread each cycle.
 Set Cmask = 1, INV =1 to count stall cycles.
 .It Li UOPS_EXECUTED.CORE
 .Pq Event B1H , Umask 02H
 Counts total number of uops to be executed per-core each cycle.
 Do not need to set ANY.
 .It Li OFF_CORE_RESPONSE_0
 .Pq Event B7H , Umask 01H
 Off-core Response Performance Monitoring.
 PMC0 only.
 Requires programming MSR 01A6H.
 .It Li OFF_CORE_RESPONSE_1
 .Pq Event BBH , Umask 01H
 Off-core Response Performance Monitoring.
 PMC3 only.
 Requires programming MSR 01A7H.
 .It Li TLB_FLUSH.DTLB_THREAD
 .Pq Event BDH , Umask 01H
 DTLB flush attempts of the thread- specific entries.
 .It Li TLB_FLUSH.STLB_ANY
 .Pq Event BDH , Umask 20H
 Count number of STLB flush attempts.
 .It Li INST_RETIRED.ANY_P
 .Pq Event C0H , Umask 00H
 Number of instructions at retirement.
 .It Li INST_RETIRED.ALL
 .Pq Event C0H , Umask 01H
 Precise instruction retired event with HW to reduce effect of PEBS shadow in
 IP distribution.
 PMC1 only.
 Must quiesce other PMCs.
 .It Li OTHER_ASSISTS.AVX_STORE
 .Pq Event C1H , Umask 08H
 Number of assists associated with 256-bit AVX store operations.
 .It Li OTHER_ASSISTS.AVX_TO_SSE
 .Pq Event C1H , Umask 10H
 Number of transitions from AVX- 256 to legacy SSE when penalty applicable.
 .It Li OTHER_ASSISTS.SSE_TO_AVX
 .Pq Event C1H , Umask 20H
 Number of transitions from SSE to AVX-256 when penalty applicable.
 .It Li UOPS_RETIRED.ALL
 .Pq Event C2H , Umask 01H
 Counts the number of micro-ops retired, Use cmask=1 and invert to count
 active cycles or stalled cycles.
 Supports PEBS, use Any=1 for core granular.
 .It Li UOPS_RETIRED.RETIRE_SLOTS
 .Pq Event C2H , Umask 02H
 Counts the number of retirement slots used each cycle.
 .It Li MACHINE_CLEARS.MEMORY_ORDERING
 .Pq Event C3H , Umask 02H
 Counts the number of machine clears due to memory order conflicts.
 .It Li MACHINE_CLEARS.SMC
 .Pq Event C3H , Umask 04H
 Number of self-modifying-code machine clears detected.
 .It Li MACHINE_CLEARS.MASKMOV
 .Pq Event C3H , Umask 20H
 Counts the number of executed AVX masked load operations that refer to an
 illegal address range with the mask bits set to 0.
 .It Li BR_INST_RETIRED.ALL_BRANCHES
 .Pq Event C4H , Umask 00H
 Branch instructions at retirement.
 .It Li BR_INST_RETIRED.CONDITIONAL
 .Pq Event C4H , Umask 01H
 Counts the number of conditional branch instructions retired.
 Supports PEBS.
 .It Li BR_INST_RETIRED.NEAR_CALL
 .Pq Event C4H , Umask 02H
 Direct and indirect near call instructions retired.
 .It Li BR_INST_RETIRED.ALL_BRANCHES
 .Pq Event C4H , Umask 04H
 Counts the number of branch instructions retired.
 .It Li BR_INST_RETIRED.NEAR_RETURN
 .Pq Event C4H , Umask 08H
 Counts the number of near return instructions retired.
 .It Li BR_INST_RETIRED.NOT_TAKEN
 .Pq Event C4H , Umask 10H
 Counts the number of not taken branch instructions retired.
 .It Li BR_INST_RETIRED.NEAR_TAKEN
 .Pq Event C4H , Umask 20H
 Number of near taken branches retired.
 .It Li BR_INST_RETIRED.FAR_BRANCH
 .Pq Event C4H , Umask 40H
 Number of far branches retired.
 .It Li BR_MISP_RETIRED.ALL_BRANCHES
 .Pq Event C5H , Umask 00H
 Mispredicted branch instructions at retirement.
 .It Li BR_MISP_RETIRED.CONDITIONAL
 .Pq Event C5H , Umask 01H
 Mispredicted conditional branch instructions retired.
 Supports PEBS.
 .It Li BR_MISP_RETIRED.NEAR_CALL
 .Pq Event C5H , Umask 02H
 Direct and indirect mispredicted near call instructions retired.
 .It Li BR_MISP_RETIRED.ALL_BRANCHES
 .Pq Event C5H , Umask 04H
 Mispredicted macro branch instructions retired.
 .It Li BR_MISP_RETIRED.NOT_TAKEN
 .Pq Event C5H , Umask 10H
 Mispredicted not taken branch instructions retired.
 .It Li BR_MISP_RETIRED.TAKEN
 .Pq Event C5H , Umask 20H
 Mispredicted taken branch instructions retired.
 .It Li FP_ASSIST.X87_OUTPUT
 .Pq Event CAH , Umask 02H
 Number of X87 FP assists due to Output values.
 .It Li FP_ASSIST.X87_INPUT
 .Pq Event CAH , Umask 04H
 Number of X87 FP assists due to input values.
 .It Li FP_ASSIST.SIMD_OUTPUT
 .Pq Event CAH , Umask 08H
 Number of SIMD FP assists due to Output values.
 .It Li FP_ASSIST.SIMD_INPUT
 .Pq Event CAH , Umask 10H
 Number of SIMD FP assists due to input values.
 .It Li FP_ASSIST.ANY
 .Pq Event CAH , Umask 1EH
 Cycles with any input/output SSE* or FP assists.
 .It Li ROB_MISC_EVENTS.LBR_INSERTS
 .Pq Event CCH , Umask 20H
 Count cases of saving new LBR records by hardware.
 .It Li MEM_TRANS_RETIRED.LOAD_LATENCY
 .Pq Event CDH , Umask 01H
 Sample loads with specified latency threshold.
 PMC3 only.
 Specify threshold in MSR 0x3F6.
 .It Li MEM_TRANS_RETIRED.PRECISE_STORE
 .Pq Event CDH , Umask 02H
 Sample stores and collect precise store operation via PEBS record.
 PMC3 only.
 .It Li MEM_UOPS_RETIRED.STLB_MISS_LOADS
 .Pq Event D0H , Umask 11H
 Count retired load uops that missed the STLB.
 .It Li MEM_UOPS_RETIRED.STLB_MISS_STORES
 .Pq Event D0H , Umask 12H
 Count retired store uops that missed the STLB.
 .It Li MEM_UOPS_RETIRED.SPLIT_LOADS
 .Pq Event D0H , Umask 41H
 Count retired load uops that were split across a cache line.
 .It Li MEM_UOPS_RETIRED.SPLIT_STORES
 .Pq Event D0H , Umask 42H
 Count retired store uops that were split across a cache line.
 .It Li MEM_UOPS_RETIRED.ALL_LOADS
 .Pq Event D0H , Umask 81H
 Count all retired load uops.
 .It Li MEM_UOPS_RETIRED.ALL_STORES
 .Pq Event D0H , Umask 82H
 Count all retired store uops.
 .It Li MEM_LOAD_UOPS_RETIRED.L1_HIT
 .Pq Event D1H , Umask 01H
 Retired load uops with L1 cache hits as data sources.
 Supports PEBS.
 .It Li MEM_LOAD_UOPS_RETIRED.L2_HIT
 .Pq Event D1H , Umask 02H
 Retired load uops with L2 cache hits as data sources.
 .It Li MEM_LOAD_UOPS_RETIRED.LLC_HIT
 .Pq Event D1H , Umask 04H
 Retired load uops with LLC cache hits as data sources.
 .It Li MEM_LOAD_UOPS_RETIRED.HIT_LFB
 .Pq Event D1H , Umask 40H
 Retired load uops which data sources were load uops missed L1 but hit FB due
 to preceding miss to the same cache line with data not ready.
 .It Li MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_MISS
 .Pq Event D2H , Umask 01H
 Retired load uops which data sources were LLC hit and cross-core snoop
 missed in on-pkg core cache.
 Supports PEBS.
 .It Li MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HIT
 .Pq Event D2H , Umask 02H
 Retired load uops which data sources were LLC and cross-core snoop hits in
 on-pkg core cache.
 Supports PEBS.
 .It Li MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HITM
 .Pq Event D2H , Umask 04H
 Retired load uops which data sources were HitM responses from shared LLC.
 .It Li MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_NONE
 .Pq Event D2H , Umask 08H
 Retired load uops which data sources were hits in LLC without snoops
 required.
 .It Li MEM_LOAD_UOPS_LLC_MISS_RETIRED.LOCAL_DRAM
 .Pq Event D3H , Umask 01H
 Retired load uops which data sources missed LLC but serviced from local
 dram.
 Supports PEBS.
 .It Li L2_TRANS.DEMAND_DATA_RD
 .Pq Event F0H , Umask 01H
 Demand Data Read requests that access L2 cache.
 .It Li L2_TRANS.RFO
 .Pq Event F0H , Umask 02H
 RFO requests that access L2 cache.
 .It Li L2_TRANS.CODE_RD
 .Pq Event F0H , Umask 04H
 L2 cache accesses when fetching instructions.
 .It Li L2_TRANS.ALL_PF
 .Pq Event F0H , Umask 08H
 Any MLC or LLC HW prefetch accessing L2, including rejects.
 .It Li L2_TRANS.L1D_WB
 .Pq Event F0H , Umask 10H
 L1D writebacks that access L2 cache.
 .It Li L2_TRANS.L2_FILL
 .Pq Event F0H , Umask 20H
 L2 fill requests that access L2 cache.
 .It Li L2_TRANS.L2_WB
 .Pq Event F0H , Umask 40H
 L2 writebacks that access L2 cache.
 .It Li L2_TRANS.ALL_REQUESTS
 .Pq Event F0H , Umask 80H
 Transactions accessing L2 pipe.
 .It Li L2_LINES_IN.I
 .Pq Event F1H , Umask 01H
 L2 cache lines in I state filling L2.
 Counting does not cover rejects.
 .It Li L2_LINES_IN.S
 .Pq Event F1H , Umask 02H
 L2 cache lines in S state filling L2.
 Counting does not cover rejects.
 .It Li L2_LINES_IN.E
 .Pq Event F1H , Umask 04H
 L2 cache lines in E state filling L2.
 Counting does not cover rejects.
 .It Li L2_LINES_IN.ALL
 .Pq Event F1H , Umask 07H
 L2 cache lines filling L2.
 Counting does not cover rejects.
 .It Li L2_LINES_OUT.DEMAND_CLEAN
 .Pq Event F2H , Umask 01H
 Clean L2 cache lines evicted by demand.
 .It Li L2_LINES_OUT.DEMAND_DIRTY
 .Pq Event F2H , Umask 02H
 Dirty L2 cache lines evicted by demand.
 .It Li L2_LINES_OUT.PF_CLEAN
 .Pq Event F2H , Umask 04H
 Clean L2 cache lines evicted by the MLC prefetcher.
 .It Li L2_LINES_OUT.PF_DIRTY
 .Pq Event F2H , Umask 08H
 Dirty L2 cache lines evicted by the MLC prefetcher.
 .El
 .Sh SEE ALSO
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.corei7 3 ,
 .Xr pmc.corei7uc 3 ,
 .Xr pmc.iaf 3 ,
 .Xr pmc.ivybridgexeon 3 ,
-.Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.sandybridge 3 ,
 .Xr pmc.sandybridgeuc 3 ,
 .Xr pmc.sandybridgexeon 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
 .Xr pmc.ucf 3 ,
 .Xr pmc.westmere 3 ,
 .Xr pmc.westmereuc 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
 .Sh HISTORY
 The
 .Nm pmc
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
 .An -nosplit
 The
 .Lb libpmc
 library was written by
 .An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
 The support for the Ivy Bridge
 microarchitecture was written by
 .An Fabien Thomas Aq Mt fabient@FreeBSD.org .
diff --git a/lib/libpmc/pmc.ivybridgexeon.3 b/lib/libpmc/pmc.ivybridgexeon.3
index 56e901be26ca..56b2f2f62c0b 100644
--- a/lib/libpmc/pmc.ivybridgexeon.3
+++ b/lib/libpmc/pmc.ivybridgexeon.3
@@ -1,891 +1,890 @@
 .\" Copyright (c) 2013 Hiren Panchasara <hiren.panchasara@gmail.com>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .Dd January 25, 2013
 .Dt PMC.IVYBRIDGEXEON 3
 .Os
 .Sh NAME
 .Nm pmc.ivybridgexeon
 .Nd measurement events for
 .Tn Intel
 .Tn Ivy Bridge Xeon
 family CPUs
 .Sh LIBRARY
 .Lb libpmc
 .Sh SYNOPSIS
 .In pmc.h
 .Sh DESCRIPTION
 .Tn Intel
 .Tn "Ivy Bridge Xeon"
 CPUs contain PMCs conforming to version 2 of the
 .Tn Intel
 performance measurement architecture.
 These CPUs may contain up to three classes of PMCs:
 .Bl -tag -width "Li PMC_CLASS_IAP"
 .It Li PMC_CLASS_IAF
 Fixed-function counters that count only one hardware event per counter.
 .It Li PMC_CLASS_IAP
 Programmable counters that may be configured to count one of a defined
 set of hardware events.
 .El
 .Pp
 The number of PMCs available in each class and their widths need to be
 determined at run time by calling
 .Xr pmc_cpuinfo 3 .
 .Pp
 Intel Ivy Bridge Xeon PMCs are documented in
 .Rs
 .%B "Intel(R) 64 and IA-32 Architectures Software Developer's Manual"
 .%N "Order Number: 325462-045US"
 .%D January 2013
 .%Q "Intel Corporation"
 .Re
 .Ss IVYBRIDGE FIXED FUNCTION PMCS
 These PMCs and their supported events are documented in
 .Xr pmc.iaf 3 .
 .Ss IVYBRIDGE PROGRAMMABLE PMCS
 The programmable PMCs support the following capabilities:
 .Bl -column "PMC_CAP_INTERRUPT" "Support"
 .It Em Capability Ta Em Support
 .It PMC_CAP_CASCADE Ta \&No
 .It PMC_CAP_EDGE Ta Yes
 .It PMC_CAP_INTERRUPT Ta Yes
 .It PMC_CAP_INVERT Ta Yes
 .It PMC_CAP_READ Ta Yes
 .It PMC_CAP_PRECISE Ta \&No
 .It PMC_CAP_SYSTEM Ta Yes
 .It PMC_CAP_TAGGING Ta \&No
 .It PMC_CAP_THRESHOLD Ta Yes
 .It PMC_CAP_USER Ta Yes
 .It PMC_CAP_WRITE Ta Yes
 .El
 .Ss Event Qualifiers
 Event specifiers for these PMCs support the following common
 qualifiers:
 .Bl -tag -width indent
 .It Li rsp= Ns Ar value
 Configure the Off-core Response bits.
 .Bl -tag -width indent
 .It Li REQ_DMND_DATA_RD
 Counts the number of demand and DCU prefetch data reads of full and partial
 cachelines as well as demand data page table entry cacheline reads.
 Does not count L2 data read prefetches or instruction fetches.
 .It Li REQ_DMND_RFO
 Counts the number of demand and DCU prefetch reads for ownership (RFO)
 requests generated by a write to data cacheline.
 Does not count L2 RFO prefetches.
 .It Li REQ_DMND_IFETCH
 Counts the number of demand and DCU prefetch instruction cacheline reads.
 Does not count L2 code read prefetches.
 .It Li REQ_WB
 Counts the number of writeback (modified to exclusive) transactions.
 .It Li REQ_PF_DATA_RD
 Counts the number of data cacheline reads generated by L2 prefetchers.
 .It Li REQ_PF_RFO
 Counts the number of RFO requests generated by L2 prefetchers.
 .It Li REQ_PF_IFETCH
 Counts the number of code reads generated by L2 prefetchers.
 .It Li REQ_PF_LLC_DATA_RD
 L2 prefetcher to L3 for loads.
 .It Li REQ_PF_LLC_RFO
 RFO requests generated by L2 prefetcher
 .It Li REQ_PF_LLC_IFETCH
 L2 prefetcher to L3 for instruction fetches.
 .It Li REQ_BUS_LOCKS
 Bus lock and split lock requests.
 .It Li REQ_STRM_ST
 Streaming store requests.
 .It Li REQ_OTHER
 Any other request that crosses IDI, including I/O.
 .It Li RES_ANY
 Catch all value for any response types.
 .It Li RES_SUPPLIER_NO_SUPP
 No Supplier Information available.
 .It Li RES_SUPPLIER_LLC_HITM
 M-state initial lookup stat in L3.
 .It Li RES_SUPPLIER_LLC_HITE
 E-state.
 .It Li RES_SUPPLIER_LLC_HITS
 S-state.
 .It Li RES_SUPPLIER_LLC_HITF
 F-state.
 .It Li RES_SUPPLIER_LOCAL
 Local DRAM Controller.
 .It Li RES_SNOOP_SNP_NONE
 No details on snoop-related information.
 .It Li RES_SNOOP_SNP_NO_NEEDED
 No snoop was needed to satisfy the request.
 .It Li RES_SNOOP_SNP_MISS
 A snoop was needed and it missed all snooped caches:
 -For LLC Hit, ReslHitl was returned by all cores
 -For LLC Miss, Rspl was returned by all sockets and data was returned from
 DRAM.
 .It Li RES_SNOOP_HIT_NO_FWD
 A snoop was needed and it hits in at least one snooped cache.
 Hit denotes a cache-line was valid before snoop effect.
 This includes:
 -Snoop Hit w/ Invalidation (LLC Hit, RFO)
 -Snoop Hit, Left Shared (LLC Hit/Miss, IFetch/Data_RD)
 -Snoop Hit w/ Invalidation and No Forward (LLC Miss, RFO Hit S)
 In the LLC Miss case, data is returned from DRAM.
 .It Li RES_SNOOP_HIT_FWD
 A snoop was needed and data was forwarded from a remote socket.
 This includes:
 -Snoop Forward Clean, Left Shared (LLC Hit/Miss, IFetch/Data_RD/RFT).
 .It Li RES_SNOOP_HITM
 A snoop was needed and it HitM-ed in local or remote cache.
 HitM denotes a cache-line was in modified state before effect as a results of snoop.
 This includes:
 -Snoop HitM w/ WB (LLC miss, IFetch/Data_RD)
 -Snoop Forward Modified w/ Invalidation (LLC Hit/Miss, RFO)
 -Snoop MtoS (LLC Hit, IFetch/Data_RD).
 .It Li RES_NON_DRAM
 Target was non-DRAM system address.
 This includes MMIO transactions.
 .El
 .It Li cmask= Ns Ar value
 Configure the PMC to increment only if the number of configured
 events measured in a cycle is greater than or equal to
 .Ar value .
 .It Li edge
 Configure the PMC to count the number of de-asserted to asserted
 transitions of the conditions expressed by the other qualifiers.
 If specified, the counter will increment only once whenever a
 condition becomes true, irrespective of the number of clocks during
 which the condition remains true.
 .It Li inv
 Invert the sense of comparison when the
 .Dq Li cmask
 qualifier is present, making the counter increment when the number of
 events per cycle is less than the value specified by the
 .Dq Li cmask
 qualifier.
 .It Li os
 Configure the PMC to count events happening at processor privilege
 level 0.
 .It Li usr
 Configure the PMC to count events occurring at privilege levels 1, 2
 or 3.
 .El
 .Pp
 If neither of the
 .Dq Li os
 or
 .Dq Li usr
 qualifiers are specified, the default is to enable both.
 .Ss Event Specifiers (Programmable PMCs)
 Ivy Bridge programmable PMCs support the following events:
 .Bl -tag -width indent
 .It Li LD_BLOCKS.STORE_FORWARD
 .Pq Event 03H , Umask 02H
 loads blocked by overlapping with store buffer that cannot be forwarded .
 .It Li MISALIGN_MEM_REF.LOADS
 .Pq Event 05H , Umask 01H
 Speculative cache-line split load uops dispatched to L1D.
 .It Li MISALIGN_MEM_REF.STORES
 .Pq Event 05H , Umask 02H
 Speculative cache-line split Store- address uops dispatched to L1D.
 .It Li LD_BLOCKS_PARTIAL.ADDRESS_ALIAS
 .Pq Event 07H , Umask 01H
 False dependencies in MOB due to partial compare on address.
 .It Li DTLB_LOAD_MISSES.DEMAND_LD_MISS_CAUSES_A_WALK
 .Pq Event 08H , Umask 81H
 Misses in all TLB levels that cause a page walk of any page size from demand loads.
 .It Li DTLB_LOAD_MISSES.DEMAND_LD_WALK_COMPLETED
 .Pq Event 08H , Umask 82H
 Misses in all TLB levels that caused page walk completed of any size by demand loads.
 .It Li DTLB_LOAD_MISSES.DEMAND_LD_WALK_DURATION
 .Pq Event 08H , Umask 84H
 Cycle PMH is busy with a walk due to demand loads.
 .It Li UOPS_ISSUED.ANY
 .Pq Event 0EH , Umask 01H
 Increments each cycle the # of Uops issued by the RAT to RS.
 Set Cmask = 1, Inv = 1to count stalled cycles.
 Set Cmask = 1, Inv = 1, Any= 1to count stalled cycles of this core.
 .It Li UOPS_ISSUED.FLAGS_MERGE
 .Pq Event 0EH , Umask 10H
 Number of flags-merge uops allocated.
 Such uops adds delay.
 .It Li UOPS_ISSUED.SLOW_LEA
 .Pq Event 0EH , Umask 20H
 Number of slow LEA or similar uops allocated.
 Such uop has 3 sources (e.g. 2 sources + immediate) regardless if as a result of LEA instruction or not.
 .It Li UOPS_ISSUED.SINGLE_MUL
 .Pq Event 0EH , Umask 40H
 Number of multiply packed/scalar single precision uops allocated.
 .It Li ARITH.FPU_DIV_ACTIVE
 .Pq Event 14H , Umask 01H
 Cycles that the divider is active, includes INT and FP.
 Set 'edge =1, cmask=1' to count the number of divides.
 .It Li L2_RQSTS.DEMAND_DATA_RD_HIT
 .Pq Event 24H , Umask 01H
 Demand Data Read requests that hit L2 cache.
 .It Li L2_RQSTS.ALL_DEMAND_DATA_RD
 .Pq Event 24H , Umask 03H
 Counts any demand and L1 HW prefetch data load requests to L2.
 .It Li L2_RQSTS.RFO_HITS
 .Pq Event 24H , Umask 04H
 Counts the number of store RFO requests that hit the L2 cache.
 .It Li L2_RQSTS.RFO_MISS
 .Pq Event 24H , Umask 08H
 Counts the number of store RFO requests that miss the L2 cache.
 .It Li L2_RQSTS.ALL_RFO
 .Pq Event 24H , Umask 0CH
 Counts all L2 store RFO requests.
 .It Li L2_RQSTS.CODE_RD_HIT
 .Pq Event 24H , Umask 10H
 Number of instruction fetches that hit the L2 cache.
 .It Li L2_RQSTS.CODE_RD_MISS
 .Pq Event 24H , Umask 20H
 Number of instruction fetches that missed the L2 cache.
 .It Li L2_RQSTS.ALL_CODE_RD
 .Pq Event 24H , Umask 30H
 Counts all L2 code requests.
 .It Li L2_RQSTS.PF_HIT
 .Pq Event 24H , Umask 40H
 Counts all L2 HW prefetcher requests that hit L2.
 .It Li L2_RQSTS.PF_MISS
 .Pq Event 24H , Umask 80H
 Counts all L2 HW prefetcher requests that missed L2.
 .It Li L2_RQSTS.ALL_PF
 .Pq Event 24H , Umask C0H
 Counts all L2 HW prefetcher requests.
 .It Li L2_STORE_LOCK_RQSTS.MISS
 .Pq Event 27H , Umask 01H
 RFOs that miss cache lines.
 .It Li L2_STORE_LOCK_RQSTS.HIT_M
 .Pq Event 27H , Umask 08H
 RFOs that hit cache lines in M state.
 .It Li L2_STORE_LOCK_RQSTS.ALL
 .Pq Event 27H , Umask 0FH
 RFOs that access cache lines in any state.
 .It Li L2_L1D_WB_RQSTS.MISS
 .Pq Event 28H , Umask 01H
 Not rejected writebacks that missed LLC.
 .It Li L2_L1D_WB_RQSTS.HIT_E
 .Pq Event 28H , Umask 04H
 Not rejected writebacks from L1D to L2 cache lines in E state.
 .It Li L2_L1D_WB_RQSTS.HIT_M
 .Pq Event 28H , Umask 08H
 Not rejected writebacks from L1D to L2 cache lines in M state.
 .It Li L2_L1D_WB_RQSTS.ALL
 .Pq Event 28H , Umask 0FH
 Not rejected writebacks from L1D to L2 cache lines in any state.
 .It Li LONGEST_LAT_CACHE.REFERENCE
 .Pq Event 2EH , Umask 4FH
 This event counts requests originating from the core that reference a cache
 line in the last level cache.
 .It Li LONGEST_LAT_CACHE.MISS
 .Pq Event 2EH , Umask 41H
 This event counts each cache miss condition for references to the last level
 cache.
 .It Li CPU_CLK_UNHALTED.THREAD_P
 .Pq Event 3CH , Umask 00H
 Counts the number of thread cycles while the thread is not in a halt state.
 The thread enters the halt state when it is running the HLT instruction.
 The core frequency may change from time to time due to power or thermal throttling.
 .It Li CPU_CLK_THREAD_UNHALTED.REF_XCLK
 .Pq Event 3CH , Umask 01H
 Increments at the frequency of XCLK (100 MHz) when not halted.
 .It Li L1D_PEND_MISS.PENDING
 .Pq Event 48H , Umask 01H
 Increments the number of outstanding L1D misses every cycle.
 Set Cmaks = 1 and Edge =1 to count occurrences.
 Counter 2 only.
 Set Cmask = 1 to count cycles.
 .It Li DTLB_STORE_MISSES.MISS_CAUSES_A_WALK
 .Pq Event 49H , Umask 01H
 Miss in all TLB levels causes an page walk of any page size (4K/2M/4M/1G).
 .It Li DTLB_STORE_MISSES.WALK_COMPLETED
 .Pq Event 49H , Umask 02H
 Miss in all TLB levels causes a page walk that completes of any page size
 (4K/2M/4M/1G).
 .It Li DTLB_STORE_MISSES.WALK_DURATION
 .Pq Event 49H , Umask 04H
 Cycles PMH is busy with this walk.
 .It Li DTLB_STORE_MISSES.STLB_HIT
 .Pq Event 49H , Umask 10H
 Store operations that miss the first TLB level but hit the second and do not
 cause page walks.
 .It Li LOAD_HIT_PRE.SW_PF
 .Pq Event 4CH , Umask 01H
 Non-SW-prefetch load dispatches that hit fill buffer allocated for S/W prefetch.
 .It Li LOAD_HIT_PRE.HW_PF
 .Pq Event 4CH , Umask 02H
 Non-SW-prefetch load dispatches that hit fill buffer allocated for H/W prefetch.
 .It Li L1D.REPLACEMENT
 .Pq Event 51H , Umask 01H
 Counts the number of lines brought into the L1 data cache.
 .It Li MOVE_ELIMINATION.INT_NOT_ELIMINATED
 .Pq Event 58H , Umask 01H
 Number of integer Move Elimination candidate uops that were not eliminated.
 .It Li MOVE_ELIMINATION.SIMD_NOT_ELIMINATED
 .Pq Event 58H , Umask 02H
 Number of SIMD Move Elimination candidate uops that were not eliminated.
 .It Li MOVE_ELIMINATION.INT_ELIMINATED
 .Pq Event 58H , Umask 04H
 Number of integer Move Elimination candidate uops that were eliminated.
 .It Li MOVE_ELIMINATION.SIMD_ELIMINATED
 .Pq Event 58H , Umask 08H
 Number of SIMD Move Elimination candidate uops that were eliminated.
 .It Li CPL_CYCLES.RING0
 .Pq Event 5CH , Umask 01H
 Unhalted core cycles when the thread is in ring 0.
 Use Edge to count transition.
 .It Li CPL_CYCLES.RING123
 .Pq Event 5CH , Umask 02H
 Unhalted core cycles when the thread is not in ring 0.
 .It Li RS_EVENTS.EMPTY_CYCLES
 .Pq Event 5EH , Umask 01H
 Cycles the RS is empty for the thread.
 .It Li DTLB_LOAD_MISSES.STLB_HIT
 .Pq Event 5FH , Umask 04H
 Counts load operations that missed 1st level DTLB but hit the 2nd level.
 .It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND_DATA_RD
 .Pq Event 60H , Umask 01H
 Offcore outstanding Demand Data Read transactions in SQ to uncore.
 Set Cmask=1 to count cycles.
 .It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND_CODE_RD
 .Pq Event 60H , Umask 02H
 Offcore outstanding Demand Code Read transactions in SQ to uncore.
 Set Cmask=1 to count cycles.
 .It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND_RFO
 .Pq Event 60H , Umask 04H
 Offcore outstanding RFO store transactions in SQ to uncore.
 Set Cmask=1 to count cycles.
 .It Li OFFCORE_REQUESTS_OUTSTANDING.ALL_DATA_RD
 .Pq Event 60H , Umask 08H
 Offcore outstanding cacheable data read transactions in SQ to uncore.
 Set Cmask=1 to count cycles.
 .It Li LOCK_CYCLES.SPLIT_LOCK_UC_LOCK_DURATION
 .Pq Event 63H , Umask 01H
 Cycles in which the L1D and L2 are locked, due to a UC lock or split lock.
 .It Li LOCK_CYCLES.CACHE_LOCK_DURATION
 .Pq Event 63H , Umask 02H
 Cycles in which the L1D is locked.
 .It Li IDQ.EMPTY
 .Pq Event 79H , Umask 02H
 Counts cycles the IDQ is empty.
 .It Li IDQ.MITE_UOPS
 .Pq Event 79H , Umask 04H
 Increment each cycle # of uops delivered to IDQ from MITE path.
 Can combine Umask 04H and 20H.
 Set Cmask = 1 to count cycles.
 .It Li IDQ.DSB_UOPS
 .Pq Event 79H , Umask 08H
 Increment each cycle. # of uops delivered to IDQ from DSB path.
 Can combine Umask 08H and 10H
 Set Cmask = 1 to count cycles.
 .It Li IDQ.MS_DSB_UOPS
 .Pq Event 79H , Umask 10H
 Increment each cycle # of uops delivered to IDQ when MS_busy by DSB.
 Set Cmask = 1 to count cycles.
 Add Edge=1 to count # of delivery.
 Can combine Umask 04H, 08H.
 .It Li IDQ.MS_MITE_UOPS
 .Pq Event 79H , Umask 20H
 Increment each cycle # of uops delivered to IDQ when MS_busy by MITE.
 Set Cmask = 1 to count cycles.
 Can combine Umask 04H, 08H.
 .It Li IDQ.MS_UOPS
 .Pq Event 79H , Umask 30H
 Increment each cycle # of uops delivered to IDQ from MS by either DSB or
 MITE.
 Set Cmask = 1 to count cycles.
 Can combine Umask 04H, 08H.
 .It Li IDQ.ALL_DSB_CYCLES_ANY_UOPS
 .Pq Event 79H , Umask 18H
 Counts cycles DSB is delivered at least one uops.
 Set Cmask = 1.
 .It Li IDQ.ALL_DSB_CYCLES_4_UOPS
 .Pq Event 79H , Umask 18H
 Counts cycles DSB is delivered four uops.
 Set Cmask = 4.
 .It Li IDQ.ALL_MITE_CYCLES_ANY_UOPS
 .Pq Event 79H , Umask 24H
 Counts cycles MITE is delivered at least one uops.
 Set Cmask = 1.
 .It Li IDQ.ALL_MITE_CYCLES_4_UOPS
 .Pq Event 79H , Umask 24H
 Counts cycles MITE is delivered four uops.
 Set Cmask = 4.
 .It Li IDQ.MITE_ALL_UOPS
 .Pq Event 79H , Umask 3CH
 # of uops delivered to IDQ from any path.
 .It Li ICACHE.MISSES
 .Pq Event 80H , Umask 02H
 Number of Instruction Cache, Streaming Buffer and Victim Cache Misses.
 Includes UC accesses.
 .It Li ITLB_MISSES.MISS_CAUSES_A_WALK
 .Pq Event 85H , Umask 01H
 Misses in all ITLB levels that cause page walks.
 .It Li ITLB_MISSES.WALK_COMPLETED
 .Pq Event 85H , Umask 02H
 Misses in all ITLB levels that cause completed page walks.
 .It Li ITLB_MISSES.WALK_DURATION
 .Pq Event 85H , Umask 04H
 Cycle PMH is busy with a walk.
 .It Li ITLB_MISSES.STLB_HIT
 .Pq Event 85H , Umask 10H
 Number of cache load STLB hits.
 No page walk.
 .It Li ILD_STALL.LCP
 .Pq Event 87H , Umask 01H
 Stalls caused by changing prefix length of the instruction.
 .It Li ILD_STALL.IQ_FULL
 .Pq Event 87H , Umask 04H
 Stall cycles due to IQ is full.
 .It Li BR_INST_EXEC.NONTAKEN_COND
 .Pq Event 88H , Umask 41H
 Count conditional near branch instructions that were executed (but not
 necessarily retired) and not taken.
 .It Li BR_INST_EXEC.TAKEN_COND
 .Pq Event 88H , Umask 81H
 Count conditional near branch instructions that were executed (but not
 necessarily retired) and taken.
 .It Li BR_INST_EXEC.DIRECT_JMP
 .Pq Event 88H , Umask 82H
 Count all unconditional near branch instructions excluding calls and
 indirect branches.
 .It Li BR_INST_EXEC.INDIRECT_JMP_NON_CALL_RET
 .Pq Event 88H , Umask 84H
 Count executed indirect near branch instructions that are not calls nor
 returns.
 .It Li BR_INST_EXEC.RETURN_NEAR
 .Pq Event 88H , Umask 88H
 Count indirect near branches that have a return mnemonic.
 .It Li BR_INST_EXEC.DIRECT_NEAR_CALL
 .Pq Event 88H , Umask 90H
 Count unconditional near call branch instructions, excluding non call
 branch, executed.
 .It Li BR_INST_EXEC.INDIRECT_NEAR_CALL
 .Pq Event 88H , Umask A0H
 Count indirect near calls, including both register and memory indirect,
 executed.
 .It Li BR_INST_EXEC.ALL_BRANCHES
 .Pq Event 88H , Umask FFH
 Counts all near executed branches (not necessarily retired).
 .It Li BR_MISP_EXEC.NONTAKEN_COND
 .Pq Event 89H , Umask 41H
 Count conditional near branch instructions mispredicted as nontaken.
 .It Li BR_MISP_EXEC.TAKEN_COND
 .Pq Event 89H , Umask 81H
 Count conditional near branch instructions mispredicted as taken.
 .It Li BR_MISP_EXEC.INDIRECT_JMP_NON_CALL_RET
 .Pq Event 89H , Umask 84H
 Count mispredicted indirect near branch instructions that are not calls
 nor returns.
 .It Li BR_MISP_EXEC.RETURN_NEAR
 .Pq Event 89H , Umask 88H
 Count mispredicted indirect near branches that have a return mnemonic.
 .It Li BR_MISP_EXEC.DIRECT_NEAR_CALL
 .Pq Event 89H , Umask 90H
 Count mispredicted unconditional near call branch instructions, excluding
 non call branch, executed.
 .It Li BR_MISP_EXEC.INDIRECT_NEAR_CALL
 .Pq Event 89H , Umask A0H
 Count mispredicted indirect near calls, including both register and memory
 indirect, executed.
 .It Li BR_MISP_EXEC.ALL_BRANCHES
 .Pq Event 89H , Umask FFH
 Counts all mispredicted near executed branches (not necessarily retired).
 .It Li IDQ_UOPS_NOT_DELIVERED.CORE
 .Pq Event 9CH , Umask 01H
 Count number of non-delivered uops to RAT per thread.
 Use Cmask to qualify uop b/w.
 .It Li UOPS_DISPATCHED_PORT.PORT_0
 .Pq Event A1H , Umask 01H
 Cycles which a Uop is dispatched on port 0.
 .It Li UOPS_DISPATCHED_PORT.PORT_1
 .Pq Event A1H , Umask 02H
 Cycles which a Uop is dispatched on port 1.
 .It Li UOPS_DISPATCHED_PORT.PORT_2_LD
 .Pq Event A1H , Umask 04H
 Cycles which a load uop is dispatched on port 2.
 .It Li UOPS_DISPATCHED_PORT.PORT_2_STA
 .Pq Event A1H , Umask 08H
 Cycles which a store address uop is dispatched on port 2.
 .It Li UOPS_DISPATCHED_PORT.PORT_2
 .Pq Event A1H , Umask 0CH
 Cycles which a Uop is dispatched on port 2.
 .It Li UOPS_DISPATCHED_PORT.PORT_3_LD
 .Pq Event A1H , Umask 10H
 Cycles which a load uop is dispatched on port 3.
 .It Li UOPS_DISPATCHED_PORT.PORT_3_STA
 .Pq Event A1H , Umask 20H
 Cycles which a store address uop is dispatched on port 3.
 .It Li UOPS_DISPATCHED_PORT.PORT_3
 .Pq Event A1H , Umask 30H
 Cycles which a Uop is dispatched on port 3.
 .It Li UOPS_DISPATCHED_PORT.PORT_4
 .Pq Event A1H , Umask 40H
 Cycles which a Uop is dispatched on port 4.
 .It Li UOPS_DISPATCHED_PORT.PORT_5
 .Pq Event A1H , Umask 80H
 Cycles which a Uop is dispatched on port 5.
 .It Li RESOURCE_STALLS.ANY
 .Pq Event A2H , Umask 01H
 Cycles Allocation is stalled due to Resource Related reason.
 .It Li RESOURCE_STALLS.RS
 .Pq Event A2H , Umask 04H
 Cycles stalled due to no eligible RS entry available.
 .It Li RESOURCE_STALLS.SB
 .Pq Event A2H , Umask 08H
 Cycles stalled due to no store buffers available. (not including draining
 form sync).
 .It Li RESOURCE_STALLS.ROB
 .Pq Event A2H , Umask 10H
 Cycles stalled due to re-order buffer full.
 .It Li CYCLE_ACTIVITY.CYCLES_L2_PENDING
 .Pq Event A3H , Umask 01H
 Cycles with pending L2 miss loads.
 Set AnyThread to count per core.
 .It Li CYCLE_ACTIVITY.CYCLES_LDM_PENDING
 .Pq Event A3H , Umask 02H
 Cycles with pending memory loads.
 Set AnyThread to count per core.
 .It Li CYCLE_ACTIVITY.CYCLES_NO_EXECUTE
 .Pq Event A3H , Umask 04H
 Cycles of dispatch stalls.
 Set AnyThread to count per core.
 .It Li CYCLE_ACTIVITY.CYCLES_L1D_PENDING
 .Pq Event A3H , Umask 08H
 Cycles with pending L1 cache miss loads.
 Set AnyThread to count per core.
 .It Li DSB2MITE_SWITCHES.COUNT
 .Pq Event ABH , Umask 01H
 Number of DSB to MITE switches.
 .It Li DSB2MITE_SWITCHES.PENALTY_CYCLES
 .Pq Event ABH , Umask 02H
 Cycles DSB to MITE switches caused delay.
 .It Li DSB_FILL.EXCEED_DSB_LINES
 .Pq Event ACH , Umask 08H
 DSB Fill encountered > 3 DSB lines.
 .It Li ITLB.ITLB_FLUSH
 .Pq Event AEH , Umask 01H
 Counts the number of ITLB flushes, includes 4k/2M/4M pages.
 .It Li OFFCORE_REQUESTS.DEMAND_DATA_RD
 .Pq Event B0H , Umask 01H
 Demand data read requests sent to uncore.
 .It Li OFFCORE_REQUESTS.DEMAND_CODE_RD
 .Pq Event B0H , Umask 02H
 Demand code read requests sent to uncore.
 .It Li OFFCORE_REQUESTS.DEMAND_RFO
 .Pq Event B0H , Umask 04H
 Demand RFO read requests sent to uncore, including regular RFOs, locks,
 ItoM.
 .It Li OFFCORE_REQUESTS.ALL_DATA_RD
 .Pq Event B0H , Umask 08H
 Data read requests sent to uncore (demand and prefetch).
 .It Li UOPS_EXECUTED.THREAD
 .Pq Event B1H , Umask 01H
 Counts total number of uops to be executed per-thread each cycle.
 Set Cmask = 1, INV =1 to count stall cycles.
 .It Li UOPS_EXECUTED.CORE
 .Pq Event B1H , Umask 02H
 Counts total number of uops to be executed per-core each cycle.
 Do not need to set ANY.
 .It Li OFF_CORE_RESPONSE_0
 .Pq Event B7H , Umask 01H
 Off-core Response Performance Monitoring.
 PMC0 only.
 Requires programming MSR 01A6H.
 .It Li OFF_CORE_RESPONSE_1
 .Pq Event BBH , Umask 01H
 Off-core Response Performance Monitoring.
 PMC3 only.
 Requires programming MSR 01A7H.
 .It Li TLB_FLUSH.DTLB_THREAD
 .Pq Event BDH , Umask 01H
 DTLB flush attempts of the thread- specific entries.
 .It Li TLB_FLUSH.STLB_ANY
 .Pq Event BDH , Umask 20H
 Count number of STLB flush attempts.
 .It Li INST_RETIRED.ANY_P
 .Pq Event C0H , Umask 00H
 Number of instructions at retirement.
 .It Li INST_RETIRED.ALL
 .Pq Event C0H , Umask 01H
 Precise instruction retired event with HW to reduce effect of PEBS shadow in
 IP distribution.
 PMC1 only.
 Must quiesce other PMCs.
 .It Li OTHER_ASSISTS.AVX_STORE
 .Pq Event C1H , Umask 08H
 Number of assists associated with 256-bit AVX store operations.
 .It Li OTHER_ASSISTS.AVX_TO_SSE
 .Pq Event C1H , Umask 10H
 Number of transitions from AVX- 256 to legacy SSE when penalty applicable.
 .It Li OTHER_ASSISTS.SSE_TO_AVX
 .Pq Event C1H , Umask 20H
 Number of transitions from SSE to AVX-256 when penalty applicable.
 .It Li UOPS_RETIRED.ALL
 .Pq Event C2H , Umask 01H
 Counts the number of micro-ops retired, Use cmask=1 and invert to count
 active cycles or stalled cycles.
 Supports PEBS, use Any=1 for core granular.
 .It Li UOPS_RETIRED.RETIRE_SLOTS
 .Pq Event C2H , Umask 02H
 Counts the number of retirement slots used each cycle.
 .It Li MACHINE_CLEARS.MEMORY_ORDERING
 .Pq Event C3H , Umask 02H
 Counts the number of machine clears due to memory order conflicts.
 .It Li MACHINE_CLEARS.SMC
 .Pq Event C3H , Umask 04H
 Number of self-modifying-code machine clears detected.
 .It Li MACHINE_CLEARS.MASKMOV
 .Pq Event C3H , Umask 20H
 Counts the number of executed AVX masked load operations that refer to an
 illegal address range with the mask bits set to 0.
 .It Li BR_INST_RETIRED.ALL_BRANCHES
 .Pq Event C4H , Umask 00H
 Branch instructions at retirement.
 .It Li BR_INST_RETIRED.CONDITIONAL
 .Pq Event C4H , Umask 01H
 Counts the number of conditional branch instructions retired.
 Supports PEBS.
 .It Li BR_INST_RETIRED.NEAR_CALL
 .Pq Event C4H , Umask 02H
 Direct and indirect near call instructions retired.
 .It Li BR_INST_RETIRED.ALL_BRANCHES
 .Pq Event C4H , Umask 04H
 Counts the number of branch instructions retired.
 .It Li BR_INST_RETIRED.NEAR_RETURN
 .Pq Event C4H , Umask 08H
 Counts the number of near return instructions retired.
 .It Li BR_INST_RETIRED.NOT_TAKEN
 .Pq Event C4H , Umask 10H
 Counts the number of not taken branch instructions retired.
 .It Li BR_INST_RETIRED.NEAR_TAKEN
 .Pq Event C4H , Umask 20H
 Number of near taken branches retired.
 .It Li BR_INST_RETIRED.FAR_BRANCH
 .Pq Event C4H , Umask 40H
 Number of far branches retired.
 .It Li BR_MISP_RETIRED.ALL_BRANCHES
 .Pq Event C5H , Umask 00H
 Mispredicted branch instructions at retirement.
 .It Li BR_MISP_RETIRED.CONDITIONAL
 .Pq Event C5H , Umask 01H
 Mispredicted conditional branch instructions retired.
 Supports PEBS.
 .It Li BR_MISP_RETIRED.NEAR_CALL
 .Pq Event C5H , Umask 02H
 Direct and indirect mispredicted near call instructions retired.
 .It Li BR_MISP_RETIRED.ALL_BRANCHES
 .Pq Event C5H , Umask 04H
 Mispredicted macro branch instructions retired.
 .It Li BR_MISP_RETIRED.NOT_TAKEN
 .Pq Event C5H , Umask 10H
 Mispredicted not taken branch instructions retired.
 .It Li BR_MISP_RETIRED.TAKEN
 .Pq Event C5H , Umask 20H
 Mispredicted taken branch instructions retired.
 .It Li FP_ASSIST.X87_OUTPUT
 .Pq Event CAH , Umask 02H
 Number of X87 FP assists due to Output values.
 .It Li FP_ASSIST.X87_INPUT
 .Pq Event CAH , Umask 04H
 Number of X87 FP assists due to input values.
 .It Li FP_ASSIST.SIMD_OUTPUT
 .Pq Event CAH , Umask 08H
 Number of SIMD FP assists due to Output values.
 .It Li FP_ASSIST.SIMD_INPUT
 .Pq Event CAH , Umask 10H
 Number of SIMD FP assists due to input values.
 .It Li FP_ASSIST.ANY
 .Pq Event CAH , Umask 1EH
 Cycles with any input/output SSE* or FP assists.
 .It Li ROB_MISC_EVENTS.LBR_INSERTS
 .Pq Event CCH , Umask 20H
 Count cases of saving new LBR records by hardware.
 .It Li MEM_TRANS_RETIRED.LOAD_LATENCY
 .Pq Event CDH , Umask 01H
 Sample loads with specified latency threshold.
 PMC3 only.
 Specify threshold in MSR 0x3F6.
 .It Li MEM_TRANS_RETIRED.PRECISE_STORE
 .Pq Event CDH , Umask 02H
 Sample stores and collect precise store operation via PEBS record.
 PMC3 only.
 .It Li MEM_UOPS_RETIRED.STLB_MISS_LOADS
 .Pq Event D0H , Umask 11H
 Count retired load uops that missed the STLB.
 .It Li MEM_UOPS_RETIRED.STLB_MISS_STORES
 .Pq Event D0H , Umask 12H
 Count retired store uops that missed the STLB.
 .It Li MEM_UOPS_RETIRED.SPLIT_LOADS
 .Pq Event D0H , Umask 41H
 Count retired load uops that were split across a cache line.
 .It Li MEM_UOPS_RETIRED.SPLIT_STORES
 .Pq Event D0H , Umask 42H
 Count retired store uops that were split across a cache line.
 .It Li MEM_UOPS_RETIRED.ALL_LOADS
 .Pq Event D0H , Umask 81H
 Count all retired load uops.
 .It Li MEM_UOPS_RETIRED.ALL_STORES
 .Pq Event D0H , Umask 82H
 Count all retired store uops.
 .It Li MEM_LOAD_UOPS_RETIRED.L1_HIT
 .Pq Event D1H , Umask 01H
 Retired load uops with L1 cache hits as data sources.
 Supports PEBS.
 .It Li MEM_LOAD_UOPS_RETIRED.L2_HIT
 .Pq Event D1H , Umask 02H
 Retired load uops with L2 cache hits as data sources.
 .It Li MEM_LOAD_UOPS_RETIRED.LLC_HIT
 .Pq Event D1H , Umask 04H
 Retired load uops whose data source was LLC hit with no snoop required.
 .It Li MEM_LOAD_UOPS_RETIRED.LLC_MISS
 .Pq Event D1H , Umask 20H
 Retired load uops whose data source is LLC miss.
 .It Li MEM_LOAD_UOPS_RETIRED.HIT_LFB
 .Pq Event D1H , Umask 40H
 Retired load uops which data sources were load uops missed L1 but hit FB due
 to preceding miss to the same cache line with data not ready.
 .It Li MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_MISS
 .Pq Event D2H , Umask 01H
 Retired load uops which data sources were LLC hit and cross-core snoop
 missed in on-pkg core cache.
 Supports PEBS.
 .It Li MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HIT
 .Pq Event D2H , Umask 02H
 Retired load uops which data sources were LLC and cross-core snoop hits in
 on-pkg core cache.
 Supports PEBS.
 .It Li MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HITM
 .Pq Event D2H , Umask 04H
 Retired load uops which data sources were HitM responses from shared LLC.
 .It Li MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_NONE
 .Pq Event D2H , Umask 08H
 Retired load uops which data sources were hits in LLC without snoops
 required.
 .It Li MEM_LOAD_UOPS_LLC_MISS_RETIRED.LOCAL_DRAM
 .Pq Event D3H , Umask 01H
 Retired load uops which data sources missed LLC but serviced from local
 dram.
 Supports PEBS.
 .It Li MEM_LOAD_UOPS_LLC_MISS_RETIRED.REMOTE_DRAM
 .Pq Event D3H , Umask 04H
 Retired load uops whose data source was remote DRAM.
 .It Li MEM_LOAD_UOPS_LLC_MISS_RETIRED.REMOTE_HITM
 .Pq Event D3H , Umask 10H
 Retired load uops whose data source was remote HITM.
 .It Li MEM_LOAD_UOPS_LLC_MISS_RETIRED.REMOTE_FWD
 .Pq Event D3H , Umask 20H
 Retired load uops whose data source was forwards from a remote cache.
 .It Li BACLEARS.ANY
 .Pq Event E6H , Umask 1FH
 Number of front end re-steers due to BPU misprediction.
 .It Li L2_TRANS.DEMAND_DATA_RD
 .Pq Event F0H , Umask 01H
 Demand Data Read requests that access L2 cache.
 .It Li L2_TRANS.RFO
 .Pq Event F0H , Umask 02H
 RFO requests that access L2 cache.
 .It Li L2_TRANS.CODE_RD
 .Pq Event F0H , Umask 04H
 L2 cache accesses when fetching instructions.
 .It Li L2_TRANS.ALL_PF
 .Pq Event F0H , Umask 08H
 Any MLC or LLC HW prefetch accessing L2, including rejects.
 .It Li L2_TRANS.L1D_WB
 .Pq Event F0H , Umask 10H
 L1D writebacks that access L2 cache.
 .It Li L2_TRANS.L2_FILL
 .Pq Event F0H , Umask 20H
 L2 fill requests that access L2 cache.
 .It Li L2_TRANS.L2_WB
 .Pq Event F0H , Umask 40H
 L2 writebacks that access L2 cache.
 .It Li L2_TRANS.ALL_REQUESTS
 .Pq Event F0H , Umask 80H
 Transactions accessing L2 pipe.
 .It Li L2_LINES_IN.I
 .Pq Event F1H , Umask 01H
 L2 cache lines in I state filling L2.
 Counting does not cover rejects.
 .It Li L2_LINES_IN.S
 .Pq Event F1H , Umask 02H
 L2 cache lines in S state filling L2.
 Counting does not cover rejects.
 .It Li L2_LINES_IN.E
 .Pq Event F1H , Umask 04H
 L2 cache lines in E state filling L2.
 Counting does not cover rejects.
 .It Li L2_LINES_IN.ALL
 .Pq Event F1H , Umask 07H
 L2 cache lines filling L2.
 Counting does not cover rejects.
 .It Li L2_LINES_OUT.DEMAND_CLEAN
 .Pq Event F2H , Umask 01H
 Clean L2 cache lines evicted by demand.
 .It Li L2_LINES_OUT.DEMAND_DIRTY
 .Pq Event F2H , Umask 02H
 Dirty L2 cache lines evicted by demand.
 .It Li L2_LINES_OUT.PF_CLEAN
 .Pq Event F2H , Umask 04H
 Clean L2 cache lines evicted by the MLC prefetcher.
 .It Li L2_LINES_OUT.PF_DIRTY
 .Pq Event F2H , Umask 08H
 Dirty L2 cache lines evicted by the MLC prefetcher.
 .It Li L2_LINES_OUT.DIRTY_ALL
 .Pq Event F2H , Umask 0AH
 Dirty L2 cache lines filling the L2.
 .El
 .Sh SEE ALSO
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.corei7 3 ,
 .Xr pmc.corei7uc 3 ,
 .Xr pmc.iaf 3 ,
 .Xr pmc.ivybridge 3 ,
-.Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.sandybridge 3 ,
 .Xr pmc.sandybridgeuc 3 ,
 .Xr pmc.sandybridgexeon 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
 .Xr pmc.ucf 3 ,
 .Xr pmc.westmere 3 ,
 .Xr pmc.westmereuc 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
 .Sh HISTORY
 The
 .Nm pmc
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
 .An -nosplit
 The
 .Lb libpmc
 library was written by
 .An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
 The support for the Ivy Bridge Xeon
 microarchitecture was written by
 .An Hiren Panchasara Aq Mt hiren.panchasara@gmail.com .
diff --git a/lib/libpmc/pmc.k7.3 b/lib/libpmc/pmc.k7.3
deleted file mode 100644
index 0c2c158cf956..000000000000
--- a/lib/libpmc/pmc.k7.3
+++ /dev/null
@@ -1,260 +0,0 @@
-.\" Copyright (c) 2003-2008 Joseph Koshy.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd October 4, 2008
-.Dt PMC.K7 3
-.Os
-.Sh NAME
-.Nm pmc.k7
-.Nd measurement events for
-.Tn AMD
-.Tn Athlon
-(K7 family) CPUs
-.Sh LIBRARY
-.Lb libpmc
-.Sh SYNOPSIS
-.In pmc.h
-.Sh DESCRIPTION
-AMD K7 PMCs are present in the
-.Tn "AMD Athlon"
-series of CPUs and are documented in:
-.Rs
-.%B "AMD Athlon Processor x86 Code Optimization Guide"
-.%N "Publication No. 22007"
-.%D "February 2002"
-.%Q "Advanced Micro Devices, Inc."
-.Re
-.Ss PMC Features
-AMD K7 PMCs are 48 bits wide.
-Each K7 CPU contains 4 PMCs with the following capabilities:
-.Bl -column "PMC_CAP_INTERRUPT" "Support"
-.It Em Capability Ta Em Support
-.It PMC_CAP_CASCADE Ta \&No
-.It PMC_CAP_EDGE Ta Yes
-.It PMC_CAP_INTERRUPT Ta Yes
-.It PMC_CAP_INVERT Ta Yes
-.It PMC_CAP_READ Ta Yes
-.It PMC_CAP_PRECISE Ta \&No
-.It PMC_CAP_SYSTEM Ta Yes
-.It PMC_CAP_TAGGING Ta \&No
-.It PMC_CAP_THRESHOLD Ta Yes
-.It PMC_CAP_USER Ta Yes
-.It PMC_CAP_WRITE Ta Yes
-.El
-.Ss Event Qualifiers
-Event specifiers for AMD K7 PMCs can have the following optional
-qualifiers:
-.Bl -tag -width indent
-.It Li count= Ns Ar value
-Configure the counter to increment only if the number of configured
-events measured in a cycle is greater than or equal to
-.Ar value .
-.It Li edge
-Configure the counter to only count negated-to-asserted transitions
-of the conditions expressed by the other qualifiers.
-In other words, the counter will increment only once whenever a given
-condition becomes true, irrespective of the number of clocks during
-which the condition remains true.
-.It Li inv
-Invert the sense of comparison when the
-.Dq Li count
-qualifier is present, making the counter to increment when the
-number of events per cycle is less than the value specified by
-the
-.Dq Li count
-qualifier.
-.It Li os
-Configure the PMC to count events happening at privilege level 0.
-.It Li unitmask= Ns Ar mask
-This qualifier is used to further qualify a select few events,
-.Dq Li k7-dc-refills-from-l2 ,
-.Dq Li k7-dc-refills-from-system
-and
-.Dq Li k7-dc-writebacks .
-Here
-.Ar mask
-is a string of the following characters optionally separated by
-.Ql +
-characters:
-.Pp
-.Bl -tag -width indent -compact
-.It Li m
-Count operations for lines in the
-.Dq Modified
-state.
-.It Li o
-Count operations for lines in the
-.Dq Owner
-state.
-.It Li e
-Count operations for lines in the
-.Dq Exclusive
-state.
-.It Li s
-Count operations for lines in the
-.Dq Shared
-state.
-.It Li i
-Count operations for lines in the
-.Dq Invalid
-state.
-.El
-.Pp
-If no
-.Dq Li unitmask
-qualifier is specified, the default is to count events for caches
-lines in any of the above states.
-.It Li usr
-Configure the PMC to count events occurring at privilege levels 1, 2
-or 3.
-.El
-.Pp
-If neither of the
-.Dq Li os
-or
-.Dq Li usr
-qualifiers were specified, the default is to enable both.
-.Ss AMD K7 Event Specifiers
-The event specifiers supported on AMD K7 PMCs are:
-.Bl -tag -width indent
-.It Li k7-dc-accesses
-.Pq Event 40H
-Count data cache accesses.
-.It Li k7-dc-misses
-.Pq Event 41H
-Count data cache misses.
-.It Li k7-dc-refills-from-l2 Op Li ,unitmask= Ns Ar mask
-.Pq Event 42H
-Count data cache refills from L2 cache.
-This event may be further qualified using the
-.Dq Li unitmask
-qualifier.
-.It Li k7-dc-refills-from-system Op Li ,unitmask= Ns Ar mask
-.Pq Event 43H
-Count data cache refills from system memory.
-This event may be further qualified using the
-.Dq Li unitmask
-qualifier.
-.It Li k7-dc-writebacks Op Li ,unitmask= Ns Ar mask
-.Pq Event 44H
-Count data cache writebacks.
-This event may be further qualified using the
-.Dq Li unitmask
-qualifier.
-.It Li k7-hardware-interrupts
-.Pq Event CFH
-Count the number of taken hardware interrupts.
-.It Li k7-ic-fetches
-.Pq Event 80H
-Count instruction cache fetches.
-.It Li k7-ic-misses
-.Pq Event 81H
-Count instruction cache misses.
-.It Li k7-interrupts-masked-cycles
-.Pq Event CDH
-Count the number of cycles when the processor's
-.Va IF
-flag was zero.
-.It Li k7-interrupts-masked-while-pending-cycles
-.Pq Event CEH
-Count the number of cycles interrupts were masked while pending due
-to the processor's
-.Va IF
-flag being zero.
-.It Li k7-l1-and-l2-dtlb-misses
-.Pq Event 46H
-Count L1 and L2 DTLB misses.
-.It Li k7-l1-dtlb-miss-and-l2-dtlb-hits
-.Pq Event 45H
-Count L1 DTLB misses and L2 DTLB hits.
-.It Li k7-l1-itlb-misses
-.Pq Event 84H
-Count L1 ITLB misses that are L2 ITLB hits.
-.It Li k7-l1-l2-itlb-misses
-.Pq Event 85H
-Count L1 (and L2) ITLB misses.
-.It Li k7-misaligned-references
-.Pq Event 47H
-Count misaligned data references.
-.It Li k7-retired-branches
-.Pq Event C2H
-Count all retired branches (conditional, unconditional, exceptions
-and interrupts).
-.It Li k7-retired-branches-mispredicted
-.Pq Event C3H
-Count all mispredicted retired branches.
-.It Li k7-retired-far-control-transfers
-.Pq Event C6H
-Count retired far control transfers.
-.It Li k7-retired-instructions
-.Pq Event C0H
-Count all retired instructions.
-.It Li k7-retired-ops
-.Pq Event C1H
-Count retired ops.
-.It Li k7-retired-resync-branches
-.Pq Event C7H
-Count retired resync branches (non control transfer branches).
-.It Li k7-retired-taken-branches
-.Pq Event C4H
-Count retired taken branches.
-.It Li k7-retired-taken-branches-mispredicted
-.Pq Event C5H
-Count mispredicted taken branches that were retired.
-.El
-.Ss Event Name Aliases
-The following table shows the mapping between the PMC-independent
-aliases supported by
-.Lb libpmc
-and the underlying hardware events used.
-.Bl -column "branch-mispredicts" "Description"
-.It Em Alias Ta Em Event
-.It Li branches Ta Li k7-retired-branches
-.It Li branch-mispredicts Ta Li k7-retired-branches-mispredicted
-.It Li dc-misses Ta Li k7-dc-misses
-.It Li ic-misses Ta Li k7-ic-misses
-.It Li instructions Ta Li k7-retired-instructions
-.It Li interrupts Ta Li k7-hardware-interrupts
-.It Li unhalted-cycles Ta (unsupported)
-.El
-.Sh SEE ALSO
-.Xr pmc 3 ,
-.Xr pmc.atom 3 ,
-.Xr pmc.core 3 ,
-.Xr pmc.core2 3 ,
-.Xr pmc.iaf 3 ,
-.Xr pmc.k8 3 ,
-.Xr pmc.soft 3 ,
-.Xr pmc.tsc 3 ,
-.Xr pmclog 3 ,
-.Xr hwpmc 4
-.Sh HISTORY
-The
-.Nm pmc
-library first appeared in
-.Fx 6.0 .
-.Sh AUTHORS
-The
-.Lb libpmc
-library was written by
-.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/lib/libpmc/pmc.k8.3 b/lib/libpmc/pmc.k8.3
index 96cc7f5ef058..29571aa1c097 100644
--- a/lib/libpmc/pmc.k8.3
+++ b/lib/libpmc/pmc.k8.3
@@ -1,793 +1,792 @@
 .\" Copyright (c) 2003-2008 Joseph Koshy.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .Dd October 4, 2008
 .Dt PMC.K8 3
 .Os
 .Sh NAME
 .Nm pmc.k8
 .Nd measurement events for
 .Tn AMD
 .Tn Athlon 64
 (K8 family) CPUs
 .Sh LIBRARY
 .Lb libpmc
 .Sh SYNOPSIS
 .In pmc.h
 .Sh DESCRIPTION
 AMD K8 PMCs are present in the
 .Tn "AMD Athlon64"
 and
 .Tn "AMD Opteron"
 series of CPUs.
 They are documented in the
 .Rs
 .%B "BIOS and Kernel Developer's Guide for the AMD Athlon(tm) 64 and AMD Opteron Processors"
 .%N "Publication No. 26094"
 .%D "April 2004"
 .%Q "Advanced Micro Devices, Inc."
 .Re
 .Ss PMC Features
 AMD K8 PMCs are 48 bits wide.
 Each CPU contains 4 PMCs with the following capabilities:
 .Bl -column "PMC_CAP_INTERRUPT" "Support"
 .It Em Capability Ta Em Support
 .It PMC_CAP_CASCADE Ta \&No
 .It PMC_CAP_EDGE Ta Yes
 .It PMC_CAP_INTERRUPT Ta Yes
 .It PMC_CAP_INVERT Ta Yes
 .It PMC_CAP_READ Ta Yes
 .It PMC_CAP_PRECISE Ta \&No
 .It PMC_CAP_SYSTEM Ta Yes
 .It PMC_CAP_TAGGING Ta \&No
 .It PMC_CAP_THRESHOLD Ta Yes
 .It PMC_CAP_USER Ta Yes
 .It PMC_CAP_WRITE Ta Yes
 .El
 .Ss Event Qualifiers
 Event specifiers for AMD K8 PMCs can have the following optional
 qualifiers:
 .Bl -tag -width indent
 .It Li count= Ns Ar value
 Configure the counter to increment only if the number of configured
 events measured in a cycle is greater than or equal to
 .Ar value .
 .It Li edge
 Configure the counter to only count negated-to-asserted transitions
 of the conditions expressed by the other fields.
 In other words, the counter will increment only once whenever a given
 condition becomes true, irrespective of the number of clocks during
 which the condition remains true.
 .It Li inv
 Invert the sense of comparison when the
 .Dq Li count
 qualifier is present, making the counter to increment when the
 number of events per cycle is less than the value specified by
 the
 .Dq Li count
 qualifier.
 .It Li mask= Ns Ar qualifier
 Many event specifiers for AMD K8 PMCs need to be additionally
 qualified using a mask qualifier.
 These additional qualifiers are event-specific and are documented
 along with their associated event specifiers below.
 .It Li os
 Configure the PMC to count events happening at privilege level 0.
 .It Li usr
 Configure the PMC to count events occurring at privilege levels 1, 2
 or 3.
 .El
 .Pp
 If neither of the
 .Dq Li os
 or
 .Dq Li usr
 qualifiers were specified, the default is to enable both.
 .Ss AMD K8 Event Specifiers
 The event specifiers supported on AMD K8 PMCs are:
 .Bl -tag -width indent
 .It Li k8-bu-cpu-clk-unhalted
 .Pq Event 76H
 Count the number of clock cycles when the CPU is not in the HLT or
 STPCLK states.
 .It Li k8-bu-fill-request-l2-miss Op Li ,mask= Ns Ar qualifier
 .Pq Event 7EH
 Count fill requests that missed in the L2 cache.
 This event may be further qualified using
 .Ar qualifier ,
 which is a
 .Ql +
 separated set of the following keywords:
 .Pp
 .Bl -tag -width indent -compact
 .It Li dc-fill
 Count data cache fill requests.
 .It Li ic-fill
 Count instruction cache fill requests.
 .It Li tlb-reload
 Count TLB reloads.
 .El
 .Pp
 The default is to count all types of requests.
 .It Li k8-bu-fill-into-l2 Op Li ,mask= Ns Ar qualifier
 .Pq Event 7FH
 The number of lines written to and from the L2 cache.
 The event may be further qualified by using
 .Ar qualifier ,
 which is a
 .Ql +
 separated set of the following keywords:
 .Pp
 .Bl -tag -width indent -compact
 .It Li dirty-l2-victim
 Count lines written into L2 cache due to victim writebacks from the
 Icache or Dcache, TLB page table walks or hardware data prefetches.
 .It Li victim-from-l2
 Count writebacks of dirty lines from L2 to the system.
 .El
 .It Li k8-bu-internal-l2-request Op Li ,mask= Ns Ar qualifier
 .Pq Event 7DH
 Count internally generated requests to the L2 cache.
 This event may be further qualified using
 .Ar qualifier ,
 which is a
 .Ql +
 separated set of the following keywords:
 .Pp
 .Bl -tag -width indent -compact
 .It Li cancelled
 Count cancelled requests.
 .It Li dc-fill
 Count data cache fill requests.
 .It Li ic-fill
 Count instruction cache fill requests.
 .It Li tag-snoop
 Count tag snoop requests.
 .It Li tlb-reload
 Count TLB reloads.
 .El
 .Pp
 The default is to count all types of requests.
 .It Li k8-dc-access
 .Pq Event 40H
 Count data cache accesses including microcode scratch pad accesses.
 .It Li k8-dc-copyback Op Li ,mask= Ns Ar qualifier
 .Pq Event 44H
 Count data cache copyback operations.
 This event may be further qualified using
 .Ar qualifier ,
 which is a
 .Ql +
 separated set of the following keywords:
 .Pp
 .Bl -tag -width indent -compact
 .It Li exclusive
 Count operations for lines in the
 .Dq exclusive
 state.
 .It Li invalid
 Count operations for lines in the
 .Dq invalid
 state.
 .It Li modified
 Count operations for lines in the
 .Dq modified
 state.
 .It Li owner
 Count operations for lines in the
 .Dq owner
 state.
 .It Li shared
 Count operations for lines in the
 .Dq shared
 state.
 .El
 .Pp
 The default is to count operations for lines in all the
 above states.
 .It Li k8-dc-dcache-accesses-by-locks Op Li ,mask= Ns Ar qualifier
 .Pq Event 4CH
 Count data cache accesses by lock instructions.
 This event is only available on processors of revision C or later
 vintage.
 This event may be further qualified using
 .Ar qualifier ,
 which is a
 .Ql +
 separated set of the following keywords:
 .Pp
 .Bl -tag -width indent -compact
 .It Li accesses
 Count data cache accesses by lock instructions.
 .It Li misses
 Count data cache misses by lock instructions.
 .El
 .Pp
 The default is to count all accesses.
 .It Li k8-dc-dispatched-prefetch-instructions Op Li ,mask= Ns Ar qualifier
 .Pq Event 4BH
 Count the number of dispatched prefetch instructions.
 This event may be further qualified using
 .Ar qualifier ,
 which is a
 .Ql +
 separated set of the following keywords:
 .Pp
 .Bl -tag -width indent -compact
 .It Li load
 Count load operations.
 .It Li nta
 Count non-temporal operations.
 .It Li store
 Count store operations.
 .El
 .Pp
 The default is to count all operations.
 .It Li k8-dc-l1-dtlb-miss-and-l2-dtlb-hit
 .Pq Event 45H
 Count L1 DTLB misses that are L2 DTLB hits.
 .It Li k8-dc-l1-dtlb-miss-and-l2-dtlb-miss
 .Pq Event 46H
 Count L1 DTLB misses that are also misses in the L2 DTLB.
 .It Li k8-dc-microarchitectural-early-cancel-of-an-access
 .Pq Event 49H
 Count microarchitectural early cancels of data cache accesses.
 .It Li k8-dc-microarchitectural-late-cancel-of-an-access
 .Pq Event 48H
 Count microarchitectural late cancels of data cache accesses.
 .It Li k8-dc-misaligned-data-reference
 .Pq Event 47H
 Count misaligned data references.
 .It Li k8-dc-miss
 .Pq Event 41H
 Count data cache misses.
 .It Li k8-dc-one-bit-ecc-error Op Li ,mask= Ns Ar qualifier
 .Pq Event 4AH
 Count one bit ECC errors found by the scrubber.
 This event may be further qualified using
 .Ar qualifier ,
 which is a
 .Ql +
 separated set of the following keywords:
 .Pp
 .Bl -tag -width indent -compact
 .It Li scrubber
 Count scrubber detected errors.
 .It Li piggyback
 Count piggyback scrubber errors.
 .El
 .Pp
 The default is to count both kinds of errors.
 .It Li k8-dc-refill-from-l2 Op Li ,mask= Ns Ar qualifier
 .Pq Event 42H
 Count data cache refills from L2 cache.
 This event may be further qualified using
 .Ar qualifier ,
 which is a
 .Ql +
 separated set of the following keywords:
 .Pp
 .Bl -tag -width indent -compact
 .It Li exclusive
 Count operations for lines in the
 .Dq exclusive
 state.
 .It Li invalid
 Count operations for lines in the
 .Dq invalid
 state.
 .It Li modified
 Count operations for lines in the
 .Dq modified
 state.
 .It Li owner
 Count operations for lines in the
 .Dq owner
 state.
 .It Li shared
 Count operations for lines in the
 .Dq shared
 state.
 .El
 .Pp
 The default is to count operations for lines in all the
 above states.
 .It Li k8-dc-refill-from-system Op Li ,mask= Ns Ar qualifier
 .Pq Event 43H
 Count data cache refills from system memory.
 This event may be further qualified using
 .Ar qualifier ,
 which is a
 .Ql +
 separated set of the following keywords:
 .Pp
 .Bl -tag -width indent -compact
 .It Li exclusive
 Count operations for lines in the
 .Dq exclusive
 state.
 .It Li invalid
 Count operations for lines in the
 .Dq invalid
 state.
 .It Li modified
 Count operations for lines in the
 .Dq modified
 state.
 .It Li owner
 Count operations for lines in the
 .Dq owner
 state.
 .It Li shared
 Count operations for lines in the
 .Dq shared
 state.
 .El
 .Pp
 The default is to count operations for lines in all the
 above states.
 .It Li k8-fp-cycles-with-no-fpu-ops-retired
 .Pq Event 01H
 Count cycles when no FPU ops were retired.
 This event is supported in revision B and later CPUs.
 .It Li k8-fp-dispatched-fpu-fast-flag-ops
 .Pq Event 02H
 Count dispatched FPU ops that use the fast flag interface.
 This event is supported in revision B and later CPUs.
 .It Li k8-fp-dispatched-fpu-ops Op Li ,mask= Ns Ar qualifier
 .Pq Event 00H
 Count the number of dispatched FPU ops.
 This event is supported in revision B and later CPUs.
 This event may be further qualified using
 .Ar qualifier ,
 which is a
 .Ql +
 separated set of the following keywords:
 .Pp
 .Bl -tag -width indent -compact
 .It Li add-pipe-excluding-junk-ops
 Count add pipe ops excluding junk ops.
 .It Li add-pipe-junk-ops
 Count junk ops in the add pipe.
 .It Li multiply-pipe-excluding-junk-ops
 Count multiply pipe ops excluding junk ops.
 .It Li multiply-pipe-junk-ops
 Count junk ops in the multiply pipe.
 .It Li store-pipe-excluding-junk-ops
 Count store pipe ops excluding junk ops
 .It Li store-pipe-junk-ops
 Count junk ops in the store pipe.
 .El
 .Pp
 The default is to count all types of ops.
 .It Li k8-fr-decoder-empty
 .Pq Event D0H
 Count cycles when there was nothing to dispatch (i.e., the decoder
 was empty).
 .It Li k8-fr-dispatch-stall-for-segment-load
 .Pq Event D4H
 Count dispatch stalls for segment loads.
 .It Li k8-fr-dispatch-stall-for-serialization
 .Pq Event D3H
 Count dispatch stalls for serialization.
 .It Li k8-fr-dispatch-stall-from-branch-abort-to-retire
 .Pq Event D2H
 Count dispatch stalls from branch abort to retiral.
 .It Li k8-fr-dispatch-stall-when-fpu-is-full
 .Pq Event D7H
 Count dispatch stalls when the FPU is full.
 .It Li k8-fr-dispatch-stall-when-ls-is-full
 .Pq Event D8H
 Count dispatch stalls when the load/store unit is full.
 .It Li k8-fr-dispatch-stall-when-reorder-buffer-is-full
 .Pq Event D5H
 Count dispatch stalls when the reorder buffer is full.
 .It Li k8-fr-dispatch-stall-when-reservation-stations-are-full
 .Pq Event D6H
 Count dispatch stalls when reservation stations are full.
 .It Li k8-fr-dispatch-stall-when-waiting-far-xfer-or-resync-branch-pending
 .Pq Event DAH
 Count dispatch stalls when a far control transfer or a resync branch
 is pending.
 .It Li k8-fr-dispatch-stall-when-waiting-for-all-to-be-quiet
 .Pq Event D9H
 Count dispatch stalls when waiting for all to be quiet.
 .\" XXX What does "waiting for all to be quiet" mean?
 .It Li k8-fr-dispatch-stalls
 .Pq Event D1H
 Count all dispatch stalls.
 .It Li k8-fr-fpu-exceptions Op Li ,mask= Ns Ar qualifier
 .Pq Event DBH
 Count FPU exceptions.
 This event is supported in revision B and later CPUs.
 This event may be further qualified using
 .Ar qualifier ,
 which is a
 .Ql +
 separated set of the following keywords:
 .Pp
 .Bl -tag -width indent -compact
 .It Li sse-and-x87-microtraps
 Count SSE and x87 microtraps.
 .It Li sse-reclass-microfaults
 Count SSE reclass microfaults
 .It Li sse-retype-microfaults
 Count SSE retype microfaults
 .It Li x87-reclass-microfaults
 Count x87 reclass microfaults.
 .El
 .Pp
 The default is to count all types of exceptions.
 .It Li k8-fr-interrupts-masked-cycles
 .Pq Event CDH
 Count cycles when interrupts were masked (by CPU RFLAGS field IF was zero).
 .It Li k8-fr-interrupts-masked-while-pending-cycles
 .Pq Event CEH
 Count cycles while interrupts were masked while pending (i.e., cycles
 when INTR was asserted while CPU RFLAGS field IF was zero).
 .It Li k8-fr-number-of-breakpoints-for-dr0
 .Pq Event DCH
 Count the number of breakpoints for DR0.
 .It Li k8-fr-number-of-breakpoints-for-dr1
 .Pq Event DDH
 Count the number of breakpoints for DR1.
 .It Li k8-fr-number-of-breakpoints-for-dr2
 .Pq Event DEH
 Count the number of breakpoints for DR2.
 .It Li k8-fr-number-of-breakpoints-for-dr3
 .Pq Event DFH
 Count the number of breakpoints for DR3.
 .It Li k8-fr-retired-branches
 .Pq Event C2H
 Count retired branches including exceptions and interrupts.
 .It Li k8-fr-retired-branches-mispredicted
 .Pq Event C3H
 Count mispredicted retired branches.
 .It Li k8-fr-retired-far-control-transfers
 .Pq Event C6H
 Count retired far control transfers (which are always mispredicted).
 .It Li k8-fr-retired-fastpath-double-op-instructions Op Li ,mask= Ns Ar qualifier
 .Pq Event CCH
 Count retired fastpath double op instructions.
 This event is supported in revision B and later CPUs.
 This event may be further qualified using
 .Ar qualifier ,
 which is a
 .Ql +
 separated set of the following keywords:
 .Pp
 .Bl -tag -width indent -compact
 .It Li low-op-pos-0
 Count instructions with the low op in position 0.
 .It Li low-op-pos-1
 Count instructions with the low op in position 1.
 .It Li low-op-pos-2
 Count instructions with the low op in position 2.
 .El
 .Pp
 The default is to count all types of instructions.
 .It Li k8-fr-retired-fpu-instructions Op Li ,mask= Ns Ar qualifier
 .Pq Event CBH
 Count retired FPU instructions.
 This event is supported in revision B and later CPUs.
 This event may be further qualified using
 .Ar qualifier ,
 which is a
 .Ql +
 separated set of the following keywords:
 .Pp
 .Bl -tag -width indent -compact
 .It Li mmx-3dnow
 Count MMX and 3DNow!\& instructions.
 .It Li packed-sse-sse2
 Count packed SSE and SSE2 instructions.
 .It Li scalar-sse-sse2
 Count scalar SSE and SSE2 instructions
 .It Li x87
 Count x87 instructions.
 .El
 .Pp
 The default is to count all types of instructions.
 .It Li k8-fr-retired-near-returns
 .Pq Event C8H
 Count retired near returns.
 .It Li k8-fr-retired-near-returns-mispredicted
 .Pq Event C9H
 Count mispredicted near returns.
 .It Li k8-fr-retired-resyncs
 .Pq Event C7H
 Count retired resyncs (non-control transfer branches).
 .It Li k8-fr-retired-taken-branches
 .Pq Event C4H
 Count retired taken branches.
 .It Li k8-fr-retired-taken-branches-mispredicted
 .Pq Event C5H
 Count retired taken branches that were mispredicted.
 .It Li k8-fr-retired-taken-branches-mispredicted-by-addr-miscompare
 .Pq Event CAH
 Count retired taken branches that were mispredicted only due to an
 address miscompare.
 .It Li k8-fr-retired-taken-hardware-interrupts
 .Pq Event CFH
 Count retired taken hardware interrupts.
 .It Li k8-fr-retired-uops
 .Pq Event C1H
 Count retired uops.
 .It Li k8-fr-retired-x86-instructions
 .Pq Event C0H
 Count retired x86 instructions including exceptions and interrupts.
 .It Li k8-ic-fetch
 .Pq Event 80H
 Count instruction cache fetches.
 .It Li k8-ic-instruction-fetch-stall
 .Pq Event 87H
 Count cycles in stalls due to instruction fetch.
 .It Li k8-ic-l1-itlb-miss-and-l2-itlb-hit
 .Pq Event 84H
 Count L1 ITLB misses that are L2 ITLB hits.
 .It Li k8-ic-l1-itlb-miss-and-l2-itlb-miss
 .Pq Event 85H
 Count ITLB misses that miss in both L1 and L2 ITLBs.
 .It Li k8-ic-microarchitectural-resync-by-snoop
 .Pq Event 86H
 Count microarchitectural resyncs caused by snoops.
 .It Li k8-ic-miss
 .Pq Event 81H
 Count instruction cache misses.
 .It Li k8-ic-refill-from-l2
 .Pq Event 82H
 Count instruction cache refills from L2 cache.
 .It Li k8-ic-refill-from-system
 .Pq Event 83H
 Count instruction cache refills from system memory.
 .It Li k8-ic-return-stack-hits
 .Pq Event 88H
 Count hits to the return stack.
 .It Li k8-ic-return-stack-overflow
 .Pq Event 89H
 Count overflows of the return stack.
 .It Li k8-ls-buffer2-full
 .Pq Event 23H
 Count load/store buffer2 full events.
 .It Li k8-ls-locked-operation Op Li ,mask= Ns Ar qualifier
 .Pq Event 24H
 Count locked operations.
 For revision C and later CPUs, the following qualifiers are supported:
 .Pp
 .Bl -tag -width indent -compact
 .It Li cycles-in-request
 Count the number of cycles in the lock request/grant stage.
 .It Li cycles-to-complete
 Count the number of cycles a lock takes to complete once it is
 non-speculative and is the older load/store operation.
 .It Li locked-instructions
 Count the number of lock instructions executed.
 .El
 .Pp
 The default is to count the number of lock instructions executed.
 .It Li k8-ls-microarchitectural-late-cancel
 .Pq Event 25H
 Count microarchitectural late cancels of operations in the load/store
 unit.
 .It Li k8-ls-microarchitectural-resync-by-self-modifying-code
 .Pq Event 21H
 Count microarchitectural resyncs caused by self-modifying code.
 .It Li k8-ls-microarchitectural-resync-by-snoop
 .Pq Event 22H
 Count microarchitectural resyncs caused by snoops.
 .It Li k8-ls-retired-cflush-instructions
 .Pq Event 26H
 Count retired CFLUSH instructions.
 .It Li k8-ls-retired-cpuid-instructions
 .Pq Event 27H
 Count retired CPUID instructions.
 .It Li k8-ls-segment-register-load Op Li ,mask= Ns Ar qualifier
 .Pq Event 20H
 Count segment register loads.
 This event may be further qualified using
 .Ar qualifier ,
 which is a
 .Ql +
 separated set of the following keywords:
 .Bl -tag -width indent -compact
 .It Li cs
 Count CS register loads.
 .It Li ds
 Count DS register loads.
 .It Li es
 Count ES register loads.
 .It Li fs
 Count FS register loads.
 .It Li gs
 Count GS register loads.
 .\" .It Li hs
 .\" Count HS register loads.
 .\" XXX "HS" register?
 .It Li ss
 Count SS register loads.
 .El
 .Pp
 The default is to count all types of loads.
 .It Li k8-nb-ht-bus0-bandwidth Op Li ,mask= Ns Ar qualifier
 .It Li k8-nb-ht-bus1-bandwidth Op Li ,mask= Ns Ar qualifier
 .It Li k8-nb-ht-bus2-bandwidth Op Li ,mask= Ns Ar qualifier
 .Pq Events F6H, F7H and F8H respectively
 Count events on the HyperTransport(tm) buses.
 These events may be further qualified using
 .Ar qualifier ,
 which is a
 .Ql +
 separated set of the following keywords:
 .Pp
 .Bl -tag -width indent -compact
 .It Li buffer-release
 Count buffer release messages sent.
 .It Li command
 Count command messages sent.
 .It Li data
 Count data messages sent.
 .It Li nop
 Count nop messages sent.
 .El
 .Pp
 The default is to count all types of messages.
 .It Li k8-nb-memory-controller-bypass-saturation Op Li ,mask= Ns Ar qualifier
 .Pq Event E4H
 Count memory controller bypass counter saturation events.
 This event may be further qualified using
 .Ar qualifier ,
 which is a
 .Ql +
 separated set of the following keywords:
 .Pp
 .Bl -tag -width indent -compact
 .It Li dram-controller-interface-bypass
 Count DRAM controller interface bypass.
 .It Li dram-controller-queue-bypass
 Count DRAM controller queue bypass.
 .It Li memory-controller-hi-pri-bypass
 Count memory controller high priority bypasses.
 .It Li memory-controller-lo-pri-bypass
 Count memory controller low priority bypasses.
 .El
 .It Li k8-nb-memory-controller-dram-slots-missed
 .Pq Event E2H
 Count memory controller DRAM command slots missed (in MemClks).
 .It Li k8-nb-memory-controller-page-access-event Op Li ,mask= Ns Ar qualifier
 .Pq Event E0H
 Count memory controller page access events.
 This event may be further qualified using
 .Ar qualifier ,
 which is a
 .Ql +
 separated set of the following keywords:
 .Pp
 .Bl -tag -width indent -compact
 .It Li page-conflict
 Count page conflicts.
 .It Li page-hit
 Count page hits.
 .It Li page-miss
 Count page misses.
 .El
 .Pp
 The default is to count all types of events.
 .It Li k8-nb-memory-controller-page-table-overflow
 .Pq Event E1H
 Count memory control page table overflow events.
 .It Li k8-nb-memory-controller-turnaround Op Li ,mask= Ns Ar qualifier
 .Pq Event E3H
 Count memory control turnaround events.
 This event may be further qualified using
 .Ar qualifier ,
 which is a
 .Ql +
 separated set of the following keywords:
 .Pp
 .Bl -tag -width indent -compact
 .\" XXX doc is unclear whether these are cycle counts or event counts
 .It Li dimm-turnaround
 Count DIMM turnarounds.
 .It Li read-to-write-turnaround
 Count read to write turnarounds.
 .It Li write-to-read-turnaround
 Count write to read turnarounds.
 .El
 .Pp
 The default is to count all types of events.
 .It Li k8-nb-probe-result Op Li ,mask= Ns Ar qualifier
 .Pq Event ECH
 Count probe events.
 This event may be further qualified using
 .Ar qualifier ,
 which is a
 .Ql +
 separated set of the following keywords:
 .Pp
 .Bl -tag -width indent -compact
 .It Li probe-hit
 Count all probe hits.
 .It Li probe-hit-dirty-no-memory-cancel
 Count probe hits without memory cancels.
 .It Li probe-hit-dirty-with-memory-cancel
 Count probe hits with memory cancels.
 .It Li probe-miss
 Count probe misses.
 .El
 .It Li k8-nb-sized-commands Op Li ,mask= Ns Ar qualifier
 .Pq Event EBH
 Count sized commands issued.
 This event may be further qualified using
 .Ar qualifier ,
 which is a
 .Ql +
 separated set of the following keywords:
 .Pp
 .Bl -tag -width indent -compact
 .It Li nonpostwrszbyte
 .It Li nonpostwrszdword
 .It Li postwrszbyte
 .It Li postwrszdword
 .It Li rdszbyte
 .It Li rdszdword
 .It Li rdmodwr
 .El
 .Pp
 The default is to count all types of commands.
 .El
 .Ss Event Name Aliases
 The following table shows the mapping between the PMC-independent
 aliases supported by
 .Lb libpmc
 and the underlying hardware events used.
 .Bl -column "branch-mispredicts" "Description"
 .It Em Alias Ta Em Event
 .It Li branches Ta Li k8-fr-retired-taken-branches
 .It Li branch-mispredicts Ta Li k8-fr-retired-taken-branches-mispredicted
 .It Li dc-misses Ta Li k8-dc-miss
 .It Li ic-misses Ta Li k8-ic-miss
 .It Li instructions Ta Li k8-fr-retired-x86-instructions
 .It Li interrupts Ta Li k8-fr-taken-hardware-interrupts
 .It Li unhalted-cycles Ta Li k8-bu-cpu-clk-unhalted
 .El
 .Sh SEE ALSO
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.core2 3 ,
 .Xr pmc.iaf 3 ,
-.Xr pmc.k7 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
 .Sh HISTORY
 The
 .Nm pmc
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
 The
 .Lb libpmc
 library was written by
 .An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/lib/libpmc/pmc.sandybridge.3 b/lib/libpmc/pmc.sandybridge.3
index 4f5b6c779efa..5672cfbcd958 100644
--- a/lib/libpmc/pmc.sandybridge.3
+++ b/lib/libpmc/pmc.sandybridge.3
@@ -1,937 +1,936 @@
 .\" Copyright (c) 2012 Davide Italiano <davide@FreeBSD.org>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .Dd October 19, 2012
 .Dt PMC.SANDYBRIDGE 3
 .Os
 .Sh NAME
 .Nm pmc.sandybridge
 .Nd measurement events for
 .Tn Intel
 .Tn Sandy Bridge
 family CPUs
 .Sh LIBRARY
 .Lb libpmc
 .Sh SYNOPSIS
 .In pmc.h
 .Sh DESCRIPTION
 .Tn Intel
 .Tn "Sandy Bridge"
 CPUs contain PMCs conforming to the version 3 of the
 .Tn Intel
 performance measurement architecture.
 These CPUs may contain up to three classes of PMCs:
 .Bl -tag -width "Li PMC_CLASS_IAP"
 .It Li PMC_CLASS_IAF
 Fixed-function counters that count only one hardware event per counter.
 .It Li PMC_CLASS_IAP
 Programmable counters that may be configured to count one of a defined
 set of hardware events.
 .It Li PMC_CLASS_TSC
 These PMCs are documented in
 .Xr pmc.tsc 3 .
 .El
 .Pp
 The number of PMCs available in each class and their widths need to be
 determined at run time by calling
 .Xr pmc_cpuinfo 3 .
 .Pp
 Intel Sandy Bridge PMCs are documented in
 .Rs
 .%B "Intel(R) 64 and IA-32 Architectures Software Developers Manual"
 .%T "Volume 3B: System Programming Guide, Part 2"
 .%N "Order Number: 253669-039US"
 .%D May 2011
 .%Q "Intel Corporation"
 .Re
 .Ss SANDY BRIDGE FIXED FUNCTION PMCS
 These PMCs and their supported events are documented in
 .Xr pmc.iaf 3 .
 .Ss SANDY BRIDGE PROGRAMMABLE PMCS
 The programmable PMCs support the following capabilities:
 .Bl -column "PMC_CAP_INTERRUPT" "Support"
 .It Em Capability Ta Em Support
 .It PMC_CAP_CASCADE Ta \&No
 .It PMC_CAP_EDGE Ta Yes
 .It PMC_CAP_INTERRUPT Ta Yes
 .It PMC_CAP_INVERT Ta Yes
 .It PMC_CAP_READ Ta Yes
 .It PMC_CAP_PRECISE Ta \&No
 .It PMC_CAP_SYSTEM Ta Yes
 .It PMC_CAP_TAGGING Ta \&No
 .It PMC_CAP_THRESHOLD Ta Yes
 .It PMC_CAP_USER Ta Yes
 .It PMC_CAP_WRITE Ta Yes
 .El
 .Ss Event Qualifiers
 Event specifiers for these PMCs support the following common
 qualifiers:
 .Bl -tag -width indent
 .It Li rsp= Ns Ar value
 Configure the Off-core Response bits.
 .Bl -tag -width indent
 .It Li REQ_DMND_DATA_RD
 Counts the number of demand and DCU prefetch data reads of full and partial
 cachelines as well as demand data page table entry cacheline reads.
 Does not count L2 data read prefetches or instruction fetches.
 .It Li REQ_DMND_RFO
 Counts the number of demand and DCU prefetch reads for ownership (RFO)
 requests generated by a write to data cacheline.
 Does not count L2 RFO prefetches.
 .It Li REQ_DMND_IFETCH
 Counts the number of demand and DCU prefetch instruction cacheline reads.
 Does not count L2 code read prefetches.
 .It Li REQ_WB
 Counts the number of writeback (modified to exclusive) transactions.
 .It Li REQ_PF_DATA_RD
 Counts the number of data cacheline reads generated by L2 prefetchers.
 .It Li REQ_PF_RFO
 Counts the number of RFO requests generated by L2 prefetchers.
 .It Li REQ_PF_IFETCH
 Counts the number of code reads generated by L2 prefetchers.
 .It Li REQ_PF_LLC_DATA_RD
 L2 prefetcher to L3 for loads.
 .It Li REQ_PF_LLC_RFO
 RFO requests generated by L2 prefetcher
 .It Li REQ_PF_LLC_IFETCH
 L2 prefetcher to L3 for instruction fetches.
 .It Li REQ_BUS_LOCKS
 Bus lock and split lock requests.
 .It Li REQ_STRM_ST
 Streaming store requests.
 .It Li REQ_OTHER
 Any other request that crosses IDI, including I/O.
 .It Li RES_ANY
 Catch all value for any response types.
 .It Li RES_SUPPLIER_NO_SUPP
 No Supplier Information available.
 .It Li RES_SUPPLIER_LLC_HITM
 M-state initial lookup stat in L3.
 .It Li RES_SUPPLIER_LLC_HITE
 E-state.
 .It Li RES_SUPPLIER_LLC_HITS
 S-state.
 .It Li RES_SUPPLIER_LLC_HITF
 F-state.
 .It Li RES_SUPPLIER_LOCAL
 Local DRAM Controller.
 .It Li RES_SNOOP_SNP_NONE
 No details on snoop-related information.
 .It Li RES_SNOOP_SNP_NO_NEEDED
 No snoop was needed to satisfy the request.
 .It Li RES_SNOOP_SNP_MISS
 A snoop was needed and it missed all snooped caches:
 -For LLC Hit, ReslHitl was returned by all cores
 -For LLC Miss, Rspl was returned by all sockets and data was returned from
 DRAM.
 .It Li RES_SNOOP_HIT_NO_FWD
 A snoop was needed and it hits in at least one snooped cache.
 Hit denotes a cache-line was valid before snoop effect.
 This includes:
 -Snoop Hit w/ Invalidation (LLC Hit, RFO)
 -Snoop Hit, Left Shared (LLC Hit/Miss, IFetch/Data_RD)
 -Snoop Hit w/ Invalidation and No Forward (LLC Miss, RFO Hit S)
 In the LLC Miss case, data is returned from DRAM.
 .It Li RES_SNOOP_HIT_FWD
 A snoop was needed and data was forwarded from a remote socket.
 This includes:
 -Snoop Forward Clean, Left Shared (LLC Hit/Miss, IFetch/Data_RD/RFT).
 .It Li RES_SNOOP_HITM
 A snoop was needed and it HitM-ed in local or remote cache.
 HitM denotes a cache-line was in modified state before effect as a results of snoop.
 This includes:
 -Snoop HitM w/ WB (LLC miss, IFetch/Data_RD)
 -Snoop Forward Modified w/ Invalidation (LLC Hit/Miss, RFO)
 -Snoop MtoS (LLC Hit, IFetch/Data_RD).
 .It Li RES_NON_DRAM
 Target was non-DRAM system address.
 This includes MMIO transactions.
 .El
 .It Li cmask= Ns Ar value
 Configure the PMC to increment only if the number of configured
 events measured in a cycle is greater than or equal to
 .Ar value .
 .It Li edge
 Configure the PMC to count the number of de-asserted to asserted
 transitions of the conditions expressed by the other qualifiers.
 If specified, the counter will increment only once whenever a
 condition becomes true, irrespective of the number of clocks during
 which the condition remains true.
 .It Li inv
 Invert the sense of comparison when the
 .Dq Li cmask
 qualifier is present, making the counter increment when the number of
 events per cycle is less than the value specified by the
 .Dq Li cmask
 qualifier.
 .It Li os
 Configure the PMC to count events happening at processor privilege
 level 0.
 .It Li usr
 Configure the PMC to count events occurring at privilege levels 1, 2
 or 3.
 .El
 .Pp
 If neither of the
 .Dq Li os
 or
 .Dq Li usr
 qualifiers are specified, the default is to enable both.
 .Ss Event Specifiers (Programmable PMCs)
 Sandy Bridge programmable PMCs support the following events:
 .Bl -tag -width indent
 .It Li LD_BLOCKS.DATA_UNKNOWN
 .Pq Event 03H, Umask 01H
 Blocked loads due to store buffer blocks with unknown data.
 .It Li LD_BLOCKS.STORE_FORWARD
 .Pq Event 03H, Umask 02H
 Loads blocked by overlapping with store buffer that cannot be forwarded.
 .It Li LD_BLOCKS.NO_SR
 .Pq Event 03H, Umask 08H
 # of Split loads blocked due to resource not available.
 .It Li LD_BLOCKS.ALL_BLOCK
 .Pq Event 03H, Umask 10H
 Number of cases where any load is blocked but has no DCU miss.
 .It Li  MISALIGN_MEM_REF.LOADS
 .Pq Event 05H, Umask  01H
 Speculative cache-line split load uops dispatched to L1D.
 .It Li MISALIGN_MEM_REF.STORES
 .Pq Event 05H, Umask  02H
 Speculative cache-line split Store-address uops dispatched to L1D.
 .It Li LD_BLOCKS_PARTIAL.ADDRESS_ALIAS
 .Pq Event 07H, Umask  01H
 False dependencies in MOB due to partial compare on address.
 .It Li LD_BLOCKS_PARTIAL.ALL_STA_BLOCK
 .Pq Event 07H, Umask 08H
 The number of times that load operations are temporarily blocked because of
 older stores, with addresses that are not yet known.
 A load operation may incur more than one block of this type.
 .It LI DTLB_LOAD_MISSES.MISS_CAUSES_A_WALK
 .Pq Event 08H, Umask 01H
 Misses in all TLB levels that cause a page walk of any page size.
 .It Li DTLB_LOAD_MISSES.WALK_COMPLETED
 .Pq Event 08H, Umask 02H
 Misses in all TLB levels that caused page walk completed of any size.
 .It Li DTLB_LOAD_MISSES.WALK_DURATION
 .Pq Event 08H, Umask 04H
 Cycle PMH is busy with a walk.
 .It Li DTLB_LOAD_MISSES.STLB_HIT
 .Pq Event 08H, Umask 10H
 Number of cache load STLB hits.
 No page walk.
 .It Li INT_MISC.RECOVERY_CYCLES
 .Pq Event 0DH, Umask 03H
 Cycles waiting to recover after Machine Clears or JEClear.
 Set Cmask = 1.
 Set Edge to count occurrences
 .It Li INT_MISC.RAT_STALL_CYCLES
 .Pq Event 0DH, Umask 40H
 Cycles RAT external stall is sent to IDQ for this thread.
 .It Li UOPS_ISSUED.ANY
 .Pq Event 0EH, Umask 01H
 Increments each cycle the # of Uops issued by the RAT to RS.
 Set Cmask = 1, Inv = 1, Any= 1 to count stalled cycles of this core.
 Set Cmask = 1, Inv = 1 to count stalled cycles
 .It Li FP_COMP_OPS_EXE.X87
 .Pq Event 10H, Umask 01H
 Counts number of X87 uops executed.
 .It Li FP_COMP_OPS_EXE.SSE_FP_PACKED_DOUBLE
 .Pq Event 10H, Umask 10H
 Counts number of SSE* double precision FP packed uops executed.
 .It Li FP_COMP_OPS_EXE.SSE_FP_SCALAR_SINGLE
 .Pq Event 10H, Umask 20H
 Counts number of SSE* single precision FP scalar uops executed.
 .It Li FP_COMP_OPS_EXE.SSE_PACKED_SINGLE
 .Pq Event 10H, Umask 40H
 Counts number of SSE* single precision FP packed uops executed.
 .It LiFP_COMP_OPS_EXE.SSE_SCALAR_DOUBLE
 .Pq Event 10H, Umask 80H
 Counts number of SSE* double precision FP scalar uops executed.
 .It Li SIMD_FP_256.PACKED_SINGLE
 .Pq Event 11H, Umask 01H
 Counts 256-bit packed single-precision floating-point instructions.
 .It Li SIMD_FP_256.PACKED_DOUBLE
 .Pq Event 11H, Umask 02H
 Counts 256-bit packed double-precision floating-point instructions.
 .It Li ARITH.FPU_DIV_ACTIVE
 .Pq Event 14H, Umask 01H
 Cycles that the divider is active, includes INT and FP.
 Set 'edge =1, cmask=1' to count the number of divides.
 .It Li INSTS_WRITTEN_TO_IQ.INSTS
 .Pq Event 17H, Umask 01H
 Counts the number of instructions written into the IQ every cycle.
 .It Li L2_RQSTS.DEMAND_DATA_RD_HIT
 .Pq Event 24H, Umask 01H
 Demand Data Read requests that hit L2 cache.
 .It Li L2_RQSTS.ALL_DEMAND_DATA_RD
 .Pq Event 24H, Umask 03H
 Counts any demand and L1 HW prefetch data load requests to L2.
 .It Li L2_RQSTS.RFO_HITS
 .Pq Event 24H, Umask 04H
 Counts the number of store RFO requests that hit the L2 cache.
 .It Li L2_RQSTS.RFO_MISS
 .Pq Event 24H, Umask 08H
 Counts the number of store RFO requests that miss the L2 cache.
 .It Li L2_RQSTS.ALL_RFO
 .Pq Event 24H, Umask 0CH
 Counts all L2 store RFO requests.
 .It Li L2_RQSTS.CODE_RD_HIT
 .Pq Event 24H, Umask 10H
 Number of instruction fetches that hit the L2 cache.
 .It Li L2_RQSTS.CODE_RD_MISS
 .Pq Event 24H, Umask 20H
 Number of instruction fetches that missed the L2 cache.
 .It Li L2_RQSTS.ALL_CODE_RD
 .Pq Event 24H, Umask 30H
 Counts all L2 code requests.
 .It Li L2_RQSTS.PF_HIT
 .Pq Event 24H, Umask 40H
 Requests from L2 Hardware prefetcher that hit L2.
 .It Li L2_RQSTS.PF_MISS
 .Pq Event 24H, Umask 80H
 Requests from L2 Hardware prefetcher that missed L2.
 .It Li L2_RQSTS.ALL_PF
 .Pq Event 24H, Umask C0H
 Any requests from L2 Hardware prefetchers.
 .It Li L2_STORE_LOCK_RQSTS.MISS
 .Pq Event 27H, Umask 01H
 RFOs that miss cache lines.
 .It Li L2_STORE_LOCK_RQSTS.HIT_E
 .Pq Event 27H, Umask 04H
 RFOs that hit cache lines in E state.
 .It Li L2_STORE_LOCK_RQSTS.HIT_M
 .Pq Event 27H, Umask 08H
 RFOs that hit cache lines in M state.
 .It Li L2_STORE_LOCK_RQSTS.ALL
 .Pq Event 27H, Umask 0FH
 RFOs that access cache lines in any state.
 .It Li L2_L1D_WB_RQSTS.HIT_E
 .Pq Event 28H, Umask 04H
 Not rejected writebacks from L1D to L2 cache lines in E state.
 .It Li L2_L1D_WB_RQSTS.HIT_M
 .Pq Event 28H, Umask 08H
 Not rejected writebacks from L1D to L2 cache lines in M state.
 .It Li LONGEST_LAT_CACHE.REFERENCE
 .Pq Event 2EH, Umask 4FH
 This event counts requests originating from the core that reference a cache
 line in the last level cache.
 .It Li LONGEST_LAT_CACHE.MISS
 .Pq Event 2EH, Umask 41H
 This event counts each cache miss condition for references to the last level
 cache.
 .It Li CPU_CLK_UNHALTED.THREAD_P
 .Pq Event 3CH, Umask 00H
 Counts the number of thread cycles while the thread is not in a halt state.
 The thread enters the halt state when it is running the HLT instruction.
 The core frequency may change from time to time due to power or thermal
 throttling.
 .It Li CPU_CLK_THREAD_UNHALTED.REF_XCLK
 .Pq Event 3CH, Umask 01H
 Increments at the frequency of XCLK (100 MHz) when not halted.
 .It Li L1D_PEND_MISS.PENDING
 .Pq Event 48H, Umask 01H
 Increments the number of outstanding L1D misses every cycle.
 Set Cmask = 1 and Edge =1  to count occurrences.
 Counter 2 only; Set Cmask = 1 to count cycles.
 .It Li DTLB_STORE_MISSES.MISS_CAUSES_A_WALK
 .Pq Event 49H, Umask 01H Miss in all TLB levels causes an page walk of any
 page size (4K/2M/4M/1G).
 .It Li DTLB_STORE_MISSES.WALK_COMPLETED
 .Pq Event 49H, Umask 02H
 Miss in all TLB levels causes a page walk that completes of any page size
 (4K/2M/4M/1G).
 .It Li DTLB_STORE_MISSES.WALK_DURATION
 .Pq Event 49H, Umask 04H
 Cycles PMH is busy with this walk.
 .It Li DTLB_STORE_MISSES.STLB_HIT
 .Pq Event 49H, Umask 10H
 Store operations that miss the first TLB level but hit the second and do not
 cause page walks.
 .It Li LOAD_HIT_PRE.SW_PF
 .Pq Event 4CH, Umask 01H
 Not SW-prefetch load dispatches that hit fill buffer allocated for S/W prefetch.
 .It Li LOAD_HIT_PER.HW_PF
 .Pq Event 4CH, Umask 02H
 Not SW-prefetch load dispatches that hit fill buffer allocated for H/W prefetch.
 .It Li HW_PRE_REQ.DL1_MISS
 .Pq Event 4EH, Umask 02H
 Hardware Prefetch requests that miss the L1D cache.
 A request is being counted each time it access the cache & miss it, including
 if a block is applicable or if hit the Fill Buffer for example.
 This accounts for both L1 streamer and IP-based (IPP) HW prefetchers.
 .It Li L1D.REPLACEMENT
 .Pq Event 51H, Umask 01H
 Counts the number of lines brought into the L1 data cache.
 .It Li L1D.ALLOCATED_IN_M
 .Pq Event 51H, Umask 02H
 Counts the number of allocations of modified L1D cache lines.
 .It Li L1D.EVICTION
 .Pq Event 51H, Umask 04H
 Counts the number of modified lines evicted from the L1 data cache due to
 replacement.
 .It Li L1D.ALL_M_REPLACEMENT
 .Pq Event 51H, Umask 08H
 Cache lines in M state evicted out of L1D due to Snoop HitM or dirty line
 replacement.
 .It Li PARTIAL_RAT_STALLS.FLAGS_MERGE_UOP
 .Pq Event 59H, Umask 20H
 Increments the number of flags-merge uops in flight each cycle.
 Set Cmask = 1 to count cycles.
 .It Li PARTIAL_RAT_STALLS.SLOW_LEA_WINDOW
 .Pq Event 59H, Umask 40H
 Cycles with at least one slow LEA uop allocated.
 .It Li PARTIAL_RAT_STALLS.MUL_SINGLE_UOP
 .Pq Event 59H, Umask 80H
 Number of Multiply packed/scalar single precision uops allocated.
 .It Li RESOURCE_STALLS2.ALL_FL_EMPTY
 .Pq Event 5BH, Umask 0CH
 Cycles stalled due to free list empty.
 .It Li RESOURCE_STALLS2.ALL_PRF_CONTROL
 .Pq Event 5BH, Umask 0FH
 Cycles stalled due to control structures full for physical registers.
 .It Li RESOURCE_STALLS2.BOB_FULL
 .Pq Event 5BH, Umask 40H
 Cycles Allocator is stalled due to Branch Order Buffer.
 .It Li RESOURCE_STALLS2.OOO_RSRC
 .Pq Event 5BH, Umask 4FH
 Cycles stalled due to out of order resources full.
 .It Li CPL_CYCLES.RING0
 .Pq Event 5CH, Umask 01H
 Unhalted core cycles when the thread is in ring 0.
 Use Edge to count transition
 .It Li CPL_CYCLES.RING123
 .Pq Event 5CH, Umask 02H
 Unhalted core cycles when the thread is not in ring 0.
 .It Li RS_EVENTS.EMPTY_CYCLES
 .Pq Event 5EH, Umask 01H
 Cycles the RS is empty for the thread.
 .It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND_DATA_RD
 .Pq Event 60H, Umask 01H
 Offcore outstanding Demand Data Read transactions in SQ to uncore.
 Set Cmask=1 to count cycles.
 .It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND_RFO
 .Pq Event 60H, Umask 04H
 Offcore outstanding RFO store transactions in SQ to uncore.
 Set Cmask=1 to count cycles.
 .It Li OFFCORE_REQUESTS_OUTSTANDING.ALL_DATA_RD
 .Pq Event 60H, Umask 08H
 Offcore outstanding cacheable data read transactions in SQ to uncore.
 Set Cmask=1 to count cycles.
 .It Li LOCK_CYCLES.SPLIT_LOCK_UC_LOCK_DURATION
 .Pq Event 63H, Umask 01H
 Cycles in which the L1D and L2 are locked, due to a UC lock or split lock.
 .It Li LOCK_CYCLES.CACHE_LOCK_DURATION
 .Pq Event 63H, Umask 02H
 Cycles in which the L1D is locked.
 .It Li IDQ.EMPTY
 .Pq Event 79H, Umask 02H
 Counts cycles the IDQ is empty.
 .It Li IQD.MITE_UOPS
 .Pq Event 79H, Umask 04H
 Increment each cycle # of uops delivered to IDQ from MITE path.
 Set Cmask = 1 to count cycles.
 Can combine Umask 04H and 20H
 .It Li IDQ.DSB_UOPS
 .Pq Event 79H, Umask 08H
 Increment each cycle.
 # of uops delivered to IDQ from DSB path.
 Set Cmask = 1 to count cycles.
 Can combine Umask 08H and 10H
 .It Li IDQ.MS_DSB_UOPS
 .Pq Event 79H, Umask 10H
 Increment each cycle # of uops delivered to IDQ when MS busy by DSB.
 Set Cmask = 1 to count cycles MS is busy.
 Set Cmask=1 and Edge=1 to count MS activations.
 Can combine Umask 08H and 10H
 .It Li IDQ.MS_MITE_UOPS
 .Pq Event 79H, Umask 20H
 Increment each cycle # of uops delivered to IDQ when MS is busy by MITE.
 Set Cmask = 1 to count cycles.
 Can combine Umask 04H and 20H
 .It Li IDQ.MS_UOPS
 .Pq Event 79H, Umask 30H
 Increment each cycle # of uops delivered to IDQ from MS by either DSB or MITE.
 Set Cmask = 1 to count cycles.
 Can combine Umask 04H, 08H and 30H
 .It Li ICACHE.MISSES
 .Pq Event 80H, Umask 02H
 Number of Instruction Cache, Streaming Buffer and Victim Cache Misses.
 Includes UC accesses.
 .It Li ITLB_MISSES.MISS_CAUSES_A_WALK
 .Pq Event 85H, Umask 01H
 Misses in all ITLB levels that cause page walks.
 .It Li ITLB_MISSES.WALK_COMPLETED
 .Pq Event 85H, Umask 02H
 Misses in all ITLB levels that cause completed page walks.
 .It Li ITLB_MISSES.WALK_DURATION
 .Pq Event 85H, Umask 04H
 Cycle PMH is busy with a walk.
 .It Li ITLB_MISSES.STLB_HIT
 .Pq Event 85H, Umask 10H
 Number of cache load STLB hits.
 No page walk.
 .It Li ILD_STALL.LCP
 .Pq Event 87H, Umask 01H
 Stalls caused by changing prefix length of the instruction.
 .It Li ILD_STALL.IQ_FULL
 .Pq Event 87H, Umask 04H
 Stall cycles due to IQ is full.
 .It Li BR_INST_EXEC.NONTAKEN_COND
 .Pq Event 88H , Umask 41H
 Count conditional near branch instructions that were executed (but not
 necessarily retired) and not taken.
 .It Li BR_INST_EXEC.TAKEN_COND
 .Pq Event 88H , Umask 81H
 Count conditional near branch instructions that were executed (but not
 necessarily retired) and taken.
 .It Li BR_INST_EXEC.DIRECT_JMP
 .Pq Event 88H , Umask 82H
 Count all unconditional near branch instructions excluding calls and
 indirect branches.
 .It Li BR_INST_EXEC.INDIRECT_JMP_NON_CALL_RET
 .Pq Event 88H , Umask 84H
 Count executed indirect near branch instructions that are not calls nor
 returns.
 .It Li BR_INST_EXEC.RETURN_NEAR
 .Pq Event 88H , Umask 88H
 Count indirect near branches that have a return mnemonic.
 .It Li BR_INST_EXEC.DIRECT_NEAR_CALL
 .Pq Event 88H , Umask 90H
 Count unconditional near call branch instructions, excluding non call
 branch, executed.
 .It Li BR_INST_EXEC.INDIRECT_NEAR_CALL
 .Pq Event 88H , Umask A0H
 Count indirect near calls, including both register and memory indirect,
 executed.
 .It Li BR_INST_EXEC.ALL_BRANCHES
 .Pq Event 88H , Umask FFH
 Counts all near executed branches (not necessarily retired).
 .It Li BR_MISP_EXEC.NONTAKEN_COND
 .Pq Event 89H , Umask 41H
 Count conditional near branch instructions mispredicted as nontaken.
 .It Li BR_MISP_EXEC.TAKEN_COND
 .Pq Event 89H , Umask 81H
 Count conditional near branch instructions mispredicted as taken.
 .It Li BR_MISP_EXEC.INDIRECT_JMP_NON_CALL_RET
 .Pq Event 89H , Umask 84H
 Count mispredicted indirect near branch instructions that are not calls
 nor returns.
 .It Li BR_MISP_EXEC.RETURN_NEAR
 .Pq Event 89H , Umask 88H
 Count mispredicted indirect near branches that have a return mnemonic.
 .It Li BR_MISP_EXEC.DIRECT_NEAR_CALL
 .Pq Event 89H , Umask 90H
 Count mispredicted unconditional near call branch instructions, excluding
 non call branch, executed.
 .It Li BR_MISP_EXEC.INDIRECT_NEAR_CALL
 .Pq Event 89H , Umask A0H
 Count mispredicted indirect near calls, including both register and memory
 indirect, executed.
 .It Li BR_MISP_EXEC.ALL_BRANCHES
 .Pq Event 89H , Umask FFH
 Counts all mispredicted near executed branches (not necessarily retired).
 .It Li IDQ_UOPS_NOT_DELIVERED.CORE
 .Pq Event 9CH, Umask 01H
 Count number of non-delivered uops to RAT per thread.
 Use Cmask to qualify uop b/w
 .It Li UOPS_DISPATCHED_PORT.PORT_0
 .Pq Event A1H, Umask 01H
 Cycles which a Uop is dispatched on port 0.
 .It Li UOPS_DISPATCHED_PORT.PORT_1
 .Pq Event A1H, Umask 02H
 Cycles which a Uop is dispatched on port 1.
 .It Li UOPS_DISPATCHED_PORT.PORT_2_LD
 .Pq Event A1H, Umask 04H
 Cycles which a load uop is dispatched on port 2.
 .It Li UOPS_DISPATCHED_PORT.PORT_2_STA
 .Pq Event A1H, Umask 08H
 Cycles which a store address uop is dispatched on port 2.
 .It Li UOPS_DISPATCHED_PORT.PORT_2
 .Pq Event A1H, Umask 0CH
 Cycles which a Uop is dispatched on port 2.
 .It Li UOPS_DISPATCHED_PORT.PORT_3_LD
 .Pq Event A1H, Umask 10H
 Cycles which a load uop is dispatched on port 3.
 .It Li UOPS_DISPATCHED_PORT.PORT_3_STA
 .Pq Event A1H, Umask 20H
 Cycles which a store address uop is dispatched on port 3.
 .It Li UOPS_DISPATCHED_PORT.PORT_3
 .Pq Event A1H, Umask 30H
 .Pq Cycles which a Uop is dispatched on port 3.
 .It Li UOPS_DISPATCHED_PORT.PORT_4
 .Pq Event A1H, Umask 40H
 Cycles which a Uop is dispatched on port 4.
 .It Li UOPS_DISPATCHED_PORT.PORT_5
 .Pq Event A1H, Umask 80H
 Cycles which a Uop is dispatched on port 5.
 .It Li RESOURCE_STALLS.ANY
 .Pq Event A2H, Umask 01H
 Cycles Allocation is stalled due to Resource Related reason.
 .It Li RESOURCE_STALLS.LB
 .Pq Event A2H, Umask 02H
 Counts the cycles of stall due to lack of load buffers.
 .It Li RESOURCE_STALLS.LB
 .Pq Event A2H, Umask 04H
 Cycles stalled due to no eligible RS entry available.
 .It Li RESOURCE_STALLS.SB
 .Pq Event A2H, Umask 08H
 Cycles stalled due to no store buffers available.
 (not including draining form sync)
 .It Li RESOURCE_STALLS.ROB
 .Pq Event A2H, Umask 10H
 Cycles stalled due to re-order buffer full.
 .It Li RESOURCE_STALLS.FCSW
 .Pq Event A2H, Umask 20H
 Cycles stalled due to writing the FPU control word.
 .It Li RESOURCE_STALLS.MXCSR
 .Pq Event A2H, Umask 40H
 Cycles stalled due to the MXCSR register rename occurring to close to a previous
 MXCSR rename.
 .It Li RESOURCE_STALLS.OTHER
 .Pq Event A2H, Umask 80H
 Cycles stalled while execution was stalled due to other resource issues.
 .It Li DSB2MITE_SWITCHES.COUNT
 .Pq Event ABH, Umask 01H
 Number of DSB to MITE switches.
 .It Li DSB2MITE_SWITCHES.PENALTY_CYCLES
 .Pq Event ABH, Umask 02H
 Cycles DSB to MITE switches caused delay.
 .It Li DSB_FILL.OTHER_CANCEL
 .Pq Event ACH, Umask 02H
 Cases of cancelling valid DSB fill not because of exceeding way limit.
 .It Li DSB_FILL.EXCEED_DSB_LINES
 .Pq Event ACH, Umask 08H
 DSB Fill encountered > 3 DSB lines.
 .It Li DSB_FILL.ALL_CANCEL
 .Pq Event ACH, Umask 0AH
 Cases of cancelling valid Decode Stream Buffer (DSB) fill not because of exceeding
 way limit.
 .It Li ITLB.ITLB_FLUSH
 .Pq Event AEH, Umask 01H
 Counts the number of ITLB flushes, includes 4k/2M/4M pages.
 .It Li OFFCORE_REQUESTS.DEMAND_DATA_RD
 .Pq Event B0H, Umask 01H
 Demand data read requests sent to uncore.
 .It Li OFFCORE_REQUESTS.DEMAND_RFO
 .Pq Event B0H, Umask 04H
 Demand RFO read requests sent to uncore, including regular RFOs, locks, ItoM.
 .It Li OFFCORE_REQUESTS.ALL_DATA_RD
 .Pq Event B0H, Umask 08H
 Data read requests sent to uncore (demand and prefetch).
 .It Li UOPS_DISPATCHED.THREAD
 .Pq Event B1H, Umask 01H
 Counts total number of uops to be dispatched per-thread each cycle.
 Set Cmask = 1, INV =1 to count stall cycles.
 .It Li UOPS_DISPATCHED.CORE
 .Pq Event B1H, Umask 02H
 Counts total number of uops to be dispatched per-core each cycle.
 Do not need to set ANY
 .It Li OFFCORE_REQUESTS_BUFFER.SQ_FULL
 .Pq Event B2H, Umask 01H
 Offcore requests buffer cannot take more entries for this thread core.
 .It Li AGU_BYPASS_CANCEL.COUNT
 .Pq Event B6H, Umask 01H
 Counts executed load operations with all the following traits: 1. addressing
 of the format [base + offset], 2. the offset is between 1 and 2047, 3. the
 address specified in the base register is in one page and the address
 [base+offset] is in another page.
 .It Li OFF_CORE_RESPONSE_0
 .Pq Event B7H, Umask 01H
 Off-core Response Performance Monitoring; PMC0 only.
 Requires programming MSR 01A6H
 .It Li OFF_CORE_RESPONSE_1
 .Pq Event BBH, Umask 01H
 Off-core Response Performance Monitoring.
 PMC3 only.
 Requires programming MSR 01A7H
 .It Li TLB_FLUSH.DTLB_THREAD
 .Pq Event BDH, Umask 01H
 DTLB flush attempts of the thread-specific entries.
 .It Li TLB_FLUSH.STLB_ANY
 .Pq Event BDH, Umask 20H
 Count number of STLB flush attempts.
 .It Li L1D_BLOCKS.BANK_CONFLICT_CYCLES
 .Pq Event BFH, Umask 05H
 Cycles when dispatched loads are cancelled due to L1D bank conflicts with other
 load ports.
 cmask=1
 .It Li INST_RETIRED.ANY_P
 .Pq Event C0H, Umask 00H
 Number of instructions at retirement.
 .It Li INST_RETIRED.PREC_DIST
 .Pq Event C0H, Umask 01H
 Precise instruction retired event with HW to reduce effect of PEBS shadow in IP
 distribution PMC1 only; Must quiesce other PMCs.
 .It Li INST_RETIRED.X87
 .Pq Event C0H, Umask 02H
 X87 instruction retired event.
 .It Li OTHER_ASSISTS.ITLB_MISS_RETIRED
 .Pq Event C1H, Umask 02H
 Instructions that experienced an ITLB miss.
 .It Li OTHER_ASSISTS.AVX_STORE
 .Pq Event C1H, Umask 08H
 Number of assists associated with 256-bit AVX store operations.
 .It Li OTHER_ASSISTS.AVX_TO_SSE
 .Pq Event C1H, Umask 10H
 Number of transitions from AVX256 to legacy SSE when penalty applicable.
 .It Li OTHER_ASSISTS.SSE_TO_AVX
 .Pq Event C1H, Umask 20H
 Number of transitions from SSE to AVX-256 when penalty applicable.
 .It Li UOPS_RETIRED.ALL
 .Pq Event C2H, Umask 01H
 Counts the number of micro-ops retired.
 Use cmask=1 and invert to count active cycles or stalled cycles.
 .It Li UOPS_RETIRED.RETIRE_SLOTS
 .Pq Event C2H, Umask 02H
 Counts the number of retirement slots used each cycle.
 .It Li MACHINE_CLEARS.MEMORY_ORDERING
 .Pq Event C3H, Umask 02H
 Counts the number of machine clears due to memory order conflicts.
 .It Li MACHINE_CLEARS.SMC
 .Pq Event C3H, Umask 04H
 Counts the number of times that a program writes to a code section.
 .It Li MACHINE_CLEARS.MASKMOV
 .Pq Event C3H, Umask 20H
 Counts the number of executed AVX masked load operations that refer to an
 illegal address range with the mask bits set to 0.
 .It Li BR_INST_RETIRED.ALL_BRANCH
 .Pq Event C4H, Umask 00H
 Branch instructions at retirement.
 .It Li BR_INST_RETIRED.CONDITIONAL
 .Pq Event C4H, Umask 01H
 Counts the number of conditional branch instructions retired.
 .It Li BR_INST_RETIRED.NEAR_CALL
 .Pq Event C4H, Umask 02H
 Direct and indirect near call instructions retired.
 .It Li BR_INST_RETIRED.ALL_BRANCHES
 .Pq Event C4H, Umask 04H
 Counts the number of branch instructions retired.
 .It Li BR_INST_RETIRED.NEAR_RETURN
 .Pq Event C4H, Umask 08H
 Counts the number of near return instructions retired.
 .It Li BR_INST_RETIRED.NOT_TAKEN
 .Pq Event C4H, Umask 10H
 Counts the number of not taken branch instructions retired.
 .It Li BR_INST_RETIRED.NEAR_TAKEN
 .Pq Event C4H, Umask 20H
 Number of near taken branches retired.
 .It Li BR_INST_RETIRED.FAR_BRANCH
 .Pq Event C4H, Umask 40H
 Number of far branches retired.
 .It Li BR_MISP_RETIRED.ALL_BRANCHES
 .Pq Event C5H, Umask 00H
 Mispredicted branch instructions at retirement.
 .It Li BR_MISP_RETIRED.CONDITIONAL
 .Pq Event C5H, Umask 01H
 Mispredicted conditional branch instructions retired.
 .It Li BR_MISP_RETIRED.NEAR_CALL
 .Pq Event C5H, Umask 02H
 Direct and indirect mispredicted near call instructions retired.
 .It Li BR_MISP_RETIRED.ALL_BRANCH
 .Pq Event C5H, Umask 04H
 Mispredicted macro branch instructions retired.
 .It Li BR_MISP_RETIRED.NOT_TAKEN
 .Pq Event C5H, Umask 10H
 Mispredicted not taken branch instructions retired.
 .It Li BR_MISP_RETIRED.TAKEN
 .Pq Event C5H, Umask 20H
 Mispredicted taken branch instructions retired.
 .It Li FP_ASSIST.X87_OUTPUT
 .Pq Event CAH, Umask 02H
 Number of X87 assists due to output value.
 .It Li FP_ASSIST.X87_INPUT
 .Pq Event CAH, Umask 04H
 Number of X87 assists due to input value.
 .It Li FP_ASSIST.SIMD_OUTPUT
 .Pq Event CAH, Umask 08H
 Number of SIMD FP assists due to Output values.
 .It Li FP_ASSIST.SIMD_INPUT
 .Pq Event CAH, Umask 10H
 Number of SIMD FP assists due to input values.
 .It Li FP_ASSIST.ANY
 .Pq Event CAH, Umask 1EH
 Cycles with any input/output SSE* or FP assists.
 .It Li ROB_MISC_EVENTS.LBR_INSERTS
 .Pq Event CCH, Umask 20H
 Count cases of saving new LBR records by hardware.
 .It Li MEM_TRANS_RETIRED.LOAD_LATENCY
 .Pq Event CDH, Umask 01H
 Sample loads with specified latency threshold.
 PMC3 only.
 Specify threshold in MSR 0x3F6.
 .It Li MEM_TRANS_RETIRED.PRECISE_STORE
 .Pq Event CDH, Umask 02H
 Sample stores and collect precise store operation via PEBS record.
 PMC3 only.
 .It Li MEM_UOP_RETIRED.LOADS
 .Pq Event D0H, Umask 01H
 Qualify retired memory uops that are loads.
 Combine with umask 10H, 20H, 40H, 80H.
 .It Li MEM_UOP_RETIRED.STORES
 .Pq Event D0H, Umask 02H
 Qualify retired memory uops that are stores.
 Combine with umask 10H, 20H, 40H, 80H.
 .It Li MEM_UOP_RETIRED.STLB_MISS
 .Pq Event D0H, Umask 10H
 Qualify retired memory uops with STLB miss.
 Must combine with umask 01H, 02H, to produce counts.
 .It Li MEM_UOP_RETIRED.LOCK
 .Pq Event D0H, Umask 20H
 Qualify retired memory uops with lock.
 Must combine with umask 01H, 02H, to produce counts.
 .It Li MEM_UOP_RETIRED.SPLIT
 .Pq Event D0H, Umask 40H
 Qualify retired memory uops with line split.
 Must combine with umask 01H, 02H, to produce counts.
 .It Li MEM_UOP_RETIRED_ALL
 .Pq Event D0H, Umask 80H
 Qualify any retired memory uops.
 Must combine with umask 01H, 02H, to produce counts.
 .It Li MEM_LOAD_UOPS_RETIRED.L1_HIT
 .Pq Event D1H, Umask 01H
 Retired load uops with L1 cache hits as data sources.
 Must combine with umask 01H, 02H, to produce counts.
 .It Li MEM_LOAD_UOPS_RETIRED.L2_HIT
 .Pq Event D1H, Umask 02H
 Retired load uops with L2 cache hits as data sources.
 .It Li MEM_LOAD_UOPS_RETIRED.LLC_HIT
 .Pq Event D1H, Umask 04H
 Retired load uops which data sources were data hits in LLC without snoops
 required.
 .It Li MEM_LOAD_UOPS_RETIRED.HIT_LFB
 .Pq Event D1H, Umask 40H
 Retired load uops which data sources were load uops missed L1 but hit FB due
 to preceding miss to the same cache line with data not ready.
 .It Li MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_MISS
 .Pq Event D2H, Umask 01H
 Retired load uops which data sources were LLC hit and cross-core snoop missed in
 on-pkg core cache.
 .It Li MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HIT
 .Pq Event D2H, Umask 02H
 Retired load uops which data sources were LLC and cross-core snoop hits in
 on-pkg core cache.
 .It Li MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HITM
 .Pq Event D2H, Umask 04H
 Retired load uops which data sources were HitM responses from shared LLC.
 .It Li MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_NONE
 .Pq Event D2H, Umask 08H
 Retired load uops which data sources were hits in LLC without snoops required.
 .It Li MEM_LOAD_UOPS_LLC_HIT_RETIRED.LLC_MISS
 .Pq Event D4H, Umask 02H
 Retired load uops with unknown information as data source in cache serviced the load.
 .It Li L2_TRANS.DEMAND_DATA_RD
 .Pq Event F0H, Umask 01H
 Demand Data Read requests that access L2 cache.
 .It Li L2_TRANS.RF0
 .Pq Event F0H, Umask 02H
 RFO requests that access L2 cache.
 .It Li L2_TRANS.CODE_RD
 .Pq Event F0H, Umask 04H
 L2 cache accesses when fetching instructions.
 .It Li L2_TRANS.ALL_PF
 .Pq Event F0H, Umask 08H
 L2 or LLC HW prefetches that access L2 cache.
 .It Li L2_TRANS.L1D_WB
 .Pq Event F0H, Umask 10H
 L1D writebacks that access L2 cache.
 .It Li L2_TRANS.L2_FILL
 .Pq Event F0H, Umask 20H
 L2 fill requests that access L2 cache.
 .It Li L2_TRANS.L2_WB
 .Pq Event F0H, Umask 40H
 L2 writebacks that access L2 cache.
 .It Li L2_TRANS.ALL_REQUESTS
 .Pq Event F0H, Umask 80H
 Transactions accessing L2 pipe.
 .It Li L2_LINES_IN.I
 .Pq Event F1H, Umask 01H
 L2 cache lines in I state filling L2.
 Counting does not cover rejects.
 .It Li L2_LINES_IN.S
 .Pq Event F1H, Umask 02H
 L2 cache lines in S state filling L2.
 Counting does not cover rejects.
 .It Li L2_LINES_IN.E
 .Pq Event F1H, Umask 04H
 L2 cache lines in E state filling L2.
 Counting does not cover rejects.
 .It Li L2_LINES-IN.ALL
 .Pq Event F1H, Umask 07H
 L2 cache lines filling L2.
 Counting does not cover rejects.
 .It Li L2_LINES_OUT.DEMAND_CLEAN
 .Pq Event F2H, Umask 01H
 Clean L2 cache lines evicted by demand.
 .It Li L2_LINES_OUT.DEMAND_DIRTY
 .Pq Event F2H, Umask 02H
 Dirty L2 cache lines evicted by demand.
 .It Li L2_LINES_OUT.PF_CLEAN
 .Pq Event F2H, Umask 04H
 Clean L2 cache lines evicted by L2 prefetch.
 .It Li L2_LINES_OUT.PF_DIRTY
 .Pq Event F2H, Umask 08H
 Dirty L2 cache lines evicted by L2 prefetch.
 .It Li L2_LINES_OUT.DIRTY_ALL
 .Pq Event F2H, Umask 0AH
 Dirty L2 cache lines filling the L2.
 Counting does not cover rejects.
 .It Li SQ_MISC.SPLIT_LOCK
 .Pq Event F4H, Umask 10H
 Split locks in SQ.
 .El
 .Sh SEE ALSO
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.corei7 3 ,
 .Xr pmc.corei7uc 3 ,
 .Xr pmc.iaf 3 ,
 .Xr pmc.ivybridge 3 ,
 .Xr pmc.ivybridgexeon 3 ,
-.Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.sandybridgeuc 3 ,
 .Xr pmc.sandybridgexeon 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
 .Xr pmc.ucf 3 ,
 .Xr pmc.westmere 3 ,
 .Xr pmc.westmereuc 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
 .Sh HISTORY
 The
 .Nm pmc
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
 .An -nosplit
 The
 .Lb libpmc
 library was written by
 .An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
 The support for the Sandy Bridge
 microarchitecture was written by
 .An Davide Italiano Aq Mt davide@FreeBSD.org .
diff --git a/lib/libpmc/pmc.sandybridgeuc.3 b/lib/libpmc/pmc.sandybridgeuc.3
index 072794bca757..080c9f31ffee 100644
--- a/lib/libpmc/pmc.sandybridgeuc.3
+++ b/lib/libpmc/pmc.sandybridgeuc.3
@@ -1,228 +1,227 @@
 .\" Copyright (c) 2012 Davide Italiano <davide@FreeBSD.org>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .Dd October 19, 2012
 .Dt PMC.SANDYBRIDGEUC 3
 .Os
 .Sh NAME
 .Nm pmc.sandybridgeuc
 .Nd uncore measurement events for
 .Tn Intel
 .Tn Sandy Bridge
 family CPUs
 .Sh LIBRARY
 .Lb libpmc
 .Sh SYNOPSIS
 .In pmc.h
 .Sh DESCRIPTION
 .Tn Intel
 .Tn "Sandy Bridge"
 CPUs contain PMCs conforming to version 3 of the
 .Tn Intel
 performance measurement architecture.
 These CPUs contain two classes of PMCs:
 .Bl -tag -width "Li PMC_CLASS_UCP"
 .It Li PMC_CLASS_UCF
 Fixed-function counters that count only one hardware event per counter.
 .It Li PMC_CLASS_UCP
 Programmable counters that may be configured to count one of a defined
 set of hardware events.
 .El
 .Pp
 The number of PMCs available in each class and their widths need to be
 determined at run time by calling
 .Xr pmc_cpuinfo 3 .
 .Pp
 Intel Sandy Bridge PMCs are documented in
 .Rs
 .%B "Intel(R) 64 and IA-32 Architectures Software Developers Manual"
 .%T "Volume 3B: System Programming Guide, Part 2"
 .%N "Order Number: 253669-039US"
 .%D May 2011
 .%Q "Intel Corporation"
 .Re
 .Ss SANDYBRIDGE UNCORE FIXED FUNCTION PMCS
 These PMCs and their supported events are documented in
 .Xr pmc.ucf 3 .
 Not all CPUs in this family implement fixed-function counters.
 .Ss SANDYBRIDGE UNCORE PROGRAMMABLE PMCS
 The programmable PMCs support the following capabilities:
 .Bl -column "PMC_CAP_INTERRUPT" "Support"
 .It Em Capability Ta Em Support
 .It PMC_CAP_CASCADE Ta \&No
 .It PMC_CAP_EDGE Ta Yes
 .It PMC_CAP_INTERRUPT Ta \&No
 .It PMC_CAP_INVERT Ta Yes
 .It PMC_CAP_READ Ta Yes
 .It PMC_CAP_PRECISE Ta \&No
 .It PMC_CAP_SYSTEM Ta \&No
 .It PMC_CAP_TAGGING Ta \&No
 .It PMC_CAP_THRESHOLD Ta Yes
 .It PMC_CAP_USER Ta \&No
 .It PMC_CAP_WRITE Ta Yes
 .El
 .Ss Event Qualifiers
 Event specifiers for these PMCs support the following common
 qualifiers:
 .Bl -tag -width indent
 .It Li cmask= Ns Ar value
 Configure the PMC to increment only if the number of configured
 events measured in a cycle is greater than or equal to
 .Ar value .
 .It Li edge
 Configure the PMC to count the number of de-asserted to asserted
 transitions of the conditions expressed by the other qualifiers.
 If specified, the counter will increment only once whenever a
 condition becomes true, irrespective of the number of clocks during
 which the condition remains true.
 .It Li inv
 Invert the sense of comparison when the
 .Dq Li cmask
 qualifier is present, making the counter increment when the number of
 events per cycle is less than the value specified by the
 .Dq Li cmask
 qualifier.
 .El
 .Ss Event Specifiers (Programmable PMCs)
 Sandy Bridge programmable PMCs support the following events:
 .Bl -tag -width indent
 .It Li CBO_XSNP_RESPONSE.RSPIHITI
 .Pq Event 22H, Umask 01H
 Snoop responses received from processor cores to requests initiated by this
 Cbox.
 Must combine with one of the umask values of 20H, 40H, 80H
 .It Li CBO_XSNP_RESPONSE.RSPIHITFSE
 .Pq Event 22H, Umask 02H
 Must combine with one of the umask values of 20H, 40H, 80H
 .It Li CBO_XSNP_RESPONSE.RSPSHITFSE
 .Pq Event 22H, Umask 04H
 Must combine with one of the umask values of 20H, 40H, 80H
 .It Li CBO_XSNP_RESPONSE.RSPSFWDM
 .Pq Event 22H, Umask 08H
 .It Li CBO_XSNP_RESPONSE.RSPIFWDM
 .Pq Event 22H, Umask 01H
 .It Li CBO_XSNP_RESPONSE.AND_EXTERNAL
 .Pq Event 22H, Umask 20H
 Filter on cross-core snoops resulted in external snoop request.
 Must combine with at least one of 01H, 02H, 04H, 08H, 10H
 .It Li CBO_XSNP_RESPONSE.AND_XCORE
 .Pq Event 22H, Umask 40H
 Filter on cross-core snoops resulted in core request.
 Must combine with at least one of 01H, 02H, 04H, 08H, 10H
 .It Li CBO_XSNP_RESPONSE.AND_XCORE
 .Pq Event 22H, Umask 80H
 Filter on cross-core snoops resulted in LLC evictions.
 Must combine with at least one of 01H, 02H, 04H, 08H, 10H
 .It Li CBO_CACHE_LOOKUP.M
 .Pq Event 34H, Umask 01H
 LLC lookup request that access cache and found line in M-state.
 Must combine with one of the umask values of 10H, 20H, 40H, 80H
 .It Li CBO_CACHE_LOOKUP.E
 .Pq Event 34H, Umask 02H
 LLC lookup request that access cache and found line in E-state.
 Must combine with one of the umask values of 10H, 20H, 40H, 80H
 .It Li CBO_CACHE_LOOKUP.S
 .Pq Event 34H, Umask 04H
 LLC lookup request that access cache and found line in S-state.
 Must combine with one of the umask values of 10H, 20H, 40H, 80H
 .It Li CBO_CACHE_LOOKUP.I
 .Pq Event 34H, Umask 08H
 LLC lookup request that access cache and found line in I-state.
 Must combine with one of the umask values of 10H, 20H, 40H, 80H
 .It Li CBO_CACHE_LOOKUP.AND_READ
 .Pq Event 34H, Umask 10H
 Filter on processor core initiated cacheable read requests.
 Must combine with at least one of 01H, 02H, 04H, 08H
 .It Li CBO_CACHE_LOOKUP_AND_READ2
 .Pq Event 34H, Umask 20H
 Filter on processor core initiated cacheable write requests.
 Must combine with at least one of 01H, 02H, 04H, 08H
 .It Li CBO_CACHE_LOOKUP.AND_EXTSNP
 .Pq Event 34H, Umask 40H
 Filter on external snoop requests.
 Must combine with at least one of 01H, 02H, 04H, 08H
 .It Li CBO_CACHE_LOOKUP.AND_ANY
 .Pq Event 34H, Umask 80H
 Filter on any IRQ or IPQ initiated requests including uncacheable,
 noncoherent requests.
 Must combine with at least one of 01H, 02H, 04H, 08H
 .It Li IMPH_CBO_TRK_OCCUPANCY.ALL
 .Pq Event 80H, Umask 01H
 Counts cycles weighted by the number of core-outgoing valid entries.
 Valid entries are between allocation to the first of IDIO or DRSO messages.
 Accounts for coherent and incoherent traffic.
 Counter 0 only
 .It Li IMPH_CBO_TRK_REQUEST.ALL
 .Pq Event 81H, Umask 01H
 Counts the number of core-outgoing entries.
 Accounts for coherent and incoherent traffic.
 .It Li IMPH_CBO_TRK_REQUEST.WRITES
 .Pq Event 81H, Umask 20H
 Counts the number of allocated write entries, include full, partial, and
 evictions.
 .It Li IMPH_CBO_TRK_REQUEST.EVICTIONS
 .Pq Event 81H, Umask 80H
 Counts the number of evictions allocated.
 .It Li IMPH_COH_TRK_OCCUPANCY.ALL
 .Pq Event 83H, Umask 01H
 Counts cycles weighted by the
 number of core-outgoing valid entries in the coherent tracker queue.
 Counter 0 only
 .It Li IMPH_COH_TRK_REQUEST.ALL
 .Pq Event 84H, Umask 01H
 Counts the number of core-outgoing entries in the coherent tracker queue.
 .El
 .Sh SEE ALSO
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.corei7 3 ,
 .Xr pmc.corei7uc 3 ,
 .Xr pmc.iaf 3 ,
-.Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.sandybridge 3 ,
 .Xr pmc.sandybridgexeon 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
 .Xr pmc.ucf 3 ,
 .Xr pmc.westmere 3 ,
 .Xr pmc.westmereuc 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
 .Sh HISTORY
 The
 .Nm pmc
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
 .An -nosplit
 The
 .Lb libpmc
 library was written by
 .An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
 The support for the Sandy Bridge
 microarchitecture was added by
 .An Davide Italiano Aq Mt davide@FreeBSD.org .
diff --git a/lib/libpmc/pmc.sandybridgexeon.3 b/lib/libpmc/pmc.sandybridgexeon.3
index f823537421f0..3d238bbad2de 100644
--- a/lib/libpmc/pmc.sandybridgexeon.3
+++ b/lib/libpmc/pmc.sandybridgexeon.3
@@ -1,1014 +1,1013 @@
 .\" Copyright (c) 2012 Hiren Panchasara <hiren.panchasara@gmail.com>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .Dd October 18, 2012
 .Dt PMC.SANDYBRIDGEXEON 3
 .Os
 .Sh NAME
 .Nm pmc.sandybridgexeon
 .Nd measurement events for
 .Tn Intel
 .Tn Sandy Bridge Xeon
 family CPUs
 .Sh LIBRARY
 .Lb libpmc
 .Sh SYNOPSIS
 .In pmc.h
 .Sh DESCRIPTION
 .Tn Intel
 .Tn "Sandy Bridge Xeon"
 CPUs contain PMCs conforming to version 2 of the
 .Tn Intel
 performance measurement architecture.
 These CPUs may contain up to two classes of PMCs:
 .Bl -tag -width "Li PMC_CLASS_IAP"
 .It Li PMC_CLASS_IAF
 Fixed-function counters that count only one hardware event per counter.
 .It Li PMC_CLASS_IAP
 Programmable counters that may be configured to count one of a defined
 set of hardware events.
 .El
 .Pp
 The number of PMCs available in each class and their widths need to be
 determined at run time by calling
 .Xr pmc_cpuinfo 3 .
 .Pp
 Intel Sandy Bridge Xeon PMCs are documented in
 .Rs
 .%B "Intel(R) 64 and IA-32 Architectures Software Developer's Manual"
 .%T "Volume 3B: System Programming Guide, Part 2"
 .%N "Order Number: 253669-043US"
 .%D August 2012
 .%Q "Intel Corporation"
 .Re
 .Ss SANDYBRIDGE XEON FIXED FUNCTION PMCS
 These PMCs and their supported events are documented in
 .Xr pmc.iaf 3 .
 .Ss SANDYBRIDGE XEON PROGRAMMABLE PMCS
 The programmable PMCs support the following capabilities:
 .Bl -column "PMC_CAP_INTERRUPT" "Support"
 .It Em Capability Ta Em Support
 .It PMC_CAP_CASCADE Ta \&No
 .It PMC_CAP_EDGE Ta Yes
 .It PMC_CAP_INTERRUPT Ta Yes
 .It PMC_CAP_INVERT Ta Yes
 .It PMC_CAP_READ Ta Yes
 .It PMC_CAP_PRECISE Ta \&No
 .It PMC_CAP_SYSTEM Ta Yes
 .It PMC_CAP_TAGGING Ta \&No
 .It PMC_CAP_THRESHOLD Ta Yes
 .It PMC_CAP_USER Ta Yes
 .It PMC_CAP_WRITE Ta Yes
 .El
 .Ss Event Qualifiers
 Event specifiers for these PMCs support the following common
 qualifiers:
 .Bl -tag -width indent
 .It Li rsp= Ns Ar value
 Configure the Off-core Response bits.
 .Bl -tag -width indent
 .It Li REQ_DMND_DATA_RD
 Counts the number of demand and DCU prefetch data reads of full and partial
 cachelines as well as demand data page table entry cacheline reads.
 Does not count L2 data read prefetches or instruction fetches.
 .It Li REQ_DMND_RFO
 Counts the number of demand and DCU prefetch reads for ownership (RFO)
 requests generated by a write to data cacheline.
 Does not count L2 RFO prefetches.
 .It Li REQ_DMND_IFETCH
 Counts the number of demand and DCU prefetch instruction cacheline reads.
 Does not count L2 code read prefetches.
 .It Li REQ_WB
 Counts the number of writeback (modified to exclusive) transactions.
 .It Li REQ_PF_DATA_RD
 Counts the number of data cacheline reads generated by L2 prefetchers.
 .It Li REQ_PF_RFO
 Counts the number of RFO requests generated by L2 prefetchers.
 .It Li REQ_PF_IFETCH
 Counts the number of code reads generated by L2 prefetchers.
 .It Li REQ_PF_LLC_DATA_RD
 L2 prefetcher to L3 for loads.
 .It Li REQ_PF_LLC_RFO
 RFO requests generated by L2 prefetcher
 .It Li REQ_PF_LLC_IFETCH
 L2 prefetcher to L3 for instruction fetches.
 .It Li REQ_BUS_LOCKS
 Bus lock and split lock requests.
 .It Li REQ_STRM_ST
 Streaming store requests.
 .It Li REQ_OTHER
 Any other request that crosses IDI, including I/O.
 .It Li RES_ANY
 Catch all value for any response types.
 .It Li RES_SUPPLIER_NO_SUPP
 No Supplier Information available.
 .It Li RES_SUPPLIER_LLC_HITM
 M-state initial lookup stat in L3.
 .It Li RES_SUPPLIER_LLC_HITE
 E-state.
 .It Li RES_SUPPLIER_LLC_HITS
 S-state.
 .It Li RES_SUPPLIER_LLC_HITF
 F-state.
 .It Li RES_SUPPLIER_LOCAL
 Local DRAM Controller.
 .It Li RES_SNOOP_SNP_NONE
 No details on snoop-related information.
 .It Li RES_SNOOP_SNP_NO_NEEDED
 No snoop was needed to satisfy the request.
 .It Li RES_SNOOP_SNP_MISS
 A snoop was needed and it missed all snooped caches:
 -For LLC Hit, ReslHitl was returned by all cores
 -For LLC Miss, Rspl was returned by all sockets and data was returned from
 DRAM.
 .It Li RES_SNOOP_HIT_NO_FWD
 A snoop was needed and it hits in at least one snooped cache.
 Hit denotes a cache-line was valid before snoop effect.
 This includes:
 -Snoop Hit w/ Invalidation (LLC Hit, RFO)
 -Snoop Hit, Left Shared (LLC Hit/Miss, IFetch/Data_RD)
 -Snoop Hit w/ Invalidation and No Forward (LLC Miss, RFO Hit S)
 In the LLC Miss case, data is returned from DRAM.
 .It Li RES_SNOOP_HIT_FWD
 A snoop was needed and data was forwarded from a remote socket.
 This includes:
 -Snoop Forward Clean, Left Shared (LLC Hit/Miss, IFetch/Data_RD/RFT).
 .It Li RES_SNOOP_HITM
 A snoop was needed and it HitM-ed in local or remote cache.
 HitM denotes a cache-line was in modified state before effect as a results of snoop.
 This includes:
 -Snoop HitM w/ WB (LLC miss, IFetch/Data_RD)
 -Snoop Forward Modified w/ Invalidation (LLC Hit/Miss, RFO)
 -Snoop MtoS (LLC Hit, IFetch/Data_RD).
 .It Li RES_NON_DRAM
 Target was non-DRAM system address.
 This includes MMIO transactions.
 .El
 .It Li cmask= Ns Ar value
 Configure the PMC to increment only if the number of configured
 events measured in a cycle is greater than or equal to
 .Ar value .
 .It Li edge
 Configure the PMC to count the number of de-asserted to asserted
 transitions of the conditions expressed by the other qualifiers.
 If specified, the counter will increment only once whenever a
 condition becomes true, irrespective of the number of clocks during
 which the condition remains true.
 .It Li inv
 Invert the sense of comparison when the
 .Dq Li cmask
 qualifier is present, making the counter increment when the number of
 events per cycle is less than the value specified by the
 .Dq Li cmask
 qualifier.
 .It Li os
 Configure the PMC to count events happening at processor privilege
 level 0.
 .It Li usr
 Configure the PMC to count events occurring at privilege levels 1, 2
 or 3.
 .El
 .Pp
 If neither of the
 .Dq Li os
 or
 .Dq Li usr
 qualifiers are specified, the default is to enable both.
 .Ss Event Specifiers (Programmable PMCs)
 Sandy Bridge Xeon programmable PMCs support the following events:
 .Bl -tag -width indent
 .It Li LD_BLOCKS.DATA_UNKNOWN
 .Pq Event 03H , Umask 01H
 blocked loads due to store buffer blocks with unknown data.
 .It Li LD_BLOCKS.STORE_FORWARD
 .Pq Event 03H , Umask 02H
 loads blocked by overlapping with store buffer that cannot
 be forwarded .
 .It Li LD_BLOCKS.NO_SR
 .Pq Event 03H , Umask 08H
 # of Split loads blocked due to resource not available.
 .It Li LD_BLOCKS.ALL_BLOCK
 .Pq Event 03H , Umask 10H
 Number of cases where any load is blocked but has no
 DCU miss.
 .It Li MISALIGN_MEM_REF.LOADS
 .Pq Event 05H , Umask 01H
 Speculative cache-line split load uops dispatched to
 L1D.
 .It Li MISALIGN_MEM_REF.STORES
 .Pq Event 05H , Umask 02H
 Speculative cache-line split Store- address uops
 dispatched to L1D.
 .It Li LD_BLOCKS_PARTIAL.ADDRESS_ALIAS
 .Pq Event 07H , Umask 01H
 False dependencies in MOB due to partial compare on
 address.
 .It Li LD_BLOCKS_PARTIAL.ALL_STALL_BLOCK
 .Pq Event 07H , Umask 08H
 The number of times that load operations are temporarily
 blocked because of older stores, with addresses that are
 not yet known.
 A load operation may incur more than one block of this type.
 .It Li TLB_LOAD_MISSES.MISS_CAUSES_A_WALK
 .Pq Event 08H , Umask 01H
 Misses in all TLB levels that cause a page walk of any
 page size.
 .It Li TLB_LOAD_MISSES.WALK_COMPLETED
 .Pq Event 08H , Umask 02H
 Misses in all TLB levels that caused page walk completed
 of any size.
 .It Li DTLB_LOAD_MISSES.WALK_DURATION
 .Pq Event 08H , Umask 04H
 Cycle PMH is busy with a walk.
 .It Li DTLB_LOAD_MISSES.STLB_HIT
 .Pq Event 08H , Umask 10H
 Number of cache load STLB hits.
 No page walk.
 .It Li INT_MISC.RECOVERY_CYCLES
 .Pq Event 0DH , Umask 03H
 Cycles waiting to recover after Machine Clears or EClear.
 Set Cmask= 1.
 .It Li INT_MISC.RAT_STALL_CYCLES
 .Pq Event 0DH , Umask 40H
 Cycles RAT external stall is sent to IDQ for this thread.
 .It Li UOPS_ISSUED.ANY
 .Pq Event 0EH , Umask 01H
 Increments each cycle the # of Uops issued by the
 RAT to RS.
 Set Cmask = 1, Inv = 1, Any= 1to count stalled cycles
 of this core.
 .It Li FP_COMP_OPS_EXE.X87
 .Pq Event 10H , Umask 01H
 Counts number of X87 uops executed.
 .It Li FP_COMP_OPS_EXE.SSE_FP_PACKED_DOUBLE
 .Pq Event 10H , Umask 10H
 Counts number of SSE* double precision FP packed
 uops executed.
 .It Li FP_COMP_OPS_EXE.SSE_FP_SCALAR_SINGLE
 .Pq Event 10H , Umask 20H
 Counts number of SSE* single precision FP scalar
 uops executed.
 .It Li FP_COMP_OPS_EXE.SSE_PACKED_SINGLE
 .Pq Event 10H , Umask 40H
 Counts number of SSE* single precision FP packed
 uops executed.
 .It Li FP_COMP_OPS_EXE.SSE_SCALAR_DOUBLE
 .Pq Event 10H , Umask 80H
 Counts number of SSE* double precision FP scalar
 uops executed.
 .It Li SIMD_FP_256.PACKED_SINGLE
 .Pq Event 11H , Umask 01H
 Counts 256-bit packed single-precision floating-
 point instructions.
 .It Li SIMD_FP_256.PACKED_DOUBLE
 .Pq Event 11H , Umask 02H
 Counts 256-bit packed double-precision floating-
 point instructions.
 .It Li ARITH.FPU_DIV_ACTIVE
 .Pq Event 14H , Umask 01H
 Cycles that the divider is active, includes INT and FP.
 Set 'edge =1, cmask=1' to count the number of
 divides.
 .It Li INSTS_WRITTEN_TO_IQ.INSTS
 .Pq Event 17H , Umask 01H
 Counts the number of instructions written into the
 IQ every cycle.
 .It Li L2_RQSTS.DEMAND_DATA_RD_HIT
 .Pq Event 24H , Umask 01H
 Demand Data Read requests that hit L2 cache.
 .It Li L2_RQSTS.ALL_DEMAND_DATA_RD
 .Pq Event 24H , Umask 03H
 Counts any demand and L1 HW prefetch data load
 requests to L2.
 .It Li L2_RQSTS.RFO_HITS
 .Pq Event 24H , Umask 04H
 Counts the number of store RFO requests that
 hit the L2 cache.
 .It Li L2_RQSTS.RFO_MISS
 .Pq Event 24H , Umask 08H
 Counts the number of store RFO requests that
 miss the L2 cache.
 .It Li L2_RQSTS.ALL_RFO
 .Pq Event 24H , Umask 0CH
 Counts all L2 store RFO requests.
 .It Li L2_RQSTS.CODE_RD_HIT
 .Pq Event 24H , Umask 10H
 Number of instruction fetches that hit the L2
 cache.
 .It Li L2_RQSTS.CODE_RD_MISS
 .Pq Event 24H , Umask 20H
 Number of instruction fetches that missed the L2
 cache.
 .It Li L2_RQSTS.ALL_CODE_RD
 .Pq Event 24H , Umask 30H
 Counts all L2 code requests.
 .It Li L2_RQSTS.PF_HIT
 .Pq Event 24H , Umask 40H
 Requests from L2 Hardware prefetcher that hit L2.
 .It Li L2_RQSTS.PF_MISS
 .Pq Event 24H , Umask 80H
 Requests from L2 Hardware prefetcher that missed
 L2.
 .It Li L2_RQSTS.ALL_PF
 .Pq Event 24H , Umask C0H
 Any requests from L2 Hardware prefetchers.
 .It Li L2_STORE_LOCK_RQSTS.MISS
 .Pq Event 27H , Umask 01H
 ROs that miss cache lines.
 .It Li L2_STORE_LOCK_RQSTS.HIT_E
 .Pq Event 27H , Umask 04H
 RFOs that hit cache lines in E state.
 .It Li L2_STORE_LOCK_RQSTS.HIT_M
 .Pq Event 27H , Umask 08H
 RFOs that hit cache lines in M state.
 .It Li L2_STORE_LOCK_RQSTS.ALL
 .Pq Event 27H , Umask 0FH
 RFOs that access cache lines in any state.
 .It Li L2_L1D_WB_RQSTS.MISS
 .Pq Event 28H , Umask 01H
 Not rejected writebacks from L1D to L2 cache lines
 that missed L2.
 .It Li L2_L1D_WB_RQSTS.HIT_S
 .Pq Event 28H , Umask 02H
 Not rejected writebacks from L1D to L2 cache lines
 in S state.
 .It Li L2_L1D_WB_RQSTS.HIT_E
 .Pq Event 28H , Umask 04H
 Not rejected writebacks from L1D to L2 cache lines
 in E state.
 .It Li L2_L1D_WB_RQSTS.HIT_M
 .Pq Event 28H , Umask 08H
 Not rejected writebacks from L1D to L2 cache lines
 in M state.
 .It Li L2_L1D_WB_RQSTS.ALL
 .Pq Event 28H , Umask 0FH
 Not rejected writebacks from L1D to L2 cache.
 .It Li LONGEST_LAT_CACHE.REFERENCE
 .Pq Event 2EH , Umask 4FH
 This event counts requests originating from the
 core that reference
 a cache line in the last level cache.
 .It Li LONGEST_LAT_CACHE.MISS
 .Pq Event 2EH , Umask 41H
 This event counts each cache miss condition for
 references to the last level cache.
 .It Li CPU_CLK_UNHALTED.THREAD_P
 .Pq Event 3CH , Umask 00H
 Counts the number of thread cycles while the
 thread is not in a halt state.
 The thread enters the halt state when it is running the HLT
 instruction.
 The core frequency may change from time to time due to power or thermal throttling.
 .It Li CPU_CLK_THREAD_UNHALTED.REF_XCLK
 .Pq Event 3CH , Umask 01H
 Increments at the frequency of XCLK (100 MHz)
 when not halted.
 .It Li L1D_PEND_MISS.PENDING
 .Pq Event 48H , Umask 01H
 Increments the number of outstanding L1D misses
 every cycle.
 Set Cmaks = 1 and Edge =1 to count occurrences.
 .It Li DTLB_STORE_MISSES.MISS_CAUSES_A_WALK
 .Pq Event 49H , Umask 01H
 Miss in all TLB levels causes an page walk of
 any page size (4K/2M/4M/1G).
 .It Li DTLB_STORE_MISSES.WALK_COMPLETED
 .Pq Event 49H , Umask 02H
 Miss in all TLB levels causes a page walk that
 completes of any page size (4K/2M/4M/1G).
 .It Li DTLB_STORE_MISSES.WALK_DURATION
 .Pq Event 49H , Umask 04H
 Cycles PMH is busy with this walk.
 .It Li DTLB_STORE_MISSES.STLB_HIT
 .Pq Event 49H , Umask 10H
 Store operations that miss the first TLB level
 but hit the second and do not cause page walks.
 .It Li LOAD_HIT_PRE.SW_PF
 .Pq Event 4CH , Umask 01H
 Not SW-prefetch load dispatches that hit fill
 buffer allocated for S/W prefetch.
 .It Li LOAD_HIT_PER.HW_PF
 .Pq Event 4CH , Umask 02H
 Not SW-prefetch load dispatches that hit fill
 buffer allocated for H/W prefetch.
 .It Li HW_PRE_REQ.DL1_MISS
 .Pq Event 4EH , Umask 02H
 Hardware Prefetch requests that miss the L1D cache.
 A request is being counted each time it access the cache
 & miss it, including if a block is applicable or if hit the Fill
 Buffer for example.
 .It Li L1D.REPLACEMENT
 .Pq Event 51H , Umask 01H
 Counts the number of lines brought into the
 L1 data cache.
 .It Li L1D.ALLOCATED_IN_M
 .Pq Event 51H , Umask 02H
 Counts the number of allocations of modified
 L1D cache lines.
 .It Li L1D.EVICTION
 .Pq Event 51H , Umask 04H
 Counts the number of modified lines evicted
 from the L1 data cache due to replacement.
 .It Li L1D.ALL_M_REPLACEMENT
 .Pq Event 51H , Umask 08H
 Cache lines in M state evicted out of L1D due
 to Snoop HitM or dirty line replacement.
 .It Li PARTIAL_RAT_STALLS.FLAGS_MERGE_UOP
 .Pq Event 59H , Umask 0CH
 Increments the number of flags-merge uops in
 flight each cycle.
 Set Cmask = 1 to count cycles.
 .It Li PARTIAL_RAT_STALLS.SLOW_LEA_WINDOW
 .Pq Event 59H , Umask 0FH
 Cycles with at least one slow LEA uop allocated.
 .It Li PARTIAL_RAT_STALLS.MUL_SINGLE_UOP
 .Pq Event 59H , Umask 40H
 Number of Multiply packed/scalar single precision
 uops allocated.
 .It Li RESOURCE_STALLS2.ALL_FL_EMPTY
 .Pq Event 5BH , Umask 0CH
 Cycles stalled due to free list empty.
 .It Li RESOURCE_STALLS2.ALL_PRF_CONTROL
 .Pq Event 5BH , Umask 0FH
 Cycles stalled due to control structures full for
 physical registers.
 .It Li RESOURCE_STALLS2.BOB_FULL
 .Pq Event 5BH , Umask 40H
 Cycles Allocator is stalled due Branch Order Buffer.
 .It Li RESOURCE_STALLS2.OOO_RSRC
 .Pq Event 5BH , Umask 4FH
 Cycles stalled due to out of order resources full.
 .It Li CPL_CYCLES.RING0
 .Pq Event 5CH , Umask 01H
 Unhalted core cycles when the thread is in ring 0.
 .It Li CPL_CYCLES.RING123
 .Pq Event 5CH , Umask 02H
 Unhalted core cycles when the thread is not in ring
 0.
 .It Li RS_EVENTS.EMPTY_CYCLES
 .Pq Event 5EH , Umask 01H
 Cycles the RS is empty for the thread.
 .It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND_DATA_RD
 .Pq Event 60H , Umask 01H
 Offcore outstanding Demand Data Read
 transactions in SQ to uncore.
 Set Cmask=1 to count cycles.
 .It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND_RFO
 .Pq Event 60H , Umask 04H
 Offcore outstanding RFO store transactions in SQ to
 uncore.
 Set Cmask=1 to count cycles.
 .It Li OFFCORE_REQUESTS_OUTSTANDING.ALL_DATA_RD
 .Pq Event 60H , Umask 08H
 Offcore outstanding cacheable data read
 transactions in SQ to uncore.
 Set Cmask=1 to count cycles.
 .It Li LOCK_CYCLES.SPLIT_LOCK_UC_LOCK_DURATION
 .Pq Event 63H , Umask 01H
 Cycles in which the L1D and L2 are locked, due to a
 UC lock or split lock.
 .It Li LOCK_CYCLES.CACHE_LOCK_DURATION
 .Pq Event 63H , Umask 02H
 Cycles in which the L1D is locked.
 .It Li IDQ.EMPTY
 .Pq Event 79H , Umask 02H
 Counts cycles the IDQ is empty.
 .It Li IDQ.MITE_UOPS
 .Pq Event 79H , Umask 04H
 Increment each cycle # of uops delivered to IDQ
 from MITE path.
 Set Cmask = 1 to count cycles.
 .It Li IDQ.DSB_UOPS
 .Pq Event 79H , Umask 08H
 Increment each cycle. # of uops delivered to IDQ
 from DSB path.
 Set Cmask = 1 to count cycles.
 .It Li IDQ.MS_DSB_UOPS
 .Pq Event 79H , Umask 10H
 Increment each cycle # of uops delivered to IDQ
 when MS busy by DSB.
 Set Cmask = 1 to count cycles MS is busy.
 Set Cmask=1 and Edge =1 to count MS activations.
 .It Li IDQ.MS_MITE_UOPS
 .Pq Event 79H , Umask 20H
 Increment each cycle # of uops delivered to IDQ
 when MS is busy by MITE.
 Set Cmask = 1 to count cycles.
 .It Li IDQ.MS_UOPS
 .Pq Event 79H , Umask 30H
 Increment each cycle # of uops delivered to IDQ
 from MS by either DSB or MITE.
 Set Cmask = 1 to count cycles.
 .It Li ICACHE.MISSES
 .Pq Event 80H , Umask 02H
 Number of Instruction Cache, Streaming Buffer and
 Victim Cache Misses.
 Includes UC accesses.
 .It Li ITLB_MISSES.MISS_CAUSES_A_WALK
 .Pq Event 85H , Umask 01H
 Misses in all ITLB levels that cause page walks.
 .It Li ITLB_MISSES.WALK_COMPLETED
 .Pq Event 85H , Umask 02H
 Misses in all ITLB levels that cause completed page
 walks.
 .It Li ITLB_MISSES.WALK_DURATION
 .Pq Event 85H , Umask 04H
 Cycle PMH is busy with a walk.
 .It Li ITLB_MISSES.STLB_HIT
 .Pq Event 85H , Umask 10H
 Number of cache load STLB hits.
 No page walk.
 .It Li ILD_STALL.LCP
 .Pq Event 87H , Umask 01H
 Stalls caused by changing prefix length of the
 instruction.
 .It Li ILD_STALL.IQ_FULL
 .Pq Event 87H , Umask 04H
 Stall cycles due to IQ is full.
 .It Li BR_INST_EXEC.NONTAKEN_COND
 .Pq Event 88H , Umask 41H
 Count conditional near branch instructions that were executed (but not
 necessarily retired) and not taken.
 .It Li BR_INST_EXEC.TAKEN_COND
 .Pq Event 88H , Umask 81H
 Count conditional near branch instructions that were executed (but not
 necessarily retired) and taken.
 .It Li BR_INST_EXEC.DIRECT_JMP
 .Pq Event 88H , Umask 82H
 Count all unconditional near branch instructions excluding calls and
 indirect branches.
 .It Li BR_INST_EXEC.INDIRECT_JMP_NON_CALL_RET
 .Pq Event 88H , Umask 84H
 Count executed indirect near branch instructions that are not calls nor
 returns.
 .It Li BR_INST_EXEC.RETURN_NEAR
 .Pq Event 88H , Umask 88H
 Count indirect near branches that have a return mnemonic.
 .It Li BR_INST_EXEC.DIRECT_NEAR_CALL
 .Pq Event 88H , Umask 90H
 Count unconditional near call branch instructions, excluding non call
 branch, executed.
 .It Li BR_INST_EXEC.INDIRECT_NEAR_CALL
 .Pq Event 88H , Umask A0H
 Count indirect near calls, including both register and memory indirect,
 executed.
 .It Li BR_INST_EXEC.ALL_BRANCHES
 .Pq Event 88H , Umask FFH
 Counts all near executed branches (not necessarily retired).
 .It Li BR_MISP_EXEC.NONTAKEN_COND
 .Pq Event 89H , Umask 41H
 Count conditional near branch instructions mispredicted as nontaken.
 .It Li BR_MISP_EXEC.TAKEN_COND
 .Pq Event 89H , Umask 81H
 Count conditional near branch instructions mispredicted as taken.
 .It Li BR_MISP_EXEC.INDIRECT_JMP_NON_CALL_RET
 .Pq Event 89H , Umask 84H
 Count mispredicted indirect near branch instructions that are not calls
 nor returns.
 .It Li BR_MISP_EXEC.RETURN_NEAR
 .Pq Event 89H , Umask 88H
 Count mispredicted indirect near branches that have a return mnemonic.
 .It Li BR_MISP_EXEC.DIRECT_NEAR_CALL
 .Pq Event 89H , Umask 90H
 Count mispredicted unconditional near call branch instructions, excluding
 non call branch, executed.
 .It Li BR_MISP_EXEC.INDIRECT_NEAR_CALL
 .Pq Event 89H , Umask A0H
 Count mispredicted indirect near calls, including both register and memory
 indirect, executed.
 .It Li BR_MISP_EXEC.ALL_BRANCHES
 .Pq Event 89H , Umask FFH
 Counts all mispredicted near executed branches (not necessarily retired).
 .It Li IDQ_UOPS_NOT_DELIVERED.CORE
 .Pq Event 9CH , Umask 01H
 Count number of non-delivered uops to RAT per
 thread.
 .It Li UOPS_DISPATCHED_PORT.PORT_0
 .Pq Event A1H , Umask 01H
 Cycles which a Uop is dispatched on port 0.
 .It Li UOPS_DISPATCHED_PORT.PORT_1
 .Pq Event A1H , Umask 02H
 Cycles which a Uop is dispatched on port 1.
 .It Li UOPS_DISPATCHED_PORT.PORT_2_LD
 .Pq Event A1H , Umask 04H
 Cycles which a load uop is dispatched on port 2.
 .It Li UOPS_DISPATCHED_PORT.PORT_2_STA
 .Pq Event A1H , Umask 08H
 Cycles which a store address uop is dispatched on
 port 2.
 .It Li UOPS_DISPATCHED_PORT.PORT_2
 .Pq Event A1H , Umask 0CH
 Cycles which a Uop is dispatched on port 2.
 .It Li UOPS_DISPATCHED_PORT.PORT_3_LD
 .Pq Event A1H , Umask 10H
 Cycles which a load uop is dispatched on port 3.
 .It Li UOPS_DISPATCHED_PORT.PORT_3_STA
 .Pq Event A1H , Umask 20H
 Cycles which a store address uop is dispatched on
 port 3.
 .It Li UOPS_DISPATCHED_PORT.PORT_3
 .Pq Event A1H , Umask 30H
 Cycles which a Uop is dispatched on port 3.
 .It Li UOPS_DISPATCHED_PORT.PORT_4
 .Pq Event A1H , Umask 40H
 Cycles which a Uop is dispatched on port 4.
 .It Li UOPS_DISPATCHED_PORT.PORT_5
 .Pq Event A1H , Umask 80H
 Cycles which a Uop is dispatched on port 5.
 .It Li RESOURCE_STALLS.ANY
 .Pq Event A2H , Umask 01H
 Cycles Allocation is stalled due to Resource Related
 reason.
 .It Li RESOURCE_STALLS.LB
 .Pq Event A2H , Umask 01H
 Counts the cycles of stall due to lack of load buffers.
 .It Li RESOURCE_STALLS.RS
 .Pq Event A2H , Umask 04H
 Cycles stalled due to no eligible RS entry available.
 .It Li RESOURCE_STALLS.SB
 .Pq Event A2H , Umask 08H
 Cycles stalled due to no store buffers available.
 (not including draining form sync).
 .It Li RESOURCE_STALLS.ROB
 .Pq Event A2H , Umask 10H
 Cycles stalled due to re-order buffer full.
 .It Li RESOURCE_STALLS.FCSW
 .Pq Event A2H , Umask 20H
 Cycles stalled due to writing the FPU control word.
 .It Li RESOURCE_STALLS.MXCSR
 .Pq Event A2H , Umask 40H
 Cycles stalled due to the MXCSR register rename
 occurring to close to a previous MXCSR rename.
 .It Li RESOURCE_STALLS.OTHER
 .Pq Event A2H , Umask 80H
 Cycles stalled while execution was stalled due to
 other resource issues.
 .It Li CYCLE_ACTIVITY.CYCLES_L2_PENDING
 .Pq Event A3H , Umask 01H
 Cycles with pending L2 miss loads.
 Set AnyThread to count per core.
 .It Li CYCLE_ACTIVITY.CYCLES_L1D_PENDING
 .Pq Event A3H , Umask 02H
 Cycles with pending L1 cache miss loads.
 Set AnyThread to count per core.
 .It Li CYCLE_ACTIVITY.CYCLES_NO_DISPATCH
 .Pq Event A3H , Umask 04H
 Cycles of dispatch stalls.
 Set AnyThread to count per core.
 .It Li DSB2MITE_SWITCHES.COUNT
 .Pq Event ABH , Umask 01H
 Number of DSB to MITE switches.
 .It Li DSB2MITE_SWITCHES.PENALTY_CYCLES
 .Pq Event ABH , Umask 02H
 Cycles DSB to MITE switches caused delay.
 .It Li DSB_FILL.OTHER_CANCEL
 .Pq Event ACH , Umask 02H
 Cases of cancelling valid DSB fill not because of
 exceeding way limit.
 .It Li DSB_FILL.EXCEED_DSB_LINES
 .Pq Event ACH , Umask 08H
 DSB Fill encountered > 3 DSB lines.
 .It Li DSB_FILL.ALL_CANCEL
 .Pq Event ACH , Umask 0AH
 Cases of cancelling valid Decode Stream Buffer
 (DSB) fill not because of exceeding way limit.
 .It Li ITLB.ITLB_FLUSH
 .Pq Event AEH , Umask 01H
 Counts the number of ITLB flushes, includes
 4k/2M/4M pages.
 .It Li OFFCORE_REQUESTS.DEMAND_DATA_RD
 .Pq Event B0H , Umask 01H
 Demand data read requests sent to uncore.
 .It Li OFFCORE_REQUESTS.DEMAND_RFO
 .Pq Event B0H , Umask 04H
 Demand RFO read requests sent to uncore, including
 regular RFOs, locks, ItoM.
 .It Li OFFCORE_REQUESTS.ALL_DATA_RD
 .Pq Event B0H , Umask 08H
 Data read requests sent to uncore (demand and
 prefetch).
 .It Li UOPS_DISPATCHED.THREAD
 .Pq Event B1H , Umask 01H
 Counts total number of uops to be dispatched per-
 thread each cycle.
 Set Cmask = 1, INV =1 to count stall cycles.
 .It Li UOPS_DISPATCHED.CORE
 .Pq Event B1H , Umask 02H
 Counts total number of uops to be dispatched per-
 core each cycle.
 .It Li OFFCORE_REQUESTS_BUFFER.SQ_FULL
 .Pq Event B2H , Umask 01H
 Offcore requests buffer cannot take more entries
 for this thread core.
 .It Li AGU_BYPASS_CANCEL.COUNT
 .Pq Event B6H , Umask 01H
 Counts executed load operations with all the
 following traits: 1. addressing of the format [base +
 offset], 2. the offset is between 1 and 2047, 3. the
 address specified in the base register is in one page
 and the address [base+offset] is in another page.
 .It Li OFF_CORE_RESPONSE_0
 .Pq Event B7H , Umask 01H
 (Event B7H, Umask 01H) Off-core Response Performance
 Monitoring; PMC0 only.
 Requires programming MSR 01A6H
 .It Li OFF_CORE_RESPONSE_1
 .Pq Event BBH , Umask 01H
 (Event BBH, Umask 01H) Off-core Response Performance
 Monitoring; PMC3 only.
 Requires programming MSR 01A7H
 .It Li TLB_FLUSH.DTLB_THREAD
 .Pq Event BDH , Umask 01H
 DTLB flush attempts of the thread-specific entries.
 .It Li TLB_FLUSH.STLB_ANY
 .Pq Event BDH , Umask 20H
 Count number of STLB flush attempts.
 .It Li L1D_BLOCKS.BANK_CONFLICT_CYCLES
 .Pq Event BFH , Umask 05H
 Cycles when dispatched loads are cancelled due to
 L1D bank conflicts with other load ports.
 .It Li INST_RETIRED.ANY_P
 .Pq Event C0H , Umask 00H
 Number of instructions at retirement.
 .It Li INST_RETIRED.ALL
 .Pq Event C0H , Umask 01H
 Precise instruction retired event with HW to reduce
 effect of PEBS shadow in IP distribution.
 .It Li OTHER_ASSISTS.ITLB_MISS_RETIRED
 .Pq Event C1H , Umask 02H
 Instructions that experienced an ITLB miss.
 .It Li OTHER_ASSISTS.AVX_STORE
 .Pq Event C1H , Umask 08H
 Number of assists associated with 256-bit AVX
 store operations.
 .It Li OTHER_ASSISTS.AVX_TO_SSE
 .Pq Event C1H , Umask 10H
 Number of transitions from AVX-256 to legacy SSE
 when penalty applicable.
 .It Li OTHER_ASSISTS.SSE_TO_AVX
 .Pq Event C1H , Umask 20H
 Number of transitions from SSE to AVX-256 when
 penalty applicable.
 .It Li UOPS_RETIRED.ALL
 .Pq Event C2H , Umask 01H
 Counts the number of micro-ops retired, Use
 cmask=1 and invert to count active cycles or stalled
 cycles.
 .It Li UOPS_RETIRED.RETIRE_SLOTS
 .Pq Event C2H , Umask 02H
 Counts the number of retirement slots used each
 cycle.
 .It Li MACHINE_CLEARS.MEMORY_ORDERING
 .Pq Event C3H , Umask 02H
 Counts the number of machine clears due to
 memory order conflicts.
 .It Li MACHINE_CLEARS.SMC
 .Pq Event C3H , Umask 04H
 Counts the number of times that a program writes
 to a code section.
 .It Li MACHINE_CLEARS.MASKMOV
 .Pq Event C3H , Umask 20H
 Counts the number of executed AVX masked load
 operations that refer to an illegal address range
 with the mask bits set to 0.
 .It Li BR_INST_RETIRED.ALL_BRANCH
 .Pq Event C4H , Umask 00H
 Branch instructions at retirement.
 .It Li BR_INST_RETIRED.CONDITIONAL
 .Pq Event C4H , Umask 01H
 Counts the number of conditional branch
 instructions retired.
 .It Li BR_INST_RETIRED.NEAR_CALL
 .Pq Event C4H , Umask 02H
 Direct and indirect near call instructions retired.
 .It Li BR_INST_RETIRED.ALL_BRANCHES
 .Pq Event C4H , Umask 04H
 Counts the number of branch instructions retired.
 .It Li BR_INST_RETIRED.NEAR_RETURN
 .Pq Event C4H , Umask 08H
 Counts the number of near return instructions
 retired.
 .It Li BR_INST_RETIRED.NOT_TAKEN
 .Pq Event C4H , Umask 10H
 Counts the number of not taken branch instructions
 retired.
 .It Li BR_INST_RETIRED.NEAR_TAKEN
 .Pq Event C4H , Umask 20H
 Number of near taken branches retired.
 .It Li BR_INST_RETIRED.FAR_BRANCH
 .Pq Event C4H , Umask 40H
 Number of far branches retired.
 .It Li BR_MISP_RETIRED.ALL_BRANCHES
 .Pq Event C5H , Umask 00H
 Mispredicted branch instructions at retirement.
 .It Li BR_MISP_RETIRED.CONDITIONAL
 .Pq Event C5H , Umask 01H
 Mispredicted conditional branch instructions retired.
 .It Li BR_MISP_RETIRED.NEAR_CALL
 .Pq Event C5H , Umask 02H
 Direct and indirect mispredicted near call
 instructions retired.
 .It Li BR_MISP_RETIRED.ALL_BRANCHES
 .Pq Event C5H , Umask 04H
 Mispredicted macro branch instructions retired.
 .It Li BR_MISP_RETIRED.NOT_TAKEN
 .Pq Event C5H , Umask 10H
 Mispredicted not taken branch instructions retired.
 .It Li BR_MISP_RETIRED.TAKEN
 .Pq Event C5H , Umask 20H
 Mispredicted taken branch instructions retired.
 .It Li FP_ASSIST.X87_OUTPUT
 .Pq Event CAH , Umask 02H
 Number of X87 assists due to output value.
 .It Li FP_ASSIST.X87_INPUT
 .Pq Event CAH , Umask 04H
 Number of X87 assists due to input value.
 .It Li FP_ASSIST.SIMD_OUTPUT
 .Pq Event CAH , Umask 08H
  Number of SIMD FP assists due to output values.
 .It Li FP_ASSIST.SIMD_INPUT
 .Pq Event CAH , Umask 10H
 Number of SIMD FP assists due to input values.
 .It Li FP_ASSIST.ANY 1EH
 .Pq Event CAH , Umask
 Cycles with any input/output SSE* or FP assists.
 .It Li ROB_MISC_EVENTS.LBR_INSERTS
 .Pq Event CCH , Umask 20H
 Count cases of saving new LBR records by
 hardware.
 .It Li MEM_TRANS_RETIRED.LOAD_LATENCY
 .Pq Event CDH , Umask 01H
 Sample loads with specified latency threshold.
 PMC3 only.
 .It Li MEM_TRANS_RETIRED.PRECISE_STORE
 .Pq Event CDH , Umask 02H
 Sample stores and collect precise store operation
 via PEBS record.
 PMC3 only.
 .It Li MEM_UOP_RETIRED.LOADS
 .Pq Event D0H , Umask 10H
 Qualify retired memory uops that are loads.
 Combine with umask 10H, 20H, 40H, 80H.
 .It Li MEM_UOP_RETIRED.STORES
 .Pq Event D0H , Umask 02H
 Qualify retired memory uops that are stores.
 Combine with umask 10H, 20H, 40H, 80H.
 .It Li MEM_UOP_RETIRED.STLB_MISS
 .Pq Event D0H , Umask
 Qualify retired memory uops with STLB miss.
 Must combine with umask 01H, 02H, to produce counts.
 .It Li MEM_UOP_RETIRED.LOCK
 .Pq Event D0H , Umask
 Qualify retired memory uops with lock.
 Must combine with umask 01H, 02H, to produce counts.
 .It Li MEM_UOP_RETIRED.SPLIT
 .Pq Event D0H , Umask
 Qualify retired memory uops with line split.
 Must combine with umask 01H, 02H, to produce counts.
 .It Li MEM_UOP_RETIRED_ALL
 .Pq Event D0H , Umask
 Qualify any retired memory uops.
 Must combine with umask 01H, 02H, to produce counts.
 .It Li MEM_LOAD_UOPS_RETIRED.L1_HIT
 .Pq Event D1H , Umask 01H
 Retired load uops with L1 cache hits as data
 sources.
 .It Li MEM_LOAD_UOPS_RETIRED.L2_HIT
 .Pq Event D1H , Umask 02H
 Retired load uops with L2 cache hits as data
 sources.
 .It Li MEM_LOAD_UOPS_RETIRED.LLC_HIT
 .Pq Event D1H , Umask 04H
 Retired load uops which data sources were data hits
 in LLC without snoops required.
 .It Li MEM_LOAD_UOPS_RETIRED.LLC_MISS
 .Pq Event D1H , Umask 20H
 Retired load uops which data sources were data
 missed LLC (excluding unknown data source).
 .It Li MEM_LOAD_UOPS_RETIRED.HIT_LFB
 .Pq Event D1H , Umask 40H
 Retired load uops which data sources were load
 uops missed L1 but hit FB due to preceding miss to
 the same cache line with data not ready.
 .It Li MEM_LOAD_UOPS_MISC_RETIRED.LLC_MISS
 .Pq Event D4H , Umask 02H
 Retired load uops with unknown information as data
 source in cache serviced the load.
 .It Li BACLEARS.ANY
 .Pq Event E6H , Umask 01H
 Counts the number of times the front end is re-
 steered, mainly when the BPU cannot provide a
 correct prediction and this is corrected by other
 branch handling mechanisms at the front end.
 .It Li L2_TRANS.DEMAND_DATA_RD
 .Pq Event F0H , Umask 01H
 Demand Data Read requests that access L2 cache.
 .It Li L2_TRANS.RFO
 .Pq Event F0H , Umask 02H
 RFO requests that access L2 cache.
 .It Li L2_TRANS.CODE_RD
 .Pq Event F0H , Umask 04H
 L2 cache accesses when fetching instructions.
 .It Li L2_TRANS.ALL_PF
 .Pq Event F0H , Umask 08H
 L2 or LLC HW prefetches that access L2 cache.
 .It Li L2_TRANS.L1D_WB
 .Pq Event F0H , Umask 10H
 L1D writebacks that access L2 cache.
 .It Li L2_TRANS.L2_FILL
 .Pq Event F0H , Umask 20H
 L2 fill requests that access L2 cache.
 .It Li L2_TRANS.L2_WB
 .Pq Event F0H , Umask 40H
 L2 writebacks that access L2 cache.
 .It Li L2_TRANS.ALL_REQUESTS
 .Pq Event F0H , Umask 80H
 Transactions accessing L2 pipe.
 .It Li L2_LINES_IN.I
 .Pq Event F1H , Umask 01H
 L2 cache lines in I state filling L2.
 .It Li L2_LINES_IN.S
 .Pq Event F1H , Umask 02H
 L2 cache lines in S state filling L2.
 .It Li L2_LINES_IN.E
 .Pq Event F1H , Umask 04H
 L2 cache lines in E state filling L2.
 .It Li L2_LINES-IN.ALL
 .Pq Event F1H , Umask 07H
 L2 cache lines filling L2.
 .It Li L2_LINES_OUT.DEMAND_CLEAN
 .Pq Event F2H , Umask 01H
 Clean L2 cache lines evicted by demand.
 .It Li L2_LINES_OUT.DEMAND_DIRTY
 .Pq Event F2H , Umask 02H
 Dirty L2 cache lines evicted by demand.
 .It Li L2_LINES_OUT.PF_CLEAN
 .Pq Event F2H , Umask 04H
 Clean L2 cache lines evicted by L2 prefetch.
 .It Li L2_LINES_OUT.PF_DIRTY
 .Pq Event F2H , Umask 08H
 Dirty L2 cache lines evicted by L2 prefetch.
 .It Li L2_LINES_OUT.DIRTY_ALL
 .Pq Event F2H , Umask 0AH
 Dirty L2 cache lines filling the L2.
 .It Li SQ_MISC.SPLIT_LOCK
 .Pq Event F4H , Umask 10H
 Split locks in SQ.
 .El
 .Sh SEE ALSO
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.corei7 3 ,
 .Xr pmc.corei7uc 3 ,
 .Xr pmc.haswelluc 3 ,
 .Xr pmc.iaf 3 ,
 .Xr pmc.ivybridge 3 ,
 .Xr pmc.ivybridgexeon 3 ,
-.Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.sandybridge 3 ,
 .Xr pmc.sandybridgeuc 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
 .Xr pmc.ucf 3 ,
 .Xr pmc.westmere 3 ,
 .Xr pmc.westmereuc 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
 .Sh HISTORY
 The
 .Nm pmc
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
 .An -nosplit
 The
 .Lb libpmc
 library was written by
 .An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
 The support for the Sandy Bridge Xeon
 microarchitecture was written by
 .An Hiren Panchasara Aq Mt hiren.panchasara@gmail.com .
diff --git a/lib/libpmc/pmc.soft.3 b/lib/libpmc/pmc.soft.3
index ce965caa2f02..dcbf8d904838 100644
--- a/lib/libpmc/pmc.soft.3
+++ b/lib/libpmc/pmc.soft.3
@@ -1,112 +1,111 @@
 .\" Copyright (c) 2012 Fabien Thomas.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .Dd September 23, 2021
 .Dt PMC.SOFT 3
 .Os
 .Sh NAME
 .Nm pmc.soft
 .Nd measurements using software based events
 .Sh LIBRARY
 .Lb libpmc
 .Sh SYNOPSIS
 .In pmc.h
 .Sh DESCRIPTION
 Software events are used to collect various source of software events.
 .Ss PMC Features
 16 sampling counters using software events based on various sources.
 These PMCs support the following capabilities:
 .Bl -column "PMC_CAP_INTERRUPT" "Support"
 .It Em Capability Ta Em Support
 .It PMC_CAP_CASCADE Ta \&No
 .It PMC_CAP_EDGE Ta \&No
 .It PMC_CAP_INTERRUPT Ta Yes
 .It PMC_CAP_INVERT Ta \&No
 .It PMC_CAP_READ Ta Yes
 .It PMC_CAP_PRECISE Ta \&No
 .It PMC_CAP_SYSTEM Ta Yes
 .It PMC_CAP_TAGGING Ta \&No
 .It PMC_CAP_THRESHOLD Ta \&No
 .It PMC_CAP_USER Ta Yes
 .It PMC_CAP_WRITE Ta Yes
 .El
 .Ss Event Qualifiers
 There is no supported event qualifier.
 .Pp
 The event specifiers supported by software are:
 .Bl -tag -width indent
 .It Li CLOCK.HARD
 Hard clock ticks.
 .It Li CLOCK.STAT
 Stat clock ticks.
 .It Li CLOCK.PROF
 Profiling clock ticks.
 .It Li INTR.ALL
 Interrupt filter executed
 .It Li INTR.FILTER
 Interrupt filter returned FILTER_HANDLED.
 .It Li INTR.ITHREAD
 Interrupt filter returned FILTER_SCHEDULE_ITHREAD.
 .It Li INTR.SCHEDULE
 Ithread scheduled.
 .It Li INTR.STRAY
 Interrupt filter returned FILTER_STRAY.
 .It Li INTR.WAITING
 Ithread not scheduled, already active.
 .It Li LOCK.FAILED
 Lock acquisition failed.
 .It Li PAGE_FAULT.ALL
 All page fault type.
 .It Li PAGE_FAULT.READ
 Read page fault.
 .It Li PAGE_FAULT.WRITE
 Write page fault.
 .El
 .Sh SEE ALSO
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.corei7 3 ,
 .Xr pmc.corei7uc 3 ,
 .Xr pmc.iaf 3 ,
-.Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.tsc 3 ,
 .Xr pmc.ucf 3 ,
 .Xr pmc.westmereuc 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
 .Sh HISTORY
 The
 .Nm pmc
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
 .An -nosplit
 The
 .Lb libpmc
 library was written by
 .An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
 Software PMC was written by
 .An Fabien Thomas Aq Mt fabient@FreeBSD.org .
diff --git a/lib/libpmc/pmc.tsc.3 b/lib/libpmc/pmc.tsc.3
index 59fcdc1898d1..c613433eb0f1 100644
--- a/lib/libpmc/pmc.tsc.3
+++ b/lib/libpmc/pmc.tsc.3
@@ -1,78 +1,77 @@
 .\" Copyright (c) 2003-2008 Joseph Koshy.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .Dd October 4, 2008
 .Dt PMC.TSC 3
 .Os
 .Sh NAME
 .Nm pmc.tsc
 .Nd measurements using the i386 timestamp counter
 .Sh LIBRARY
 .Lb libpmc
 .Sh SYNOPSIS
 .In pmc.h
 .Sh DESCRIPTION
 In the i386 architecture, the timestamp counter is a monotonically
 non-decreasing counter that counts processor cycles.
 .Pp
 This counter may be selected specifying an event specifier
 .Dq Li tsc
 to
 .Xr pmc_allocate 3 .
 The TSC is a read-only counter that may only be allocated in
 system-wide counting mode.
 The
 .Dq Li tsc
 event does not support further event qualifiers.
 .Pp
 Multiple processes are allowed to allocate the TSC.
 Once allocated, the TSC may be read using the
 .Fn pmc_read
 function, or by using the
 .Li RDTSC
 instruction.
 .Ss Event Name Aliases
 The alias
 .Dq Li cycles
 maps to the TSC.
 .Sh SEE ALSO
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.core2 3 ,
 .Xr pmc.iaf 3 ,
-.Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
 .Sh HISTORY
 The
 .Nm pmc
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
 The
 .Lb libpmc
 library was written by
 .An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/lib/libpmc/pmc.ucf.3 b/lib/libpmc/pmc.ucf.3
index d39b0e8f0db7..7604e915d384 100644
--- a/lib/libpmc/pmc.ucf.3
+++ b/lib/libpmc/pmc.ucf.3
@@ -1,108 +1,107 @@
 .\" Copyright (c) 2010 Fabien Thomas.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .Dd March 30, 2010
 .Dt PMC.UCF 3
 .Os
 .Sh NAME
 .Nm pmc.ucf
 .Nd measurement events for
 .Tn Intel
 uncore fixed function performance counters.
 .Sh LIBRARY
 .Lb libpmc
 .Sh SYNOPSIS
 .In pmc.h
 .Sh DESCRIPTION
 Each fixed-function PMC measures a specific hardware event.
 The number of fixed-function PMCs implemented in a CPU can vary.
 The number of fixed-function PMCs present can be determined at runtime
 by using function
 .Xr pmc_cpuinfo 3 .
 .Pp
 Intel uncore fixed-function PMCs are documented in
 .Rs
 .%B "Intel(R) 64 and IA-32 Architectures Software Developes Manual"
 .%T "Volume 3B: System Programming Guide, Part 2"
 .%N "Order Number: 253669-033US"
 .%D December 2009
 .%Q "Intel Corporation"
 .Re
 .Pp
 .Ss PMC Capabilities
 Fixed-function PMCs support the following capabilities:
 .Bl -column "PMC_CAP_INTERRUPT" "Support"
 .It Em Capability Ta Em Support
 .It PMC_CAP_CASCADE Ta \&No
 .It PMC_CAP_EDGE Ta \&No
 .It PMC_CAP_INTERRUPT Ta \&No
 .It PMC_CAP_INVERT Ta \&No
 .It PMC_CAP_READ Ta Yes
 .It PMC_CAP_PRECISE Ta \&No
 .It PMC_CAP_SYSTEM Ta \&No
 .It PMC_CAP_TAGGING Ta \&No
 .It PMC_CAP_THRESHOLD Ta \&No
 .It PMC_CAP_USER Ta \&No
 .It PMC_CAP_WRITE Ta Yes
 .El
 .Ss Class Name Prefix
 These PMCs are named using a class name prefix of
 .Dq Li ucf- .
 .Ss Event Specifiers (Fixed Function PMCs)
 The fixed function PMCs are selectable using the following
 event names:
 .Bl -tag -width indent
 .It Li UCLOCK
 .Pq Fixed Function Counter 0
 The fixed-function uncore counter increments at the rate of the U-clock.
 The frequency of the uncore clock domain can be determined from the uncore
 clock ratio which is available in the PCI configuration space register at
 offset C0H under device number 0 and Function 0.
 .El
 .Sh SEE ALSO
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.core2 3 ,
 .Xr pmc.corei7 3 ,
 .Xr pmc.corei7uc 3 ,
 .Xr pmc.iaf 3 ,
-.Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
 .Xr pmc.westmere 3 ,
 .Xr pmc.westmereuc 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
 .Sh HISTORY
 The
 .Nm pmc
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
 The
 .Lb libpmc
 library was written by
 .An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/lib/libpmc/pmc.westmere.3 b/lib/libpmc/pmc.westmere.3
index 1d7c206f25c3..00aaa0b74338 100644
--- a/lib/libpmc/pmc.westmere.3
+++ b/lib/libpmc/pmc.westmere.3
@@ -1,1393 +1,1392 @@
 .\" Copyright (c) 2010 Fabien Thomas.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .Dd February 25, 2012
 .Dt PMC.WESTMERE 3
 .Os
 .Sh NAME
 .Nm pmc.westmere
 .Nd measurement events for
 .Tn Intel
 .Tn Westmere
 family CPUs
 .Sh LIBRARY
 .Lb libpmc
 .Sh SYNOPSIS
 .In pmc.h
 .Sh DESCRIPTION
 .Tn Intel
 .Tn "Westmere"
 CPUs contain PMCs conforming to version 2 of the
 .Tn Intel
 performance measurement architecture.
 These CPUs may contain up to three classes of PMCs:
 .Bl -tag -width "Li PMC_CLASS_IAP"
 .It Li PMC_CLASS_IAF
 Fixed-function counters that count only one hardware event per counter.
 .It Li PMC_CLASS_IAP
 Programmable counters that may be configured to count one of a defined
 set of hardware events.
 .El
 .Pp
 The number of PMCs available in each class and their widths need to be
 determined at run time by calling
 .Xr pmc_cpuinfo 3 .
 .Pp
 Intel Westmere PMCs are documented in
 .Rs
 .%B "Intel(R) 64 and IA-32 Architectures Software Developes Manual"
 .%T "Volume 3B: System Programming Guide, Part 2"
 .%N "Order Number: 253669-033US"
 .%D December 2009
 .%Q "Intel Corporation"
 .Re
 .Ss WESTMERE FIXED FUNCTION PMCS
 These PMCs and their supported events are documented in
 .Xr pmc.iaf 3 .
 .Ss WESTMERE PROGRAMMABLE PMCS
 The programmable PMCs support the following capabilities:
 .Bl -column "PMC_CAP_INTERRUPT" "Support"
 .It Em Capability Ta Em Support
 .It PMC_CAP_CASCADE Ta \&No
 .It PMC_CAP_EDGE Ta Yes
 .It PMC_CAP_INTERRUPT Ta Yes
 .It PMC_CAP_INVERT Ta Yes
 .It PMC_CAP_READ Ta Yes
 .It PMC_CAP_PRECISE Ta \&No
 .It PMC_CAP_SYSTEM Ta Yes
 .It PMC_CAP_TAGGING Ta \&No
 .It PMC_CAP_THRESHOLD Ta Yes
 .It PMC_CAP_USER Ta Yes
 .It PMC_CAP_WRITE Ta Yes
 .El
 .Ss Event Qualifiers
 Event specifiers for these PMCs support the following common
 qualifiers:
 .Bl -tag -width indent
 .It Li rsp= Ns Ar value
 Configure the Off-core Response bits.
 .Bl -tag -width indent
 .It Li DMND_DATA_RD
 Counts the number of demand and DCU prefetch data reads of full
 and partial cachelines as well as demand data page table entry
 cacheline reads.
 Does not count L2 data read prefetches or
 instruction fetches.
 .It Li DMND_RFO
 Counts the number of demand and DCU prefetch reads for ownership
 (RFO) requests generated by a write to data cacheline.
 Does not count L2 RFO.
 .It Li DMND_IFETCH
 Counts the number of demand and DCU prefetch instruction cacheline
 reads.
 Does not count L2 code read prefetches.
 WB
 Counts the number of writeback (modified to exclusive) transactions.
 .It Li PF_DATA_RD
 Counts the number of data cacheline reads generated by L2 prefetchers.
 .It Li PF_RFO
 Counts the number of RFO requests generated by L2 prefetchers.
 .It Li PF_IFETCH
 Counts the number of code reads generated by L2 prefetchers.
 .It Li OTHER
 Counts one of the following transaction types, including L3 invalidate,
 I/O, full or partial writes, WC or non-temporal stores, CLFLUSH, Fences,
 lock, unlock, split lock.
 .It Li UNCORE_HIT
 L3 Hit: local or remote home requests that hit L3 cache in the uncore
 with no coherency actions required (snooping).
 .It Li OTHER_CORE_HIT_SNP
 L3 Hit: local or remote home requests that hit L3 cache in the uncore
 and was serviced by another core with a cross core snoop where no modified
 copies were found (clean).
 .It Li OTHER_CORE_HITM
 L3 Hit: local or remote home requests that hit L3 cache in the uncore
 and was serviced by another core with a cross core snoop where modified
 copies were found (HITM).
 .It Li REMOTE_CACHE_FWD
 L3 Miss: local homed requests that missed the L3 cache and was serviced
 by forwarded data following a cross package snoop where no modified
 copies found. (Remote home requests are not counted)
 .It Li REMOTE_DRAM
 L3 Miss: remote home requests that missed the L3 cache and were serviced
 by remote DRAM.
 .It Li LOCAL_DRAM
 L3 Miss: local home requests that missed the L3 cache and were serviced
 by local DRAM.
 .It Li NON_DRAM
 Non-DRAM requests that were serviced by IOH.
 .El
 .It Li cmask= Ns Ar value
 Configure the PMC to increment only if the number of configured
 events measured in a cycle is greater than or equal to
 .Ar value .
 .It Li edge
 Configure the PMC to count the number of de-asserted to asserted
 transitions of the conditions expressed by the other qualifiers.
 If specified, the counter will increment only once whenever a
 condition becomes true, irrespective of the number of clocks during
 which the condition remains true.
 .It Li inv
 Invert the sense of comparison when the
 .Dq Li cmask
 qualifier is present, making the counter increment when the number of
 events per cycle is less than the value specified by the
 .Dq Li cmask
 qualifier.
 .It Li os
 Configure the PMC to count events happening at processor privilege
 level 0.
 .It Li usr
 Configure the PMC to count events occurring at privilege levels 1, 2
 or 3.
 .El
 .Pp
 If neither of the
 .Dq Li os
 or
 .Dq Li usr
 qualifiers are specified, the default is to enable both.
 .Ss Event Specifiers (Programmable PMCs)
 Westmere programmable PMCs support the following events:
 .Bl -tag -width indent
 .It Li LOAD_BLOCK.OVERLAP_STORE
 .Pq Event 03H , Umask 02H
 Loads that partially overlap an earlier store
 .It Li SB_DRAIN.ANY
 .Pq Event 04H , Umask 07H
 All Store buffer stall cycles
 .It Li MISALIGN_MEMORY.STORE
 .Pq Event 05H , Umask 02H
 All store referenced with misaligned address
 .It Li STORE_BLOCKS.AT_RET
 .Pq Event 06H , Umask 04H
 Counts number of loads delayed with at-Retirement block code.
 The following
 loads need to be executed at retirement and wait for all senior stores on
 the same thread to be drained: load splitting across 4K boundary (page
 split), load accessing uncacheable (UC or USWC) memory, load lock, and load
 with page table in UC or USWC memory region.
 .It Li STORE_BLOCKS.L1D_BLOCK
 .Pq Event 06H , Umask 08H
 Cacheable loads delayed with L1D block code
 .It Li PARTIAL_ADDRESS_ALIAS
 .Pq Event 07H , Umask 01H
 Counts false dependency due to partial address aliasing
 .It Li DTLB_LOAD_MISSES.ANY
 .Pq Event 08H , Umask 01H
 Counts all load misses that cause a page walk
 .It Li DTLB_LOAD_MISSES.WALK_COMPLETED
 .Pq Event 08H , Umask 02H
 Counts number of completed page walks due to load miss in the STLB.
 .It Li DTLB_LOAD_MISSES.WALK_CYCLES
 .Pq Event 08H , Umask 04H
 Cycles PMH is busy with a page walk due to a load miss in the STLB.
 .It Li DTLB_LOAD_MISSES.STLB_HIT
 .Pq Event 08H , Umask 10H
 Number of cache load STLB hits
 .It Li DTLB_LOAD_MISSES.PDE_MISS
 .Pq Event 08H , Umask 20H
 Number of DTLB cache load misses where the low part of the linear to
 physical address translation was missed.
 .It Li MEM_INST_RETIRED.LOADS
 .Pq Event 0BH , Umask 01H
 Counts the number of instructions with an architecturally-visible store
 retired on the architected path.
 In conjunction with ld_lat facility
 .It Li MEM_INST_RETIRED.STORES
 .Pq Event 0BH , Umask 02H
 Counts the number of instructions with an architecturally-visible store
 retired on the architected path.
 In conjunction with ld_lat facility
 .It Li MEM_INST_RETIRED.LATENCY_ABOVE_THRESHOLD
 .Pq Event 0BH , Umask 10H
 Counts the number of instructions exceeding the latency specified with
 ld_lat facility.
 In conjunction with ld_lat facility
 .It Li MEM_STORE_RETIRED.DTLB_MISS
 .Pq Event 0CH , Umask 01H
 The event counts the number of retired stores that missed the DTLB.
 The DTLB miss is not counted if the store operation causes a fault.
 Does not counter prefetches.
 Counts both primary and secondary misses to the TLB
 .It Li UOPS_ISSUED.ANY
 .Pq Event 0EH , Umask 01H
 Counts the number of Uops issued by the Register Allocation Table to the
 Reservation Station, i.e. the UOPs issued from the front end to the back
 end.
 .It Li UOPS_ISSUED.STALLED_CYCLES
 .Pq Event 0EH , Umask 01H
 Counts the number of cycles no Uops issued by the Register Allocation Table
 to the Reservation Station, i.e. the UOPs issued from the front end to the
 back end.
 set invert=1, cmask = 1
 .It Li UOPS_ISSUED.FUSED
 .Pq Event 0EH , Umask 02H
 Counts the number of fused Uops that were issued from the Register
 Allocation Table to the Reservation Station.
 .It Li MEM_UNCORE_RETIRED.LOCAL_HITM
 .Pq Event 0FH , Umask 02H
 Load instructions retired that HIT modified data in sibling core (Precise
 Event)
 .It Li MEM_UNCORE_RETIRED.LOCAL_DRAM_AND_REMOTE_CACHE_HIT
 .Pq Event 0FH , Umask 08H
 Load instructions retired local dram and remote cache HIT data sources
 (Precise Event)
 .It Li MEM_UNCORE_RETIRED.LOCAL_DRAM
 .Pq Event 0FH , Umask 10H
 Load instructions retired with a data source of local DRAM or locally homed
 remote cache HITM (Precise Event)
 .It Li MEM_UNCORE_RETIRED.REMOTE_DRAM
 .Pq Event 0FH , Umask 20H
 Load instructions retired remote DRAM and remote home-remote cache HITM
 (Precise Event)
 .It Li MEM_UNCORE_RETIRED.UNCACHEABLE
 .Pq Event 0FH , Umask 80H
 Load instructions retired I/O (Precise Event)
 .It Li FP_COMP_OPS_EXE.X87
 .Pq Event 10H , Umask 01H
 Counts the number of FP Computational Uops Executed.
 The number of FADD,
 FSUB, FCOM, FMULs, integer MULsand IMULs, FDIVs, FPREMs, FSQRTS, integer
 DIVs, and IDIVs.
 This event does not distinguish an FADD used in the middle
 of a transcendental flow from a separate FADD instruction.
 .It Li FP_COMP_OPS_EXE.MMX
 .Pq Event 10H , Umask 02H
 Counts number of MMX Uops executed.
 .It Li FP_COMP_OPS_EXE.SSE_FP
 .Pq Event 10H , Umask 04H
 Counts number of SSE and SSE2 FP uops executed.
 .It Li FP_COMP_OPS_EXE.SSE2_INTEGER
 .Pq Event 10H , Umask 08H
 Counts number of SSE2 integer uops executed.
 .It Li FP_COMP_OPS_EXE.SSE_FP_PACKED
 .Pq Event 10H , Umask 10H
 Counts number of SSE FP packed uops executed.
 .It Li FP_COMP_OPS_EXE.SSE_FP_SCALAR
 .Pq Event 10H , Umask 20H
 Counts number of SSE FP scalar uops executed.
 .It Li FP_COMP_OPS_EXE.SSE_SINGLE_PRECISION
 .Pq Event 10H , Umask 40H
 Counts number of SSE* FP single precision uops executed.
 .It Li FP_COMP_OPS_EXE.SSE_DOUBLE_PRECISION
 .Pq Event 10H , Umask 80H
 Counts number of SSE* FP double precision uops executed.
 .It Li SIMD_INT_128.PACKED_MPY
 .Pq Event 12H , Umask 01H
 Counts number of 128 bit SIMD integer multiply operations.
 .It Li SIMD_INT_128.PACKED_SHIFT
 .Pq Event 12H , Umask 02H
 Counts number of 128 bit SIMD integer shift operations.
 .It Li SIMD_INT_128.PACK
 .Pq Event 12H , Umask 04H
 Counts number of 128 bit SIMD integer pack operations.
 .It Li SIMD_INT_128.UNPACK
 .Pq Event 12H , Umask 08H
 Counts number of 128 bit SIMD integer unpack operations.
 .It Li SIMD_INT_128.PACKED_LOGICAL
 .Pq Event 12H , Umask 10H
 Counts number of 128 bit SIMD integer logical operations.
 .It Li SIMD_INT_128.PACKED_ARITH
 .Pq Event 12H , Umask 20H
 Counts number of 128 bit SIMD integer arithmetic operations.
 .It Li SIMD_INT_128.SHUFFLE_MOVE
 .Pq Event 12H , Umask 40H
 Counts number of 128 bit SIMD integer shuffle and move operations.
 .It Li LOAD_DISPATCH.RS
 .Pq Event 13H , Umask 01H
 Counts number of loads dispatched from the Reservation Station that bypass
 the Memory Order Buffer.
 .It Li LOAD_DISPATCH.RS_DELAYED
 .Pq Event 13H , Umask 02H
 Counts the number of delayed RS dispatches at the stage latch.
 If an RS dispatch can not bypass to LB, it has another chance to dispatch
 from the one-cycle delayed staging latch before it is written into the LB.
 .It Li LOAD_DISPATCH.MOB
 .Pq Event 13H , Umask 04H
 Counts the number of loads dispatched from the Reservation Station to the
 Memory Order Buffer.
 .It Li LOAD_DISPATCH.ANY
 .Pq Event 13H , Umask 07H
 Counts all loads dispatched from the Reservation Station.
 .It Li ARITH.CYCLES_DIV_BUSY
 .Pq Event 14H , Umask 01H
 Counts the number of cycles the divider is busy executing divide or square
 root operations.
 The divide can be integer, X87 or Streaming SIMD Extensions (SSE).
 The square root operation can be either X87 or SSE.
 Set 'edge =1, invert=1, cmask=1' to count the number of divides.
 Count may be incorrect When SMT is on
 .It Li ARITH.MUL
 .Pq Event 14H , Umask 02H
 Counts the number of multiply operations executed.
 This includes integer as
 well as floating point multiply operations but excludes DPPS mul and MPSAD.
 Count may be incorrect When SMT is on
 .It Li INST_QUEUE_WRITES
 .Pq Event 17H , Umask 01H
 Counts the number of instructions written into the instruction queue every
 cycle.
 .It Li INST_DECODED.DEC0
 .Pq Event 18H , Umask 01H
 Counts number of instructions that require decoder 0 to be decoded.
 Usually, this means that the instruction maps to more than 1 uop
 .It Li TWO_UOP_INSTS_DECODED
 .Pq Event 19H , Umask 01H
 An instruction that generates two uops was decoded
 .It Li INST_QUEUE_WRITE_CYCLES
 .Pq Event 1EH , Umask 01H
 This event counts the number of cycles during which instructions are written
 to the instruction queue.
 Dividing this counter by the number of
 instructions written to the instruction queue (INST_QUEUE_WRITES) yields the
 average number of instructions decoded each cycle.
 If this number is less
 than four and the pipe stalls, this indicates that the decoder is failing to
 decode enough instructions per cycle to sustain the 4-wide pipeline.
 If SSE* instructions that are 6 bytes or longer arrive one after another,
 then front end throughput may limit execution speed.
 In such case,
 .It Li LSD_OVERFLOW
 .Pq Event 20H , Umask 01H
 Number of loops that can not stream from the instruction queue.
 .It Li L2_RQSTS.LD_HIT
 .Pq Event 24H , Umask 01H
 Counts number of loads that hit the L2 cache.
 L2 loads include both L1D demand misses as well as L1D prefetches.
 L2 loads can be rejected for various reasons.
 Only non rejected loads are counted.
 .It Li L2_RQSTS.LD_MISS
 .Pq Event 24H , Umask 02H
 Counts the number of loads that miss the L2 cache.
 L2 loads include both L1D demand misses as well as L1D prefetches.
 .It Li L2_RQSTS.LOADS
 .Pq Event 24H , Umask 03H
 Counts all L2 load requests.
 L2 loads include both L1D demand misses as well as L1D prefetches.
 .It Li L2_RQSTS.RFO_HIT
 .Pq Event 24H , Umask 04H
 Counts the number of store RFO requests that hit the L2 cache.
 L2 RFO requests include both L1D demand RFO misses as well as L1D RFO
 prefetches.
 Count includes WC memory requests, where the data is not fetched but the
 permission to write the line is required.
 .It Li L2_RQSTS.RFO_MISS
 .Pq Event 24H , Umask 08H
 Counts the number of store RFO requests that miss the L2 cache.
 L2 RFO requests include both L1D demand RFO misses as well as L1D RFO
 prefetches.
 .It Li L2_RQSTS.RFOS
 .Pq Event 24H , Umask 0CH
 Counts all L2 store RFO requests.
 L2 RFO requests include both L1D demand
 RFO misses as well as L1D RFO prefetches.
 .It Li L2_RQSTS.IFETCH_HIT
 .Pq Event 24H , Umask 10H
 Counts number of instruction fetches that hit the L2 cache.
 L2 instruction fetches include both L1I demand misses as well as L1I
 instruction prefetches.
 .It Li L2_RQSTS.IFETCH_MISS
 .Pq Event 24H , Umask 20H
 Counts number of instruction fetches that miss the L2 cache.
 L2 instruction fetches include both L1I demand misses as well as L1I
 instruction prefetches.
 .It Li L2_RQSTS.IFETCHES
 .Pq Event 24H , Umask 30H
 Counts all instruction fetches.
 L2 instruction fetches include both L1I
 demand misses as well as L1I instruction prefetches.
 .It Li L2_RQSTS.PREFETCH_HIT
 .Pq Event 24H , Umask 40H
 Counts L2 prefetch hits for both code and data.
 .It Li L2_RQSTS.PREFETCH_MISS
 .Pq Event 24H , Umask 80H
 Counts L2 prefetch misses for both code and data.
 .It Li L2_RQSTS.PREFETCHES
 .Pq Event 24H , Umask C0H
 Counts all L2 prefetches for both code and data.
 .It Li L2_RQSTS.MISS
 .Pq Event 24H , Umask AAH
 Counts all L2 misses for both code and data.
 .It Li L2_RQSTS.REFERENCES
 .Pq Event 24H , Umask FFH
 Counts all L2 requests for both code and data.
 .It Li L2_DATA_RQSTS.DEMAND.I_STATE
 .Pq Event 26H , Umask 01H
 Counts number of L2 data demand loads where the cache line to be loaded is
 in the I (invalid) state, i.e. a cache miss.
 L2 demand loads are both L1D demand misses and L1D prefetches.
 .It Li L2_DATA_RQSTS.DEMAND.S_STATE
 .Pq Event 26H , Umask 02H
 Counts number of L2 data demand loads where the cache line to be loaded is
 in the S (shared) state.
 L2 demand loads are both L1D demand misses and L1D
 prefetches.
 .It Li L2_DATA_RQSTS.DEMAND.E_STATE
 .Pq Event 26H , Umask 04H
 Counts number of L2 data demand loads where the cache line to be loaded is
 in the E (exclusive) state.
 L2 demand loads are both L1D demand misses and
 L1D prefetches.
 .It Li L2_DATA_RQSTS.DEMAND.M_STATE
 .Pq Event 26H , Umask 08H
 Counts number of L2 data demand loads where the cache line to be loaded is
 in the M (modified) state.
 L2 demand loads are both L1D demand misses and
 L1D prefetches.
 .It Li L2_DATA_RQSTS.DEMAND.MESI
 .Pq Event 26H , Umask 0FH
 Counts all L2 data demand requests.
 L2 demand loads are both L1D demand
 misses and L1D prefetches.
 .It Li L2_DATA_RQSTS.PREFETCH.I_STATE
 .Pq Event 26H , Umask 10H
 Counts number of L2 prefetch data loads where the cache line to be loaded is
 in the I (invalid) state, i.e. a cache miss.
 .It Li L2_DATA_RQSTS.PREFETCH.S_STATE
 .Pq Event 26H , Umask 20H
 Counts number of L2 prefetch data loads where the cache line to be loaded is
 in the S (shared) state.
 A prefetch RFO will miss on an S state line, while
 a prefetch read will hit on an S state line.
 .It Li L2_DATA_RQSTS.PREFETCH.E_STATE
 .Pq Event 26H , Umask 40H
 Counts number of L2 prefetch data loads where the cache line to be loaded is
 in the E (exclusive) state.
 .It Li L2_DATA_RQSTS.PREFETCH.M_STATE
 .Pq Event 26H , Umask 80H
 Counts number of L2 prefetch data loads where the cache line to be loaded is
 in the M (modified) state.
 .It Li L2_DATA_RQSTS.PREFETCH.MESI
 .Pq Event 26H , Umask F0H
 Counts all L2 prefetch requests.
 .It Li L2_DATA_RQSTS.ANY
 .Pq Event 26H , Umask FFH
 Counts all L2 data requests.
 .It Li L2_WRITE.RFO.I_STATE
 .Pq Event 27H , Umask 01H
 Counts number of L2 demand store RFO requests where the cache line to be
 loaded is in the I (invalid) state, i.e, a cache miss.
 The L1D prefetcher
 does not issue a RFO prefetch.
 This is a demand RFO request
 .It Li L2_WRITE.RFO.S_STATE
 .Pq Event 27H , Umask 02H
 Counts number of L2 store RFO requests where the cache line to be loaded is
 in the S (shared) state.
 The L1D prefetcher does not issue a RFO prefetch.
 This is a demand RFO request.
 .It Li L2_WRITE.RFO.M_STATE
 .Pq Event 27H , Umask 08H
 Counts number of L2 store RFO requests where the cache line to be loaded is
 in the M (modified) state.
 The L1D prefetcher does not issue a RFO prefetch.
 This is a demand RFO request.
 .It Li L2_WRITE.RFO.HIT
 .Pq Event 27H , Umask 0EH
 Counts number of L2 store RFO requests where the cache line to be loaded is
 in either the S, E or M states.
 The L1D prefetcher does not issue a RFO
 prefetch.
 This is a demand RFO request
 .It Li L2_WRITE.RFO.MESI
 .Pq Event 27H , Umask 0FH
 Counts all L2 store RFO requests.The L1D prefetcher does not issue a RFO
 prefetch.
 This is a demand RFO request.
 .It Li L2_WRITE.LOCK.I_STATE
 .Pq Event 27H , Umask 10H
 Counts number of L2 demand lock RFO requests where the cache line to be
 loaded is in the I (invalid) state, i.e. a cache miss.
 .It Li L2_WRITE.LOCK.S_STATE
 .Pq Event 27H , Umask 20H
 Counts number of L2 lock RFO requests where the cache line to be loaded is
 in the S (shared) state.
 .It Li L2_WRITE.LOCK.E_STATE
 .Pq Event 27H , Umask 40H
 Counts number of L2 demand lock RFO requests where the cache line to be
 loaded is in the E (exclusive) state.
 .It Li L2_WRITE.LOCK.M_STATE
 .Pq Event 27H , Umask 80H
 Counts number of L2 demand lock RFO requests where the cache line to be
 loaded is in the M (modified) state.
 .It Li L2_WRITE.LOCK.HIT
 .Pq Event 27H , Umask E0H
 Counts number of L2 demand lock RFO requests where the cache line to be
 loaded is in either the S, E, or M state.
 .It Li L2_WRITE.LOCK.MESI
 .Pq Event 27H , Umask F0H
 Counts all L2 demand lock RFO requests.
 .It Li L1D_WB_L2.I_STATE
 .Pq Event 28H , Umask 01H
 Counts number of L1 writebacks to the L2 where the cache line to be written
 is in the I (invalid) state, i.e. a cache miss.
 .It Li L1D_WB_L2.S_STATE
 .Pq Event 28H , Umask 02H
 Counts number of L1 writebacks to the L2 where the cache line to be written
 is in the S state.
 .It Li L1D_WB_L2.E_STATE
 .Pq Event 28H , Umask 04H
 Counts number of L1 writebacks to the L2 where the cache line to be written
 is in the E (exclusive) state.
 .It Li L1D_WB_L2.M_STATE
 .Pq Event 28H , Umask 08H
 Counts number of L1 writebacks to the L2 where the cache line to be written
 is in the M (modified) state.
 .It Li L1D_WB_L2.MESI
 .Pq Event 28H , Umask 0FH
 Counts all L1 writebacks to the L2.
 .It Li L3_LAT_CACHE.REFERENCE
 .Pq Event 2EH , Umask 02H
 Counts uncore Last Level Cache references.
 Because cache hierarchy, cache
 sizes and other implementation-specific characteristics; value comparison to
 estimate performance differences is not recommended.
 See Table A-1.
 .It Li L3_LAT_CACHE.MISS
 .Pq Event 2EH , Umask 01H
 Counts uncore Last Level Cache misses.
 Because cache hierarchy, cache sizes
 and other implementation-specific characteristics; value comparison to
 estimate performance differences is not recommended.
 See Table A-1.
 .It Li CPU_CLK_UNHALTED.THREAD_P
 .Pq Event 3CH , Umask 00H
 Counts the number of thread cycles while the thread is not in a halt state.
 The thread enters the halt state when it is running the HLT instruction.
 The core frequency may change from time to time due to power or thermal
 throttling.
 see Table A-1
 .It Li CPU_CLK_UNHALTED.REF_P
 .Pq Event 3CH , Umask 01H
 Increments at the frequency of TSC when not halted.
 see Table A-1
 .It Li DTLB_MISSES.ANY
 .Pq Event 49H , Umask 01H
 Counts the number of misses in the STLB which causes a page walk.
 .It Li DTLB_MISSES.WALK_COMPLETED
 .Pq Event 49H , Umask 02H
 Counts number of misses in the STLB which resulted in a completed page walk.
 .It Li DTLB_MISSES.WALK_CYCLES
 .Pq Event 49H , Umask 04H
 Counts cycles of page walk due to misses in the STLB.
 .It Li DTLB_MISSES.STLB_HIT
 .Pq Event 49H , Umask 10H
 Counts the number of DTLB first level misses that hit in the second level
 TLB.
 This event is only relevant if the core contains multiple DTLB levels.
 .It Li DTLB_MISSES.LARGE_WALK_COMPLETED
 .Pq Event 49H , Umask 80H
 Counts number of completed large page walks due to misses in the STLB.
 .It Li LOAD_HIT_PRE
 .Pq Event 4CH , Umask 01H
 Counts load operations sent to the L1 data cache while a previous SSE
 prefetch instruction to the same cache line has started prefetching but has
 not yet finished.
 .It Li L1D_PREFETCH.REQUESTS
 .Pq Event 4EH , Umask 01H
 Counts number of hardware prefetch requests dispatched out of the prefetch
 FIFO.
 .It Li L1D_PREFETCH.MISS
 .Pq Event 4EH , Umask 02H
 Counts number of hardware prefetch requests that miss the L1D.
 There are two
 prefetchers in the L1D.
 A streamer, which predicts lines sequentially after
 this one should be fetched, and the IP prefetcher that remembers access
 patterns for the current instruction.
 The streamer prefetcher stops on an
 L1D hit, while the IP prefetcher does not.
 .It Li L1D_PREFETCH.TRIGGERS
 .Pq Event 4EH , Umask 04H
 Counts number of prefetch requests triggered by the Finite State Machine and
 pushed into the prefetch FIFO.
 Some of the prefetch requests are dropped due
 to overwrites or competition between the IP index prefetcher and streamer
 prefetcher.
 The prefetch FIFO contains 4 entries.
 .It Li EPT.WALK_CYCLES
 .Pq Event 4FH , Umask 10H
 Counts Extended Page walk cycles.
 .It Li L1D.REPL
 .Pq Event 51H , Umask 01H
 Counts the number of lines brought into the L1 data cache.
 Counter 0, 1 only.
 .It Li L1D.M_REPL
 .Pq Event 51H , Umask 02H
 Counts the number of modified lines brought into the L1 data cache.
 Counter 0, 1 only.
 .It Li L1D.M_EVICT
 .Pq Event 51H , Umask 04H
 Counts the number of modified lines evicted from the L1 data cache due to
 replacement.
 Counter 0, 1 only.
 .It Li L1D.M_SNOOP_EVICT
 .Pq Event 51H , Umask 08H
 Counts the number of modified lines evicted from the L1 data cache due to
 snoop HITM intervention.
 Counter 0, 1 only
 .It Li L1D_CACHE_PREFETCH_LOCK_FB_HIT
 .Pq Event 52H , Umask 01H
 Counts the number of cacheable load lock speculated instructions accepted
 into the fill buffer.
 .It Li L1D_CACHE_LOCK_FB_HIT
 .Pq Event 53H , Umask 01H
 Counts the number of cacheable load lock speculated or retired instructions
 accepted into the fill buffer.
 .It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND.READ_DATA
 .Pq Event 60H , Umask 01H
 Counts weighted cycles of offcore demand data read requests.
 Does not include L2 prefetch requests.
 Counter 0.
 .It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND.READ_CODE
 .Pq Event 60H , Umask 02H
 Counts weighted cycles of offcore demand code read requests.
 Does not include L2 prefetch requests.
 Counter 0.
 .It Li OFFCORE_REQUESTS_OUTSTANDING.DEMAND.RFO
 .Pq Event 60H , Umask 04H
 Counts weighted cycles of offcore demand RFO requests.
 Does not include L2 prefetch requests.
 Counter 0.
 .It Li OFFCORE_REQUESTS_OUTSTANDING.ANY.READ
 .Pq Event 60H , Umask 08H
 Counts weighted cycles of offcore read requests of any kind.
 Include L2 prefetch requests.
 Counter 0.
 .It Li CACHE_LOCK_CYCLES.L1D_L2
 .Pq Event 63H , Umask 01H
 Cycle count during which the L1D and L2 are locked.
 A lock is asserted when
 there is a locked memory access, due to uncacheable memory, a locked
 operation that spans two cache lines, or a page walk from an uncacheable
 page table.
 Counter 0, 1 only.
 L1D and L2 locks have a very high performance penalty and
 it is highly recommended to avoid such accesses.
 .It Li CACHE_LOCK_CYCLES.L1D
 .Pq Event 63H , Umask 02H
 Counts the number of cycles that cacheline in the L1 data cache unit is
 locked.
 Counter 0, 1 only.
 .It Li IO_TRANSACTIONS
 .Pq Event 6CH , Umask 01H
 Counts the number of completed I/O transactions.
 .It Li L1I.HITS
 .Pq Event 80H , Umask 01H
 Counts all instruction fetches that hit the L1 instruction cache.
 .It Li L1I.MISSES
 .Pq Event 80H , Umask 02H
 Counts all instruction fetches that miss the L1I cache.
 This includes
 instruction cache misses, streaming buffer misses, victim cache misses and
 uncacheable fetches.
 An instruction fetch miss is counted only once and not
 once for every cycle it is outstanding.
 .It Li L1I.READS
 .Pq Event 80H , Umask 03H
 Counts all instruction fetches, including uncacheable fetches that bypass
 the L1I.
 .It Li L1I.CYCLES_STALLED
 .Pq Event 80H , Umask 04H
 Cycle counts for which an instruction fetch stalls due to a L1I cache miss,
 ITLB miss or ITLB fault.
 .It Li LARGE_ITLB.HIT
 .Pq Event 82H , Umask 01H
 Counts number of large ITLB hits.
 .It Li ITLB_MISSES.ANY
 .Pq Event 85H , Umask 01H
 Counts the number of misses in all levels of the ITLB which causes a page
 walk.
 .It Li ITLB_MISSES.WALK_COMPLETED
 .Pq Event 85H , Umask 02H
 Counts number of misses in all levels of the ITLB which resulted in a
 completed page walk.
 .It Li ITLB_MISSES.WALK_CYCLES
 .Pq Event 85H , Umask 04H
 Counts ITLB miss page walk cycles.
 .It Li ITLB_MISSES.LARGE_WALK_COMPLETED
 .Pq Event 85H , Umask 80H
 Counts number of completed large page walks due to misses in the STLB.
 .It Li ILD_STALL.LCP
 .Pq Event 87H , Umask 01H
 Cycles Instruction Length Decoder stalls due to length changing prefixes:
 66, 67 or REX.W (for EM64T) instructions which change the length of the
 decoded instruction.
 .It Li ILD_STALL.MRU
 .Pq Event 87H , Umask 02H
 Instruction Length Decoder stall cycles due to Brand Prediction Unit (PBU)
 Most Recently Used (MRU) bypass.
 .It Li ILD_STALL.IQ_FULL
 .Pq Event 87H , Umask 04H
 Stall cycles due to a full instruction queue.
 .It Li ILD_STALL.REGEN
 .Pq Event 87H , Umask 08H
 Counts the number of regen stalls.
 .It Li ILD_STALL.ANY
 .Pq Event 87H , Umask 0FH
 Counts any cycles the Instruction Length Decoder is stalled.
 .It Li BR_INST_EXEC.COND
 .Pq Event 88H , Umask 01H
 Counts the number of conditional near branch instructions executed, but not
 necessarily retired.
 .It Li BR_INST_EXEC.DIRECT
 .Pq Event 88H , Umask 02H
 Counts all unconditional near branch instructions excluding calls and
 indirect branches.
 .It Li BR_INST_EXEC.INDIRECT_NON_CALL
 .Pq Event 88H , Umask 04H
 Counts the number of executed indirect near branch instructions that are not
 calls.
 .It Li BR_INST_EXEC.NON_CALLS
 .Pq Event 88H , Umask 07H
 Counts all non call near branch instructions executed, but not necessarily
 retired.
 .It Li BR_INST_EXEC.RETURN_NEAR
 .Pq Event 88H , Umask 08H
 Counts indirect near branches that have a return mnemonic.
 .It Li BR_INST_EXEC.DIRECT_NEAR_CALL
 .Pq Event 88H , Umask 10H
 Counts unconditional near call branch instructions, excluding non call
 branch, executed.
 .It Li BR_INST_EXEC.INDIRECT_NEAR_CALL
 .Pq Event 88H , Umask 20H
 Counts indirect near calls, including both register and memory indirect,
 executed.
 .It Li BR_INST_EXEC.NEAR_CALLS
 .Pq Event 88H , Umask 30H
 Counts all near call branches executed, but not necessarily retired.
 .It Li BR_INST_EXEC.TAKEN
 .Pq Event 88H , Umask 40H
 Counts taken near branches executed, but not necessarily retired.
 .It Li BR_INST_EXEC.ANY
 .Pq Event 88H , Umask 7FH
 Counts all near executed branches (not necessarily retired).
 This includes only instructions and not micro-op branches.
 Frequent branching is not necessarily a major performance issue.
 However frequent branch mispredictions may be a problem.
 .It Li BR_MISP_EXEC.COND
 .Pq Event 89H , Umask 01H
 Counts the number of mispredicted conditional near branch instructions
 executed, but not necessarily retired.
 .It Li BR_MISP_EXEC.DIRECT
 .Pq Event 89H , Umask 02H
 Counts mispredicted macro unconditional near branch instructions, excluding
 calls and indirect branches (should always be 0).
 .It Li BR_MISP_EXEC.INDIRECT_NON_CALL
 .Pq Event 89H , Umask 04H
 Counts the number of executed mispredicted indirect near branch instructions
 that are not calls.
 .It Li BR_MISP_EXEC.NON_CALLS
 .Pq Event 89H , Umask 07H
 Counts mispredicted non call near branches executed, but not necessarily
 retired.
 .It Li BR_MISP_EXEC.RETURN_NEAR
 .Pq Event 89H , Umask 08H
 Counts mispredicted indirect branches that have a rear return mnemonic.
 .It Li BR_MISP_EXEC.DIRECT_NEAR_CALL
 .Pq Event 89H , Umask 10H
 Counts mispredicted non-indirect near calls executed, (should always be 0).
 .It Li BR_MISP_EXEC.INDIRECT_NEAR_CALL
 .Pq Event 89H , Umask 20H
 Counts mispredicted indirect near calls executed, including both register
 and memory indirect.
 .It Li BR_MISP_EXEC.NEAR_CALLS
 .Pq Event 89H , Umask 30H
 Counts all mispredicted near call branches executed, but not necessarily
 retired.
 .It Li BR_MISP_EXEC.TAKEN
 .Pq Event 89H , Umask 40H
 Counts executed mispredicted near branches that are taken, but not
 necessarily retired.
 .It Li BR_MISP_EXEC.ANY
 .Pq Event 89H , Umask 7FH
 Counts the number of mispredicted near branch instructions that were
 executed, but not necessarily retired.
 .It Li RESOURCE_STALLS.ANY
 .Pq Event A2H , Umask 01H
 Counts the number of Allocator resource related stalls.
 Includes register renaming buffer entries, memory buffer entries.
 In addition to resource related stalls, this event counts some other events.
 Includes stalls arising
 during branch misprediction recovery, such as if retirement of the
 mispredicted branch is delayed and stalls arising while store buffer is
 draining from synchronizing operations.
 Does not include stalls due to SuperQ (off core) queue full, too many cache
 misses, etc.
 .It Li RESOURCE_STALLS.LOAD
 .Pq Event A2H , Umask 02H
 Counts the cycles of stall due to lack of load buffer for load operation.
 .It Li RESOURCE_STALLS.RS_FULL
 .Pq Event A2H , Umask 04H
 This event counts the number of cycles when the number of instructions in
 the pipeline waiting for execution reaches the limit the processor can
 handle.
 A high count of this event indicates that there are long latency
 operations in the pipe (possibly load and store operations that miss the L2
 cache, or instructions dependent upon instructions further down the pipeline
 that have yet to retire.
 When RS is full, new instructions can not enter the reservation station and
 start execution.
 .It Li RESOURCE_STALLS.STORE
 .Pq Event A2H , Umask 08H
 This event counts the number of cycles that a resource related stall will
 occur due to the number of store instructions reaching the limit of the
 pipeline, (i.e. all store buffers are used).
 The stall ends when a store
 instruction commits its data to the cache or memory.
 .It Li RESOURCE_STALLS.ROB_FULL
 .Pq Event A2H , Umask 10H
 Counts the cycles of stall due to re- order buffer full.
 .It Li RESOURCE_STALLS.FPCW
 .Pq Event A2H , Umask 20H
 Counts the number of cycles while execution was stalled due to writing the
 floating-point unit (FPU) control word.
 .It Li RESOURCE_STALLS.MXCSR
 .Pq Event A2H , Umask 40H
 Stalls due to the MXCSR register rename occurring to close to a previous
 MXCSR rename.
 The MXCSR provides control and status for the MMX registers.
 .It Li RESOURCE_STALLS.OTHER
 .Pq Event A2H , Umask 80H
 Counts the number of cycles while execution was stalled due to other
 resource issues.
 .It Li MACRO_INSTS.FUSIONS_DECODED
 .Pq Event A6H , Umask 01H
 Counts the number of instructions decoded that are macro-fused but not
 necessarily executed or retired.
 .It Li BACLEAR_FORCE_IQ
 .Pq Event A7H , Umask 01H
 Counts number of times a BACLEAR was forced by the Instruction Queue.
 The IQ is also responsible for providing conditional branch prediction
 direction based on a static scheme and dynamic data provided by the L2
 Branch Prediction Unit.
 If the conditional branch target is not found in the Target
 Array and the IQ predicts that the branch is taken, then the IQ will force
 the Branch Address Calculator to issue a BACLEAR.
 Each BACLEAR asserted by
 the BAC generates approximately an 8 cycle bubble in the instruction fetch
 pipeline.
 .It Li LSD.UOPS
 .Pq Event A8H , Umask 01H
 Counts the number of micro-ops delivered by loop stream detector
 Use cmask=1 and invert to count cycles
 .It Li ITLB_FLUSH
 .Pq Event AEH , Umask 01H
 Counts the number of ITLB flushes
 .It Li OFFCORE_REQUESTS.DEMAND.READ_DATA
 .Pq Event B0H , Umask 01H
 Counts number of offcore demand data read requests.
 Does not count L2 prefetch requests.
 .It Li OFFCORE_REQUESTS.DEMAND.READ_CODE
 .Pq Event B0H , Umask 02H
 Counts number of offcore demand code read requests.
 Does not count L2 prefetch requests.
 .It Li OFFCORE_REQUESTS.DEMAND.RFO
 .Pq Event B0H , Umask 04H
 Counts number of offcore demand RFO requests.
 Does not count L2 prefetch requests.
 .It Li OFFCORE_REQUESTS.ANY.READ
 .Pq Event B0H , Umask 08H
 Counts number of offcore read requests.
 Includes L2 prefetch requests.
 .It Li OFFCORE_REQUESTS.ANY.RFO
 .Pq Event 80H , Umask 10H
 Counts number of offcore RFO requests.
 Includes L2 prefetch requests.
 .It Li OFFCORE_REQUESTS.L1D_WRITEBACK
 .Pq Event B0H , Umask 40H
 Counts number of L1D writebacks to the uncore.
 .It Li OFFCORE_REQUESTS.ANY
 .Pq Event B0H , Umask 80H
 Counts all offcore requests.
 .It Li UOPS_EXECUTED.PORT0
 .Pq Event B1H , Umask 01H
 Counts number of Uops executed that were issued on port 0.
 Port 0 handles integer arithmetic, SIMD and FP add Uops.
 .It Li UOPS_EXECUTED.PORT1
 .Pq Event B1H , Umask 02H
 Counts number of Uops executed that were issued on port 1.
 Port 1 handles integer arithmetic, SIMD, integer shift, FP multiply and
 FP divide Uops.
 .It Li UOPS_EXECUTED.PORT2_CORE
 .Pq Event B1H , Umask 04H
 Counts number of Uops executed that were issued on port 2.
 Port 2 handles the load Uops.
 This is a core count only and can not be collected per
 thread.
 .It Li UOPS_EXECUTED.PORT3_CORE
 .Pq Event B1H , Umask 08H
 Counts number of Uops executed that were issued on port 3.
 Port 3 handles store Uops.
 This is a core count only and can not be collected per thread.
 .It Li UOPS_EXECUTED.PORT4_CORE
 .Pq Event B1H , Umask 10H
 Counts number of Uops executed that where issued on port 4.
 Port 4 handles the value to be stored for the store Uops issued on port 3.
 This is a core count only and can not be collected per thread.
 .It Li UOPS_EXECUTED.CORE_ACTIVE_CYCLES_NO_PORT5
 .Pq Event B1H , Umask 1FH
 Counts number of cycles there are one or more uops being executed and were
 issued on ports 0-4.
 This is a core count only and can not be collected per thread.
 .It Li UOPS_EXECUTED.PORT5
 .Pq Event B1H , Umask 20H
 Counts number of Uops executed that where issued on port 5.
 .It Li UOPS_EXECUTED.CORE_ACTIVE_CYCLES
 .Pq Event B1H , Umask 3FH
 Counts number of cycles there are one or more uops being executed on any
 ports.
 This is a core count only and can not be collected per thread.
 .It Li UOPS_EXECUTED.PORT015
 .Pq Event B1H , Umask 40H
 Counts number of Uops executed that where issued on port 0, 1, or 5.
 Use cmask=1, invert=1 to count stall cycles.
 .It Li UOPS_EXECUTED.PORT234
 .Pq Event B1H , Umask 80H
 Counts number of Uops executed that where issued on port 2, 3, or 4.
 .It Li OFFCORE_REQUESTS_SQ_FULL
 .Pq Event B2H , Umask 01H
 Counts number of cycles the SQ is full to handle off-core requests.
 .It Li SNOOPQ_REQUESTS_OUTSTANDING.DATA
 .Pq Event B3H , Umask 01H
 Counts weighted cycles of snoopq requests for data.
 Counter 0 only
 Use cmask=1 to count cycles not empty.
 .It Li SNOOPQ_REQUESTS_OUTSTANDING.INVALIDATE
 .Pq Event B3H , Umask 02H
 Counts weighted cycles of snoopq invalidate requests.
 Counter 0 only.
 Use cmask=1 to count cycles not empty.
 .It Li SNOOPQ_REQUESTS_OUTSTANDING.CODE
 .Pq Event B3H , Umask 04H
 Counts weighted cycles of snoopq requests for code.
 Counter 0 only.
 Use cmask=1 to count cycles not empty.
 .It Li SNOOPQ_REQUESTS.CODE
 .Pq Event B4H , Umask 01H
 Counts the number of snoop code requests.
 .It Li SNOOPQ_REQUESTS.DATA
 .Pq Event B4H , Umask 02H
 Counts the number of snoop data requests.
 .It Li SNOOPQ_REQUESTS.INVALIDATE
 .Pq Event B4H , Umask 04H
 Counts the number of snoop invalidate requests
 .It Li OFF_CORE_RESPONSE_0
 .Pq Event B7H , Umask 01H
 see Section 30.6.1.3, Off-core Response Performance Monitoring in the
 Processor Core.
 Requires programming MSR 01A6H.
 .It Li SNOOP_RESPONSE.HIT
 .Pq Event B8H , Umask 01H
 Counts HIT snoop response sent by this thread in response to a snoop
 request.
 .It Li SNOOP_RESPONSE.HITE
 .Pq Event B8H , Umask 02H
 Counts HIT E snoop response sent by this thread in response to a snoop
 request.
 .It Li SNOOP_RESPONSE.HITM
 .Pq Event B8H , Umask 04H
 Counts HIT M snoop response sent by this thread in response to a snoop
 request.
 .It Li OFF_CORE_RESPONSE_1
 .Pq Event BBH , Umask 01H
 see Section 30.6.1.3, Off-core Response Performance Monitoring in the
 Processor Core.
 Use MSR 01A7H.
 .It Li INST_RETIRED.ANY_P
 .Pq Event C0H , Umask 01H
 See Table A-1
 Notes: INST_RETIRED.ANY is counted by a designated fixed counter.
 INST_RETIRED.ANY_P is counted by a programmable counter and is an
 architectural performance event.
 Event is supported if CPUID.A.EBX[1] = 0.
 Counting: Faulting executions of GETSEC/VM entry/VM Exit/MWait will not
 count as retired instructions.
 .It Li INST_RETIRED.X87
 .Pq Event C0H , Umask 02H
 Counts the number of floating point computational operations retired
 floating point computational operations executed by the assist handler and
 sub-operations of complex floating point instructions like transcendental
 instructions.
 .It Li INST_RETIRED.MMX
 .Pq Event C0H , Umask 04H
 Counts the number of retired: MMX instructions.
 .It Li UOPS_RETIRED.ANY
 .Pq Event C2H , Umask 01H
 Counts the number of micro-ops retired, (macro-fused=1, micro- fused=2,
 others=1; maximum count of 8 per cycle).
 Most instructions are composed of one or two micro-ops.
 Some instructions are decoded into longer sequences
 such as repeat instructions, floating point transcendental instructions, and
 assists.
 Use cmask=1 and invert to count active cycles or stalled cycles
 .It Li UOPS_RETIRED.RETIRE_SLOTS
 .Pq Event C2H , Umask 02H
 Counts the number of retirement slots used each cycle
 .It Li UOPS_RETIRED.MACRO_FUSED
 .Pq Event C2H , Umask 04H
 Counts number of macro-fused uops retired.
 .It Li MACHINE_CLEARS.CYCLES
 .Pq Event C3H , Umask 01H
 Counts the cycles machine clear is asserted.
 .It Li MACHINE_CLEARS.MEM_ORDER
 .Pq Event C3H , Umask 02H
 Counts the number of machine clears due to memory order conflicts.
 .It Li MACHINE_CLEARS.SMC
 .Pq Event C3H , Umask 04H
 Counts the number of times that a program writes to a code section.
 Self-modifying code causes a sever penalty in all Intel 64 and IA-32
 processors.
 The modified cache line is written back to the L2 and L3caches.
 .It Li BR_INST_RETIRED.ANY_P
 .Pq Event C4H , Umask 00H
 See Table A-1.
 .It Li BR_INST_RETIRED.CONDITIONAL
 .Pq Event C4H , Umask 01H
 Counts the number of conditional branch instructions retired.
 .It Li BR_INST_RETIRED.NEAR_CALL
 .Pq Event C4H , Umask 02H
 Counts the number of direct & indirect near unconditional calls retired.
 .It Li BR_INST_RETIRED.ALL_BRANCHES
 .Pq Event C4H , Umask 04H
 Counts the number of branch instructions retired.
 .It Li BR_MISP_RETIRED.ANY_P
 .Pq Event C5H , Umask 00H
 See Table A-1.
 .It Li BR_MISP_RETIRED.CONDITIONAL
 .Pq Event C5H , Umask 01H
 Counts mispredicted conditional retired calls.
 .It Li BR_MISP_RETIRED.NEAR_CALL
 .Pq Event C5H , Umask 02H
 Counts mispredicted direct & indirect near unconditional retired calls.
 .It Li BR_MISP_RETIRED.ALL_BRANCHES
 .Pq Event C5H , Umask 04H
 Counts all mispredicted retired calls.
 .It Li SSEX_UOPS_RETIRED.PACKED_SINGLE
 .Pq Event C7H , Umask 01H
 Counts SIMD packed single-precision floating point Uops retired.
 .It Li SSEX_UOPS_RETIRED.SCALAR_SINGLE
 .Pq Event C7H , Umask 02H
 Counts SIMD calar single-precision floating point Uops retired.
 .It Li SSEX_UOPS_RETIRED.PACKED_DOUBLE
 .Pq Event C7H , Umask 04H
 Counts SIMD packed double- precision floating point Uops retired.
 .It Li SSEX_UOPS_RETIRED.SCALAR_DOUBLE
 .Pq Event C7H , Umask 08H
 Counts SIMD scalar double-precision floating point Uops retired.
 .It Li SSEX_UOPS_RETIRED.VECTOR_INTEGER
 .Pq Event C7H , Umask 10H
 Counts 128-bit SIMD vector integer Uops retired.
 .It Li ITLB_MISS_RETIRED
 .Pq Event C8H , Umask 20H
 Counts the number of retired instructions that missed the ITLB when the
 instruction was fetched.
 .It Li MEM_LOAD_RETIRED.L1D_HIT
 .Pq Event CBH , Umask 01H
 Counts number of retired loads that hit the L1 data cache.
 .It Li MEM_LOAD_RETIRED.L2_HIT
 .Pq Event CBH , Umask 02H
 Counts number of retired loads that hit the L2 data cache.
 .It Li MEM_LOAD_RETIRED.L3_UNSHARED_HIT
 .Pq Event CBH , Umask 04H
 Counts number of retired loads that hit their own, unshared lines in the L3
 cache.
 .It Li MEM_LOAD_RETIRED.OTHER_CORE_L2_HIT_HITM
 .Pq Event CBH , Umask 08H
 Counts number of retired loads that hit in a sibling core's L2 (on die
 core).
 Since the L3 is inclusive of all cores on the package, this is an L3 hit.
 This counts both clean or modified hits.
 .It Li MEM_LOAD_RETIRED.L3_MISS
 .Pq Event CBH , Umask 10H
 Counts number of retired loads that miss the L3 cache.
 The load was satisfied by a remote socket, local memory or an IOH.
 .It Li MEM_LOAD_RETIRED.HIT_LFB
 .Pq Event CBH , Umask 40H
 Counts number of retired loads that miss the L1D and the address is located
 in an allocated line fill buffer and will soon be committed to cache.
 This is counting secondary L1D misses.
 .It Li MEM_LOAD_RETIRED.DTLB_MISS
 .Pq Event CBH , Umask 80H
 Counts the number of retired loads that missed the DTLB.
 The DTLB miss is not counted if the load operation causes a fault.
 This event counts loads from cacheable memory only.
 The event does not count loads by software prefetches.
 Counts both primary and secondary misses to the TLB.
 .It Li FP_MMX_TRANS.TO_FP
 .Pq Event CCH , Umask 01H
 Counts the first floating-point instruction following any MMX instruction.
 You can use this event to estimate the penalties for the transitions between
 floating-point and MMX technology states.
 .It Li FP_MMX_TRANS.TO_MMX
 .Pq Event CCH , Umask 02H
 Counts the first MMX instruction following a floating-point instruction.
 You can use this event to estimate the penalties for the transitions between
 floating-point and MMX technology states.
 .It Li FP_MMX_TRANS.ANY
 .Pq Event CCH , Umask 03H
 Counts all transitions from floating point to MMX instructions and from MMX
 instructions to floating point instructions.
 You can use this event to estimate the penalties for the transitions between
 floating-point and MMX technology states.
 .It Li MACRO_INSTS.DECODED
 .Pq Event D0H , Umask 01H
 Counts the number of instructions decoded, (but not necessarily executed or
 retired).
 .It Li UOPS_DECODED.STALL_CYCLES
 .Pq Event D1H , Umask 01H
 Counts the cycles of decoder stalls.
 .It Li UOPS_DECODED.MS
 .Pq Event D1H , Umask 02H
 Counts the number of Uops decoded by the Microcode Sequencer, MS.
 The MS delivers uops when the instruction is more than 4 uops long or a
 microcode assist is occurring.
 .It Li UOPS_DECODED.ESP_FOLDING
 .Pq Event D1H , Umask 04H
 Counts number of stack pointer (ESP) instructions decoded: push , pop , call
 , ret, etc.
 ESP instructions do not generate a Uop to increment or decrement ESP.
 Instead, they update an ESP_Offset register that keeps track of the
 delta to the current value of the ESP register.
 .It Li UOPS_DECODED.ESP_SYNC
 .Pq Event D1H , Umask 08H
 Counts number of stack pointer (ESP) sync operations where an ESP
 instruction is corrected by adding the ESP offset register to the current
 value of the ESP register.
 .It Li RAT_STALLS.FLAGS
 .Pq Event D2H , Umask 01H
 Counts the number of cycles during which execution stalled due to several
 reasons, one of which is a partial flag register stall.
 A partial register
 stall may occur when two conditions are met: 1) an instruction modifies
 some, but not all, of the flags in the flag register and 2) the next
 instruction, which depends on flags, depends on flags that were not modified
 by this instruction.
 .It Li RAT_STALLS.REGISTERS
 .Pq Event D2H , Umask 02H
 This event counts the number of cycles instruction execution latency became
 longer than the defined latency because the instruction used a register that
 was partially written by previous instruction.
 .It Li RAT_STALLS.ROB_READ_PORT
 .Pq Event D2H , Umask 04H
 Counts the number of cycles when ROB read port stalls occurred, which did
 not allow new micro-ops to enter the out-of-order pipeline.
 Note that, at
 this stage in the pipeline, additional stalls may occur at the same cycle
 and prevent the stalled micro-ops from entering the pipe.
 In such a case,
 micro-ops retry entering the execution pipe in the next cycle and the
 ROB-read port stall is counted again.
 .It Li RAT_STALLS.SCOREBOARD
 .Pq Event D2H , Umask 08H
 Counts the cycles where we stall due to microarchitecturally required
 serialization.
 Microcode scoreboarding stalls.
 .It Li RAT_STALLS.ANY
 .Pq Event D2H , Umask 0FH
 Counts all Register Allocation Table stall cycles due to: Cycles when ROB
 read port stalls occurred, which did not allow new micro-ops to enter the
 execution pipe.
 Cycles when partial register stalls occurred Cycles when
 flag stalls occurred Cycles floating-point unit (FPU) status word stalls
 occurred.
 To count each of these conditions separately use the events:
 RAT_STALLS.ROB_READ_PORT, RAT_STALLS.PARTIAL, RAT_STALLS.FLAGS, and
 RAT_STALLS.FPSW.
 .It Li SEG_RENAME_STALLS
 .Pq Event D4H , Umask 01H
 Counts the number of stall cycles due to the lack of renaming resources for
 the ES, DS, FS, and GS segment registers.
 If a segment is renamed but not
 retired and a second update to the same segment occurs, a stall occurs in
 the front- end of the pipeline until the renamed segment retires.
 .It Li ES_REG_RENAMES
 .Pq Event D5H , Umask 01H
 Counts the number of times the ES segment register is renamed.
 .It Li UOP_UNFUSION
 .Pq Event DBH , Umask 01H
 Counts unfusion events due to floating point exception to a fused uop.
 .It Li BR_INST_DECODED
 .Pq Event E0H , Umask 01H
 Counts the number of branch instructions decoded.
 .It Li BPU_MISSED_CALL_RET
 .Pq Event E5H , Umask 01H
 Counts number of times the Branch Prediction Unit missed predicting a call
 or return branch.
 .It Li BACLEAR.CLEAR
 .Pq Event E6H , Umask 01H
 Counts the number of times the front end is resteered, mainly when the
 Branch Prediction Unit cannot provide a correct prediction and this is
 corrected by the Branch Address Calculator at the front end.
 This can occur
 if the code has many branches such that they cannot be consumed by the BPU.
 Each BACLEAR asserted by the BAC generates approximately an 8 cycle bubble
 in the instruction fetch pipeline.
 The effect on total execution time depends on the surrounding code.
 .It Li BACLEAR.BAD_TARGET
 .Pq Event E6H , Umask 02H
 Counts number of Branch Address Calculator clears (BACLEAR) asserted due to
 conditional branch instructions in which there was a target hit but the
 direction was wrong.
 Each BACLEAR asserted by the BAC generates
 approximately an 8 cycle bubble in the instruction fetch pipeline.
 .It Li BPU_CLEARS.EARLY
 .Pq Event E8H , Umask 01H
 Counts early (normal) Branch Prediction Unit clears: BPU predicted a taken
 branch after incorrectly assuming that it was not taken.
 The BPU clear leads to 2 cycle bubble in the Front End.
 .It Li BPU_CLEARS.LATE
 .Pq Event E8H , Umask 02H
 Counts late Branch Prediction Unit clears due to Most Recently Used
 conflicts.
 The PBU clear leads to a 3 cycle bubble in the Front End.
 .It Li THREAD_ACTIVE
 .Pq Event ECH , Umask 01H
 Counts cycles threads are active.
 .It Li L2_TRANSACTIONS.LOAD
 .Pq Event F0H , Umask 01H
 Counts L2 load operations due to HW prefetch or demand loads.
 .It Li L2_TRANSACTIONS.RFO
 .Pq Event F0H , Umask 02H
 Counts L2 RFO operations due to HW prefetch or demand RFOs.
 .It Li L2_TRANSACTIONS.IFETCH
 .Pq Event F0H , Umask 04H
 Counts L2 instruction fetch operations due to HW prefetch or demand ifetch.
 .It Li L2_TRANSACTIONS.PREFETCH
 .Pq Event F0H , Umask 08H
 Counts L2 prefetch operations.
 .It Li L2_TRANSACTIONS.L1D_WB
 .Pq Event F0H , Umask 10H
 Counts L1D writeback operations to the L2.
 .It Li L2_TRANSACTIONS.FILL
 .Pq Event F0H , Umask 20H
 Counts L2 cache line fill operations due to load, RFO, L1D writeback or
 prefetch.
 .It Li L2_TRANSACTIONS.WB
 .Pq Event F0H , Umask 40H
 Counts L2 writeback operations to the L3.
 .It Li L2_TRANSACTIONS.ANY
 .Pq Event F0H , Umask 80H
 Counts all L2 cache operations.
 .It Li L2_LINES_IN.S_STATE
 .Pq Event F1H , Umask 02H
 Counts the number of cache lines allocated in the L2 cache in the S (shared)
 state.
 .It Li L2_LINES_IN.E_STATE
 .Pq Event F1H , Umask 04H
 Counts the number of cache lines allocated in the L2 cache in the E
 (exclusive) state.
 .It Li L2_LINES_IN.ANY
 .Pq Event F1H , Umask 07H
 Counts the number of cache lines allocated in the L2 cache.
 .It Li L2_LINES_OUT.DEMAND_CLEAN
 .Pq Event F2H , Umask 01H
 Counts L2 clean cache lines evicted by a demand request.
 .It Li L2_LINES_OUT.DEMAND_DIRTY
 .Pq Event F2H , Umask 02H
 Counts L2 dirty (modified) cache lines evicted by a demand request.
 .It Li L2_LINES_OUT.PREFETCH_CLEAN
 .Pq Event F2H , Umask 04H
 Counts L2 clean cache line evicted by a prefetch request.
 .It Li L2_LINES_OUT.PREFETCH_DIRTY
 .Pq Event F2H , Umask 08H
 Counts L2 modified cache line evicted by a prefetch request.
 .It Li L2_LINES_OUT.ANY
 .Pq Event F2H , Umask 0FH
 Counts all L2 cache lines evicted for any reason.
 .It Li SQ_MISC.LRU_HINTS
 .Pq Event F4H , Umask 04H
 Counts number of Super Queue LRU hints sent to L3.
 .It Li SQ_MISC.SPLIT_LOCK
 .Pq Event F4H , Umask 10H
 Counts the number of SQ lock splits across a cache line.
 .It Li SQ_FULL_STALL_CYCLES
 .Pq Event F6H , Umask 01H
 Counts cycles the Super Queue is full.
 Neither of the threads on this core will be able to access the uncore.
 .It Li FP_ASSIST.ALL
 .Pq Event F7H , Umask 01H
 Counts the number of floating point operations executed that required
 micro-code assist intervention.
 Assists are required in the following cases:
 SSE instructions, (Denormal input when the DAZ flag is off or Underflow
 result when the FTZ flag is off): x87 instructions, (NaN or denormal are
 loaded to a register or used as input from memory, Division by 0 or
 Underflow output).
 .It Li FP_ASSIST.OUTPUT
 .Pq Event F7H , Umask 02H
 Counts number of floating point micro-code assist when the output value
 (destination register) is invalid.
 .It Li FP_ASSIST.INPUT
 .Pq Event F7H , Umask 04H
 Counts number of floating point micro-code assist when the input value (one
 of the source operands to an FP instruction) is invalid.
 .It Li SIMD_INT_64.PACKED_MPY
 .Pq Event FDH , Umask 01H
 Counts number of SID integer 64 bit packed multiply operations.
 .It Li SIMD_INT_64.PACKED_SHIFT
 .Pq Event FDH , Umask 02H
 Counts number of SID integer 64 bit packed shift operations.
 .It Li SIMD_INT_64.PACK
 .Pq Event FDH , Umask 04H
 Counts number of SID integer 64 bit pack operations.
 .It Li SIMD_INT_64.UNPACK
 .Pq Event FDH , Umask 08H
 Counts number of SID integer 64 bit unpack operations.
 .It Li SIMD_INT_64.PACKED_LOGICAL
 .Pq Event FDH , Umask 10H
 Counts number of SID integer 64 bit logical operations.
 .It Li SIMD_INT_64.PACKED_ARITH
 .Pq Event FDH , Umask 20H
 Counts number of SID integer 64 bit arithmetic operations.
 .It Li SIMD_INT_64.SHUFFLE_MOVE
 .Pq Event FDH , Umask 40H
 Counts number of SID integer 64 bit shift or move operations.
 .El
 .Sh SEE ALSO
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.corei7 3 ,
 .Xr pmc.corei7uc 3 ,
 .Xr pmc.iaf 3 ,
-.Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
 .Xr pmc.ucf 3 ,
 .Xr pmc.westmereuc 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
 .Sh HISTORY
 The
 .Nm pmc
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
 The
 .Lb libpmc
 library was written by
 .An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/lib/libpmc/pmc.westmereuc.3 b/lib/libpmc/pmc.westmereuc.3
index d9574be03422..67b21ef42f84 100644
--- a/lib/libpmc/pmc.westmereuc.3
+++ b/lib/libpmc/pmc.westmereuc.3
@@ -1,1097 +1,1096 @@
 .\" Copyright (c) 2010 Fabien Thomas.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .Dd March 24, 2010
 .Dt PMC.WESTMEREUC 3
 .Os
 .Sh NAME
 .Nm pmc.westmere
 .Nd uncore measurement events for
 .Tn Intel
 .Tn Westmere
 family CPUs
 .Sh LIBRARY
 .Lb libpmc
 .Sh SYNOPSIS
 .In pmc.h
 .Sh DESCRIPTION
 .Tn Intel
 .Tn "Westmere"
 CPUs contain PMCs conforming to version 2 of the
 .Tn Intel
 performance measurement architecture.
 These CPUs contain two classes of PMCs:
 .Bl -tag -width "Li PMC_CLASS_UCP"
 .It Li PMC_CLASS_UCF
 Fixed-function counters that count only one hardware event per counter.
 .It Li PMC_CLASS_UCP
 Programmable counters that may be configured to count one of a defined
 set of hardware events.
 .El
 .Pp
 The number of PMCs available in each class and their widths need to be
 determined at run time by calling
 .Xr pmc_cpuinfo 3 .
 .Pp
 Intel Westmere PMCs are documented in
 .Rs
 .%B "Intel(R) 64 and IA-32 Architectures Software Developes Manual"
 .%T "Volume 3B: System Programming Guide, Part 2"
 .%N "Order Number: 253669-033US"
 .%D December 2009
 .%Q "Intel Corporation"
 .Re
 .Ss WESTMERE UNCORE FIXED FUNCTION PMCS
 These PMCs and their supported events are documented in
 .Xr pmc.ucf 3 .
 Not all CPUs in this family implement fixed-function counters.
 .Ss WESTMERE UNCORE PROGRAMMABLE PMCS
 The programmable PMCs support the following capabilities:
 .Bl -column "PMC_CAP_INTERRUPT" "Support"
 .It Em Capability Ta Em Support
 .It PMC_CAP_CASCADE Ta \&No
 .It PMC_CAP_EDGE Ta Yes
 .It PMC_CAP_INTERRUPT Ta \&No
 .It PMC_CAP_INVERT Ta Yes
 .It PMC_CAP_READ Ta Yes
 .It PMC_CAP_PRECISE Ta \&No
 .It PMC_CAP_SYSTEM Ta \&No
 .It PMC_CAP_TAGGING Ta \&No
 .It PMC_CAP_THRESHOLD Ta Yes
 .It PMC_CAP_USER Ta \&No
 .It PMC_CAP_WRITE Ta Yes
 .El
 .Ss Event Qualifiers
 Event specifiers for these PMCs support the following common
 qualifiers:
 .Bl -tag -width indent
 .It Li cmask= Ns Ar value
 Configure the PMC to increment only if the number of configured
 events measured in a cycle is greater than or equal to
 .Ar value .
 .It Li edge
 Configure the PMC to count the number of de-asserted to asserted
 transitions of the conditions expressed by the other qualifiers.
 If specified, the counter will increment only once whenever a
 condition becomes true, irrespective of the number of clocks during
 which the condition remains true.
 .It Li inv
 Invert the sense of comparison when the
 .Dq Li cmask
 qualifier is present, making the counter increment when the number of
 events per cycle is less than the value specified by the
 .Dq Li cmask
 qualifier.
 .El
 .Ss Event Specifiers (Programmable PMCs)
 Westmere uncore programmable PMCs support the following events:
 .Bl -tag -width indent
 .It Li GQ_CYCLES_FULL.READ_TRACKER
 .Pq Event 00H , Umask 01H
 Uncore cycles Global Queue read tracker is full.
 .It Li GQ_CYCLES_FULL.WRITE_TRACKER
 .Pq Event 00H , Umask 02H
 Uncore cycles Global Queue write tracker is full.
 .It Li GQ_CYCLES_FULL.PEER_PROBE_TRACKER
 .Pq Event 00H , Umask 04H
 Uncore cycles Global Queue peer probe tracker is full.
 The peer probe tracker queue tracks snoops from the IOH and remote sockets.
 .It Li GQ_CYCLES_NOT_EMPTY.READ_TRACKER
 .Pq Event 01H , Umask 01H
 Uncore cycles were Global Queue read tracker has at least one valid entry.
 .It Li GQ_CYCLES_NOT_EMPTY.WRITE_TRACKER
 .Pq Event 01H , Umask 02H
 Uncore cycles were Global Queue write tracker has at least one valid entry.
 .It Li GQ_CYCLES_NOT_EMPTY.PEER_PROBE_TRACKER
 .Pq Event 01H , Umask 04H
 Uncore cycles were Global Queue peer probe tracker has at least one valid entry.
 The peer probe tracker queue tracks IOH and remote socket snoops.
 .It Li GQ_OCCUPANCY.READ_TRACKER
 .Pq Event 02H , Umask 01H
 Increments the number of queue entries (code read, data read, and RFOs) in
 the tread tracker.
 The GQ read tracker allocate to deallocate occupancy count is divided by the
 count to obtain the average read tracker latency.
 .It Li GQ_ALLOC.READ_TRACKER
 .Pq Event 03H , Umask 01H
 Counts the number of tread tracker allocate to deallocate entries.
 The GQ read tracker allocate to deallocate occupancy count is divided by
 the count to obtain the average read tracker latency.
 .It Li GQ_ALLOC.RT_L3_MISS
 .Pq Event 03H , Umask 02H
 Counts the number GQ read tracker entries for which a full cache line read
 has missed the L3.
 The GQ read tracker L3 miss to fill occupancy count is divided by this count
 to obtain the average cache line read L3 miss latency.
 The latency represents the time after which the L3 has determined that the
 cache line has missed.
 The time between a GQ read tracker allocation and the L3 determining that
 the cache line has missed is the average L3 hit latency.
 The total L3 cache line read miss latency is the hit latency + L3 miss
 latency.
 .It Li GQ_ALLOC.RT_TO_L3_RESP
 .Pq Event 03H , Umask 04H
 Counts the number of GQ read tracker entries that are allocated in the read
 tracker queue that hit or miss the L3.
 The GQ read tracker L3 hit occupancy count is divided by this count to obtain the average L3 hit latency.
 .It Li GQ_ALLOC.RT_TO_RTID_ACQUIRED
 .Pq Event 03H , Umask 08H
 Counts the number of GQ read tracker entries that are allocated in the read
 tracker, have missed in the L3 and have not acquired a Request Transaction ID.
 The GQ read tracker L3 miss to RTID acquired occupancy count is
 divided by this count to obtain the average latency for a read L3 miss to
 acquire an RTID.
 .It Li GQ_ALLOC.WT_TO_RTID_ACQUIRED
 .Pq Event 03H , Umask 10H
 Counts the number of GQ write tracker entries that are allocated in the
 write tracker, have missed in the L3 and have not acquired a Request
 Transaction ID.
 The GQ write tracker L3 miss to RTID occupancy count is divided by this count
 to obtain the average latency for a write L3 miss to acquire an RTID.
 .It Li GQ_ALLOC.WRITE_TRACKER
 .Pq Event 03H , Umask 20H
 Counts the number of GQ write tracker entries that are allocated in the write
 tracker queue that miss the L3.
 The GQ write tracker occupancy count
 is divided by the this count to obtain the average L3 write miss latency.
 .It Li GQ_ALLOC.PEER_PROBE_TRACKER
 .Pq Event 03H , Umask 40H
 Counts the number of GQ peer probe tracker (snoop) entries that are
 allocated in the peer probe tracker queue that miss the L3.
 The GQ peer probe occupancy count is divided by this count to obtain the average
 L3 peer probe miss latency.
 .It Li GQ_DATA.FROM_QPI
 .Pq Event 04H , Umask 01H
 Cycles Global Queue Quickpath Interface input data port is busy importing
 data from the Quickpath Interface.
 Each cycle the input port can transfer 8 or 16 bytes of data.
 .It Li GQ_DATA.FROM_QMC
 .Pq Event 04H , Umask 02H
 Cycles Global Queue Quickpath Memory Interface input data port is busy
 importing data from the Quickpath Memory Interface.
 Each cycle the input port can transfer 8 or 16 bytes of data.
 .It Li GQ_DATA.FROM_L3
 .Pq Event 04H , Umask 04H
 Cycles GQ L3 input data port is busy importing data from the Last Level Cache.
 Each cycle the input port can transfer 32 bytes of data.
 .It Li GQ_DATA.FROM_CORES_02
 .Pq Event 04H , Umask 08H
 Cycles GQ Core 0 and 2 input data port is busy importing data from processor
 cores 0 and 2.
 Each cycle the input port can transfer 32 bytes of data.
 .It Li GQ_DATA.FROM_CORES_13
 .Pq Event 04H , Umask 10H
 Cycles GQ Core 1 and 3 input data port is busy importing data from processor
 cores 1 and 3.
 Each cycle the input port can transfer 32 bytes of data.
 .It Li GQ_DATA.TO_QPI_QMC
 .Pq Event 05H , Umask 01H
 Cycles GQ QPI and QMC output data port is busy sending data to the Quickpath
 Interface or Quickpath Memory Interface.
 Each cycle the output port can transfer 32 bytes of data.
 .It Li GQ_DATA.TO_L3
 .Pq Event 05H , Umask 02H
 Cycles GQ L3 output data port is busy sending data to the Last Level Cache.
 Each cycle the output port can transfer 32 bytes of data.
 .It Li GQ_DATA.TO_CORES
 .Pq Event 05H , Umask 04H
 Cycles GQ Core output data port is busy sending data to the Cores.
 Each cycle the output port can transfer 32 bytes of data.
 .It Li SNP_RESP_TO_LOCAL_HOME.I_STATE
 .Pq Event 06H , Umask 01H
 Number of snoop responses to the local home that L3 does not have the
 referenced cache line.
 .It Li SNP_RESP_TO_LOCAL_HOME.S_STATE
 .Pq Event 06H , Umask 02H
 Number of snoop responses to the local home that L3 has the referenced line
 cached in the S state.
 .It Li SNP_RESP_TO_LOCAL_HOME.FWD_S_STATE
 .Pq Event 06H , Umask 04H
 Number of responses to code or data read snoops to the local home that the
 L3 has the referenced cache line in the E state.
 The L3 cache line state is changed to the S state and the line is forwarded
 to the local home in the S state.
 .It Li SNP_RESP_TO_LOCAL_HOME.FWD_I_STATE
 .Pq Event 06H , Umask 08H
 Number of responses to read invalidate snoops to the local home that the L3
 has the referenced cache line in the M state.
 The L3 cache line state is invalidated and the line is forwarded to the
 local home in the M state.
 .It Li SNP_RESP_TO_LOCAL_HOME.CONFLICT
 .Pq Event 06H , Umask 10H
 Number of conflict snoop responses sent to the local home.
 .It Li SNP_RESP_TO_LOCAL_HOME.WB
 .Pq Event 06H , Umask 20H
 Number of responses to code or data read snoops to the local home that the
 L3 has the referenced line cached in the M state.
 .It Li SNP_RESP_TO_REMOTE_HOME.I_STATE
 .Pq Event 07H , Umask 01H
 Number of snoop responses to a remote home that L3 does not have the
 referenced cache line.
 .It Li SNP_RESP_TO_REMOTE_HOME.S_STATE
 .Pq Event 07H , Umask 02H
 Number of snoop responses to a remote home that L3 has the referenced line
 cached in the S state.
 .It Li SNP_RESP_TO_REMOTE_HOME.FWD_S_STATE
 .Pq Event 07H , Umask 04H
 Number of responses to code or data read snoops to a remote home that the L3
 has the referenced cache line in the E state.
 The L3 cache line state is changed to the S state and the line is forwarded
 to the remote home in the S state.
 .It Li SNP_RESP_TO_REMOTE_HOME.FWD_I_STATE
 .Pq Event 07H , Umask 08H
 Number of responses to read invalidate snoops to a remote home that the L3
 has the referenced cache line in the M state.
 The L3 cache line state is invalidated and the line is forwarded to the
 remote home in the M state.
 .It Li SNP_RESP_TO_REMOTE_HOME.CONFLICT
 .Pq Event 07H , Umask 10H
 Number of conflict snoop responses sent to the local home.
 .It Li SNP_RESP_TO_REMOTE_HOME.WB
 .Pq Event 07H , Umask 20H
 Number of responses to code or data read snoops to a remote home that the L3
 has the referenced line cached in the M state.
 .It Li SNP_RESP_TO_REMOTE_HOME.HITM
 .Pq Event 07H , Umask 24H
 Number of HITM snoop responses to a remote home.
 .It Li L3_HITS.READ
 .Pq Event 08H , Umask 01H
 Number of code read, data read and RFO requests that hit in the L3.
 .It Li L3_HITS.WRITE
 .Pq Event 08H , Umask 02H
 Number of writeback requests that hit in the L3.
 Writebacks from the cores will always result in L3 hits due to the
 inclusive property of the L3.
 .It Li L3_HITS.PROBE
 .Pq Event 08H , Umask 04H
 Number of snoops from IOH or remote sockets that hit in the L3.
 .It Li L3_HITS.ANY
 .Pq Event 08H , Umask 03H
 Number of reads and writes that hit the L3.
 .It Li L3_MISS.READ
 .Pq Event 09H , Umask 01H
 Number of code read, data read and RFO requests that miss the L3.
 .It Li L3_MISS.WRITE
 .Pq Event 09H , Umask 02H
 Number of writeback requests that miss the L3.
 Should always be zero as writebacks from the cores will always result in L3 hits due to the inclusive
 property of the L3.
 .It Li L3_MISS.PROBE
 .Pq Event 09H , Umask 04H
 Number of snoops from IOH or remote sockets that miss the L3.
 .It Li L3_MISS.ANY
 .Pq Event 09H , Umask 03H
 Number of reads and writes that miss the L3.
 .It Li L3_LINES_IN.M_STATE
 .Pq Event 0AH , Umask 01H
 Counts the number of L3 lines allocated in M state.
 The only time a cache line is allocated in the M state is when the
 line was forwarded in M state is forwarded due to a Snoop Read Invalidate Own request.
 .It Li L3_LINES_IN.E_STATE
 .Pq Event 0AH , Umask 02H
 Counts the number of L3 lines allocated in E state.
 .It Li L3_LINES_IN.S_STATE
 .Pq Event 0AH , Umask 04H
 Counts the number of L3 lines allocated in S state.
 .It Li L3_LINES_IN.F_STATE
 .Pq Event 0AH , Umask 08H
 Counts the number of L3 lines allocated in F state.
 .It Li L3_LINES_IN.ANY
 .Pq Event 0AH , Umask 0FH
 Counts the number of L3 lines allocated in any state.
 .It Li L3_LINES_OUT.M_STATE
 .Pq Event 0BH , Umask 01H
 Counts the number of L3 lines victimized that were in the M state.
 When the victim cache line is in M state, the line is written to its home cache agent
 which can be either local or remote.
 .It Li L3_LINES_OUT.E_STATE
 .Pq Event 0BH , Umask 02H
 Counts the number of L3 lines victimized that were in the E state.
 .It Li L3_LINES_OUT.S_STATE
 .Pq Event 0BH , Umask 04H
 Counts the number of L3 lines victimized that were in the S state.
 .It Li L3_LINES_OUT.I_STATE
 .Pq Event 0BH , Umask 08H
 Counts the number of L3 lines victimized that were in the I state.
 .It Li L3_LINES_OUT.F_STATE
 .Pq Event 0BH , Umask 10H
 Counts the number of L3 lines victimized that were in the F state.
 .It Li L3_LINES_OUT.ANY
 .Pq Event 0BH , Umask 1FH
 Counts the number of L3 lines victimized in any state.
 .It Li GQ_SNOOP.GOTO_S
 .Pq Event 0CH , Umask 01H
 Counts the number of remote snoops that have requested a cache line be set
 to the S state.
 .It Li GQ_SNOOP.GOTO_I
 .Pq Event 0CH , Umask 02H
 Counts the number of remote snoops that have requested a cache line be set
 to the I state.
 .It Li GQ_SNOOP.GOTO_S_HIT_E
 .Pq Event 0CH , Umask 04H
 Counts the number of remote snoops that have requested a cache line be set
 to the S state from E state.
 Requires writing MSR 301H with mask = 2H
 .It Li GQ_SNOOP.GOTO_S_HIT_F
 .Pq Event 0CH , Umask 04H
 Counts the number of remote snoops that have requested a cache line be set
 to the S state from F (forward) state.
 Requires writing MSR 301H with mask = 8H
 .It Li GQ_SNOOP.GOTO_S_HIT_M
 .Pq Event 0CH , Umask 04H
 Counts the number of remote snoops that have requested a cache line be set
 to the S state from M state.
 Requires writing MSR 301H with mask = 1H
 .It Li GQ_SNOOP.GOTO_S_HIT_S
 .Pq Event 0CH , Umask 04H
 Counts the number of remote snoops that have requested a cache line be set
 to the S state from S state.
 Requires writing MSR 301H with mask = 4H
 .It Li GQ_SNOOP.GOTO_I_HIT_E
 .Pq Event 0CH , Umask 08H
 Counts the number of remote snoops that have requested a cache line be set
 to the I state from E state.
 Requires writing MSR 301H with mask = 2H
 .It Li GQ_SNOOP.GOTO_I_HIT_F
 .Pq Event 0CH , Umask 08H
 Counts the number of remote snoops that have requested a cache line be set
 to the I state from F (forward) state.
 Requires writing MSR 301H with mask = 8H
 .It Li GQ_SNOOP.GOTO_I_HIT_M
 .Pq Event 0CH , Umask 08H
 Counts the number of remote snoops that have requested a cache line be set
 to the I state from M state.
 Requires writing MSR 301H with mask = 1H
 .It Li GQ_SNOOP.GOTO_I_HIT_S
 .Pq Event 0CH , Umask 08H
 Counts the number of remote snoops that have requested a cache line be set
 to the I state from S state.
 Requires writing MSR 301H with mask = 4H
 .It Li QHL_REQUESTS.IOH_READS
 .Pq Event 20H , Umask 01H
 Counts number of Quickpath Home Logic read requests from the IOH.
 .It Li QHL_REQUESTS.IOH_WRITES
 .Pq Event 20H , Umask 02H
 Counts number of Quickpath Home Logic write requests from the IOH.
 .It Li QHL_REQUESTS.REMOTE_READS
 .Pq Event 20H , Umask 04H
 Counts number of Quickpath Home Logic read requests from a remote socket.
 .It Li QHL_REQUESTS.REMOTE_WRITES
 .Pq Event 20H , Umask 08H
 Counts number of Quickpath Home Logic write requests from a remote socket.
 .It Li QHL_REQUESTS.LOCAL_READS
 .Pq Event 20H , Umask 10H
 Counts number of Quickpath Home Logic read requests from the local socket.
 .It Li QHL_REQUESTS.LOCAL_WRITES
 .Pq Event 20H , Umask 20H
 Counts number of Quickpath Home Logic write requests from the local socket.
 .It Li QHL_CYCLES_FULL.IOH
 .Pq Event 21H , Umask 01H
 Counts uclk cycles all entries in the Quickpath Home Logic IOH are full.
 .It Li QHL_CYCLES_FULL.REMOTE
 .Pq Event 21H , Umask 02H
 Counts uclk cycles all entries in the Quickpath Home Logic remote tracker
 are full.
 .It Li QHL_CYCLES_FULL.LOCAL
 .Pq Event 21H , Umask 04H
 Counts uclk cycles all entries in the Quickpath Home Logic local tracker are
 full.
 .It Li QHL_CYCLES_NOT_EMPTY.IOH
 .Pq Event 22H , Umask 01H
 Counts uclk cycles all entries in the Quickpath Home Logic IOH is busy.
 .It Li QHL_CYCLES_NOT_EMPTY.REMOTE
 .Pq Event 22H , Umask 02H
 Counts uclk cycles all entries in the Quickpath Home Logic remote tracker is
 busy.
 .It Li QHL_CYCLES_NOT_EMPTY.LOCAL
 .Pq Event 22H , Umask 04H
 Counts uclk cycles all entries in the Quickpath Home Logic local tracker is
 busy.
 .It Li QHL_OCCUPANCY.IOH
 .Pq Event 23H , Umask 01H
 QHL IOH tracker allocate to deallocate read occupancy.
 .It Li QHL_OCCUPANCY.REMOTE
 .Pq Event 23H , Umask 02H
 QHL remote tracker allocate to deallocate read occupancy.
 .It Li QHL_OCCUPANCY.LOCAL
 .Pq Event 23H , Umask 04H
 QHL local tracker allocate to deallocate read occupancy.
 .It Li QHL_ADDRESS_CONFLICTS.2WAY
 .Pq Event 24H , Umask 02H
 Counts number of QHL Active Address Table (AAT) entries that saw a max of 2 conflicts.
 The AAT is a structure that tracks requests that are in conflict.
 The requests themselves are in the home tracker entries.
 The count is reported when an AAT entry deallocates.
 .It Li QHL_ADDRESS_CONFLICTS.3WAY
 .Pq Event 24H , Umask 04H
 Counts number of QHL Active Address Table (AAT) entries that saw a max of 3 conflicts.
 The AAT is a structure that tracks requests that are in conflict.
 The requests themselves are in the home tracker entries.
 The count is reported when an AAT entry deallocates.
 .It Li QHL_CONFLICT_CYCLES.IOH
 .Pq Event 25H , Umask 01H
 Counts cycles the Quickpath Home Logic IOH Tracker contains two or more
 requests with an address conflict.
 A max of 3 requests can be in conflict.
 .It Li QHL_CONFLICT_CYCLES.REMOTE
 .Pq Event 25H , Umask 02H
 Counts cycles the Quickpath Home Logic Remote Tracker contains two or more
 requests with an address conflict.
 A max of 3 requests can be in conflict.
 .It Li QHL_CONFLICT_CYCLES.LOCAL
 .Pq Event 25H , Umask 04H
 Counts cycles the Quickpath Home Logic Local Tracker contains two or more
 requests with an address conflict.
 A max of 3 requests can be in conflict.
 .It Li QHL_TO_QMC_BYPASS
 .Pq Event 26H , Umask 01H
 Counts number or requests to the Quickpath Memory Controller that bypass the
 Quickpath Home Logic.
 All local accesses can be bypassed.
 For remote requests, only read requests can be bypassed.
 .It Li QMC_ISOC_FULL.READ.CH0
 .Pq Event 28H , Umask 01H
 Counts cycles all the entries in the DRAM channel 0 high priority queue are
 occupied with isochronous read requests.
 .It Li QMC_ISOC_FULL.READ.CH1
 .Pq Event 28H , Umask 02H
 Counts cycles all the entries in the DRAM channel 1 high priority queue are
 occupied with isochronous read requests.
 .It Li QMC_ISOC_FULL.READ.CH2
 .Pq Event 28H , Umask 04H
 Counts cycles all the entries in the DRAM channel 2 high priority queue are
 occupied with isochronous read requests.
 .It Li QMC_ISOC_FULL.WRITE.CH0
 .Pq Event 28H , Umask 08H
 Counts cycles all the entries in the DRAM channel 0 high priority queue are
 occupied with isochronous write requests.
 .It Li QMC_ISOC_FULL.WRITE.CH1
 .Pq Event 28H , Umask 10H
 Counts cycles all the entries in the DRAM channel 1 high priority queue are
 occupied with isochronous write requests.
 .It Li QMC_ISOC_FULL.WRITE.CH2
 .Pq Event 28H , Umask 20H
 Counts cycles all the entries in the DRAM channel 2 high priority queue are
 occupied with isochronous write requests.
 .It Li QMC_BUSY.READ.CH0
 .Pq Event 29H , Umask 01H
 Counts cycles where Quickpath Memory Controller has at least 1 outstanding
 read request to DRAM channel 0.
 .It Li QMC_BUSY.READ.CH1
 .Pq Event 29H , Umask 02H
 Counts cycles where Quickpath Memory Controller has at least 1 outstanding
 read request to DRAM channel 1.
 .It Li QMC_BUSY.READ.CH2
 .Pq Event 29H , Umask 04H
 Counts cycles where Quickpath Memory Controller has at least 1 outstanding
 read request to DRAM channel 2.
 .It Li QMC_BUSY.WRITE.CH0
 .Pq Event 29H , Umask 08H
 Counts cycles where Quickpath Memory Controller has at least 1 outstanding
 write request to DRAM channel 0.
 .It Li QMC_BUSY.WRITE.CH1
 .Pq Event 29H , Umask 10H
 Counts cycles where Quickpath Memory Controller has at least 1 outstanding
 write request to DRAM channel 1.
 .It Li QMC_BUSY.WRITE.CH2
 .Pq Event 29H , Umask 20H
 Counts cycles where Quickpath Memory Controller has at least 1 outstanding
 write request to DRAM channel 2.
 .It Li QMC_OCCUPANCY.CH0
 .Pq Event 2AH , Umask 01H
 IMC channel 0 normal read request occupancy.
 .It Li QMC_OCCUPANCY.CH1
 .Pq Event 2AH , Umask 02H
 IMC channel 1 normal read request occupancy.
 .It Li QMC_OCCUPANCY.CH2
 .Pq Event 2AH , Umask 04H
 IMC channel 2 normal read request occupancy.
 .It Li QMC_OCCUPANCY.ANY
 .Pq Event 2AH , Umask 07H
 Normal read request occupancy for any channel.
 .It Li QMC_ISSOC_OCCUPANCY.CH0
 .Pq Event 2BH , Umask 01H
 IMC channel 0 issoc read request occupancy.
 .It Li QMC_ISSOC_OCCUPANCY.CH1
 .Pq Event 2BH , Umask 02H
 IMC channel 1 issoc read request occupancy.
 .It Li QMC_ISSOC_OCCUPANCY.CH2
 .Pq Event 2BH , Umask 04H
 IMC channel 2 issoc read request occupancy.
 .It Li QMC_ISSOC_READS.ANY
 .Pq Event 2BH , Umask 07H
 IMC issoc read request occupancy.
 .It Li QMC_NORMAL_READS.CH0
 .Pq Event 2CH , Umask 01H
 Counts the number of Quickpath Memory Controller channel 0 medium and low
 priority read requests.
 The QMC channel 0 normal read occupancy divided by this count provides the
 average QMC channel 0 read latency.
 .It Li QMC_NORMAL_READS.CH1
 .Pq Event 2CH , Umask 02H
 Counts the number of Quickpath Memory Controller channel 1 medium and low
 priority read requests.
 The QMC channel 1 normal read occupancy divided by this count provides the
 average QMC channel 1 read latency.
 .It Li QMC_NORMAL_READS.CH2
 .Pq Event 2CH , Umask 04H
 Counts the number of Quickpath Memory Controller channel 2 medium and low
 priority read requests.
 The QMC channel 2 normal read occupancy divided by this count provides the
 average QMC channel 2 read latency.
 .It Li QMC_NORMAL_READS.ANY
 .Pq Event 2CH , Umask 07H
 Counts the number of Quickpath Memory Controller medium and low priority read requests.
 The QMC normal read occupancy divided by this count provides the average
 QMC read latency.
 .It Li QMC_HIGH_PRIORITY_READS.CH0
 .Pq Event 2DH , Umask 01H
 Counts the number of Quickpath Memory Controller channel 0 high priority
 isochronous read requests.
 .It Li QMC_HIGH_PRIORITY_READS.CH1
 .Pq Event 2DH , Umask 02H
 Counts the number of Quickpath Memory Controller channel 1 high priority
 isochronous read requests.
 .It Li QMC_HIGH_PRIORITY_READS.CH2
 .Pq Event 2DH , Umask 04H
 Counts the number of Quickpath Memory Controller channel 2 high priority
 isochronous read requests.
 .It Li QMC_HIGH_PRIORITY_READS.ANY
 .Pq Event 2DH , Umask 07H
 Counts the number of Quickpath Memory Controller high priority isochronous
 read requests.
 .It Li QMC_CRITICAL_PRIORITY_READS.CH0
 .Pq Event 2EH , Umask 01H
 Counts the number of Quickpath Memory Controller channel 0 critical priority
 isochronous read requests.
 .It Li QMC_CRITICAL_PRIORITY_READS.CH1
 .Pq Event 2EH , Umask 02H
 Counts the number of Quickpath Memory Controller channel 1 critical priority
 isochronous read requests.
 .It Li QMC_CRITICAL_PRIORITY_READS.CH2
 .Pq Event 2EH , Umask 04H
 Counts the number of Quickpath Memory Controller channel 2 critical priority
 isochronous read requests.
 .It Li QMC_CRITICAL_PRIORITY_READS.ANY
 .Pq Event 2EH , Umask 07H
 Counts the number of Quickpath Memory Controller critical priority
 isochronous read requests.
 .It Li QMC_WRITES.FULL.CH0
 .Pq Event 2FH , Umask 01H
 Counts number of full cache line writes to DRAM channel 0.
 .It Li QMC_WRITES.FULL.CH1
 .Pq Event 2FH , Umask 02H
 Counts number of full cache line writes to DRAM channel 1.
 .It Li QMC_WRITES.FULL.CH2
 .Pq Event 2FH , Umask 04H
 Counts number of full cache line writes to DRAM channel 2.
 .It Li QMC_WRITES.FULL.ANY
 .Pq Event 2FH , Umask 07H
 Counts number of full cache line writes to DRAM.
 .It Li QMC_WRITES.PARTIAL.CH0
 .Pq Event 2FH , Umask 08H
 Counts number of partial cache line writes to DRAM channel 0.
 .It Li QMC_WRITES.PARTIAL.CH1
 .Pq Event 2FH , Umask 10H
 Counts number of partial cache line writes to DRAM channel 1.
 .It Li QMC_WRITES.PARTIAL.CH2
 .Pq Event 2FH , Umask 20H
 Counts number of partial cache line writes to DRAM channel 2.
 .It Li QMC_WRITES.PARTIAL.ANY
 .Pq Event 2FH , Umask 38H
 Counts number of partial cache line writes to DRAM.
 .It Li QMC_CANCEL.CH0
 .Pq Event 30H , Umask 01H
 Counts number of DRAM channel 0 cancel requests.
 .It Li QMC_CANCEL.CH1
 .Pq Event 30H , Umask 02H
 Counts number of DRAM channel 1 cancel requests.
 .It Li QMC_CANCEL.CH2
 .Pq Event 30H , Umask 04H
 Counts number of DRAM channel 2 cancel requests.
 .It Li QMC_CANCEL.ANY
 .Pq Event 30H , Umask 07H
 Counts number of DRAM cancel requests.
 .It Li QMC_PRIORITY_UPDATES.CH0
 .Pq Event 31H , Umask 01H
 Counts number of DRAM channel 0 priority updates.
 A priority update occurs when an ISOC high or critical request is
 received by the QHL and there is a matching request with normal priority
 that has already been issued to the QMC.
 In this instance, the QHL will send a priority update to QMC to
 expedite the request.
 .It Li QMC_PRIORITY_UPDATES.CH1
 .Pq Event 31H , Umask 02H
 Counts number of DRAM channel 1 priority updates.
 A priority update occurs when an ISOC high or critical request is received
 by the QHL and there is a matching request with normal priority that has
 already been issued to the QMC.
 In this instance, the QHL will send a priority update to QMC to expedite the request.
 .It Li QMC_PRIORITY_UPDATES.CH2
 .Pq Event 31H , Umask 04H
 Counts number of DRAM channel 2 priority updates.
 A priority update occurs when an ISOC high or critical request is received
 by the QHL and there is a matching request with normal priority that has
 already been issued to the QMC.
 In this instance, the QHL will send a priority update to QMC to expedite the request.
 .It Li QMC_PRIORITY_UPDATES.ANY
 .Pq Event 31H , Umask 07H
 Counts number of DRAM priority updates.
 A priority update occurs when an ISOC high or critical request is received
 by the QHL and there is a matching request with normal priority that has already
 been issued to the QMC.
 In this instance, the QHL will send a priority update to QMC to expedite the request.
 .It Li IMC_RETRY.CH0
 .Pq Event 32H , Umask 01H
 Counts number of IMC DRAM channel 0 retries.
 DRAM retry only occurs when configured in RAS mode.
 .It Li IMC_RETRY.CH1
 .Pq Event 32H , Umask 02H
 Counts number of IMC DRAM channel 1 retries.
 DRAM retry only occurs when configured in RAS mode.
 .It Li IMC_RETRY.CH2
 .Pq Event 32H , Umask 04H
 Counts number of IMC DRAM channel 2 retries.
 DRAM retry only occurs when configured in RAS mode.
 .It Li IMC_RETRY.ANY
 .Pq Event 32H , Umask 07H
 Counts number of IMC DRAM retries from any channel.
 DRAM retry only occurs when configured in RAS mode.
 .It Li QHL_FRC_ACK_CNFLTS.IOH
 .Pq Event 33H , Umask 01H
 Counts number of Force Acknowledge Conflict messages sent by the Quickpath
 Home Logic to the IOH.
 .It Li QHL_FRC_ACK_CNFLTS.REMOTE
 .Pq Event 33H , Umask 02H
 Counts number of Force Acknowledge Conflict messages sent by the Quickpath
 Home Logic to the remote home.
 .It Li QHL_FRC_ACK_CNFLTS.LOCAL
 .Pq Event 33H , Umask 04H
 Counts number of Force Acknowledge Conflict messages sent by the Quickpath
 Home Logic to the local home.
 .It Li QHL_FRC_ACK_CNFLTS.ANY
 .Pq Event 33H , Umask 07H
 Counts number of Force Acknowledge Conflict messages sent by the Quickpath
 Home Logic.
 .It Li QHL_SLEEPS.IOH_ORDER
 .Pq Event 34H , Umask 01H
 Counts number of occurrences a request was put to sleep due to IOH ordering
 (write after read) conflicts.
 While in the sleep state, the request is not eligible to be scheduled to the QMC.
 .It Li QHL_SLEEPS.REMOTE_ORDER
 .Pq Event 34H , Umask 02H
 Counts number of occurrences a request was put to sleep due to remote socket
 ordering (write after read) conflicts.
 While in the sleep state, the request is not eligible to be scheduled to the QMC.
 .It Li QHL_SLEEPS.LOCAL_ORDER
 .Pq Event 34H , Umask 04H
 Counts number of occurrences a request was put to sleep due to local socket
 ordering (write after read) conflicts.
 While in the sleep state, the request is not eligible to be scheduled to the QMC.
 .It Li QHL_SLEEPS.IOH_CONFLICT
 .Pq Event 34H , Umask 08H
 Counts number of occurrences a request was put to sleep due to IOH address conflicts.
 While in the sleep state, the request is not eligible to be scheduled to the QMC.
 .It Li QHL_SLEEPS.REMOTE_CONFLICT
 .Pq Event 34H , Umask 10H
 Counts number of occurrences a request was put to sleep due to remote socket
 address conflicts.
 While in the sleep state, the request is not eligible to be scheduled to the QMC.
 .It Li QHL_SLEEPS.LOCAL_CONFLICT
 .Pq Event 34H , Umask 20H
 Counts number of occurrences a request was put to sleep due to local socket address conflicts.
 While in the sleep state, the request is not eligible to be scheduled to the QMC.
 .It Li ADDR_OPCODE_MATCH.IOH
 .Pq Event 35H , Umask 01H
 Counts number of requests from the IOH, address/opcode of request is
 qualified by mask value written to MSR 396H.
 The following mask values are supported:
 0: NONE 40000000_00000000H:RSPFWDI 40001A00_00000000H:RSPFWDS
 40001D00_00000000H:RSPIWB
 Match opcode/address by writing MSR 396H with mask supported mask value.
 .It Li ADDR_OPCODE_MATCH.REMOTE
 .Pq Event 35H , Umask 02H
 Counts number of requests from the remote socket, address/opcode of request
 is qualified by mask value written to MSR 396H.
 The following mask values are supported:
 0: NONE 40000000_00000000H:RSPFWDI 40001A00_00000000H:RSPFWDS
 40001D00_00000000H:RSPIWB
 Match opcode/address by writing MSR 396H with mask supported mask value.
 .It Li ADDR_OPCODE_MATCH.LOCAL
 .Pq Event 35H , Umask 04H
 Counts number of requests from the local socket, address/opcode of request
 is qualified by mask value written to MSR 396H.
 The following mask values are supported:
 0: NONE 40000000_00000000H:RSPFWDI 40001A00_00000000H:RSPFWDS
 40001D00_00000000H:RSPIWB
 Match opcode/address by writing MSR 396H with mask supported mask value.
 .It Li QPI_TX_STALLED_SINGLE_FLIT.HOME.LINK_0
 .Pq Event 40H , Umask 01H
 Counts cycles the Quickpath outbound link 0 HOME virtual channel is stalled
 due to lack of a VNA and VN0 credit.
 Note that this event does not filter out when a flit would not have been selected
 for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_SINGLE_FLIT.SNOOP.LINK_0
 .Pq Event 40H , Umask 02H
 Counts cycles the Quickpath outbound link 0 SNOOP virtual channel is stalled
 due to lack of a VNA and VN0 credit.
 Note that this event does not filter out when a flit would not have been selected
 for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_SINGLE_FLIT.NDR.LINK_0
 .Pq Event 40H , Umask 04H
 Counts cycles the Quickpath outbound link 0 non-data response virtual
 channel is stalled due to lack of a VNA and VN0 credit.
 Note that this event does not filter out when a flit would not have been selected
 for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_SINGLE_FLIT.HOME.LINK_1
 .Pq Event 40H , Umask 08H
 Counts cycles the Quickpath outbound link 1 HOME virtual channel is stalled
 due to lack of a VNA and VN0 credit.
 Note that this event does not filter out when a flit would not have been selected
 for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_SINGLE_FLIT.SNOOP.LINK_1
 .Pq Event 40H , Umask 10H
 Counts cycles the Quickpath outbound link 1 SNOOP virtual channel is stalled
 due to lack of a VNA and VN0 credit.
 Note that this event does not filter out when a flit would not have been selected
 for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_SINGLE_FLIT.NDR.LINK_1
 .Pq Event 40H , Umask 20H
 Counts cycles the Quickpath outbound link 1 non-data response virtual
 channel is stalled due to lack of a VNA and VN0 credit.
 Note that this event does not filter out when a flit would not have been selected
 for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_SINGLE_FLIT.LINK_0
 .Pq Event 40H , Umask 07H
 Counts cycles the Quickpath outbound link 0 virtual channels are stalled due
 to lack of a VNA and VN0 credit.
 Note that this event does not filter out when a flit would not have been selected
 for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_SINGLE_FLIT.LINK_1
 .Pq Event 40H , Umask 38H
 Counts cycles the Quickpath outbound link 1 virtual channels are stalled due
 to lack of a VNA and VN0 credit.
 Note that this event does not filter out when a flit would not have been selected
 for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_MULTI_FLIT.DRS.LINK_0
 .Pq Event 41H , Umask 01H
 Counts cycles the Quickpath outbound link 0 Data ResponSe virtual channel is
 stalled due to lack of VNA and VN0 credits.
 Note that this event does not filter out when a flit would not have been selected
 for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_MULTI_FLIT.NCB.LINK_0
 .Pq Event 41H , Umask 02H
 Counts cycles the Quickpath outbound link 0 Non-Coherent Bypass virtual
 channel is stalled due to lack of VNA and VN0 credits.
 Note that this event does not filter out when a flit would not have been selected
 for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_MULTI_FLIT.NCS.LINK_0
 .Pq Event 41H , Umask 04H
 Counts cycles the Quickpath outbound link 0 Non-Coherent Standard virtual
 channel is stalled due to lack of VNA and VN0 credits.
 Note that this event does not filter out when a flit would not have been selected
 for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_MULTI_FLIT.DRS.LINK_1
 .Pq Event 41H , Umask 08H
 Counts cycles the Quickpath outbound link 1 Data ResponSe virtual channel is
 stalled due to lack of VNA and VN0 credits.
 Note that this event does not filter out when a flit would not have been selected
 for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_MULTI_FLIT.NCB.LINK_1
 .Pq Event 41H , Umask 10H
 Counts cycles the Quickpath outbound link 1 Non-Coherent Bypass virtual
 channel is stalled due to lack of VNA and VN0 credits.
 Note that this event does not filter out when a flit would not have been selected
 for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_MULTI_FLIT.NCS.LINK_1
 .Pq Event 41H , Umask 20H
 Counts cycles the Quickpath outbound link 1 Non-Coherent Standard virtual
 channel is stalled due to lack of VNA and VN0 credits.
 Note that this event does not filter out when a flit would not have been selected
 for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_MULTI_FLIT.LINK_0
 .Pq Event 41H , Umask 07H
 Counts cycles the Quickpath outbound link 0 virtual channels are stalled due
 to lack of VNA and VN0 credits.
 Note that this event does not filter out when a flit would not have been selected
 for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_STALLED_MULTI_FLIT.LINK_1
 .Pq Event 41H , Umask 38H
 Counts cycles the Quickpath outbound link 1 virtual channels are stalled due
 to lack of VNA and VN0 credits.
 Note that this event does not filter out when a flit would not have been selected
 for arbitration because another virtual channel is getting arbitrated.
 .It Li QPI_TX_HEADER.FULL.LINK_0
 .Pq Event 42H , Umask 01H
 Number of cycles that the header buffer in the Quickpath Interface outbound
 link 0 is full.
 .It Li QPI_TX_HEADER.BUSY.LINK_0
 .Pq Event 42H , Umask 02H
 Number of cycles that the header buffer in the Quickpath Interface outbound
 link 0 is busy.
 .It Li QPI_TX_HEADER.FULL.LINK_1
 .Pq Event 42H , Umask 04H
 Number of cycles that the header buffer in the Quickpath Interface outbound
 link 1 is full.
 .It Li QPI_TX_HEADER.BUSY.LINK_1
 .Pq Event 42H , Umask 08H
 Number of cycles that the header buffer in the Quickpath Interface outbound
 link 1 is busy.
 .It Li QPI_RX_NO_PPT_CREDIT.STALLS.LINK_0
 .Pq Event 43H , Umask 01H
 Number of cycles that snoop packets incoming to the Quickpath Interface link
 0 are stalled and not sent to the GQ because the GQ Peer Probe Tracker (PPT)
 does not have any available entries.
 .It Li QPI_RX_NO_PPT_CREDIT.STALLS.LINK_1
 .Pq Event 43H , Umask 02H
 Number of cycles that snoop packets incoming to the Quickpath Interface link
 1 are stalled and not sent to the GQ because the GQ Peer Probe Tracker (PPT)
 does not have any available entries.
 .It Li DRAM_OPEN.CH0
 .Pq Event 60H , Umask 01H
 Counts number of DRAM Channel 0 open commands issued either for read or write.
 To read or write data, the referenced DRAM page must first be opened.
 .It Li DRAM_OPEN.CH1
 .Pq Event 60H , Umask 02H
 Counts number of DRAM Channel 1 open commands issued either for read or write.
 To read or write data, the referenced DRAM page must first be opened.
 .It Li DRAM_OPEN.CH2
 .Pq Event 60H , Umask 04H
 Counts number of DRAM Channel 2 open commands issued either for read or write.
 To read or write data, the referenced DRAM page must first be opened.
 .It Li DRAM_PAGE_CLOSE.CH0
 .Pq Event 61H , Umask 01H
 DRAM channel 0 command issued to CLOSE a page due to page idle timer expiration.
 Closing a page is done by issuing a precharge.
 .It Li DRAM_PAGE_CLOSE.CH1
 .Pq Event 61H , Umask 02H
 DRAM channel 1 command issued to CLOSE a page due to page idle timer expiration.
 Closing a page is done by issuing a precharge.
 .It Li DRAM_PAGE_CLOSE.CH2
 .Pq Event 61H , Umask 04H
 DRAM channel 2 command issued to CLOSE a page due to page idle timer expiration.
 Closing a page is done by issuing a precharge.
 .It Li DRAM_PAGE_MISS.CH0
 .Pq Event 62H , Umask 01H
 Counts the number of precharges (PRE) that were issued to DRAM channel 0
 because there was a page miss.
 A page miss refers to a situation in which a page is currently open and another
 page from the same bank needs to be opened.
 The new page experiences a page miss.
 Closing of the old page is done by issuing a precharge.
 .It Li DRAM_PAGE_MISS.CH1
 .Pq Event 62H , Umask 02H
 Counts the number of precharges (PRE) that were issued to DRAM channel 1
 because there was a page miss.
 A page miss refers to a situation in which a page is currently open and another
 page from the same bank needs to be opened.
 The new page experiences a page miss.
 Closing of the old page is done by issuing a precharge.
 .It Li DRAM_PAGE_MISS.CH2
 .Pq Event 62H , Umask 04H
 Counts the number of precharges (PRE) that were issued to DRAM channel 2
 because there was a page miss.
 A page miss refers to a situation in which a page is currently open and another
 page from the same bank needs to be opened.
 The new page experiences a page miss.
 Closing of the old page is done by issuing a precharge.
 .It Li DRAM_READ_CAS.CH0
 .Pq Event 63H , Umask 01H
 Counts the number of times a read CAS command was issued on DRAM channel 0.
 .It Li DRAM_READ_CAS.AUTOPRE_CH0
 .Pq Event 63H , Umask 02H
 Counts the number of times a read CAS command was issued on DRAM channel 0
 where the command issued used the auto-precharge (auto page close) mode.
 .It Li DRAM_READ_CAS.CH1
 .Pq Event 63H , Umask 04H
 Counts the number of times a read CAS command was issued on DRAM channel 1.
 .It Li DRAM_READ_CAS.AUTOPRE_CH1
 .Pq Event 63H , Umask 08H
 Counts the number of times a read CAS command was issued on DRAM channel 1
 where the command issued used the auto-precharge (auto page close) mode.
 .It Li DRAM_READ_CAS.CH2
 .Pq Event 63H , Umask 10H
 Counts the number of times a read CAS command was issued on DRAM channel 2.
 .It Li DRAM_READ_CAS.AUTOPRE_CH2
 .Pq Event 63H , Umask 20H
 Counts the number of times a read CAS command was issued on DRAM channel 2
 where the command issued used the auto-precharge (auto page close) mode.
 .It Li DRAM_WRITE_CAS.CH0
 .Pq Event 64H , Umask 01H
 Counts the number of times a write CAS command was issued on DRAM channel 0.
 .It Li DRAM_WRITE_CAS.AUTOPRE_CH0
 .Pq Event 64H , Umask 02H
 Counts the number of times a write CAS command was issued on DRAM channel 0
 where the command issued used the auto-precharge (auto page close) mode.
 .It Li DRAM_WRITE_CAS.CH1
 .Pq Event 64H , Umask 04H
 Counts the number of times a write CAS command was issued on DRAM channel 1.
 .It Li DRAM_WRITE_CAS.AUTOPRE_CH1
 .Pq Event 64H , Umask 08H
 Counts the number of times a write CAS command was issued on DRAM channel 1
 where the command issued used the auto-precharge (auto page close) mode.
 .It Li DRAM_WRITE_CAS.CH2
 .Pq Event 64H , Umask 10H
 Counts the number of times a write CAS command was issued on DRAM channel 2.
 .It Li DRAM_WRITE_CAS.AUTOPRE_CH2
 .Pq Event 64H , Umask 20H
 Counts the number of times a write CAS command was issued on DRAM channel 2
 where the command issued used the auto-precharge (auto page close) mode.
 .It Li DRAM_REFRESH.CH0
 .Pq Event 65H , Umask 01H
 Counts number of DRAM channel 0 refresh commands.
 DRAM loses data content over time.
 In order to keep correct data content, the data values have to be
 refreshed periodically.
 .It Li DRAM_REFRESH.CH1
 .Pq Event 65H , Umask 02H
 Counts number of DRAM channel 1 refresh commands.
 DRAM loses data content over time.
 In order to keep correct data content, the data values have to be refreshed periodically.
 .It Li DRAM_REFRESH.CH2
 .Pq Event 65H , Umask 04H
 Counts number of DRAM channel 2 refresh commands.
 DRAM loses data content over time.
 In order to keep correct data content, the data values have to be refreshed periodically.
 .It Li DRAM_PRE_ALL.CH0
 .Pq Event 66H , Umask 01H
 Counts number of DRAM Channel 0 precharge-all (PREALL) commands that close
 all open pages in a rank.
 PREALL is issued when the DRAM needs to be refreshed or needs to go into a power down mode.
 .It Li DRAM_PRE_ALL.CH1
 .Pq Event 66H , Umask 02H
 Counts number of DRAM Channel 1 precharge-all (PREALL) commands that close
 all open pages in a rank.
 PREALL is issued when the DRAM needs to be refreshed or needs to go into a power down mode.
 .It Li DRAM_PRE_ALL.CH2
 .Pq Event 66H , Umask 04H
 Counts number of DRAM Channel 2 precharge-all (PREALL) commands that close
 all open pages in a rank.
 PREALL is issued when the DRAM needs to be refreshed or needs to go into a power down mode.
 .It Li DRAM_THERMAL_THROTTLED
 .Pq Event 67H , Umask 01H
 Uncore cycles DRAM was throttled due to its temperature being above the
 thermal throttling threshold.
 .It Li THERMAL_THROTTLING_TEMP.CORE_0
 .Pq Event 80H , Umask 01H
 Cycles that the PCU records that core 0 is above the thermal throttling
 threshold temperature.
 .It Li THERMAL_THROTTLING_TEMP.CORE_1
 .Pq Event 80H , Umask 02H
 Cycles that the PCU records that core 1 is above the thermal throttling
 threshold temperature.
 .It Li THERMAL_THROTTLING_TEMP.CORE_2
 .Pq Event 80H , Umask 04H
 Cycles that the PCU records that core 2 is above the thermal throttling
 threshold temperature.
 .It Li THERMAL_THROTTLING_TEMP.CORE_3
 .Pq Event 80H , Umask 08H
 Cycles that the PCU records that core 3 is above the thermal throttling
 threshold temperature.
 .It Li THERMAL_THROTTLED_TEMP.CORE_0
 .Pq Event 81H , Umask 01H
 Cycles that the PCU records that core 0 is in the power throttled state due
 to cores temperature being above the thermal throttling threshold.
 .It Li THERMAL_THROTTLED_TEMP.CORE_1
 .Pq Event 81H , Umask 02H
 Cycles that the PCU records that core 1 is in the power throttled state due
 to cores temperature being above the thermal throttling threshold.
 .It Li THERMAL_THROTTLED_TEMP.CORE_2
 .Pq Event 81H , Umask 04H
 Cycles that the PCU records that core 2 is in the power throttled state due
 to cores temperature being above the thermal throttling threshold.
 .It Li THERMAL_THROTTLED_TEMP.CORE_3
 .Pq Event 81H , Umask 08H
 Cycles that the PCU records that core 3 is in the power throttled state due
 to cores temperature being above the thermal throttling threshold.
 .It Li PROCHOT_ASSERTION
 .Pq Event 82H , Umask 01H
 Number of system assertions of PROCHOT indicating the entire processor has
 exceeded the thermal limit.
 .It Li THERMAL_THROTTLING_PROCHOT.CORE_0
 .Pq Event 83H , Umask 01H
 Cycles that the PCU records that core 0 is a low power state due to the
 system asserting PROCHOT the entire processor has exceeded the thermal
 limit.
 .It Li THERMAL_THROTTLING_PROCHOT.CORE_1
 .Pq Event 83H , Umask 02H
 Cycles that the PCU records that core 1 is a low power state due to the
 system asserting PROCHOT the entire processor has exceeded the thermal
 limit.
 .It Li THERMAL_THROTTLING_PROCHOT.CORE_2
 .Pq Event 83H , Umask 04H
 Cycles that the PCU records that core 2 is a low power state due to the
 system asserting PROCHOT the entire processor has exceeded the thermal
 limit.
 .It Li THERMAL_THROTTLING_PROCHOT.CORE_3
 .Pq Event 83H , Umask 08H
 Cycles that the PCU records that core 3 is a low power state due to the
 system asserting PROCHOT the entire processor has exceeded the thermal
 limit.
 .It Li TURBO_MODE.CORE_0
 .Pq Event 84H , Umask 01H
 Uncore cycles that core 0 is operating in turbo mode.
 .It Li TURBO_MODE.CORE_1
 .Pq Event 84H , Umask 02H
 Uncore cycles that core 1 is operating in turbo mode.
 .It Li TURBO_MODE.CORE_2
 .Pq Event 84H , Umask 04H
 Uncore cycles that core 2 is operating in turbo mode.
 .It Li TURBO_MODE.CORE_3
 .Pq Event 84H , Umask 08H
 Uncore cycles that core 3 is operating in turbo mode.
 .It Li CYCLES_UNHALTED_L3_FLL_ENABLE
 .Pq Event 85H , Umask 02H
 Uncore cycles that at least one core is unhalted and all L3 ways are
 enabled.
 .It Li CYCLES_UNHALTED_L3_FLL_DISABLE
 .Pq Event 86H , Umask 01H
 Uncore cycles that at least one core is unhalted and all L3 ways are
 disabled.
 .El
 .Sh SEE ALSO
 .Xr pmc 3 ,
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.corei7 3 ,
 .Xr pmc.corei7uc 3 ,
 .Xr pmc.iaf 3 ,
-.Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
 .Xr pmc.ucf 3 ,
 .Xr pmc.westmere 3 ,
 .Xr pmc_cpuinfo 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4
 .Sh HISTORY
 The
 .Nm pmc
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
 The
 .Lb libpmc
 library was written by
 .An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/sys/dev/hwpmc/pmc_events.h b/sys/dev/hwpmc/pmc_events.h
index 73362baa7e9c..ab157cb05dcf 100644
--- a/sys/dev/hwpmc/pmc_events.h
+++ b/sys/dev/hwpmc/pmc_events.h
@@ -1,2486 +1,2451 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2005  Joseph Koshy
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #ifndef _DEV_HWPMC_PMC_EVENTS_H_
 #define	_DEV_HWPMC_PMC_EVENTS_H_
 
 /*
  * Note: Documentation on adding events can be found online at:
  *
  * https://wiki.freebsd.org/PmcTools/PmcHardwareHowTo
  *
  * Please refer to this resource before you attempt to modify this file or the
  * hwpmc driver/subsystem.
  */
 
 /* * PMC event codes.
  *
  * __PMC_EV(CLASS, SYMBOLIC-NAME)
  *
  */
 /* timestamp counters. */
 #define        __PMC_EV_TSC()                                                  \
 	__PMC_EV(TSC, TSC)
 
 #define        PMC_EV_TSC_FIRST        PMC_EV_TSC_TSC
 #define        PMC_EV_TSC_LAST         PMC_EV_TSC_TSC
 
 #define	__PMC_EV_ALIAS_TSC()			\
 __PMC_EV_ALIAS("cycles",	TSC_TSC)
 
 /*
  * Software events are dynamically defined.
  */
 
 #define        PMC_EV_DYN_COUNT        0x1000
 
 #define        PMC_EV_SOFT_FIRST       0x20000
 #define        PMC_EV_SOFT_LAST        (PMC_EV_SOFT_FIRST + PMC_EV_DYN_COUNT - 1)
 
-/*
- * AMD K7 Events, from "The AMD Athlon(tm) Processor x86 Code
- * Optimization Guide" [Doc#22007K, Feb 2002]
- */
-
-#define	__PMC_EV_K7()					\
-__PMC_EV(K7, DC_ACCESSES)				\
-__PMC_EV(K7, DC_MISSES)					\
-__PMC_EV(K7, DC_REFILLS_FROM_L2)			\
-__PMC_EV(K7, DC_REFILLS_FROM_SYSTEM)			\
-__PMC_EV(K7, DC_WRITEBACKS)				\
-__PMC_EV(K7, L1_DTLB_MISS_AND_L2_DTLB_HITS)		\
-__PMC_EV(K7, L1_AND_L2_DTLB_MISSES)			\
-__PMC_EV(K7, MISALIGNED_REFERENCES)			\
-__PMC_EV(K7, IC_FETCHES)				\
-__PMC_EV(K7, IC_MISSES)					\
-__PMC_EV(K7, L1_ITLB_MISSES)				\
-__PMC_EV(K7, L1_L2_ITLB_MISSES)				\
-__PMC_EV(K7, RETIRED_INSTRUCTIONS)			\
-__PMC_EV(K7, RETIRED_OPS)				\
-__PMC_EV(K7, RETIRED_BRANCHES)				\
-__PMC_EV(K7, RETIRED_BRANCHES_MISPREDICTED)		\
-__PMC_EV(K7, RETIRED_TAKEN_BRANCHES)			\
-__PMC_EV(K7, RETIRED_TAKEN_BRANCHES_MISPREDICTED)	\
-__PMC_EV(K7, RETIRED_FAR_CONTROL_TRANSFERS)		\
-__PMC_EV(K7, RETIRED_RESYNC_BRANCHES)			\
-__PMC_EV(K7, INTERRUPTS_MASKED_CYCLES)			\
-__PMC_EV(K7, INTERRUPTS_MASKED_WHILE_PENDING_CYCLES)	\
-__PMC_EV(K7, HARDWARE_INTERRUPTS)
-
-#define	PMC_EV_K7_FIRST	PMC_EV_K7_DC_ACCESSES
-#define	PMC_EV_K7_LAST	PMC_EV_K7_HARDWARE_INTERRUPTS
-
 /* AMD K8 PMCs */
 
 #define	__PMC_EV_K8()							\
 __PMC_EV(K8, FP_DISPATCHED_FPU_OPS)					\
 __PMC_EV(K8, FP_CYCLES_WITH_NO_FPU_OPS_RETIRED)				\
 __PMC_EV(K8, FP_DISPATCHED_FPU_FAST_FLAG_OPS)				\
 __PMC_EV(K8, LS_SEGMENT_REGISTER_LOAD)					\
 __PMC_EV(K8, LS_MICROARCHITECTURAL_RESYNC_BY_SELF_MODIFYING_CODE)	\
 __PMC_EV(K8, LS_MICROARCHITECTURAL_RESYNC_BY_SNOOP)			\
 __PMC_EV(K8, LS_BUFFER2_FULL)						\
 __PMC_EV(K8, LS_LOCKED_OPERATION)					\
 __PMC_EV(K8, LS_MICROARCHITECTURAL_LATE_CANCEL)				\
 __PMC_EV(K8, LS_RETIRED_CFLUSH_INSTRUCTIONS)				\
 __PMC_EV(K8, LS_RETIRED_CPUID_INSTRUCTIONS)				\
 __PMC_EV(K8, DC_ACCESS)							\
 __PMC_EV(K8, DC_MISS)							\
 __PMC_EV(K8, DC_REFILL_FROM_L2)						\
 __PMC_EV(K8, DC_REFILL_FROM_SYSTEM)					\
 __PMC_EV(K8, DC_COPYBACK)						\
 __PMC_EV(K8, DC_L1_DTLB_MISS_AND_L2_DTLB_HIT)				\
 __PMC_EV(K8, DC_L1_DTLB_MISS_AND_L2_DTLB_MISS)				\
 __PMC_EV(K8, DC_MISALIGNED_DATA_REFERENCE)				\
 __PMC_EV(K8, DC_MICROARCHITECTURAL_LATE_CANCEL)				\
 __PMC_EV(K8, DC_MICROARCHITECTURAL_EARLY_CANCEL)			\
 __PMC_EV(K8, DC_ONE_BIT_ECC_ERROR)					\
 __PMC_EV(K8, DC_DISPATCHED_PREFETCH_INSTRUCTIONS)			\
 __PMC_EV(K8, DC_DCACHE_ACCESSES_BY_LOCKS)				\
 __PMC_EV(K8, BU_CPU_CLK_UNHALTED)					\
 __PMC_EV(K8, BU_INTERNAL_L2_REQUEST)					\
 __PMC_EV(K8, BU_FILL_REQUEST_L2_MISS)					\
 __PMC_EV(K8, BU_FILL_INTO_L2)						\
 __PMC_EV(K8, IC_FETCH)							\
 __PMC_EV(K8, IC_MISS)							\
 __PMC_EV(K8, IC_REFILL_FROM_L2)						\
 __PMC_EV(K8, IC_REFILL_FROM_SYSTEM)					\
 __PMC_EV(K8, IC_L1_ITLB_MISS_AND_L2_ITLB_HIT)				\
 __PMC_EV(K8, IC_L1_ITLB_MISS_AND_L2_ITLB_MISS)				\
 __PMC_EV(K8, IC_MICROARCHITECTURAL_RESYNC_BY_SNOOP)			\
 __PMC_EV(K8, IC_INSTRUCTION_FETCH_STALL)				\
 __PMC_EV(K8, IC_RETURN_STACK_HIT)					\
 __PMC_EV(K8, IC_RETURN_STACK_OVERFLOW)					\
 __PMC_EV(K8, FR_RETIRED_X86_INSTRUCTIONS)				\
 __PMC_EV(K8, FR_RETIRED_UOPS)						\
 __PMC_EV(K8, FR_RETIRED_BRANCHES)					\
 __PMC_EV(K8, FR_RETIRED_BRANCHES_MISPREDICTED)				\
 __PMC_EV(K8, FR_RETIRED_TAKEN_BRANCHES)					\
 __PMC_EV(K8, FR_RETIRED_TAKEN_BRANCHES_MISPREDICTED)			\
 __PMC_EV(K8, FR_RETIRED_FAR_CONTROL_TRANSFERS)				\
 __PMC_EV(K8, FR_RETIRED_RESYNCS)					\
 __PMC_EV(K8, FR_RETIRED_NEAR_RETURNS)					\
 __PMC_EV(K8, FR_RETIRED_NEAR_RETURNS_MISPREDICTED)			\
 __PMC_EV(K8, FR_RETIRED_TAKEN_BRANCHES_MISPREDICTED_BY_ADDR_MISCOMPARE)	\
 __PMC_EV(K8, FR_RETIRED_FPU_INSTRUCTIONS)				\
 __PMC_EV(K8, FR_RETIRED_FASTPATH_DOUBLE_OP_INSTRUCTIONS)		\
 __PMC_EV(K8, FR_INTERRUPTS_MASKED_CYCLES)				\
 __PMC_EV(K8, FR_INTERRUPTS_MASKED_WHILE_PENDING_CYCLES)			\
 __PMC_EV(K8, FR_TAKEN_HARDWARE_INTERRUPTS)				\
 __PMC_EV(K8, FR_DECODER_EMPTY)						\
 __PMC_EV(K8, FR_DISPATCH_STALLS)					\
 __PMC_EV(K8, FR_DISPATCH_STALL_FROM_BRANCH_ABORT_TO_RETIRE)		\
 __PMC_EV(K8, FR_DISPATCH_STALL_FOR_SERIALIZATION)			\
 __PMC_EV(K8, FR_DISPATCH_STALL_FOR_SEGMENT_LOAD)			\
 __PMC_EV(K8, FR_DISPATCH_STALL_WHEN_REORDER_BUFFER_IS_FULL)		\
 __PMC_EV(K8, FR_DISPATCH_STALL_WHEN_RESERVATION_STATIONS_ARE_FULL)	\
 __PMC_EV(K8, FR_DISPATCH_STALL_WHEN_FPU_IS_FULL)			\
 __PMC_EV(K8, FR_DISPATCH_STALL_WHEN_LS_IS_FULL)				\
 __PMC_EV(K8, FR_DISPATCH_STALL_WHEN_WAITING_FOR_ALL_TO_BE_QUIET)	\
 __PMC_EV(K8, FR_DISPATCH_STALL_WHEN_FAR_XFER_OR_RESYNC_BRANCH_PENDING)	\
 __PMC_EV(K8, FR_FPU_EXCEPTIONS)						\
 __PMC_EV(K8, FR_NUMBER_OF_BREAKPOINTS_FOR_DR0)				\
 __PMC_EV(K8, FR_NUMBER_OF_BREAKPOINTS_FOR_DR1)				\
 __PMC_EV(K8, FR_NUMBER_OF_BREAKPOINTS_FOR_DR2)				\
 __PMC_EV(K8, FR_NUMBER_OF_BREAKPOINTS_FOR_DR3)				\
 __PMC_EV(K8, NB_MEMORY_CONTROLLER_PAGE_ACCESS_EVENT)			\
 __PMC_EV(K8, NB_MEMORY_CONTROLLER_PAGE_TABLE_OVERFLOW)			\
 __PMC_EV(K8, NB_MEMORY_CONTROLLER_DRAM_COMMAND_SLOTS_MISSED)		\
 __PMC_EV(K8, NB_MEMORY_CONTROLLER_TURNAROUND)				\
 __PMC_EV(K8, NB_MEMORY_CONTROLLER_BYPASS_SATURATION)			\
 __PMC_EV(K8, NB_SIZED_COMMANDS)						\
 __PMC_EV(K8, NB_PROBE_RESULT)						\
 __PMC_EV(K8, NB_HT_BUS0_BANDWIDTH)					\
 __PMC_EV(K8, NB_HT_BUS1_BANDWIDTH)					\
 __PMC_EV(K8, NB_HT_BUS2_BANDWIDTH)
 
 #define	PMC_EV_K8_FIRST		PMC_EV_K8_FP_DISPATCHED_FPU_OPS
 #define	PMC_EV_K8_LAST		PMC_EV_K8_NB_HT_BUS2_BANDWIDTH
 
 /*
  * Events supported by Intel architectural fixed function counters,
  * from the "Intel 64 and IA-32 Architectures Software Developer's
  * Manual Volume 3B: System Programming Guide, Part 2", July 2008.
  */
 #define	__PMC_EV_IAF()							\
 __PMC_EV(IAF, INSTR_RETIRED_ANY)					\
 __PMC_EV(IAF, CPU_CLK_UNHALTED_CORE)					\
 __PMC_EV(IAF, CPU_CLK_UNHALTED_REF)
 
 #define	PMC_EV_IAF_FIRST	PMC_EV_IAF_INSTR_RETIRED_ANY
 #define	PMC_EV_IAF_LAST		PMC_EV_IAF_CPU_CLK_UNHALTED_REF
 
 #define	__PMC_EV_ALIAS_IAF()						\
 __PMC_EV_ALIAS("instruction-retired",	IAF_INSTR_RETIRED_ANY)		\
 __PMC_EV_ALIAS("unhalted-core-cycles",	IAF_CPU_CLK_UNHALTED_CORE)	\
 __PMC_EV_ALIAS("unhalted-reference-cycles", IAF_CPU_CLK_UNHALTED_REF)
 
 /*
  * ARMv7 Events
  */
 
 #define	__PMC_EV_ARMV7()			\
 	__PMC_EV(ARMV7, EVENT_00H)		\
 	__PMC_EV(ARMV7, EVENT_01H)		\
 	__PMC_EV(ARMV7, EVENT_02H)		\
 	__PMC_EV(ARMV7, EVENT_03H)		\
 	__PMC_EV(ARMV7, EVENT_04H)		\
 	__PMC_EV(ARMV7, EVENT_05H)		\
 	__PMC_EV(ARMV7, EVENT_06H)		\
 	__PMC_EV(ARMV7, EVENT_07H)		\
 	__PMC_EV(ARMV7, EVENT_08H)		\
 	__PMC_EV(ARMV7, EVENT_09H)		\
 	__PMC_EV(ARMV7, EVENT_0AH)		\
 	__PMC_EV(ARMV7, EVENT_0BH)		\
 	__PMC_EV(ARMV7, EVENT_0CH)		\
 	__PMC_EV(ARMV7, EVENT_0DH)		\
 	__PMC_EV(ARMV7, EVENT_0EH)		\
 	__PMC_EV(ARMV7, EVENT_0FH)		\
 	__PMC_EV(ARMV7, EVENT_10H)		\
 	__PMC_EV(ARMV7, EVENT_11H)		\
 	__PMC_EV(ARMV7, EVENT_12H)		\
 	__PMC_EV(ARMV7, EVENT_13H)		\
 	__PMC_EV(ARMV7, EVENT_14H)		\
 	__PMC_EV(ARMV7, EVENT_15H)		\
 	__PMC_EV(ARMV7, EVENT_16H)		\
 	__PMC_EV(ARMV7, EVENT_17H)		\
 	__PMC_EV(ARMV7, EVENT_18H)		\
 	__PMC_EV(ARMV7, EVENT_19H)		\
 	__PMC_EV(ARMV7, EVENT_1AH)		\
 	__PMC_EV(ARMV7, EVENT_1BH)		\
 	__PMC_EV(ARMV7, EVENT_1CH)		\
 	__PMC_EV(ARMV7, EVENT_1DH)		\
 	__PMC_EV(ARMV7, EVENT_1EH)		\
 	__PMC_EV(ARMV7, EVENT_1FH)		\
 	__PMC_EV(ARMV7, EVENT_20H)		\
 	__PMC_EV(ARMV7, EVENT_21H)		\
 	__PMC_EV(ARMV7, EVENT_22H)		\
 	__PMC_EV(ARMV7, EVENT_23H)		\
 	__PMC_EV(ARMV7, EVENT_24H)		\
 	__PMC_EV(ARMV7, EVENT_25H)		\
 	__PMC_EV(ARMV7, EVENT_26H)		\
 	__PMC_EV(ARMV7, EVENT_27H)		\
 	__PMC_EV(ARMV7, EVENT_28H)		\
 	__PMC_EV(ARMV7, EVENT_29H)		\
 	__PMC_EV(ARMV7, EVENT_2AH)		\
 	__PMC_EV(ARMV7, EVENT_2BH)		\
 	__PMC_EV(ARMV7, EVENT_2CH)		\
 	__PMC_EV(ARMV7, EVENT_2DH)		\
 	__PMC_EV(ARMV7, EVENT_2EH)		\
 	__PMC_EV(ARMV7, EVENT_2FH)		\
 	__PMC_EV(ARMV7, EVENT_30H)		\
 	__PMC_EV(ARMV7, EVENT_31H)		\
 	__PMC_EV(ARMV7, EVENT_32H)		\
 	__PMC_EV(ARMV7, EVENT_33H)		\
 	__PMC_EV(ARMV7, EVENT_34H)		\
 	__PMC_EV(ARMV7, EVENT_35H)		\
 	__PMC_EV(ARMV7, EVENT_36H)		\
 	__PMC_EV(ARMV7, EVENT_37H)		\
 	__PMC_EV(ARMV7, EVENT_38H)		\
 	__PMC_EV(ARMV7, EVENT_39H)		\
 	__PMC_EV(ARMV7, EVENT_3AH)		\
 	__PMC_EV(ARMV7, EVENT_3BH)		\
 	__PMC_EV(ARMV7, EVENT_3CH)		\
 	__PMC_EV(ARMV7, EVENT_3DH)		\
 	__PMC_EV(ARMV7, EVENT_3EH)		\
 	__PMC_EV(ARMV7, EVENT_3FH)		\
 	__PMC_EV(ARMV7, EVENT_40H)		\
 	__PMC_EV(ARMV7, EVENT_41H)		\
 	__PMC_EV(ARMV7, EVENT_42H)		\
 	__PMC_EV(ARMV7, EVENT_43H)		\
 	__PMC_EV(ARMV7, EVENT_44H)		\
 	__PMC_EV(ARMV7, EVENT_45H)		\
 	__PMC_EV(ARMV7, EVENT_46H)		\
 	__PMC_EV(ARMV7, EVENT_47H)		\
 	__PMC_EV(ARMV7, EVENT_48H)		\
 	__PMC_EV(ARMV7, EVENT_49H)		\
 	__PMC_EV(ARMV7, EVENT_4AH)		\
 	__PMC_EV(ARMV7, EVENT_4BH)		\
 	__PMC_EV(ARMV7, EVENT_4CH)		\
 	__PMC_EV(ARMV7, EVENT_4DH)		\
 	__PMC_EV(ARMV7, EVENT_4EH)		\
 	__PMC_EV(ARMV7, EVENT_4FH)		\
 	__PMC_EV(ARMV7, EVENT_50H)		\
 	__PMC_EV(ARMV7, EVENT_51H)		\
 	__PMC_EV(ARMV7, EVENT_52H)		\
 	__PMC_EV(ARMV7, EVENT_53H)		\
 	__PMC_EV(ARMV7, EVENT_54H)		\
 	__PMC_EV(ARMV7, EVENT_55H)		\
 	__PMC_EV(ARMV7, EVENT_56H)		\
 	__PMC_EV(ARMV7, EVENT_57H)		\
 	__PMC_EV(ARMV7, EVENT_58H)		\
 	__PMC_EV(ARMV7, EVENT_59H)		\
 	__PMC_EV(ARMV7, EVENT_5AH)		\
 	__PMC_EV(ARMV7, EVENT_5BH)		\
 	__PMC_EV(ARMV7, EVENT_5CH)		\
 	__PMC_EV(ARMV7, EVENT_5DH)		\
 	__PMC_EV(ARMV7, EVENT_5EH)		\
 	__PMC_EV(ARMV7, EVENT_5FH)		\
 	__PMC_EV(ARMV7, EVENT_60H)		\
 	__PMC_EV(ARMV7, EVENT_61H)		\
 	__PMC_EV(ARMV7, EVENT_62H)		\
 	__PMC_EV(ARMV7, EVENT_63H)		\
 	__PMC_EV(ARMV7, EVENT_64H)		\
 	__PMC_EV(ARMV7, EVENT_65H)		\
 	__PMC_EV(ARMV7, EVENT_66H)		\
 	__PMC_EV(ARMV7, EVENT_67H)		\
 	__PMC_EV(ARMV7, EVENT_68H)		\
 	__PMC_EV(ARMV7, EVENT_69H)		\
 	__PMC_EV(ARMV7, EVENT_6AH)		\
 	__PMC_EV(ARMV7, EVENT_6BH)		\
 	__PMC_EV(ARMV7, EVENT_6CH)		\
 	__PMC_EV(ARMV7, EVENT_6DH)		\
 	__PMC_EV(ARMV7, EVENT_6EH)		\
 	__PMC_EV(ARMV7, EVENT_6FH)		\
 	__PMC_EV(ARMV7, EVENT_70H)		\
 	__PMC_EV(ARMV7, EVENT_71H)		\
 	__PMC_EV(ARMV7, EVENT_72H)		\
 	__PMC_EV(ARMV7, EVENT_73H)		\
 	__PMC_EV(ARMV7, EVENT_74H)		\
 	__PMC_EV(ARMV7, EVENT_75H)		\
 	__PMC_EV(ARMV7, EVENT_76H)		\
 	__PMC_EV(ARMV7, EVENT_77H)		\
 	__PMC_EV(ARMV7, EVENT_78H)		\
 	__PMC_EV(ARMV7, EVENT_79H)		\
 	__PMC_EV(ARMV7, EVENT_7AH)		\
 	__PMC_EV(ARMV7, EVENT_7BH)		\
 	__PMC_EV(ARMV7, EVENT_7CH)		\
 	__PMC_EV(ARMV7, EVENT_7DH)		\
 	__PMC_EV(ARMV7, EVENT_7EH)		\
 	__PMC_EV(ARMV7, EVENT_7FH)		\
 	__PMC_EV(ARMV7, EVENT_80H)		\
 	__PMC_EV(ARMV7, EVENT_81H)		\
 	__PMC_EV(ARMV7, EVENT_82H)		\
 	__PMC_EV(ARMV7, EVENT_83H)		\
 	__PMC_EV(ARMV7, EVENT_84H)		\
 	__PMC_EV(ARMV7, EVENT_85H)		\
 	__PMC_EV(ARMV7, EVENT_86H)		\
 	__PMC_EV(ARMV7, EVENT_87H)		\
 	__PMC_EV(ARMV7, EVENT_88H)		\
 	__PMC_EV(ARMV7, EVENT_89H)		\
 	__PMC_EV(ARMV7, EVENT_8AH)		\
 	__PMC_EV(ARMV7, EVENT_8BH)		\
 	__PMC_EV(ARMV7, EVENT_8CH)		\
 	__PMC_EV(ARMV7, EVENT_8DH)		\
 	__PMC_EV(ARMV7, EVENT_8EH)		\
 	__PMC_EV(ARMV7, EVENT_8FH)		\
 	__PMC_EV(ARMV7, EVENT_90H)		\
 	__PMC_EV(ARMV7, EVENT_91H)		\
 	__PMC_EV(ARMV7, EVENT_92H)		\
 	__PMC_EV(ARMV7, EVENT_93H)		\
 	__PMC_EV(ARMV7, EVENT_94H)		\
 	__PMC_EV(ARMV7, EVENT_95H)		\
 	__PMC_EV(ARMV7, EVENT_96H)		\
 	__PMC_EV(ARMV7, EVENT_97H)		\
 	__PMC_EV(ARMV7, EVENT_98H)		\
 	__PMC_EV(ARMV7, EVENT_99H)		\
 	__PMC_EV(ARMV7, EVENT_9AH)		\
 	__PMC_EV(ARMV7, EVENT_9BH)		\
 	__PMC_EV(ARMV7, EVENT_9CH)		\
 	__PMC_EV(ARMV7, EVENT_9DH)		\
 	__PMC_EV(ARMV7, EVENT_9EH)		\
 	__PMC_EV(ARMV7, EVENT_9FH)		\
 	__PMC_EV(ARMV7, EVENT_A0H)		\
 	__PMC_EV(ARMV7, EVENT_A1H)		\
 	__PMC_EV(ARMV7, EVENT_A2H)		\
 	__PMC_EV(ARMV7, EVENT_A3H)		\
 	__PMC_EV(ARMV7, EVENT_A4H)		\
 	__PMC_EV(ARMV7, EVENT_A5H)		\
 	__PMC_EV(ARMV7, EVENT_A6H)		\
 	__PMC_EV(ARMV7, EVENT_A7H)		\
 	__PMC_EV(ARMV7, EVENT_A8H)		\
 	__PMC_EV(ARMV7, EVENT_A9H)		\
 	__PMC_EV(ARMV7, EVENT_AAH)		\
 	__PMC_EV(ARMV7, EVENT_ABH)		\
 	__PMC_EV(ARMV7, EVENT_ACH)		\
 	__PMC_EV(ARMV7, EVENT_ADH)		\
 	__PMC_EV(ARMV7, EVENT_AEH)		\
 	__PMC_EV(ARMV7, EVENT_AFH)		\
 	__PMC_EV(ARMV7, EVENT_B0H)		\
 	__PMC_EV(ARMV7, EVENT_B1H)		\
 	__PMC_EV(ARMV7, EVENT_B2H)		\
 	__PMC_EV(ARMV7, EVENT_B3H)		\
 	__PMC_EV(ARMV7, EVENT_B4H)		\
 	__PMC_EV(ARMV7, EVENT_B5H)		\
 	__PMC_EV(ARMV7, EVENT_B6H)		\
 	__PMC_EV(ARMV7, EVENT_B7H)		\
 	__PMC_EV(ARMV7, EVENT_B8H)		\
 	__PMC_EV(ARMV7, EVENT_B9H)		\
 	__PMC_EV(ARMV7, EVENT_BAH)		\
 	__PMC_EV(ARMV7, EVENT_BBH)		\
 	__PMC_EV(ARMV7, EVENT_BCH)		\
 	__PMC_EV(ARMV7, EVENT_BDH)		\
 	__PMC_EV(ARMV7, EVENT_BEH)		\
 	__PMC_EV(ARMV7, EVENT_BFH)		\
 	__PMC_EV(ARMV7, EVENT_C0H)		\
 	__PMC_EV(ARMV7, EVENT_C1H)		\
 	__PMC_EV(ARMV7, EVENT_C2H)		\
 	__PMC_EV(ARMV7, EVENT_C3H)		\
 	__PMC_EV(ARMV7, EVENT_C4H)		\
 	__PMC_EV(ARMV7, EVENT_C5H)		\
 	__PMC_EV(ARMV7, EVENT_C6H)		\
 	__PMC_EV(ARMV7, EVENT_C7H)		\
 	__PMC_EV(ARMV7, EVENT_C8H)		\
 	__PMC_EV(ARMV7, EVENT_C9H)		\
 	__PMC_EV(ARMV7, EVENT_CAH)		\
 	__PMC_EV(ARMV7, EVENT_CBH)		\
 	__PMC_EV(ARMV7, EVENT_CCH)		\
 	__PMC_EV(ARMV7, EVENT_CDH)		\
 	__PMC_EV(ARMV7, EVENT_CEH)		\
 	__PMC_EV(ARMV7, EVENT_CFH)		\
 	__PMC_EV(ARMV7, EVENT_D0H)		\
 	__PMC_EV(ARMV7, EVENT_D1H)		\
 	__PMC_EV(ARMV7, EVENT_D2H)		\
 	__PMC_EV(ARMV7, EVENT_D3H)		\
 	__PMC_EV(ARMV7, EVENT_D4H)		\
 	__PMC_EV(ARMV7, EVENT_D5H)		\
 	__PMC_EV(ARMV7, EVENT_D6H)		\
 	__PMC_EV(ARMV7, EVENT_D7H)		\
 	__PMC_EV(ARMV7, EVENT_D8H)		\
 	__PMC_EV(ARMV7, EVENT_D9H)		\
 	__PMC_EV(ARMV7, EVENT_DAH)		\
 	__PMC_EV(ARMV7, EVENT_DBH)		\
 	__PMC_EV(ARMV7, EVENT_DCH)		\
 	__PMC_EV(ARMV7, EVENT_DDH)		\
 	__PMC_EV(ARMV7, EVENT_DEH)		\
 	__PMC_EV(ARMV7, EVENT_DFH)		\
 	__PMC_EV(ARMV7, EVENT_E0H)		\
 	__PMC_EV(ARMV7, EVENT_E1H)		\
 	__PMC_EV(ARMV7, EVENT_E2H)		\
 	__PMC_EV(ARMV7, EVENT_E3H)		\
 	__PMC_EV(ARMV7, EVENT_E4H)		\
 	__PMC_EV(ARMV7, EVENT_E5H)		\
 	__PMC_EV(ARMV7, EVENT_E6H)		\
 	__PMC_EV(ARMV7, EVENT_E7H)		\
 	__PMC_EV(ARMV7, EVENT_E8H)		\
 	__PMC_EV(ARMV7, EVENT_E9H)		\
 	__PMC_EV(ARMV7, EVENT_EAH)		\
 	__PMC_EV(ARMV7, EVENT_EBH)		\
 	__PMC_EV(ARMV7, EVENT_ECH)		\
 	__PMC_EV(ARMV7, EVENT_EDH)		\
 	__PMC_EV(ARMV7, EVENT_EEH)		\
 	__PMC_EV(ARMV7, EVENT_EFH)		\
 	__PMC_EV(ARMV7, EVENT_F0H)		\
 	__PMC_EV(ARMV7, EVENT_F1H)		\
 	__PMC_EV(ARMV7, EVENT_F2H)		\
 	__PMC_EV(ARMV7, EVENT_F3H)		\
 	__PMC_EV(ARMV7, EVENT_F4H)		\
 	__PMC_EV(ARMV7, EVENT_F5H)		\
 	__PMC_EV(ARMV7, EVENT_F6H)		\
 	__PMC_EV(ARMV7, EVENT_F7H)		\
 	__PMC_EV(ARMV7, EVENT_F8H)		\
 	__PMC_EV(ARMV7, EVENT_F9H)		\
 	__PMC_EV(ARMV7, EVENT_FAH)		\
 	__PMC_EV(ARMV7, EVENT_FBH)		\
 	__PMC_EV(ARMV7, EVENT_FCH)		\
 	__PMC_EV(ARMV7, EVENT_FDH)		\
 	__PMC_EV(ARMV7, EVENT_FEH)		\
 	__PMC_EV(ARMV7, EVENT_FFH)
 
 #define	PMC_EV_ARMV7_FIRST	PMC_EV_ARMV7_EVENT_00H
 #define	PMC_EV_ARMV7_LAST	PMC_EV_ARMV7_EVENT_FFH
 
 #define	__PMC_EV_ALIAS_ARMV7_COMMON()					\
 	__PMC_EV_ALIAS("PMNC_SW_INCR",		ARMV7_EVENT_00H)	\
 	__PMC_EV_ALIAS("L1_ICACHE_REFILL",	ARMV7_EVENT_01H)	\
 	__PMC_EV_ALIAS("ITLB_REFILL",		ARMV7_EVENT_02H)	\
 	__PMC_EV_ALIAS("L1_DCACHE_REFILL",	ARMV7_EVENT_03H)	\
 	__PMC_EV_ALIAS("L1_DCACHE_ACCESS",	ARMV7_EVENT_04H)	\
 	__PMC_EV_ALIAS("DTLB_REFILL",		ARMV7_EVENT_05H)	\
 	__PMC_EV_ALIAS("MEM_READ",		ARMV7_EVENT_06H)	\
 	__PMC_EV_ALIAS("MEM_WRITE",		ARMV7_EVENT_07H)	\
 	__PMC_EV_ALIAS("EXC_TAKEN",		ARMV7_EVENT_09H)	\
 	__PMC_EV_ALIAS("EXC_EXECUTED",		ARMV7_EVENT_0AH)	\
 	__PMC_EV_ALIAS("CID_WRITE",		ARMV7_EVENT_0BH)	\
 	__PMC_EV_ALIAS("PC_WRITE",		ARMV7_EVENT_0CH)	\
 	__PMC_EV_ALIAS("PC_IMM_BRANCH",		ARMV7_EVENT_0DH)	\
 	__PMC_EV_ALIAS("MEM_UNALIGNED_ACCESS",	ARMV7_EVENT_0FH)	\
 	__PMC_EV_ALIAS("PC_BRANCH_MIS_PRED",	ARMV7_EVENT_10H)	\
 	__PMC_EV_ALIAS("CLOCK_CYCLES",		ARMV7_EVENT_11H)	\
 	__PMC_EV_ALIAS("PC_BRANCH_PRED",	ARMV7_EVENT_12H)
 
 #define	__PMC_EV_ALIAS_ARMV7_COMMON_A8()				\
 	__PMC_EV_ALIAS_ARMV7_COMMON()					\
 	__PMC_EV_ALIAS("INSTR_EXECUTED",	ARMV7_EVENT_08H)	\
 	__PMC_EV_ALIAS("PC_PROC_RETURN",	ARMV7_EVENT_0EH)	\
 	__PMC_EV_ALIAS("MEM_ACCESS",		ARMV7_EVENT_13H)	\
 	__PMC_EV_ALIAS("L1_ICACHE_ACCESS",	ARMV7_EVENT_14H)	\
 	__PMC_EV_ALIAS("L1_DCACHE_WB",		ARMV7_EVENT_15H)	\
 	__PMC_EV_ALIAS("L2_CACHE_ACCESS",	ARMV7_EVENT_16H)	\
 	__PMC_EV_ALIAS("L2_CACHE_REFILL",	ARMV7_EVENT_17H)	\
 	__PMC_EV_ALIAS("L2_CACHE_WB",		ARMV7_EVENT_18H)	\
 	__PMC_EV_ALIAS("BUS_ACCESS",		ARMV7_EVENT_19H)	\
 	__PMC_EV_ALIAS("MEM_ERROR",		ARMV7_EVENT_1AH)	\
 	__PMC_EV_ALIAS("INSTR_SPEC",		ARMV7_EVENT_1BH)	\
 	__PMC_EV_ALIAS("TTBR_WRITE",		ARMV7_EVENT_1CH)	\
 	__PMC_EV_ALIAS("BUS_CYCLES",		ARMV7_EVENT_1DH)	\
 	__PMC_EV_ALIAS("CPU_CYCLES",		ARMV7_EVENT_FFH)
 
 #define	__PMC_EV_ALIAS_ARMV7_CORTEX_A8()				 \
 	__PMC_EV_ALIAS_ARMV7_COMMON_A8()				 \
 	__PMC_EV_ALIAS("WRITE_BUF_FULL",		ARMV7_EVENT_40H) \
 	__PMC_EV_ALIAS("L2_STORE_MERGED",		ARMV7_EVENT_41H) \
 	__PMC_EV_ALIAS("L2_STORE_BUFFERABLE",		ARMV7_EVENT_42H) \
 	__PMC_EV_ALIAS("L2_ACCESS",			ARMV7_EVENT_43H) \
 	__PMC_EV_ALIAS("L2_CACHE_MISS",			ARMV7_EVENT_44H) \
 	__PMC_EV_ALIAS("AXI_READ",			ARMV7_EVENT_45H) \
 	__PMC_EV_ALIAS("AXI_WRITE",			ARMV7_EVENT_46H) \
 	__PMC_EV_ALIAS("MEM_REPLAY_EVT",		ARMV7_EVENT_47H) \
 	__PMC_EV_ALIAS("MEM_UNALIGNED_ACCESS_REPLAY",	ARMV7_EVENT_48H) \
 	__PMC_EV_ALIAS("L1_DCACHE_HASH_MISS",		ARMV7_EVENT_49H) \
 	__PMC_EV_ALIAS("L1_ICACHE_HASH_MISS",		ARMV7_EVENT_4AH) \
 	__PMC_EV_ALIAS("L1_CACHE_PAGECOL_ALIAS",	ARMV7_EVENT_4BH) \
 	__PMC_EV_ALIAS("L1_DCACHE_NEON_ACCESS",		ARMV7_EVENT_4CH) \
 	__PMC_EV_ALIAS("L1_DCACHE_NEON_CACHEABLE",	ARMV7_EVENT_4DH) \
 	__PMC_EV_ALIAS("L2_CACHE_NEON_MEM_ACCESS",	ARMV7_EVENT_4EH) \
 	__PMC_EV_ALIAS("L2_CACHE_NEON_HIT",		ARMV7_EVENT_4FH) \
 	__PMC_EV_ALIAS("L1_CACHE_ACCESS_NOCP15",	ARMV7_EVENT_50H) \
 	__PMC_EV_ALIAS("RET_STACK_MISPREDICT",		ARMV7_EVENT_51H) \
 	__PMC_EV_ALIAS("BRANCH_DIR_MISPREDICT",		ARMV7_EVENT_52H) \
 	__PMC_EV_ALIAS("PRED_BRANCH_PRED_TAKEN",	ARMV7_EVENT_53H) \
 	__PMC_EV_ALIAS("PRED_BRANCH_EXEC_TAKEN",	ARMV7_EVENT_54H) \
 	__PMC_EV_ALIAS("OPS_ISSUED",			ARMV7_EVENT_55H) \
 	__PMC_EV_ALIAS("CYCLES_NO_INSTRUCTION",		ARMV7_EVENT_56H) \
 	__PMC_EV_ALIAS("INSTRUCTIONS_ISSUED_CYCLE",	ARMV7_EVENT_57H) \
 	__PMC_EV_ALIAS("CYCLES_STALLED_NEON_MRC",	ARMV7_EVENT_58H) \
 	__PMC_EV_ALIAS("CYCLES_STALLED_NEON_FULLQ",	ARMV7_EVENT_59H) \
 	__PMC_EV_ALIAS("CYCLES_NONIDLE_NEON_INT",	ARMV7_EVENT_5AH) \
 	__PMC_EV_ALIAS("PMUEXTIN0_EVT",			ARMV7_EVENT_70H) \
 	__PMC_EV_ALIAS("PMUEXTIN1_EVT",			ARMV7_EVENT_71H) \
 	__PMC_EV_ALIAS("PMUEXTIN_EVT",			ARMV7_EVENT_72H)
 #define	PMC_EV_ARMV7_CORTEX_A8_FIRST	PMC_EV_ARMV7_PMNC_SW_INCR
 #define	PMC_EV_ARMV7_CORTEX_A8_LAST	PMC_EV_ARMV7_PMUEXTIN_EVT
 
 #define	__PMC_EV_ALIAS_ARMV7_CORTEX_A9()					\
 	__PMC_EV_ALIAS_ARMV7_COMMON()						\
 	__PMC_EV_ALIAS("JAVA_BYTECODE",			ARMV7_EVENT_40H)	\
 	__PMC_EV_ALIAS("SOFTWARE_JAVA_BYTECODE",	ARMV7_EVENT_41H)	\
 	__PMC_EV_ALIAS("JAZELLE_BACKWARD_BRANCH",	ARMV7_EVENT_42H)	\
 	__PMC_EV_ALIAS("COHERENT_LINEFILL_MISSC",	ARMV7_EVENT_50H)	\
 	__PMC_EV_ALIAS("COHERENT_LINEFILL_HITC",	ARMV7_EVENT_51H)	\
 	__PMC_EV_ALIAS("INSTR_CACHE_DEPENDENT_STALL",	ARMV7_EVENT_60H)	\
 	__PMC_EV_ALIAS("DATA_CACHE_DEPENDENT_STALL",	ARMV7_EVENT_61H)	\
 	__PMC_EV_ALIAS("MAIN_TLB_MISS_STALL",		ARMV7_EVENT_62H)	\
 	__PMC_EV_ALIAS("STREX_PASSED",			ARMV7_EVENT_63H)	\
 	__PMC_EV_ALIAS("STREX_FAILED",			ARMV7_EVENT_64H)	\
 	__PMC_EV_ALIAS("DATA_EVICTION",			ARMV7_EVENT_65H)	\
 	__PMC_EV_ALIAS("ISSUE_DNOT_DISPATCH_ANY_INSTR",	ARMV7_EVENT_66H)	\
 	__PMC_EV_ALIAS("ISSUE_IS_EMPTY",		ARMV7_EVENT_67H)	\
 	__PMC_EV_ALIAS("INSTR_RENAMED",			ARMV7_EVENT_68H)	\
 	__PMC_EV_ALIAS("PREDICTABLE_FUNCTION_RETURN",	ARMV7_EVENT_6EH)	\
 	__PMC_EV_ALIAS("MAIN_EXECUTION_UNIT_PIPE",	ARMV7_EVENT_70H)	\
 	__PMC_EV_ALIAS("SECOND_EXECUTION_UNIT_PIPE",	ARMV7_EVENT_71H)	\
 	__PMC_EV_ALIAS("LOAD_STORE_PIPE",		ARMV7_EVENT_72H)	\
 	__PMC_EV_ALIAS("FLOATING_POINT_INSTR_RENAMED",	ARMV7_EVENT_73H)	\
 	__PMC_EV_ALIAS("NEON_INSTRS_RENAMED",		ARMV7_EVENT_74H)	\
 	__PMC_EV_ALIAS("PLD_STALL",			ARMV7_EVENT_80H)	\
 	__PMC_EV_ALIAS("WRITE_STALL",			ARMV7_EVENT_81H)	\
 	__PMC_EV_ALIAS("INSTR_MAIN_TLB_MISS_STALL",	ARMV7_EVENT_82H)	\
 	__PMC_EV_ALIAS("DATA_MAIN_TLB_MISS_STALL",	ARMV7_EVENT_83H)	\
 	__PMC_EV_ALIAS("INSTR_MICRO_TLB_MISS_STALL",	ARMV7_EVENT_84H)	\
 	__PMC_EV_ALIAS("DATA_MICRO_TLB_MISS_STALL",	ARMV7_EVENT_85H)	\
 	__PMC_EV_ALIAS("DMB_STALL",			ARMV7_EVENT_86H)	\
 	__PMC_EV_ALIAS("INTEGER_CORE_CLOCK_ENABLED",	ARMV7_EVENT_8AH)	\
 	__PMC_EV_ALIAS("DATA_ENGINE_CLOCK_ENABLED",	ARMV7_EVENT_8BH)	\
 	__PMC_EV_ALIAS("ISB",				ARMV7_EVENT_90H)	\
 	__PMC_EV_ALIAS("DSB",				ARMV7_EVENT_91H)	\
 	__PMC_EV_ALIAS("DMB",				ARMV7_EVENT_92H)	\
 	__PMC_EV_ALIAS("EXTERNAL_INTERRUPT",		ARMV7_EVENT_93H)	\
 	__PMC_EV_ALIAS("PLE_CACHE_LINE_REQ_COMPLETED",	ARMV7_EVENT_A0H)	\
 	__PMC_EV_ALIAS("PLE_CACHE_LINE_REQ_SKIPPED",	ARMV7_EVENT_A1H)	\
 	__PMC_EV_ALIAS("PLE_FIFO_FLUSH",		ARMV7_EVENT_A2H)	\
 	__PMC_EV_ALIAS("PLE_REQUEST_COMPLETED",		ARMV7_EVENT_A3H)	\
 	__PMC_EV_ALIAS("PLE_FIFO_OVERFLOW",		ARMV7_EVENT_A4H)	\
 	__PMC_EV_ALIAS("PLE_REQUEST_PROGRAMMED",	ARMV7_EVENT_A5H)
 
 /*
  * ARMv8 Events
  *
  * NB: ARMv8.1 extends this to a 16-bit encoding, but we only define the 10-bit
  * event numbers here.
  */
 
 #define	__PMC_EV_ARMV8()			\
 	__PMC_EV(ARMV8, EVENT_00H)		\
 	__PMC_EV(ARMV8, EVENT_01H)		\
 	__PMC_EV(ARMV8, EVENT_02H)		\
 	__PMC_EV(ARMV8, EVENT_03H)		\
 	__PMC_EV(ARMV8, EVENT_04H)		\
 	__PMC_EV(ARMV8, EVENT_05H)		\
 	__PMC_EV(ARMV8, EVENT_06H)		\
 	__PMC_EV(ARMV8, EVENT_07H)		\
 	__PMC_EV(ARMV8, EVENT_08H)		\
 	__PMC_EV(ARMV8, EVENT_09H)		\
 	__PMC_EV(ARMV8, EVENT_0AH)		\
 	__PMC_EV(ARMV8, EVENT_0BH)		\
 	__PMC_EV(ARMV8, EVENT_0CH)		\
 	__PMC_EV(ARMV8, EVENT_0DH)		\
 	__PMC_EV(ARMV8, EVENT_0EH)		\
 	__PMC_EV(ARMV8, EVENT_0FH)		\
 	__PMC_EV(ARMV8, EVENT_10H)		\
 	__PMC_EV(ARMV8, EVENT_11H)		\
 	__PMC_EV(ARMV8, EVENT_12H)		\
 	__PMC_EV(ARMV8, EVENT_13H)		\
 	__PMC_EV(ARMV8, EVENT_14H)		\
 	__PMC_EV(ARMV8, EVENT_15H)		\
 	__PMC_EV(ARMV8, EVENT_16H)		\
 	__PMC_EV(ARMV8, EVENT_17H)		\
 	__PMC_EV(ARMV8, EVENT_18H)		\
 	__PMC_EV(ARMV8, EVENT_19H)		\
 	__PMC_EV(ARMV8, EVENT_1AH)		\
 	__PMC_EV(ARMV8, EVENT_1BH)		\
 	__PMC_EV(ARMV8, EVENT_1CH)		\
 	__PMC_EV(ARMV8, EVENT_1DH)		\
 	__PMC_EV(ARMV8, EVENT_1EH)		\
 	__PMC_EV(ARMV8, EVENT_1FH)		\
 	__PMC_EV(ARMV8, EVENT_20H)		\
 	__PMC_EV(ARMV8, EVENT_21H)		\
 	__PMC_EV(ARMV8, EVENT_22H)		\
 	__PMC_EV(ARMV8, EVENT_23H)		\
 	__PMC_EV(ARMV8, EVENT_24H)		\
 	__PMC_EV(ARMV8, EVENT_25H)		\
 	__PMC_EV(ARMV8, EVENT_26H)		\
 	__PMC_EV(ARMV8, EVENT_27H)		\
 	__PMC_EV(ARMV8, EVENT_28H)		\
 	__PMC_EV(ARMV8, EVENT_29H)		\
 	__PMC_EV(ARMV8, EVENT_2AH)		\
 	__PMC_EV(ARMV8, EVENT_2BH)		\
 	__PMC_EV(ARMV8, EVENT_2CH)		\
 	__PMC_EV(ARMV8, EVENT_2DH)		\
 	__PMC_EV(ARMV8, EVENT_2EH)		\
 	__PMC_EV(ARMV8, EVENT_2FH)		\
 	__PMC_EV(ARMV8, EVENT_30H)		\
 	__PMC_EV(ARMV8, EVENT_31H)		\
 	__PMC_EV(ARMV8, EVENT_32H)		\
 	__PMC_EV(ARMV8, EVENT_33H)		\
 	__PMC_EV(ARMV8, EVENT_34H)		\
 	__PMC_EV(ARMV8, EVENT_35H)		\
 	__PMC_EV(ARMV8, EVENT_36H)		\
 	__PMC_EV(ARMV8, EVENT_37H)		\
 	__PMC_EV(ARMV8, EVENT_38H)		\
 	__PMC_EV(ARMV8, EVENT_39H)		\
 	__PMC_EV(ARMV8, EVENT_3AH)		\
 	__PMC_EV(ARMV8, EVENT_3BH)		\
 	__PMC_EV(ARMV8, EVENT_3CH)		\
 	__PMC_EV(ARMV8, EVENT_3DH)		\
 	__PMC_EV(ARMV8, EVENT_3EH)		\
 	__PMC_EV(ARMV8, EVENT_3FH)		\
 	__PMC_EV(ARMV8, EVENT_40H)		\
 	__PMC_EV(ARMV8, EVENT_41H)		\
 	__PMC_EV(ARMV8, EVENT_42H)		\
 	__PMC_EV(ARMV8, EVENT_43H)		\
 	__PMC_EV(ARMV8, EVENT_44H)		\
 	__PMC_EV(ARMV8, EVENT_45H)		\
 	__PMC_EV(ARMV8, EVENT_46H)		\
 	__PMC_EV(ARMV8, EVENT_47H)		\
 	__PMC_EV(ARMV8, EVENT_48H)		\
 	__PMC_EV(ARMV8, EVENT_49H)		\
 	__PMC_EV(ARMV8, EVENT_4AH)		\
 	__PMC_EV(ARMV8, EVENT_4BH)		\
 	__PMC_EV(ARMV8, EVENT_4CH)		\
 	__PMC_EV(ARMV8, EVENT_4DH)		\
 	__PMC_EV(ARMV8, EVENT_4EH)		\
 	__PMC_EV(ARMV8, EVENT_4FH)		\
 	__PMC_EV(ARMV8, EVENT_50H)		\
 	__PMC_EV(ARMV8, EVENT_51H)		\
 	__PMC_EV(ARMV8, EVENT_52H)		\
 	__PMC_EV(ARMV8, EVENT_53H)		\
 	__PMC_EV(ARMV8, EVENT_54H)		\
 	__PMC_EV(ARMV8, EVENT_55H)		\
 	__PMC_EV(ARMV8, EVENT_56H)		\
 	__PMC_EV(ARMV8, EVENT_57H)		\
 	__PMC_EV(ARMV8, EVENT_58H)		\
 	__PMC_EV(ARMV8, EVENT_59H)		\
 	__PMC_EV(ARMV8, EVENT_5AH)		\
 	__PMC_EV(ARMV8, EVENT_5BH)		\
 	__PMC_EV(ARMV8, EVENT_5CH)		\
 	__PMC_EV(ARMV8, EVENT_5DH)		\
 	__PMC_EV(ARMV8, EVENT_5EH)		\
 	__PMC_EV(ARMV8, EVENT_5FH)		\
 	__PMC_EV(ARMV8, EVENT_60H)		\
 	__PMC_EV(ARMV8, EVENT_61H)		\
 	__PMC_EV(ARMV8, EVENT_62H)		\
 	__PMC_EV(ARMV8, EVENT_63H)		\
 	__PMC_EV(ARMV8, EVENT_64H)		\
 	__PMC_EV(ARMV8, EVENT_65H)		\
 	__PMC_EV(ARMV8, EVENT_66H)		\
 	__PMC_EV(ARMV8, EVENT_67H)		\
 	__PMC_EV(ARMV8, EVENT_68H)		\
 	__PMC_EV(ARMV8, EVENT_69H)		\
 	__PMC_EV(ARMV8, EVENT_6AH)		\
 	__PMC_EV(ARMV8, EVENT_6BH)		\
 	__PMC_EV(ARMV8, EVENT_6CH)		\
 	__PMC_EV(ARMV8, EVENT_6DH)		\
 	__PMC_EV(ARMV8, EVENT_6EH)		\
 	__PMC_EV(ARMV8, EVENT_6FH)		\
 	__PMC_EV(ARMV8, EVENT_70H)		\
 	__PMC_EV(ARMV8, EVENT_71H)		\
 	__PMC_EV(ARMV8, EVENT_72H)		\
 	__PMC_EV(ARMV8, EVENT_73H)		\
 	__PMC_EV(ARMV8, EVENT_74H)		\
 	__PMC_EV(ARMV8, EVENT_75H)		\
 	__PMC_EV(ARMV8, EVENT_76H)		\
 	__PMC_EV(ARMV8, EVENT_77H)		\
 	__PMC_EV(ARMV8, EVENT_78H)		\
 	__PMC_EV(ARMV8, EVENT_79H)		\
 	__PMC_EV(ARMV8, EVENT_7AH)		\
 	__PMC_EV(ARMV8, EVENT_7BH)		\
 	__PMC_EV(ARMV8, EVENT_7CH)		\
 	__PMC_EV(ARMV8, EVENT_7DH)		\
 	__PMC_EV(ARMV8, EVENT_7EH)		\
 	__PMC_EV(ARMV8, EVENT_7FH)		\
 	__PMC_EV(ARMV8, EVENT_80H)		\
 	__PMC_EV(ARMV8, EVENT_81H)		\
 	__PMC_EV(ARMV8, EVENT_82H)		\
 	__PMC_EV(ARMV8, EVENT_83H)		\
 	__PMC_EV(ARMV8, EVENT_84H)		\
 	__PMC_EV(ARMV8, EVENT_85H)		\
 	__PMC_EV(ARMV8, EVENT_86H)		\
 	__PMC_EV(ARMV8, EVENT_87H)		\
 	__PMC_EV(ARMV8, EVENT_88H)		\
 	__PMC_EV(ARMV8, EVENT_89H)		\
 	__PMC_EV(ARMV8, EVENT_8AH)		\
 	__PMC_EV(ARMV8, EVENT_8BH)		\
 	__PMC_EV(ARMV8, EVENT_8CH)		\
 	__PMC_EV(ARMV8, EVENT_8DH)		\
 	__PMC_EV(ARMV8, EVENT_8EH)		\
 	__PMC_EV(ARMV8, EVENT_8FH)		\
 	__PMC_EV(ARMV8, EVENT_90H)		\
 	__PMC_EV(ARMV8, EVENT_91H)		\
 	__PMC_EV(ARMV8, EVENT_92H)		\
 	__PMC_EV(ARMV8, EVENT_93H)		\
 	__PMC_EV(ARMV8, EVENT_94H)		\
 	__PMC_EV(ARMV8, EVENT_95H)		\
 	__PMC_EV(ARMV8, EVENT_96H)		\
 	__PMC_EV(ARMV8, EVENT_97H)		\
 	__PMC_EV(ARMV8, EVENT_98H)		\
 	__PMC_EV(ARMV8, EVENT_99H)		\
 	__PMC_EV(ARMV8, EVENT_9AH)		\
 	__PMC_EV(ARMV8, EVENT_9BH)		\
 	__PMC_EV(ARMV8, EVENT_9CH)		\
 	__PMC_EV(ARMV8, EVENT_9DH)		\
 	__PMC_EV(ARMV8, EVENT_9EH)		\
 	__PMC_EV(ARMV8, EVENT_9FH)		\
 	__PMC_EV(ARMV8, EVENT_A0H)		\
 	__PMC_EV(ARMV8, EVENT_A1H)		\
 	__PMC_EV(ARMV8, EVENT_A2H)		\
 	__PMC_EV(ARMV8, EVENT_A3H)		\
 	__PMC_EV(ARMV8, EVENT_A4H)		\
 	__PMC_EV(ARMV8, EVENT_A5H)		\
 	__PMC_EV(ARMV8, EVENT_A6H)		\
 	__PMC_EV(ARMV8, EVENT_A7H)		\
 	__PMC_EV(ARMV8, EVENT_A8H)		\
 	__PMC_EV(ARMV8, EVENT_A9H)		\
 	__PMC_EV(ARMV8, EVENT_AAH)		\
 	__PMC_EV(ARMV8, EVENT_ABH)		\
 	__PMC_EV(ARMV8, EVENT_ACH)		\
 	__PMC_EV(ARMV8, EVENT_ADH)		\
 	__PMC_EV(ARMV8, EVENT_AEH)		\
 	__PMC_EV(ARMV8, EVENT_AFH)		\
 	__PMC_EV(ARMV8, EVENT_B0H)		\
 	__PMC_EV(ARMV8, EVENT_B1H)		\
 	__PMC_EV(ARMV8, EVENT_B2H)		\
 	__PMC_EV(ARMV8, EVENT_B3H)		\
 	__PMC_EV(ARMV8, EVENT_B4H)		\
 	__PMC_EV(ARMV8, EVENT_B5H)		\
 	__PMC_EV(ARMV8, EVENT_B6H)		\
 	__PMC_EV(ARMV8, EVENT_B7H)		\
 	__PMC_EV(ARMV8, EVENT_B8H)		\
 	__PMC_EV(ARMV8, EVENT_B9H)		\
 	__PMC_EV(ARMV8, EVENT_BAH)		\
 	__PMC_EV(ARMV8, EVENT_BBH)		\
 	__PMC_EV(ARMV8, EVENT_BCH)		\
 	__PMC_EV(ARMV8, EVENT_BDH)		\
 	__PMC_EV(ARMV8, EVENT_BEH)		\
 	__PMC_EV(ARMV8, EVENT_BFH)		\
 	__PMC_EV(ARMV8, EVENT_C0H)		\
 	__PMC_EV(ARMV8, EVENT_C1H)		\
 	__PMC_EV(ARMV8, EVENT_C2H)		\
 	__PMC_EV(ARMV8, EVENT_C3H)		\
 	__PMC_EV(ARMV8, EVENT_C4H)		\
 	__PMC_EV(ARMV8, EVENT_C5H)		\
 	__PMC_EV(ARMV8, EVENT_C6H)		\
 	__PMC_EV(ARMV8, EVENT_C7H)		\
 	__PMC_EV(ARMV8, EVENT_C8H)		\
 	__PMC_EV(ARMV8, EVENT_C9H)		\
 	__PMC_EV(ARMV8, EVENT_CAH)		\
 	__PMC_EV(ARMV8, EVENT_CBH)		\
 	__PMC_EV(ARMV8, EVENT_CCH)		\
 	__PMC_EV(ARMV8, EVENT_CDH)		\
 	__PMC_EV(ARMV8, EVENT_CEH)		\
 	__PMC_EV(ARMV8, EVENT_CFH)		\
 	__PMC_EV(ARMV8, EVENT_D0H)		\
 	__PMC_EV(ARMV8, EVENT_D1H)		\
 	__PMC_EV(ARMV8, EVENT_D2H)		\
 	__PMC_EV(ARMV8, EVENT_D3H)		\
 	__PMC_EV(ARMV8, EVENT_D4H)		\
 	__PMC_EV(ARMV8, EVENT_D5H)		\
 	__PMC_EV(ARMV8, EVENT_D6H)		\
 	__PMC_EV(ARMV8, EVENT_D7H)		\
 	__PMC_EV(ARMV8, EVENT_D8H)		\
 	__PMC_EV(ARMV8, EVENT_D9H)		\
 	__PMC_EV(ARMV8, EVENT_DAH)		\
 	__PMC_EV(ARMV8, EVENT_DBH)		\
 	__PMC_EV(ARMV8, EVENT_DCH)		\
 	__PMC_EV(ARMV8, EVENT_DDH)		\
 	__PMC_EV(ARMV8, EVENT_DEH)		\
 	__PMC_EV(ARMV8, EVENT_DFH)		\
 	__PMC_EV(ARMV8, EVENT_E0H)		\
 	__PMC_EV(ARMV8, EVENT_E1H)		\
 	__PMC_EV(ARMV8, EVENT_E2H)		\
 	__PMC_EV(ARMV8, EVENT_E3H)		\
 	__PMC_EV(ARMV8, EVENT_E4H)		\
 	__PMC_EV(ARMV8, EVENT_E5H)		\
 	__PMC_EV(ARMV8, EVENT_E6H)		\
 	__PMC_EV(ARMV8, EVENT_E7H)		\
 	__PMC_EV(ARMV8, EVENT_E8H)		\
 	__PMC_EV(ARMV8, EVENT_E9H)		\
 	__PMC_EV(ARMV8, EVENT_EAH)		\
 	__PMC_EV(ARMV8, EVENT_EBH)		\
 	__PMC_EV(ARMV8, EVENT_ECH)		\
 	__PMC_EV(ARMV8, EVENT_EDH)		\
 	__PMC_EV(ARMV8, EVENT_EEH)		\
 	__PMC_EV(ARMV8, EVENT_EFH)		\
 	__PMC_EV(ARMV8, EVENT_F0H)		\
 	__PMC_EV(ARMV8, EVENT_F1H)		\
 	__PMC_EV(ARMV8, EVENT_F2H)		\
 	__PMC_EV(ARMV8, EVENT_F3H)		\
 	__PMC_EV(ARMV8, EVENT_F4H)		\
 	__PMC_EV(ARMV8, EVENT_F5H)		\
 	__PMC_EV(ARMV8, EVENT_F6H)		\
 	__PMC_EV(ARMV8, EVENT_F7H)		\
 	__PMC_EV(ARMV8, EVENT_F8H)		\
 	__PMC_EV(ARMV8, EVENT_F9H)		\
 	__PMC_EV(ARMV8, EVENT_FAH)		\
 	__PMC_EV(ARMV8, EVENT_FBH)		\
 	__PMC_EV(ARMV8, EVENT_FCH)		\
 	__PMC_EV(ARMV8, EVENT_FDH)		\
 	__PMC_EV(ARMV8, EVENT_FEH)		\
 	__PMC_EV(ARMV8, EVENT_FFH)		\
 	__PMC_EV(ARMV8, EVENT_100H)		\
 	__PMC_EV(ARMV8, EVENT_101H)		\
 	__PMC_EV(ARMV8, EVENT_102H)		\
 	__PMC_EV(ARMV8, EVENT_103H)		\
 	__PMC_EV(ARMV8, EVENT_104H)		\
 	__PMC_EV(ARMV8, EVENT_105H)		\
 	__PMC_EV(ARMV8, EVENT_106H)		\
 	__PMC_EV(ARMV8, EVENT_107H)		\
 	__PMC_EV(ARMV8, EVENT_108H)		\
 	__PMC_EV(ARMV8, EVENT_109H)		\
 	__PMC_EV(ARMV8, EVENT_10AH)		\
 	__PMC_EV(ARMV8, EVENT_10BH)		\
 	__PMC_EV(ARMV8, EVENT_10CH)		\
 	__PMC_EV(ARMV8, EVENT_10DH)		\
 	__PMC_EV(ARMV8, EVENT_10EH)		\
 	__PMC_EV(ARMV8, EVENT_10FH)		\
 	__PMC_EV(ARMV8, EVENT_110H)		\
 	__PMC_EV(ARMV8, EVENT_111H)		\
 	__PMC_EV(ARMV8, EVENT_112H)		\
 	__PMC_EV(ARMV8, EVENT_113H)		\
 	__PMC_EV(ARMV8, EVENT_114H)		\
 	__PMC_EV(ARMV8, EVENT_115H)		\
 	__PMC_EV(ARMV8, EVENT_116H)		\
 	__PMC_EV(ARMV8, EVENT_117H)		\
 	__PMC_EV(ARMV8, EVENT_118H)		\
 	__PMC_EV(ARMV8, EVENT_119H)		\
 	__PMC_EV(ARMV8, EVENT_11AH)		\
 	__PMC_EV(ARMV8, EVENT_11BH)		\
 	__PMC_EV(ARMV8, EVENT_11CH)		\
 	__PMC_EV(ARMV8, EVENT_11DH)		\
 	__PMC_EV(ARMV8, EVENT_11EH)		\
 	__PMC_EV(ARMV8, EVENT_11FH)		\
 	__PMC_EV(ARMV8, EVENT_120H)		\
 	__PMC_EV(ARMV8, EVENT_121H)		\
 	__PMC_EV(ARMV8, EVENT_122H)		\
 	__PMC_EV(ARMV8, EVENT_123H)		\
 	__PMC_EV(ARMV8, EVENT_124H)		\
 	__PMC_EV(ARMV8, EVENT_125H)		\
 	__PMC_EV(ARMV8, EVENT_126H)		\
 	__PMC_EV(ARMV8, EVENT_127H)		\
 	__PMC_EV(ARMV8, EVENT_128H)		\
 	__PMC_EV(ARMV8, EVENT_129H)		\
 	__PMC_EV(ARMV8, EVENT_12AH)		\
 	__PMC_EV(ARMV8, EVENT_12BH)		\
 	__PMC_EV(ARMV8, EVENT_12CH)		\
 	__PMC_EV(ARMV8, EVENT_12DH)		\
 	__PMC_EV(ARMV8, EVENT_12EH)		\
 	__PMC_EV(ARMV8, EVENT_12FH)		\
 	__PMC_EV(ARMV8, EVENT_130H)		\
 	__PMC_EV(ARMV8, EVENT_131H)		\
 	__PMC_EV(ARMV8, EVENT_132H)		\
 	__PMC_EV(ARMV8, EVENT_133H)		\
 	__PMC_EV(ARMV8, EVENT_134H)		\
 	__PMC_EV(ARMV8, EVENT_135H)		\
 	__PMC_EV(ARMV8, EVENT_136H)		\
 	__PMC_EV(ARMV8, EVENT_137H)		\
 	__PMC_EV(ARMV8, EVENT_138H)		\
 	__PMC_EV(ARMV8, EVENT_139H)		\
 	__PMC_EV(ARMV8, EVENT_13AH)		\
 	__PMC_EV(ARMV8, EVENT_13BH)		\
 	__PMC_EV(ARMV8, EVENT_13CH)		\
 	__PMC_EV(ARMV8, EVENT_13DH)		\
 	__PMC_EV(ARMV8, EVENT_13EH)		\
 	__PMC_EV(ARMV8, EVENT_13FH)		\
 	__PMC_EV(ARMV8, EVENT_140H)		\
 	__PMC_EV(ARMV8, EVENT_141H)		\
 	__PMC_EV(ARMV8, EVENT_142H)		\
 	__PMC_EV(ARMV8, EVENT_143H)		\
 	__PMC_EV(ARMV8, EVENT_144H)		\
 	__PMC_EV(ARMV8, EVENT_145H)		\
 	__PMC_EV(ARMV8, EVENT_146H)		\
 	__PMC_EV(ARMV8, EVENT_147H)		\
 	__PMC_EV(ARMV8, EVENT_148H)		\
 	__PMC_EV(ARMV8, EVENT_149H)		\
 	__PMC_EV(ARMV8, EVENT_14AH)		\
 	__PMC_EV(ARMV8, EVENT_14BH)		\
 	__PMC_EV(ARMV8, EVENT_14CH)		\
 	__PMC_EV(ARMV8, EVENT_14DH)		\
 	__PMC_EV(ARMV8, EVENT_14EH)		\
 	__PMC_EV(ARMV8, EVENT_14FH)		\
 	__PMC_EV(ARMV8, EVENT_150H)		\
 	__PMC_EV(ARMV8, EVENT_151H)		\
 	__PMC_EV(ARMV8, EVENT_152H)		\
 	__PMC_EV(ARMV8, EVENT_153H)		\
 	__PMC_EV(ARMV8, EVENT_154H)		\
 	__PMC_EV(ARMV8, EVENT_155H)		\
 	__PMC_EV(ARMV8, EVENT_156H)		\
 	__PMC_EV(ARMV8, EVENT_157H)		\
 	__PMC_EV(ARMV8, EVENT_158H)		\
 	__PMC_EV(ARMV8, EVENT_159H)		\
 	__PMC_EV(ARMV8, EVENT_15AH)		\
 	__PMC_EV(ARMV8, EVENT_15BH)		\
 	__PMC_EV(ARMV8, EVENT_15CH)		\
 	__PMC_EV(ARMV8, EVENT_15DH)		\
 	__PMC_EV(ARMV8, EVENT_15EH)		\
 	__PMC_EV(ARMV8, EVENT_15FH)		\
 	__PMC_EV(ARMV8, EVENT_160H)		\
 	__PMC_EV(ARMV8, EVENT_161H)		\
 	__PMC_EV(ARMV8, EVENT_162H)		\
 	__PMC_EV(ARMV8, EVENT_163H)		\
 	__PMC_EV(ARMV8, EVENT_164H)		\
 	__PMC_EV(ARMV8, EVENT_165H)		\
 	__PMC_EV(ARMV8, EVENT_166H)		\
 	__PMC_EV(ARMV8, EVENT_167H)		\
 	__PMC_EV(ARMV8, EVENT_168H)		\
 	__PMC_EV(ARMV8, EVENT_169H)		\
 	__PMC_EV(ARMV8, EVENT_16AH)		\
 	__PMC_EV(ARMV8, EVENT_16BH)		\
 	__PMC_EV(ARMV8, EVENT_16CH)		\
 	__PMC_EV(ARMV8, EVENT_16DH)		\
 	__PMC_EV(ARMV8, EVENT_16EH)		\
 	__PMC_EV(ARMV8, EVENT_16FH)		\
 	__PMC_EV(ARMV8, EVENT_170H)		\
 	__PMC_EV(ARMV8, EVENT_171H)		\
 	__PMC_EV(ARMV8, EVENT_172H)		\
 	__PMC_EV(ARMV8, EVENT_173H)		\
 	__PMC_EV(ARMV8, EVENT_174H)		\
 	__PMC_EV(ARMV8, EVENT_175H)		\
 	__PMC_EV(ARMV8, EVENT_176H)		\
 	__PMC_EV(ARMV8, EVENT_177H)		\
 	__PMC_EV(ARMV8, EVENT_178H)		\
 	__PMC_EV(ARMV8, EVENT_179H)		\
 	__PMC_EV(ARMV8, EVENT_17AH)		\
 	__PMC_EV(ARMV8, EVENT_17BH)		\
 	__PMC_EV(ARMV8, EVENT_17CH)		\
 	__PMC_EV(ARMV8, EVENT_17DH)		\
 	__PMC_EV(ARMV8, EVENT_17EH)		\
 	__PMC_EV(ARMV8, EVENT_17FH)		\
 	__PMC_EV(ARMV8, EVENT_180H)		\
 	__PMC_EV(ARMV8, EVENT_181H)		\
 	__PMC_EV(ARMV8, EVENT_182H)		\
 	__PMC_EV(ARMV8, EVENT_183H)		\
 	__PMC_EV(ARMV8, EVENT_184H)		\
 	__PMC_EV(ARMV8, EVENT_185H)		\
 	__PMC_EV(ARMV8, EVENT_186H)		\
 	__PMC_EV(ARMV8, EVENT_187H)		\
 	__PMC_EV(ARMV8, EVENT_188H)		\
 	__PMC_EV(ARMV8, EVENT_189H)		\
 	__PMC_EV(ARMV8, EVENT_18AH)		\
 	__PMC_EV(ARMV8, EVENT_18BH)		\
 	__PMC_EV(ARMV8, EVENT_18CH)		\
 	__PMC_EV(ARMV8, EVENT_18DH)		\
 	__PMC_EV(ARMV8, EVENT_18EH)		\
 	__PMC_EV(ARMV8, EVENT_18FH)		\
 	__PMC_EV(ARMV8, EVENT_190H)		\
 	__PMC_EV(ARMV8, EVENT_191H)		\
 	__PMC_EV(ARMV8, EVENT_192H)		\
 	__PMC_EV(ARMV8, EVENT_193H)		\
 	__PMC_EV(ARMV8, EVENT_194H)		\
 	__PMC_EV(ARMV8, EVENT_195H)		\
 	__PMC_EV(ARMV8, EVENT_196H)		\
 	__PMC_EV(ARMV8, EVENT_197H)		\
 	__PMC_EV(ARMV8, EVENT_198H)		\
 	__PMC_EV(ARMV8, EVENT_199H)		\
 	__PMC_EV(ARMV8, EVENT_19AH)		\
 	__PMC_EV(ARMV8, EVENT_19BH)		\
 	__PMC_EV(ARMV8, EVENT_19CH)		\
 	__PMC_EV(ARMV8, EVENT_19DH)		\
 	__PMC_EV(ARMV8, EVENT_19EH)		\
 	__PMC_EV(ARMV8, EVENT_19FH)		\
 	__PMC_EV(ARMV8, EVENT_1A0H)		\
 	__PMC_EV(ARMV8, EVENT_1A1H)		\
 	__PMC_EV(ARMV8, EVENT_1A2H)		\
 	__PMC_EV(ARMV8, EVENT_1A3H)		\
 	__PMC_EV(ARMV8, EVENT_1A4H)		\
 	__PMC_EV(ARMV8, EVENT_1A5H)		\
 	__PMC_EV(ARMV8, EVENT_1A6H)		\
 	__PMC_EV(ARMV8, EVENT_1A7H)		\
 	__PMC_EV(ARMV8, EVENT_1A8H)		\
 	__PMC_EV(ARMV8, EVENT_1A9H)		\
 	__PMC_EV(ARMV8, EVENT_1AAH)		\
 	__PMC_EV(ARMV8, EVENT_1ABH)		\
 	__PMC_EV(ARMV8, EVENT_1ACH)		\
 	__PMC_EV(ARMV8, EVENT_1ADH)		\
 	__PMC_EV(ARMV8, EVENT_1AEH)		\
 	__PMC_EV(ARMV8, EVENT_1AFH)		\
 	__PMC_EV(ARMV8, EVENT_1B0H)		\
 	__PMC_EV(ARMV8, EVENT_1B1H)		\
 	__PMC_EV(ARMV8, EVENT_1B2H)		\
 	__PMC_EV(ARMV8, EVENT_1B3H)		\
 	__PMC_EV(ARMV8, EVENT_1B4H)		\
 	__PMC_EV(ARMV8, EVENT_1B5H)		\
 	__PMC_EV(ARMV8, EVENT_1B6H)		\
 	__PMC_EV(ARMV8, EVENT_1B7H)		\
 	__PMC_EV(ARMV8, EVENT_1B8H)		\
 	__PMC_EV(ARMV8, EVENT_1B9H)		\
 	__PMC_EV(ARMV8, EVENT_1BAH)		\
 	__PMC_EV(ARMV8, EVENT_1BBH)		\
 	__PMC_EV(ARMV8, EVENT_1BCH)		\
 	__PMC_EV(ARMV8, EVENT_1BDH)		\
 	__PMC_EV(ARMV8, EVENT_1BEH)		\
 	__PMC_EV(ARMV8, EVENT_1BFH)		\
 	__PMC_EV(ARMV8, EVENT_1C0H)		\
 	__PMC_EV(ARMV8, EVENT_1C1H)		\
 	__PMC_EV(ARMV8, EVENT_1C2H)		\
 	__PMC_EV(ARMV8, EVENT_1C3H)		\
 	__PMC_EV(ARMV8, EVENT_1C4H)		\
 	__PMC_EV(ARMV8, EVENT_1C5H)		\
 	__PMC_EV(ARMV8, EVENT_1C6H)		\
 	__PMC_EV(ARMV8, EVENT_1C7H)		\
 	__PMC_EV(ARMV8, EVENT_1C8H)		\
 	__PMC_EV(ARMV8, EVENT_1C9H)		\
 	__PMC_EV(ARMV8, EVENT_1CAH)		\
 	__PMC_EV(ARMV8, EVENT_1CBH)		\
 	__PMC_EV(ARMV8, EVENT_1CCH)		\
 	__PMC_EV(ARMV8, EVENT_1CDH)		\
 	__PMC_EV(ARMV8, EVENT_1CEH)		\
 	__PMC_EV(ARMV8, EVENT_1CFH)		\
 	__PMC_EV(ARMV8, EVENT_1D0H)		\
 	__PMC_EV(ARMV8, EVENT_1D1H)		\
 	__PMC_EV(ARMV8, EVENT_1D2H)		\
 	__PMC_EV(ARMV8, EVENT_1D3H)		\
 	__PMC_EV(ARMV8, EVENT_1D4H)		\
 	__PMC_EV(ARMV8, EVENT_1D5H)		\
 	__PMC_EV(ARMV8, EVENT_1D6H)		\
 	__PMC_EV(ARMV8, EVENT_1D7H)		\
 	__PMC_EV(ARMV8, EVENT_1D8H)		\
 	__PMC_EV(ARMV8, EVENT_1D9H)		\
 	__PMC_EV(ARMV8, EVENT_1DAH)		\
 	__PMC_EV(ARMV8, EVENT_1DBH)		\
 	__PMC_EV(ARMV8, EVENT_1DCH)		\
 	__PMC_EV(ARMV8, EVENT_1DDH)		\
 	__PMC_EV(ARMV8, EVENT_1DEH)		\
 	__PMC_EV(ARMV8, EVENT_1DFH)		\
 	__PMC_EV(ARMV8, EVENT_1E0H)		\
 	__PMC_EV(ARMV8, EVENT_1E1H)		\
 	__PMC_EV(ARMV8, EVENT_1E2H)		\
 	__PMC_EV(ARMV8, EVENT_1E3H)		\
 	__PMC_EV(ARMV8, EVENT_1E4H)		\
 	__PMC_EV(ARMV8, EVENT_1E5H)		\
 	__PMC_EV(ARMV8, EVENT_1E6H)		\
 	__PMC_EV(ARMV8, EVENT_1E7H)		\
 	__PMC_EV(ARMV8, EVENT_1E8H)		\
 	__PMC_EV(ARMV8, EVENT_1E9H)		\
 	__PMC_EV(ARMV8, EVENT_1EAH)		\
 	__PMC_EV(ARMV8, EVENT_1EBH)		\
 	__PMC_EV(ARMV8, EVENT_1ECH)		\
 	__PMC_EV(ARMV8, EVENT_1EDH)		\
 	__PMC_EV(ARMV8, EVENT_1EEH)		\
 	__PMC_EV(ARMV8, EVENT_1EFH)		\
 	__PMC_EV(ARMV8, EVENT_1F0H)		\
 	__PMC_EV(ARMV8, EVENT_1F1H)		\
 	__PMC_EV(ARMV8, EVENT_1F2H)		\
 	__PMC_EV(ARMV8, EVENT_1F3H)		\
 	__PMC_EV(ARMV8, EVENT_1F4H)		\
 	__PMC_EV(ARMV8, EVENT_1F5H)		\
 	__PMC_EV(ARMV8, EVENT_1F6H)		\
 	__PMC_EV(ARMV8, EVENT_1F7H)		\
 	__PMC_EV(ARMV8, EVENT_1F8H)		\
 	__PMC_EV(ARMV8, EVENT_1F9H)		\
 	__PMC_EV(ARMV8, EVENT_1FAH)		\
 	__PMC_EV(ARMV8, EVENT_1FBH)		\
 	__PMC_EV(ARMV8, EVENT_1FCH)		\
 	__PMC_EV(ARMV8, EVENT_1FDH)		\
 	__PMC_EV(ARMV8, EVENT_1FEH)		\
 	__PMC_EV(ARMV8, EVENT_1FFH)		\
 	__PMC_EV(ARMV8, EVENT_200H)		\
 	__PMC_EV(ARMV8, EVENT_201H)		\
 	__PMC_EV(ARMV8, EVENT_202H)		\
 	__PMC_EV(ARMV8, EVENT_203H)		\
 	__PMC_EV(ARMV8, EVENT_204H)		\
 	__PMC_EV(ARMV8, EVENT_205H)		\
 	__PMC_EV(ARMV8, EVENT_206H)		\
 	__PMC_EV(ARMV8, EVENT_207H)		\
 	__PMC_EV(ARMV8, EVENT_208H)		\
 	__PMC_EV(ARMV8, EVENT_209H)		\
 	__PMC_EV(ARMV8, EVENT_20AH)		\
 	__PMC_EV(ARMV8, EVENT_20BH)		\
 	__PMC_EV(ARMV8, EVENT_20CH)		\
 	__PMC_EV(ARMV8, EVENT_20DH)		\
 	__PMC_EV(ARMV8, EVENT_20EH)		\
 	__PMC_EV(ARMV8, EVENT_20FH)		\
 	__PMC_EV(ARMV8, EVENT_210H)		\
 	__PMC_EV(ARMV8, EVENT_211H)		\
 	__PMC_EV(ARMV8, EVENT_212H)		\
 	__PMC_EV(ARMV8, EVENT_213H)		\
 	__PMC_EV(ARMV8, EVENT_214H)		\
 	__PMC_EV(ARMV8, EVENT_215H)		\
 	__PMC_EV(ARMV8, EVENT_216H)		\
 	__PMC_EV(ARMV8, EVENT_217H)		\
 	__PMC_EV(ARMV8, EVENT_218H)		\
 	__PMC_EV(ARMV8, EVENT_219H)		\
 	__PMC_EV(ARMV8, EVENT_21AH)		\
 	__PMC_EV(ARMV8, EVENT_21BH)		\
 	__PMC_EV(ARMV8, EVENT_21CH)		\
 	__PMC_EV(ARMV8, EVENT_21DH)		\
 	__PMC_EV(ARMV8, EVENT_21EH)		\
 	__PMC_EV(ARMV8, EVENT_21FH)		\
 	__PMC_EV(ARMV8, EVENT_220H)		\
 	__PMC_EV(ARMV8, EVENT_221H)		\
 	__PMC_EV(ARMV8, EVENT_222H)		\
 	__PMC_EV(ARMV8, EVENT_223H)		\
 	__PMC_EV(ARMV8, EVENT_224H)		\
 	__PMC_EV(ARMV8, EVENT_225H)		\
 	__PMC_EV(ARMV8, EVENT_226H)		\
 	__PMC_EV(ARMV8, EVENT_227H)		\
 	__PMC_EV(ARMV8, EVENT_228H)		\
 	__PMC_EV(ARMV8, EVENT_229H)		\
 	__PMC_EV(ARMV8, EVENT_22AH)		\
 	__PMC_EV(ARMV8, EVENT_22BH)		\
 	__PMC_EV(ARMV8, EVENT_22CH)		\
 	__PMC_EV(ARMV8, EVENT_22DH)		\
 	__PMC_EV(ARMV8, EVENT_22EH)		\
 	__PMC_EV(ARMV8, EVENT_22FH)		\
 	__PMC_EV(ARMV8, EVENT_230H)		\
 	__PMC_EV(ARMV8, EVENT_231H)		\
 	__PMC_EV(ARMV8, EVENT_232H)		\
 	__PMC_EV(ARMV8, EVENT_233H)		\
 	__PMC_EV(ARMV8, EVENT_234H)		\
 	__PMC_EV(ARMV8, EVENT_235H)		\
 	__PMC_EV(ARMV8, EVENT_236H)		\
 	__PMC_EV(ARMV8, EVENT_237H)		\
 	__PMC_EV(ARMV8, EVENT_238H)		\
 	__PMC_EV(ARMV8, EVENT_239H)		\
 	__PMC_EV(ARMV8, EVENT_23AH)		\
 	__PMC_EV(ARMV8, EVENT_23BH)		\
 	__PMC_EV(ARMV8, EVENT_23CH)		\
 	__PMC_EV(ARMV8, EVENT_23DH)		\
 	__PMC_EV(ARMV8, EVENT_23EH)		\
 	__PMC_EV(ARMV8, EVENT_23FH)		\
 	__PMC_EV(ARMV8, EVENT_240H)		\
 	__PMC_EV(ARMV8, EVENT_241H)		\
 	__PMC_EV(ARMV8, EVENT_242H)		\
 	__PMC_EV(ARMV8, EVENT_243H)		\
 	__PMC_EV(ARMV8, EVENT_244H)		\
 	__PMC_EV(ARMV8, EVENT_245H)		\
 	__PMC_EV(ARMV8, EVENT_246H)		\
 	__PMC_EV(ARMV8, EVENT_247H)		\
 	__PMC_EV(ARMV8, EVENT_248H)		\
 	__PMC_EV(ARMV8, EVENT_249H)		\
 	__PMC_EV(ARMV8, EVENT_24AH)		\
 	__PMC_EV(ARMV8, EVENT_24BH)		\
 	__PMC_EV(ARMV8, EVENT_24CH)		\
 	__PMC_EV(ARMV8, EVENT_24DH)		\
 	__PMC_EV(ARMV8, EVENT_24EH)		\
 	__PMC_EV(ARMV8, EVENT_24FH)		\
 	__PMC_EV(ARMV8, EVENT_250H)		\
 	__PMC_EV(ARMV8, EVENT_251H)		\
 	__PMC_EV(ARMV8, EVENT_252H)		\
 	__PMC_EV(ARMV8, EVENT_253H)		\
 	__PMC_EV(ARMV8, EVENT_254H)		\
 	__PMC_EV(ARMV8, EVENT_255H)		\
 	__PMC_EV(ARMV8, EVENT_256H)		\
 	__PMC_EV(ARMV8, EVENT_257H)		\
 	__PMC_EV(ARMV8, EVENT_258H)		\
 	__PMC_EV(ARMV8, EVENT_259H)		\
 	__PMC_EV(ARMV8, EVENT_25AH)		\
 	__PMC_EV(ARMV8, EVENT_25BH)		\
 	__PMC_EV(ARMV8, EVENT_25CH)		\
 	__PMC_EV(ARMV8, EVENT_25DH)		\
 	__PMC_EV(ARMV8, EVENT_25EH)		\
 	__PMC_EV(ARMV8, EVENT_25FH)		\
 	__PMC_EV(ARMV8, EVENT_260H)		\
 	__PMC_EV(ARMV8, EVENT_261H)		\
 	__PMC_EV(ARMV8, EVENT_262H)		\
 	__PMC_EV(ARMV8, EVENT_263H)		\
 	__PMC_EV(ARMV8, EVENT_264H)		\
 	__PMC_EV(ARMV8, EVENT_265H)		\
 	__PMC_EV(ARMV8, EVENT_266H)		\
 	__PMC_EV(ARMV8, EVENT_267H)		\
 	__PMC_EV(ARMV8, EVENT_268H)		\
 	__PMC_EV(ARMV8, EVENT_269H)		\
 	__PMC_EV(ARMV8, EVENT_26AH)		\
 	__PMC_EV(ARMV8, EVENT_26BH)		\
 	__PMC_EV(ARMV8, EVENT_26CH)		\
 	__PMC_EV(ARMV8, EVENT_26DH)		\
 	__PMC_EV(ARMV8, EVENT_26EH)		\
 	__PMC_EV(ARMV8, EVENT_26FH)		\
 	__PMC_EV(ARMV8, EVENT_270H)		\
 	__PMC_EV(ARMV8, EVENT_271H)		\
 	__PMC_EV(ARMV8, EVENT_272H)		\
 	__PMC_EV(ARMV8, EVENT_273H)		\
 	__PMC_EV(ARMV8, EVENT_274H)		\
 	__PMC_EV(ARMV8, EVENT_275H)		\
 	__PMC_EV(ARMV8, EVENT_276H)		\
 	__PMC_EV(ARMV8, EVENT_277H)		\
 	__PMC_EV(ARMV8, EVENT_278H)		\
 	__PMC_EV(ARMV8, EVENT_279H)		\
 	__PMC_EV(ARMV8, EVENT_27AH)		\
 	__PMC_EV(ARMV8, EVENT_27BH)		\
 	__PMC_EV(ARMV8, EVENT_27CH)		\
 	__PMC_EV(ARMV8, EVENT_27DH)		\
 	__PMC_EV(ARMV8, EVENT_27EH)		\
 	__PMC_EV(ARMV8, EVENT_27FH)		\
 	__PMC_EV(ARMV8, EVENT_280H)		\
 	__PMC_EV(ARMV8, EVENT_281H)		\
 	__PMC_EV(ARMV8, EVENT_282H)		\
 	__PMC_EV(ARMV8, EVENT_283H)		\
 	__PMC_EV(ARMV8, EVENT_284H)		\
 	__PMC_EV(ARMV8, EVENT_285H)		\
 	__PMC_EV(ARMV8, EVENT_286H)		\
 	__PMC_EV(ARMV8, EVENT_287H)		\
 	__PMC_EV(ARMV8, EVENT_288H)		\
 	__PMC_EV(ARMV8, EVENT_289H)		\
 	__PMC_EV(ARMV8, EVENT_28AH)		\
 	__PMC_EV(ARMV8, EVENT_28BH)		\
 	__PMC_EV(ARMV8, EVENT_28CH)		\
 	__PMC_EV(ARMV8, EVENT_28DH)		\
 	__PMC_EV(ARMV8, EVENT_28EH)		\
 	__PMC_EV(ARMV8, EVENT_28FH)		\
 	__PMC_EV(ARMV8, EVENT_290H)		\
 	__PMC_EV(ARMV8, EVENT_291H)		\
 	__PMC_EV(ARMV8, EVENT_292H)		\
 	__PMC_EV(ARMV8, EVENT_293H)		\
 	__PMC_EV(ARMV8, EVENT_294H)		\
 	__PMC_EV(ARMV8, EVENT_295H)		\
 	__PMC_EV(ARMV8, EVENT_296H)		\
 	__PMC_EV(ARMV8, EVENT_297H)		\
 	__PMC_EV(ARMV8, EVENT_298H)		\
 	__PMC_EV(ARMV8, EVENT_299H)		\
 	__PMC_EV(ARMV8, EVENT_29AH)		\
 	__PMC_EV(ARMV8, EVENT_29BH)		\
 	__PMC_EV(ARMV8, EVENT_29CH)		\
 	__PMC_EV(ARMV8, EVENT_29DH)		\
 	__PMC_EV(ARMV8, EVENT_29EH)		\
 	__PMC_EV(ARMV8, EVENT_29FH)		\
 	__PMC_EV(ARMV8, EVENT_2A0H)		\
 	__PMC_EV(ARMV8, EVENT_2A1H)		\
 	__PMC_EV(ARMV8, EVENT_2A2H)		\
 	__PMC_EV(ARMV8, EVENT_2A3H)		\
 	__PMC_EV(ARMV8, EVENT_2A4H)		\
 	__PMC_EV(ARMV8, EVENT_2A5H)		\
 	__PMC_EV(ARMV8, EVENT_2A6H)		\
 	__PMC_EV(ARMV8, EVENT_2A7H)		\
 	__PMC_EV(ARMV8, EVENT_2A8H)		\
 	__PMC_EV(ARMV8, EVENT_2A9H)		\
 	__PMC_EV(ARMV8, EVENT_2AAH)		\
 	__PMC_EV(ARMV8, EVENT_2ABH)		\
 	__PMC_EV(ARMV8, EVENT_2ACH)		\
 	__PMC_EV(ARMV8, EVENT_2ADH)		\
 	__PMC_EV(ARMV8, EVENT_2AEH)		\
 	__PMC_EV(ARMV8, EVENT_2AFH)		\
 	__PMC_EV(ARMV8, EVENT_2B0H)		\
 	__PMC_EV(ARMV8, EVENT_2B1H)		\
 	__PMC_EV(ARMV8, EVENT_2B2H)		\
 	__PMC_EV(ARMV8, EVENT_2B3H)		\
 	__PMC_EV(ARMV8, EVENT_2B4H)		\
 	__PMC_EV(ARMV8, EVENT_2B5H)		\
 	__PMC_EV(ARMV8, EVENT_2B6H)		\
 	__PMC_EV(ARMV8, EVENT_2B7H)		\
 	__PMC_EV(ARMV8, EVENT_2B8H)		\
 	__PMC_EV(ARMV8, EVENT_2B9H)		\
 	__PMC_EV(ARMV8, EVENT_2BAH)		\
 	__PMC_EV(ARMV8, EVENT_2BBH)		\
 	__PMC_EV(ARMV8, EVENT_2BCH)		\
 	__PMC_EV(ARMV8, EVENT_2BDH)		\
 	__PMC_EV(ARMV8, EVENT_2BEH)		\
 	__PMC_EV(ARMV8, EVENT_2BFH)		\
 	__PMC_EV(ARMV8, EVENT_2C0H)		\
 	__PMC_EV(ARMV8, EVENT_2C1H)		\
 	__PMC_EV(ARMV8, EVENT_2C2H)		\
 	__PMC_EV(ARMV8, EVENT_2C3H)		\
 	__PMC_EV(ARMV8, EVENT_2C4H)		\
 	__PMC_EV(ARMV8, EVENT_2C5H)		\
 	__PMC_EV(ARMV8, EVENT_2C6H)		\
 	__PMC_EV(ARMV8, EVENT_2C7H)		\
 	__PMC_EV(ARMV8, EVENT_2C8H)		\
 	__PMC_EV(ARMV8, EVENT_2C9H)		\
 	__PMC_EV(ARMV8, EVENT_2CAH)		\
 	__PMC_EV(ARMV8, EVENT_2CBH)		\
 	__PMC_EV(ARMV8, EVENT_2CCH)		\
 	__PMC_EV(ARMV8, EVENT_2CDH)		\
 	__PMC_EV(ARMV8, EVENT_2CEH)		\
 	__PMC_EV(ARMV8, EVENT_2CFH)		\
 	__PMC_EV(ARMV8, EVENT_2D0H)		\
 	__PMC_EV(ARMV8, EVENT_2D1H)		\
 	__PMC_EV(ARMV8, EVENT_2D2H)		\
 	__PMC_EV(ARMV8, EVENT_2D3H)		\
 	__PMC_EV(ARMV8, EVENT_2D4H)		\
 	__PMC_EV(ARMV8, EVENT_2D5H)		\
 	__PMC_EV(ARMV8, EVENT_2D6H)		\
 	__PMC_EV(ARMV8, EVENT_2D7H)		\
 	__PMC_EV(ARMV8, EVENT_2D8H)		\
 	__PMC_EV(ARMV8, EVENT_2D9H)		\
 	__PMC_EV(ARMV8, EVENT_2DAH)		\
 	__PMC_EV(ARMV8, EVENT_2DBH)		\
 	__PMC_EV(ARMV8, EVENT_2DCH)		\
 	__PMC_EV(ARMV8, EVENT_2DDH)		\
 	__PMC_EV(ARMV8, EVENT_2DEH)		\
 	__PMC_EV(ARMV8, EVENT_2DFH)		\
 	__PMC_EV(ARMV8, EVENT_2E0H)		\
 	__PMC_EV(ARMV8, EVENT_2E1H)		\
 	__PMC_EV(ARMV8, EVENT_2E2H)		\
 	__PMC_EV(ARMV8, EVENT_2E3H)		\
 	__PMC_EV(ARMV8, EVENT_2E4H)		\
 	__PMC_EV(ARMV8, EVENT_2E5H)		\
 	__PMC_EV(ARMV8, EVENT_2E6H)		\
 	__PMC_EV(ARMV8, EVENT_2E7H)		\
 	__PMC_EV(ARMV8, EVENT_2E8H)		\
 	__PMC_EV(ARMV8, EVENT_2E9H)		\
 	__PMC_EV(ARMV8, EVENT_2EAH)		\
 	__PMC_EV(ARMV8, EVENT_2EBH)		\
 	__PMC_EV(ARMV8, EVENT_2ECH)		\
 	__PMC_EV(ARMV8, EVENT_2EDH)		\
 	__PMC_EV(ARMV8, EVENT_2EEH)		\
 	__PMC_EV(ARMV8, EVENT_2EFH)		\
 	__PMC_EV(ARMV8, EVENT_2F0H)		\
 	__PMC_EV(ARMV8, EVENT_2F1H)		\
 	__PMC_EV(ARMV8, EVENT_2F2H)		\
 	__PMC_EV(ARMV8, EVENT_2F3H)		\
 	__PMC_EV(ARMV8, EVENT_2F4H)		\
 	__PMC_EV(ARMV8, EVENT_2F5H)		\
 	__PMC_EV(ARMV8, EVENT_2F6H)		\
 	__PMC_EV(ARMV8, EVENT_2F7H)		\
 	__PMC_EV(ARMV8, EVENT_2F8H)		\
 	__PMC_EV(ARMV8, EVENT_2F9H)		\
 	__PMC_EV(ARMV8, EVENT_2FAH)		\
 	__PMC_EV(ARMV8, EVENT_2FBH)		\
 	__PMC_EV(ARMV8, EVENT_2FCH)		\
 	__PMC_EV(ARMV8, EVENT_2FDH)		\
 	__PMC_EV(ARMV8, EVENT_2FEH)		\
 	__PMC_EV(ARMV8, EVENT_2FFH)		\
 	__PMC_EV(ARMV8, EVENT_300H)		\
 	__PMC_EV(ARMV8, EVENT_301H)		\
 	__PMC_EV(ARMV8, EVENT_302H)		\
 	__PMC_EV(ARMV8, EVENT_303H)		\
 	__PMC_EV(ARMV8, EVENT_304H)		\
 	__PMC_EV(ARMV8, EVENT_305H)		\
 	__PMC_EV(ARMV8, EVENT_306H)		\
 	__PMC_EV(ARMV8, EVENT_307H)		\
 	__PMC_EV(ARMV8, EVENT_308H)		\
 	__PMC_EV(ARMV8, EVENT_309H)		\
 	__PMC_EV(ARMV8, EVENT_30AH)		\
 	__PMC_EV(ARMV8, EVENT_30BH)		\
 	__PMC_EV(ARMV8, EVENT_30CH)		\
 	__PMC_EV(ARMV8, EVENT_30DH)		\
 	__PMC_EV(ARMV8, EVENT_30EH)		\
 	__PMC_EV(ARMV8, EVENT_30FH)		\
 	__PMC_EV(ARMV8, EVENT_310H)		\
 	__PMC_EV(ARMV8, EVENT_311H)		\
 	__PMC_EV(ARMV8, EVENT_312H)		\
 	__PMC_EV(ARMV8, EVENT_313H)		\
 	__PMC_EV(ARMV8, EVENT_314H)		\
 	__PMC_EV(ARMV8, EVENT_315H)		\
 	__PMC_EV(ARMV8, EVENT_316H)		\
 	__PMC_EV(ARMV8, EVENT_317H)		\
 	__PMC_EV(ARMV8, EVENT_318H)		\
 	__PMC_EV(ARMV8, EVENT_319H)		\
 	__PMC_EV(ARMV8, EVENT_31AH)		\
 	__PMC_EV(ARMV8, EVENT_31BH)		\
 	__PMC_EV(ARMV8, EVENT_31CH)		\
 	__PMC_EV(ARMV8, EVENT_31DH)		\
 	__PMC_EV(ARMV8, EVENT_31EH)		\
 	__PMC_EV(ARMV8, EVENT_31FH)		\
 	__PMC_EV(ARMV8, EVENT_320H)		\
 	__PMC_EV(ARMV8, EVENT_321H)		\
 	__PMC_EV(ARMV8, EVENT_322H)		\
 	__PMC_EV(ARMV8, EVENT_323H)		\
 	__PMC_EV(ARMV8, EVENT_324H)		\
 	__PMC_EV(ARMV8, EVENT_325H)		\
 	__PMC_EV(ARMV8, EVENT_326H)		\
 	__PMC_EV(ARMV8, EVENT_327H)		\
 	__PMC_EV(ARMV8, EVENT_328H)		\
 	__PMC_EV(ARMV8, EVENT_329H)		\
 	__PMC_EV(ARMV8, EVENT_32AH)		\
 	__PMC_EV(ARMV8, EVENT_32BH)		\
 	__PMC_EV(ARMV8, EVENT_32CH)		\
 	__PMC_EV(ARMV8, EVENT_32DH)		\
 	__PMC_EV(ARMV8, EVENT_32EH)		\
 	__PMC_EV(ARMV8, EVENT_32FH)		\
 	__PMC_EV(ARMV8, EVENT_330H)		\
 	__PMC_EV(ARMV8, EVENT_331H)		\
 	__PMC_EV(ARMV8, EVENT_332H)		\
 	__PMC_EV(ARMV8, EVENT_333H)		\
 	__PMC_EV(ARMV8, EVENT_334H)		\
 	__PMC_EV(ARMV8, EVENT_335H)		\
 	__PMC_EV(ARMV8, EVENT_336H)		\
 	__PMC_EV(ARMV8, EVENT_337H)		\
 	__PMC_EV(ARMV8, EVENT_338H)		\
 	__PMC_EV(ARMV8, EVENT_339H)		\
 	__PMC_EV(ARMV8, EVENT_33AH)		\
 	__PMC_EV(ARMV8, EVENT_33BH)		\
 	__PMC_EV(ARMV8, EVENT_33CH)		\
 	__PMC_EV(ARMV8, EVENT_33DH)		\
 	__PMC_EV(ARMV8, EVENT_33EH)		\
 	__PMC_EV(ARMV8, EVENT_33FH)		\
 	__PMC_EV(ARMV8, EVENT_340H)		\
 	__PMC_EV(ARMV8, EVENT_341H)		\
 	__PMC_EV(ARMV8, EVENT_342H)		\
 	__PMC_EV(ARMV8, EVENT_343H)		\
 	__PMC_EV(ARMV8, EVENT_344H)		\
 	__PMC_EV(ARMV8, EVENT_345H)		\
 	__PMC_EV(ARMV8, EVENT_346H)		\
 	__PMC_EV(ARMV8, EVENT_347H)		\
 	__PMC_EV(ARMV8, EVENT_348H)		\
 	__PMC_EV(ARMV8, EVENT_349H)		\
 	__PMC_EV(ARMV8, EVENT_34AH)		\
 	__PMC_EV(ARMV8, EVENT_34BH)		\
 	__PMC_EV(ARMV8, EVENT_34CH)		\
 	__PMC_EV(ARMV8, EVENT_34DH)		\
 	__PMC_EV(ARMV8, EVENT_34EH)		\
 	__PMC_EV(ARMV8, EVENT_34FH)		\
 	__PMC_EV(ARMV8, EVENT_350H)		\
 	__PMC_EV(ARMV8, EVENT_351H)		\
 	__PMC_EV(ARMV8, EVENT_352H)		\
 	__PMC_EV(ARMV8, EVENT_353H)		\
 	__PMC_EV(ARMV8, EVENT_354H)		\
 	__PMC_EV(ARMV8, EVENT_355H)		\
 	__PMC_EV(ARMV8, EVENT_356H)		\
 	__PMC_EV(ARMV8, EVENT_357H)		\
 	__PMC_EV(ARMV8, EVENT_358H)		\
 	__PMC_EV(ARMV8, EVENT_359H)		\
 	__PMC_EV(ARMV8, EVENT_35AH)		\
 	__PMC_EV(ARMV8, EVENT_35BH)		\
 	__PMC_EV(ARMV8, EVENT_35CH)		\
 	__PMC_EV(ARMV8, EVENT_35DH)		\
 	__PMC_EV(ARMV8, EVENT_35EH)		\
 	__PMC_EV(ARMV8, EVENT_35FH)		\
 	__PMC_EV(ARMV8, EVENT_360H)		\
 	__PMC_EV(ARMV8, EVENT_361H)		\
 	__PMC_EV(ARMV8, EVENT_362H)		\
 	__PMC_EV(ARMV8, EVENT_363H)		\
 	__PMC_EV(ARMV8, EVENT_364H)		\
 	__PMC_EV(ARMV8, EVENT_365H)		\
 	__PMC_EV(ARMV8, EVENT_366H)		\
 	__PMC_EV(ARMV8, EVENT_367H)		\
 	__PMC_EV(ARMV8, EVENT_368H)		\
 	__PMC_EV(ARMV8, EVENT_369H)		\
 	__PMC_EV(ARMV8, EVENT_36AH)		\
 	__PMC_EV(ARMV8, EVENT_36BH)		\
 	__PMC_EV(ARMV8, EVENT_36CH)		\
 	__PMC_EV(ARMV8, EVENT_36DH)		\
 	__PMC_EV(ARMV8, EVENT_36EH)		\
 	__PMC_EV(ARMV8, EVENT_36FH)		\
 	__PMC_EV(ARMV8, EVENT_370H)		\
 	__PMC_EV(ARMV8, EVENT_371H)		\
 	__PMC_EV(ARMV8, EVENT_372H)		\
 	__PMC_EV(ARMV8, EVENT_373H)		\
 	__PMC_EV(ARMV8, EVENT_374H)		\
 	__PMC_EV(ARMV8, EVENT_375H)		\
 	__PMC_EV(ARMV8, EVENT_376H)		\
 	__PMC_EV(ARMV8, EVENT_377H)		\
 	__PMC_EV(ARMV8, EVENT_378H)		\
 	__PMC_EV(ARMV8, EVENT_379H)		\
 	__PMC_EV(ARMV8, EVENT_37AH)		\
 	__PMC_EV(ARMV8, EVENT_37BH)		\
 	__PMC_EV(ARMV8, EVENT_37CH)		\
 	__PMC_EV(ARMV8, EVENT_37DH)		\
 	__PMC_EV(ARMV8, EVENT_37EH)		\
 	__PMC_EV(ARMV8, EVENT_37FH)		\
 	__PMC_EV(ARMV8, EVENT_380H)		\
 	__PMC_EV(ARMV8, EVENT_381H)		\
 	__PMC_EV(ARMV8, EVENT_382H)		\
 	__PMC_EV(ARMV8, EVENT_383H)		\
 	__PMC_EV(ARMV8, EVENT_384H)		\
 	__PMC_EV(ARMV8, EVENT_385H)		\
 	__PMC_EV(ARMV8, EVENT_386H)		\
 	__PMC_EV(ARMV8, EVENT_387H)		\
 	__PMC_EV(ARMV8, EVENT_388H)		\
 	__PMC_EV(ARMV8, EVENT_389H)		\
 	__PMC_EV(ARMV8, EVENT_38AH)		\
 	__PMC_EV(ARMV8, EVENT_38BH)		\
 	__PMC_EV(ARMV8, EVENT_38CH)		\
 	__PMC_EV(ARMV8, EVENT_38DH)		\
 	__PMC_EV(ARMV8, EVENT_38EH)		\
 	__PMC_EV(ARMV8, EVENT_38FH)		\
 	__PMC_EV(ARMV8, EVENT_390H)		\
 	__PMC_EV(ARMV8, EVENT_391H)		\
 	__PMC_EV(ARMV8, EVENT_392H)		\
 	__PMC_EV(ARMV8, EVENT_393H)		\
 	__PMC_EV(ARMV8, EVENT_394H)		\
 	__PMC_EV(ARMV8, EVENT_395H)		\
 	__PMC_EV(ARMV8, EVENT_396H)		\
 	__PMC_EV(ARMV8, EVENT_397H)		\
 	__PMC_EV(ARMV8, EVENT_398H)		\
 	__PMC_EV(ARMV8, EVENT_399H)		\
 	__PMC_EV(ARMV8, EVENT_39AH)		\
 	__PMC_EV(ARMV8, EVENT_39BH)		\
 	__PMC_EV(ARMV8, EVENT_39CH)		\
 	__PMC_EV(ARMV8, EVENT_39DH)		\
 	__PMC_EV(ARMV8, EVENT_39EH)		\
 	__PMC_EV(ARMV8, EVENT_39FH)		\
 	__PMC_EV(ARMV8, EVENT_3A0H)		\
 	__PMC_EV(ARMV8, EVENT_3A1H)		\
 	__PMC_EV(ARMV8, EVENT_3A2H)		\
 	__PMC_EV(ARMV8, EVENT_3A3H)		\
 	__PMC_EV(ARMV8, EVENT_3A4H)		\
 	__PMC_EV(ARMV8, EVENT_3A5H)		\
 	__PMC_EV(ARMV8, EVENT_3A6H)		\
 	__PMC_EV(ARMV8, EVENT_3A7H)		\
 	__PMC_EV(ARMV8, EVENT_3A8H)		\
 	__PMC_EV(ARMV8, EVENT_3A9H)		\
 	__PMC_EV(ARMV8, EVENT_3AAH)		\
 	__PMC_EV(ARMV8, EVENT_3ABH)		\
 	__PMC_EV(ARMV8, EVENT_3ACH)		\
 	__PMC_EV(ARMV8, EVENT_3ADH)		\
 	__PMC_EV(ARMV8, EVENT_3AEH)		\
 	__PMC_EV(ARMV8, EVENT_3AFH)		\
 	__PMC_EV(ARMV8, EVENT_3B0H)		\
 	__PMC_EV(ARMV8, EVENT_3B1H)		\
 	__PMC_EV(ARMV8, EVENT_3B2H)		\
 	__PMC_EV(ARMV8, EVENT_3B3H)		\
 	__PMC_EV(ARMV8, EVENT_3B4H)		\
 	__PMC_EV(ARMV8, EVENT_3B5H)		\
 	__PMC_EV(ARMV8, EVENT_3B6H)		\
 	__PMC_EV(ARMV8, EVENT_3B7H)		\
 	__PMC_EV(ARMV8, EVENT_3B8H)		\
 	__PMC_EV(ARMV8, EVENT_3B9H)		\
 	__PMC_EV(ARMV8, EVENT_3BAH)		\
 	__PMC_EV(ARMV8, EVENT_3BBH)		\
 	__PMC_EV(ARMV8, EVENT_3BCH)		\
 	__PMC_EV(ARMV8, EVENT_3BDH)		\
 	__PMC_EV(ARMV8, EVENT_3BEH)		\
 	__PMC_EV(ARMV8, EVENT_3BFH)		\
 	__PMC_EV(ARMV8, EVENT_3C0H)		\
 	__PMC_EV(ARMV8, EVENT_3C1H)		\
 	__PMC_EV(ARMV8, EVENT_3C2H)		\
 	__PMC_EV(ARMV8, EVENT_3C3H)		\
 	__PMC_EV(ARMV8, EVENT_3C4H)		\
 	__PMC_EV(ARMV8, EVENT_3C5H)		\
 	__PMC_EV(ARMV8, EVENT_3C6H)		\
 	__PMC_EV(ARMV8, EVENT_3C7H)		\
 	__PMC_EV(ARMV8, EVENT_3C8H)		\
 	__PMC_EV(ARMV8, EVENT_3C9H)		\
 	__PMC_EV(ARMV8, EVENT_3CAH)		\
 	__PMC_EV(ARMV8, EVENT_3CBH)		\
 	__PMC_EV(ARMV8, EVENT_3CCH)		\
 	__PMC_EV(ARMV8, EVENT_3CDH)		\
 	__PMC_EV(ARMV8, EVENT_3CEH)		\
 	__PMC_EV(ARMV8, EVENT_3CFH)		\
 	__PMC_EV(ARMV8, EVENT_3D0H)		\
 	__PMC_EV(ARMV8, EVENT_3D1H)		\
 	__PMC_EV(ARMV8, EVENT_3D2H)		\
 	__PMC_EV(ARMV8, EVENT_3D3H)		\
 	__PMC_EV(ARMV8, EVENT_3D4H)		\
 	__PMC_EV(ARMV8, EVENT_3D5H)		\
 	__PMC_EV(ARMV8, EVENT_3D6H)		\
 	__PMC_EV(ARMV8, EVENT_3D7H)		\
 	__PMC_EV(ARMV8, EVENT_3D8H)		\
 	__PMC_EV(ARMV8, EVENT_3D9H)		\
 	__PMC_EV(ARMV8, EVENT_3DAH)		\
 	__PMC_EV(ARMV8, EVENT_3DBH)		\
 	__PMC_EV(ARMV8, EVENT_3DCH)		\
 	__PMC_EV(ARMV8, EVENT_3DDH)		\
 	__PMC_EV(ARMV8, EVENT_3DEH)		\
 	__PMC_EV(ARMV8, EVENT_3DFH)		\
 	__PMC_EV(ARMV8, EVENT_3E0H)		\
 	__PMC_EV(ARMV8, EVENT_3E1H)		\
 	__PMC_EV(ARMV8, EVENT_3E2H)		\
 	__PMC_EV(ARMV8, EVENT_3E3H)		\
 	__PMC_EV(ARMV8, EVENT_3E4H)		\
 	__PMC_EV(ARMV8, EVENT_3E5H)		\
 	__PMC_EV(ARMV8, EVENT_3E6H)		\
 	__PMC_EV(ARMV8, EVENT_3E7H)		\
 	__PMC_EV(ARMV8, EVENT_3E8H)		\
 	__PMC_EV(ARMV8, EVENT_3E9H)		\
 	__PMC_EV(ARMV8, EVENT_3EAH)		\
 	__PMC_EV(ARMV8, EVENT_3EBH)		\
 	__PMC_EV(ARMV8, EVENT_3ECH)		\
 	__PMC_EV(ARMV8, EVENT_3EDH)		\
 	__PMC_EV(ARMV8, EVENT_3EEH)		\
 	__PMC_EV(ARMV8, EVENT_3EFH)		\
 	__PMC_EV(ARMV8, EVENT_3F0H)		\
 	__PMC_EV(ARMV8, EVENT_3F1H)		\
 	__PMC_EV(ARMV8, EVENT_3F2H)		\
 	__PMC_EV(ARMV8, EVENT_3F3H)		\
 	__PMC_EV(ARMV8, EVENT_3F4H)		\
 	__PMC_EV(ARMV8, EVENT_3F5H)		\
 	__PMC_EV(ARMV8, EVENT_3F6H)		\
 	__PMC_EV(ARMV8, EVENT_3F7H)		\
 	__PMC_EV(ARMV8, EVENT_3F8H)		\
 	__PMC_EV(ARMV8, EVENT_3F9H)		\
 	__PMC_EV(ARMV8, EVENT_3FAH)		\
 	__PMC_EV(ARMV8, EVENT_3FBH)		\
 	__PMC_EV(ARMV8, EVENT_3FCH)		\
 	__PMC_EV(ARMV8, EVENT_3FDH)		\
 	__PMC_EV(ARMV8, EVENT_3FEH)		\
 	__PMC_EV(ARMV8, EVENT_3FFH)
 
 #define	PMC_EV_ARMV8_FIRST	PMC_EV_ARMV8_EVENT_00H
 #define	PMC_EV_ARMV8_LAST	PMC_EV_ARMV8_EVENT_3FFH
 
 #define	__PMC_EV_ALIAS_ARMV8_COMMON()					\
 	__PMC_EV_ALIAS("SW_INCR",		ARMV8_EVENT_00H)	\
 	__PMC_EV_ALIAS("L1I_CACHE_REFILL",	ARMV8_EVENT_01H)	\
 	__PMC_EV_ALIAS("L1I_TLB_REFILL",	ARMV8_EVENT_02H)	\
 	__PMC_EV_ALIAS("L1D_CACHE_REFILL",	ARMV8_EVENT_03H)	\
 	__PMC_EV_ALIAS("L1D_CACHE",		ARMV8_EVENT_04H)	\
 	__PMC_EV_ALIAS("L1D_TLB_REFILL",	ARMV8_EVENT_05H)	\
 	__PMC_EV_ALIAS("INST_RETIRED",		ARMV8_EVENT_08H)	\
 	__PMC_EV_ALIAS("EXC_TAKEN",		ARMV8_EVENT_09H)	\
 	__PMC_EV_ALIAS("EXC_RETURN",		ARMV8_EVENT_0AH)	\
 	__PMC_EV_ALIAS("CID_WRITE_RETIRED",	ARMV8_EVENT_0BH)	\
 	__PMC_EV_ALIAS("BR_MIS_PRED",		ARMV8_EVENT_10H)	\
 	__PMC_EV_ALIAS("CPU_CYCLES",		ARMV8_EVENT_11H)	\
 	__PMC_EV_ALIAS("BR_PRED",		ARMV8_EVENT_12H)	\
 	__PMC_EV_ALIAS("MEM_ACCESS",		ARMV8_EVENT_13H)	\
 	__PMC_EV_ALIAS("L1I_CACHE",		ARMV8_EVENT_14H)	\
 	__PMC_EV_ALIAS("L1D_CACHE_WB",		ARMV8_EVENT_15H)	\
 	__PMC_EV_ALIAS("L2D_CACHE",		ARMV8_EVENT_16H)	\
 	__PMC_EV_ALIAS("L2D_CACHE_REFILL",	ARMV8_EVENT_17H)	\
 	__PMC_EV_ALIAS("L2D_CACHE_WB",		ARMV8_EVENT_18H)	\
 	__PMC_EV_ALIAS("BUS_ACCESS",		ARMV8_EVENT_19H)	\
 	__PMC_EV_ALIAS("MEMORY_ERROR",		ARMV8_EVENT_1AH)	\
 	__PMC_EV_ALIAS("BUS_CYCLES",		ARMV8_EVENT_1DH)	\
 	__PMC_EV_ALIAS("CHAIN",			ARMV8_EVENT_1EH)	\
 	__PMC_EV_ALIAS("BUS_ACCESS_LD",		ARMV8_EVENT_60H)	\
 	__PMC_EV_ALIAS("BUS_ACCESS_ST",		ARMV8_EVENT_61H)	\
 	__PMC_EV_ALIAS("BR_INDIRECT_SPEC",	ARMV8_EVENT_7AH)	\
 	__PMC_EV_ALIAS("EXC_IRQ",		ARMV8_EVENT_86H)	\
 	__PMC_EV_ALIAS("EXC_FIQ",		ARMV8_EVENT_87H)
 
 #define	__PMC_EV_ALIAS_ARMV8_CORTEX_A53()				\
 	__PMC_EV_ALIAS_ARMV8_COMMON()					\
 	__PMC_EV_ALIAS("LD_RETIRED",		ARMV8_EVENT_06H)	\
 	__PMC_EV_ALIAS("ST_RETIRED",		ARMV8_EVENT_07H)	\
 	__PMC_EV_ALIAS("PC_WRITE_RETIRED",	ARMV8_EVENT_0CH)	\
 	__PMC_EV_ALIAS("BR_IMMED_RETIRED",	ARMV8_EVENT_0DH)	\
 	__PMC_EV_ALIAS("BR_RETURN_RETIRED",	ARMV8_EVENT_0EH)	\
 	__PMC_EV_ALIAS("UNALIGNED_LDST_RETIRED",ARMV8_EVENT_0FH)
 
 #define	__PMC_EV_ALIAS_ARMV8_CORTEX_A57_A76()				\
 	__PMC_EV_ALIAS_ARMV8_COMMON()					\
 	__PMC_EV_ALIAS("INST_SPEC",		ARMV8_EVENT_1BH)	\
 	__PMC_EV_ALIAS("TTBR_WRITE_RETIRED",	ARMV8_EVENT_1CH)	\
 	__PMC_EV_ALIAS("L1D_CACHE_LD",		ARMV8_EVENT_40H)	\
 	__PMC_EV_ALIAS("L1D_CACHE_ST",		ARMV8_EVENT_41H)	\
 	__PMC_EV_ALIAS("L1D_CACHE_REFILL_LD",	ARMV8_EVENT_42H)	\
 	__PMC_EV_ALIAS("L1D_CACHE_REFILL_ST",	ARMV8_EVENT_43H)	\
 	__PMC_EV_ALIAS("L1D_CACHE_WB_VICTIM",	ARMV8_EVENT_46H)	\
 	__PMC_EV_ALIAS("L1D_CACHE_WB_CLEAN",	ARMV8_EVENT_47H)	\
 	__PMC_EV_ALIAS("L1D_CACHE_INVAL",	ARMV8_EVENT_48H)	\
 	__PMC_EV_ALIAS("L1D_TLB_REFILL_LD",	ARMV8_EVENT_4CH)	\
 	__PMC_EV_ALIAS("L1D_TLB_REFILL_ST",	ARMV8_EVENT_4DH)	\
 	__PMC_EV_ALIAS("L2D_CACHE_LD",		ARMV8_EVENT_50H)	\
 	__PMC_EV_ALIAS("L2D_CACHE_ST",		ARMV8_EVENT_51H)	\
 	__PMC_EV_ALIAS("L2D_CACHE_REFILL_LD",	ARMV8_EVENT_52H)	\
 	__PMC_EV_ALIAS("L2D_CACHE_REFILL_ST",	ARMV8_EVENT_53H)	\
 	__PMC_EV_ALIAS("L2D_CACHE_WB_VICTIM",	ARMV8_EVENT_56H)	\
 	__PMC_EV_ALIAS("L2D_CACHE_WB_CLEAN",	ARMV8_EVENT_57H)	\
 	__PMC_EV_ALIAS("L2D_CACHE_INVAL",	ARMV8_EVENT_58H)	\
 	__PMC_EV_ALIAS("MEM_ACCESS_LD",		ARMV8_EVENT_66H)	\
 	__PMC_EV_ALIAS("MEM_ACCESS_ST",		ARMV8_EVENT_67H)	\
 	__PMC_EV_ALIAS("UNALIGNED_LD_SPEC",	ARMV8_EVENT_68H)	\
 	__PMC_EV_ALIAS("UNALIGNED_ST_SPEC",	ARMV8_EVENT_69H)	\
 	__PMC_EV_ALIAS("UNALIGNED_LDST_SPEC",	ARMV8_EVENT_6AH)	\
 	__PMC_EV_ALIAS("LDREX_SPEC",		ARMV8_EVENT_6CH)	\
 	__PMC_EV_ALIAS("STREX_PASS_SPEC",	ARMV8_EVENT_6DH)	\
 	__PMC_EV_ALIAS("STREX_FAIL_SPEC",	ARMV8_EVENT_6EH)	\
 	__PMC_EV_ALIAS("LD_SPEC",		ARMV8_EVENT_70H)	\
 	__PMC_EV_ALIAS("ST_SPEC",		ARMV8_EVENT_71H)	\
 	__PMC_EV_ALIAS("LDST_SPEC",		ARMV8_EVENT_72H)	\
 	__PMC_EV_ALIAS("DP_SPEC",		ARMV8_EVENT_73H)	\
 	__PMC_EV_ALIAS("ASE_SPEC",		ARMV8_EVENT_74H)	\
 	__PMC_EV_ALIAS("VFP_SPEC",		ARMV8_EVENT_75H)	\
 	__PMC_EV_ALIAS("PC_WRITE_SPEC",		ARMV8_EVENT_76H)	\
 	__PMC_EV_ALIAS("CRYPTO_SPEC",		ARMV8_EVENT_77H)	\
 	__PMC_EV_ALIAS("BR_IMMED_SPEC",		ARMV8_EVENT_78H)	\
 	__PMC_EV_ALIAS("BR_RETURN_SPEC",	ARMV8_EVENT_79H)	\
 	__PMC_EV_ALIAS("ISB_SPEC",		ARMV8_EVENT_7CH)	\
 	__PMC_EV_ALIAS("DSB_SPEC",		ARMV8_EVENT_7DH)	\
 	__PMC_EV_ALIAS("DMB_SPEC",		ARMV8_EVENT_7EH)	\
 	__PMC_EV_ALIAS("EXC_UNDEF",		ARMV8_EVENT_81H)	\
 	__PMC_EV_ALIAS("EXC_SVC",		ARMV8_EVENT_82H)	\
 	__PMC_EV_ALIAS("EXC_PABORT",		ARMV8_EVENT_83H)	\
 	__PMC_EV_ALIAS("EXC_DABORT",		ARMV8_EVENT_84H)	\
 	__PMC_EV_ALIAS("EXC_SMC",		ARMV8_EVENT_88H)	\
 	__PMC_EV_ALIAS("EXC_HVC",		ARMV8_EVENT_8AH)	\
 	__PMC_EV_ALIAS("EXC_TRAP_PABORT",	ARMV8_EVENT_8BH)	\
 	__PMC_EV_ALIAS("EXC_TRAP_DABORT",	ARMV8_EVENT_8CH)	\
 	__PMC_EV_ALIAS("EXC_TRAP_OTHER",	ARMV8_EVENT_8DH)	\
 	__PMC_EV_ALIAS("EXC_TRAP_IRQ",		ARMV8_EVENT_8EH)	\
 	__PMC_EV_ALIAS("EXC_TRAP_FIQ",		ARMV8_EVENT_8FH)	\
 	__PMC_EV_ALIAS("RC_LD_SPEC",		ARMV8_EVENT_90H)	\
 	__PMC_EV_ALIAS("RC_ST_SPEC",		ARMV8_EVENT_91H)
 
 #define	__PMC_EV_ALIAS_ARMV8_CORTEX_A57()				\
 	__PMC_EV_ALIAS_ARMV8_CORTEX_A57_A76()				\
 	__PMC_EV_ALIAS("BUS_ACCESS_SHARED",	ARMV8_EVENT_62H)	\
 	__PMC_EV_ALIAS("BUS_ACCESS_NOT_SHARED",	ARMV8_EVENT_63H)	\
 	__PMC_EV_ALIAS("BUS_ACCESS_NORMAL",	ARMV8_EVENT_64H)	\
 	__PMC_EV_ALIAS("BUS_ACCESS_PERIPH",	ARMV8_EVENT_65H)
 
 #define	__PMC_EV_ALIAS_ARMV8_CORTEX_A76()				\
 	__PMC_EV_ALIAS_ARMV8_CORTEX_A57_A76()				\
 	__PMC_EV_ALIAS("L2D_CACHE_ALLOCATE",	ARMV8_EVENT_20H)	\
 	__PMC_EV_ALIAS("BR_RETIRED",		ARMV8_EVENT_21H)	\
 	__PMC_EV_ALIAS("BR_MIS_PRED_RETIRED",	ARMV8_EVENT_22H)	\
 	__PMC_EV_ALIAS("STALL_FRONTEND",	ARMV8_EVENT_23H)	\
 	__PMC_EV_ALIAS("STALL_BACKEND",		ARMV8_EVENT_24H)	\
 	__PMC_EV_ALIAS("L1D_TLB",		ARMV8_EVENT_25H)	\
 	__PMC_EV_ALIAS("L1I_TLB",		ARMV8_EVENT_26H)	\
 	__PMC_EV_ALIAS("L3D_CACHE_ALLOCATE",	ARMV8_EVENT_29H)	\
 	__PMC_EV_ALIAS("L3D_CACHE_REFILL",	ARMV8_EVENT_2AH)	\
 	__PMC_EV_ALIAS("L3D_CACHE",		ARMV8_EVENT_2BH)	\
 	__PMC_EV_ALIAS("L2D_TLB_REFILL",	ARMV8_EVENT_2DH)	\
 	__PMC_EV_ALIAS("L2D_TLB",		ARMV8_EVENT_2FH)	\
 	__PMC_EV_ALIAS("REMOTE_ACCESS",		ARMV8_EVENT_31H)	\
 	__PMC_EV_ALIAS("DTLB_WALK",		ARMV8_EVENT_34H)	\
 	__PMC_EV_ALIAS("ITLB_WALK",		ARMV8_EVENT_35H)	\
 	__PMC_EV_ALIAS("LL_CACHE_RD",		ARMV8_EVENT_36H)	\
 	__PMC_EV_ALIAS("LL_CACHE_MISS_RD",	ARMV8_EVENT_37H)	\
 	__PMC_EV_ALIAS("L1D_CACHE_REFILL_INNER", ARMV8_EVENT_44H)	\
 	__PMC_EV_ALIAS("L1D_CACHE_REFILL_OUTER", ARMV8_EVENT_45H)	\
 	__PMC_EV_ALIAS("L1D_TLB_RD",		ARMV8_EVENT_4EH)	\
 	__PMC_EV_ALIAS("L1D_TLB_WR",		ARMV8_EVENT_4FH)	\
 	__PMC_EV_ALIAS("L2D_TLB_REFILL_RD",	ARMV8_EVENT_5CH)	\
 	__PMC_EV_ALIAS("L2D_TLB_REFILL_WR",	ARMV8_EVENT_5DH)	\
 	__PMC_EV_ALIAS("L2D_TLB_RD",		ARMV8_EVENT_5EH)	\
 	__PMC_EV_ALIAS("L2D_TLB_WR",		ARMV8_EVENT_5FH)	\
 	__PMC_EV_ALIAS("STREX_SPEC",		ARMV8_EVENT_6FH)	\
 	__PMC_EV_ALIAS("L3_CACHE_RD",		ARMV8_EVENT_A0H)
 
 /*
  * ARM DMC-620 memory controller counters.
  */
 
 #define	__PMC_EV_DMC620_PMU_CD2()					\
 	__PMC_EV(DMC620_PMU_CD2, clkdiv2_cycle_count)			\
 	__PMC_EV(DMC620_PMU_CD2, clkdiv2_allocate)			\
 	__PMC_EV(DMC620_PMU_CD2, clkdiv2_queue_depth)			\
 	__PMC_EV(DMC620_PMU_CD2, clkdiv2_waiting_for_wr_data)		\
 	__PMC_EV(DMC620_PMU_CD2, clkdiv2_read_backlog)			\
 	__PMC_EV(DMC620_PMU_CD2, clkdiv2_waiting_for_mi)		\
 	__PMC_EV(DMC620_PMU_CD2, clkdiv2_hazard_resolution)		\
 	__PMC_EV(DMC620_PMU_CD2, clkdiv2_enqueue)			\
 	__PMC_EV(DMC620_PMU_CD2, clkdiv2_arbitrate)			\
 	__PMC_EV(DMC620_PMU_CD2, clkdiv2_lrank_turnaround_activate)	\
 	__PMC_EV(DMC620_PMU_CD2, clkdiv2_prank_turnaround_activate)	\
 	__PMC_EV(DMC620_PMU_CD2, clkdiv2_read_depth)			\
 	__PMC_EV(DMC620_PMU_CD2, clkdiv2_write_depth)			\
 	__PMC_EV(DMC620_PMU_CD2, clkdiv2_highhigh_qos_depth)		\
 	__PMC_EV(DMC620_PMU_CD2, clkdiv2_high_qos_depth)		\
 	__PMC_EV(DMC620_PMU_CD2, clkdiv2_medium_qos_depth)		\
 	__PMC_EV(DMC620_PMU_CD2, clkdiv2_low_qos_depth)			\
 	__PMC_EV(DMC620_PMU_CD2, clkdiv2_activate)			\
 	__PMC_EV(DMC620_PMU_CD2, clkdiv2_rdwr)				\
 	__PMC_EV(DMC620_PMU_CD2, clkdiv2_refresh)			\
 	__PMC_EV(DMC620_PMU_CD2, clkdiv2_training_request)		\
 	__PMC_EV(DMC620_PMU_CD2, clkdiv2_t_mac_tracker)			\
 	__PMC_EV(DMC620_PMU_CD2, clkdiv2_bk_fsm_tracker)		\
 	__PMC_EV(DMC620_PMU_CD2, clkdiv2_bk_open_tracker)		\
 	__PMC_EV(DMC620_PMU_CD2, clkdiv2_ranks_in_pwr_down)		\
 	__PMC_EV(DMC620_PMU_CD2, clkdiv2_ranks_in_sref)			\
 
 #define	__PMC_EV_DMC620_PMU_C()						\
 	__PMC_EV(DMC620_PMU_C, clk_cycle_count)				\
 	__PMC_EV(DMC620_PMU_C, clk_request)				\
 	__PMC_EV(DMC620_PMU_C, clk_upload_stall)
 
 #define	PMC_EV_DMC620_PMU_CD2_FIRST	PMC_EV_DMC620_PMU_CD2_clkdiv2_cycle_count
 #define	PMC_EV_DMC620_PMU_CD2_LAST	PMC_EV_DMC620_PMU_CD2_clkdiv2_ranks_in_sref
 #define	PMC_EV_DMC620_PMU_C_FIRST	PMC_EV_DMC620_PMU_C_clk_cycle_count
 #define	PMC_EV_DMC620_PMU_C_LAST	PMC_EV_DMC620_PMU_C_clk_upload_stall
 
 /*
  * Arm CMN-600 Coherent Mesh Network controller counters.
  */
 
 #define	__PMC_EV_CMN600_PMU()					\
 	__PMC_EV(CMN600_PMU, dn_rxreq_dvmop)			\
 	__PMC_EV(CMN600_PMU, dn_rxreq_dvmsync)			\
 	__PMC_EV(CMN600_PMU, dn_rxreq_dvmop_vmid_filtered)	\
 	__PMC_EV(CMN600_PMU, dn_rxreq_retried)			\
 	__PMC_EV(CMN600_PMU, dn_rxreq_trk_occupancy)		\
 	__PMC_EV(CMN600_PMU, dn_rxreq_tlbi_dvmop)		\
 	__PMC_EV(CMN600_PMU, dn_rxreq_bpi_dvmop)		\
 	__PMC_EV(CMN600_PMU, dn_rxreq_pici_dvmop)		\
 	__PMC_EV(CMN600_PMU, dn_rxreq_vivi_dvmop)		\
 	__PMC_EV(CMN600_PMU, dn_rxreq_dvmop_other_filtered)	\
 	__PMC_EV(CMN600_PMU, dn_rxreq_snp_sent)			\
 	__PMC_EV(CMN600_PMU, dn_rxreq_snp_stalled)		\
 	__PMC_EV(CMN600_PMU, dn_rxreq_trk_full)			\
 	__PMC_EV(CMN600_PMU, hnf_cache_miss)			\
 	__PMC_EV(CMN600_PMU, hnf_slc_sf_cache_access)		\
 	__PMC_EV(CMN600_PMU, hnf_cache_fill)			\
 	__PMC_EV(CMN600_PMU, hnf_pocq_retry)			\
 	__PMC_EV(CMN600_PMU, hnf_pocq_reqs_recvd)		\
 	__PMC_EV(CMN600_PMU, hnf_sf_hit)			\
 	__PMC_EV(CMN600_PMU, hnf_sf_evictions)			\
 	__PMC_EV(CMN600_PMU, hnf_dir_snoops_sent)		\
 	__PMC_EV(CMN600_PMU, hnf_brd_snoops_sent)		\
 	__PMC_EV(CMN600_PMU, hnf_slc_eviction)			\
 	__PMC_EV(CMN600_PMU, hnf_slc_fill_invalid_way)		\
 	__PMC_EV(CMN600_PMU, hnf_mc_retries)			\
 	__PMC_EV(CMN600_PMU, hnf_mc_reqs)			\
 	__PMC_EV(CMN600_PMU, hnf_qos_hh_retry)			\
 	__PMC_EV(CMN600_PMU, hnf_qos_pocq)			\
 	__PMC_EV(CMN600_PMU, hnf_pocq_addrhaz)			\
 	__PMC_EV(CMN600_PMU, hnf_pocq_atomic_addrhaz)		\
 	__PMC_EV(CMN600_PMU, hnf_ld_st_swp_adq_full)		\
 	__PMC_EV(CMN600_PMU, hnf_cmp_adq_full)			\
 	__PMC_EV(CMN600_PMU, hnf_txdat_stall)			\
 	__PMC_EV(CMN600_PMU, hnf_txrsp_stall)			\
 	__PMC_EV(CMN600_PMU, hnf_seq_full)			\
 	__PMC_EV(CMN600_PMU, hnf_seq_hit)			\
 	__PMC_EV(CMN600_PMU, hnf_snp_sent)			\
 	__PMC_EV(CMN600_PMU, hnf_sfbi_dir_snp_sent)		\
 	__PMC_EV(CMN600_PMU, hnf_sfbi_brd_snp_sent)		\
 	__PMC_EV(CMN600_PMU, hnf_snp_sent_untrk)		\
 	__PMC_EV(CMN600_PMU, hnf_intv_dirty)			\
 	__PMC_EV(CMN600_PMU, hnf_stash_snp_sent)		\
 	__PMC_EV(CMN600_PMU, hnf_stash_data_pull)		\
 	__PMC_EV(CMN600_PMU, hnf_snp_fwded)			\
 	__PMC_EV(CMN600_PMU, hni_rrt_rd_occ_cnt_ovfl)		\
 	__PMC_EV(CMN600_PMU, hni_rrt_wr_occ_cnt_ovfl)		\
 	__PMC_EV(CMN600_PMU, hni_rdt_rd_occ_cnt_ovfl)		\
 	__PMC_EV(CMN600_PMU, hni_rdt_wr_occ_cnt_ovfl)		\
 	__PMC_EV(CMN600_PMU, hni_wdb_occ_cnt_ovfl)		\
 	__PMC_EV(CMN600_PMU, hni_rrt_rd_alloc)			\
 	__PMC_EV(CMN600_PMU, hni_rrt_wr_alloc)			\
 	__PMC_EV(CMN600_PMU, hni_rdt_rd_alloc)			\
 	__PMC_EV(CMN600_PMU, hni_rdt_wr_alloc)			\
 	__PMC_EV(CMN600_PMU, hni_wdb_alloc)			\
 	__PMC_EV(CMN600_PMU, hni_txrsp_retryack)		\
 	__PMC_EV(CMN600_PMU, hni_arvalid_no_arready)		\
 	__PMC_EV(CMN600_PMU, hni_arready_no_arvalid)		\
 	__PMC_EV(CMN600_PMU, hni_awvalid_no_awready)		\
 	__PMC_EV(CMN600_PMU, hni_awready_no_awvalid)		\
 	__PMC_EV(CMN600_PMU, hni_wvalid_no_wready)		\
 	__PMC_EV(CMN600_PMU, hni_txdat_stall)			\
 	__PMC_EV(CMN600_PMU, hni_nonpcie_serialization)		\
 	__PMC_EV(CMN600_PMU, hni_pcie_serialization)		\
 	__PMC_EV(CMN600_PMU, xp_txflit_valid)			\
 	__PMC_EV(CMN600_PMU, xp_txflit_stall)			\
 	__PMC_EV(CMN600_PMU, xp_partial_dat_flit)		\
 	__PMC_EV(CMN600_PMU, sbsx_rd_req)			\
 	__PMC_EV(CMN600_PMU, sbsx_wr_req)			\
 	__PMC_EV(CMN600_PMU, sbsx_cmo_req)			\
 	__PMC_EV(CMN600_PMU, sbsx_txrsp_retryack)		\
 	__PMC_EV(CMN600_PMU, sbsx_txdat_flitv)			\
 	__PMC_EV(CMN600_PMU, sbsx_txrsp_flitv)			\
 	__PMC_EV(CMN600_PMU, sbsx_rd_req_trkr_occ_cnt_ovfl)	\
 	__PMC_EV(CMN600_PMU, sbsx_wr_req_trkr_occ_cnt_ovfl)	\
 	__PMC_EV(CMN600_PMU, sbsx_cmo_req_trkr_occ_cnt_ovfl)	\
 	__PMC_EV(CMN600_PMU, sbsx_wdb_occ_cnt_ovfl)		\
 	__PMC_EV(CMN600_PMU, sbsx_rd_axi_trkr_occ_cnt_ovfl)	\
 	__PMC_EV(CMN600_PMU, sbsx_cmo_axi_trkr_occ_cnt_ovfl)	\
 	__PMC_EV(CMN600_PMU, sbsx_arvalid_no_arready)		\
 	__PMC_EV(CMN600_PMU, sbsx_awvalid_no_awready)		\
 	__PMC_EV(CMN600_PMU, sbsx_wvalid_no_wready)		\
 	__PMC_EV(CMN600_PMU, sbsx_txdat_stall)			\
 	__PMC_EV(CMN600_PMU, sbsx_txrsp_stall)			\
 	__PMC_EV(CMN600_PMU, rnd_s0_rdata_beats)		\
 	__PMC_EV(CMN600_PMU, rnd_s1_rdata_beats)		\
 	__PMC_EV(CMN600_PMU, rnd_s2_rdata_beats)		\
 	__PMC_EV(CMN600_PMU, rnd_rxdat_flits)			\
 	__PMC_EV(CMN600_PMU, rnd_txdat_flits)			\
 	__PMC_EV(CMN600_PMU, rnd_txreq_flits_total)		\
 	__PMC_EV(CMN600_PMU, rnd_txreq_flits_retried)		\
 	__PMC_EV(CMN600_PMU, rnd_rrt_occ_ovfl)			\
 	__PMC_EV(CMN600_PMU, rnd_wrt_occ_ovfl)			\
 	__PMC_EV(CMN600_PMU, rnd_txreq_flits_replayed)		\
 	__PMC_EV(CMN600_PMU, rnd_wrcancel_sent)			\
 	__PMC_EV(CMN600_PMU, rnd_s0_wdata_beats)		\
 	__PMC_EV(CMN600_PMU, rnd_s1_wdata_beats)		\
 	__PMC_EV(CMN600_PMU, rnd_s2_wdata_beats)		\
 	__PMC_EV(CMN600_PMU, rnd_rrt_alloc)			\
 	__PMC_EV(CMN600_PMU, rnd_wrt_alloc)			\
 	__PMC_EV(CMN600_PMU, rnd_rdb_unord)			\
 	__PMC_EV(CMN600_PMU, rnd_rdb_replay)			\
 	__PMC_EV(CMN600_PMU, rnd_rdb_hybrid)			\
 	__PMC_EV(CMN600_PMU, rnd_rdb_ord)			\
 	__PMC_EV(CMN600_PMU, rni_s0_rdata_beats)		\
 	__PMC_EV(CMN600_PMU, rni_s1_rdata_beats)		\
 	__PMC_EV(CMN600_PMU, rni_s2_rdata_beats)		\
 	__PMC_EV(CMN600_PMU, rni_rxdat_flits)			\
 	__PMC_EV(CMN600_PMU, rni_txdat_flits)			\
 	__PMC_EV(CMN600_PMU, rni_txreq_flits_total)		\
 	__PMC_EV(CMN600_PMU, rni_txreq_flits_retried)		\
 	__PMC_EV(CMN600_PMU, rni_rrt_occ_ovfl)			\
 	__PMC_EV(CMN600_PMU, rni_wrt_occ_ovfl)			\
 	__PMC_EV(CMN600_PMU, rni_txreq_flits_replayed)		\
 	__PMC_EV(CMN600_PMU, rni_wrcancel_sent)			\
 	__PMC_EV(CMN600_PMU, rni_s0_wdata_beats)		\
 	__PMC_EV(CMN600_PMU, rni_s1_wdata_beats)		\
 	__PMC_EV(CMN600_PMU, rni_s2_wdata_beats)		\
 	__PMC_EV(CMN600_PMU, rni_rrt_alloc)			\
 	__PMC_EV(CMN600_PMU, rni_wrt_alloc)			\
 	__PMC_EV(CMN600_PMU, rni_rdb_unord)			\
 	__PMC_EV(CMN600_PMU, rni_rdb_replay)			\
 	__PMC_EV(CMN600_PMU, rni_rdb_hybrid)			\
 	__PMC_EV(CMN600_PMU, rni_rdb_ord)			\
 	__PMC_EV(CMN600_PMU, cxha_rddatbyp)			\
 	__PMC_EV(CMN600_PMU, cxha_chirsp_up_stall)		\
 	__PMC_EV(CMN600_PMU, cxha_chidat_up_stall)		\
 	__PMC_EV(CMN600_PMU, cxha_snppcrd_lnk0_stall)		\
 	__PMC_EV(CMN600_PMU, cxha_snppcrd_lnk1_stall)		\
 	__PMC_EV(CMN600_PMU, cxha_snppcrd_lnk2_stall)		\
 	__PMC_EV(CMN600_PMU, cxha_reqtrk_occ)			\
 	__PMC_EV(CMN600_PMU, cxha_rdb_occ)			\
 	__PMC_EV(CMN600_PMU, cxha_rdbbyp_occ)			\
 	__PMC_EV(CMN600_PMU, cxha_wdb_occ)			\
 	__PMC_EV(CMN600_PMU, cxha_snptrk_occ)			\
 	__PMC_EV(CMN600_PMU, cxha_sdb_occ)			\
 	__PMC_EV(CMN600_PMU, cxha_snphaz_occ)			\
 	__PMC_EV(CMN600_PMU, cxra_req_trk_occ)			\
 	__PMC_EV(CMN600_PMU, cxra_snp_trk_occ)			\
 	__PMC_EV(CMN600_PMU, cxra_rd_dat_buf_occ)		\
 	__PMC_EV(CMN600_PMU, cxra_wr_dat_buf_occ)		\
 	__PMC_EV(CMN600_PMU, cxra_snp_sink_buf_occ)		\
 	__PMC_EV(CMN600_PMU, cxra_snp_bcasts)			\
 	__PMC_EV(CMN600_PMU, cxra_req_chains)			\
 	__PMC_EV(CMN600_PMU, cxra_req_chain_avg_len)		\
 	__PMC_EV(CMN600_PMU, cxra_chi_rsp_upload_stalls)	\
 	__PMC_EV(CMN600_PMU, cxra_chi_dat_upload_stalls)	\
 	__PMC_EV(CMN600_PMU, cxra_dat_pcrd_stalls_lnk0)		\
 	__PMC_EV(CMN600_PMU, cxra_dat_pcrd_stalls_lnk1)		\
 	__PMC_EV(CMN600_PMU, cxra_dat_pcrd_stalls_lnk2)		\
 	__PMC_EV(CMN600_PMU, cxra_req_pcrd_stalls_lnk0)		\
 	__PMC_EV(CMN600_PMU, cxra_req_pcrd_stalls_lnk1)		\
 	__PMC_EV(CMN600_PMU, cxra_req_pcrd_stalls_lnk2)		\
 	__PMC_EV(CMN600_PMU, cxra_ext_rsp_stall)		\
 	__PMC_EV(CMN600_PMU, cxra_ext_dat_stall)		\
 	__PMC_EV(CMN600_PMU, cxla_rx_tlp_link0)			\
 	__PMC_EV(CMN600_PMU, cxla_rx_tlp_link1)			\
 	__PMC_EV(CMN600_PMU, cxla_rx_tlp_link2)			\
 	__PMC_EV(CMN600_PMU, cxla_tx_tlp_link0)			\
 	__PMC_EV(CMN600_PMU, cxla_tx_tlp_link1)			\
 	__PMC_EV(CMN600_PMU, cxla_tx_tlp_link2)			\
 	__PMC_EV(CMN600_PMU, cxla_rx_cxs_link0)			\
 	__PMC_EV(CMN600_PMU, cxla_rx_cxs_link1)			\
 	__PMC_EV(CMN600_PMU, cxla_rx_cxs_link2)			\
 	__PMC_EV(CMN600_PMU, cxla_tx_cxs_link0)			\
 	__PMC_EV(CMN600_PMU, cxla_tx_cxs_link1)			\
 	__PMC_EV(CMN600_PMU, cxla_tx_cxs_link2)			\
 	__PMC_EV(CMN600_PMU, cxla_avg_rx_tlp_sz_dws)		\
 	__PMC_EV(CMN600_PMU, cxla_avg_tx_tlp_sz_dws)		\
 	__PMC_EV(CMN600_PMU, cxla_avg_rx_tlp_sz_ccix_msg)	\
 	__PMC_EV(CMN600_PMU, cxla_avg_tx_tlp_sz_ccix_msg)	\
 	__PMC_EV(CMN600_PMU, cxla_avg_sz_rx_cxs_dw_beat)	\
 	__PMC_EV(CMN600_PMU, cxla_avg_sz_tx_cxs_dw_beat)	\
 	__PMC_EV(CMN600_PMU, cxla_tx_cxs_link_credit_backpressure) \
 	__PMC_EV(CMN600_PMU, cxla_rx_tlp_buffer_full)		\
 	__PMC_EV(CMN600_PMU, cxla_tx_tlp_buffer_full)		\
 	__PMC_EV(CMN600_PMU, cxla_avg_latency_process_rx_tlp)	\
 	__PMC_EV(CMN600_PMU, cxla_avg_latency_form_tx_tlp)
 
 
 #define	PMC_EV_CMN600_PMU_FIRST	PMC_EV_CMN600_PMU_dn_rxreq_dvmop
 #define	PMC_EV_CMN600_PMU_LAST	\
 		PMC_EV_CMN600_PMU_cxla_avg_latency_form_tx_tlp
 
 #define __PMC_EV_PPC7450()						\
 	__PMC_EV(PPC7450, CYCLE)					\
 	__PMC_EV(PPC7450, INSTR_COMPLETED)				\
 	__PMC_EV(PPC7450, TLB_BIT_TRANSITIONS)				\
 	__PMC_EV(PPC7450, INSTR_DISPATCHED)				\
 	__PMC_EV(PPC7450, PMON_EXCEPT)					\
 	__PMC_EV(PPC7450, PMON_SIG)					\
 	__PMC_EV(PPC7450, VPU_INSTR_COMPLETED)				\
 	__PMC_EV(PPC7450, VFPU_INSTR_COMPLETED)				\
 	__PMC_EV(PPC7450, VIU1_INSTR_COMPLETED)				\
 	__PMC_EV(PPC7450, VIU2_INSTR_COMPLETED)				\
 	__PMC_EV(PPC7450, MTVSCR_INSTR_COMPLETED)			\
 	__PMC_EV(PPC7450, MTVRSAVE_INSTR_COMPLETED)			\
 	__PMC_EV(PPC7450, VPU_INSTR_WAIT_CYCLES)			\
 	__PMC_EV(PPC7450, VFPU_INSTR_WAIT_CYCLES)			\
 	__PMC_EV(PPC7450, VIU1_INSTR_WAIT_CYCLES)			\
 	__PMC_EV(PPC7450, VIU2_INSTR_WAIT_CYCLES)			\
 	__PMC_EV(PPC7450, MFVSCR_SYNC_CYCLES)				\
 	__PMC_EV(PPC7450, VSCR_SAT_SET)					\
 	__PMC_EV(PPC7450, STORE_INSTR_COMPLETED)			\
 	__PMC_EV(PPC7450, L1_INSTR_CACHE_MISSES)			\
 	__PMC_EV(PPC7450, L1_DATA_SNOOPS)				\
 	__PMC_EV(PPC7450, UNRESOLVED_BRANCHES)				\
 	__PMC_EV(PPC7450, SPEC_BUFFER_CYCLES)				\
 	__PMC_EV(PPC7450, BRANCH_UNIT_STALL_CYCLES)			\
 	__PMC_EV(PPC7450, TRUE_BRANCH_TARGET_HITS)			\
 	__PMC_EV(PPC7450, BRANCH_LINK_STAC_PREDICTED)			\
 	__PMC_EV(PPC7450, GPR_ISSUE_QUEUE_DISPATCHES)			\
 	__PMC_EV(PPC7450, CYCLES_THREE_INSTR_DISPATCHED)		\
 	__PMC_EV(PPC7450, THRESHOLD_INSTR_QUEUE_ENTRIES_CYCLES)		\
 	__PMC_EV(PPC7450, THRESHOLD_VEC_INSTR_QUEUE_ENTRIES_CYCLES)	\
 	__PMC_EV(PPC7450, CYCLES_NO_COMPLETED_INSTRS)			\
 	__PMC_EV(PPC7450, IU2_INSTR_COMPLETED)				\
 	__PMC_EV(PPC7450, BRANCHES_COMPLETED)				\
 	__PMC_EV(PPC7450, EIEIO_INSTR_COMPLETED)			\
 	__PMC_EV(PPC7450, MTSPR_INSTR_COMPLETED)			\
 	__PMC_EV(PPC7450, SC_INSTR_COMPLETED)				\
 	__PMC_EV(PPC7450, LS_LM_COMPLETED)				\
 	__PMC_EV(PPC7450, ITLB_HW_TABLE_SEARCH_CYCLES)			\
 	__PMC_EV(PPC7450, DTLB_HW_SEARCH_CYCLES_OVER_THRESHOLD)		\
 	__PMC_EV(PPC7450, L1_INSTR_CACHE_ACCESSES)			\
 	__PMC_EV(PPC7450, INSTR_BKPT_MATCHES)				\
 	__PMC_EV(PPC7450, L1_DATA_CACHE_LOAD_MISS_CYCLES_OVER_THRESHOLD)\
 	__PMC_EV(PPC7450, L1_DATA_SNOOP_HIT_ON_MODIFIED)		\
 	__PMC_EV(PPC7450, LOAD_MISS_ALIAS)				\
 	__PMC_EV(PPC7450, LOAD_MISS_ALIAS_ON_TOUCH)			\
 	__PMC_EV(PPC7450, TOUCH_ALIAS)					\
 	__PMC_EV(PPC7450, L1_DATA_SNOOP_HIT_CASTOUT_QUEUE)		\
 	__PMC_EV(PPC7450, L1_DATA_SNOOP_HIT_CASTOUT)			\
 	__PMC_EV(PPC7450, L1_DATA_SNOOP_HITS)				\
 	__PMC_EV(PPC7450, WRITE_THROUGH_STORES)				\
 	__PMC_EV(PPC7450, CACHE_INHIBITED_STORES)			\
 	__PMC_EV(PPC7450, L1_DATA_LOAD_HIT)				\
 	__PMC_EV(PPC7450, L1_DATA_TOUCH_HIT)				\
 	__PMC_EV(PPC7450, L1_DATA_STORE_HIT)				\
 	__PMC_EV(PPC7450, L1_DATA_TOTAL_HITS)				\
 	__PMC_EV(PPC7450, DST_INSTR_DISPATCHED)				\
 	__PMC_EV(PPC7450, REFRESHED_DSTS)				\
 	__PMC_EV(PPC7450, SUCCESSFUL_DST_TABLE_SEARCHES)		\
 	__PMC_EV(PPC7450, DSS_INSTR_COMPLETED)				\
 	__PMC_EV(PPC7450, DST_STREAM_0_CACHE_LINE_FETCHES)		\
 	__PMC_EV(PPC7450, VTQ_SUSPENDS_DUE_TO_CTX_CHANGE)		\
 	__PMC_EV(PPC7450, VTQ_LINE_FETCH_HIT)				\
 	__PMC_EV(PPC7450, VEC_LOAD_INSTR_COMPLETED)			\
 	__PMC_EV(PPC7450, FP_STORE_INSTR_COMPLETED_IN_LSU)		\
 	__PMC_EV(PPC7450, FPU_RENORMALIZATION)				\
 	__PMC_EV(PPC7450, FPU_DENORMALIZATION)				\
 	__PMC_EV(PPC7450, FP_STORE_CAUSES_STALL_IN_LSU)			\
 	__PMC_EV(PPC7450, LD_ST_TRUE_ALIAS_STALL)			\
 	__PMC_EV(PPC7450, LSU_INDEXED_ALIAS_STALL)			\
 	__PMC_EV(PPC7450, LSU_ALIAS_VS_FSQ_WB0_WB1)			\
 	__PMC_EV(PPC7450, LSU_ALIAS_VS_CSQ)				\
 	__PMC_EV(PPC7450, LSU_LOAD_HIT_LINE_ALIAS_VS_CSQ0)		\
 	__PMC_EV(PPC7450, LSU_LOAD_MISS_LINE_ALIAS_VS_CSQ0)		\
 	__PMC_EV(PPC7450, LSU_TOUCH_LINE_ALIAS_VS_FSQ_WB0_WB1)		\
 	__PMC_EV(PPC7450, LSU_TOUCH_ALIAS_VS_CSQ)			\
 	__PMC_EV(PPC7450, LSU_LMQ_FULL_STALL)				\
 	__PMC_EV(PPC7450, FP_LOAD_INSTR_COMPLETED_IN_LSU)		\
 	__PMC_EV(PPC7450, FP_LOAD_SINGLE_INSTR_COMPLETED_IN_LSU)	\
 	__PMC_EV(PPC7450, FP_LOAD_DOUBLE_COMPLETED_IN_LSU)		\
 	__PMC_EV(PPC7450, LSU_RA_LATCH_STALL)				\
 	__PMC_EV(PPC7450, LSU_LOAD_VS_STORE_QUEUE_ALIAS_STALL)		\
 	__PMC_EV(PPC7450, LSU_LMQ_INDEX_ALIAS)				\
 	__PMC_EV(PPC7450, LSU_STORE_QUEUE_INDEX_ALIAS)			\
 	__PMC_EV(PPC7450, LSU_CSQ_FORWARDING)				\
 	__PMC_EV(PPC7450, LSU_MISALIGNED_LOAD_FINISH)			\
 	__PMC_EV(PPC7450, LSU_MISALIGN_STORE_COMPLETED)			\
 	__PMC_EV(PPC7450, LSU_MISALIGN_STALL)				\
 	__PMC_EV(PPC7450, FP_ONE_QUARTER_FPSCR_RENAMES_BUSY)		\
 	__PMC_EV(PPC7450, FP_ONE_HALF_FPSCR_RENAMES_BUSY)		\
 	__PMC_EV(PPC7450, FP_THREE_QUARTERS_FPSCR_RENAMES_BUSY)		\
 	__PMC_EV(PPC7450, FP_ALL_FPSCR_RENAMES_BUSY)			\
 	__PMC_EV(PPC7450, FP_DENORMALIZED_RESULT)			\
 	__PMC_EV(PPC7450, L1_DATA_TOTAL_MISSES)				\
 	__PMC_EV(PPC7450, DISPATCHES_TO_FPR_ISSUE_QUEUE)		\
 	__PMC_EV(PPC7450, LSU_INSTR_COMPLETED)				\
 	__PMC_EV(PPC7450, LOAD_INSTR_COMPLETED)				\
 	__PMC_EV(PPC7450, SS_SM_INSTR_COMPLETED)			\
 	__PMC_EV(PPC7450, TLBIE_INSTR_COMPLETED)			\
 	__PMC_EV(PPC7450, LWARX_INSTR_COMPLETED)			\
 	__PMC_EV(PPC7450, MFSPR_INSTR_COMPLETED)			\
 	__PMC_EV(PPC7450, REFETCH_SERIALIZATION)			\
 	__PMC_EV(PPC7450, COMPLETION_QUEUE_ENTRIES_OVER_THRESHOLD)	\
 	__PMC_EV(PPC7450, CYCLES_ONE_INSTR_DISPATCHED)			\
 	__PMC_EV(PPC7450, CYCLES_TWO_INSTR_COMPLETED)			\
 	__PMC_EV(PPC7450, ITLB_NON_SPECULATIVE_MISSES)			\
 	__PMC_EV(PPC7450, CYCLES_WAITING_FROM_L1_INSTR_CACHE_MISS)	\
 	__PMC_EV(PPC7450, L1_DATA_LOAD_ACCESS_MISS)			\
 	__PMC_EV(PPC7450, L1_DATA_TOUCH_MISS)				\
 	__PMC_EV(PPC7450, L1_DATA_STORE_MISS)				\
 	__PMC_EV(PPC7450, L1_DATA_TOUCH_MISS_CYCLES)			\
 	__PMC_EV(PPC7450, L1_DATA_CYCLES_USED)				\
 	__PMC_EV(PPC7450, DST_STREAM_1_CACHE_LINE_FETCHES)		\
 	__PMC_EV(PPC7450, VTQ_STREAM_CANCELED_PREMATURELY)		\
 	__PMC_EV(PPC7450, VTQ_RESUMES_DUE_TO_CTX_CHANGE)		\
 	__PMC_EV(PPC7450, VTQ_LINE_FETCH_MISS)				\
 	__PMC_EV(PPC7450, VTQ_LINE_FETCH)				\
 	__PMC_EV(PPC7450, TLBIE_SNOOPS)					\
 	__PMC_EV(PPC7450, L1_INSTR_CACHE_RELOADS)			\
 	__PMC_EV(PPC7450, L1_DATA_CACHE_RELOADS)			\
 	__PMC_EV(PPC7450, L1_DATA_CACHE_CASTOUTS_TO_L2)			\
 	__PMC_EV(PPC7450, STORE_MERGE_GATHER)				\
 	__PMC_EV(PPC7450, CACHEABLE_STORE_MERGE_TO_32_BYTES)		\
 	__PMC_EV(PPC7450, DATA_BKPT_MATCHES)				\
 	__PMC_EV(PPC7450, FALL_THROUGH_BRANCHES_PROCESSED)		\
 	__PMC_EV(PPC7450,						\
 	    FIRST_SPECULATIVE_BRANCH_BUFFER_RESOLVED_CORRECTLY)		\
 	__PMC_EV(PPC7450, SECOND_SPECULATION_BUFFER_ACTIVE)		\
 	__PMC_EV(PPC7450, BPU_STALL_ON_LR_DEPENDENCY)			\
 	__PMC_EV(PPC7450, BTIC_MISS)					\
 	__PMC_EV(PPC7450, BRANCH_LINK_STACK_CORRECTLY_RESOLVED)		\
 	__PMC_EV(PPC7450, FPR_ISSUE_STALLED)				\
 	__PMC_EV(PPC7450, SWITCHES_BETWEEN_PRIV_USER)			\
 	__PMC_EV(PPC7450, LSU_COMPLETES_FP_STORE_SINGLE)		\
 	__PMC_EV(PPC7450, VR_ISSUE_QUEUE_DISPATCHES)			\
 	__PMC_EV(PPC7450, VR_STALLS)					\
 	__PMC_EV(PPC7450, GPR_RENAME_BUFFER_ENTRIES_OVER_THRESHOLD)	\
 	__PMC_EV(PPC7450, FPR_ISSUE_QUEUE_ENTRIES)			\
 	__PMC_EV(PPC7450, FPU_INSTR_COMPLETED)				\
 	__PMC_EV(PPC7450, STWCX_INSTR_COMPLETED)			\
 	__PMC_EV(PPC7450, LS_LM_INSTR_PIECES)				\
 	__PMC_EV(PPC7450, ITLB_HW_SEARCH_CYCLES_OVER_THRESHOLD)		\
 	__PMC_EV(PPC7450, DTLB_MISSES)					\
 	__PMC_EV(PPC7450, CANCELLED_L1_INSTR_CACHE_MISSES)		\
 	__PMC_EV(PPC7450, L1_DATA_CACHE_OP_HIT)				\
 	__PMC_EV(PPC7450, L1_DATA_LOAD_MISS_CYCLES)			\
 	__PMC_EV(PPC7450, L1_DATA_PUSHES)				\
 	__PMC_EV(PPC7450, L1_DATA_TOTAL_MISS)				\
 	__PMC_EV(PPC7450, VT2_FETCHES)					\
 	__PMC_EV(PPC7450, TAKEN_BRANCHES_PROCESSED)			\
 	__PMC_EV(PPC7450, BRANCH_FLUSHES)				\
 	__PMC_EV(PPC7450,						\
 	    SECOND_SPECULATIVE_BRANCH_BUFFER_RESOLVED_CORRECTLY)	\
 	__PMC_EV(PPC7450, THIRD_SPECULATION_BUFFER_ACTIVE)		\
 	__PMC_EV(PPC7450, BRANCH_UNIT_STALL_ON_CTR_DEPENDENCY)		\
 	__PMC_EV(PPC7450, FAST_BTIC_HIT)				\
 	__PMC_EV(PPC7450, BRANCH_LINK_STACK_MISPREDICTED)		\
 	__PMC_EV(PPC7450, CYCLES_THREE_INSTR_COMPLETED)			\
 	__PMC_EV(PPC7450, CYCLES_NO_INSTR_DISPATCHED)			\
 	__PMC_EV(PPC7450, GPR_ISSUE_QUEUE_ENTRIES_OVER_THRESHOLD)	\
 	__PMC_EV(PPC7450, GPR_ISSUE_QUEUE_STALLED)			\
 	__PMC_EV(PPC7450, IU1_INSTR_COMPLETED)				\
 	__PMC_EV(PPC7450, DSSALL_INSTR_COMPLETED)			\
 	__PMC_EV(PPC7450, TLBSYNC_INSTR_COMPLETED)			\
 	__PMC_EV(PPC7450, SYNC_INSTR_COMPLETED)				\
 	__PMC_EV(PPC7450, SS_SM_INSTR_PIECES)				\
 	__PMC_EV(PPC7450, DTLB_HW_SEARCH_CYCLES)			\
 	__PMC_EV(PPC7450, SNOOP_RETRIES)				\
 	__PMC_EV(PPC7450, SUCCESSFUL_STWCX)				\
 	__PMC_EV(PPC7450, DST_STREAM_3_CACHE_LINE_FETCHES)		\
 	__PMC_EV(PPC7450,						\
 	    THIRD_SPECULATIVE_BRANCH_BUFFER_RESOLVED_CORRECTLY)		\
 	__PMC_EV(PPC7450, MISPREDICTED_BRANCHES)			\
 	__PMC_EV(PPC7450, FOLDED_BRANCHES)				\
 	__PMC_EV(PPC7450, FP_STORE_DOUBLE_COMPLETES_IN_LSU)		\
 	__PMC_EV(PPC7450, L2_CACHE_HITS)				\
 	__PMC_EV(PPC7450, L3_CACHE_HITS)				\
 	__PMC_EV(PPC7450, L2_INSTR_CACHE_MISSES)			\
 	__PMC_EV(PPC7450, L3_INSTR_CACHE_MISSES)			\
 	__PMC_EV(PPC7450, L2_DATA_CACHE_MISSES)				\
 	__PMC_EV(PPC7450, L3_DATA_CACHE_MISSES)				\
 	__PMC_EV(PPC7450, L2_LOAD_HITS)					\
 	__PMC_EV(PPC7450, L2_STORE_HITS)				\
 	__PMC_EV(PPC7450, L3_LOAD_HITS)					\
 	__PMC_EV(PPC7450, L3_STORE_HITS)				\
 	__PMC_EV(PPC7450, L2_TOUCH_HITS)				\
 	__PMC_EV(PPC7450, L3_TOUCH_HITS)				\
 	__PMC_EV(PPC7450, SNOOP_MODIFIED)				\
 	__PMC_EV(PPC7450, SNOOP_VALID)					\
 	__PMC_EV(PPC7450, INTERVENTION)					\
 	__PMC_EV(PPC7450, L2_CACHE_MISSES)				\
 	__PMC_EV(PPC7450, L3_CACHE_MISSES)				\
 	__PMC_EV(PPC7450, L2_CACHE_CASTOUTS)				\
 	__PMC_EV(PPC7450, L3_CACHE_CASTOUTS)				\
 	__PMC_EV(PPC7450, L2SQ_FULL_CYCLES)				\
 	__PMC_EV(PPC7450, L3SQ_FULL_CYCLES)				\
 	__PMC_EV(PPC7450, RAQ_FULL_CYCLES)				\
 	__PMC_EV(PPC7450, WAQ_FULL_CYCLES)				\
 	__PMC_EV(PPC7450, L1_EXTERNAL_INTERVENTIONS)			\
 	__PMC_EV(PPC7450, L2_EXTERNAL_INTERVENTIONS)			\
 	__PMC_EV(PPC7450, L3_EXTERNAL_INTERVENTIONS)			\
 	__PMC_EV(PPC7450, EXTERNAL_INTERVENTIONS)			\
 	__PMC_EV(PPC7450, EXTERNAL_PUSHES)				\
 	__PMC_EV(PPC7450, EXTERNAL_SNOOP_RETRY)				\
 	__PMC_EV(PPC7450, DTQ_FULL_CYCLES)				\
 	__PMC_EV(PPC7450, BUS_RETRY)					\
 	__PMC_EV(PPC7450, L2_VALID_REQUEST)				\
 	__PMC_EV(PPC7450, BORDQ_FULL)					\
 	__PMC_EV(PPC7450, BUS_TAS_FOR_READS)				\
 	__PMC_EV(PPC7450, BUS_TAS_FOR_WRITES)				\
 	__PMC_EV(PPC7450, BUS_READS_NOT_RETRIED)			\
 	__PMC_EV(PPC7450, BUS_WRITES_NOT_RETRIED)			\
 	__PMC_EV(PPC7450, BUS_READS_WRITES_NOT_RETRIED)			\
 	__PMC_EV(PPC7450, BUS_RETRY_DUE_TO_L1_RETRY)			\
 	__PMC_EV(PPC7450, BUS_RETRY_DUE_TO_PREVIOUS_ADJACENT)		\
 	__PMC_EV(PPC7450, BUS_RETRY_DUE_TO_COLLISION)			\
 	__PMC_EV(PPC7450, BUS_RETRY_DUE_TO_INTERVENTION_ORDERING)	\
 	__PMC_EV(PPC7450, SNOOP_REQUESTS)				\
 	__PMC_EV(PPC7450, PREFETCH_ENGINE_REQUEST)			\
 	__PMC_EV(PPC7450, PREFETCH_ENGINE_COLLISION_VS_LOAD)		\
 	__PMC_EV(PPC7450, PREFETCH_ENGINE_COLLISION_VS_STORE)		\
 	__PMC_EV(PPC7450, PREFETCH_ENGINE_COLLISION_VS_INSTR_FETCH)	\
 	__PMC_EV(PPC7450,						\
 	    PREFETCH_ENGINE_COLLISION_VS_LOAD_STORE_INSTR_FETCH)	\
 	__PMC_EV(PPC7450, PREFETCH_ENGINE_FULL)
 
 #define PMC_EV_PPC7450_FIRST	PMC_EV_PPC7450_CYCLE
 #define PMC_EV_PPC7450_LAST	PMC_EV_PPC7450_PREFETCH_ENGINE_FULL
 
 #define __PMC_EV_PPC970() \
 	__PMC_EV(PPC970, INSTR_COMPLETED) \
 	__PMC_EV(PPC970, MARKED_GROUP_DISPATCH) \
 	__PMC_EV(PPC970, MARKED_STORE_COMPLETED) \
 	__PMC_EV(PPC970, GCT_EMPTY) \
 	__PMC_EV(PPC970, RUN_CYCLES) \
 	__PMC_EV(PPC970, OVERFLOW) \
 	__PMC_EV(PPC970, CYCLES) \
 	__PMC_EV(PPC970, THRESHOLD_TIMEOUT) \
 	__PMC_EV(PPC970, GROUP_DISPATCH) \
 	__PMC_EV(PPC970, BR_MARKED_INSTR_FINISH) \
 	__PMC_EV(PPC970, GCT_EMPTY_BY_SRQ_FULL) \
 	__PMC_EV(PPC970, STOP_COMPLETION) \
 	__PMC_EV(PPC970, LSU_EMPTY) \
 	__PMC_EV(PPC970, MARKED_STORE_WITH_INTR) \
 	__PMC_EV(PPC970, CYCLES_IN_SUPER) \
 	__PMC_EV(PPC970, VPU_MARKED_INSTR_COMPLETED) \
 	__PMC_EV(PPC970, FXU0_IDLE_FXU1_BUSY) \
 	__PMC_EV(PPC970, SRQ_EMPTY) \
 	__PMC_EV(PPC970, MARKED_GROUP_COMPLETED) \
 	__PMC_EV(PPC970, CR_MARKED_INSTR_FINISH) \
 	__PMC_EV(PPC970, DISPATCH_SUCCESS) \
 	__PMC_EV(PPC970, FXU0_IDLE_FXU1_IDLE) \
 	__PMC_EV(PPC970, ONE_PLUS_INSTR_COMPLETED) \
 	__PMC_EV(PPC970, GROUP_MARKED_IDU) \
 	__PMC_EV(PPC970, MARKED_GROUP_COMPLETE_TIMEOUT) \
 	__PMC_EV(PPC970, FXU0_BUSY_FXU1_BUSY) \
 	__PMC_EV(PPC970, MARKED_STORE_SENT_TO_STS) \
 	__PMC_EV(PPC970, FXU_MARKED_INSTR_FINISHED) \
 	__PMC_EV(PPC970, MARKED_GROUP_ISSUED) \
 	__PMC_EV(PPC970, FXU0_BUSY_FXU1_IDLE) \
 	__PMC_EV(PPC970, GROUP_COMPLETED) \
 	__PMC_EV(PPC970, FPU_MARKED_INSTR_COMPLETED) \
 	__PMC_EV(PPC970, MARKED_INSTR_FINISH_ANY_UNIT) \
 	__PMC_EV(PPC970, EXTERNAL_INTERRUPT) \
 	__PMC_EV(PPC970, GROUP_DISPATCH_REJECT) \
 	__PMC_EV(PPC970, LSU_MARKED_INSTR_FINISH) \
 	__PMC_EV(PPC970, TIMEBASE_EVENT) \
 	__PMC_EV(PPC970, LSU_COMPLETION_STALL) \
 	__PMC_EV(PPC970, FXU_COMPLETION_STALL) \
 	__PMC_EV(PPC970, DCACHE_MISS_COMPLETION_STALL) \
 	__PMC_EV(PPC970, FPU_COMPLETION_STALL) \
 	__PMC_EV(PPC970, FXU_LONG_INSTR_COMPLETION_STALL) \
 	__PMC_EV(PPC970, REJECT_COMPLETION_STALL) \
 	__PMC_EV(PPC970, FPU_LONG_INSTR_COMPLETION_STALL) \
 	__PMC_EV(PPC970, GCT_EMPTY_BY_ICACHE_MISS) \
 	__PMC_EV(PPC970, REJECT_COMPLETION_STALL_ERAT_MISS) \
 	__PMC_EV(PPC970, GCT_EMPTY_BY_BRANCH_MISS_PREDICT) \
 	__PMC_EV(PPC970, BUS_HIGH) \
 	__PMC_EV(PPC970, BUS_LOW) \
 	__PMC_EV(PPC970, ADDER)
 
 
 #define PMC_EV_PPC970_FIRST		PMC_EV_PPC970_INSTR_COMPLETED
 #define PMC_EV_PPC970_LAST		PMC_EV_PPC970_ADDER
 
 #define __PMC_EV_E500() \
 	__PMC_EV(E500, CYCLES) \
 	__PMC_EV(E500, INSTR_COMPLETED) \
 	__PMC_EV(E500, UOPS_COMPLETED) \
 	__PMC_EV(E500, INSTR_FETCHED) \
 	__PMC_EV(E500, UOPS_DECODED) \
 	__PMC_EV(E500, PM_EVENT_TRANSITIONS) \
 	__PMC_EV(E500, PM_EVENT_CYCLES) \
 	__PMC_EV(E500, BRANCH_INSTRS_COMPLETED) \
 	__PMC_EV(E500, LOAD_UOPS_COMPLETED) \
 	__PMC_EV(E500, STORE_UOPS_COMPLETED) \
 	__PMC_EV(E500, CQ_REDIRECTS) \
 	__PMC_EV(E500, BRANCHES_FINISHED) \
 	__PMC_EV(E500, TAKEN_BRANCHES_FINISHED) \
 	__PMC_EV(E500, FINISHED_UNCOND_BRANCHES_MISS_BTB) \
 	__PMC_EV(E500, BRANCH_MISPRED) \
 	__PMC_EV(E500, BTB_BRANCH_MISPRED_FROM_DIRECTION) \
 	__PMC_EV(E500, BTB_HITS_PSEUDO_HITS) \
 	__PMC_EV(E500, CYCLES_DECODE_STALLED) \
 	__PMC_EV(E500, CYCLES_ISSUE_STALLED) \
 	__PMC_EV(E500, CYCLES_BRANCH_ISSUE_STALLED) \
 	__PMC_EV(E500, CYCLES_SU1_SCHED_STALLED) \
 	__PMC_EV(E500, CYCLES_SU2_SCHED_STALLED) \
 	__PMC_EV(E500, CYCLES_MU_SCHED_STALLED) \
 	__PMC_EV(E500, CYCLES_LRU_SCHED_STALLED) \
 	__PMC_EV(E500, CYCLES_BU_SCHED_STALLED) \
 	__PMC_EV(E500, TOTAL_TRANSLATED) \
 	__PMC_EV(E500, LOADS_TRANSLATED) \
 	__PMC_EV(E500, STORES_TRANSLATED) \
 	__PMC_EV(E500, TOUCHES_TRANSLATED) \
 	__PMC_EV(E500, CACHEOPS_TRANSLATED) \
 	__PMC_EV(E500, CACHE_INHIBITED_ACCESS_TRANSLATED) \
 	__PMC_EV(E500, GUARDED_LOADS_TRANSLATED) \
 	__PMC_EV(E500, WRITE_THROUGH_STORES_TRANSLATED) \
 	__PMC_EV(E500, MISALIGNED_LOAD_STORE_ACCESS_TRANSLATED) \
 	__PMC_EV(E500, TOTAL_ALLOCATED_TO_DLFB) \
 	__PMC_EV(E500, LOADS_TRANSLATED_ALLOCATED_TO_DLFB) \
 	__PMC_EV(E500, STORES_COMPLETED_ALLOCATED_TO_DLFB) \
 	__PMC_EV(E500, TOUCHES_TRANSLATED_ALLOCATED_TO_DLFB) \
 	__PMC_EV(E500, STORES_COMPLETED) \
 	__PMC_EV(E500, DATA_L1_CACHE_LOCKS) \
 	__PMC_EV(E500, DATA_L1_CACHE_RELOADS) \
 	__PMC_EV(E500, DATA_L1_CACHE_CASTOUTS) \
 	__PMC_EV(E500, LOAD_MISS_DLFB_FULL) \
 	__PMC_EV(E500, LOAD_MISS_LDQ_FULL) \
 	__PMC_EV(E500, LOAD_GUARDED_MISS) \
 	__PMC_EV(E500, STORE_TRANSLATE_WHEN_QUEUE_FULL) \
 	__PMC_EV(E500, ADDRESS_COLLISION) \
 	__PMC_EV(E500, DATA_MMU_MISS) \
 	__PMC_EV(E500, DATA_MMU_BUSY) \
 	__PMC_EV(E500, PART2_MISALIGNED_CACHE_ACCESS) \
 	__PMC_EV(E500, LOAD_MISS_DLFB_FULL_CYCLES) \
 	__PMC_EV(E500, LOAD_MISS_LDQ_FULL_CYCLES) \
 	__PMC_EV(E500, LOAD_GUARDED_MISS_CYCLES) \
 	__PMC_EV(E500, STORE_TRANSLATE_WHEN_QUEUE_FULL_CYCLES) \
 	__PMC_EV(E500, ADDRESS_COLLISION_CYCLES) \
 	__PMC_EV(E500, DATA_MMU_MISS_CYCLES) \
 	__PMC_EV(E500, DATA_MMU_BUSY_CYCLES) \
 	__PMC_EV(E500, PART2_MISALIGNED_CACHE_ACCESS_CYCLES) \
 	__PMC_EV(E500, INSTR_L1_CACHE_LOCKS) \
 	__PMC_EV(E500, INSTR_L1_CACHE_RELOADS) \
 	__PMC_EV(E500, INSTR_L1_CACHE_FETCHES) \
 	__PMC_EV(E500, INSTR_MMU_TLB4K_RELOADS) \
 	__PMC_EV(E500, INSTR_MMU_VSP_RELOADS) \
 	__PMC_EV(E500, DATA_MMU_TLB4K_RELOADS) \
 	__PMC_EV(E500, DATA_MMU_VSP_RELOADS) \
 	__PMC_EV(E500, L2MMU_MISSES) \
 	__PMC_EV(E500, BIU_MASTER_REQUESTS) \
 	__PMC_EV(E500, BIU_MASTER_INSTR_SIDE_REQUESTS) \
 	__PMC_EV(E500, BIU_MASTER_DATA_SIDE_REQUESTS) \
 	__PMC_EV(E500, BIU_MASTER_DATA_SIDE_CASTOUT_REQUESTS) \
 	__PMC_EV(E500, BIU_MASTER_RETRIES) \
 	__PMC_EV(E500, SNOOP_REQUESTS) \
 	__PMC_EV(E500, SNOOP_HITS) \
 	__PMC_EV(E500, SNOOP_PUSHES) \
 	__PMC_EV(E500, SNOOP_RETRIES) \
 	__PMC_EV(E500, DLFB_LOAD_MISS_CYCLES) \
 	__PMC_EV(E500, ILFB_FETCH_MISS_CYCLES) \
 	__PMC_EV(E500, EXT_INPU_INTR_LATENCY_CYCLES) \
 	__PMC_EV(E500, CRIT_INPUT_INTR_LATENCY_CYCLES) \
 	__PMC_EV(E500, EXT_INPUT_INTR_PENDING_LATENCY_CYCLES) \
 	__PMC_EV(E500, CRIT_INPUT_INTR_PENDING_LATENCY_CYCLES) \
 	__PMC_EV(E500, PMC0_OVERFLOW) \
 	__PMC_EV(E500, PMC1_OVERFLOW) \
 	__PMC_EV(E500, PMC2_OVERFLOW) \
 	__PMC_EV(E500, PMC3_OVERFLOW) \
 	__PMC_EV(E500, INTERRUPTS_TAKEN) \
 	__PMC_EV(E500, EXT_INPUT_INTR_TAKEN) \
 	__PMC_EV(E500, CRIT_INPUT_INTR_TAKEN) \
 	__PMC_EV(E500, SYSCALL_TRAP_INTR) \
 	__PMC_EV(E500, TLB_BIT_TRANSITIONS) \
 	__PMC_EV(E500, L2_LINEFILL_BUFFER) \
 	__PMC_EV(E500, LV2_VS) \
 	__PMC_EV(E500, CASTOUTS_RELEASED) \
 	__PMC_EV(E500, INTV_ALLOCATIONS) \
 	__PMC_EV(E500, DLFB_RETRIES_TO_MBAR) \
 	__PMC_EV(E500, STORE_RETRIES) \
 	__PMC_EV(E500, STASH_L1_HITS) \
 	__PMC_EV(E500, STASH_L2_HITS) \
 	__PMC_EV(E500, STASH_BUSY_1) \
 	__PMC_EV(E500, STASH_BUSY_2) \
 	__PMC_EV(E500, STASH_BUSY_3) \
 	__PMC_EV(E500, STASH_HITS) \
 	__PMC_EV(E500, STASH_HIT_DLFB) \
 	__PMC_EV(E500, STASH_REQUESTS) \
 	__PMC_EV(E500, STASH_REQUESTS_L1) \
 	__PMC_EV(E500, STASH_REQUESTS_L2) \
 	__PMC_EV(E500, STALLS_NO_CAQ_OR_COB) \
 	__PMC_EV(E500, L2_CACHE_ACCESSES) \
 	__PMC_EV(E500, L2_HIT_CACHE_ACCESSES) \
 	__PMC_EV(E500, L2_CACHE_DATA_ACCESSES) \
 	__PMC_EV(E500, L2_CACHE_DATA_HITS) \
 	__PMC_EV(E500, L2_CACHE_INSTR_ACCESSES) \
 	__PMC_EV(E500, L2_CACHE_INSTR_HITS) \
 	__PMC_EV(E500, L2_CACHE_ALLOCATIONS) \
 	__PMC_EV(E500, L2_CACHE_DATA_ALLOCATIONS) \
 	__PMC_EV(E500, L2_CACHE_DIRTY_DATA_ALLOCATIONS) \
 	__PMC_EV(E500, L2_CACHE_INSTR_ALLOCATIONS) \
 	__PMC_EV(E500, L2_CACHE_UPDATES) \
 	__PMC_EV(E500, L2_CACHE_CLEAN_UPDATES) \
 	__PMC_EV(E500, L2_CACHE_DIRTY_UPDATES) \
 	__PMC_EV(E500, L2_CACHE_CLEAN_REDUNDANT_UPDATES) \
 	__PMC_EV(E500, L2_CACHE_DIRTY_REDUNDANT_UPDATES) \
 	__PMC_EV(E500, L2_CACHE_LOCKS) \
 	__PMC_EV(E500, L2_CACHE_CASTOUTS) \
 	__PMC_EV(E500, L2_CACHE_DATA_DIRTY_HITS) \
 	__PMC_EV(E500, INSTR_LFB_WENT_HIGH_PRIORITY) \
 	__PMC_EV(E500, SNOOP_THROTTLING_TURNED_ON) \
 	__PMC_EV(E500, L2_CLEAN_LINE_INVALIDATIONS) \
 	__PMC_EV(E500, L2_INCOHERENT_LINE_INVALIDATIONS) \
 	__PMC_EV(E500, L2_COHERENT_LINE_INVALIDATIONS) \
 	__PMC_EV(E500, COHERENT_LOOKUP_MISS_DUE_TO_VALID_BUT_INCOHERENT_MATCHES) \
 	__PMC_EV(E500, IAC1S_DETECTED) \
 	__PMC_EV(E500, IAC2S_DETECTED) \
 	__PMC_EV(E500, DAC1S_DTECTED) \
 	__PMC_EV(E500, DAC2S_DTECTED) \
 	__PMC_EV(E500, DVT0_DETECTED) \
 	__PMC_EV(E500, DVT1_DETECTED) \
 	__PMC_EV(E500, DVT2_DETECTED) \
 	__PMC_EV(E500, DVT3_DETECTED) \
 	__PMC_EV(E500, DVT4_DETECTED) \
 	__PMC_EV(E500, DVT5_DETECTED) \
 	__PMC_EV(E500, DVT6_DETECTED) \
 	__PMC_EV(E500, DVT7_DETECTED) \
 	__PMC_EV(E500, CYCLES_COMPLETION_STALLED_NEXUS_FIFO_FULL) \
 	__PMC_EV(E500, FPU_DOUBLE_PUMP) \
 	__PMC_EV(E500, FPU_FINISH) \
 	__PMC_EV(E500, FPU_DIVIDE_CYCLES) \
 	__PMC_EV(E500, FPU_DENORM_INPUT_CYCLES) \
 	__PMC_EV(E500, FPU_RESULT_STALL_CYCLES) \
 	__PMC_EV(E500, FPU_FPSCR_FULL_STALL) \
 	__PMC_EV(E500, FPU_PIPE_SYNC_STALLS) \
 	__PMC_EV(E500, FPU_INPUT_DATA_STALLS) \
 	__PMC_EV(E500, DECORATED_LOADS) \
 	__PMC_EV(E500, DECORATED_STORES) \
 	__PMC_EV(E500, LOAD_RETRIES) \
 	__PMC_EV(E500, STWCX_SUCCESSES) \
 	__PMC_EV(E500, STWCX_FAILURES) \
 
 #define PMC_EV_E500_FIRST		PMC_EV_E500_CYCLES
 #define PMC_EV_E500_LAST		PMC_EV_E500_STWCX_FAILURES
 /*
  * All known PMC events.
  *
  * PMC event numbers are allocated sparsely to allow new PMC events to
  * be added to a PMC class without breaking ABI compatibility.  The
  * current allocation scheme is:
  *
  * START	#EVENTS		DESCRIPTION
  * 0		0x1000		Reserved
  * 0x1000	0x0001		TSC
- * 0x2000	0x0080		AMD K7 events
+ * 0x2000	0x0080		free (was AMD K7 events)
  * 0x2080	0x0100		AMD K8 events
  * 0x10000	0x0080		INTEL architectural fixed-function events
  * 0x10080	0x0F80		free (was INTEL architectural programmable events)
  * 0x11000	0x0080		free (was INTEL Pentium 4 events)
  * 0x11080	0x0080		free (was INTEL Pentium MMX events)
  * 0x11100	0x0100		free (was INTEL Pentium Pro/P-II/P-III/Pentium-M events)
  * 0x11200	0x00FF		free (was INTEL XScale events)
  * 0x11300	0x00FF		free (was MIPS 24K events)
  * 0x11400	0x00FF		free (was Octeon events)
  * 0x11500	0x00FF		free (was MIPS 74K events)
  * 0x11600	0x00FF		free (was BERI statcounters)
  * 0x13000	0x00FF		MPC7450 events
  * 0x13100	0x00FF		IBM PPC970 events
  * 0x13200	0x00FF		free (was IBM POWER8 events)
  * 0x13300	0x00FF		Freescale e500 events
  * 0x14000	0x0100		ARMv7 events
  * 0x14100	0x0400		ARMv8 events
  * 0x14500	0x0020		ARM DMC-620 clkdiv2 events
  * 0x14520	0x0080		ARM DMC-620 clk events
  * 0x14600	0x0100		ARM CMN-600 events
  * 0x20000	0x1000		Software events
  */
 #define	__PMC_EVENTS()					\
 	__PMC_EV_BLOCK(TSC,		0x01000)	\
 	__PMC_EV_TSC()					\
-	__PMC_EV_BLOCK(K7,		0x02000)	\
-	__PMC_EV_K7()					\
 	__PMC_EV_BLOCK(K8,		0x02080)	\
 	__PMC_EV_K8()					\
 	__PMC_EV_BLOCK(IAF,		0x10000)	\
 	__PMC_EV_IAF()					\
 	__PMC_EV_BLOCK(PPC7450,		0x13000)	\
 	__PMC_EV_PPC7450()				\
 	__PMC_EV_BLOCK(PPC970,		0x13100)	\
 	__PMC_EV_PPC970()				\
 	__PMC_EV_BLOCK(E500,		0x13300)	\
 	__PMC_EV_E500()					\
 	__PMC_EV_BLOCK(ARMV7,		0x14000)	\
 	__PMC_EV_ARMV7()				\
 	__PMC_EV_BLOCK(ARMV8,		0x14100)	\
 	__PMC_EV_ARMV8()				\
 	__PMC_EV_BLOCK(DMC620_PMU_CD2,	0x14500)	\
 	__PMC_EV_DMC620_PMU_CD2()			\
 	__PMC_EV_BLOCK(DMC620_PMU_C,	0x14520)	\
 	__PMC_EV_DMC620_PMU_C()				\
 	__PMC_EV_BLOCK(CMN600_PMU,	0x14600)	\
 	__PMC_EV_CMN600_PMU()
 
 #define	PMC_EVENT_FIRST	PMC_EV_TSC_TSC
 #define	PMC_EVENT_LAST	PMC_EV_SOFT_LAST
 
 #endif /* _DEV_HWPMC_PMC_EVENTS_H_ */
diff --git a/sys/sys/pmc.h b/sys/sys/pmc.h
index 714d8a7c65b7..5c0067121305 100644
--- a/sys/sys/pmc.h
+++ b/sys/sys/pmc.h
@@ -1,1240 +1,1238 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2003-2008, Joseph Koshy
  * Copyright (c) 2007 The FreeBSD Foundation
  * All rights reserved.
  *
  * Portions of this software were developed by A. Joseph Koshy under
  * sponsorship from the FreeBSD Foundation and Google, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #ifndef _SYS_PMC_H_
 #define	_SYS_PMC_H_
 
 #include <dev/hwpmc/pmc_events.h>
 #include <sys/proc.h>
 #include <sys/counter.h>
 #include <machine/pmc_mdep.h>
 #include <machine/profile.h>
 #ifdef _KERNEL
 #include <sys/epoch.h>
 #include <ck_queue.h>
 #endif
 
 #define	PMC_MODULE_NAME		"hwpmc"
 #define	PMC_NAME_MAX		64 /* HW counter name size */
 #define	PMC_CLASS_MAX		8  /* max #classes of PMCs per-system */
 
 /*
  * Kernel<->userland API version number [MMmmpppp]
  *
  * Major numbers are to be incremented when an incompatible change to
  * the ABI occurs that older clients will not be able to handle.
  *
  * Minor numbers are incremented when a backwards compatible change
  * occurs that allows older correct programs to run unchanged.  For
  * example, when support for a new PMC type is added.
  *
  * The patch version is incremented for every bug fix.
  */
 #define	PMC_VERSION_MAJOR	0x0A
 #define	PMC_VERSION_MINOR	0x00
 #define	PMC_VERSION_PATCH	0x0000
 
 #define	PMC_VERSION		(PMC_VERSION_MAJOR << 24 |		\
 	PMC_VERSION_MINOR << 16 | PMC_VERSION_PATCH)
 
 #define PMC_CPUID_LEN 64
 /* cpu model name for pmu lookup */
 extern char pmc_cpuid[PMC_CPUID_LEN];
 
 /*
  * Kinds of CPUs known.
  *
  * We keep track of CPU variants that need to be distinguished in
  * some way for PMC operations.  CPU names are grouped by manufacturer
  * and numbered sparsely in order to minimize changes to the ABI involved
  * when new CPUs are added.
  *
  * Please keep the pmc(3) manual page in sync with this list.
  */
 #define	__PMC_CPUS()								\
-    __PMC_CPU(AMD_K7,			0x00,	"AMD K7")			\
     __PMC_CPU(AMD_K8,			0x01,	"AMD K8")			\
     __PMC_CPU(INTEL_CORE,		0x87,	"Intel Core Solo/Duo")		\
     __PMC_CPU(INTEL_CORE2,		0x88,	"Intel Core2")			\
     __PMC_CPU(INTEL_CORE2EXTREME,	0x89,	"Intel Core2 Extreme")		\
     __PMC_CPU(INTEL_ATOM,		0x8A,	"Intel Atom")			\
     __PMC_CPU(INTEL_COREI7,		0x8B,	"Intel Core i7")		\
     __PMC_CPU(INTEL_WESTMERE,		0x8C,	"Intel Westmere")		\
     __PMC_CPU(INTEL_SANDYBRIDGE,	0x8D,	"Intel Sandy Bridge")		\
     __PMC_CPU(INTEL_IVYBRIDGE,		0x8E,	"Intel Ivy Bridge")		\
     __PMC_CPU(INTEL_SANDYBRIDGE_XEON,	0x8F,	"Intel Sandy Bridge Xeon")	\
     __PMC_CPU(INTEL_IVYBRIDGE_XEON,	0x90,	"Intel Ivy Bridge Xeon")	\
     __PMC_CPU(INTEL_HASWELL,		0x91,	"Intel Haswell")		\
     __PMC_CPU(INTEL_ATOM_SILVERMONT,	0x92,	"Intel Atom Silvermont")	\
     __PMC_CPU(INTEL_NEHALEM_EX,		0x93,	"Intel Nehalem Xeon 7500")	\
     __PMC_CPU(INTEL_WESTMERE_EX,	0x94,	"Intel Westmere Xeon E7")	\
     __PMC_CPU(INTEL_HASWELL_XEON,	0x95,	"Intel Haswell Xeon E5 v3")	\
     __PMC_CPU(INTEL_BROADWELL,		0x96,	"Intel Broadwell")		\
     __PMC_CPU(INTEL_BROADWELL_XEON,	0x97,	"Intel Broadwell Xeon")		\
     __PMC_CPU(INTEL_SKYLAKE,		0x98,	"Intel Skylake")		\
     __PMC_CPU(INTEL_SKYLAKE_XEON,	0x99,	"Intel Skylake Xeon")		\
     __PMC_CPU(INTEL_ATOM_GOLDMONT,	0x9A,	"Intel Atom Goldmont")		\
     __PMC_CPU(INTEL_ICELAKE,		0x9B,	"Intel Icelake")		\
     __PMC_CPU(INTEL_ICELAKE_XEON,	0x9C,	"Intel Icelake Xeon")		\
     __PMC_CPU(INTEL_ALDERLAKE,		0x9D,	"Intel Alderlake")		\
     __PMC_CPU(INTEL_ATOM_GOLDMONT_P,	0x9E,	"Intel Atom Goldmont Plus")	\
     __PMC_CPU(INTEL_ATOM_TREMONT,	0x9F,	"Intel Atom Tremont")		\
     __PMC_CPU(INTEL_XSCALE,		0x100,	"Intel XScale")			\
     __PMC_CPU(PPC_7450,			0x300,	"PowerPC MPC7450")		\
     __PMC_CPU(PPC_E500,			0x340,	"PowerPC e500 Core")		\
     __PMC_CPU(PPC_970,			0x380,	"IBM PowerPC 970")		\
     __PMC_CPU(PPC_POWER8,		0x390,	"IBM POWER8")			\
     __PMC_CPU(GENERIC,			0x400,	"Generic")			\
     __PMC_CPU(ARMV7_CORTEX_A5,		0x500,	"ARMv7 Cortex A5")		\
     __PMC_CPU(ARMV7_CORTEX_A7,		0x501,	"ARMv7 Cortex A7")		\
     __PMC_CPU(ARMV7_CORTEX_A8,		0x502,	"ARMv7 Cortex A8")		\
     __PMC_CPU(ARMV7_CORTEX_A9,		0x503,	"ARMv7 Cortex A9")		\
     __PMC_CPU(ARMV7_CORTEX_A15,		0x504,	"ARMv7 Cortex A15")		\
     __PMC_CPU(ARMV7_CORTEX_A17,		0x505,	"ARMv7 Cortex A17")		\
     __PMC_CPU(ARMV8_CORTEX_A53,		0x600,	"ARMv8 Cortex A53")		\
     __PMC_CPU(ARMV8_CORTEX_A57,		0x601,	"ARMv8 Cortex A57")		\
     __PMC_CPU(ARMV8_CORTEX_A76,		0x602,	"ARMv8 Cortex A76")
 
 enum pmc_cputype {
 #undef	__PMC_CPU
 #define	__PMC_CPU(S,V,D)	PMC_CPU_##S = V,
 	__PMC_CPUS()
 };
 
-#define	PMC_CPU_FIRST	PMC_CPU_AMD_K7
+#define	PMC_CPU_FIRST	PMC_CPU_AMD_K8
 #define	PMC_CPU_LAST	PMC_CPU_ARMV8_CORTEX_A76
 
 /*
  * Classes of PMCs
  */
 #define	__PMC_CLASSES()								\
     __PMC_CLASS(TSC,		0x00,	"CPU Timestamp counter")		\
-    __PMC_CLASS(K7,		0x01,	"AMD K7 performance counters")		\
     __PMC_CLASS(K8,		0x02,	"AMD K8 performance counters")		\
     __PMC_CLASS(IAF,		0x06,	"Intel Core2/Atom, fixed function")	\
     __PMC_CLASS(IAP,		0x07,	"Intel Core...Atom, programmable")	\
     __PMC_CLASS(UCF,		0x08,	"Intel Uncore fixed function")		\
     __PMC_CLASS(UCP,		0x09,	"Intel Uncore programmable")		\
     __PMC_CLASS(XSCALE,		0x0A,	"Intel XScale counters")		\
     __PMC_CLASS(PPC7450,	0x0D,	"Motorola MPC7450 class")		\
     __PMC_CLASS(PPC970,		0x0E,	"IBM PowerPC 970 class")		\
     __PMC_CLASS(SOFT,		0x0F,	"Software events")			\
     __PMC_CLASS(ARMV7,		0x10,	"ARMv7")				\
     __PMC_CLASS(ARMV8,		0x11,	"ARMv8")				\
     __PMC_CLASS(E500,		0x13,	"Freescale e500 class")			\
     __PMC_CLASS(POWER8,		0x15,	"IBM POWER8 class")			\
     __PMC_CLASS(DMC620_PMU_CD2,	0x16,	"ARM DMC620 Memory Controller PMU CLKDIV2") \
     __PMC_CLASS(DMC620_PMU_C,	0x17,	"ARM DMC620 Memory Controller PMU CLK")	\
     __PMC_CLASS(CMN600_PMU,	0x18,	"Arm CoreLink CMN600 Coherent Mesh Network PMU")
 
 enum pmc_class {
 #undef  __PMC_CLASS
 #define	__PMC_CLASS(S,V,D)	PMC_CLASS_##S = V,
 	__PMC_CLASSES()
 };
 
 #define	PMC_CLASS_FIRST	PMC_CLASS_TSC
 #define	PMC_CLASS_LAST	PMC_CLASS_CMN600_PMU
 
 /*
  * A PMC can be in the following states:
  *
  * Hardware states:
  *   DISABLED   -- administratively prohibited from being used.
  *   FREE       -- HW available for use
  * Software states:
  *   ALLOCATED  -- allocated
  *   STOPPED    -- allocated, but not counting events
  *   RUNNING    -- allocated, and in operation; 'pm_runcount'
  *                 holds the number of CPUs using this PMC at
  *                 a given instant
  *   DELETED    -- being destroyed
  */
 
 #define	__PMC_HWSTATES()			\
 	__PMC_STATE(DISABLED)			\
 	__PMC_STATE(FREE)
 
 #define	__PMC_SWSTATES()			\
 	__PMC_STATE(ALLOCATED)			\
 	__PMC_STATE(STOPPED)			\
 	__PMC_STATE(RUNNING)			\
 	__PMC_STATE(DELETED)
 
 #define	__PMC_STATES()				\
 	__PMC_HWSTATES()			\
 	__PMC_SWSTATES()
 
 enum pmc_state {
 #undef	__PMC_STATE
 #define	__PMC_STATE(S)	PMC_STATE_##S,
 	__PMC_STATES()
 	__PMC_STATE(MAX)
 };
 
 #define	PMC_STATE_FIRST	PMC_STATE_DISABLED
 #define	PMC_STATE_LAST	PMC_STATE_DELETED
 
 /*
  * An allocated PMC may used as a 'global' counter or as a
  * 'thread-private' one.  Each such mode of use can be in either
  * statistical sampling mode or in counting mode.  Thus a PMC in use
  *
  * SS i.e., SYSTEM STATISTICAL  -- system-wide statistical profiling
  * SC i.e., SYSTEM COUNTER      -- system-wide counting mode
  * TS i.e., THREAD STATISTICAL  -- thread virtual, statistical profiling
  * TC i.e., THREAD COUNTER      -- thread virtual, counting mode
  *
  * Statistical profiling modes rely on the PMC periodically delivering
  * a interrupt to the CPU (when the configured number of events have
  * been measured), so the PMC must have the ability to generate
  * interrupts.
  *
  * In counting modes, the PMC counts its configured events, with the
  * value of the PMC being read whenever needed by its owner process.
  *
  * The thread specific modes "virtualize" the PMCs -- the PMCs appear
  * to be thread private and count events only when the profiled thread
  * actually executes on the CPU.
  *
  * The system-wide "global" modes keep the PMCs running all the time
  * and are used to measure the behaviour of the whole system.
  */
 
 #define	__PMC_MODES()				\
 	__PMC_MODE(SS,	0)			\
 	__PMC_MODE(SC,	1)			\
 	__PMC_MODE(TS,	2)			\
 	__PMC_MODE(TC,	3)
 
 enum pmc_mode {
 #undef	__PMC_MODE
 #define	__PMC_MODE(M,N)	PMC_MODE_##M = N,
 	__PMC_MODES()
 };
 
 #define	PMC_MODE_FIRST	PMC_MODE_SS
 #define	PMC_MODE_LAST	PMC_MODE_TC
 
 #define	PMC_IS_COUNTING_MODE(mode)				\
 	((mode) == PMC_MODE_SC || (mode) == PMC_MODE_TC)
 #define	PMC_IS_SYSTEM_MODE(mode)				\
 	((mode) == PMC_MODE_SS || (mode) == PMC_MODE_SC)
 #define	PMC_IS_SAMPLING_MODE(mode)				\
 	((mode) == PMC_MODE_SS || (mode) == PMC_MODE_TS)
 #define	PMC_IS_VIRTUAL_MODE(mode)				\
 	((mode) == PMC_MODE_TS || (mode) == PMC_MODE_TC)
 
 /*
  * PMC row disposition
  */
 
 #define	__PMC_DISPOSITIONS(N)					\
 	__PMC_DISP(STANDALONE)	/* global/disabled counters */	\
 	__PMC_DISP(FREE)	/* free/available */		\
 	__PMC_DISP(THREAD)	/* thread-virtual PMCs */	\
 	__PMC_DISP(UNKNOWN)	/* sentinel */
 
 enum pmc_disp {
 #undef	__PMC_DISP
 #define	__PMC_DISP(D)	PMC_DISP_##D ,
 	__PMC_DISPOSITIONS()
 };
 
 #define	PMC_DISP_FIRST	PMC_DISP_STANDALONE
 #define	PMC_DISP_LAST	PMC_DISP_THREAD
 
 /*
  * Counter capabilities
  *
  * __PMC_CAPS(NAME, VALUE, DESCRIPTION)
  */
 
 #define	__PMC_CAPS()							\
 	__PMC_CAP(INTERRUPT,	0, "generate interrupts")		\
 	__PMC_CAP(USER,		1, "count user-mode events")		\
 	__PMC_CAP(SYSTEM,	2, "count system-mode events")		\
 	__PMC_CAP(EDGE,		3, "do edge detection of events")	\
 	__PMC_CAP(THRESHOLD,	4, "ignore events below a threshold")	\
 	__PMC_CAP(READ,		5, "read PMC counter")			\
 	__PMC_CAP(WRITE,	6, "reprogram PMC counter")		\
 	__PMC_CAP(INVERT,	7, "invert comparison sense")		\
 	__PMC_CAP(QUALIFIER,	8, "further qualify monitored events")	\
 	__PMC_CAP(PRECISE,	9, "perform precise sampling")		\
 	__PMC_CAP(TAGGING,	10, "tag upstream events")		\
 	__PMC_CAP(CASCADE,	11, "cascade counters")			\
 	__PMC_CAP(SYSWIDE,	12, "system wide counter")		\
 	__PMC_CAP(DOMWIDE,	13, "NUMA domain wide counter")
 
 enum pmc_caps
 {
 #undef	__PMC_CAP
 #define	__PMC_CAP(NAME, VALUE, DESCR)	PMC_CAP_##NAME = (1 << VALUE) ,
 	__PMC_CAPS()
 };
 
 #define	PMC_CAP_FIRST		PMC_CAP_INTERRUPT
 #define	PMC_CAP_LAST		PMC_CAP_DOMWIDE
 
 /*
  * PMC Event Numbers
  *
  * These are generated from the definitions in "dev/hwpmc/pmc_events.h".
  */
 
 enum pmc_event {
 #undef	__PMC_EV
 #undef	__PMC_EV_BLOCK
 #define	__PMC_EV_BLOCK(C,V)	PMC_EV_ ## C ## __BLOCK_START = (V) - 1 ,
 #define	__PMC_EV(C,N)		PMC_EV_ ## C ## _ ## N ,
 	__PMC_EVENTS()
 };
 
 /*
  * PMC SYSCALL INTERFACE
  */
 
 /*
  * "PMC_OPS" -- these are the commands recognized by the kernel
  * module, and are used when performing a system call from userland.
  */
 #define	__PMC_OPS()							\
 	__PMC_OP(CONFIGURELOG, "Set log file")				\
 	__PMC_OP(FLUSHLOG, "Flush log file")				\
 	__PMC_OP(GETCPUINFO, "Get system CPU information")		\
 	__PMC_OP(GETDRIVERSTATS, "Get driver statistics")		\
 	__PMC_OP(GETMODULEVERSION, "Get module version")		\
 	__PMC_OP(GETPMCINFO, "Get per-cpu PMC information")		\
 	__PMC_OP(PMCADMIN, "Set PMC state")				\
 	__PMC_OP(PMCALLOCATE, "Allocate and configure a PMC")		\
 	__PMC_OP(PMCATTACH, "Attach a PMC to a process")		\
 	__PMC_OP(PMCDETACH, "Detach a PMC from a process")		\
 	__PMC_OP(PMCGETMSR, "Get a PMC's hardware address")		\
 	__PMC_OP(PMCRELEASE, "Release a PMC")				\
 	__PMC_OP(PMCRW, "Read/Set a PMC")				\
 	__PMC_OP(PMCSETCOUNT, "Set initial count/sampling rate")	\
 	__PMC_OP(PMCSTART, "Start a PMC")				\
 	__PMC_OP(PMCSTOP, "Stop a PMC")					\
 	__PMC_OP(WRITELOG, "Write a cookie to the log file")		\
 	__PMC_OP(CLOSELOG, "Close log file")				\
 	__PMC_OP(GETDYNEVENTINFO, "Get dynamic events list")
 
 enum pmc_ops {
 #undef	__PMC_OP
 #define	__PMC_OP(N, D)	PMC_OP_##N,
 	__PMC_OPS()
 };
 
 /*
  * Flags used in operations on PMCs.
  */
 
 #define	PMC_F_UNUSED1		0x00000001 /* unused */
 #define	PMC_F_DESCENDANTS	0x00000002 /*OP ALLOCATE track descendants */
 #define	PMC_F_LOG_PROCCSW	0x00000004 /*OP ALLOCATE track ctx switches */
 #define	PMC_F_LOG_PROCEXIT	0x00000008 /*OP ALLOCATE log proc exits */
 #define	PMC_F_NEWVALUE		0x00000010 /*OP RW write new value */
 #define	PMC_F_OLDVALUE		0x00000020 /*OP RW get old value */
 
 /* V2 API */
 #define	PMC_F_CALLCHAIN		0x00000080 /*OP ALLOCATE capture callchains */
 #define	PMC_F_USERCALLCHAIN	0x00000100 /*OP ALLOCATE use userspace stack */
 
 /* V10 API */
 #define	PMC_F_EV_PMU		0x00000200 /*
 					    * OP ALLOCATE: pm_ev has special
 					    * userspace meaning; counter
 					    * configuration is communicated
 					    * through class-dependent fields
 					    */
 
 /* internal flags */
 #define	PMC_F_ATTACHED_TO_OWNER	0x00010000 /*attached to owner*/
 #define	PMC_F_NEEDS_LOGFILE	0x00020000 /*needs log file */
 #define	PMC_F_ATTACH_DONE	0x00040000 /*attached at least once */
 
 #define	PMC_CALLCHAIN_DEPTH_MAX	512
 
 #define	PMC_CC_F_USERSPACE	0x01	   /*userspace callchain*/
 
 /*
  * Cookies used to denote allocated PMCs, and the values of PMCs.
  */
 
 typedef uint32_t	pmc_id_t;
 typedef uint64_t	pmc_value_t;
 
 #define	PMC_ID_INVALID		(~ (pmc_id_t) 0)
 
 /*
  * PMC IDs have the following format:
  *
  * +-----------------------+-------+-----------+
  * |   CPU      | PMC MODE | CLASS | ROW INDEX |
  * +-----------------------+-------+-----------+
  *
  * where CPU is 12 bits, MODE 4, CLASS 8, and ROW INDEX 8  Field 'CPU'
  * is set to the requested CPU for system-wide PMCs or PMC_CPU_ANY for
  * process-mode PMCs.  Field 'PMC MODE' is the allocated PMC mode.
  * Field 'PMC CLASS' is the class of the PMC.  Field 'ROW INDEX' is the
  * row index for the PMC.
  *
  * The 'ROW INDEX' ranges over 0..NWPMCS where NHWPMCS is the total
  * number of hardware PMCs on this cpu.
  */
 
 #define	PMC_ID_TO_ROWINDEX(ID)	((ID) & 0xFF)
 #define	PMC_ID_TO_CLASS(ID)	(((ID) & 0xFF00) >> 8)
 #define	PMC_ID_TO_MODE(ID)	(((ID) & 0xF0000) >> 16)
 #define	PMC_ID_TO_CPU(ID)	(((ID) & 0xFFF00000) >> 20)
 #define	PMC_ID_MAKE_ID(CPU,MODE,CLASS,ROWINDEX)			\
 	((((CPU) & 0xFFF) << 20) | (((MODE) & 0xF) << 16) |	\
 	(((CLASS) & 0xFF) << 8) | ((ROWINDEX) & 0xFF))
 
 /*
  * Data structures for system calls supported by the pmc driver.
  */
 
 /*
  * OP PMCALLOCATE
  *
  * Allocate a PMC on the named CPU.
  */
 
 #define	PMC_CPU_ANY	~0
 
 struct pmc_op_pmcallocate {
 	uint32_t	pm_caps;	/* PMC_CAP_* */
 	uint32_t	pm_cpu;		/* CPU number or PMC_CPU_ANY */
 	enum pmc_class	pm_class;	/* class of PMC desired */
 	enum pmc_event	pm_ev;		/* [enum pmc_event] desired */
 	uint32_t	pm_flags;	/* additional modifiers PMC_F_* */
 	enum pmc_mode	pm_mode;	/* desired mode */
 	pmc_id_t	pm_pmcid;	/* [return] process pmc id */
 	pmc_value_t	pm_count;	/* initial/sample count */
 
 	union pmc_md_op_pmcallocate pm_md; /* MD layer extensions */
 };
 
 /*
  * OP PMCADMIN
  *
  * Set the administrative state (i.e., whether enabled or disabled) of
  * a PMC 'pm_pmc' on CPU 'pm_cpu'.  Note that 'pm_pmc' specifies an
  * absolute PMC number and need not have been first allocated by the
  * calling process.
  */
 
 struct pmc_op_pmcadmin {
 	int		pm_cpu;		/* CPU# */
 	uint32_t	pm_flags;	/* flags */
 	int		pm_pmc;         /* PMC# */
 	enum pmc_state  pm_state;	/* desired state */
 };
 
 /*
  * OP PMCATTACH / OP PMCDETACH
  *
  * Attach/detach a PMC and a process.
  */
 
 struct pmc_op_pmcattach {
 	pmc_id_t	pm_pmc;		/* PMC to attach to */
 	pid_t		pm_pid;		/* target process */
 };
 
 /*
  * OP PMCSETCOUNT
  *
  * Set the sampling rate (i.e., the reload count) for statistical counters.
  * 'pm_pmcid' need to have been previously allocated using PMCALLOCATE.
  */
 
 struct pmc_op_pmcsetcount {
 	pmc_value_t	pm_count;	/* initial/sample count */
 	pmc_id_t	pm_pmcid;	/* PMC id to set */
 };
 
 /*
  * OP PMCRW
  *
  * Read the value of a PMC named by 'pm_pmcid'.  'pm_pmcid' needs
  * to have been previously allocated using PMCALLOCATE.
  */
 
 struct pmc_op_pmcrw {
 	uint32_t	pm_flags;	/* PMC_F_{OLD,NEW}VALUE*/
 	pmc_id_t	pm_pmcid;	/* pmc id */
 	pmc_value_t	pm_value;	/* new&returned value */
 };
 
 /*
  * OP GETPMCINFO
  *
  * retrieve PMC state for a named CPU.  The caller is expected to
  * allocate 'npmc' * 'struct pmc_info' bytes of space for the return
  * values.
  */
 
 struct pmc_info {
 	char		pm_name[PMC_NAME_MAX]; /* pmc name */
 	enum pmc_class	pm_class;	/* enum pmc_class */
 	int		pm_enabled;	/* whether enabled */
 	enum pmc_disp	pm_rowdisp;	/* FREE, THREAD or STANDLONE */
 	pid_t		pm_ownerpid;	/* owner, or -1 */
 	enum pmc_mode	pm_mode;	/* current mode [enum pmc_mode] */
 	enum pmc_event	pm_event;	/* current event */
 	uint32_t	pm_flags;	/* current flags */
 	pmc_value_t	pm_reloadcount;	/* sampling counters only */
 };
 
 struct pmc_op_getpmcinfo {
 	int32_t		pm_cpu;		/* 0 <= cpu < mp_maxid */
 	struct pmc_info	pm_pmcs[];	/* space for 'npmc' structures */
 };
 
 /*
  * OP GETCPUINFO
  *
  * Retrieve system CPU information.
  */
 
 struct pmc_classinfo {
 	enum pmc_class	pm_class;	/* class id */
 	uint32_t	pm_caps;	/* counter capabilities */
 	uint32_t	pm_width;	/* width of the PMC */
 	uint32_t	pm_num;		/* number of PMCs in class */
 };
 
 struct pmc_op_getcpuinfo {
 	enum pmc_cputype pm_cputype; /* what kind of CPU */
 	uint32_t	pm_ncpu;    /* max CPU number */
 	uint32_t	pm_npmc;    /* #PMCs per CPU */
 	uint32_t	pm_nclass;  /* #classes of PMCs */
 	struct pmc_classinfo  pm_classes[PMC_CLASS_MAX];
 };
 
 /*
  * OP CONFIGURELOG
  *
  * Configure a log file for writing system-wide statistics to.
  */
 
 struct pmc_op_configurelog {
 	int		pm_flags;
 	int		pm_logfd;   /* logfile fd (or -1) */
 };
 
 /*
  * OP GETDRIVERSTATS
  *
  * Retrieve pmc(4) driver-wide statistics.
  */
 #ifdef _KERNEL
 struct pmc_driverstats {
 	counter_u64_t	pm_intr_ignored;	/* #interrupts ignored */
 	counter_u64_t	pm_intr_processed;	/* #interrupts processed */
 	counter_u64_t	pm_intr_bufferfull;	/* #interrupts with ENOSPC */
 	counter_u64_t	pm_syscalls;		/* #syscalls */
 	counter_u64_t	pm_syscall_errors;	/* #syscalls with errors */
 	counter_u64_t	pm_buffer_requests;	/* #buffer requests */
 	counter_u64_t	pm_buffer_requests_failed; /* #failed buffer requests */
 	counter_u64_t	pm_log_sweeps;		/* #sample buffer processing
 						   passes */
 	counter_u64_t	pm_merges;		/* merged k+u */
 	counter_u64_t	pm_overwrites;		/* UR overwrites */
 };
 #endif
 
 struct pmc_op_getdriverstats {
 	unsigned int	pm_intr_ignored;	/* #interrupts ignored */
 	unsigned int	pm_intr_processed;	/* #interrupts processed */
 	unsigned int	pm_intr_bufferfull;	/* #interrupts with ENOSPC */
 	unsigned int	pm_syscalls;		/* #syscalls */
 	unsigned int	pm_syscall_errors;	/* #syscalls with errors */
 	unsigned int	pm_buffer_requests;	/* #buffer requests */
 	unsigned int	pm_buffer_requests_failed; /* #failed buffer requests */
 	unsigned int	pm_log_sweeps;		/* #sample buffer processing
 						   passes */
 };
 
 /*
  * OP RELEASE / OP START / OP STOP
  *
  * Simple operations on a PMC id.
  */
 
 struct pmc_op_simple {
 	pmc_id_t	pm_pmcid;
 };
 
 /*
  * OP WRITELOG
  *
  * Flush the current log buffer and write 4 bytes of user data to it.
  */
 
 struct pmc_op_writelog {
 	uint32_t	pm_userdata;
 };
 
 /*
  * OP GETMSR
  *
  * Retrieve the machine specific address associated with the allocated
  * PMC.  This number can be used subsequently with a read-performance-counter
  * instruction.
  */
 
 struct pmc_op_getmsr {
 	uint32_t	pm_msr;		/* machine specific address */
 	pmc_id_t	pm_pmcid;	/* allocated pmc id */
 };
 
 /*
  * OP GETDYNEVENTINFO
  *
  * Retrieve a PMC dynamic class events list.
  */
 
 struct pmc_dyn_event_descr {
 	char		pm_ev_name[PMC_NAME_MAX];
 	enum pmc_event	pm_ev_code;
 };
 
 struct pmc_op_getdyneventinfo {
 	enum pmc_class			pm_class;
 	unsigned int			pm_nevent;
 	struct pmc_dyn_event_descr	pm_events[PMC_EV_DYN_COUNT];
 };
 
 #ifdef _KERNEL
 
 #include <sys/malloc.h>
 #include <sys/sysctl.h>
 #include <sys/_cpuset.h>
 
 #include <machine/frame.h>
 
 #define	PMC_HASH_SIZE				1024
 #define	PMC_MTXPOOL_SIZE			2048
 #define	PMC_LOG_BUFFER_SIZE			256
 #define	PMC_NLOGBUFFERS_PCPU			32
 #define	PMC_NSAMPLES				256
 #define	PMC_CALLCHAIN_DEPTH			128
 #define	PMC_THREADLIST_MAX			128
 
 #define PMC_SYSCTL_NAME_PREFIX "kern." PMC_MODULE_NAME "."
 
 /*
  * Locking keys
  *
  * (b) - pmc_bufferlist_mtx (spin lock)
  * (k) - pmc_kthread_mtx (sleep lock)
  * (o) - po->po_mtx (spin lock)
  * (g) - global_epoch_preempt (epoch)
  * (p) - pmc_sx (sx)
  */
 
 /*
  * PMC commands
  */
 
 struct pmc_syscall_args {
 	register_t	pmop_code;	/* one of PMC_OP_* */
 	void		*pmop_data;	/* syscall parameter */
 };
 
 /*
  * Interface to processor specific s1tuff
  */
 
 /*
  * struct pmc_descr
  *
  * Machine independent (i.e., the common parts) of a human readable
  * PMC description.
  */
 
 struct pmc_descr {
 	char		pd_name[PMC_NAME_MAX]; /* name */
 	uint32_t	pd_caps;	/* capabilities */
 	enum pmc_class	pd_class;	/* class of the PMC */
 	uint32_t	pd_width;	/* width in bits */
 };
 
 /*
  * struct pmc_target
  *
  * This structure records all the target processes associated with a
  * PMC.
  */
 
 struct pmc_target {
 	LIST_ENTRY(pmc_target)	pt_next;
 	struct pmc_process	*pt_process; /* target descriptor */
 };
 
 /*
  * struct pmc
  *
  * Describes each allocated PMC.
  *
  * Each PMC has precisely one owner, namely the process that allocated
  * the PMC.
  *
  * A PMC may be attached to multiple target processes.  The
  * 'pm_targets' field links all the target processes being monitored
  * by this PMC.
  *
  * The 'pm_savedvalue' field is protected by a mutex.
  *
  * On a multi-cpu machine, multiple target threads associated with a
  * process-virtual PMC could be concurrently executing on different
  * CPUs.  The 'pm_runcount' field is atomically incremented every time
  * the PMC gets scheduled on a CPU and atomically decremented when it
  * get descheduled.  Deletion of a PMC is only permitted when this
  * field is '0'.
  *
  */
 struct pmc_pcpu_state {
 	uint32_t pps_overflowcnt;	/* count overflow interrupts */
 	uint8_t pps_stalled;
 	uint8_t pps_cpustate;
 } __aligned(CACHE_LINE_SIZE);
 struct pmc {
 	LIST_HEAD(,pmc_target)	pm_targets;	/* list of target processes */
 	LIST_ENTRY(pmc)		pm_next;	/* owner's list */
 
 	/*
 	 * System-wide PMCs are allocated on a CPU and are not moved
 	 * around.  For system-wide PMCs we record the CPU the PMC was
 	 * allocated on in the 'CPU' field of the pmc ID.
 	 *
 	 * Virtual PMCs run on whichever CPU is currently executing
 	 * their targets' threads.  For these PMCs we need to save
 	 * their current PMC counter values when they are taken off
 	 * CPU.
 	 */
 
 	union {
 		pmc_value_t	pm_savedvalue;	/* Virtual PMCS */
 	} pm_gv;
 
 	/*
 	 * For sampling mode PMCs, we keep track of the PMC's "reload
 	 * count", which is the counter value to be loaded in when
 	 * arming the PMC for the next counting session.  For counting
 	 * modes on PMCs that are read-only (e.g., the x86 TSC), we
 	 * keep track of the initial value at the start of
 	 * counting-mode operation.
 	 */
 
 	union {
 		pmc_value_t	pm_reloadcount;	/* sampling PMC modes */
 		pmc_value_t	pm_initial;	/* counting PMC modes */
 	} pm_sc;
 
 	struct pmc_pcpu_state *pm_pcpu_state;
 	volatile cpuset_t pm_cpustate;	/* CPUs where PMC should be active */
 	uint32_t	pm_caps;	/* PMC capabilities */
 	enum pmc_event	pm_event;	/* event being measured */
 	uint32_t	pm_flags;	/* additional flags PMC_F_... */
 	struct pmc_owner *pm_owner;	/* owner thread state */
 	counter_u64_t		pm_runcount;	/* #cpus currently on */
 	enum pmc_state	pm_state;	/* current PMC state */
 
 	/*
 	 * The PMC ID field encodes the row-index for the PMC, its
 	 * mode, class and the CPU# associated with the PMC.
 	 */
 
 	pmc_id_t	pm_id;		/* allocated PMC id */
 	enum pmc_class pm_class;
 
 	/* md extensions */
 	union pmc_md_pmc	pm_md;
 };
 
 /*
  * Accessor macros for 'struct pmc'
  */
 
 #define	PMC_TO_MODE(P)		PMC_ID_TO_MODE((P)->pm_id)
 #define	PMC_TO_CLASS(P)		PMC_ID_TO_CLASS((P)->pm_id)
 #define	PMC_TO_ROWINDEX(P)	PMC_ID_TO_ROWINDEX((P)->pm_id)
 #define	PMC_TO_CPU(P)		PMC_ID_TO_CPU((P)->pm_id)
 
 /*
  * struct pmc_threadpmcstate
  *
  * Record per-PMC, per-thread state.
  */
 struct pmc_threadpmcstate {
 	pmc_value_t	pt_pmcval;	/* per-thread reload count */
 };
 
 /*
  * struct pmc_thread
  *
  * Record a 'target' thread being profiled.
  */
 struct pmc_thread {
 	LIST_ENTRY(pmc_thread) pt_next;		/* linked list */
 	struct thread	*pt_td;			/* target thread */
 	struct pmc_threadpmcstate pt_pmcs[];	/* per-PMC state */
 };
 
 /*
  * struct pmc_process
  *
  * Record a 'target' process being profiled.
  *
  * The target process being profiled could be different from the owner
  * process which allocated the PMCs.  Each target process descriptor
  * is associated with NHWPMC 'struct pmc *' pointers.  Each PMC at a
  * given hardware row-index 'n' will use slot 'n' of the 'pp_pmcs[]'
  * array.  The size of this structure is thus PMC architecture
  * dependent.
  *
  */
 
 struct pmc_targetstate {
 	struct pmc	*pp_pmc;   /* target PMC */
 	pmc_value_t	pp_pmcval; /* per-process value */
 };
 
 struct pmc_process {
 	LIST_ENTRY(pmc_process) pp_next;	/* hash chain */
 	LIST_HEAD(,pmc_thread) pp_tds;		/* list of threads */
 	struct mtx	*pp_tdslock;		/* lock on pp_tds thread list */
 	int		pp_refcnt;		/* reference count */
 	uint32_t	pp_flags;		/* flags PMC_PP_* */
 	struct proc	*pp_proc;		/* target process */
 	struct pmc_targetstate pp_pmcs[];       /* NHWPMCs */
 };
 
 #define	PMC_PP_ENABLE_MSR_ACCESS	0x00000001
 
 /*
  * struct pmc_owner
  *
  * We associate a PMC with an 'owner' process.
  *
  * A process can be associated with 0..NCPUS*NHWPMC PMCs during its
  * lifetime, where NCPUS is the numbers of CPUS in the system and
  * NHWPMC is the number of hardware PMCs per CPU.  These are
  * maintained in the list headed by the 'po_pmcs' to save on space.
  *
  */
 
 struct pmc_owner  {
 	LIST_ENTRY(pmc_owner)	po_next;	/* hash chain */
 	CK_LIST_ENTRY(pmc_owner)	po_ssnext;	/* (g/p) list of SS PMC owners */
 	LIST_HEAD(, pmc)	po_pmcs;	/* owned PMC list */
 	TAILQ_HEAD(, pmclog_buffer) po_logbuffers; /* (o) logbuffer list */
 	struct mtx		po_mtx;		/* spin lock for (o) */
 	struct proc		*po_owner;	/* owner proc */
 	uint32_t		po_flags;	/* (k) flags PMC_PO_* */
 	struct proc		*po_kthread;	/* (k) helper kthread */
 	struct file		*po_file;	/* file reference */
 	int			po_error;	/* recorded error */
 	short			po_sscount;	/* # SS PMCs owned */
 	short			po_logprocmaps;	/* global mappings done */
 	struct pmclog_buffer	*po_curbuf[MAXCPU];	/* current log buffer */
 };
 
 #define	PMC_PO_OWNS_LOGFILE		0x00000001 /* has a log file */
 #define	PMC_PO_SHUTDOWN			0x00000010 /* in the process of shutdown */
 #define	PMC_PO_INITIAL_MAPPINGS_DONE	0x00000020
 
 /*
  * struct pmc_hw -- describe the state of the PMC hardware
  *
  * When in use, a HW PMC is associated with one allocated 'struct pmc'
  * pointed to by field 'phw_pmc'.  When inactive, this field is NULL.
  *
  * On an SMP box, one or more HW PMC's in process virtual mode with
  * the same 'phw_pmc' could be executing on different CPUs.  In order
  * to handle this case correctly, we need to ensure that only
  * incremental counts get added to the saved value in the associated
  * 'struct pmc'.  The 'phw_save' field is used to keep the saved PMC
  * value at the time the hardware is started during this context
  * switch (i.e., the difference between the new (hardware) count and
  * the saved count is atomically added to the count field in 'struct
  * pmc' at context switch time).
  *
  */
 
 struct pmc_hw {
 	uint32_t	phw_state;	/* see PHW_* macros below */
 	struct pmc	*phw_pmc;	/* current thread PMC */
 };
 
 #define	PMC_PHW_RI_MASK		0x000000FF
 #define	PMC_PHW_CPU_SHIFT	8
 #define	PMC_PHW_CPU_MASK	0x0000FF00
 #define	PMC_PHW_FLAGS_SHIFT	16
 #define	PMC_PHW_FLAGS_MASK	0xFFFF0000
 
 #define	PMC_PHW_INDEX_TO_STATE(ri)	((ri) & PMC_PHW_RI_MASK)
 #define	PMC_PHW_STATE_TO_INDEX(state)	((state) & PMC_PHW_RI_MASK)
 #define	PMC_PHW_CPU_TO_STATE(cpu)	(((cpu) << PMC_PHW_CPU_SHIFT) & \
 	PMC_PHW_CPU_MASK)
 #define	PMC_PHW_STATE_TO_CPU(state)	(((state) & PMC_PHW_CPU_MASK) >> \
 	PMC_PHW_CPU_SHIFT)
 #define	PMC_PHW_FLAGS_TO_STATE(flags)	(((flags) << PMC_PHW_FLAGS_SHIFT) & \
 	PMC_PHW_FLAGS_MASK)
 #define	PMC_PHW_STATE_TO_FLAGS(state)	(((state) & PMC_PHW_FLAGS_MASK) >> \
 	PMC_PHW_FLAGS_SHIFT)
 #define	PMC_PHW_FLAG_IS_ENABLED		(PMC_PHW_FLAGS_TO_STATE(0x01))
 #define	PMC_PHW_FLAG_IS_SHAREABLE	(PMC_PHW_FLAGS_TO_STATE(0x02))
 
 /*
  * struct pmc_sample
  *
  * Space for N (tunable) PC samples and associated control data.
  */
 
 struct pmc_sample {
 	uint16_t		ps_nsamples;	/* callchain depth */
 	uint16_t		ps_nsamples_actual;
 	uint16_t		ps_cpu;		/* cpu number */
 	uint16_t		ps_flags;	/* other flags */
 	lwpid_t			ps_tid;		/* thread id */
 	pid_t			ps_pid;		/* process PID or -1 */
 	int		ps_ticks; /* ticks at sample time */
 	/* pad */
 	struct thread		*ps_td;		/* which thread */
 	struct pmc		*ps_pmc;	/* interrupting PMC */
 	uintptr_t		*ps_pc;		/* (const) callchain start */
 	uint64_t		ps_tsc;		/* tsc value */
 };
 
 #define 	PMC_SAMPLE_FREE		((uint16_t) 0)
 #define 	PMC_USER_CALLCHAIN_PENDING	((uint16_t) 0xFFFF)
 
 struct pmc_samplebuffer {
 	volatile uint64_t		ps_prodidx; /* producer index */
 	volatile uint64_t		ps_considx; /* consumer index */
 	uintptr_t		*ps_callchains;	/* all saved call chains */
 	struct pmc_sample	ps_samples[];	/* array of sample entries */
 };
 
 #define PMC_CONS_SAMPLE(psb)					\
 	(&(psb)->ps_samples[(psb)->ps_considx & pmc_sample_mask])
 
 #define PMC_CONS_SAMPLE_OFF(psb, off)							\
 	(&(psb)->ps_samples[(off) & pmc_sample_mask])
 
 #define PMC_PROD_SAMPLE(psb)					\
 	(&(psb)->ps_samples[(psb)->ps_prodidx & pmc_sample_mask])
 
 /*
  * struct pmc_cpustate
  *
  * A CPU is modelled as a collection of HW PMCs with space for additional
  * flags.
  */
 
 struct pmc_cpu {
 	uint32_t	pc_state;	/* physical cpu number + flags */
 	struct pmc_samplebuffer *pc_sb[3]; /* space for samples */
 	struct pmc_hw	*pc_hwpmcs[];	/* 'npmc' pointers */
 };
 
 #define	PMC_PCPU_CPU_MASK		0x000000FF
 #define	PMC_PCPU_FLAGS_MASK		0xFFFFFF00
 #define	PMC_PCPU_FLAGS_SHIFT		8
 #define	PMC_PCPU_STATE_TO_CPU(S)	((S) & PMC_PCPU_CPU_MASK)
 #define	PMC_PCPU_STATE_TO_FLAGS(S)	(((S) & PMC_PCPU_FLAGS_MASK) >> PMC_PCPU_FLAGS_SHIFT)
 #define	PMC_PCPU_FLAGS_TO_STATE(F)	(((F) << PMC_PCPU_FLAGS_SHIFT) & PMC_PCPU_FLAGS_MASK)
 #define	PMC_PCPU_CPU_TO_STATE(C)	((C) & PMC_PCPU_CPU_MASK)
 #define	PMC_PCPU_FLAG_HTT		(PMC_PCPU_FLAGS_TO_STATE(0x1))
 
 /*
  * struct pmc_binding
  *
  * CPU binding information.
  */
 
 struct pmc_binding {
 	int	pb_bound;	/* is bound? */
 	int	pb_cpu;		/* if so, to which CPU */
 	u_char	pb_priority;	/* Thread active priority. */
 };
 
 struct pmc_mdep;
 
 /*
  * struct pmc_classdep
  *
  * PMC class-dependent operations.
  */
 struct pmc_classdep {
 	uint32_t	pcd_caps;	/* class capabilities */
 	enum pmc_class	pcd_class;	/* class id */
 	int		pcd_num;	/* number of PMCs */
 	int		pcd_ri;		/* row index of the first PMC in class */
 	int		pcd_width;	/* width of the PMC */
 
 	/* configuring/reading/writing the hardware PMCs */
 	int (*pcd_config_pmc)(int _cpu, int _ri, struct pmc *_pm);
 	int (*pcd_get_config)(int _cpu, int _ri, struct pmc **_ppm);
 	int (*pcd_read_pmc)(int _cpu, int _ri, struct pmc *_pm,
 	    pmc_value_t *_value);
 	int (*pcd_write_pmc)(int _cpu, int _ri, struct pmc *_pm,
 	    pmc_value_t _value);
 
 	/* pmc allocation/release */
 	int (*pcd_allocate_pmc)(int _cpu, int _ri, struct pmc *_t,
 		const struct pmc_op_pmcallocate *_a);
 	int (*pcd_release_pmc)(int _cpu, int _ri, struct pmc *_pm);
 
 	/* starting and stopping PMCs */
 	int (*pcd_start_pmc)(int _cpu, int _ri, struct pmc *_pm);
 	int (*pcd_stop_pmc)(int _cpu, int _ri, struct pmc *_pm);
 
 	/* description */
 	int (*pcd_describe)(int _cpu, int _ri, struct pmc_info *_pi,
 		struct pmc **_ppmc);
 
 	/* class-dependent initialization & finalization */
 	int (*pcd_pcpu_init)(struct pmc_mdep *_md, int _cpu);
 	int (*pcd_pcpu_fini)(struct pmc_mdep *_md, int _cpu);
 
 	/* machine-specific interface */
 	int (*pcd_get_msr)(int _ri, uint32_t *_msr);
 };
 
 /*
  * struct pmc_mdep
  *
  * Machine dependent bits needed per CPU type.
  */
 
 struct pmc_mdep  {
 	uint32_t	pmd_cputype;    /* from enum pmc_cputype */
 	uint32_t	pmd_npmc;	/* number of PMCs per CPU */
 	uint32_t	pmd_nclass;	/* number of PMC classes present */
 
 	/*
 	 * Machine dependent methods.
 	 */
 
 	/* thread context switch in/out */
 	int (*pmd_switch_in)(struct pmc_cpu *_p, struct pmc_process *_pp);
 	int (*pmd_switch_out)(struct pmc_cpu *_p, struct pmc_process *_pp);
 
 	/* handle a PMC interrupt */
 	int (*pmd_intr)(struct trapframe *_tf);
 
 	/*
 	 * PMC class dependent information.
 	 */
 	struct pmc_classdep pmd_classdep[];
 };
 
 /*
  * Per-CPU state.  This is an array of 'mp_ncpu' pointers
  * to struct pmc_cpu descriptors.
  */
 
 extern struct pmc_cpu **pmc_pcpu;
 
 /* driver statistics */
 extern struct pmc_driverstats pmc_stats;
 
 #if	defined(HWPMC_DEBUG)
 
 /* HWPMC_DEBUG without KTR will compile but is a no-op. */
 #if !defined(KTR) || !defined(KTR_COMPILE) || ((KTR_COMPILE & KTR_SUBSYS) == 0)
 #error "HWPMC_DEBUG requires KTR and KTR_COMPILE=KTR_SUBSYS -- see ktr(4)"
 #endif
 
 #include <sys/ktr.h>
 
 #define	__pmcdbg_used		/* unused variable annotation */
 
 /*
  * Debug flags, major flag groups.
  *
  * Please keep the DEBUGGING section of the hwpmc(4) man page in sync.
  */
 struct pmc_debugflags {
 	int	pdb_CPU;
 	int	pdb_CSW;
 	int	pdb_LOG;
 	int	pdb_MDP;
 	int	pdb_MOD;
 	int	pdb_OWN;
 	int	pdb_PMC;
 	int	pdb_PRC;
 	int	pdb_SAM;
 };
 
 extern struct pmc_debugflags pmc_debugflags;
 
 #define	KTR_PMC			KTR_SUBSYS
 
 #define	PMC_DEBUG_STRSIZE		128
 #define	PMC_DEBUG_DEFAULT_FLAGS		{ 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 
 #define	PMCDBG0(M, N, L, F) do {					\
 	if (pmc_debugflags.pdb_ ## M & (1 << PMC_DEBUG_MIN_ ## N))	\
 		CTR0(KTR_PMC, #M ":" #N ":" #L  ": " F);		\
 } while (0)
 #define	PMCDBG1(M, N, L, F, p1) do {					\
 	if (pmc_debugflags.pdb_ ## M & (1 << PMC_DEBUG_MIN_ ## N))	\
 		CTR1(KTR_PMC, #M ":" #N ":" #L  ": " F, p1);		\
 } while (0)
 #define	PMCDBG2(M, N, L, F, p1, p2) do {				\
 	if (pmc_debugflags.pdb_ ## M & (1 << PMC_DEBUG_MIN_ ## N))	\
 		CTR2(KTR_PMC, #M ":" #N ":" #L  ": " F, p1, p2);	\
 } while (0)
 #define	PMCDBG3(M, N, L, F, p1, p2, p3) do {				\
 	if (pmc_debugflags.pdb_ ## M & (1 << PMC_DEBUG_MIN_ ## N))	\
 		CTR3(KTR_PMC, #M ":" #N ":" #L  ": " F, p1, p2, p3);	\
 } while (0)
 #define	PMCDBG4(M, N, L, F, p1, p2, p3, p4) do {			\
 	if (pmc_debugflags.pdb_ ## M & (1 << PMC_DEBUG_MIN_ ## N))	\
 		CTR4(KTR_PMC, #M ":" #N ":" #L  ": " F, p1, p2, p3, p4);\
 } while (0)
 #define	PMCDBG5(M, N, L, F, p1, p2, p3, p4, p5) do {			\
 	if (pmc_debugflags.pdb_ ## M & (1 << PMC_DEBUG_MIN_ ## N))	\
 		CTR5(KTR_PMC, #M ":" #N ":" #L  ": " F, p1, p2, p3, p4,	\
 		    p5);						\
 } while (0)
 #define	PMCDBG6(M, N, L, F, p1, p2, p3, p4, p5, p6) do {		\
 	if (pmc_debugflags.pdb_ ## M & (1 << PMC_DEBUG_MIN_ ## N))	\
 		CTR6(KTR_PMC, #M ":" #N ":" #L  ": " F, p1, p2, p3, p4,	\
 		    p5, p6);						\
 } while (0)
 
 /* Major numbers */
 #define	PMC_DEBUG_MAJ_CPU		0 /* cpu switches */
 #define	PMC_DEBUG_MAJ_CSW		1 /* context switches */
 #define	PMC_DEBUG_MAJ_LOG		2 /* logging */
 #define	PMC_DEBUG_MAJ_MDP		3 /* machine dependent */
 #define	PMC_DEBUG_MAJ_MOD		4 /* misc module infrastructure */
 #define	PMC_DEBUG_MAJ_OWN		5 /* owner */
 #define	PMC_DEBUG_MAJ_PMC		6 /* pmc management */
 #define	PMC_DEBUG_MAJ_PRC		7 /* processes */
 #define	PMC_DEBUG_MAJ_SAM		8 /* sampling */
 
 /* Minor numbers */
 
 /* Common (8 bits) */
 #define	PMC_DEBUG_MIN_ALL		0 /* allocation */
 #define	PMC_DEBUG_MIN_REL		1 /* release */
 #define	PMC_DEBUG_MIN_OPS		2 /* ops: start, stop, ... */
 #define	PMC_DEBUG_MIN_INI		3 /* init */
 #define	PMC_DEBUG_MIN_FND		4 /* find */
 
 /* MODULE */
 #define	PMC_DEBUG_MIN_PMH	       14 /* pmc_hook */
 #define	PMC_DEBUG_MIN_PMS	       15 /* pmc_syscall */
 
 /* OWN */
 #define	PMC_DEBUG_MIN_ORM		8 /* owner remove */
 #define	PMC_DEBUG_MIN_OMR		9 /* owner maybe remove */
 
 /* PROCESSES */
 #define	PMC_DEBUG_MIN_TLK		8 /* link target */
 #define	PMC_DEBUG_MIN_TUL		9 /* unlink target */
 #define	PMC_DEBUG_MIN_EXT	       10 /* process exit */
 #define	PMC_DEBUG_MIN_EXC	       11 /* process exec */
 #define	PMC_DEBUG_MIN_FRK	       12 /* process fork */
 #define	PMC_DEBUG_MIN_ATT	       13 /* attach/detach */
 #define	PMC_DEBUG_MIN_SIG	       14 /* signalling */
 
 /* CONTEXT SWITCHES */
 #define	PMC_DEBUG_MIN_SWI		8 /* switch in */
 #define	PMC_DEBUG_MIN_SWO		9 /* switch out */
 
 /* PMC */
 #define	PMC_DEBUG_MIN_REG		8 /* pmc register */
 #define	PMC_DEBUG_MIN_ALR		9 /* allocate row */
 
 /* MACHINE DEPENDENT LAYER */
 #define	PMC_DEBUG_MIN_REA		8 /* read */
 #define	PMC_DEBUG_MIN_WRI		9 /* write */
 #define	PMC_DEBUG_MIN_CFG	       10 /* config */
 #define	PMC_DEBUG_MIN_STA	       11 /* start */
 #define	PMC_DEBUG_MIN_STO	       12 /* stop */
 #define	PMC_DEBUG_MIN_INT	       13 /* interrupts */
 
 /* CPU */
 #define	PMC_DEBUG_MIN_BND		8 /* bind */
 #define	PMC_DEBUG_MIN_SEL		9 /* select */
 
 /* LOG */
 #define	PMC_DEBUG_MIN_GTB		8 /* get buf */
 #define	PMC_DEBUG_MIN_SIO		9 /* schedule i/o */
 #define	PMC_DEBUG_MIN_FLS	       10 /* flush */
 #define	PMC_DEBUG_MIN_SAM	       11 /* sample */
 #define	PMC_DEBUG_MIN_CLO	       12 /* close */
 
 #else
 #define	__pmcdbg_used			__unused
 #define	PMCDBG0(M, N, L, F)		/* nothing */
 #define	PMCDBG1(M, N, L, F, p1)
 #define	PMCDBG2(M, N, L, F, p1, p2)
 #define	PMCDBG3(M, N, L, F, p1, p2, p3)
 #define	PMCDBG4(M, N, L, F, p1, p2, p3, p4)
 #define	PMCDBG5(M, N, L, F, p1, p2, p3, p4, p5)
 #define	PMCDBG6(M, N, L, F, p1, p2, p3, p4, p5, p6)
 #endif
 
 /* declare a dedicated memory pool */
 MALLOC_DECLARE(M_PMC);
 
 /*
  * Functions
  */
 
 struct pmc_mdep *pmc_md_initialize(void);	/* MD init function */
 void	pmc_md_finalize(struct pmc_mdep *_md);	/* MD fini function */
 int	pmc_getrowdisp(int _ri);
 int	pmc_process_interrupt(int _ring, struct pmc *_pm, struct trapframe *_tf);
 int	pmc_save_kernel_callchain(uintptr_t *_cc, int _maxsamples,
     struct trapframe *_tf);
 int	pmc_save_user_callchain(uintptr_t *_cc, int _maxsamples,
     struct trapframe *_tf);
 void	pmc_restore_cpu_binding(struct pmc_binding *pb);
 void	pmc_save_cpu_binding(struct pmc_binding *pb);
 void	pmc_select_cpu(int cpu);
 struct pmc_mdep *pmc_mdep_alloc(int nclasses);
 void pmc_mdep_free(struct pmc_mdep *md);
 uint64_t pmc_rdtsc(void);
 #endif /* _KERNEL */
 #endif /* _SYS_PMC_H_ */
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index eba077e7472c..298a3b2e403e 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1,9650 +1,9649 @@
 #
 #
 # This file adds support for the WITHOUT_* and WITH_* knobs in src.conf(5) to
 # the check-old* and delete-old* targets.
 #
 
 .if ${MK_ACCT} == no
 OLD_FILES+=etc/rc.d/accounting
 OLD_FILES+=etc/periodic/daily/310.accounting
 OLD_FILES+=usr/sbin/accton
 OLD_FILES+=usr/sbin/sa
 OLD_FILES+=usr/share/man/man8/accton.8.gz
 OLD_FILES+=usr/share/man/man8/sa.8.gz
 OLD_FILES+=usr/tests/usr.sbin/sa/Kyuafile
 OLD_FILES+=usr/tests/usr.sbin/sa/legacy_test
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-amd64-sav.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-amd64-sav.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-amd64-u.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-amd64-usr.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-amd64-usr.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-i386-sav.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-i386-sav.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-i386-u.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-i386-usr.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-i386-usr.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-sav.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-sav.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-u.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-usr.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-usr.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-amd64-sav.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-amd64-u.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-amd64-usr.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-i386-sav.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-i386-u.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-i386-usr.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-sparc64-sav.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-sparc64-u.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-sparc64-usr.in
 OLD_DIRS+=usr/tests/usr.sbin/sa
 .endif
 
 .if ${MK_ACPI} == no
 OLD_FILES+=etc/devd/asus.conf
 OLD_FILES+=etc/rc.d/power_profile
 OLD_FILES+=usr/sbin/acpiconf
 OLD_FILES+=usr/sbin/acpidb
 OLD_FILES+=usr/sbin/acpidump
 OLD_FILES+=usr/sbin/iasl
 OLD_FILES+=usr/share/man/man8/acpiconf.8.gz
 OLD_FILES+=usr/share/man/man8/acpidb.8.gz
 OLD_FILES+=usr/share/man/man8/acpidump.8.gz
 OLD_FILES+=usr/share/man/man8/iasl.8.gz
 .endif
 
 .if ${MK_ACPI} == no && ${MK_APM} == no
 OLD_FILES+=etc/rc.d/powerd
 .endif
 
 .if ${MK_APM} == no
 OLD_FILES+=etc/rc.d/apm
 OLD_FILES+=etc/rc.d/apmd
 OLD_FILES+=etc/apmd.conf
 OLD_FILES+=usr/sbin/apm
 OLD_FILES+=usr/share/examples/etc/apmd.conf
 .endif
 
 .if ${MK_AT} == no
 OLD_FILES+=etc/pam.d/atrun
 OLD_FILES+=usr/bin/at
 OLD_FILES+=usr/bin/atq
 OLD_FILES+=usr/bin/atrm
 OLD_FILES+=usr/bin/batch
 OLD_FILES+=usr/libexec/atrun
 OLD_FILES+=usr/share/man/man1/at.1.gz
 OLD_FILES+=usr/share/man/man1/atq.1.gz
 OLD_FILES+=usr/share/man/man1/atrm.1.gz
 OLD_FILES+=usr/share/man/man1/batch.1.gz
 OLD_FILES+=usr/share/man/man8/atrun.8.gz
 .endif
 
 .if ${MK_AUDIT} == no
 OLD_FILES+=etc/rc.d/auditd
 OLD_FILES+=etc/rc.d/auditdistd
 OLD_FILES+=usr/sbin/audit
 OLD_FILES+=usr/sbin/auditd
 OLD_FILES+=usr/sbin/auditdistd
 OLD_FILES+=usr/sbin/auditreduce
 OLD_FILES+=usr/sbin/praudit
 OLD_FILES+=usr/share/man/man1/auditreduce.1.gz
 OLD_FILES+=usr/share/man/man1/praudit.1.gz
 OLD_FILES+=usr/share/man/man5/auditdistd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/audit.8.gz
 OLD_FILES+=usr/share/man/man8/auditd.8.gz
 OLD_FILES+=usr/share/man/man8/auditdistd.8.gz
 OLD_FILES+=usr/tests/sys/audit/process-control
 OLD_FILES+=usr/tests/sys/audit/open
 OLD_FILES+=usr/tests/sys/audit/network
 OLD_FILES+=usr/tests/sys/audit/miscellaneous
 OLD_FILES+=usr/tests/sys/audit/Kyuafile
 OLD_FILES+=usr/tests/sys/audit/ioctl
 OLD_FILES+=usr/tests/sys/audit/inter-process
 OLD_FILES+=usr/tests/sys/audit/file-write
 OLD_FILES+=usr/tests/sys/audit/file-read
 OLD_FILES+=usr/tests/sys/audit/file-delete
 OLD_FILES+=usr/tests/sys/audit/file-create
 OLD_FILES+=usr/tests/sys/audit/file-close
 OLD_FILES+=usr/tests/sys/audit/file-attribute-modify
 OLD_FILES+=usr/tests/sys/audit/file-attribute-access
 OLD_FILES+=usr/tests/sys/audit/administrative
 OLD_DIRS+=usr/tests/sys/audit
 .endif
 
 .if ${MK_AUTHPF} == no
 OLD_FILES+=usr/sbin/authpf
 OLD_FILES+=usr/sbin/authpf-noip
 OLD_FILES+=usr/share/man/man8/authpf.8.gz
 OLD_FILES+=usr/share/man/man8/authpf-noip.8.gz
 .endif
 
 .if ${MK_AUTOFS} == no
 OLD_FILES+=etc/autofs/include_ldap
 OLD_FILES+=etc/autofs/special_hosts
 OLD_FILES+=etc/autofs/special_media
 OLD_FILES+=etc/autofs/special_noauto
 OLD_FILES+=etc/autofs/special_null
 OLD_FILES+=etc/auto_master
 OLD_FILES+=etc/rc.d/automount
 OLD_FILES+=etc/rc.d/automountd
 OLD_FILES+=etc/rc.d/autounmountd
 OLD_FILES+=usr/sbin/automount
 OLD_FILES+=usr/sbin/automountd
 OLD_FILES+=usr/sbin/autounmountd
 OLD_FILES+=usr/share/man/man5/autofs.5.gz
 OLD_FILES+=usr/share/man/man5/auto_master.5.gz
 OLD_FILES+=usr/share/man/man8/automount.8.gz
 OLD_FILES+=usr/share/man/man8/automountd.8.gz
 OLD_FILES+=usr/share/man/man8/autounmountd.8.gz
 OLD_DIRS+=etc/autofs
 .endif
 
 .if ${MK_BEARSSL} == no
 OLD_FILES+=usr/lib/libbearssl.a
 OLD_FILES+=usr/lib/libbearssl.so
 OLD_LIBS+=usr/lib/libbearssl.so.5
 OLD_FILES+=usr/lib/libsecureboot.a
 OLD_FILES+=usr/lib/libsecureboot.so
 OLD_LIBS+=usr/lib/libsecureboot.so.5
 .endif
 
 .if ${MK_BHYVE} == no
 OLD_FILES+=usr/lib/libvmmapi.a
 OLD_FILES+=usr/lib/libvmmapi.so
 OLD_LIBS+=usr/lib/libvmmapi.so.5
 OLD_FILES+=usr/include/vmmapi.h
 OLD_FILES+=usr/sbin/bhyve
 OLD_FILES+=usr/sbin/bhyvectl
 OLD_FILES+=usr/sbin/bhyveload
 OLD_FILES+=usr/share/examples/bhyve/vmrun.sh
 OLD_FILES+=usr/share/man/man8/bhyve.8.gz
 OLD_FILES+=usr/share/man/man8/bhyveload.8.gz
 OLD_DIRS+=usr/share/examples/bhyve
 .endif
 
 .if ${MK_LLD_IS_LD} == no
 OLD_FILES+=usr/bin/ld
 OLD_FILES+=usr/share/man/man1/ld.1.gz
 .endif
 
 .if ${MK_BLACKLIST} == no
 OLD_FILES+=etc/blacklistd.conf
 OLD_FILES+=etc/rc.d/blacklistd
 OLD_FILES+=usr/include/blacklist.h
 OLD_FILES+=usr/lib/libblacklist.a
 OLD_FILES+=usr/lib/libblacklist_p.a
 OLD_FILES+=usr/lib/libblacklist.so
 OLD_LIBS+=usr/lib/libblacklist.so.0
 OLD_FILES+=usr/libexec/blacklistd-helper
 OLD_FILES+=usr/sbin/blacklistctl
 OLD_FILES+=usr/sbin/blacklistd
 OLD_FILES+=usr/share/man/man3/blacklist.3.gz
 OLD_FILES+=usr/share/man/man3/blacklist_close.3.gz
 OLD_FILES+=usr/share/man/man3/blacklist_open.3.gz
 OLD_FILES+=usr/share/man/man3/blacklist_r.3.gz
 OLD_FILES+=usr/share/man/man3/blacklist_sa.3.gz
 OLD_FILES+=usr/share/man/man3/blacklist_sa_r.3.gz
 OLD_FILES+=usr/share/man/man5/blacklistd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/blacklistctl.8.gz
 OLD_FILES+=usr/share/man/man8/blacklistd.8.gz
 .endif
 
 .if ${MK_BLUETOOTH} == no
 OLD_FILES+=etc/bluetooth/hcsecd.conf
 OLD_FILES+=etc/bluetooth/hosts
 OLD_FILES+=etc/bluetooth/protocols
 OLD_FILES+=etc/defaults/bluetooth.device.conf
 OLD_FILES+=etc/devd/iwmbtfw.conf
 OLD_DIRS+=etc/bluetooth
 OLD_FILES+=etc/rc.d/bluetooth
 OLD_FILES+=etc/rc.d/bthidd
 OLD_FILES+=etc/rc.d/hcsecd
 OLD_FILES+=etc/rc.d/rfcomm_pppd_server
 OLD_FILES+=etc/rc.d/sdpd
 OLD_FILES+=etc/rc.d/ubthidhci
 OLD_FILES+=usr/bin/bthost
 OLD_FILES+=usr/bin/btsockstat
 OLD_FILES+=usr/bin/rfcomm_sppd
 OLD_FILES+=usr/include/bluetooth.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_bluetooth.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_bt3c.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket_l2cap.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket_sco.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_h4.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_hci.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_l2cap.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_ubt.h
 OLD_DIRS+=usr/include/netgraph/bluetooth/include
 OLD_DIRS+=usr/include/netgraph/bluetooth
 OLD_FILES+=usr/include/sdp.h
 OLD_FILES+=usr/lib/libbluetooth.a
 OLD_FILES+=usr/lib/libbluetooth.so
 OLD_LIBS+=usr/lib/libbluetooth.so.4
 OLD_FILES+=usr/lib/libbluetooth_p.a
 OLD_FILES+=usr/lib/libsdp.a
 OLD_FILES+=usr/lib/libsdp.so
 OLD_LIBS+=usr/lib/libsdp.so.4
 OLD_FILES+=usr/lib/libsdp_p.a
 OLD_FILES+=usr/sbin/ath3kfw
 OLD_FILES+=usr/sbin/bcmfw
 OLD_FILES+=usr/sbin/bluetooth-config
 OLD_FILES+=usr/sbin/bt3cfw
 OLD_FILES+=usr/sbin/bthidcontrol
 OLD_FILES+=usr/sbin/bthidd
 OLD_FILES+=usr/sbin/btpand
 OLD_FILES+=usr/sbin/hccontrol
 OLD_FILES+=usr/sbin/hcsecd
 OLD_FILES+=usr/sbin/hcseriald
 OLD_FILES+=usr/sbin/iwmbtfw
 OLD_FILES+=usr/sbin/l2control
 OLD_FILES+=usr/sbin/l2ping
 OLD_FILES+=usr/sbin/rfcomm_pppd
 OLD_FILES+=usr/sbin/sdpcontrol
 OLD_FILES+=usr/sbin/sdpd
 OLD_FILES+=usr/share/examples/etc/defaults/bluetooth.device.conf
 OLD_FILES+=usr/share/man/man1/bthost.1.gz
 OLD_FILES+=usr/share/man/man1/btsockstat.1.gz
 OLD_FILES+=usr/share/man/man1/rfcomm_sppd.1.gz
 OLD_FILES+=usr/share/man/man3/SDP_GET128.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_GET16.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_GET32.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_GET64.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_GET8.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_PUT128.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_PUT16.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_PUT32.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_PUT64.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_PUT8.3.gz
 OLD_FILES+=usr/share/man/man3/bdaddr_any.3.gz
 OLD_FILES+=usr/share/man/man3/bdaddr_copy.3.gz
 OLD_FILES+=usr/share/man/man3/bdaddr_same.3.gz
 OLD_FILES+=usr/share/man/man3/bluetooth.3.gz
 OLD_FILES+=usr/share/man/man3/bt_aton.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devaddr.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devclose.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devenum.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devfilter.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devfilter_evt_clr.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devfilter_evt_set.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devfilter_evt_tst.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devfilter_pkt_clr.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devfilter_pkt_set.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devfilter_pkt_tst.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devinfo.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devinquiry.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devname.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devopen.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devreq.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devsend.3.gz
 OLD_FILES+=usr/share/man/man3/bt_endhostent.3.gz
 OLD_FILES+=usr/share/man/man3/bt_endprotoent.3.gz
 OLD_FILES+=usr/share/man/man3/bt_gethostbyaddr.3.gz
 OLD_FILES+=usr/share/man/man3/bt_gethostbyname.3.gz
 OLD_FILES+=usr/share/man/man3/bt_gethostent.3.gz
 OLD_FILES+=usr/share/man/man3/bt_getprotobyname.3.gz
 OLD_FILES+=usr/share/man/man3/bt_getprotobynumber.3.gz
 OLD_FILES+=usr/share/man/man3/bt_getprotoent.3.gz
 OLD_FILES+=usr/share/man/man3/bt_ntoa.3.gz
 OLD_FILES+=usr/share/man/man3/bt_sethostent.3.gz
 OLD_FILES+=usr/share/man/man3/bt_setprotoent.3.gz
 OLD_FILES+=usr/share/man/man3/sdp.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_attr2desc.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_change_service.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_close.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_error.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_open.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_open_local.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_register_service.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_search.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_unregister_service.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_uuid2desc.3.gz
 OLD_FILES+=usr/share/man/man4/ng_bluetooth.4.gz
 OLD_FILES+=usr/share/man/man5/bluetooth.device.conf.5.gz
 OLD_FILES+=usr/share/man/man5/bluetooth.hosts.5.gz
 OLD_FILES+=usr/share/man/man5/bluetooth.protocols.5.gz
 OLD_FILES+=usr/share/man/man5/hcsecd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/ath3kfw.8.gz
 OLD_FILES+=usr/share/man/man8/bcmfw.8.gz
 OLD_FILES+=usr/share/man/man8/bluetooth-config.8.gz
 OLD_FILES+=usr/share/man/man8/bt3cfw.8.gz
 OLD_FILES+=usr/share/man/man8/bthidcontrol.8.gz
 OLD_FILES+=usr/share/man/man8/bthidd.8.gz
 OLD_FILES+=usr/share/man/man8/btpand.8.gz
 OLD_FILES+=usr/share/man/man8/hccontrol.8.gz
 OLD_FILES+=usr/share/man/man8/hcsecd.8.gz
 OLD_FILES+=usr/share/man/man8/hcseriald.8.gz
 OLD_FILES+=usr/share/man/man8/iwmbtfw.8.gz
 OLD_FILES+=usr/share/man/man8/l2control.8.gz
 OLD_FILES+=usr/share/man/man8/l2ping.8.gz
 OLD_FILES+=usr/share/man/man8/rfcomm_pppd.8.gz
 OLD_FILES+=usr/share/man/man8/sdpcontrol.8.gz
 OLD_FILES+=usr/share/man/man8/sdpd.8.gz
 .endif
 
 .if ${MK_BOOT} == no
 OLD_FILES+=boot/beastie.4th
 OLD_FILES+=boot/boot
 OLD_FILES+=boot/boot0
 OLD_FILES+=boot/boot0sio
 OLD_FILES+=boot/boot1
 OLD_FILES+=boot/boot1.efi
 OLD_FILES+=boot/boot2
 OLD_FILES+=boot/brand.4th
 OLD_FILES+=boot/cdboot
 OLD_FILES+=boot/check-password.4th
 OLD_FILES+=boot/color.4th
 OLD_FILES+=boot/defaults/loader.conf
 OLD_FILES+=boot/delay.4th
 OLD_FILES+=boot/device.hints
 OLD_FILES+=boot/frames.4th
 OLD_FILES+=boot/gptboot
 OLD_FILES+=boot/gptzfsboot
 OLD_FILES+=boot/loader
 OLD_FILES+=boot/loader.4th
 OLD_FILES+=boot/loader.efi
 OLD_FILES+=boot/loader.help
 OLD_FILES+=boot/loader.rc
 OLD_FILES+=boot/mbr
 OLD_FILES+=boot/menu-commands.4th
 OLD_FILES+=boot/menu.4th
 OLD_FILES+=boot/menu.rc
 OLD_FILES+=boot/menusets.4th
 OLD_FILES+=boot/pcibios.4th
 OLD_FILES+=boot/pmbr
 OLD_FILES+=boot/pxeboot
 OLD_FILES+=boot/screen.4th
 OLD_FILES+=boot/shortcuts.4th
 OLD_FILES+=boot/support.4th
 OLD_FILES+=boot/userboot.so
 OLD_FILES+=boot/version.4th
 OLD_FILES+=boot/zfsboot
 OLD_FILES+=boot/zfsloader
 OLD_FILES+=usr/lib/kgzldr.o
 OLD_FILES+=usr/share/man/man5/loader.conf.5.gz
 OLD_FILES+=usr/share/man/man8/beastie.4th.8.gz
 OLD_FILES+=usr/share/man/man8/brand.4th.8.gz
 OLD_FILES+=usr/share/man/man8/check-password.4th.8.gz
 OLD_FILES+=usr/share/man/man8/color.4th.8.gz
 OLD_FILES+=usr/share/man/man8/delay.4th.8.gz
 OLD_FILES+=usr/share/man/man8/gptboot.8.gz
 OLD_FILES+=usr/share/man/man8/gptzfsboot.8.gz
 OLD_FILES+=usr/share/man/man8/loader.4th.8.gz
 OLD_FILES+=usr/share/man/man8/loader.8.gz
 OLD_FILES+=usr/share/man/man8/menu.4th.8.gz
 OLD_FILES+=usr/share/man/man8/menusets.4th.8.gz
 OLD_FILES+=usr/share/man/man8/pxeboot.8.gz
 OLD_FILES+=usr/share/man/man8/version.4th.8.gz
 OLD_FILES+=usr/share/man/man8/zfsboot.8.gz
 OLD_FILES+=usr/share/man/man8/zfsloader.8.gz
 .endif
 
 .if ${MK_BOOTPARAMD} == no
 OLD_FILES+=etc/rc.d/bootparams
 OLD_FILES+=usr/sbin/bootparamd
 OLD_FILES+=usr/share/man/man5/bootparams.5.gz
 OLD_FILES+=usr/share/man/man8/bootparamd.8.gz
 OLD_FILES+=usr/sbin/callbootd
 .endif
 
 .if ${MK_BOOTPD} == no
 OLD_FILES+=usr/libexec/bootpd
 OLD_FILES+=usr/share/man/man5/bootptab.5.gz
 OLD_FILES+=usr/share/man/man8/bootpd.8.gz
 OLD_FILES+=usr/libexec/bootpgw
 OLD_FILES+=usr/sbin/bootpef
 OLD_FILES+=usr/share/man/man8/bootpef.8.gz
 OLD_FILES+=usr/sbin/bootptest
 OLD_FILES+=usr/share/man/man8/bootptest.8.gz
 .endif
 
 .if ${MK_BSD_CPIO} == no
 OLD_FILES+=usr/bin/bsdcpio
 OLD_FILES+=usr/bin/cpio
 OLD_FILES+=usr/share/man/man1/bsdcpio.1.gz
 OLD_FILES+=usr/share/man/man1/cpio.1.gz
 .endif
 
 .if ${MK_BSDINSTALL} == no
 OLD_FILES+=usr/libexec/bsdinstall/adduser
 OLD_FILES+=usr/libexec/bsdinstall/auto
 OLD_FILES+=usr/libexec/bsdinstall/autopart
 OLD_FILES+=usr/libexec/bsdinstall/bootconfig
 OLD_FILES+=usr/libexec/bsdinstall/checksum
 OLD_FILES+=usr/libexec/bsdinstall/config
 OLD_FILES+=usr/libexec/bsdinstall/distextract
 OLD_FILES+=usr/libexec/bsdinstall/distfetch
 OLD_FILES+=usr/libexec/bsdinstall/docsinstall
 OLD_FILES+=usr/libexec/bsdinstall/entropy
 OLD_FILES+=usr/libexec/bsdinstall/fetchmissingdists
 OLD_FILES+=usr/libexec/bsdinstall/hardening
 OLD_FILES+=usr/libexec/bsdinstall/hostname
 OLD_FILES+=usr/libexec/bsdinstall/jail
 OLD_FILES+=usr/libexec/bsdinstall/keymap
 OLD_FILES+=usr/libexec/bsdinstall/mirrorselect
 OLD_FILES+=usr/libexec/bsdinstall/mount
 OLD_FILES+=usr/libexec/bsdinstall/netconfig
 OLD_FILES+=usr/libexec/bsdinstall/netconfig_ipv4
 OLD_FILES+=usr/libexec/bsdinstall/netconfig_ipv6
 OLD_FILES+=usr/libexec/bsdinstall/partedit
 OLD_FILES+=usr/libexec/bsdinstall/rootpass
 OLD_FILES+=usr/libexec/bsdinstall/runconsoles
 OLD_FILES+=usr/libexec/bsdinstall/script
 OLD_FILES+=usr/libexec/bsdinstall/scriptedpart
 OLD_FILES+=usr/libexec/bsdinstall/services
 OLD_FILES+=usr/libexec/bsdinstall/startbsdinstall
 OLD_FILES+=usr/libexec/bsdinstall/time
 OLD_FILES+=usr/libexec/bsdinstall/umount
 OLD_FILES+=usr/libexec/bsdinstall/wlanconfig
 OLD_FILES+=usr/libexec/bsdinstall/zfsboot
 OLD_FILES+=usr/sbin/bsdinstall
 OLD_FILES+=usr/share/man/man8/bsdinstall.8.gz
 OLD_FILES+=usr/share/man/man8/sade.8.gz
 OLD_DIRS+=usr/libexec/bsdinstall
 .endif
 
 .if ${MK_BSNMP} == no
 OLD_FILES+=etc/snmpd.config
 OLD_FILES+=etc/rc.d/bsnmpd
 OLD_FILES+=usr/bin/bsnmpget
 OLD_FILES+=usr/bin/bsnmpset
 OLD_FILES+=usr/bin/bsnmpwalk
 OLD_FILES+=usr/include/bsnmp/asn1.h
 OLD_FILES+=usr/include/bsnmp/bridge_snmp.h
 OLD_FILES+=usr/include/bsnmp/snmp.h
 OLD_FILES+=usr/include/bsnmp/snmp_mibII.h
 OLD_FILES+=usr/include/bsnmp/snmp_netgraph.h
 OLD_FILES+=usr/include/bsnmp/snmpagent.h
 OLD_FILES+=usr/include/bsnmp/snmpclient.h
 OLD_FILES+=usr/include/bsnmp/snmpmod.h
 OLD_FILES+=usr/lib/libbsnmp.a
 OLD_FILES+=usr/lib/libbsnmp.so
 OLD_LIBS+=usr/lib/libbsnmp.so.6
 OLD_FILES+=usr/lib/libbsnmp_p.a
 OLD_FILES+=usr/lib/libbsnmptools.a
 OLD_FILES+=usr/lib/libbsnmptools.so
 OLD_LIBS+=usr/lib/libbsnmptools.so.0
 OLD_FILES+=usr/lib/libbsnmptools_p.a
 OLD_FILES+=usr/lib/snmp_bridge.so
 OLD_LIBS+=usr/lib/snmp_bridge.so.6
 OLD_FILES+=usr/lib/snmp_hast.so
 OLD_LIBS+=usr/lib/snmp_hast.so.6
 OLD_FILES+=usr/lib/snmp_hostres.so
 OLD_LIBS+=usr/lib/snmp_hostres.so.6
 OLD_FILES+=usr/lib/snmp_lm75.so
 OLD_LIBS+=usr/lib/snmp_lm75.so.6
 OLD_FILES+=usr/lib/snmp_mibII.so
 OLD_LIBS+=usr/lib/snmp_mibII.so.6
 OLD_FILES+=usr/lib/snmp_netgraph.so
 OLD_LIBS+=usr/lib/snmp_netgraph.so.6
 OLD_FILES+=usr/lib/snmp_pf.so
 OLD_LIBS+=usr/lib/snmp_pf.so.6
 OLD_FILES+=usr/lib/snmp_target.so
 OLD_LIBS+=usr/lib/snmp_target.so.6
 OLD_FILES+=usr/lib/snmp_usm.so
 OLD_LIBS+=usr/lib/snmp_usm.so.6
 OLD_FILES+=usr/lib/snmp_vacm.so
 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/sbin/bsnmpd
 OLD_FILES+=usr/sbin/gensnmptree
 OLD_FILES+=usr/share/examples/etc/snmpd.config
 OLD_FILES+=usr/share/man/man1/bsnmpd.1.gz
 OLD_FILES+=usr/share/man/man1/bsnmpget.1.gz
 OLD_FILES+=usr/share/man/man1/bsnmpset.1.gz
 OLD_FILES+=usr/share/man/man1/bsnmpwalk.1.gz
 OLD_FILES+=usr/share/man/man1/gensnmptree.1.gz
 # lib/libbsnmp/libbsnmp
 OLD_FILES+=usr/share/man/man3/TRUTH_GET.3.gz
 OLD_FILES+=usr/share/man/man3/TRUTH_MK.3.gz
 OLD_FILES+=usr/share/man/man3/TRUTH_OK.3.gz
 OLD_FILES+=usr/share/man/man3/asn1.3.gz
 OLD_FILES+=usr/share/man/man3/asn_append_oid.3.gz
 OLD_FILES+=usr/share/man/man3/asn_commit_header.3.gz
 OLD_FILES+=usr/share/man/man3/asn_compare_oid.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_counter64_raw.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_header.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_integer.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_integer_raw.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_ipaddress.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_ipaddress_raw.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_null.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_null_raw.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_objid.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_objid_raw.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_octetstring.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_octetstring_raw.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_sequence.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_timeticks.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_uint32_raw.3.gz
 OLD_FILES+=usr/share/man/man3/asn_is_suboid.3.gz
 OLD_FILES+=usr/share/man/man3/asn_oid2str.3.gz
 OLD_FILES+=usr/share/man/man3/asn_oid2str_r.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_counter64.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_exception.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_header.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_integer.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_ipaddress.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_null.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_objid.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_octetstring.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_temp_header.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_timeticks.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_uint32.3.gz
 OLD_FILES+=usr/share/man/man3/asn_skip.3.gz
 OLD_FILES+=usr/share/man/man3/asn_slice_oid.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_add_binding.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_calc_keychange.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_client.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_client_init.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_client_set_host.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_client_set_port.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_close.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_debug.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_dep_commit.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_dep_finish.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_dep_lookup.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_dep_rollback.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_depop_t.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_dialog.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_discover_engine.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_get.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_get_local_keys.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_getbulk.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_getnext.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_init_context.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_make_errresp.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_oid_append.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_op_t.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_open.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_parse_server.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_passwd_to_keys.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_check.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_create.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_decode.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_decode_header.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_decode_scoped.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_decode_secmode.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_dump.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_encode.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_free.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_init_secparams.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_send.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_receive.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_send_cb_f.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_set.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_table_cb_f.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_table_fetch.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_table_fetch_async.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_timeout_cb_f.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_timeout_start_f.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_timeout_stop_f.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_trace.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_value_copy.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_value_free.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_value_parse.3.gz
 OLD_FILES+=usr/share/man/man3/tree_size.3.gz
 # usr.sbin/bsnmpd/bsnmpd
 OLD_FILES+=usr/share/man/man3/FIND_OBJECT_INT.3.gz
 OLD_FILES+=usr/share/man/man3/FIND_OBJECT_INT_LINK.3.gz
 OLD_FILES+=usr/share/man/man3/FIND_OBJECT_INT_LINK_INDEX.3.gz
 OLD_FILES+=usr/share/man/man3/FIND_OBJECT_OID.3.gz
 OLD_FILES+=usr/share/man/man3/FIND_OBJECT_OID_LINK.3.gz
 OLD_FILES+=usr/share/man/man3/FIND_OBJECT_OID_LINK_INDEX.3.gz
 OLD_FILES+=usr/share/man/man3/INSERT_OBJECT_INT.3.gz
 OLD_FILES+=usr/share/man/man3/INSERT_OBJECT_INT_LINK.3.gz
 OLD_FILES+=usr/share/man/man3/INSERT_OBJECT_INT_LINK_INDEX.3.gz
 OLD_FILES+=usr/share/man/man3/INSERT_OBJECT_OID.3.gz
 OLD_FILES+=usr/share/man/man3/INSERT_OBJECT_OID_LINK.3.gz
 OLD_FILES+=usr/share/man/man3/INSERT_OBJECT_OID_LINK_INDEX.3.gz
 OLD_FILES+=usr/share/man/man3/NEXT_OBJECT_INT.3.gz
 OLD_FILES+=usr/share/man/man3/NEXT_OBJECT_INT_LINK.3.gz
 OLD_FILES+=usr/share/man/man3/NEXT_OBJECT_INT_LINK_INDEX.3.gz
 OLD_FILES+=usr/share/man/man3/NEXT_OBJECT_OID.3.gz
 OLD_FILES+=usr/share/man/man3/NEXT_OBJECT_OID_LINK.3.gz
 OLD_FILES+=usr/share/man/man3/NEXT_OBJECT_OID_LINK_INDEX.3.gz
 OLD_FILES+=usr/share/man/man3/asn1.3.gz
 OLD_FILES+=usr/share/man/man3/bsnmpagent.3.gz
 OLD_FILES+=usr/share/man/man3/bsnmpclient.3.gz
 OLD_FILES+=usr/share/man/man3/bsnmpd_get_target_stats.3.gz
 OLD_FILES+=usr/share/man/man3/bsnmpd_get_usm_stats.3.gz
 OLD_FILES+=usr/share/man/man3/bsnmpd_reset_usm_stats.3.gz
 OLD_FILES+=usr/share/man/man3/bsnmplib.3.gz
 OLD_FILES+=usr/share/man/man3/buf_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/buf_size.3.gz
 OLD_FILES+=usr/share/man/man3/comm_define.3.gz
 OLD_FILES+=usr/share/man/man3/community.3.gz
 OLD_FILES+=usr/share/man/man3/fd_deselect.3.gz
 OLD_FILES+=usr/share/man/man3/fd_resume.3.gz
 OLD_FILES+=usr/share/man/man3/fd_select.3.gz
 OLD_FILES+=usr/share/man/man3/fd_suspend.3.gz
 OLD_FILES+=usr/share/man/man3/get_ticks.3.gz
 OLD_FILES+=usr/share/man/man3/index_append.3.gz
 OLD_FILES+=usr/share/man/man3/index_append_off.3.gz
 OLD_FILES+=usr/share/man/man3/index_compare.3.gz
 OLD_FILES+=usr/share/man/man3/index_compare_off.3.gz
 OLD_FILES+=usr/share/man/man3/index_decode.3.gz
 OLD_FILES+=usr/share/man/man3/ip_commit.3.gz
 OLD_FILES+=usr/share/man/man3/ip_get.3.gz
 OLD_FILES+=usr/share/man/man3/ip_rollback.3.gz
 OLD_FILES+=usr/share/man/man3/ip_save.3.gz
 OLD_FILES+=usr/share/man/man3/or_register.3.gz
 OLD_FILES+=usr/share/man/man3/or_unregister.3.gz
 OLD_FILES+=usr/share/man/man3/oid_commit.3.gz
 OLD_FILES+=usr/share/man/man3/oid_get.3.gz
 OLD_FILES+=usr/share/man/man3/oid_rollback.3.gz
 OLD_FILES+=usr/share/man/man3/oid_save.3.gz
 OLD_FILES+=usr/share/man/man3/oid_usmNotInTimeWindows.3.gz
 OLD_FILES+=usr/share/man/man3/oid_usmUnknownEngineIDs.3.gz
 OLD_FILES+=usr/share/man/man3/oid_zeroDotZero.3.gz
 OLD_FILES+=usr/share/man/man3/reqid_allocate.3.gz
 OLD_FILES+=usr/share/man/man3/reqid_base.3.gz
 OLD_FILES+=usr/share/man/man3/reqid_istype.3.gz
 OLD_FILES+=usr/share/man/man3/reqid_next.3.gz
 OLD_FILES+=usr/share/man/man3/reqid_type.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_bridge.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_hast.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_hostres.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_input_finish.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_input_start.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_lm75.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_mibII.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_netgraph.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_output.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_auth_access.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_send_port.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_send_trap.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_target.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_usm.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_vacm.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_wlan.3.gz
 OLD_FILES+=usr/share/man/man3/snmpd_target_stat.3.gz
 OLD_FILES+=usr/share/man/man3/snmpd_usmstats.3.gz
 OLD_FILES+=usr/share/man/man3/snmpmod.3.gz
 OLD_FILES+=usr/share/man/man3/start_tick.3.gz
 OLD_FILES+=usr/share/man/man3/string_commit.3.gz
 OLD_FILES+=usr/share/man/man3/string_free.3.gz
 OLD_FILES+=usr/share/man/man3/string_get.3.gz
 OLD_FILES+=usr/share/man/man3/string_get_max.3.gz
 OLD_FILES+=usr/share/man/man3/string_rollback.3.gz
 OLD_FILES+=usr/share/man/man3/string_save.3.gz
 OLD_FILES+=usr/share/man/man3/systemg.3.gz
 OLD_FILES+=usr/share/man/man3/this_tick.3.gz
 OLD_FILES+=usr/share/man/man3/timer_start.3.gz
 OLD_FILES+=usr/share/man/man3/timer_start_repeat.3.gz
 OLD_FILES+=usr/share/man/man3/timer_stop.3.gz
 OLD_FILES+=usr/share/man/man3/target_activate_address.3.gz
 OLD_FILES+=usr/share/man/man3/target_address.3.gz
 OLD_FILES+=usr/share/man/man3/target_delete_address.3.gz
 OLD_FILES+=usr/share/man/man3/target_delete_notify.3.gz
 OLD_FILES+=usr/share/man/man3/target_delete_param.3.gz
 OLD_FILES+=usr/share/man/man3/target_first_address.3.gz
 OLD_FILES+=usr/share/man/man3/target_first_notify.3.gz
 OLD_FILES+=usr/share/man/man3/target_first_param.3.gz
 OLD_FILES+=usr/share/man/man3/target_flush_all.3.gz
 OLD_FILES+=usr/share/man/man3/target_next_address.3.gz
 OLD_FILES+=usr/share/man/man3/target_next_notify.3.gz
 OLD_FILES+=usr/share/man/man3/target_next_param.3.gz
 OLD_FILES+=usr/share/man/man3/target_new_address.3.gz
 OLD_FILES+=usr/share/man/man3/target_new_notify.3.gz
 OLD_FILES+=usr/share/man/man3/target_new_param.3.gz
 OLD_FILES+=usr/share/man/man3/target_notify.3.gz
 OLD_FILES+=usr/share/man/man3/target_param.3.gz
 OLD_FILES+=usr/share/man/man3/usm_delete_user.3.gz
 OLD_FILES+=usr/share/man/man3/usm_find_user.3.gz
 OLD_FILES+=usr/share/man/man3/usm_first_user.3.gz
 OLD_FILES+=usr/share/man/man3/usm_flush_users.3.gz
 OLD_FILES+=usr/share/man/man3/usm_next_user.3.gz
 OLD_FILES+=usr/share/man/man3/usm_new_user.3.gz
 OLD_FILES+=usr/share/man/man3/usm_user.3.gz
 OLD_FILES+=usr/share/snmp/defs/bridge_tree.def
 OLD_FILES+=usr/share/snmp/defs/hast_tree.def
 OLD_FILES+=usr/share/snmp/defs/hostres_tree.def
 OLD_FILES+=usr/share/snmp/defs/lm75_tree.def
 OLD_FILES+=usr/share/snmp/defs/mibII_tree.def
 OLD_FILES+=usr/share/snmp/defs/netgraph_tree.def
 OLD_FILES+=usr/share/snmp/defs/pf_tree.def
 OLD_FILES+=usr/share/snmp/defs/target_tree.def
 OLD_FILES+=usr/share/snmp/defs/tc.def
 OLD_FILES+=usr/share/snmp/defs/tree.def
 OLD_FILES+=usr/share/snmp/defs/usm_tree.def
 OLD_FILES+=usr/share/snmp/defs/vacm_tree.def
 OLD_FILES+=usr/share/snmp/defs/wlan_tree.def
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM-FREEBSD-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-BRIDGE-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-HAST-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-HOSTRES-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-IP-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-LM75-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-MIB2-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-NETGRAPH.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-PF-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-SNMPD.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-WIRELESS-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BRIDGE-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/FOKUS-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/FREEBSD-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/RSTP-MIB.txt
 OLD_DIRS+=usr/include/bsnmp
 OLD_DIRS+=usr/share/snmp
 OLD_DIRS+=usr/share/snmp/defs
 OLD_DIRS+=usr/share/snmp/mibs
 .endif
 
 .if ${MK_CALENDAR} == no
 OLD_FILES+=etc/periodic/daily/300.calendar
 OLD_FILES+=usr/bin/calendar
 OLD_FILES+=usr/share/calendar/calendar.all
 OLD_FILES+=usr/share/calendar/calendar.australia
 OLD_FILES+=usr/share/calendar/calendar.birthday
 OLD_FILES+=usr/share/calendar/calendar.brazilian
 OLD_FILES+=usr/share/calendar/calendar.christian
 OLD_FILES+=usr/share/calendar/calendar.computer
 OLD_FILES+=usr/share/calendar/calendar.croatian
 OLD_FILES+=usr/share/calendar/calendar.dutch
 OLD_FILES+=usr/share/calendar/calendar.freebsd
 OLD_FILES+=usr/share/calendar/calendar.french
 OLD_FILES+=usr/share/calendar/calendar.german
 OLD_FILES+=usr/share/calendar/calendar.history
 OLD_FILES+=usr/share/calendar/calendar.holiday
 OLD_FILES+=usr/share/calendar/calendar.hungarian
 OLD_FILES+=usr/share/calendar/calendar.judaic
 OLD_FILES+=usr/share/calendar/calendar.lotr
 OLD_FILES+=usr/share/calendar/calendar.music
 OLD_FILES+=usr/share/calendar/calendar.newzealand
 OLD_FILES+=usr/share/calendar/calendar.russian
 OLD_FILES+=usr/share/calendar/calendar.southafrica
 OLD_FILES+=usr/share/calendar/calendar.ukrainian
 OLD_FILES+=usr/share/calendar/calendar.usholiday
 OLD_FILES+=usr/share/calendar/calendar.world
 OLD_FILES+=usr/share/calendar/de_AT.ISO_8859-15/calendar.feiertag
 OLD_DIRS+=usr/share/calendar/de_AT.ISO_8859-15
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.all
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.feiertag
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.geschichte
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.kirche
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.literatur
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.musik
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.wissenschaft
 OLD_DIRS+=usr/share/calendar/de_DE.ISO8859-1
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-15
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.all
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.fetes
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.french
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.jferies
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.proverbes
 OLD_DIRS+=usr/share/calendar/fr_FR.ISO8859-1
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-15
 OLD_FILES+=usr/share/calendar/hr_HR.ISO8859-2/calendar.all
 OLD_FILES+=usr/share/calendar/hr_HR.ISO8859-2/calendar.praznici
 OLD_DIRS+=usr/share/calendar/hr_HR.ISO8859-2
 OLD_FILES+=usr/share/calendar/hu_HU.ISO8859-2/calendar.all
 OLD_FILES+=usr/share/calendar/hu_HU.ISO8859-2/calendar.nevnapok
 OLD_FILES+=usr/share/calendar/hu_HU.ISO8859-2/calendar.unnepek
 OLD_DIRS+=usr/share/calendar/hu_HU.ISO8859-2
 OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.all
 OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.commemorative
 OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.holidays
 OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.mcommemorative
 OLD_DIRS+=usr/share/calendar/pt_BR.ISO8859-1
 OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.all
 OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.commemorative
 OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.holidays
 OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.mcommemorative
 OLD_DIRS+=usr/share/calendar/pt_BR.UTF-8
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.all
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.common
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.holiday
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.military
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.orthodox
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.pagan
 OLD_DIRS+=usr/share/calendar/ru_RU.KOI8-R
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.all
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.common
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.holiday
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.military
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.orthodox
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.pagan
 OLD_DIRS+=usr/share/calendar/ru_RU.UTF-8
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.all
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.holiday
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.misc
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.orthodox
 OLD_DIRS+=usr/share/calendar/uk_UA.KOI8-U
 OLD_DIRS+=usr/share/calendar
 OLD_FILES+=usr/share/man/man1/calendar.1.gz
 OLD_FILES+=usr/tests/usr.bin/calendar/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/calendar/calendar.calibrate
 OLD_FILES+=usr/tests/usr.bin/calendar/legacy_test
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.a1.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.a2.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.a3.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.a4.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.a5.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.b1.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.b2.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.b3.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.b4.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.b5.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.s1.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.s2.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.s3.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.s4.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.sh
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.w0-1.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.w0-2.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.w0-3.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.w0-4.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.w0-5.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.w0-6.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.w0-7.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.wn-1.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.wn-2.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.wn-3.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.wn-4.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.wn-5.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.wn-6.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.wn-7.out
 OLD_DIRS+=usr/tests/usr.bin/calendar
 .endif
 
 .if ${MK_CASPER} == no
 OLD_LIBS+=lib/libcasper.so.1
 OLD_LIBS+=lib/libcap_dns.so.2
 OLD_LIBS+=lib/libcap_fileargs.so.1
 OLD_LIBS+=lib/libcap_grp.so.1
 OLD_LIBS+=lib/libcap_net.so.1
 OLD_LIBS+=lib/libcap_netdb.so.1
 OLD_LIBS+=lib/libcap_pwd.so.1
 OLD_LIBS+=lib/libcap_sysctl.so.1
 OLD_LIBS+=lib/libcap_sysctl.so.2
 OLD_LIBS+=lib/libcap_syslog.so.1
 .endif
 
 .if ${MK_CCD} == no
 OLD_FILES+=etc/rc.d/ccd
 OLD_FILES+=rescue/ccdconfig
 OLD_FILES+=sbin/ccdconfig
 OLD_FILES+=usr/share/man/man4/ccd.4.gz
 OLD_FILES+=usr/share/man/man8/ccdconfig.8.gz
 .endif
 
 .if ${MK_DTRACE} == no
 OLD_LIBS+=lib/libctf.so.2
 OLD_LIBS+=lib/libdtrace.so.2
 OLD_FILES+=usr/bin/ctfconvert
 OLD_FILES+=usr/bin/ctfdump
 OLD_FILES+=usr/bin/ctfmerge
 OLD_FILES+=usr/lib/dtrace/drti.o
 OLD_FILES+=usr/lib/dtrace/errno.d
 OLD_FILES+=usr/lib/dtrace/io.d
 OLD_FILES+=usr/lib/dtrace/ip.d
 OLD_FILES+=usr/lib/dtrace/ipfw.d
 OLD_FILES+=usr/lib/dtrace/mbuf.d
 OLD_FILES+=usr/lib/dtrace/psinfo.d
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/lib/dtrace/regs_x86.d
 .endif
 OLD_FILES+=usr/lib/dtrace/sctp.d
 OLD_FILES+=usr/lib/dtrace/siftr.d
 OLD_FILES+=usr/lib/dtrace/signal.d
 OLD_FILES+=usr/lib/dtrace/socket.d
 OLD_FILES+=usr/lib/dtrace/tcp.d
 OLD_FILES+=usr/lib/dtrace/udp.d
 OLD_FILES+=usr/lib/dtrace/udplite.d
 OLD_FILES+=usr/lib/dtrace/unistd.d
 OLD_FILES+=usr/lib/libctf.a
 OLD_FILES+=usr/lib/libctf.so
 OLD_FILES+=usr/lib/libctf_p.a
 OLD_FILES+=usr/lib/libdtrace.a
 OLD_FILES+=usr/lib/libdtrace.so
 OLD_FILES+=usr/lib/libdtrace_p.a
 OLD_LIBS+=lib/libdtrace.so.2
 OLD_FILES+=usr/libexec/dwatch/chmod
 OLD_FILES+=usr/libexec/dwatch/errno
 OLD_FILES+=usr/libexec/dwatch/fchmodat
 OLD_FILES+=usr/libexec/dwatch/io
 OLD_FILES+=usr/libexec/dwatch/io-done
 OLD_FILES+=usr/libexec/dwatch/io-start
 OLD_FILES+=usr/libexec/dwatch/ip
 OLD_FILES+=usr/libexec/dwatch/ip-receive
 OLD_FILES+=usr/libexec/dwatch/ip-send
 OLD_FILES+=usr/libexec/dwatch/kill
 OLD_FILES+=usr/libexec/dwatch/lchmod
 OLD_FILES+=usr/libexec/dwatch/nanosleep
 OLD_FILES+=usr/libexec/dwatch/open
 OLD_FILES+=usr/libexec/dwatch/openat
 OLD_FILES+=usr/libexec/dwatch/proc
 OLD_FILES+=usr/libexec/dwatch/proc-create
 OLD_FILES+=usr/libexec/dwatch/proc-exec
 OLD_FILES+=usr/libexec/dwatch/proc-exec-failure
 OLD_FILES+=usr/libexec/dwatch/proc-exec-success
 OLD_FILES+=usr/libexec/dwatch/proc-exit
 OLD_FILES+=usr/libexec/dwatch/proc-signal
 OLD_FILES+=usr/libexec/dwatch/proc-signal-clear
 OLD_FILES+=usr/libexec/dwatch/proc-signal-discard
 OLD_FILES+=usr/libexec/dwatch/proc-signal-send
 OLD_FILES+=usr/libexec/dwatch/proc-status
 OLD_FILES+=usr/libexec/dwatch/read
 OLD_FILES+=usr/libexec/dwatch/recv
 OLD_FILES+=usr/libexec/dwatch/recvfrom
 OLD_FILES+=usr/libexec/dwatch/recvmsg
 OLD_FILES+=usr/libexec/dwatch/rw
 OLD_FILES+=usr/libexec/dwatch/sched
 OLD_FILES+=usr/libexec/dwatch/sched-change-pri
 OLD_FILES+=usr/libexec/dwatch/sched-cpu
 OLD_FILES+=usr/libexec/dwatch/sched-dequeue
 OLD_FILES+=usr/libexec/dwatch/sched-enqueue
 OLD_FILES+=usr/libexec/dwatch/sched-exec
 OLD_FILES+=usr/libexec/dwatch/sched-lend-pri
 OLD_FILES+=usr/libexec/dwatch/sched-load-change
 OLD_FILES+=usr/libexec/dwatch/sched-off-cpu
 OLD_FILES+=usr/libexec/dwatch/sched-on-cpu
 OLD_FILES+=usr/libexec/dwatch/sched-preempt
 OLD_FILES+=usr/libexec/dwatch/sched-pri
 OLD_FILES+=usr/libexec/dwatch/sched-queue
 OLD_FILES+=usr/libexec/dwatch/sched-remain-cpu
 OLD_FILES+=usr/libexec/dwatch/sched-sleep
 OLD_FILES+=usr/libexec/dwatch/sched-surrender
 OLD_FILES+=usr/libexec/dwatch/sched-tick
 OLD_FILES+=usr/libexec/dwatch/sched-wakeup
 OLD_FILES+=usr/libexec/dwatch/send
 OLD_FILES+=usr/libexec/dwatch/sendmsg
 OLD_FILES+=usr/libexec/dwatch/sendrecv
 OLD_FILES+=usr/libexec/dwatch/sendto
 OLD_FILES+=usr/libexec/dwatch/systop
 OLD_FILES+=usr/libexec/dwatch/tcp
 OLD_FILES+=usr/libexec/dwatch/tcp-accept
 OLD_FILES+=usr/libexec/dwatch/tcp-accept-established
 OLD_FILES+=usr/libexec/dwatch/tcp-accept-refused
 OLD_FILES+=usr/libexec/dwatch/tcp-connect
 OLD_FILES+=usr/libexec/dwatch/tcp-connect-established
 OLD_FILES+=usr/libexec/dwatch/tcp-connect-refused
 OLD_FILES+=usr/libexec/dwatch/tcp-connect-request
 OLD_FILES+=usr/libexec/dwatch/tcp-established
 OLD_FILES+=usr/libexec/dwatch/tcp-init
 OLD_FILES+=usr/libexec/dwatch/tcp-io
 OLD_FILES+=usr/libexec/dwatch/tcp-receive
 OLD_FILES+=usr/libexec/dwatch/tcp-refused
 OLD_FILES+=usr/libexec/dwatch/tcp-send
 OLD_FILES+=usr/libexec/dwatch/tcp-state-change
 OLD_FILES+=usr/libexec/dwatch/tcp-status
 OLD_FILES+=usr/libexec/dwatch/udp
 OLD_FILES+=usr/libexec/dwatch/udp-receive
 OLD_FILES+=usr/libexec/dwatch/udp-send
 OLD_FILES+=usr/libexec/dwatch/udplite
 OLD_FILES+=usr/libexec/dwatch/udplite-receive
 OLD_FILES+=usr/libexec/dwatch/udplite-send
 OLD_FILES+=usr/libexec/dwatch/vop_create
 OLD_FILES+=usr/libexec/dwatch/vop_lookup
 OLD_FILES+=usr/libexec/dwatch/vop_mkdir
 OLD_FILES+=usr/libexec/dwatch/vop_mknod
 OLD_FILES+=usr/libexec/dwatch/vop_readdir
 OLD_FILES+=usr/libexec/dwatch/vop_remove
 OLD_FILES+=usr/libexec/dwatch/vop_rename
 OLD_FILES+=usr/libexec/dwatch/vop_rmdir
 OLD_FILES+=usr/libexec/dwatch/vop_symlink
 OLD_FILES+=usr/libexec/dwatch/write
 OLD_FILES+=usr/sbin/dtrace
 OLD_FILES+=usr/sbin/dwatch
 OLD_FILES+=usr/sbin/lockstat
 OLD_FILES+=usr/sbin/plockstat
 OLD_FILES+=usr/share/man/man1/dtrace.1.gz
 OLD_FILES+=usr/share/man/man1/dtruss.1.gz
 OLD_FILES+=usr/share/man/man1/lockstat.1.gz
 OLD_FILES+=usr/share/man/man1/plockstat.1.gz
 OLD_FILES+=usr/share/dtrace/blocking
 OLD_FILES+=usr/share/dtrace/disklatency
 OLD_FILES+=usr/share/dtrace/disklatencycmd
 OLD_FILES+=usr/share/dtrace/hotopen
 OLD_FILES+=usr/share/dtrace/nfsattrstats
 OLD_FILES+=usr/share/dtrace/nfsclienttime
 OLD_FILES+=usr/share/dtrace/siftr
 OLD_FILES+=usr/share/dtrace/toolkit/execsnoop
 OLD_FILES+=usr/share/dtrace/toolkit/hotkernel
 OLD_FILES+=usr/share/dtrace/toolkit/hotuser
 OLD_FILES+=usr/share/dtrace/toolkit/opensnoop
 OLD_FILES+=usr/share/dtrace/toolkit/procsystime
 OLD_FILES+=usr/share/dtrace/tcpconn
 OLD_FILES+=usr/share/dtrace/tcpdebug
 OLD_FILES+=usr/share/dtrace/tcpstate
 OLD_FILES+=usr/share/dtrace/tcptrack
 OLD_FILES+=usr/share/dtrace/udptrack
 OLD_FILES+=usr/share/man/man1/dtrace.1.gz
 OLD_DIRS+=usr/lib/dtrace
 .  for libcompat in ${_ALL_libcompats}
 OLD_DIRS+=usr/lib${libcompat}/dtrace
 .  endfor
 OLD_DIRS+=usr/libexec/dwatch
 OLD_DIRS+=usr/share/dtrace/toolkit
 OLD_DIRS+=usr/share/dtrace
 .endif
 
 .if ${MK_ZFS} == no
 OLD_FILES+=boot/gptzfsboot
 OLD_FILES+=boot/zfsboot
 OLD_FILES+=boot/zfsloader
 OLD_FILES+=etc/rc.d/zfs
 OLD_FILES+=etc/rc.d/zfsbe
 OLD_FILES+=etc/rc.d/zfsd
 OLD_FILES+=etc/rc.d/zfskeys
 OLD_FILES+=etc/rc.d/zvol
 OLD_FILES+=etc/devd/zfs.conf
 OLD_FILES+=etc/periodic/daily/404.status-zfs
 OLD_FILES+=etc/periodic/daily/800.scrub-zfs
 OLD_FILES+=etc/zfs/exports
 OLD_DIRS+=etc/zfs
 OLD_LIBS+=lib/libavl.so.2
 OLD_LIBS+=lib/libnvpair.so.2
 OLD_LIBS+=lib/libumem.so.2
 OLD_LIBS+=lib/libuutil.so.2
 OLD_LIBS+=lib/libzfs.so.2
 OLD_LIBS+=lib/libzfs.so.3
 OLD_LIBS+=lib/libzfs_core.so.2
 OLD_LIBS+=lib/libzpool.so.2
 OLD_FILES+=rescue/zdb
 OLD_FILES+=rescue/zfs
 OLD_FILES+=rescue/zpool
 OLD_FILES+=sbin/bectl
 OLD_FILES+=sbin/zfs
 OLD_FILES+=sbin/zpool
 OLD_FILES+=sbin/zfsbootcfg
 OLD_FILES+=usr/bin/zinject
 OLD_FILES+=usr/bin/zstreamdump
 OLD_FILES+=usr/bin/ztest
 OLD_FILES+=usr/lib/libbe.a
 OLD_FILES+=usr/lib/libbe_p.a
 OLD_FILES+=usr/lib/libbe.so
 OLD_LIBS+=lib/libbe.so.1
 OLD_FILES+=usr/lib/libavl.a
 OLD_FILES+=usr/lib/libavl.so
 OLD_FILES+=usr/lib/libavl_p.a
 OLD_FILES+=usr/lib/libnvpair.a
 OLD_FILES+=usr/lib/libnvpair.so
 OLD_FILES+=usr/lib/libnvpair_p.a
 OLD_FILES+=usr/lib/libumem.a
 OLD_FILES+=usr/lib/libumem.so
 OLD_FILES+=usr/lib/libumem_p.a
 OLD_FILES+=usr/lib/libuutil.a
 OLD_FILES+=usr/lib/libuutil.so
 OLD_FILES+=usr/lib/libuutil_p.a
 OLD_FILES+=usr/lib/libzfs.a
 OLD_FILES+=usr/lib/libzfs.so
 OLD_FILES+=usr/lib/libzfs_core.a
 OLD_FILES+=usr/lib/libzfs_core.so
 OLD_FILES+=usr/lib/libzfs_core_p.a
 OLD_FILES+=usr/lib/libzfs_p.a
 OLD_FILES+=usr/lib/libzpool.a
 OLD_FILES+=usr/lib/libzpool.so
 OLD_LIBS+=usr/lib/libzpool.so.2
 OLD_FILES+=usr/sbin/zfsd
 OLD_FILES+=usr/sbin/zhack
 OLD_FILES+=usr/sbin/zdb
 OLD_FILES+=usr/share/man/man3/be_activate.3.gz
 OLD_FILES+=usr/share/man/man3/be_active_name.3.gz
 OLD_FILES+=usr/share/man/man3/be_active_path.3.gz
 OLD_FILES+=usr/share/man/man3/be_create_depth.3.gz
 OLD_FILES+=usr/share/man/man3/be_create_from_existing_snap.3.gz
 OLD_FILES+=usr/share/man/man3/be_create_from_existing.3.gz
 OLD_FILES+=usr/share/man/man3/be_create.3.gz
 OLD_FILES+=usr/share/man/man3/be_deactivate.3.gz
 OLD_FILES+=usr/share/man/man3/be_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/be_exists.3.gz
 OLD_FILES+=usr/share/man/man3/be_export.3.gz
 OLD_FILES+=usr/share/man/man3/be_get_bootenv_props.3.gz
 OLD_FILES+=usr/share/man/man3/be_get_dataset_props.3.gz
 OLD_FILES+=usr/share/man/man3/be_get_dataset_snapshots.3.gz
 OLD_FILES+=usr/share/man/man3/be_import.3.gz
 OLD_FILES+=usr/share/man/man3/be_is_auto_snapshot_name.3.gz
 OLD_FILES+=usr/share/man/man3/be_mount.3.gz
 OLD_FILES+=usr/share/man/man3/be_mounted_at.3.gz
 OLD_FILES+=usr/share/man/man3/be_nextboot_name.3.gz
 OLD_FILES+=usr/share/man/man3/be_nextboot_path.3.gz
 OLD_FILES+=usr/share/man/man3/be_nicenum.3.gz
 OLD_FILES+=usr/share/man/man3/be_prop_list_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/be_prop_list_free.3.gz
 OLD_FILES+=usr/share/man/man3/be_rename.3.gz
 OLD_FILES+=usr/share/man/man3/be_root_concat.3.gz
 OLD_FILES+=usr/share/man/man3/be_root_path.3.gz
 OLD_FILES+=usr/share/man/man3/be_snapshot.3.gz
 OLD_FILES+=usr/share/man/man3/be_unmount.3.gz
 OLD_FILES+=usr/share/man/man3/be_validate_name.3.gz
 OLD_FILES+=usr/share/man/man3/be_validate_snap.3.gz
 OLD_FILES+=usr/share/man/man3/libbe_close.3.gz
 OLD_FILES+=usr/share/man/man3/libbe_errno.3.gz
 OLD_FILES+=usr/share/man/man3/libbe_error_description.3.gz
 OLD_FILES+=usr/share/man/man3/libbe_init.3.gz
 OLD_FILES+=usr/share/man/man3/libbe_print_on_error.3.gz
 OLD_FILES+=usr/share/man/man3/libbe.3.gz
 OLD_FILES+=usr/share/man/man5/zpool-features.5.gz
 OLD_FILES+=usr/share/man/man8/bectl.8.gz
 OLD_FILES+=usr/share/man/man8/gptzfsboot.8.gz
 OLD_FILES+=usr/share/man/man8/zdb.8.gz
 OLD_FILES+=usr/share/man/man8/zfs-program.8.gz
 OLD_FILES+=usr/share/man/man8/zfs.8.gz
 OLD_FILES+=usr/share/man/man8/zfsboot.8.gz
 OLD_FILES+=usr/share/man/man8/zfsbootcfg.8.gz
 OLD_FILES+=usr/share/man/man8/zfsd.8.gz
 OLD_FILES+=usr/share/man/man8/zfsloader.8.gz
 OLD_FILES+=usr/share/man/man8/zpool.8.gz
 .endif
 
 .if ${MK_CLANG} == no && ${MK_LLVM_BINUTILS} == no
 OLD_FILES+=usr/bin/llvm-addr2line
 OLD_FILES+=usr/bin/llvm-ar
 OLD_FILES+=usr/bin/llvm-nm
 OLD_FILES+=usr/bin/llvm-objcopy
 OLD_FILES+=usr/bin/llvm-objdump
 OLD_FILES+=usr/bin/llvm-ranlib
 OLD_FILES+=usr/bin/llvm-readelf
 OLD_FILES+=usr/bin/llvm-readobj
 OLD_FILES+=usr/bin/llvm-size
 OLD_FILES+=usr/bin/llvm-strings
 OLD_FILES+=usr/bin/llvm-symbolizer
 OLD_FILES+=usr/bin/objdump
 OLD_FILES+=usr/share/man/man1/llvm-addr2line.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-ar.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-nm.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-objcopy.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-ranlib.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-readelf.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-readobj.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-size.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-strings.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-symbolizer.1.gz
 OLD_FILES+=usr/share/man/man1/objdump.1.gz
 .endif
 
 .if ${MK_CLANG} == no
 OLD_FILES+=usr/bin/clang
 OLD_FILES+=usr/bin/clang++
 OLD_FILES+=usr/bin/clang-cpp
 OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_texture_intrinsics.h
 OLD_FILES+=usr/lib/clang/16/include/__clang_hip_cmath.h
 OLD_FILES+=usr/lib/clang/16/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/16/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/16/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/16/include/__clang_hip_stdlib.h
 OLD_FILES+=usr/lib/clang/16/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/16/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/16/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/16/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/16/include/altivec.h
 OLD_FILES+=usr/lib/clang/16/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/16/include/amxfp16intrin.h
 OLD_FILES+=usr/lib/clang/16/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/16/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/16/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/16/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/16/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/16/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/16/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/16/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/16/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/16/include/arm_neon_sve_bridge.h
 OLD_FILES+=usr/lib/clang/16/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/16/include/armintr.h
 OLD_FILES+=usr/lib/clang/16/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512fp16intrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vlfp16intrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avxifmaintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avxneconvertintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avxvnniint8intrin.h
 OLD_FILES+=usr/lib/clang/16/include/avxvnniintrin.h
 OLD_FILES+=usr/lib/clang/16/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/16/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/16/include/builtins.h
 OLD_FILES+=usr/lib/clang/16/include/cet.h
 OLD_FILES+=usr/lib/clang/16/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/16/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/16/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/16/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/16/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/16/include/cmpccxaddintrin.h
 OLD_FILES+=usr/lib/clang/16/include/cpuid.h
 OLD_FILES+=usr/lib/clang/16/include/crc32intrin.h
 OLD_FILES+=usr/lib/clang/16/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/16/include/cuda_wrappers/cmath
 OLD_FILES+=usr/lib/clang/16/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/16/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/16/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/16/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/16/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/16/include/float.h
 OLD_FILES+=usr/lib/clang/16/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/16/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/16/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/16/include/fuzzer
 OLD_FILES+=usr/lib/clang/16/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/16/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/16/include/hexagon_circ_brev_intrinsics.h
 OLD_FILES+=usr/lib/clang/16/include/hexagon_protos.h
 OLD_FILES+=usr/lib/clang/16/include/hexagon_types.h
 OLD_FILES+=usr/lib/clang/16/include/hlsl/hlsl_basic_types.h
 OLD_FILES+=usr/lib/clang/16/include/hlsl/hlsl_intrinsics.h
 OLD_DIRS+=usr/lib/clang/16/include/hlsl
 OLD_FILES+=usr/lib/clang/16/include/hlsl.h
 OLD_FILES+=usr/lib/clang/16/include/hresetintrin.h
 OLD_FILES+=usr/lib/clang/16/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/16/include/hvx_hexagon_protos.h
 OLD_FILES+=usr/lib/clang/16/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/16/include/immintrin.h
 OLD_FILES+=usr/lib/clang/16/include/intrin.h
 OLD_FILES+=usr/lib/clang/16/include/inttypes.h
 OLD_FILES+=usr/lib/clang/16/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/16/include/iso646.h
 OLD_FILES+=usr/lib/clang/16/include/keylockerintrin.h
 OLD_FILES+=usr/lib/clang/16/include/larchintrin.h
 OLD_FILES+=usr/lib/clang/16/include/limits.h
 OLD_FILES+=usr/lib/clang/16/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/16/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/16/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/16/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/16/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/module.modulemap
 OLD_FILES+=usr/lib/clang/16/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/16/include/msa.h
 OLD_FILES+=usr/lib/clang/16/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/16/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/omp-tools.h
 OLD_FILES+=usr/lib/clang/16/include/omp.h
 OLD_FILES+=usr/lib/clang/16/include/ompt.h
 OLD_FILES+=usr/lib/clang/16/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/16/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/16/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/16/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/16/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/16/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/16/include/openmp_wrappers/complex_cmath.h
 OLD_FILES+=usr/lib/clang/16/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/16/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/16/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/16/include/orc_rt/c_api.h
 OLD_DIRS+=usr/lib/clang/16/include/orc_rt
 OLD_FILES+=usr/lib/clang/16/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/16/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/16/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/16/include/ppc_wrappers/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/16/include/ppc_wrappers/bmiintrin.h
 OLD_FILES+=usr/lib/clang/16/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/ppc_wrappers/immintrin.h
 OLD_FILES+=usr/lib/clang/16/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/16/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/ppc_wrappers/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/16/include/ppc_wrappers/x86intrin.h
 OLD_FILES+=usr/lib/clang/16/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/16/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/16/include/prfchiintrin.h
 OLD_FILES+=usr/lib/clang/16/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/16/include/profile/InstrProfData.inc
 OLD_FILES+=usr/lib/clang/16/include/profile/MemProfData.inc
 OLD_DIRS+=usr/lib/clang/16/include/profile
 OLD_FILES+=usr/lib/clang/16/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/16/include/raointintrin.h
 OLD_FILES+=usr/lib/clang/16/include/rdpruintrin.h
 OLD_FILES+=usr/lib/clang/16/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/16/include/riscv_vector.h
 OLD_FILES+=usr/lib/clang/16/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/memprof_interface.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/16/include/sanitizer
 OLD_FILES+=usr/lib/clang/16/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/16/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/16/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/16/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/stdalign.h
 OLD_FILES+=usr/lib/clang/16/include/stdarg.h
 OLD_FILES+=usr/lib/clang/16/include/stdatomic.h
 OLD_FILES+=usr/lib/clang/16/include/stdbool.h
 OLD_FILES+=usr/lib/clang/16/include/stddef.h
 OLD_FILES+=usr/lib/clang/16/include/stdint.h
 OLD_FILES+=usr/lib/clang/16/include/stdnoreturn.h
 OLD_FILES+=usr/lib/clang/16/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/tgmath.h
 OLD_FILES+=usr/lib/clang/16/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/16/include/uintrintrin.h
 OLD_FILES+=usr/lib/clang/16/include/unwind.h
 OLD_FILES+=usr/lib/clang/16/include/vadefs.h
 OLD_FILES+=usr/lib/clang/16/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/16/include/varargs.h
 OLD_FILES+=usr/lib/clang/16/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/16/include/velintrin.h
 OLD_FILES+=usr/lib/clang/16/include/velintrin_approx.h
 OLD_FILES+=usr/lib/clang/16/include/velintrin_gen.h
 OLD_FILES+=usr/lib/clang/16/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/16/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/16/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/16/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/16/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/16/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/16/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/16/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/16/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/16/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/16/include/xray
 OLD_FILES+=usr/lib/clang/16/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/16/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/16/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/16/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/16/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/16/include
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan_static-i386.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan_static-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/16/lib/freebsd
 OLD_DIRS+=usr/lib/clang/16/lib
 OLD_FILES+=usr/lib/clang/16/share/asan_ignorelist.txt
 OLD_FILES+=usr/lib/clang/16/share/cfi_ignorelist.txt
 OLD_FILES+=usr/lib/clang/16/share/msan_ignorelist.txt
 OLD_DIRS+=usr/lib/clang/16/share
 OLD_DIRS+=usr/lib/clang/16
 OLD_DIRS+=usr/lib/clang
 OLD_FILES+=usr/share/doc/llvm/clang/LICENSE.TXT
 OLD_DIRS+=usr/share/doc/llvm/clang
 OLD_FILES+=usr/share/doc/llvm/COPYRIGHT.regex
 OLD_FILES+=usr/share/doc/llvm/LICENSE.TXT
 OLD_DIRS+=usr/share/doc/llvm
 OLD_FILES+=usr/share/man/man1/clang.1.gz
 OLD_FILES+=usr/share/man/man1/clang++.1.gz
 OLD_FILES+=usr/share/man/man1/clang-cpp.1.gz
 .endif
 
 .if ${MK_CLANG_EXTRAS} == no
 OLD_FILES+=usr/bin/bugpoint
 OLD_FILES+=usr/bin/llc
 OLD_FILES+=usr/bin/lli
 OLD_FILES+=usr/bin/llvm-as
 OLD_FILES+=usr/bin/llvm-bcanalyzer
 OLD_FILES+=usr/bin/llvm-cxxdump
 OLD_FILES+=usr/bin/llvm-diff
 OLD_FILES+=usr/bin/llvm-dis
 OLD_FILES+=usr/bin/llvm-dwarfdump
 OLD_FILES+=usr/bin/llvm-dwp
 OLD_FILES+=usr/bin/llvm-extract
 OLD_FILES+=usr/bin/llvm-link
 OLD_FILES+=usr/bin/llvm-lto
 OLD_FILES+=usr/bin/llvm-lto2
 OLD_FILES+=usr/bin/llvm-mc
 OLD_FILES+=usr/bin/llvm-mca
 OLD_FILES+=usr/bin/llvm-modextract
 OLD_FILES+=usr/bin/llvm-pdbutil
 OLD_FILES+=usr/bin/llvm-rtdyld
 OLD_FILES+=usr/bin/llvm-xray
 OLD_FILES+=usr/bin/opt
 OLD_FILES+=usr/share/man/man1/bugpoint.1.gz
 OLD_FILES+=usr/share/man/man1/llc.1.gz
 OLD_FILES+=usr/share/man/man1/lli.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-as.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-bcanalyzer.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-diff.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-dis.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-dwarfdump.1
 OLD_FILES+=usr/share/man/man1/llvm-extract.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-link.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-pdbutil.1.gz
 OLD_FILES+=usr/share/man/man1/opt.1.gz
 .endif
 
 .if ${MK_CLANG_EXTRAS} == no && ${MK_CLANG_FORMAT} == no
 OLD_FILES+=usr/bin/clang-format
 .endif
 
 .if ${MK_CLANG_EXTRAS} == no && ${MK_LLVM_CXXFILT} == no
 OLD_FILES+=usr/bin/llvm-cxxfilt
 OLD_FILES+=usr/share/man/man1/llvm-cxxfilt.1.gz
 .endif
 
 .if ${MK_CPP} == no
 OLD_FILES+=usr/bin/cpp
 OLD_FILES+=usr/share/man/man1/cpp.1.gz
 .endif
 
 .if ${MK_CUSE} == no
 OLD_FILES+=usr/include/fs/cuse/cuse_defs.h
 OLD_FILES+=usr/include/fs/cuse/cuse_ioctl.h
 OLD_FILES+=usr/include/cuse.h
 OLD_FILES+=usr/lib/libcuse.a
 OLD_LIBS+=usr/lib/libcuse.so.1
 OLD_FILES+=usr/lib/libcuse_p.a
 OLD_FILES+=usr/share/man/man3/cuse.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_alloc_unit_number.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_alloc_unit_number_by_id.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_copy_in.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_copy_out.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_dev_create.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_dev_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_dev_get_current.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_dev_get_per_file_handle.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_dev_get_priv0.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_dev_get_priv1.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_dev_set_per_file_handle.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_dev_set_priv0.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_dev_set_priv1.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_free_unit_number.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_free_unit_number_by_id.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_get_local.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_got_peer_signal.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_init.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_is_vmalloc_addr.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_poll_wakeup.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_set_local.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_uninit.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_vmalloc.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_vmfree.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_vmoffset.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_wait_and_process.3.gz
 OLD_DIRS+=usr/include/fs/cuse
 .endif
 
 .if ${MK_DEBUG_FILES} == no
 .if exists(${DESTDIR}/usr/lib/debug)
 DEBUG_DIRS!=find ${DESTDIR}/usr/lib/debug -mindepth 1 \
     -type d \! -path "${DESTDIR}/usr/lib/debug/boot/*" \
     | sed -e 's,^${DESTDIR}/,,'; echo
 DEBUG_FILES!=find ${DESTDIR}/usr/lib/debug \
     \! -type d \! -path "${DESTDIR}/usr/lib/debug/boot/*" \! -name "lib*.so*" \
     | sed -e 's,^${DESTDIR}/,,'; echo
 DEBUG_LIBS!=find ${DESTDIR}/usr/lib/debug \! -type d -name "lib*.so*" \
     | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_DIRS+=${DEBUG_DIRS}
 OLD_FILES+=${DEBUG_FILES}
 OLD_LIBS+=${DEBUG_LIBS}
 .endif
 .endif
 
 .if ${MK_DIALOG} == no
 OLD_FILES+=usr/bin/dialog
 OLD_FILES+=usr/bin/dpv
 OLD_FILES+=usr/lib/libdialog.a
 OLD_FILES+=usr/lib/libdialog.so
 OLD_LIBS+=usr/lib/libdialog.so.10
 OLD_FILES+=usr/lib/libdialog_p.a
 OLD_FILES+=usr/lib/libdpv.a
 OLD_FILES+=usr/lib/libdpv.so
 OLD_LIBS+=usr/lib/libdpv.so.3
 OLD_FILES+=usr/lib/libdpv_p.a
 OLD_FILES+=usr/share/man/man1/dialog.1.gz
 OLD_FILES+=usr/share/man/man1/dpv.1.gz
 OLD_FILES+=usr/share/man/man3/dialog.3.gz
 OLD_FILES+=usr/share/man/man3/dpv.3.gz
 .endif
 
 .if ${MK_EFI} == no
 OLD_FILES+=usr/sbin/efibootmgr
 OLD_FILES+=usr/sbin/efidp
 OLD_FILES+=usr/sbin/efivar
 OLD_FILES+=usr/sbin/uefisign
 OLD_FILES+=usr/share/examples/uefisign/uefikeys
 .endif
 
 .if ${MK_FTP} == no
 OLD_FILES+=etc/ftpusers
 OLD_FILES+=etc/newsyslog.conf.d/ftp.conf
 OLD_FILES+=etc/pam.d/ftp
 OLD_FILES+=etc/pam.d/ftpd
 OLD_FILES+=etc/rc.d/ftpd
 OLD_FILES+=etc/syslog.d/ftp.conf
 OLD_FILES+=usr/bin/ftp
 OLD_FILES+=usr/bin/gate-ftp
 OLD_FILES+=usr/bin/pftp
 OLD_FILES+=usr/libexec/ftpd
 OLD_FILES+=usr/share/man/man1/ftp.1.gz
 OLD_FILES+=usr/share/man/man1/gate-ftp.1.gz
 OLD_FILES+=usr/share/man/man1/pftp.1.gz
 OLD_FILES+=usr/share/man/man5/ftpchroot.5.gz
 OLD_FILES+=usr/share/man/man8/ftpd.8.gz
 .endif
 
 .if ${MK_DICT} == no
 OLD_FILES+=usr/share/dict/README
 OLD_FILES+=usr/share/dict/freebsd
 OLD_FILES+=usr/share/dict/propernames
 OLD_FILES+=usr/share/dict/web2
 OLD_FILES+=usr/share/dict/web2a
 OLD_FILES+=usr/share/dict/words
 OLD_DIRS+=usr/share/dict
 .endif
 
 .if ${MK_DMAGENT} == no
 OLD_FILES+=etc/dma/dma.conf
 OLD_DIRS+=etc/dma
 OLD_FILES+=usr/libexec/dma
 OLD_FILES+=usr/libexec/dma-mbox-create
 OLD_FILES+=usr/share/man/man8/dma.8.gz
 OLD_FILES+=usr/share/examples/dma/auth.conf
 OLD_FILES+=usr/share/examples/dma/mailer.conf
 OLD_DIRS+=usr/share/examples/dma
 .endif
 
 .if ${MK_EE} == no
 OLD_FILES+=usr/bin/edit
 OLD_FILES+=usr/bin/ee
 OLD_FILES+=usr/bin/ree
 OLD_FILES+=usr/share/man/man1/edit.1.gz
 OLD_FILES+=usr/share/man/man1/ee.1.gz
 OLD_FILES+=usr/share/man/man1/ree.1.gz
 OLD_FILES+=usr/share/nls/C/ee.cat
 OLD_FILES+=usr/share/nls/de_DE.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/fr_FR.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/ee.cat
 OLD_FILES+=usr/share/nls/pl_PL.ISO8859-2/ee.cat
 OLD_FILES+=usr/share/nls/pt_BR.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/ee.cat
 OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/ee.cat
 .endif
 
 .if ${MK_EXAMPLES} == no
 OLD_FILES+=usr/share/examples/BSD_daemon/FreeBSD.pfa
 OLD_FILES+=usr/share/examples/BSD_daemon/README
 OLD_FILES+=usr/share/examples/BSD_daemon/beastie.eps
 OLD_FILES+=usr/share/examples/BSD_daemon/beastie.fig
 OLD_FILES+=usr/share/examples/BSD_daemon/eps.patch
 OLD_FILES+=usr/share/examples/BSD_daemon/poster.sh
 OLD_FILES+=usr/share/examples/FreeBSD_version/FreeBSD_version.c
 OLD_FILES+=usr/share/examples/FreeBSD_version/Makefile
 OLD_FILES+=usr/share/examples/FreeBSD_version/README
 OLD_FILES+=usr/share/examples/IPv6/USAGE
 OLD_FILES+=usr/share/examples/bhyve/vmrun.sh
 OLD_FILES+=usr/share/examples/bootforth/README
 OLD_FILES+=usr/share/examples/bootforth/boot.4th
 OLD_FILES+=usr/share/examples/bootforth/frames.4th
 OLD_FILES+=usr/share/examples/bootforth/loader.rc
 OLD_FILES+=usr/share/examples/bootforth/menu.4th
 OLD_FILES+=usr/share/examples/bootforth/menuconf.4th
 OLD_FILES+=usr/share/examples/bootforth/screen.4th
 OLD_FILES+=usr/share/examples/bsdconfig/add_some_packages.sh
 OLD_FILES+=usr/share/examples/bsdconfig/browse_packages_http.sh
 OLD_FILES+=usr/share/examples/bsdconfig/bsdconfigrc
 OLD_FILES+=usr/share/examples/csh/dot.cshrc
 OLD_FILES+=usr/share/examples/diskless/ME
 OLD_FILES+=usr/share/examples/diskless/README.BOOTP
 OLD_FILES+=usr/share/examples/diskless/README.TEMPLATING
 OLD_FILES+=usr/share/examples/diskless/clone_root
 OLD_FILES+=usr/share/examples/dma/mailer.conf
 OLD_FILES+=usr/share/examples/drivers/README
 OLD_FILES+=usr/share/examples/drivers/make_device_driver.sh
 OLD_FILES+=usr/share/examples/drivers/make_pseudo_driver.sh
 OLD_FILES+=usr/share/examples/dwatch/profile_template
 OLD_FILES+=usr/share/examples/etc/README.examples
 OLD_FILES+=usr/share/examples/etc/bsd-style-copyright
 OLD_FILES+=usr/share/examples/etc/group
 OLD_FILES+=usr/share/examples/etc/login.access
 OLD_FILES+=usr/share/examples/etc/make.conf
 OLD_FILES+=usr/share/examples/etc/rc.bsdextended
 OLD_FILES+=usr/share/examples/etc/rc.firewall
 OLD_FILES+=usr/share/examples/etc/termcap.small
 OLD_FILES+=usr/share/examples/etc/wpa_supplicant.conf
 OLD_FILES+=usr/share/examples/find_interface/Makefile
 OLD_FILES+=usr/share/examples/find_interface/README
 OLD_FILES+=usr/share/examples/find_interface/find_interface.c
 OLD_FILES+=usr/share/examples/flua/libjail.lua
 OLD_FILES+=usr/share/examples/hast/ucarp.sh
 OLD_FILES+=usr/share/examples/hast/ucarp_down.sh
 OLD_FILES+=usr/share/examples/hast/ucarp_up.sh
 OLD_FILES+=usr/share/examples/hast/vip-down.sh
 OLD_FILES+=usr/share/examples/hast/vip-up.sh
 OLD_FILES+=usr/share/examples/hostapd/hostapd.conf
 OLD_FILES+=usr/share/examples/hostapd/hostapd.eap_user
 OLD_FILES+=usr/share/examples/hostapd/hostapd.wpa_psk
 OLD_FILES+=usr/share/examples/indent/indent.pro
 OLD_FILES+=usr/share/examples/ipfilter/BASIC.NAT
 OLD_FILES+=usr/share/examples/ipfilter/BASIC_1.FW
 OLD_FILES+=usr/share/examples/ipfilter/BASIC_2.FW
 OLD_FILES+=usr/share/examples/ipfilter/README
 OLD_FILES+=usr/share/examples/ipfilter/example.1
 OLD_FILES+=usr/share/examples/ipfilter/example.10
 OLD_FILES+=usr/share/examples/ipfilter/example.11
 OLD_FILES+=usr/share/examples/ipfilter/example.12
 OLD_FILES+=usr/share/examples/ipfilter/example.13
 OLD_FILES+=usr/share/examples/ipfilter/example.14
 OLD_FILES+=usr/share/examples/ipfilter/example.2
 OLD_FILES+=usr/share/examples/ipfilter/example.3
 OLD_FILES+=usr/share/examples/ipfilter/example.4
 OLD_FILES+=usr/share/examples/ipfilter/example.5
 OLD_FILES+=usr/share/examples/ipfilter/example.6
 OLD_FILES+=usr/share/examples/ipfilter/example.7
 OLD_FILES+=usr/share/examples/ipfilter/example.8
 OLD_FILES+=usr/share/examples/ipfilter/example.9
 OLD_FILES+=usr/share/examples/ipfilter/example.sr
 OLD_FILES+=usr/share/examples/ipfilter/examples.txt
 OLD_FILES+=usr/share/examples/ipfilter/firewall
 OLD_FILES+=usr/share/examples/ipfilter/firewall.1
 OLD_FILES+=usr/share/examples/ipfilter/firewall.2
 OLD_FILES+=usr/share/examples/ipfilter/ftp-proxy
 OLD_FILES+=usr/share/examples/ipfilter/ftppxy
 OLD_FILES+=usr/share/examples/ipfilter/ipf-howto.txt
 OLD_FILES+=usr/share/examples/ipfilter/ipf.conf.permissive
 OLD_FILES+=usr/share/examples/ipfilter/ipf.conf.restrictive
 OLD_FILES+=usr/share/examples/ipfilter/ipf.conf.sample
 OLD_FILES+=usr/share/examples/ipfilter/ipnat.conf.sample
 OLD_FILES+=usr/share/examples/ipfilter/mkfilters
 OLD_FILES+=usr/share/examples/ipfilter/nat-setup
 OLD_FILES+=usr/share/examples/ipfilter/nat.eg
 OLD_FILES+=usr/share/examples/ipfilter/rules.txt
 OLD_FILES+=usr/share/examples/ipfilter/server
 OLD_FILES+=usr/share/examples/ipfilter/tcpstate
 OLD_FILES+=usr/share/examples/ipfw/change_rules.sh
 OLD_FILES+=usr/share/examples/jails/README
 OLD_FILES+=usr/share/examples/jails/VIMAGE
 OLD_FILES+=usr/share/examples/jails/jail.xxx.conf
 OLD_FILES+=usr/share/examples/jails/jib
 OLD_FILES+=usr/share/examples/jails/jng
 OLD_FILES+=usr/share/examples/jails/rc.conf.jails
 OLD_FILES+=usr/share/examples/jails/rcjail.xxx.conf
 OLD_FILES+=usr/share/examples/kld/Makefile
 OLD_FILES+=usr/share/examples/kld/cdev/Makefile
 OLD_FILES+=usr/share/examples/kld/cdev/README
 OLD_FILES+=usr/share/examples/kld/cdev/module/Makefile
 OLD_FILES+=usr/share/examples/kld/cdev/module/cdev.c
 OLD_FILES+=usr/share/examples/kld/cdev/module/cdev.h
 OLD_FILES+=usr/share/examples/kld/cdev/module/cdevmod.c
 OLD_FILES+=usr/share/examples/kld/cdev/test/Makefile
 OLD_FILES+=usr/share/examples/kld/cdev/test/testcdev.c
 OLD_FILES+=usr/share/examples/kld/dyn_sysctl/Makefile
 OLD_FILES+=usr/share/examples/kld/dyn_sysctl/README
 OLD_FILES+=usr/share/examples/kld/dyn_sysctl/dyn_sysctl.c
 OLD_FILES+=usr/share/examples/kld/firmware/Makefile
 OLD_FILES+=usr/share/examples/kld/firmware/README
 OLD_FILES+=usr/share/examples/kld/firmware/fwconsumer/Makefile
 OLD_FILES+=usr/share/examples/kld/firmware/fwconsumer/fw_consumer.c
 OLD_FILES+=usr/share/examples/kld/firmware/fwimage/Makefile
 OLD_FILES+=usr/share/examples/kld/firmware/fwimage/firmware.img.uu
 OLD_FILES+=usr/share/examples/kld/khelp/Makefile
 OLD_FILES+=usr/share/examples/kld/khelp/README
 OLD_FILES+=usr/share/examples/kld/khelp/h_example.c
 OLD_FILES+=usr/share/examples/kld/syscall/Makefile
 OLD_FILES+=usr/share/examples/kld/syscall/module/Makefile
 OLD_FILES+=usr/share/examples/kld/syscall/module/syscall.c
 OLD_FILES+=usr/share/examples/kld/syscall/test/Makefile
 OLD_FILES+=usr/share/examples/kld/syscall/test/call.c
 OLD_FILES+=usr/share/examples/kyua/Kyuafile.top
 OLD_FILES+=usr/share/examples/kyua/kyua.conf
 OLD_FILES+=usr/share/examples/libusb20/Makefile
 OLD_FILES+=usr/share/examples/libusb20/README
 OLD_FILES+=usr/share/examples/libusb20/bulk.c
 OLD_FILES+=usr/share/examples/libusb20/control.c
 OLD_FILES+=usr/share/examples/libusb20/util.c
 OLD_FILES+=usr/share/examples/libusb20/util.h
 OLD_FILES+=usr/share/examples/libvgl/Makefile
 OLD_FILES+=usr/share/examples/libvgl/demo.c
 OLD_FILES+=usr/share/examples/mdoc/POSIX-copyright
 OLD_FILES+=usr/share/examples/mdoc/deshallify.sh
 OLD_FILES+=usr/share/examples/mdoc/example.1
 OLD_FILES+=usr/share/examples/mdoc/example.3
 OLD_FILES+=usr/share/examples/mdoc/example.4
 OLD_FILES+=usr/share/examples/mdoc/example.9
 OLD_FILES+=usr/share/examples/netgraph/ether.bridge
 OLD_FILES+=usr/share/examples/netgraph/frame_relay
 OLD_FILES+=usr/share/examples/netgraph/ngctl
 OLD_FILES+=usr/share/examples/netgraph/raw
 OLD_FILES+=usr/share/examples/netgraph/udp.tunnel
 OLD_FILES+=usr/share/examples/netgraph/virtual.chain
 OLD_FILES+=usr/share/examples/netgraph/virtual.lan
 OLD_FILES+=usr/share/examples/perfmon/Makefile
 OLD_FILES+=usr/share/examples/perfmon/README
 OLD_FILES+=usr/share/examples/perfmon/perfmon.c
 OLD_FILES+=usr/share/examples/pf/ackpri
 OLD_FILES+=usr/share/examples/pf/faq-example1
 OLD_FILES+=usr/share/examples/pf/faq-example2
 OLD_FILES+=usr/share/examples/pf/faq-example3
 OLD_FILES+=usr/share/examples/pf/pf.conf
 OLD_FILES+=usr/share/examples/pf/queue1
 OLD_FILES+=usr/share/examples/pf/queue2
 OLD_FILES+=usr/share/examples/pf/queue3
 OLD_FILES+=usr/share/examples/pf/queue4
 OLD_FILES+=usr/share/examples/pf/spamd
 OLD_FILES+=usr/share/examples/ppi/Makefile
 OLD_FILES+=usr/share/examples/ppi/ppilcd.c
 OLD_FILES+=usr/share/examples/ppp/chap-auth
 OLD_FILES+=usr/share/examples/ppp/login-auth
 OLD_FILES+=usr/share/examples/ppp/ppp.conf.sample
 OLD_FILES+=usr/share/examples/ppp/ppp.conf.span-isp
 OLD_FILES+=usr/share/examples/ppp/ppp.conf.span-isp.working
 OLD_FILES+=usr/share/examples/ppp/ppp.linkdown.sample
 OLD_FILES+=usr/share/examples/ppp/ppp.linkdown.span-isp
 OLD_FILES+=usr/share/examples/ppp/ppp.linkdown.span-isp.working
 OLD_FILES+=usr/share/examples/ppp/ppp.linkup.sample
 OLD_FILES+=usr/share/examples/ppp/ppp.linkup.span-isp
 OLD_FILES+=usr/share/examples/ppp/ppp.linkup.span-isp.working
 OLD_FILES+=usr/share/examples/ppp/ppp.secret.sample
 OLD_FILES+=usr/share/examples/ppp/ppp.secret.span-isp
 OLD_FILES+=usr/share/examples/ppp/ppp.secret.span-isp.working
 OLD_FILES+=usr/share/examples/printing/diablo-if-net
 OLD_FILES+=usr/share/examples/printing/hpdf
 OLD_FILES+=usr/share/examples/printing/hpif
 OLD_FILES+=usr/share/examples/printing/hpof
 OLD_FILES+=usr/share/examples/printing/hprf
 OLD_FILES+=usr/share/examples/printing/hpvf
 OLD_FILES+=usr/share/examples/printing/if-simple
 OLD_FILES+=usr/share/examples/printing/if-simpleX
 OLD_FILES+=usr/share/examples/printing/ifhp
 OLD_FILES+=usr/share/examples/printing/make-ps-header
 OLD_FILES+=usr/share/examples/printing/netprint
 OLD_FILES+=usr/share/examples/printing/psdf
 OLD_FILES+=usr/share/examples/printing/psdfX
 OLD_FILES+=usr/share/examples/printing/psif
 OLD_FILES+=usr/share/examples/printing/pstf
 OLD_FILES+=usr/share/examples/printing/pstfX
 OLD_FILES+=usr/share/examples/scsi_target/Makefile
 OLD_FILES+=usr/share/examples/scsi_target/scsi_cmds.c
 OLD_FILES+=usr/share/examples/scsi_target/scsi_target.8
 OLD_FILES+=usr/share/examples/scsi_target/scsi_target.c
 OLD_FILES+=usr/share/examples/scsi_target/scsi_target.h
 OLD_FILES+=usr/share/examples/sendmail/mailer.conf
 OLD_FILES+=usr/share/examples/ses/Makefile
 OLD_FILES+=usr/share/examples/ses/Makefile.inc
 OLD_FILES+=usr/share/examples/ses/getencstat/Makefile
 OLD_FILES+=usr/share/examples/ses/getencstat/getencstat.0
 OLD_FILES+=usr/share/examples/ses/sesd/Makefile
 OLD_FILES+=usr/share/examples/ses/sesd/sesd.0
 OLD_FILES+=usr/share/examples/ses/setencstat/Makefile
 OLD_FILES+=usr/share/examples/ses/setencstat/setencstat.0
 OLD_FILES+=usr/share/examples/ses/setobjstat/Makefile
 OLD_FILES+=usr/share/examples/ses/setobjstat/setobjstat.0
 OLD_FILES+=usr/share/examples/ses/srcs/chpmon.c
 OLD_FILES+=usr/share/examples/ses/srcs/eltsub.c
 OLD_FILES+=usr/share/examples/ses/srcs/eltsub.h
 OLD_FILES+=usr/share/examples/ses/srcs/getencstat.c
 OLD_FILES+=usr/share/examples/ses/srcs/getnobj.c
 OLD_FILES+=usr/share/examples/ses/srcs/getobjmap.c
 OLD_FILES+=usr/share/examples/ses/srcs/getobjstat.c
 OLD_FILES+=usr/share/examples/ses/srcs/inienc.c
 OLD_FILES+=usr/share/examples/ses/srcs/sesd.c
 OLD_FILES+=usr/share/examples/ses/srcs/setencstat.c
 OLD_FILES+=usr/share/examples/ses/srcs/setobjstat.c
 OLD_FILES+=usr/share/examples/smbfs/dot.nsmbrc
 OLD_FILES+=usr/share/examples/smbfs/print/lj6l
 OLD_FILES+=usr/share/examples/smbfs/print/ljspool
 OLD_FILES+=usr/share/examples/smbfs/print/printcap.sample
 OLD_FILES+=usr/share/examples/smbfs/print/tolj
 OLD_FILES+=usr/share/examples/sound/basic.c
 OLD_FILES+=usr/share/examples/sound/ossmidi.h
 OLD_FILES+=usr/share/examples/sound/ossinit.h
 OLD_FILES+=usr/share/examples/sound/README
 OLD_FILES+=usr/share/examples/sound/midi.c
 OLD_FILES+=usr/share/examples/sunrpc/Makefile
 OLD_FILES+=usr/share/examples/sunrpc/dir/Makefile
 OLD_FILES+=usr/share/examples/sunrpc/dir/dir.x
 OLD_FILES+=usr/share/examples/sunrpc/dir/dir_proc.c
 OLD_FILES+=usr/share/examples/sunrpc/dir/rls.c
 OLD_FILES+=usr/share/examples/sunrpc/msg/Makefile
 OLD_FILES+=usr/share/examples/sunrpc/msg/msg.x
 OLD_FILES+=usr/share/examples/sunrpc/msg/msg_proc.c
 OLD_FILES+=usr/share/examples/sunrpc/msg/printmsg.c
 OLD_FILES+=usr/share/examples/sunrpc/msg/rprintmsg.c
 OLD_FILES+=usr/share/examples/sunrpc/sort/Makefile
 OLD_FILES+=usr/share/examples/sunrpc/sort/rsort.c
 OLD_FILES+=usr/share/examples/sunrpc/sort/sort.x
 OLD_FILES+=usr/share/examples/sunrpc/sort/sort_proc.c
 OLD_FILES+=usr/share/examples/tcsh/complete.tcsh
 OLD_FILES+=usr/share/examples/tcsh/csh-mode.el
 OLD_FILES+=usr/share/examples/uefisign/uefikeys
 OLD_FILES+=usr/share/examples/ypldap/ypldap.conf
 OLD_DIRS+=usr/share/examples
 OLD_DIRS+=usr/share/examples/BSD_daemon
 OLD_DIRS+=usr/share/examples/FreeBSD_version
 OLD_DIRS+=usr/share/examples/IPv6
 OLD_DIRS+=usr/share/examples/bhyve
 OLD_DIRS+=usr/share/examples/bootforth
 OLD_DIRS+=usr/share/examples/bsdconfig
 OLD_DIRS+=usr/share/examples/csh
 OLD_DIRS+=usr/share/examples/diskless
 OLD_DIRS+=usr/share/examples/dma
 OLD_DIRS+=usr/share/examples/drivers
 OLD_DIRS+=usr/share/examples/dwatch
 OLD_DIRS+=usr/share/examples/etc
 OLD_DIRS+=usr/share/examples/etc/defaults
 OLD_DIRS+=usr/share/examples/find_interface
 OLD_DIRS+=usr/share/examples/flua
 OLD_DIRS+=usr/share/examples/hast
 OLD_DIRS+=usr/share/examples/ibcs2
 OLD_DIRS+=usr/share/examples/hostapd
 OLD_DIRS+=usr/share/examples/indent
 OLD_DIRS+=usr/share/examples/ipfilter
 OLD_DIRS+=usr/share/examples/ipfw
 OLD_DIRS+=usr/share/examples/jails
 OLD_DIRS+=usr/share/examples/kld
 OLD_DIRS+=usr/share/examples/kld/cdev
 OLD_DIRS+=usr/share/examples/kld/cdev/module
 OLD_DIRS+=usr/share/examples/kld/cdev/test
 OLD_DIRS+=usr/share/examples/kld/dyn_sysctl
 OLD_DIRS+=usr/share/examples/kld/firmware
 OLD_DIRS+=usr/share/examples/kld/firmware/fwconsumer
 OLD_DIRS+=usr/share/examples/kld/firmware/fwimage
 OLD_DIRS+=usr/share/examples/kld/khelp
 OLD_DIRS+=usr/share/examples/kld/syscall
 OLD_DIRS+=usr/share/examples/kld/syscall/module
 OLD_DIRS+=usr/share/examples/kld/syscall/test
 OLD_DIRS+=usr/share/examples/kyua
 OLD_DIRS+=usr/share/examples/libusb20
 OLD_DIRS+=usr/share/examples/libvgl
 OLD_DIRS+=usr/share/examples/mdoc
 OLD_DIRS+=usr/share/examples/netgraph
 OLD_DIRS+=usr/share/examples/perfmon
 OLD_DIRS+=usr/share/examples/pf
 OLD_DIRS+=usr/share/examples/ppi
 OLD_DIRS+=usr/share/examples/ppp
 OLD_DIRS+=usr/share/examples/printing
 OLD_DIRS+=usr/share/examples/scsi_target
 OLD_DIRS+=usr/share/examples/sendmail
 OLD_DIRS+=usr/share/examples/ses
 OLD_DIRS+=usr/share/examples/ses/getencstat
 OLD_DIRS+=usr/share/examples/ses/sesd
 OLD_DIRS+=usr/share/examples/ses/setencstat
 OLD_DIRS+=usr/share/examples/ses/setobjstat
 OLD_DIRS+=usr/share/examples/ses/srcs
 OLD_DIRS+=usr/share/examples/smbfs
 OLD_DIRS+=usr/share/examples/smbfs/print
 OLD_DIRS+=usr/share/examples/sound
 OLD_DIRS+=usr/share/examples/sunrpc
 OLD_DIRS+=usr/share/examples/sunrpc/dir
 OLD_DIRS+=usr/share/examples/sunrpc/msg
 OLD_DIRS+=usr/share/examples/sunrpc/sort
 OLD_DIRS+=usr/share/examples/tcsh
 OLD_DIRS+=usr/share/examples/uefisign
 OLD_DIRS+=usr/share/examples/ypldap
 .endif
 
 .if ${MK_FDT} == no
 OLD_FILES+=usr/sbin/ofwdump
 OLD_FILES+=usr/share/man/man8/ofwdump.8.gz
 .endif
 
 .if ${MK_FINGER} == no
 OLD_FILES+=usr/bin/finger
 OLD_FILES+=usr/share/man/man1/finger.1.gz
 OLD_FILES+=usr/share/man/man5/finger.conf.5.gz
 OLD_FILES+=usr/libexec/fingerd
 OLD_FILES+=usr/share/man/man8/fingerd.8.gz
 .endif
 
 .if ${MK_FLOPPY} == no
 OLD_FILES+=usr/sbin/fdcontrol
 OLD_FILES+=usr/sbin/fdformat
 OLD_FILES+=usr/sbin/fdread
 OLD_FILES+=usr/sbin/fdwrite
 OLD_FILES+=usr/share/man/man1/fdformat.1.gz
 OLD_FILES+=usr/share/man/man1/fdread.1.gz
 OLD_FILES+=usr/share/man/man1/fdwrite.1.gz
 OLD_FILES+=usr/share/man/man8/fdcontrol.8.gz
 .endif
 
 .if ${MK_FORTH} == no
 OLD_FILES+=usr/share/man/man8/beastie.4th.8.gz
 OLD_FILES+=usr/share/man/man8/brand.4th.8.gz
 OLD_FILES+=usr/share/man/man8/check-password.4th.8.gz
 OLD_FILES+=usr/share/man/man8/color.4th.8.gz
 OLD_FILES+=usr/share/man/man8/delay.4th.8.gz
 OLD_FILES+=usr/share/man/man8/loader.4th.8.gz
 OLD_FILES+=usr/share/man/man8/menu.4th.8.gz
 OLD_FILES+=usr/share/man/man8/menusets.4th.8.gz
 OLD_FILES+=usr/share/man/man8/version.4th.8.gz
 .endif
 
 .if ${MK_FREEBSD_UPDATE} == no
 OLD_FILES+=etc/freebsd-update.conf
 OLD_FILES+=usr/sbin/freebsd-update
 OLD_FILES+=usr/share/examples/etc/freebsd-update.conf
 OLD_FILES+=usr/share/man/man5/freebsd-update.conf.5.gz
 OLD_FILES+=usr/share/man/man8/freebsd-update.8.gz
 .endif
 
 .if ${MK_FREEBSD_UPDATE} == no
 OLD_FILES+=usr/libexec/phttpget
 OLD_FILES+=usr/share/man/man8/phttpget.8.gz
 .endif
 
 .if ${MK_GAMES} == no
 OLD_FILES+=usr/bin/caesar
 OLD_FILES+=usr/bin/factor
 OLD_FILES+=usr/bin/fortune
 OLD_FILES+=usr/bin/grdc
 OLD_FILES+=usr/bin/morse
 OLD_FILES+=usr/bin/number
 OLD_FILES+=usr/bin/pom
 OLD_FILES+=usr/bin/primes
 OLD_FILES+=usr/bin/random
 OLD_FILES+=usr/bin/rot13
 OLD_FILES+=usr/bin/strfile
 OLD_FILES+=usr/bin/unstr
 OLD_FILES+=usr/share/games/fortune/fortunes
 OLD_FILES+=usr/share/games/fortune/fortunes.dat
 OLD_FILES+=usr/share/games/fortune/freebsd-tips
 OLD_FILES+=usr/share/games/fortune/freebsd-tips.dat
 OLD_FILES+=usr/share/games/fortune/gerrold.limerick
 OLD_FILES+=usr/share/games/fortune/gerrold.limerick.dat
 OLD_FILES+=usr/share/games/fortune/limerick
 OLD_FILES+=usr/share/games/fortune/limerick.dat
 OLD_FILES+=usr/share/games/fortune/murphy
 OLD_FILES+=usr/share/games/fortune/murphy-o
 OLD_FILES+=usr/share/games/fortune/murphy-o.dat
 OLD_FILES+=usr/share/games/fortune/murphy.dat
 OLD_FILES+=usr/share/games/fortune/startrek
 OLD_FILES+=usr/share/games/fortune/startrek.dat
 OLD_FILES+=usr/share/games/fortune/zippy
 OLD_FILES+=usr/share/games/fortune/zippy.dat
 OLD_DIRS+=usr/share/games/fortune
 OLD_DIRS+=usr/share/games
 OLD_FILES+=usr/share/man/man6/caesar.6.gz
 OLD_FILES+=usr/share/man/man6/factor.6.gz
 OLD_FILES+=usr/share/man/man6/fortune.6.gz
 OLD_FILES+=usr/share/man/man6/grdc.6.gz
 OLD_FILES+=usr/share/man/man6/morse.6.gz
 OLD_FILES+=usr/share/man/man6/number.6.gz
 OLD_FILES+=usr/share/man/man6/pom.6.gz
 OLD_FILES+=usr/share/man/man6/primes.6.gz
 OLD_FILES+=usr/share/man/man6/random.6.gz
 OLD_FILES+=usr/share/man/man6/rot13.6.gz
 OLD_FILES+=usr/share/man/man8/strfile.8.gz
 OLD_FILES+=usr/share/man/man8/unstr.8.gz
 .endif
 
 .if ${MK_LLVM_COV} == no
 OLD_FILES+=usr/bin/gcov
 OLD_FILES+=usr/share/man/man1/gcov.1.gz
 .endif
 
 .if ${MK_LLVM_COV} == no
 OLD_FILES+=usr/bin/llvm-cov
 OLD_FILES+=usr/bin/llvm-profdata
 OLD_FILES+=usr/share/man/man1/llvm-cov.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-profdata.1.gz
 .endif
 
 .if ${MK_GH_BC} == no
 OLD_FILES+=usr/share/misc/bc.library
 OLD_FILES+=usr/tests/usr.bin/dc/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/dc/bcode
 OLD_FILES+=usr/tests/usr.bin/dc/inout
 OLD_DIRS+=usr/tests/usr.bin/dc
 .endif
 
 .if ${MK_GOOGLETEST} == no
 OLD_FILES+=usr/include/private/gmock/gmock-actions.h
 OLD_FILES+=usr/include/private/gmock/gmock-cardinalities.h
 OLD_FILES+=usr/include/private/gmock/gmock-function-mocker.h
 OLD_FILES+=usr/include/private/gmock/gmock-matchers.h
 OLD_FILES+=usr/include/private/gmock/gmock-more-actions.h
 OLD_FILES+=usr/include/private/gmock/gmock-more-matchers.h
 OLD_FILES+=usr/include/private/gmock/gmock-nice-strict.h
 OLD_FILES+=usr/include/private/gmock/gmock-spec-builders.h
 OLD_FILES+=usr/include/private/gmock/gmock.h
 OLD_FILES+=usr/include/private/gmock/internal/custom/gmock-generated-actions.h
 OLD_FILES+=usr/include/private/gmock/internal/custom/gmock-matchers.h
 OLD_FILES+=usr/include/private/gmock/internal/custom/gmock-port.h
 OLD_FILES+=usr/include/private/gmock/internal/gmock-internal-utils.h
 OLD_FILES+=usr/include/private/gmock/internal/gmock-port.h
 OLD_FILES+=usr/include/private/gmock/internal/gmock-pp.h
 OLD_FILES+=usr/include/private/gtest/gtest-assertion-result.h
 OLD_FILES+=usr/include/private/gtest/gtest-death-test.h
 OLD_FILES+=usr/include/private/gtest/gtest-matchers.h
 OLD_FILES+=usr/include/private/gtest/gtest-message.h
 OLD_FILES+=usr/include/private/gtest/gtest-param-test.h
 OLD_FILES+=usr/include/private/gtest/gtest-printers.h
 OLD_FILES+=usr/include/private/gtest/gtest-spi.h
 OLD_FILES+=usr/include/private/gtest/gtest-test-part.h
 OLD_FILES+=usr/include/private/gtest/gtest-typed-test.h
 OLD_FILES+=usr/include/private/gtest/gtest.h
 OLD_FILES+=usr/include/private/gtest/gtest_pred_impl.h
 OLD_FILES+=usr/include/private/gtest/gtest_prod.h
 OLD_FILES+=usr/include/private/gtest/internal/custom/gtest-port.h
 OLD_FILES+=usr/include/private/gtest/internal/custom/gtest-printers.h
 OLD_FILES+=usr/include/private/gtest/internal/custom/gtest.h
 OLD_FILES+=usr/include/private/gtest/internal/gtest-death-test-internal.h
 OLD_FILES+=usr/include/private/gtest/internal/gtest-filepath.h
 OLD_FILES+=usr/include/private/gtest/internal/gtest-internal.h
 OLD_FILES+=usr/include/private/gtest/internal/gtest-param-util.h
 OLD_FILES+=usr/include/private/gtest/internal/gtest-port-arch.h
 OLD_FILES+=usr/include/private/gtest/internal/gtest-port.h
 OLD_FILES+=usr/include/private/gtest/internal/gtest-string.h
 OLD_FILES+=usr/include/private/gtest/internal/gtest-type-util.h
 OLD_FILES+=usr/lib/libprivategmock.a
 OLD_FILES+=usr/lib/libprivategmock_p.a
 OLD_LIBS+=usr/lib/libprivategmock.so
 OLD_LIBS+=usr/lib/libprivategmock.so.0
 OLD_FILES+=usr/lib/libprivategmock_main.a
 OLD_FILES+=usr/lib/libprivategmock_main_p.a
 OLD_LIBS+=usr/lib/libprivategmock_main.so
 OLD_LIBS+=usr/lib/libprivategmock_main.so.0
 OLD_FILES+=usr/lib/libprivategtest.a
 OLD_FILES+=usr/lib/libprivategtest_p.a
 OLD_LIBS+=usr/lib/libprivategtest.so
 OLD_LIBS+=usr/lib/libprivategtest.so.0
 OLD_FILES+=usr/lib/libprivategtest_main.a
 OLD_FILES+=usr/lib/libprivategtest_main_p.a
 OLD_LIBS+=usr/lib/libprivategtest_main.so
 OLD_LIBS+=usr/lib/libprivategtest_main.so.0
 OLD_FILES+=usr/tests/lib/googletest/Kyuafile
 OLD_FILES+=usr/tests/lib/googletest/gmock/Kyuafile
 OLD_FILES+=usr/tests/lib/googletest/gmock/gmock_stress_test
 OLD_FILES+=usr/tests/lib/googletest/gmock_main/Kyuafile
 OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-actions_test
 OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-cardinalities_test
 OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-function-mocker_test
 OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-internal-utils_test
 OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-matchers-arithmetic_test
 OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-matchers-comparisons_test
 OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-matchers-containers_test
 OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-matchers-misc_test
 OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-more-actions_test
 OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-nice-strict_test
 OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-port_test
 OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-spec-builders_test
 OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock_ex_test
 OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock_link_test
 OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock_test
 OLD_FILES+=usr/tests/lib/googletest/gtest/Kyuafile
 OLD_FILES+=usr/tests/lib/googletest/gtest/googletest-param-test-test
 OLD_FILES+=usr/tests/lib/googletest/gtest/gtest-unittest-api_test
 OLD_FILES+=usr/tests/lib/googletest/gtest/gtest_environment_test
 OLD_FILES+=usr/tests/lib/googletest/gtest/gtest_no_test_unittest
 OLD_FILES+=usr/tests/lib/googletest/gtest/gtest_premature_exit_test
 OLD_FILES+=usr/tests/lib/googletest/gtest/gtest_repeat_test
 OLD_FILES+=usr/tests/lib/googletest/gtest/gtest_stress_test
 OLD_FILES+=usr/tests/lib/googletest/gtest/gtest_throw_on_failure_ex_test
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/Kyuafile
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-death-test-test
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-filepath-test
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-listener-test
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-message-test
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-options-test
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-port-test
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-printers-test
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-test-part-test
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest-typed-test_test
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_main_unittest
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_pred_impl_unittest
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_prod_test
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_skip_in_environment_setup_test
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_skip_test
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_sole_header_test
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_unittest
 OLD_FILES+=usr/tests/share/examples/tests/googletest/Kyuafile
 OLD_FILES+=usr/tests/share/examples/tests/googletest/sample10_unittest
 OLD_FILES+=usr/tests/share/examples/tests/googletest/sample1_unittest
 OLD_FILES+=usr/tests/share/examples/tests/googletest/sample2_unittest
 OLD_FILES+=usr/tests/share/examples/tests/googletest/sample3_unittest
 OLD_FILES+=usr/tests/share/examples/tests/googletest/sample4_unittest
 OLD_FILES+=usr/tests/share/examples/tests/googletest/sample5_unittest
 OLD_FILES+=usr/tests/share/examples/tests/googletest/sample6_unittest
 OLD_FILES+=usr/tests/share/examples/tests/googletest/sample7_unittest
 OLD_FILES+=usr/tests/share/examples/tests/googletest/sample8_unittest
 OLD_DIRS+=usr/include/private/gmock/
 OLD_DIRS+=usr/include/private/gmock/internal
 OLD_DIRS+=usr/include/private/gmock/internal/custom
 OLD_DIRS+=usr/include/private/gtest/
 OLD_DIRS+=usr/include/private/gtest/internal
 OLD_DIRS+=usr/include/private/gtest/internal/custom
 OLD_DIRS+=usr/tests/lib/googletest
 OLD_DIRS+=usr/tests/lib/googletest/gmock
 OLD_DIRS+=usr/tests/lib/googletest/gmock_main
 OLD_DIRS+=usr/tests/lib/googletest/gtest
 OLD_DIRS+=usr/tests/lib/googletest/gtest_main
 OLD_DIRS+=usr/tests/share/examples/tests/googletest
 .endif
 
 .if ${MK_GPIO} == no
 OLD_FILES+=usr/include/libgpio.h
 OLD_FILES+=usr/lib/libgpio.a
 OLD_FILES+=usr/lib/libgpio.so
 OLD_LIBS+=usr/lib/libgpio.so.0
 OLD_FILES+=usr/lib/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
 OLD_FILES+=usr/share/man/man3/gpio_open.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_open_device.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_config.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_get.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_high.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_input.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_invin.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_invout.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_list.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_low.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_opendrain.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_output.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_pulldown.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_pullup.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_pulsate.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_pushpull.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_set.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_set_flags.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_tristate.3.gz
 OLD_FILES+=usr/share/man/man8/gpioctl.8.gz
 .endif
 
 .if ${MK_GNU_DIFF} == no
 OLD_FILES+=usr/bin/diff3
 OLD_FILES+=usr/share/man/man1/diff3.1.gz
 .endif
 
 .if ${MK_GSSAPI} == no
 OLD_FILES+=usr/include/gssapi/gssapi.h
 OLD_DIRS+=usr/include/gssapi
 OLD_FILES+=usr/include/gssapi.h
 OLD_FILES+=usr/lib/libgssapi.a
 OLD_FILES+=usr/lib/libgssapi.so
 OLD_LIBS+=usr/lib/libgssapi.so.10
 OLD_FILES+=usr/lib/libgssapi_p.a
 OLD_FILES+=usr/lib/librpcsec_gss.a
 OLD_FILES+=usr/lib/librpcsec_gss.so
 OLD_LIBS+=usr/lib/librpcsec_gss.so.1
 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
 OLD_FILES+=usr/share/man/man3/gss_add_cred.3.gz
 OLD_FILES+=usr/share/man/man3/gss_add_oid_set_member.3.gz
 OLD_FILES+=usr/share/man/man3/gss_canonicalize_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_compare_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_context_time.3.gz
 OLD_FILES+=usr/share/man/man3/gss_create_empty_oid_set.3.gz
 OLD_FILES+=usr/share/man/man3/gss_delete_sec_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_display_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_display_status.3.gz
 OLD_FILES+=usr/share/man/man3/gss_duplicate_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_export_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_export_sec_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_get_mic.3.gz
 OLD_FILES+=usr/share/man/man3/gss_import_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_import_sec_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_indicate_mechs.3.gz
 OLD_FILES+=usr/share/man/man3/gss_init_sec_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_inquire_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_inquire_cred.3.gz
 OLD_FILES+=usr/share/man/man3/gss_inquire_cred_by_mech.3.gz
 OLD_FILES+=usr/share/man/man3/gss_inquire_mechs_for_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_inquire_names_for_mech.3.gz
 OLD_FILES+=usr/share/man/man3/gss_process_context_token.3.gz
 OLD_FILES+=usr/share/man/man3/gss_release_buffer.3.gz
 OLD_FILES+=usr/share/man/man3/gss_release_cred.3.gz
 OLD_FILES+=usr/share/man/man3/gss_release_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_release_oid_set.3.gz
 OLD_FILES+=usr/share/man/man3/gss_seal.3.gz
 OLD_FILES+=usr/share/man/man3/gss_sign.3.gz
 OLD_FILES+=usr/share/man/man3/gss_test_oid_set_member.3.gz
 OLD_FILES+=usr/share/man/man3/gss_unseal.3.gz
 OLD_FILES+=usr/share/man/man3/gss_unwrap.3.gz
 OLD_FILES+=usr/share/man/man3/gss_verify.3.gz
 OLD_FILES+=usr/share/man/man3/gss_verify_mic.3.gz
 OLD_FILES+=usr/share/man/man3/gss_wrap.3.gz
 OLD_FILES+=usr/share/man/man3/gss_wrap_size_limit.3.gz
 OLD_FILES+=usr/share/man/man3/gssapi.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_get_error.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_get_mech_info.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_get_mechanisms.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_get_principal_name.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_get_versions.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_getcred.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_is_installed.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_max_data_length.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_mech_to_oid.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_oid_to_mech.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_qop_to_num.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_seccreate.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_set_callback.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_set_defaults.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_set_svc_name.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_svc_max_data_length.3.gz
 OLD_FILES+=usr/share/man/man3/rpcsec_gss.3.gz
 OLD_FILES+=usr/share/man/man5/mech.5.gz
 OLD_FILES+=usr/share/man/man5/qop.5.gz
 OLD_FILES+=usr/share/man/man8/gssd.8.gz
 .endif
 
 .if ${MK_HAST} == no
 OLD_FILES+=etc/rc.d/hastd
 OLD_FILES+=sbin/hastctl
 OLD_FILES+=sbin/hastd
 OLD_FILES+=usr/share/examples/hast/ucarp.sh
 OLD_FILES+=usr/share/examples/hast/ucarp_down.sh
 OLD_FILES+=usr/share/examples/hast/ucarp_up.sh
 OLD_FILES+=usr/share/examples/hast/vip-down.sh
 OLD_FILES+=usr/share/examples/hast/vip-up.sh
 OLD_FILES+=usr/share/man/man5/hast.conf.5.gz
 OLD_FILES+=usr/share/man/man8/hastctl.8.gz
 OLD_FILES+=usr/share/man/man8/hastd.8.gz
 OLD_DIRS+=usr/share/examples/hast
 # bsnmp
 OLD_FILES+=usr/lib/snmp_hast.so
 OLD_LIBS+=usr/lib/snmp_hast.so.6
 OLD_FILES+=usr/share/man/man3/snmp_hast.3.gz
 OLD_FILES+=usr/share/snmp/defs/hast_tree.def
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-HAST-MIB.txt
 .endif
 
 .if ${MK_HESIOD} == no
 OLD_FILES+=usr/bin/hesinfo
 OLD_FILES+=usr/include/hesiod.h
 OLD_FILES+=usr/share/man/man1/hesinfo.1.gz
 OLD_FILES+=usr/share/man/man3/hesiod.3.gz
 OLD_FILES+=usr/share/man/man5/hesiod.conf.5.gz
 .endif
 
 .if ${MK_HTML} == no
 OLD_FILES+=usr/share/doc/ncurses/hackguide.html
 OLD_FILES+=usr/share/doc/ncurses/ncurses-intro.html
 OLD_DIRS+=usr/share/doc/ncurses
 OLD_FILES+=usr/share/doc/ntp/accopt.html
 OLD_FILES+=usr/share/doc/ntp/assoc.html
 OLD_FILES+=usr/share/doc/ntp/audio.html
 OLD_FILES+=usr/share/doc/ntp/authopt.html
 OLD_FILES+=usr/share/doc/ntp/build.html
 OLD_FILES+=usr/share/doc/ntp/clockopt.html
 OLD_FILES+=usr/share/doc/ntp/config.html
 OLD_FILES+=usr/share/doc/ntp/confopt.html
 OLD_FILES+=usr/share/doc/ntp/copyright.html
 OLD_FILES+=usr/share/doc/ntp/debug.html
 OLD_FILES+=usr/share/doc/ntp/driver1.html
 OLD_FILES+=usr/share/doc/ntp/driver10.html
 OLD_FILES+=usr/share/doc/ntp/driver11.html
 OLD_FILES+=usr/share/doc/ntp/driver12.html
 OLD_FILES+=usr/share/doc/ntp/driver16.html
 OLD_FILES+=usr/share/doc/ntp/driver18.html
 OLD_FILES+=usr/share/doc/ntp/driver19.html
 OLD_FILES+=usr/share/doc/ntp/driver2.html
 OLD_FILES+=usr/share/doc/ntp/driver20.html
 OLD_FILES+=usr/share/doc/ntp/driver22.html
 OLD_FILES+=usr/share/doc/ntp/driver26.html
 OLD_FILES+=usr/share/doc/ntp/driver27.html
 OLD_FILES+=usr/share/doc/ntp/driver28.html
 OLD_FILES+=usr/share/doc/ntp/driver29.html
 OLD_FILES+=usr/share/doc/ntp/driver3.html
 OLD_FILES+=usr/share/doc/ntp/driver30.html
 OLD_FILES+=usr/share/doc/ntp/driver32.html
 OLD_FILES+=usr/share/doc/ntp/driver33.html
 OLD_FILES+=usr/share/doc/ntp/driver34.html
 OLD_FILES+=usr/share/doc/ntp/driver35.html
 OLD_FILES+=usr/share/doc/ntp/driver36.html
 OLD_FILES+=usr/share/doc/ntp/driver37.html
 OLD_FILES+=usr/share/doc/ntp/driver4.html
 OLD_FILES+=usr/share/doc/ntp/driver5.html
 OLD_FILES+=usr/share/doc/ntp/driver6.html
 OLD_FILES+=usr/share/doc/ntp/driver7.html
 OLD_FILES+=usr/share/doc/ntp/driver8.html
 OLD_FILES+=usr/share/doc/ntp/driver9.html
 OLD_FILES+=usr/share/doc/ntp/extern.html
 OLD_FILES+=usr/share/doc/ntp/hints.html
 OLD_FILES+=usr/share/doc/ntp/howto.html
 OLD_FILES+=usr/share/doc/ntp/index.html
 OLD_FILES+=usr/share/doc/ntp/kern.html
 OLD_FILES+=usr/share/doc/ntp/ldisc.html
 OLD_FILES+=usr/share/doc/ntp/measure.html
 OLD_FILES+=usr/share/doc/ntp/miscopt.html
 OLD_FILES+=usr/share/doc/ntp/monopt.html
 OLD_FILES+=usr/share/doc/ntp/mx4200data.html
 OLD_FILES+=usr/share/doc/ntp/notes.html
 OLD_FILES+=usr/share/doc/ntp/ntpd.html
 OLD_FILES+=usr/share/doc/ntp/ntpdate.html
 OLD_FILES+=usr/share/doc/ntp/ntpdc.html
 OLD_FILES+=usr/share/doc/ntp/ntpq.html
 OLD_FILES+=usr/share/doc/ntp/ntptime.html
 OLD_FILES+=usr/share/doc/ntp/ntptrace.html
 OLD_FILES+=usr/share/doc/ntp/parsedata.html
 OLD_FILES+=usr/share/doc/ntp/parsenew.html
 OLD_FILES+=usr/share/doc/ntp/patches.html
 OLD_FILES+=usr/share/doc/ntp/porting.html
 OLD_FILES+=usr/share/doc/ntp/pps.html
 OLD_FILES+=usr/share/doc/ntp/prefer.html
 OLD_FILES+=usr/share/doc/ntp/quick.html
 OLD_FILES+=usr/share/doc/ntp/rdebug.html
 OLD_FILES+=usr/share/doc/ntp/refclock.html
 OLD_FILES+=usr/share/doc/ntp/release.html
 OLD_FILES+=usr/share/doc/ntp/tickadj.html
 .endif
 
 .if ${MK_ICONV} == no
 OLD_FILES+=usr/bin/iconv
 OLD_FILES+=usr/bin/mkcsmapper
 OLD_FILES+=usr/bin/mkesdb
 OLD_FILES+=usr/include/_libiconv_compat.h
 OLD_FILES+=usr/include/iconv.h
 OLD_LIBS+=usr/lib/i18n/libBIG5.so.5
 OLD_FILES+=usr/lib/i18n/libBIG5.so
 OLD_LIBS+=usr/lib/i18n/libDECHanyu.so.5
 OLD_FILES+=usr/lib/i18n/libDECHanyu.so
 OLD_LIBS+=usr/lib/i18n/libEUC.so.5
 OLD_FILES+=usr/lib/i18n/libEUC.so
 OLD_LIBS+=usr/lib/i18n/libEUCTW.so.5
 OLD_FILES+=usr/lib/i18n/libEUCTW.so
 OLD_LIBS+=usr/lib/i18n/libGBK2K.so.5
 OLD_FILES+=usr/lib/i18n/libGBK2K.so
 OLD_LIBS+=usr/lib/i18n/libHZ.so.5
 OLD_FILES+=usr/lib/i18n/libHZ.so
 OLD_LIBS+=usr/lib/i18n/libISO2022.so.5
 OLD_FILES+=usr/lib/i18n/libISO2022.so
 OLD_LIBS+=usr/lib/i18n/libJOHAB.so.5
 OLD_FILES+=usr/lib/i18n/libJOHAB.so
 OLD_LIBS+=usr/lib/i18n/libMSKanji.so.5
 OLD_FILES+=usr/lib/i18n/libMSKanji.so
 OLD_LIBS+=usr/lib/i18n/libUES.so.5
 OLD_FILES+=usr/lib/i18n/libUES.so
 OLD_LIBS+=usr/lib/i18n/libUTF1632.so.5
 OLD_FILES+=usr/lib/i18n/libUTF1632.so
 OLD_LIBS+=usr/lib/i18n/libUTF7.so.5
 OLD_FILES+=usr/lib/i18n/libUTF7.so
 OLD_LIBS+=usr/lib/i18n/libUTF8.so.5
 OLD_FILES+=usr/lib/i18n/libUTF8.so
 OLD_LIBS+=usr/lib/i18n/libVIQR.so.5
 OLD_FILES+=usr/lib/i18n/libVIQR.so
 OLD_LIBS+=usr/lib/i18n/libZW.so.5
 OLD_FILES+=usr/lib/i18n/libZW.so
 OLD_LIBS+=usr/lib/i18n/libiconv_none.so.5
 OLD_FILES+=usr/lib/i18n/libiconv_none.so
 OLD_LIBS+=usr/lib/i18n/libiconv_std.so.5
 OLD_FILES+=usr/lib/i18n/libiconv_std.so
 OLD_LIBS+=usr/lib/i18n/libmapper_646.so.5
 OLD_FILES+=usr/lib/i18n/libmapper_646.so
 OLD_LIBS+=usr/lib/i18n/libmapper_none.so.5
 OLD_FILES+=usr/lib/i18n/libmapper_none.so
 OLD_LIBS+=usr/lib/i18n/libmapper_parallel.so.5
 OLD_FILES+=usr/lib/i18n/libmapper_parallel.so
 OLD_LIBS+=usr/lib/i18n/libmapper_serial.so.5
 OLD_FILES+=usr/lib/i18n/libmapper_serial.so
 OLD_LIBS+=usr/lib/i18n/libmapper_std.so.5
 OLD_FILES+=usr/lib/i18n/libmapper_std.so
 OLD_LIBS+=usr/lib/i18n/libmapper_zone.so.5
 OLD_FILES+=usr/lib/i18n/libmapper_zone.so
 OLD_FILES+=usr/share/man/man1/iconv.1.gz
 OLD_FILES+=usr/share/man/man1/mkcsmapper.1.gz
 OLD_FILES+=usr/share/man/man1/mkesdb.1.gz
 OLD_FILES+=usr/share/man/man3/__iconv.3.gz
 OLD_FILES+=usr/share/man/man3/__iconv_free_list.3.gz
 OLD_FILES+=usr/share/man/man3/__iconv_get_list.3.gz
 OLD_FILES+=usr/share/man/man3/iconv.3.gz
 OLD_FILES+=usr/share/man/man3/iconv_canonicalize.3.gz
 OLD_FILES+=usr/share/man/man3/iconv_close.3.gz
 OLD_FILES+=usr/share/man/man3/iconv_open.3.gz
 OLD_FILES+=usr/share/man/man3/iconv_open_into.3.gz
 OLD_FILES+=usr/share/man/man3/iconvctl.3.gz
 OLD_FILES+=usr/share/man/man3/iconvlist.3.gz
 OLD_DIRS+=usr/lib/i18n
 OLD_DIRS+=usr/share/i18n
 OLD_DIRS+=usr/share/i18n/esdb
 OLD_DIRS+=usr/share/i18n/esdb/ISO-2022
 OLD_DIRS+=usr/share/i18n/esdb/BIG5
 OLD_DIRS+=usr/share/i18n/esdb/MISC
 OLD_DIRS+=usr/share/i18n/esdb/TCVN
 OLD_DIRS+=usr/share/i18n/esdb/EBCDIC
 OLD_DIRS+=usr/share/i18n/esdb/ISO-8859
 OLD_DIRS+=usr/share/i18n/esdb/GEORGIAN
 OLD_DIRS+=usr/share/i18n/esdb/AST
 OLD_DIRS+=usr/share/i18n/esdb/KAZAKH
 OLD_DIRS+=usr/share/i18n/esdb/APPLE
 OLD_DIRS+=usr/share/i18n/esdb/EUC
 OLD_DIRS+=usr/share/i18n/esdb/CP
 OLD_DIRS+=usr/share/i18n/esdb/DEC
 OLD_DIRS+=usr/share/i18n/esdb/UTF
 OLD_DIRS+=usr/share/i18n/esdb/GB
 OLD_DIRS+=usr/share/i18n/esdb/ISO646
 OLD_DIRS+=usr/share/i18n/esdb/KOI
 OLD_DIRS+=usr/share/i18n/csmapper
 OLD_DIRS+=usr/share/i18n/csmapper/KAZAKH
 OLD_DIRS+=usr/share/i18n/csmapper/CNS
 OLD_DIRS+=usr/share/i18n/csmapper/BIG5
 OLD_DIRS+=usr/share/i18n/csmapper/JIS
 OLD_DIRS+=usr/share/i18n/csmapper/KOI
 OLD_DIRS+=usr/share/i18n/csmapper/TCVN
 OLD_DIRS+=usr/share/i18n/csmapper/MISC
 OLD_DIRS+=usr/share/i18n/csmapper/EBCDIC
 OLD_DIRS+=usr/share/i18n/csmapper/ISO646
 OLD_DIRS+=usr/share/i18n/csmapper/CP
 OLD_DIRS+=usr/share/i18n/csmapper/GEORGIAN
 OLD_DIRS+=usr/share/i18n/csmapper/ISO-8859
 OLD_DIRS+=usr/share/i18n/csmapper/AST
 OLD_DIRS+=usr/share/i18n/csmapper/APPLE
 OLD_DIRS+=usr/share/i18n/csmapper/KS
 OLD_DIRS+=usr/share/i18n/csmapper/GB
 .endif
 
 .if ${MK_INET} == no && ${MK_INET6} == no
 OLD_FILES+=sbin/ping
 OLD_FILES+=usr/share/man/man8/ping.8.gz
 .endif
 
 .if ${MK_INET6} == no
 OLD_FILES+=sbin/ping6
 OLD_FILES+=sbin/rtsol
 OLD_FILES+=usr/sbin/ip6addrctl
 OLD_FILES+=usr/sbin/mld6query
 OLD_FILES+=usr/sbin/ndp
 OLD_FILES+=usr/sbin/rip6query
 OLD_FILES+=usr/sbin/route6d
 OLD_FILES+=usr/sbin/rrenumd
 OLD_FILES+=usr/sbin/rtadvctl
 OLD_FILES+=usr/sbin/rtadvd
 OLD_FILES+=usr/sbin/rtsold
 OLD_FILES+=usr/sbin/traceroute6
 OLD_FILES+=usr/share/doc/IPv6/IMPLEMENTATION
 OLD_FILES+=usr/share/man/man5/rrenumd.conf.5.gz
 OLD_FILES+=usr/share/man/man5/rtadvd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/ip6addrctl.8.gz
 OLD_FILES+=usr/share/man/man8/mld6query.8.gz
 OLD_FILES+=usr/share/man/man8/ndp.8.gz
 OLD_FILES+=usr/share/man/man8/rip6query.8.gz
 OLD_FILES+=usr/share/man/man8/route6d.8.gz
 OLD_FILES+=usr/share/man/man8/rrenumd.8.gz
 OLD_FILES+=usr/share/man/man8/rtadvctl.8.gz
 OLD_FILES+=usr/share/man/man8/rtadvd.8.gz
 OLD_FILES+=usr/share/man/man8/rtsol.8.gz
 OLD_FILES+=usr/share/man/man8/rtsold.8.gz
 OLD_FILES+=usr/share/man/man8/traceroute6.8.gz
 .endif
 
 .if ${MK_INET6_SUPPORT} == no
 OLD_FILES+=rescue/ping6
 OLD_FILES+=rescue/rtsol
 .endif
 
 .if ${MK_INETD} == no
 OLD_FILES+=etc/inetd.conf
 OLD_FILES+=etc/rc.d/inetd
 OLD_FILES+=usr/sbin/inetd
 OLD_FILES+=usr/share/man/man5/inetd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/inetd.8.gz
 .endif
 
 .if ${MK_IPFILTER} == no
 OLD_FILES+=etc/periodic/security/510.ipfdenied
 OLD_FILES+=etc/periodic/security/610.ipf6denied
 OLD_FILES+=etc/rc.d/ipfilter
 OLD_FILES+=etc/rc.d/ipfs
 OLD_FILES+=etc/rc.d/ipmon
 OLD_FILES+=etc/rc.d/ipnat
 OLD_FILES+=etc/rc.d/ippool
 OLD_FILES+=rescue/ipf
 OLD_FILES+=sbin/ipf
 OLD_FILES+=sbin/ipfs
 OLD_FILES+=sbin/ipfstat
 OLD_FILES+=sbin/ipftest
 OLD_FILES+=sbin/ipmon
 OLD_FILES+=sbin/ipnat
 OLD_FILES+=sbin/ippool
 OLD_FILES+=sbin/ipresend
 OLD_FILES+=usr/include/netinet/ip_auth.h
 OLD_FILES+=usr/include/netinet/ip_compat.h
 OLD_FILES+=usr/include/netinet/ip_fil.h
 OLD_FILES+=usr/include/netinet/ip_frag.h
 OLD_FILES+=usr/include/netinet/ip_htable.h
 OLD_FILES+=usr/include/netinet/ip_lookup.h
 OLD_FILES+=usr/include/netinet/ip_nat.h
 OLD_FILES+=usr/include/netinet/ip_pool.h
 OLD_FILES+=usr/include/netinet/ip_proxy.h
 OLD_FILES+=usr/include/netinet/ip_rules.h
 OLD_FILES+=usr/include/netinet/ip_scan.h
 OLD_FILES+=usr/include/netinet/ip_state.h
 OLD_FILES+=usr/include/netinet/ip_sync.h
 OLD_FILES+=usr/include/netinet/ipl.h
 OLD_FILES+=usr/share/examples/ipfilter/README
 OLD_FILES+=usr/share/examples/ipfilter/BASIC.NAT
 OLD_FILES+=usr/share/examples/ipfilter/BASIC_1.FW
 OLD_FILES+=usr/share/examples/ipfilter/BASIC_2.FW
 OLD_FILES+=usr/share/examples/ipfilter/example.1
 OLD_FILES+=usr/share/examples/ipfilter/example.2
 OLD_FILES+=usr/share/examples/ipfilter/example.3
 OLD_FILES+=usr/share/examples/ipfilter/example.4
 OLD_FILES+=usr/share/examples/ipfilter/example.5
 OLD_FILES+=usr/share/examples/ipfilter/example.6
 OLD_FILES+=usr/share/examples/ipfilter/example.7
 OLD_FILES+=usr/share/examples/ipfilter/example.8
 OLD_FILES+=usr/share/examples/ipfilter/example.9
 OLD_FILES+=usr/share/examples/ipfilter/example.10
 OLD_FILES+=usr/share/examples/ipfilter/example.11
 OLD_FILES+=usr/share/examples/ipfilter/example.12
 OLD_FILES+=usr/share/examples/ipfilter/example.13
 OLD_FILES+=usr/share/examples/ipfilter/example.sr
 OLD_FILES+=usr/share/examples/ipfilter/firewall
 OLD_FILES+=usr/share/examples/ipfilter/ftp-proxy
 OLD_FILES+=usr/share/examples/ipfilter/ftppxy
 OLD_FILES+=usr/share/examples/ipfilter/nat-setup
 OLD_FILES+=usr/share/examples/ipfilter/nat.eg
 OLD_FILES+=usr/share/examples/ipfilter/server
 OLD_FILES+=usr/share/examples/ipfilter/tcpstate
 OLD_FILES+=usr/share/examples/ipfilter/example.14
 OLD_FILES+=usr/share/examples/ipfilter/firewall.1
 OLD_FILES+=usr/share/examples/ipfilter/firewall.2
 OLD_FILES+=usr/share/examples/ipfilter/ipf.conf.permissive
 OLD_FILES+=usr/share/examples/ipfilter/ipf.conf.restrictive
 OLD_FILES+=usr/share/examples/ipfilter/ipf.conf.sample
 OLD_FILES+=usr/share/examples/ipfilter/ipnat.conf.sample
 OLD_FILES+=usr/share/examples/ipfilter/ipf-howto.txt
 OLD_FILES+=usr/share/examples/ipfilter/examples.txt
 OLD_FILES+=usr/share/examples/ipfilter/rules.txt
 OLD_FILES+=usr/share/examples/ipfilter/mkfilters
 OLD_DIRS+=usr/share/examples/ipfilter
 OLD_FILES+=usr/share/man/man1/ipftest.1.gz
 OLD_FILES+=usr/share/man/man1/ipresend.1.gz
 OLD_FILES+=usr/share/man/man4/ipf.4.gz
 OLD_FILES+=usr/share/man/man4/ipl.4.gz
 OLD_FILES+=usr/share/man/man4/ipfilter.4.gz
 OLD_FILES+=usr/share/man/man4/ipnat.4.gz
 OLD_FILES+=usr/share/man/man5/ipf.5.gz
 OLD_FILES+=usr/share/man/man5/ipf.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ipf6.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ipfilter.5.gz
 OLD_FILES+=usr/share/man/man8/ipmon.5.gz
 OLD_FILES+=usr/share/man/man5/ipmon.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ipnat.5.gz
 OLD_FILES+=usr/share/man/man5/ipnat.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ippool.5.gz
 OLD_FILES+=usr/share/man/man8/ipf.8.gz
 OLD_FILES+=usr/share/man/man8/ipfs.8.gz
 OLD_FILES+=usr/share/man/man8/ipfstat.8.gz
 OLD_FILES+=usr/share/man/man8/ipmon.8.gz
 OLD_FILES+=usr/share/man/man8/ipnat.8.gz
 OLD_FILES+=usr/share/man/man8/ippool.8.gz
 .endif
 
 .if ${MK_IPFW} == no
 OLD_FILES+=etc/rc.d/ipfw
 OLD_FILES+=etc/periodic/security/500.ipfwdenied
 OLD_FILES+=etc/periodic/security/550.ipfwlimit
 OLD_FILES+=sbin/ipfw
 OLD_FILES+=sbin/natd
 OLD_FILES+=usr/sbin/ipfwpcap
 OLD_FILES+=usr/share/man/man8/ipfw.8.gz
 OLD_FILES+=usr/share/man/man8/ipfwpcap.8.gz
 OLD_FILES+=usr/share/man/man8/natd.8.gz
 .endif
 
 .if ${MK_ISCSI} == no
 OLD_FILES+=etc/rc.d/iscsictl
 OLD_FILES+=etc/rc.d/iscsid
 OLD_FILES+=rescue/iscsictl
 OLD_FILES+=rescue/iscsid
 OLD_FILES+=usr/bin/iscsictl
 OLD_FILES+=usr/sbin/iscsid
 OLD_FILES+=usr/share/man/man4/iscsi.4.gz
 OLD_FILES+=usr/share/man/man5/iscsi.conf.5.gz
 OLD_FILES+=usr/share/man/man8/iscsictl.8.gz
 OLD_FILES+=usr/share/man/man8/iscsid.8.gz
 .endif
 
 .if ${MK_JAIL} == no
 OLD_FILES+=etc/rc.d/jail
 OLD_FILES+=usr/sbin/jail
 OLD_FILES+=usr/sbin/jexec
 OLD_FILES+=usr/sbin/jls
 OLD_FILES+=usr/share/man/man5/jail.conf.5.gz
 OLD_FILES+=usr/share/man/man8/jail.8.gz
 OLD_FILES+=usr/share/man/man8/jexec.8.gz
 OLD_FILES+=usr/share/man/man8/jls.8.gz
 .endif
 
 .if ${MK_KDUMP} == no
 OLD_FILES+=usr/bin/kdump
 OLD_FILES+=usr/bin/truss
 OLD_FILES+=usr/share/man/man1/kdump.1.gz
 OLD_FILES+=usr/share/man/man1/truss.1.gz
 .endif
 
 .if ${MK_KERBEROS} == no
 OLD_FILES+=etc/rc.d/ipropd_master
 OLD_FILES+=etc/rc.d/ipropd_slave
 OLD_FILES+=usr/bin/asn1_compile
 OLD_FILES+=usr/bin/compile_et
 OLD_FILES+=usr/bin/hxtool
 OLD_FILES+=usr/bin/kadmin
 OLD_FILES+=usr/bin/kcc
 OLD_FILES+=usr/bin/kdestroy
 OLD_FILES+=usr/bin/kf
 OLD_FILES+=usr/bin/kgetcred
 OLD_FILES+=usr/bin/kinit
 OLD_FILES+=usr/bin/klist
 OLD_FILES+=usr/bin/kpasswd
 OLD_FILES+=usr/bin/krb5-config
 OLD_FILES+=usr/bin/ksu
 OLD_FILES+=usr/bin/kswitch
 OLD_FILES+=usr/bin/make-roken
 OLD_FILES+=usr/bin/slc
 OLD_FILES+=usr/bin/string2key
 OLD_FILES+=usr/bin/verify_krb5_conf
 OLD_FILES+=usr/include/asn1-common.h
 OLD_FILES+=usr/include/asn1_err.h
 OLD_FILES+=usr/include/base64.h
 OLD_FILES+=usr/include/cms_asn1.h
 OLD_FILES+=usr/include/crmf_asn1.h
 OLD_FILES+=usr/include/der-private.h
 OLD_FILES+=usr/include/der-protos.h
 OLD_FILES+=usr/include/der.h
 OLD_FILES+=usr/include/digest_asn1.h
 OLD_FILES+=usr/include/getarg.h
 OLD_FILES+=usr/include/gssapi/gssapi_krb5.h
 OLD_FILES+=usr/include/hdb-protos.h
 OLD_FILES+=usr/include/hdb.h
 OLD_FILES+=usr/include/hdb_asn1.h
 OLD_FILES+=usr/include/hdb_err.h
 OLD_FILES+=usr/include/heim_asn1.h
 OLD_FILES+=usr/include/heim_err.h
 OLD_FILES+=usr/include/heim_threads.h
 OLD_FILES+=usr/include/heimbase.h
 OLD_FILES+=usr/include/heimntlm-protos.h
 OLD_FILES+=usr/include/heimntlm.h
 OLD_FILES+=usr/include/hex.h
 OLD_FILES+=usr/include/hx509-private.h
 OLD_FILES+=usr/include/hx509-protos.h
 OLD_FILES+=usr/include/hx509.h
 OLD_FILES+=usr/include/hx509_err.h
 OLD_FILES+=usr/include/k524_err.h
 OLD_FILES+=usr/include/kadm5/admin.h
 OLD_FILES+=usr/include/kadm5/kadm5-private.h
 OLD_FILES+=usr/include/kadm5/kadm5-protos.h
 OLD_FILES+=usr/include/kadm5/kadm5-pwcheck.h
 OLD_FILES+=usr/include/kadm5/kadm5_err.h
 OLD_FILES+=usr/include/kadm5/private.h
 OLD_DIRS+=usr/include/kadm5
 OLD_FILES+=usr/include/kafs.h
 OLD_FILES+=usr/include/kdc-protos.h
 OLD_FILES+=usr/include/kdc.h
 OLD_FILES+=usr/include/krb5-private.h
 OLD_FILES+=usr/include/krb5-protos.h
 OLD_FILES+=usr/include/krb5-types.h
 OLD_FILES+=usr/include/krb5.h
 OLD_FILES+=usr/include/krb5/ccache_plugin.h
 OLD_FILES+=usr/include/krb5/locate_plugin.h
 OLD_FILES+=usr/include/krb5/send_to_kdc_plugin.h
 OLD_FILES+=usr/include/krb5/windc_plugin.h
 OLD_DIRS+=usr/include/krb5
 OLD_FILES+=usr/include/krb5_asn1.h
 OLD_FILES+=usr/include/krb5_ccapi.h
 OLD_FILES+=usr/include/krb5_err.h
 OLD_FILES+=usr/include/kx509_asn1.h
 OLD_FILES+=usr/include/ntlm_err.h
 OLD_FILES+=usr/include/ocsp_asn1.h
 OLD_FILES+=usr/include/parse_bytes.h
 OLD_FILES+=usr/include/parse_time.h
 OLD_FILES+=usr/include/parse_units.h
 OLD_FILES+=usr/include/pkcs10_asn1.h
 OLD_FILES+=usr/include/pkcs12_asn1.h
 OLD_FILES+=usr/include/pkcs8_asn1.h
 OLD_FILES+=usr/include/pkcs9_asn1.h
 OLD_FILES+=usr/include/pkinit_asn1.h
 OLD_FILES+=usr/include/resolve.h
 OLD_FILES+=usr/include/rfc2459_asn1.h
 OLD_FILES+=usr/include/roken-common.h
 OLD_FILES+=usr/include/rtbl.h
 OLD_FILES+=usr/include/wind.h
 OLD_FILES+=usr/include/wind_err.h
 OLD_FILES+=usr/include/xdbm.h
 OLD_FILES+=usr/lib/libasn1.a
 OLD_FILES+=usr/lib/libasn1.so
 OLD_LIBS+=usr/lib/libasn1.so.11
 OLD_FILES+=usr/lib/libasn1_p.a
 OLD_FILES+=usr/lib/libcom_err.a
 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/lib/libgssapi_krb5.a
 OLD_FILES+=usr/lib/libgssapi_krb5.so
 OLD_LIBS+=usr/lib/libgssapi_krb5.so.10
 OLD_FILES+=usr/lib/libgssapi_krb5_p.a
 OLD_FILES+=usr/lib/libgssapi_ntlm.a
 OLD_FILES+=usr/lib/libgssapi_ntlm.so
 OLD_LIBS+=usr/lib/libgssapi_ntlm.so.10
 OLD_FILES+=usr/lib/libgssapi_ntlm_p.a
 OLD_FILES+=usr/lib/libgssapi_spnego.a
 OLD_FILES+=usr/lib/libgssapi_spnego.so
 OLD_LIBS+=usr/lib/libgssapi_spnego.so.10
 OLD_FILES+=usr/lib/libgssapi_spnego_p.a
 OLD_FILES+=usr/lib/libhdb.a
 OLD_FILES+=usr/lib/libhdb.so
 OLD_LIBS+=usr/lib/libhdb.so.11
 OLD_FILES+=usr/lib/libhdb_p.a
 OLD_FILES+=usr/lib/libheimbase.a
 OLD_FILES+=usr/lib/libheimbase.so
 OLD_LIBS+=usr/lib/libheimbase.so.11
 OLD_FILES+=usr/lib/libheimbase_p.a
 OLD_FILES+=usr/lib/libheimntlm.a
 OLD_FILES+=usr/lib/libheimntlm.so
 OLD_LIBS+=usr/lib/libheimntlm.so.11
 OLD_FILES+=usr/lib/libheimntlm_p.a
 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/lib/libhx509.a
 OLD_FILES+=usr/lib/libhx509.so
 OLD_LIBS+=usr/lib/libhx509.so.11
 OLD_FILES+=usr/lib/libhx509_p.a
 OLD_FILES+=usr/lib/libkadm5clnt.a
 OLD_FILES+=usr/lib/libkadm5clnt.so
 OLD_LIBS+=usr/lib/libkadm5clnt.so.11
 OLD_FILES+=usr/lib/libkadm5clnt_p.a
 OLD_FILES+=usr/lib/libkadm5srv.a
 OLD_FILES+=usr/lib/libkadm5srv.so
 OLD_LIBS+=usr/lib/libkadm5srv.so.11
 OLD_FILES+=usr/lib/libkadm5srv_p.a
 OLD_FILES+=usr/lib/libkafs5.a
 OLD_FILES+=usr/lib/libkafs5.so
 OLD_LIBS+=usr/lib/libkafs5.so.11
 OLD_FILES+=usr/lib/libkafs5_p.a
 OLD_FILES+=usr/lib/libkdc.a
 OLD_FILES+=usr/lib/libkdc.so
 OLD_LIBS+=usr/lib/libkdc.so.11
 OLD_FILES+=usr/lib/libkdc_p.a
 OLD_FILES+=usr/lib/libkrb5.a
 OLD_FILES+=usr/lib/libkrb5.so
 OLD_LIBS+=usr/lib/libkrb5.so.11
 OLD_FILES+=usr/lib/libkrb5_p.a
 OLD_FILES+=usr/lib/libroken.a
 OLD_FILES+=usr/lib/libroken.so
 OLD_LIBS+=usr/lib/libroken.so.11
 OLD_FILES+=usr/lib/libroken_p.a
 OLD_FILES+=usr/lib/libwind.a
 OLD_FILES+=usr/lib/libwind.so
 OLD_LIBS+=usr/lib/libwind.so.11
 OLD_FILES+=usr/lib/libwind_p.a
 OLD_FILES+=usr/lib/pam_krb5.so
 OLD_LIBS+=usr/lib/pam_krb5.so.6
 OLD_FILES+=usr/lib/pam_ksu.so
 OLD_LIBS+=usr/lib/pam_ksu.so.6
 OLD_FILES+=usr/lib/libprivateheimipcc.a
 OLD_FILES+=usr/lib/libprivateheimipcc.so
 OLD_LIBS+=usr/lib/libprivateheimipcc.so.11
 OLD_FILES+=usr/lib/libprivateheimipcc_p.a
 OLD_FILES+=usr/lib/libprivateheimipcs.a
 OLD_FILES+=usr/lib/libprivateheimipcs.so
 OLD_LIBS+=usr/lib/libprivateheimipcs.so.11
 OLD_FILES+=usr/lib/libprivateheimipcs_p.a
 OLD_FILES+=usr/libexec/digest-service
 OLD_FILES+=usr/libexec/hprop
 OLD_FILES+=usr/libexec/hpropd
 OLD_FILES+=usr/libexec/ipropd-master
 OLD_FILES+=usr/libexec/ipropd-slave
 OLD_FILES+=usr/libexec/kadmind
 OLD_FILES+=usr/libexec/kcm
 OLD_FILES+=usr/libexec/kdc
 OLD_FILES+=usr/libexec/kdigest
 OLD_FILES+=usr/libexec/kfd
 OLD_FILES+=usr/libexec/kimpersonate
 OLD_FILES+=usr/libexec/kpasswdd
 OLD_FILES+=usr/sbin/kstash
 OLD_FILES+=usr/sbin/ktutil
 OLD_FILES+=usr/sbin/iprop-log
 OLD_FILES+=usr/share/man/man1/kdestroy.1.gz
 OLD_FILES+=usr/share/man/man1/kf.1.gz
 OLD_FILES+=usr/share/man/man1/kinit.1.gz
 OLD_FILES+=usr/share/man/man1/klist.1.gz
 OLD_FILES+=usr/share/man/man1/kpasswd.1.gz
 OLD_FILES+=usr/share/man/man1/krb5-config.1.gz
 OLD_FILES+=usr/share/man/man1/kswitch.1.gz
 OLD_FILES+=usr/share/man/man3/HDB.3.gz
 OLD_FILES+=usr/share/man/man3/hdb__del.3.gz
 OLD_FILES+=usr/share/man/man3/hdb__get.3.gz
 OLD_FILES+=usr/share/man/man3/hdb__put.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_auth_status.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_check_constrained_delegation.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_check_pkinit_ms_upn_match.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_check_s4u2self.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_close.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_entry_ex.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_fetch_kvno.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_firstkey.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_free.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_get_realms.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_lock.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_name.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_nextkey.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_open.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_password.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_remove.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_rename.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_store.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_unlock.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_build_ntlm1_master.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_build_ntlm2_master.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_calculate_lm2.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_calculate_ntlm1.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_calculate_ntlm2.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_decode_targetinfo.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_encode_targetinfo.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_encode_type1.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_encode_type2.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_encode_type3.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_free_buf.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_free_targetinfo.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_free_type1.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_free_type2.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_free_type3.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_keyex_unwrap.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_nt_key.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_ntlmv2_key.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_verify_ntlm2.3.gz
 OLD_FILES+=usr/share/man/man3/hx509.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_bitstring_print.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_sign.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_sign_self.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_crl_dp_uri.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_eku.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_san_hostname.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_san_jid.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_san_ms_upn.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_san_otherName.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_san_pkinit.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_san_rfc822name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_init.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_ca.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_domaincontroller.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_notAfter.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_notAfter_lifetime.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_notBefore.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_proxy.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_serialnumber.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_spki.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_subject.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_template.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_unique.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_subject_expand.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_template_units.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_binary.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_check_eku.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_cmp.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_find_subjectAltName_otherName.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_SPKI.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_SPKI_AlgorithmIdentifier.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_attribute.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_base_subject.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_friendly_name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_issuer.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_issuer_unique_id.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_notAfter.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_notBefore.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_serialnumber.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_subject.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_subject_unique_id.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_init.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_init_data.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_keyusage_print.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_ref.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_set_friendly_name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_add.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_append.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_end_seq.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_filter.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_find.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_info.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_init.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_iter_f.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_merge.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_next_cert.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_start_seq.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_store.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ci_print_names.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_clear_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cms.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cms_create_signed_1.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cms_envelope_1.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cms_unenvelope.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cms_unwrap_ContentInfo.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cms_verify_signed.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cms_wrap_ContentInfo.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_context_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_context_init.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_context_set_missing_revoke.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_crl_add_revoked_certs.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_crl_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_crl_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_crl_lifetime.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_crl_sign.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_crypto.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_env.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_env_add.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_env_add_binding.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_env_find.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_env_find_binding.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_env_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_env_lfind.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_err.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_error.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_free_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_free_octet_string_list.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_general_name_unparse.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_get_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_get_one_cert.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_keyset.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_lock.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_misc.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_binary.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_cmp.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_copy.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_expand.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_is_null_p.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_to_Name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_to_string.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ocsp_request.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ocsp_verify.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_oid_print.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_oid_sprint.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_parse_name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_peer.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_peer_info_add_cms_alg.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_peer_info_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_peer_info_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_peer_info_set_cert.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_peer_info_set_cms_algs.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_print.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_print_cert.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_print_stdout.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_match_cmp_func.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_match_eku.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_match_friendly_name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_match_issuer_serial.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_match_option.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_statistic_file.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_unparse_stats.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_revoke.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_revoke_add_crl.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_revoke_add_ocsp.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_revoke_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_revoke_init.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_revoke_ocsp_print.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_revoke_verify.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_set_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_set_error_stringv.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_unparse_der_name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_validate_cert.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_validate_ctx_add_flags.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_validate_ctx_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_validate_ctx_init.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_validate_ctx_set_print.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_attach_anchors.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_attach_revoke.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_ctx_f_allow_default_trustanchors.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_destroy_ctx.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_hostname.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_init_ctx.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_path.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_set_max_depth.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_set_proxy_certificate.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_set_strict_rfc3280_verification.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_set_time.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_signature.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_xfree.3.gz
 OLD_FILES+=usr/share/man/man3/k_afs_cell_of_file.3.gz
 OLD_FILES+=usr/share/man/man3/k_hasafs.3.gz
 OLD_FILES+=usr/share/man/man3/k_pioctl.3.gz
 OLD_FILES+=usr/share/man/man3/k_setpag.3.gz
 OLD_FILES+=usr/share/man/man3/k_unlog.3.gz
 OLD_FILES+=usr/share/man/man3/kadm5_pwcheck.3.gz
 OLD_FILES+=usr/share/man/man3/kafs.3.gz
 OLD_FILES+=usr/share/man/man3/kafs5.3.gz
 OLD_FILES+=usr/share/man/man3/kafs_set_verbose.3.gz
 OLD_FILES+=usr/share/man/man3/kafs_settoken.3.gz
 OLD_FILES+=usr/share/man/man3/kafs_settoken5.3.gz
 OLD_FILES+=usr/share/man/man3/kafs_settoken_rxkad.3.gz
 OLD_FILES+=usr/share/man/man3/krb5.3.gz
 OLD_FILES+=usr/share/man/man3/krb524_convert_creds_kdc.3.gz
 OLD_FILES+=usr/share/man/man3/krb524_convert_creds_kdc_ccache.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_425_conv_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_425_conv_principal_ext.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_524_conv_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_acc_ops.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_acl_match_file.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_acl_match_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_add_et_list.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_add_extra_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_add_ignore_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_addlog_dest.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_addlog_func.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_addr2sockaddr.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_address_compare.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_address_order.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_address_prefixlen_boundary.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_address_search.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_afslog.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_afslog_uid.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_allow_weak_crypto.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_aname_to_localname.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_anyaddr.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_appdefault.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_appdefault_boolean.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_appdefault_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_appdefault_time.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_append_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_genaddrs.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_getaddrs.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_getflags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_getkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_getlocalsubkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_getrcache.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_getremotesubkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_getuserkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_init.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_initivector.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setaddrs.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setaddrs_from_fd.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setflags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setivector.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setlocalsubkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setrcache.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setremotesubkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setuserkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_context.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_getauthenticator.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_getcksumtype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_getkeytype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_getlocalseqnumber.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_getremoteseqnumber.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_setcksumtype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_setkeytype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_setlocalseqnumber.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_setremoteseqnumber.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_build_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_build_principal_ext.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_build_principal_va.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_build_principal_va_ext.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_c_enctype_compare.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_c_make_checksum.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_cache_end_seq_get.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_cache_get_first.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_cache_match.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_cache_next.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_clear_mcred.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_close.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_copy_cache.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_copy_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_copy_match_f.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_default_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_end_seq_get.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_gen_new.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_config.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_friendly_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_full_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_kdc_offset.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_lifetime.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_ops.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_prefix_ops.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_type.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_version.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_initialize.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_last_change_time.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_move.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_new_unique.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_next_cred.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_register.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_remove_cred.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_resolve.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_retrieve_cred.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_set_config.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_set_default_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_set_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_set_friendly_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_set_kdc_offset.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_start_seq_get.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_store_cred.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_support_switch.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_switch.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ccache.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ccache_intro.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cccol_cursor_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cccol_cursor_new.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cccol_cursor_next.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cccol_last_change_time.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_change_password.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_check_transited.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_checksum_is_collision_proof.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_checksum_is_keyed.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_checksumsize.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cksumtype_to_enctype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_clear_error_message.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_clear_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_closelog.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_compare_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_file_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_free_strings.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_bool.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_bool_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_list.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_string_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_strings.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_time.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_time_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_parse_file_multi.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_parse_string_multi.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_bool.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_bool_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_list.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_string_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_strings.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_time.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_time_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_context.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_creds_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_data.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_host_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_keyblock.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_keyblock_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_ticket.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_create_checksum.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_create_checksum_iov.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_credential.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_creds_get_ticket_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_fx_cf2.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_getblocksize.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_getconfoundersize.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_getenctype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_getpadsize.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_init.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_iov.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_data_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_data_cmp.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_data_copy.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_data_ct_cmp.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_data_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_data_realloc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_data_zero.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_decrypt.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_decrypt_EncryptedData.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_decrypt_iov_ivec.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_deprecated.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_digest.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_digest_probe.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_eai_to_heim_errno.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_encrypt_EncryptedData.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_encrypt_iov_ivec.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_enctype_disable.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_enctype_enable.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_enctype_valid.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_enctypes_compatible_keys.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_error.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_expand_hostname.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_expand_hostname_realms.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_fcc_ops.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_fileformats.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_find_padata.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_config_files.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_context.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_cred_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_creds_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_data.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_data_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_host_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_keyblock.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_keyblock_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_krbhst.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_ticket.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_unparsed_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_fwd_tgt_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_generate_random_block.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_generate_subkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_generate_subkey_extended.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_all_client_addrs.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_all_server_addrs.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_cred_from_kdc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_cred_from_kdc_opt.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_credentials.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_default_config_files.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_default_in_tkt_etypes.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_default_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_default_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_default_realms.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_dns_canonicalize_hostname.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_extra_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_fcache_version.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_forwarded_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_host_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_ignore_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_in_cred.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_in_tkt_with_keytab.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_in_tkt_with_password.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_in_tkt_with_skey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds_keyblock.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds_keytab.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds_opt_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds_opt_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds_opt_get_error.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds_opt_init.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds_password.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_kdc_sec_offset.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_krb524hst.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_krb_admin_hst.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_krb_changepw_hst.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_krbhst.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_max_time_skew.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_use_admin_kdc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_validated_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_getportbyname.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_h_addr2addr.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_h_addr2sockaddr.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_h_errno_to_heim_errno.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_context.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_get.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_get_error.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_init.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_intro.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_set_keytab.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_set_password.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_set_service.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_step.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_ets.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_initlog.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_introduction.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_is_config_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_is_thread_safe.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kerberos_enctypes.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keyblock_get_enctype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keyblock_init.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keyblock_zero.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keytab.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keytab_intro.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keytab_key_proc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keytype_to_enctypes.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keytype_to_enctypes_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keytype_to_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_format_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_get_addrinfo.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_init.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_next.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_next_as_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_reset.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_add_entry.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_close.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_compare.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_copy_entry_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_default_modify_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_default_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_end_seq_get.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_free_entry.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_get_entry.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_get_full_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_get_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_get_type.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_have_content.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_next_entry.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_read_service_key.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_register.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_remove_entry.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_resolve.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_start_seq_get.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kuserok.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_log.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_log_msg.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_make_addrport.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_make_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_max_sockaddr_size.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_mcc_ops.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_mk_req.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_mk_safe.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_openlog.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_pac.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_pac_get_buffer.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_pac_verify.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_parse_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_parse_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_parse_name_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_parse_nametype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_password_key_proc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_plugin_register.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_prepend_config_files_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_princ_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_princ_set_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_compare.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_compare_any_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_get_comp_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_get_num_comp.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_get_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_get_type.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_intro.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_is_krbtgt.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_match.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_set_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_set_type.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_print_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_random_to_key.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rcache.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_error.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_req_ctx.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_req_in_ctx_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_req_in_set_keytab.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_req_in_set_pac_check.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_req_out_ctx_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_req_out_get_server.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_safe.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_realm_compare.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_addrs.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_authdata.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_creds_tag.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_data.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_int16.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_int32.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_int8.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_keyblock.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_stringz.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_times.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_uint16.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_uint32.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_uint8.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_config_files.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_default_in_tkt_etypes.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_default_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_dns_canonicalize_hostname.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_error_message.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_extra_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_fcache_version.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_home_dir_access.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_ignore_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_kdc_sec_offset.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_max_time_skew.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_password.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_real_time.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_use_admin_kdc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_sname_to_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_sock_to_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_sockaddr2address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_sockaddr2port.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_sockaddr_uninteresting.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_clear_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_emem.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_from_data.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_from_fd.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_from_mem.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_from_readonly_mem.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_get_byteorder.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_get_eof_code.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_is_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_read.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_seek.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_set_byteorder.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_set_eof_code.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_set_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_set_max_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_to_data.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_truncate.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_write.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_addrs.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_authdata.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_creds_tag.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_data.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_int16.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_int32.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_int8.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_keyblock.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_stringz.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_times.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_uint16.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_uint32.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_uint8.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_string_to_key.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_string_to_keytype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_support.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ticket.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ticket_get_authorization_data_type.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ticket_get_client.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ticket_get_endtime.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ticket_get_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ticket_get_server.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_timeofday.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_unparse_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_unparse_name_fixed.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_unparse_name_fixed_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_unparse_name_fixed_short.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_unparse_name_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_unparse_name_short.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_us_timeofday.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_v4compat.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_checksum.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_checksum_iov.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_init_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_opt_init.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_opt_set_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_opt_set_keytab.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_opt_set_secure.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_opt_set_service.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_user.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_user_lrealm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_user_opt.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_vlog.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_vlog_msg.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_vset_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_vwarn.3.gz
 OLD_FILES+=usr/share/man/man3/krb_afslog.3.gz
 OLD_FILES+=usr/share/man/man3/krb_afslog_uid.3.gz
 OLD_FILES+=usr/share/man/man3/ntlm_buf.3.gz
 OLD_FILES+=usr/share/man/man3/ntlm_core.3.gz
 OLD_FILES+=usr/share/man/man3/ntlm_type1.3.gz
 OLD_FILES+=usr/share/man/man3/ntlm_type2.3.gz
 OLD_FILES+=usr/share/man/man3/ntlm_type3.3.gz
 OLD_FILES+=usr/share/man/man5/krb5.conf.5.gz
 OLD_FILES+=usr/share/man/man8/hprop.8.gz
 OLD_FILES+=usr/share/man/man8/hpropd.8.gz
 OLD_FILES+=usr/share/man/man8/iprop-log.8.gz
 OLD_FILES+=usr/share/man/man8/iprop.8.gz
 OLD_FILES+=usr/share/man/man8/kadmin.8.gz
 OLD_FILES+=usr/share/man/man8/kadmind.8.gz
 OLD_FILES+=usr/share/man/man8/kcm.8.gz
 OLD_FILES+=usr/share/man/man8/kdc.8.gz
 OLD_FILES+=usr/share/man/man8/kdigest.8.gz
 OLD_FILES+=usr/share/man/man8/kerberos.8.gz
 OLD_FILES+=usr/share/man/man8/kimpersonate.8.gz
 OLD_FILES+=usr/share/man/man8/kpasswdd.8.gz
 OLD_FILES+=usr/share/man/man8/kstash.8.gz
 OLD_FILES+=usr/share/man/man8/ktutil.8.gz
 OLD_FILES+=usr/share/man/man8/pam_krb5.8.gz
 OLD_FILES+=usr/share/man/man8/pam_ksu.8.gz
 OLD_FILES+=usr/share/man/man8/string2key.8.gz
 OLD_FILES+=usr/share/man/man8/verify_krb5_conf.8.gz
 .endif
 
 .if ${MK_KERBEROS_SUPPORT} == no
 OLD_FILES+=usr/bin/compile_et
 OLD_FILES+=usr/include/com_err.h
 OLD_FILES+=usr/include/com_right.h
 OLD_FILES+=usr/lib/libcom_err.a
 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/share/man/man1/compile_et.1.gz
 OLD_FILES+=usr/share/man/man3/com_err.3.gz
 .endif
 
 .if ${MK_LDNS} == no
 OLD_FILES+=usr/lib/libprivateldns.a
 OLD_FILES+=usr/lib/libprivateldns.so
 OLD_LIBS+=usr/lib/libprivateldns.so.5
 OLD_FILES+=usr/lib/libprivateldns_p.a
 .endif
 
 .if ${MK_LDNS_UTILS} == no
 OLD_FILES+=usr/bin/drill
 OLD_FILES+=usr/share/man/man1/drill.1.gz
 OLD_FILES+=usr/bin/host
 OLD_FILES+=usr/share/man/man1/host.1.gz
 .endif
 
 .if ${MK_LEGACY_CONSOLE} == no
 OLD_FILES+=etc/rc.d/moused
 OLD_FILES+=etc/rc.d/syscons
 OLD_FILES+=usr/sbin/kbdcontrol
 OLD_FILES+=usr/sbin/kbdmap
 OLD_FILES+=usr/sbin/moused
 OLD_FILES+=usr/sbin/vidcontrol
 OLD_FILES+=usr/sbin/vidfont
 OLD_FILES+=usr/share/man/man1/kbdcontrol.1.gz
 OLD_FILES+=usr/share/man/man1/kbdmap.1.gz
 OLD_FILES+=usr/share/man/man1/vidcontrol.1.gz
 OLD_FILES+=usr/share/man/man1/vidfont.1.gz
 OLD_FILES+=usr/share/man/man5/kbdmap.5.gz
 OLD_FILES+=usr/share/man/man5/keymap.5.gz
 OLD_FILES+=usr/share/man/man8/moused.8.gz
 .endif
 
 .for LIBCOMPAT libcompat in ${_ALL_LIBCOMPATS_libcompats}
 .  if ${MK_LIB${LIBCOMPAT}} == no
 OLD_FILES+=etc/mtree/BSD.lib${libcompat}.dist
 OLD_FILES+=libexec/ld-elf${libcompat}.so.1
 .    if exists(${DESTDIR}/usr/lib${libcompat})
 LIB${LIBCOMPAT}_DIRS!=find ${DESTDIR}/usr/lib${libcompat} -type d \
     | sed -e 's,^${DESTDIR}/,,'; echo
 LIB${LIBCOMPAT}_FILES!=find ${DESTDIR}/usr/lib${libcompat} \! -type d \
     \! -name "lib*.so*" | sed -e 's,^${DESTDIR}/,,'; echo
 LIB${LIBCOMPAT}_LIBS!=find ${DESTDIR}/usr/lib${libcompat} \! -type d \
     -name "lib*.so*" | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_DIRS+=${LIB${LIBCOMPAT}_DIRS}
 OLD_FILES+=${LIB${LIBCOMPAT}_FILES}
 OLD_LIBS+=${LIB${LIBCOMPAT}_LIBS}
 .    endif
 .    if ${MK_DEBUG_FILES} == no
 .      if exists(${DESTDIR}/usr/lib/debug/usr/lib${libcompat})
 DEBUG_LIB${LIBCOMPAT}_DIRS!=find ${DESTDIR}/usr/lib/debug/usr/lib${libcompat} -type d \
     | sed -e 's,^${DESTDIR}/,,'; echo
 DEBUG_LIB${LIBCOMPAT}_FILES!=find ${DESTDIR}/usr/lib/debug/usr/lib${libcompat} \! -type d \
     \! -name "lib*.so*" | sed -e 's,^${DESTDIR}/,,'; echo
 DEBUG_LIB${LIBCOMPAT}_LIBS!=find ${DESTDIR}/usr/lib/debug/usr/lib${libcompat} \! -type d \
     -name "lib*.so*" | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_DIRS+=${DEBUG_LIB${LIBCOMPAT}_DIRS}
 OLD_FILES+=${DEBUG_LIB${LIBCOMPAT}_FILES}
 OLD_LIBS+=${DEBUG_LIB${LIBCOMPAT}_LIBS}
 .      endif
 .    endif
 .endif
 .endfor # LIBCOMPAT libcompat
 
 .if ${MK_LLD} == no
 OLD_FILES+=usr/bin/ld.lld
 .endif
 
 .if ${MK_LLDB} == no
 OLD_FILES+=usr/bin/lldb
 OLD_FILES+=usr/bin/lldb-server
 OLD_FILES+=usr/share/man/man1/lldb-server.1.gz
 OLD_FILES+=usr/share/man/man1/lldb.1.gz
 .endif
 
 .if ${MK_LOCALES} == no
 OLD_DIRS+=usr/share/locale/af_ZA.ISO8859-15
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/af_ZA.ISO8859-1
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/af_ZA.UTF-8
 OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/am_ET.UTF-8
 OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/ar_AE.UTF-8
 OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/ar_EG.UTF-8
 OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/ar_JO.UTF-8
 OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/ar_MA.UTF-8
 OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/ar_QA.UTF-8
 OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/ar_SA.UTF-8
 OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/be_BY.CP1131
 OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_COLLATE
 OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_CTYPE
 OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_MESSAGES
 OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_MONETARY
 OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_NUMERIC
 OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_TIME
 OLD_DIRS+=usr/share/locale/be_BY.CP1251
 OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_COLLATE
 OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_CTYPE
 OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_MESSAGES
 OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_MONETARY
 OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_NUMERIC
 OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_TIME
 OLD_DIRS+=usr/share/locale/be_BY.ISO8859-5
 OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_COLLATE
 OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_CTYPE
 OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_MESSAGES
 OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_MONETARY
 OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_NUMERIC
 OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_TIME
 OLD_DIRS+=usr/share/locale/be_BY.UTF-8
 OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/bg_BG.CP1251
 OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_COLLATE
 OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_CTYPE
 OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_MESSAGES
 OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_MONETARY
 OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_NUMERIC
 OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_TIME
 OLD_DIRS+=usr/share/locale/bg_BG.UTF-8
 OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/ca_AD.ISO8859-1
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/ca_AD.ISO8859-15
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/ca_AD.UTF-8
 OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/ca_ES.ISO8859-1
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/ca_ES.ISO8859-15
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/ca_ES.UTF-8
 OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/ca_FR.ISO8859-1
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/ca_FR.ISO8859-15
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/ca_FR.UTF-8
 OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/ca_IT.ISO8859-1
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/ca_IT.ISO8859-15
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/ca_IT.UTF-8
 OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/cs_CZ.ISO8859-2
 OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_MONETARY
 OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_TIME
 OLD_DIRS+=usr/share/locale/cs_CZ.UTF-8
 OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/da_DK.ISO8859-1
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/da_DK.ISO8859-15
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/da_DK.UTF-8
 OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/de_AT.ISO8859-1
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/de_AT.ISO8859-15
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/de_AT.UTF-8
 OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/de_CH.ISO8859-1
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/de_CH.ISO8859-15
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/de_CH.UTF-8
 OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/de_DE.ISO8859-1
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/de_DE.ISO8859-15
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/de_DE.UTF-8
 OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/el_GR.ISO8859-7
 OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_COLLATE
 OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_CTYPE
 OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_MESSAGES
 OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_MONETARY
 OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_NUMERIC
 OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_TIME
 OLD_DIRS+=usr/share/locale/el_GR.UTF-8
 OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/en_AU.ISO8859-1
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/en_AU.ISO8859-15
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/en_AU.US-ASCII
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_TIME
 OLD_DIRS+=usr/share/locale/en_AU.UTF-8
 OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/en_CA.ISO8859-1
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/en_CA.ISO8859-15
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/en_CA.US-ASCII
 OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_TIME
 OLD_DIRS+=usr/share/locale/en_CA.UTF-8
 OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/en_GB.ISO8859-1
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/en_GB.ISO8859-15
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/en_GB.US-ASCII
 OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_TIME
 OLD_DIRS+=usr/share/locale/en_GB.UTF-8
 OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/en_HK.ISO8859-1
 OLD_FILES+=usr/share/locale/en_HK.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_HK.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_HK.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_HK.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_HK.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_HK.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/en_HK.UTF-8
 OLD_FILES+=usr/share/locale/en_HK.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_HK.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_HK.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_HK.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_HK.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_HK.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/en_IE.ISO8859-1
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/en_IE.ISO8859-15
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/en_IE.UTF-8
 OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/en_NZ.ISO8859-1
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/en_NZ.ISO8859-15
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/en_NZ.US-ASCII
 OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_TIME
 OLD_DIRS+=usr/share/locale/en_NZ.UTF-8
 OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/en_PH.UTF-8
 OLD_FILES+=usr/share/locale/en_PH.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_PH.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_PH.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_PH.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_PH.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_PH.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/en_SG.ISO8859-1
 OLD_FILES+=usr/share/locale/en_SG.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_SG.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_SG.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_SG.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_SG.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_SG.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/en_SG.UTF-8
 OLD_FILES+=usr/share/locale/en_SG.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_SG.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_SG.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_SG.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_SG.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_SG.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/en_US.ISO8859-1
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/en_US.ISO8859-15
 OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/en_US.US-ASCII
 OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_TIME
 OLD_DIRS+=usr/share/locale/en_US.UTF-8
 OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/en_ZA.ISO8859-1
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/en_ZA.ISO8859-15
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/en_ZA.US-ASCII
 OLD_FILES+=usr/share/locale/en_ZA.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_ZA.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_ZA.US-ASCII/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_ZA.US-ASCII/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_ZA.US-ASCII/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_ZA.US-ASCII/LC_TIME
 OLD_DIRS+=usr/share/locale/en_ZA.UTF-8
 OLD_FILES+=usr/share/locale/en_ZA.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_ZA.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_ZA.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_ZA.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_ZA.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_ZA.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/es_AR.ISO8859-1
 OLD_FILES+=usr/share/locale/es_AR.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/es_AR.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/es_AR.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/es_AR.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/es_AR.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/es_AR.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/es_AR.UTF-8
 OLD_FILES+=usr/share/locale/es_AR.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/es_AR.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/es_AR.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/es_AR.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/es_AR.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/es_AR.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/es_CR.UTF-8
 OLD_FILES+=usr/share/locale/es_CR.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/es_CR.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/es_CR.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/es_CR.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/es_CR.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/es_CR.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/es_ES.ISO8859-1
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/es_ES.ISO8859-15
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/es_ES.UTF-8
 OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/es_MX.ISO8859-1
 OLD_FILES+=usr/share/locale/es_MX.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/es_MX.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/es_MX.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/es_MX.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/es_MX.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/es_MX.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/es_MX.UTF-8
 OLD_FILES+=usr/share/locale/es_MX.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/es_MX.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/es_MX.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/es_MX.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/es_MX.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/es_MX.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/et_EE.ISO8859-1
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/et_EE.ISO8859-15
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/et_EE.UTF-8
 OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/eu_ES.ISO8859-1
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/eu_ES.ISO8859-15
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/eu_ES.UTF-8
 OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/fi_FI.ISO8859-1
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/fi_FI.ISO8859-15
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/fi_FI.UTF-8
 OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/fr_BE.ISO8859-1
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/fr_BE.ISO8859-15
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/fr_BE.UTF-8
 OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/fr_CA.ISO8859-1
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/fr_CA.ISO8859-15
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/fr_CA.UTF-8
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/fr_CH.ISO8859-1
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/fr_CH.ISO8859-15
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/fr_CH.UTF-8
 OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/fr_FR.ISO8859-1
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/fr_FR.ISO8859-15
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/fr_FR.UTF-8
 OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/he_IL.UTF-8
 OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/hi_IN.ISCII-DEV
 OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_COLLATE
 OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_CTYPE
 OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_MESSAGES
 OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_MONETARY
 OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_NUMERIC
 OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_TIME
 OLD_DIRS+=usr/share/locale/hi_IN.UTF-8
 OLD_FILES+=usr/share/locale/hi_IN.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/hi_IN.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/hi_IN.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/hi_IN.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/hi_IN.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/hi_IN.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/hr_HR.ISO8859-2
 OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_MONETARY
 OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_TIME
 OLD_DIRS+=usr/share/locale/hr_HR.UTF-8
 OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/hu_HU.ISO8859-2
 OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_MONETARY
 OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_TIME
 OLD_DIRS+=usr/share/locale/hu_HU.UTF-8
 OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/hy_AM.ARMSCII-8
 OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_TIME
 OLD_DIRS+=usr/share/locale/hy_AM.UTF-8
 OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/is_IS.ISO8859-1
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/is_IS.ISO8859-15
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/is_IS.UTF-8
 OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/it_CH.ISO8859-1
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/it_CH.ISO8859-15
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/it_CH.UTF-8
 OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/it_IT.ISO8859-1
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/it_IT.ISO8859-15
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/it_IT.UTF-8
 OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/ja_JP.eucJP
 OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_COLLATE
 OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_CTYPE
 OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_MONETARY
 OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_TIME
 OLD_DIRS+=usr/share/locale/ja_JP.SJIS
 OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_COLLATE
 OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_CTYPE
 OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_MONETARY
 OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_TIME
 OLD_DIRS+=usr/share/locale/ja_JP.UTF-8
 OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/kk_KZ.UTF-8
 OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/ko_KR.CP949
 OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_COLLATE
 OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_CTYPE
 OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_MONETARY
 OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_TIME
 OLD_DIRS+=usr/share/locale/ko_KR.eucKR
 OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_COLLATE
 OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_CTYPE
 OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_MONETARY
 OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_TIME
 OLD_DIRS+=usr/share/locale/ko_KR.UTF-8
 OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/lt_LT.ISO8859-13
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_COLLATE
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_CTYPE
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_MESSAGES
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_MONETARY
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_NUMERIC
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_TIME
 OLD_DIRS+=usr/share/locale/lt_LT.UTF-8
 OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/lv_LV.ISO8859-13
 OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_COLLATE
 OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_CTYPE
 OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_MESSAGES
 OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_MONETARY
 OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_NUMERIC
 OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_TIME
 OLD_DIRS+=usr/share/locale/lv_LV.UTF-8
 OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/mn_MN.UTF-8
 OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/nb_NO.ISO8859-1
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/nb_NO.ISO8859-15
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/nb_NO.UTF-8
 OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/nl_BE.ISO8859-1
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/nl_BE.ISO8859-15
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/nl_BE.UTF-8
 OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/nl_NL.ISO8859-1
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/nl_NL.ISO8859-15
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/nl_NL.UTF-8
 OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/nn_NO.ISO8859-1
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/nn_NO.ISO8859-15
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/nn_NO.UTF-8
 OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/pl_PL.ISO8859-2
 OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_MONETARY
 OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_TIME
 OLD_DIRS+=usr/share/locale/pl_PL.UTF-8
 OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/pt_BR.ISO8859-1
 OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/pt_BR.UTF-8
 OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/pt_PT.ISO8859-1
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/pt_PT.ISO8859-15
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/pt_PT.UTF-8
 OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/ro_RO.ISO8859-2
 OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_MONETARY
 OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_TIME
 OLD_DIRS+=usr/share/locale/ro_RO.UTF-8
 OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/ru_RU.CP1251
 OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_COLLATE
 OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_CTYPE
 OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_MONETARY
 OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_TIME
 OLD_DIRS+=usr/share/locale/ru_RU.CP866
 OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_COLLATE
 OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_CTYPE
 OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_MONETARY
 OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_TIME
 OLD_DIRS+=usr/share/locale/ru_RU.ISO8859-5
 OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_COLLATE
 OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_CTYPE
 OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_MONETARY
 OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_TIME
 OLD_DIRS+=usr/share/locale/ru_RU.KOI8-R
 OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_COLLATE
 OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_CTYPE
 OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_MONETARY
 OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_TIME
 OLD_DIRS+=usr/share/locale/ru_RU.UTF-8
 OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/se_FI.UTF-8
 OLD_FILES+=usr/share/locale/se_FI.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/se_FI.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/se_FI.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/se_FI.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/se_FI.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/se_FI.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/se_NO.UTF-8
 OLD_FILES+=usr/share/locale/se_NO.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/se_NO.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/se_NO.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/se_NO.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/se_NO.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/se_NO.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/sk_SK.ISO8859-2
 OLD_FILES+=usr/share/locale/sk_SK.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/sk_SK.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/sk_SK.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sk_SK.ISO8859-2/LC_MONETARY
 OLD_FILES+=usr/share/locale/sk_SK.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sk_SK.ISO8859-2/LC_TIME
 OLD_DIRS+=usr/share/locale/sk_SK.UTF-8
 OLD_FILES+=usr/share/locale/sk_SK.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/sk_SK.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/sk_SK.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sk_SK.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/sk_SK.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sk_SK.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/sl_SI.ISO8859-2
 OLD_FILES+=usr/share/locale/sl_SI.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/sl_SI.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/sl_SI.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sl_SI.ISO8859-2/LC_MONETARY
 OLD_FILES+=usr/share/locale/sl_SI.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sl_SI.ISO8859-2/LC_TIME
 OLD_DIRS+=usr/share/locale/sl_SI.UTF-8
 OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/sr_RS.ISO8859-5
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-5/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-5/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-5/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-5/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-5/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-5/LC_TIME
 OLD_DIRS+=usr/share/locale/sr_RS.UTF-8
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/sr_RS.ISO8859-2
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-2/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-2/LC_TIME
 OLD_DIRS+=usr/share/locale/sr_RS.UTF-8@latin
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8@latin/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8@latin/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8@latin/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8@latin/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8@latin/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8@latin/LC_TIME
 OLD_DIRS+=usr/share/locale/sv_FI.ISO8859-1
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/sv_FI.ISO8859-15
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/sv_FI.UTF-8
 OLD_FILES+=usr/share/locale/sv_FI.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/sv_FI.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/sv_FI.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sv_FI.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/sv_FI.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sv_FI.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/sv_SE.ISO8859-1
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/sv_SE.ISO8859-15
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/sv_SE.UTF-8
 OLD_FILES+=usr/share/locale/sv_SE.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/sv_SE.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/sv_SE.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sv_SE.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/sv_SE.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sv_SE.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/tr_TR.ISO8859-9
 OLD_FILES+=usr/share/locale/tr_TR.ISO8859-9/LC_COLLATE
 OLD_FILES+=usr/share/locale/tr_TR.ISO8859-9/LC_CTYPE
 OLD_FILES+=usr/share/locale/tr_TR.ISO8859-9/LC_MESSAGES
 OLD_FILES+=usr/share/locale/tr_TR.ISO8859-9/LC_MONETARY
 OLD_FILES+=usr/share/locale/tr_TR.ISO8859-9/LC_NUMERIC
 OLD_FILES+=usr/share/locale/tr_TR.ISO8859-9/LC_TIME
 OLD_DIRS+=usr/share/locale/tr_TR.UTF-8
 OLD_FILES+=usr/share/locale/tr_TR.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/tr_TR.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/tr_TR.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/tr_TR.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/tr_TR.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/tr_TR.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/uk_UA.CP1251
 OLD_FILES+=usr/share/locale/uk_UA.CP1251/LC_COLLATE
 OLD_FILES+=usr/share/locale/uk_UA.CP1251/LC_CTYPE
 OLD_FILES+=usr/share/locale/uk_UA.CP1251/LC_MESSAGES
 OLD_FILES+=usr/share/locale/uk_UA.CP1251/LC_MONETARY
 OLD_FILES+=usr/share/locale/uk_UA.CP1251/LC_NUMERIC
 OLD_FILES+=usr/share/locale/uk_UA.CP1251/LC_TIME
 OLD_DIRS+=usr/share/locale/uk_UA.ISO8859-5
 OLD_FILES+=usr/share/locale/uk_UA.ISO8859-5/LC_COLLATE
 OLD_FILES+=usr/share/locale/uk_UA.ISO8859-5/LC_CTYPE
 OLD_FILES+=usr/share/locale/uk_UA.ISO8859-5/LC_MESSAGES
 OLD_FILES+=usr/share/locale/uk_UA.ISO8859-5/LC_MONETARY
 OLD_FILES+=usr/share/locale/uk_UA.ISO8859-5/LC_NUMERIC
 OLD_FILES+=usr/share/locale/uk_UA.ISO8859-5/LC_TIME
 OLD_DIRS+=usr/share/locale/uk_UA.KOI8-U
 OLD_FILES+=usr/share/locale/uk_UA.KOI8-U/LC_COLLATE
 OLD_FILES+=usr/share/locale/uk_UA.KOI8-U/LC_CTYPE
 OLD_FILES+=usr/share/locale/uk_UA.KOI8-U/LC_MESSAGES
 OLD_FILES+=usr/share/locale/uk_UA.KOI8-U/LC_MONETARY
 OLD_FILES+=usr/share/locale/uk_UA.KOI8-U/LC_NUMERIC
 OLD_FILES+=usr/share/locale/uk_UA.KOI8-U/LC_TIME
 OLD_DIRS+=usr/share/locale/uk_UA.UTF-8
 OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_CN.eucCN
 OLD_FILES+=usr/share/locale/zh_CN.eucCN/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_CN.eucCN/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_CN.eucCN/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_CN.eucCN/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_CN.eucCN/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_CN.eucCN/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_CN.GB18030
 OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_CN.GB2312
 OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_CN.GBK
 OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_CN.UTF-8
 OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_HK.UTF-8
 OLD_FILES+=usr/share/locale/zh_HK.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_HK.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_HK.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_HK.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_HK.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_HK.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_TW.Big5
 OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_TW.UTF-8
 OLD_FILES+=usr/share/locale/zh_TW.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_TW.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_TW.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_TW.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_TW.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_TW.UTF-8/LC_TIME
 .endif
 
 .if ${MK_LOCATE} == no
 OLD_FILES+=etc/locate.rc
 OLD_FILES+=etc/periodic/weekly/310.locate
 OLD_FILES+=usr/bin/locate
 OLD_FILES+=usr/libexec/locate.bigram
 OLD_FILES+=usr/libexec/locate.code
 OLD_FILES+=usr/libexec/locate.concatdb
 OLD_FILES+=usr/libexec/locate.mklocatedb
 OLD_FILES+=usr/libexec/locate.updatedb
 OLD_FILES+=usr/share/man/man1/locate.1.gz
 OLD_FILES+=usr/share/man/man8/locate.updatedb.8.gz
 OLD_FILES+=usr/share/man/man8/updatedb.8.gz
 .endif
 
 .if ${MK_LPR} == no
 OLD_FILES+=etc/hosts.lpd
 OLD_FILES+=etc/printcap
 OLD_FILES+=etc/newsyslog.conf.d/lpr.conf
 OLD_FILES+=etc/rc.d/lpd
 OLD_FILES+=etc/syslog.d/lpr.conf
 OLD_FILES+=usr/bin/lp
 OLD_FILES+=usr/bin/lpq
 OLD_FILES+=usr/bin/lpr
 OLD_FILES+=usr/bin/lprm
 OLD_FILES+=usr/libexec/lpr/ru/bjc-240.sh.sample
 OLD_FILES+=usr/libexec/lpr/ru/koi2alt
 OLD_FILES+=usr/libexec/lpr/ru/koi2855
 OLD_DIRS+=usr/libexec/lpr/ru
 OLD_FILES+=usr/libexec/lpr/lpf
 OLD_DIRS+=usr/libexec/lpr
 OLD_FILES+=usr/sbin/chkprintcap
 OLD_FILES+=usr/sbin/lpc
 OLD_FILES+=usr/sbin/lpd
 OLD_FILES+=usr/sbin/lptest
 OLD_FILES+=usr/sbin/pac
 OLD_FILES+=usr/share/doc/smm/07.lpd/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/07.lpd
 OLD_FILES+=usr/share/examples/etc/hosts.lpd
 OLD_FILES+=usr/share/examples/etc/printcap
 OLD_FILES+=usr/share/man/man1/lp.1.gz
 OLD_FILES+=usr/share/man/man1/lpq.1.gz
 OLD_FILES+=usr/share/man/man1/lpr.1.gz
 OLD_FILES+=usr/share/man/man1/lprm.1.gz
 OLD_FILES+=usr/share/man/man1/lptest.1.gz
 OLD_FILES+=usr/share/man/man5/printcap.5.gz
 OLD_FILES+=usr/share/man/man8/chkprintcap.8.gz
 OLD_FILES+=usr/share/man/man8/lpc.8.gz
 OLD_FILES+=usr/share/man/man8/lpd.8.gz
 OLD_FILES+=usr/share/man/man8/pac.8.gz
 .endif
 
 .if ${MK_MAIL} == no
 OLD_FILES+=etc/aliases
 OLD_FILES+=etc/mail.rc
 OLD_FILES+=etc/mail/aliases
 OLD_FILES+=etc/mail/mailer.conf
 OLD_FILES+=etc/periodic/daily/130.clean-msgs
 OLD_FILES+=usr/bin/Mail
 OLD_FILES+=usr/bin/biff
 OLD_FILES+=usr/bin/from
 OLD_FILES+=usr/bin/mail
 OLD_FILES+=usr/bin/mailx
 OLD_FILES+=usr/bin/msgs
 OLD_FILES+=usr/libexec/comsat
 OLD_FILES+=usr/share/examples/etc/mail.rc
 OLD_FILES+=usr/share/man/man1/Mail.1.gz
 OLD_FILES+=usr/share/man/man1/biff.1.gz
 OLD_FILES+=usr/share/man/man1/from.1.gz
 OLD_FILES+=usr/share/man/man1/mail.1.gz
 OLD_FILES+=usr/share/man/man1/mailx.1.gz
 OLD_FILES+=usr/share/man/man1/msgs.1.gz
 OLD_FILES+=usr/share/man/man8/comsat.8.gz
 OLD_FILES+=usr/share/misc/mail.help
 OLD_FILES+=usr/share/misc/mail.tildehelp
 .endif
 
 .if ${MK_MAILWRAPPER} == no
 OLD_FILES+=etc/mail/mailer.conf
 # Don't remove, for no mailwrapper case:
 # /usr/sbin/sendmail -> /usr/sbin/mailwrapper
 # /usr/sbin/mailwrapper -> /usr/libexec/sendmail/sendmail
 #OLD_FILES+=usr/sbin/mailwrapper
 OLD_FILES+=usr/share/man/man8/mailwrapper.8.gz
 .endif
 
 .if ${MK_MAKE} == no
 OLD_FILES+=usr/bin/make
 OLD_FILES+=usr/share/man/man1/make.1.gz
 OLD_FILES+=usr/share/mk/atf.test.mk
 OLD_FILES+=usr/share/mk/bsd.README
 OLD_FILES+=usr/share/mk/bsd.arch.inc.mk
 OLD_FILES+=usr/share/mk/bsd.compiler.mk
 OLD_FILES+=usr/share/mk/bsd.cpu.mk
 OLD_FILES+=usr/share/mk/bsd.crunchgen.mk
 OLD_FILES+=usr/share/mk/bsd.dep.mk
 OLD_FILES+=usr/share/mk/bsd.doc.mk
 OLD_FILES+=usr/share/mk/bsd.dtb.mk
 OLD_FILES+=usr/share/mk/bsd.endian.mk
 OLD_FILES+=usr/share/mk/bsd.files.mk
 OLD_FILES+=usr/share/mk/bsd.incs.mk
 OLD_FILES+=usr/share/mk/bsd.info.mk
 OLD_FILES+=usr/share/mk/bsd.init.mk
 OLD_FILES+=usr/share/mk/bsd.kmod.mk
 OLD_FILES+=usr/share/mk/bsd.lib.mk
 OLD_FILES+=usr/share/mk/bsd.libnames.mk
 OLD_FILES+=usr/share/mk/bsd.links.mk
 OLD_FILES+=usr/share/mk/bsd.man.mk
 OLD_FILES+=usr/share/mk/bsd.mkopt.mk
 OLD_FILES+=usr/share/mk/bsd.nls.mk
 OLD_FILES+=usr/share/mk/bsd.obj.mk
 OLD_FILES+=usr/share/mk/bsd.opts.mk
 OLD_FILES+=usr/share/mk/bsd.own.mk
 OLD_FILES+=usr/share/mk/bsd.port.mk
 OLD_FILES+=usr/share/mk/bsd.port.options.mk
 OLD_FILES+=usr/share/mk/bsd.port.post.mk
 OLD_FILES+=usr/share/mk/bsd.port.pre.mk
 OLD_FILES+=usr/share/mk/bsd.port.subdir.mk
 OLD_FILES+=usr/share/mk/bsd.prog.mk
 OLD_FILES+=usr/share/mk/bsd.progs.mk
 OLD_FILES+=usr/share/mk/bsd.snmpmod.mk
 OLD_FILES+=usr/share/mk/bsd.subdir.mk
 OLD_FILES+=usr/share/mk/bsd.symver.mk
 OLD_FILES+=usr/share/mk/bsd.sys.mk
 OLD_FILES+=usr/share/mk/bsd.test.mk
 OLD_FILES+=usr/share/mk/plain.test.mk
 OLD_FILES+=usr/share/mk/suite.test.mk
 OLD_FILES+=usr/share/mk/sys.mk
 OLD_FILES+=usr/share/mk/tap.test.mk
 OLD_FILES+=usr/share/mk/version_gen.awk
 OLD_FILES+=usr/tests/usr.bin/bmake/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.4
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.5
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.6
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.7
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.4
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.5
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.6
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.7
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.4
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.5
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.6
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.7
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/libtest.a
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.4
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.5
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.6
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.7
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stderr.4
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stderr.5
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stderr.6
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stderr.7
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stdout.4
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stdout.5
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stdout.6
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stdout.7
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/libtest.a
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.status.4
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.status.5
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.status.6
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.status.7
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stderr.4
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stderr.5
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stderr.6
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stderr.7
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stdout.4
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stdout.5
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stdout.6
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stdout.7
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/libtest.a
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t0/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t0/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t0/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t0/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t0/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t1/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t2/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t2/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t2/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t2/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t2/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t3/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t3/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t3/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t3/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t3/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/common.sh
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/ellipsis/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/ellipsis/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/ellipsis/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/ellipsis/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/ellipsis/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/ellipsis/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/empty/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/empty/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/empty/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/empty/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/empty/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/empty/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/joberr/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/joberr/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/joberr/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/joberr/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/joberr/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/joberr/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/plus/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/plus/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/plus/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/plus/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/plus/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/plus/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/sh
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/sh
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/sh
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/shell
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/shell
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/basic/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/basic/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/basic/TEST1.a
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/basic/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/basic/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/basic/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/basic/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/TEST1.a
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/TEST2.a
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/TEST1.a
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/TEST2.a
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/directive-t0/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/directive-t0/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/directive-t0/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/directive-t0/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/directive-t0/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/directive-t0/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.status.4
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.status.5
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stderr.4
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stderr.5
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stdout.4
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stdout.5
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/2/1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/2/1/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/2/1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/2/1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/2/1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/2/1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/mk/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/mk/sys.mk
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/2/1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/2/1/cleanup
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/2/1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/2/1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/2/1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/2/1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/mk/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/mk/sys.mk
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/2/1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/2/1/cleanup
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/2/1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/2/1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/2/1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/2/1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/mk/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/mk/sys.mk
 OLD_FILES+=usr/tests/usr.bin/bmake/test-new.mk
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_M/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_M/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_M/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_M/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_M/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_M/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/t0/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/t0/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/t0/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/t0/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/t0/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/t0/legacy_test
 .endif
 
 .if ${MK_MAN} == no
 MAN_FILES!=find ${DESTDIR}/usr/share/man ${DESTDIR}/usr/share/openssl/man -type f | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_FILES+=${MAN_FILES}
 MAN_DIRS!=find ${DESTDIR}/usr/share/man ${DESTDIR}/usr/share/openssl/man -type d | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_DIRS+=${MAN_DIRS}
 .endif
 
 .if ${MK_MAN_UTILS} == no
 OLD_FILES+=etc/periodic/weekly/320.whatis
 OLD_FILES+=usr/bin/apropos
 OLD_FILES+=usr/bin/makewhatis
 OLD_FILES+=usr/bin/man
 OLD_FILES+=usr/bin/manpath
 OLD_FILES+=usr/bin/whatis
 OLD_FILES+=usr/libexec/makewhatis.local
 OLD_FILES+=usr/sbin/manctl
 OLD_FILES+=usr/share/man/man1/apropos.1.gz
 OLD_FILES+=usr/share/man/man1/makewhatis.1.gz
 OLD_FILES+=usr/share/man/man1/man.1.gz
 OLD_FILES+=usr/share/man/man1/manpath.1.gz
 OLD_FILES+=usr/share/man/man1/whatis.1.gz
 OLD_FILES+=usr/share/man/man5/man.conf.5.gz
 OLD_FILES+=usr/share/man/man8/makewhatis.local.8.gz
 OLD_FILES+=usr/share/man/man8/manctl.8.gz
 OLD_FILES+=usr/share/man/whatis
 OLD_FILES+=usr/share/openssl/man/whatis
 .endif
 
 .if ${MK_NETCAT} == no
 OLD_FILES+=rescue/nc
 OLD_FILES+=usr/bin/nc
 OLD_FILES+=usr/share/man/man1/nc.1.gz
 .endif
 
 .if ${MK_NETGRAPH} == no
 OLD_FILES+=usr/include/netgraph.h
 OLD_FILES+=usr/lib/libnetgraph.a
 OLD_FILES+=usr/lib/libnetgraph.so
 OLD_LIBS+=usr/lib/libnetgraph.so.4
 OLD_FILES+=usr/lib/libnetgraph_p.a
 OLD_FILES+=usr/libexec/pppoed
 OLD_FILES+=usr/sbin/flowctl
 OLD_FILES+=usr/sbin/lmcconfig
 OLD_FILES+=usr/sbin/ngctl
 OLD_FILES+=usr/sbin/nghook
 OLD_FILES+=usr/share/man/man3/NgAllocRecvAsciiMsg.3.gz
 OLD_FILES+=usr/share/man/man3/NgAllocRecvData.3.gz
 OLD_FILES+=usr/share/man/man3/NgAllocRecvMsg.3.gz
 OLD_FILES+=usr/share/man/man3/NgMkSockNode.3.gz
 OLD_FILES+=usr/share/man/man3/NgNameNode.3.gz
 OLD_FILES+=usr/share/man/man3/NgRecvAsciiMsg.3.gz
 OLD_FILES+=usr/share/man/man3/NgRecvData.3.gz
 OLD_FILES+=usr/share/man/man3/NgRecvMsg.3.gz
 OLD_FILES+=usr/share/man/man3/NgSendAsciiMsg.3.gz
 OLD_FILES+=usr/share/man/man3/NgSendData.3.gz
 OLD_FILES+=usr/share/man/man3/NgSendMsg.3.gz
 OLD_FILES+=usr/share/man/man3/NgSendReplyMsg.3.gz
 OLD_FILES+=usr/share/man/man3/NgSetDebug.3.gz
 OLD_FILES+=usr/share/man/man3/NgSetErrLog.3.gz
 OLD_FILES+=usr/share/man/man3/netgraph.3.gz
 OLD_FILES+=usr/share/man/man8/flowctl.8.gz
 OLD_FILES+=usr/share/man/man8/lmcconfig.8.gz
 OLD_FILES+=usr/share/man/man8/ngctl.8.gz
 OLD_FILES+=usr/share/man/man8/nghook.8.gz
 OLD_FILES+=usr/share/man/man8/pppoed.8.gz
 .endif
 
 .if ${MK_IPFW} == no || ${MK_NETGRAPH} == no
 OLD_FILES+=etc/rc.d/ipfw_netflow
 .endif
 
 .if ${MK_NETGRAPH_SUPPORT} == no
 OLD_FILES+=usr/include/bsnmp/snmp_netgraph.h
 OLD_FILES+=usr/lib/snmp_netgraph.so
 OLD_LIBS+=usr/lib/snmp_netgraph.so.6
 OLD_FILES+=usr/share/man/man3/snmp_netgraph.3.gz
 OLD_FILES+=usr/share/snmp/defs/netgraph_tree.def
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-NETGRAPH.txt
 .endif
 
 .if ${MK_NIS} == no
 OLD_FILES+=etc/rc.d/ypbind
 OLD_FILES+=etc/rc.d/ypldap
 OLD_FILES+=etc/rc.d/yppasswdd
 OLD_FILES+=etc/rc.d/ypserv
 OLD_FILES+=etc/rc.d/ypset
 OLD_FILES+=etc/rc.d/ypupdated
 OLD_FILES+=etc/rc.d/ypxfrd
 OLD_FILES+=usr/bin/ypcat
 OLD_FILES+=usr/bin/ypchfn
 OLD_FILES+=usr/bin/ypchpass
 OLD_FILES+=usr/bin/ypchsh
 OLD_FILES+=usr/bin/ypmatch
 OLD_FILES+=usr/bin/yppasswd
 OLD_FILES+=usr/bin/ypwhich
 OLD_FILES+=usr/include/ypclnt.h
 OLD_FILES+=usr/lib/libypclnt.a
 OLD_FILES+=usr/lib/libypclnt.so
 OLD_LIBS+=usr/lib/libypclnt.so.4
 OLD_FILES+=usr/lib/libypclnt_p.a
 OLD_FILES+=usr/libexec/mknetid
 OLD_FILES+=usr/libexec/yppwupdate
 OLD_FILES+=usr/libexec/ypxfr
 OLD_FILES+=usr/sbin/rpc.yppasswdd
 OLD_FILES+=usr/sbin/rpc.ypupdated
 OLD_FILES+=usr/sbin/rpc.ypxfrd
 OLD_FILES+=usr/sbin/yp_mkdb
 OLD_FILES+=usr/sbin/ypbind
 OLD_FILES+=usr/sbin/ypinit
 OLD_FILES+=usr/sbin/ypldap
 OLD_FILES+=usr/sbin/yppoll
 OLD_FILES+=usr/sbin/yppush
 OLD_FILES+=usr/sbin/ypserv
 OLD_FILES+=usr/sbin/ypset
 OLD_FILES+=usr/share/man/man1/ypcat.1.gz
 OLD_FILES+=usr/share/man/man1/ypchfn.1.gz
 OLD_FILES+=usr/share/man/man1/ypchpass.1.gz
 OLD_FILES+=usr/share/man/man1/ypchsh.1.gz
 OLD_FILES+=usr/share/man/man1/ypmatch.1.gz
 OLD_FILES+=usr/share/man/man1/yppasswd.1.gz
 OLD_FILES+=usr/share/man/man1/ypwhich.1.gz
 OLD_FILES+=usr/share/man/man5/netid.5.gz
 OLD_FILES+=usr/share/man/man5/ypldap.conf.5.gz
 OLD_FILES+=usr/share/man/man8/mknetid.8.gz
 OLD_FILES+=usr/share/man/man8/rpc.yppasswdd.8.gz
 OLD_FILES+=usr/share/man/man8/rpc.ypxfrd.8.gz
 OLD_FILES+=usr/share/man/man8/NIS.8.gz
 OLD_FILES+=usr/share/man/man8/YP.8.gz
 OLD_FILES+=usr/share/man/man8/yp.8.gz
 OLD_FILES+=usr/share/man/man8/nis.8.gz
 OLD_FILES+=usr/share/man/man8/yp_mkdb.8.gz
 OLD_FILES+=usr/share/man/man8/ypbind.8.gz
 OLD_FILES+=usr/share/man/man8/ypinit.8.gz
 OLD_FILES+=usr/share/man/man8/ypldap.8.gz
 OLD_FILES+=usr/share/man/man8/yppoll.8.gz
 OLD_FILES+=usr/share/man/man8/yppush.8.gz
 OLD_FILES+=usr/share/man/man8/ypserv.8.gz
 OLD_FILES+=usr/share/man/man8/ypset.8.gz
 OLD_FILES+=usr/share/man/man8/ypxfr.8.gz
 OLD_FILES+=var/yp/Makefile
 OLD_FILES+=var/yp/Makefile.dist
 OLD_DIRS+=var/yp
 .endif
 
 .if ${MK_NETLINK} == no
 OLD_FILES+=usr.bin/genl
 OLD_FILES+=usr/share/man/man1/genl.1.gz
 .endif
 
 .if ${MK_NLS} == no
 OLD_DIRS+=usr/share/nls/
 OLD_DIRS+=usr/share/nls/C
 OLD_FILES+=usr/share/nls/C/ee.cat
 OLD_DIRS+=usr/share/nls/af_ZA.ISO8859-1
 OLD_DIRS+=usr/share/nls/af_ZA.ISO8859-15
 OLD_DIRS+=usr/share/nls/af_ZA.UTF-8
 OLD_DIRS+=usr/share/nls/am_ET.UTF-8
 OLD_DIRS+=usr/share/nls/be_BY.CP1131
 OLD_DIRS+=usr/share/nls/be_BY.CP1251
 OLD_DIRS+=usr/share/nls/be_BY.ISO8859-5
 OLD_DIRS+=usr/share/nls/be_BY.UTF-8
 OLD_FILES+=usr/share/nls/be_BY.UTF-8/libc.cat
 OLD_DIRS+=usr/share/nls/bg_BG.CP1251
 OLD_DIRS+=usr/share/nls/bg_BG.UTF-8
 OLD_DIRS+=usr/share/nls/ca_ES.ISO8859-1
 OLD_FILES+=usr/share/nls/ca_ES.ISO8859-1/libc.cat
 OLD_DIRS+=usr/share/nls/ca_ES.ISO8859-15
 OLD_DIRS+=usr/share/nls/ca_ES.UTF-8
 OLD_DIRS+=usr/share/nls/cs_CZ.ISO8859-2
 OLD_DIRS+=usr/share/nls/cs_CZ.UTF-8
 OLD_DIRS+=usr/share/nls/da_DK.ISO8859-1
 OLD_DIRS+=usr/share/nls/da_DK.ISO8859-15
 OLD_DIRS+=usr/share/nls/da_DK.UTF-8
 OLD_DIRS+=usr/share/nls/de_AT.ISO8859-1
 OLD_FILES+=usr/share/nls/de_AT.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/de_AT.ISO8859-1/tcsh.cat
 OLD_DIRS+=usr/share/nls/de_AT.ISO8859-15
 OLD_FILES+=usr/share/nls/de_AT.ISO8859-15/ee.cat
 OLD_FILES+=usr/share/nls/de_AT.ISO8859-15/tcsh.cat
 OLD_DIRS+=usr/share/nls/de_AT.UTF-8
 OLD_FILES+=usr/share/nls/de_AT.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/de_CH.ISO8859-1
 OLD_FILES+=usr/share/nls/de_CH.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/de_CH.ISO8859-1/tcsh.cat
 OLD_DIRS+=usr/share/nls/de_CH.ISO8859-15
 OLD_FILES+=usr/share/nls/de_CH.ISO8859-15/ee.cat
 OLD_FILES+=usr/share/nls/de_CH.ISO8859-15/tcsh.cat
 OLD_DIRS+=usr/share/nls/de_CH.UTF-8
 OLD_FILES+=usr/share/nls/de_CH.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/de_DE.ISO8859-1
 OLD_FILES+=usr/share/nls/de_DE.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/de_DE.ISO8859-1/libc.cat
 OLD_FILES+=usr/share/nls/de_DE.ISO8859-1/tcsh.cat
 OLD_DIRS+=usr/share/nls/de_DE.ISO8859-15
 OLD_FILES+=usr/share/nls/de_DE.ISO8859-15/ee.cat
 OLD_FILES+=usr/share/nls/de_DE.ISO8859-15/tcsh.cat
 OLD_DIRS+=usr/share/nls/de_DE.UTF-8
 OLD_FILES+=usr/share/nls/de_DE.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/el_GR.ISO8859-7
 OLD_FILES+=usr/share/nls/el_GR.ISO8859-7/libc.cat
 OLD_FILES+=usr/share/nls/el_GR.ISO8859-7/tcsh.cat
 OLD_DIRS+=usr/share/nls/el_GR.UTF-8
 OLD_FILES+=usr/share/nls/el_GR.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/en_AU.ISO8859-1
 OLD_DIRS+=usr/share/nls/en_AU.ISO8859-15
 OLD_DIRS+=usr/share/nls/en_AU.US-ASCII
 OLD_DIRS+=usr/share/nls/en_AU.UTF-8
 OLD_DIRS+=usr/share/nls/en_CA.ISO8859-1
 OLD_FILES+=usr/share/nls/en_US.ISO8859-1/ee.cat
 OLD_DIRS+=usr/share/nls/en_CA.ISO8859-15
 OLD_DIRS+=usr/share/nls/en_CA.US-ASCII
 OLD_DIRS+=usr/share/nls/en_CA.UTF-8
 OLD_DIRS+=usr/share/nls/en_GB.ISO8859-1
 OLD_DIRS+=usr/share/nls/en_GB.ISO8859-15
 OLD_DIRS+=usr/share/nls/en_GB.US-ASCII
 OLD_DIRS+=usr/share/nls/en_GB.UTF-8
 OLD_DIRS+=usr/share/nls/en_IE.UTF-8
 OLD_DIRS+=usr/share/nls/en_NZ.ISO8859-1
 OLD_DIRS+=usr/share/nls/en_NZ.ISO8859-15
 OLD_DIRS+=usr/share/nls/en_NZ.US-ASCII
 OLD_DIRS+=usr/share/nls/en_NZ.UTF-8
 OLD_DIRS+=usr/share/nls/en_US.ISO8859-1
 OLD_DIRS+=usr/share/nls/en_US.ISO8859-15
 OLD_FILES+=usr/share/nls/en_US.ISO8859-15/ee.cat
 OLD_DIRS+=usr/share/nls/en_US.UTF-8
 OLD_DIRS+=usr/share/nls/es_ES.UTF-8
 OLD_FILES+=usr/share/nls/es_ES.ISO8859-1/libc.cat
 OLD_FILES+=usr/share/nls/es_ES.ISO8859-1/tcsh.cat
 OLD_DIRS+=usr/share/nls/es_ES.ISO8859-1
 OLD_DIRS+=usr/share/nls/es_ES.ISO8859-15
 OLD_FILES+=usr/share/nls/es_ES.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/es_ES.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/et_EE.ISO8859-15
 OLD_FILES+=usr/share/nls/et_EE.ISO8859-15/tcsh.cat
 OLD_DIRS+=usr/share/nls/et_EE.UTF-8
 OLD_FILES+=usr/share/nls/et_EE.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/fi_FI.ISO8859-1
 OLD_FILES+=usr/share/nls/fi_FI.ISO8859-1/libc.cat
 OLD_FILES+=usr/share/nls/fi_FI.ISO8859-1/tcsh.cat
 OLD_DIRS+=usr/share/nls/fi_FI.ISO8859-15
 OLD_FILES+=usr/share/nls/fi_FI.ISO8859-15/tcsh.cat
 OLD_DIRS+=usr/share/nls/fi_FI.UTF-8
 OLD_FILES+=usr/share/nls/fi_FI.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/fr_BE.ISO8859-1
 OLD_FILES+=usr/share/nls/fr_BE.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/fr_BE.ISO8859-1/tcsh.cat
 OLD_DIRS+=usr/share/nls/fr_BE.ISO8859-15
 OLD_FILES+=usr/share/nls/fr_BE.ISO8859-15/ee.cat
 OLD_FILES+=usr/share/nls/fr_BE.ISO8859-15/tcsh.cat
 OLD_DIRS+=usr/share/nls/fr_BE.UTF-8
 OLD_FILES+=usr/share/nls/fr_BE.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/fr_CA.ISO8859-1
 OLD_FILES+=usr/share/nls/fr_CA.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/fr_CA.ISO8859-1/tcsh.cat
 OLD_DIRS+=usr/share/nls/fr_CA.ISO8859-15
 OLD_FILES+=usr/share/nls/fr_CA.ISO8859-15/ee.cat
 OLD_FILES+=usr/share/nls/fr_CA.ISO8859-15/tcsh.cat
 OLD_DIRS+=usr/share/nls/fr_CA.UTF-8
 OLD_FILES+=usr/share/nls/fr_CA.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/fr_CH.ISO8859-1
 OLD_FILES+=usr/share/nls/fr_CH.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/fr_CH.ISO8859-1/tcsh.cat
 OLD_DIRS+=usr/share/nls/fr_CH.ISO8859-15
 OLD_FILES+=usr/share/nls/fr_CH.ISO8859-15/ee.cat
 OLD_FILES+=usr/share/nls/fr_CH.ISO8859-15/tcsh.cat
 OLD_DIRS+=usr/share/nls/fr_CH.UTF-8
 OLD_FILES+=usr/share/nls/fr_CH.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/fr_FR.ISO8859-1
 OLD_FILES+=usr/share/nls/fr_FR.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/fr_FR.ISO8859-1/libc.cat
 OLD_FILES+=usr/share/nls/fr_FR.ISO8859-1/tcsh.cat
 OLD_DIRS+=usr/share/nls/fr_FR.ISO8859-15
 OLD_FILES+=usr/share/nls/fr_FR.ISO8859-15/ee.cat
 OLD_FILES+=usr/share/nls/fr_FR.ISO8859-15/tcsh.cat
 OLD_DIRS+=usr/share/nls/fr_FR.UTF-8
 OLD_FILES+=usr/share/nls/fr_FR.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/gl_ES.ISO8859-1
 OLD_FILES+=usr/share/nls/gl_ES.ISO8859-1/libc.cat
 OLD_DIRS+=usr/share/nls/he_IL.UTF-8
 OLD_DIRS+=usr/share/nls/hi_IN.ISCII-DEV
 OLD_DIRS+=usr/share/nls/hr_HR.ISO8859-2
 OLD_DIRS+=usr/share/nls/hu_HU.ISO8859-2
 OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/ee.cat
 OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/libc.cat
 OLD_DIRS+=usr/share/nls/hr_HR.UTF-8
 OLD_DIRS+=usr/share/nls/hu_HU.UTF-8
 OLD_DIRS+=usr/share/nls/hy_AM.ARMSCII-8
 OLD_DIRS+=usr/share/nls/hy_AM.UTF-8
 OLD_DIRS+=usr/share/nls/is_IS.ISO8859-1
 OLD_DIRS+=usr/share/nls/is_IS.ISO8859-15
 OLD_DIRS+=usr/share/nls/is_IS.UTF-8
 OLD_DIRS+=usr/share/nls/it_CH.ISO8859-1
 OLD_FILES+=usr/share/nls/it_CH.ISO8859-1/tcsh.cat
 OLD_DIRS+=usr/share/nls/it_CH.ISO8859-15
 OLD_FILES+=usr/share/nls/it_CH.ISO8859-15/tcsh.cat
 OLD_DIRS+=usr/share/nls/it_CH.UTF-8
 OLD_FILES+=usr/share/nls/it_CH.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/it_IT.ISO8859-1
 OLD_FILES+=usr/share/nls/it_IT.ISO8859-1/tcsh.cat
 OLD_DIRS+=usr/share/nls/it_IT.ISO8859-15
 OLD_FILES+=usr/share/nls/it_IT.ISO8859-15/libc.cat
 OLD_FILES+=usr/share/nls/it_IT.ISO8859-15/tcsh.cat
 OLD_DIRS+=usr/share/nls/it_IT.UTF-8
 OLD_FILES+=usr/share/nls/it_IT.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/ja_JP.SJIS
 OLD_FILES+=usr/share/nls/ja_JP.SJIS/tcsh.cat
 OLD_DIRS+=usr/share/nls/ja_JP.UTF-8
 OLD_FILES+=usr/share/nls/ja_JP.UTF-8/libc.cat
 OLD_FILES+=usr/share/nls/ja_JP.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/ja_JP.eucJP
 OLD_FILES+=usr/share/nls/ja_JP.eucJP/libc.cat
 OLD_FILES+=usr/share/nls/ja_JP.eucJP/tcsh.cat
 OLD_DIRS+=usr/share/nls/kk_KZ.PT154
 OLD_DIRS+=usr/share/nls/kk_KZ.UTF-8
 OLD_DIRS+=usr/share/nls/ko_KR.CP949
 OLD_DIRS+=usr/share/nls/ko_KR.UTF-8
 OLD_FILES+=usr/share/nls/ko_KR.UTF-8/libc.cat
 OLD_DIRS+=usr/share/nls/ko_KR.eucKR
 OLD_FILES+=usr/share/nls/ko_KR.eucKR/libc.cat
 OLD_DIRS+=usr/share/nls/lv_LV.UTF-8
 OLD_DIRS+=usr/share/nls/lt_LT.ISO8859-13
 OLD_DIRS+=usr/share/nls/lt_LT.UTF-8
 OLD_DIRS+=usr/share/nls/lv_LV.ISO8859-13
 OLD_DIRS+=usr/share/nls/mn_MN.UTF-8
 OLD_FILES+=usr/share/nls/mn_MN.UTF-8/libc.cat
 OLD_DIRS+=usr/share/nls/nl_BE.ISO8859-1
 OLD_DIRS+=usr/share/nls/nl_BE.ISO8859-15
 OLD_DIRS+=usr/share/nls/nl_BE.UTF-8
 OLD_DIRS+=usr/share/nls/no_NO.ISO8859-1
 OLD_FILES+=usr/share/nls/nl_NL.ISO8859-1/libc.cat
 OLD_DIRS+=usr/share/nls/nl_NL.ISO8859-15
 OLD_DIRS+=usr/share/nls/nl_NL.ISO8859-1
 OLD_FILES+=usr/share/nls/no_NO.ISO8859-1/libc.cat
 OLD_DIRS+=usr/share/nls/no_NO.ISO8859-15
 OLD_DIRS+=usr/share/nls/nl_NL.UTF-8
 OLD_DIRS+=usr/share/nls/no_NO.UTF-8
 OLD_DIRS+=usr/share/nls/pl_PL.ISO8859-2
 OLD_FILES+=usr/share/nls/pl_PL.ISO8859-2/ee.cat
 OLD_FILES+=usr/share/nls/pl_PL.ISO8859-2/libc.cat
 OLD_DIRS+=usr/share/nls/pl_PL.UTF-8
 OLD_DIRS+=usr/share/nls/pt_BR.ISO8859-1
 OLD_DIRS+=usr/share/nls/pt_BR.UTF-8
 OLD_DIRS+=usr/share/nls/pt_PT.ISO8859-1
 OLD_FILES+=usr/share/nls/pt_BR.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/pt_BR.ISO8859-1/libc.cat
 OLD_FILES+=usr/share/nls/pt_PT.ISO8859-1/ee.cat
 OLD_DIRS+=usr/share/nls/pt_PT.ISO8859-15
 OLD_DIRS+=usr/share/nls/pt_PT.UTF-8
 OLD_DIRS+=usr/share/nls/ro_RO.ISO8859-2
 OLD_DIRS+=usr/share/nls/ro_RO.UTF-8
 OLD_DIRS+=usr/share/nls/ru_RU.CP1251
 OLD_FILES+=usr/share/nls/ru_RU.CP1251/tcsh.cat
 OLD_DIRS+=usr/share/nls/ru_RU.CP866
 OLD_FILES+=usr/share/nls/ru_RU.CP866/tcsh.cat
 OLD_DIRS+=usr/share/nls/ru_RU.ISO8859-5
 OLD_FILES+=usr/share/nls/ru_RU.ISO8859-5/tcsh.cat
 OLD_DIRS+=usr/share/nls/ru_RU.KOI8-R
 OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/ee.cat
 OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/libc.cat
 OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/tcsh.cat
 OLD_DIRS+=usr/share/nls/ru_RU.UTF-8
 OLD_FILES+=usr/share/nls/ru_RU.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/sk_SK.ISO8859-2
 OLD_FILES+=usr/share/nls/sk_SK.ISO8859-2/libc.cat
 OLD_DIRS+=usr/share/nls/sk_SK.UTF-8
 OLD_DIRS+=usr/share/nls/sl_SI.ISO8859-2
 OLD_DIRS+=usr/share/nls/sl_SI.UTF-8
 OLD_DIRS+=usr/share/nls/sr_YU.ISO8859-2
 OLD_DIRS+=usr/share/nls/sr_YU.ISO8859-5
 OLD_DIRS+=usr/share/nls/sr_YU.UTF-8
 OLD_DIRS+=usr/share/nls/sv_SE.ISO8859-1
 OLD_FILES+=usr/share/nls/sv_SE.ISO8859-1/libc.cat
 OLD_DIRS+=usr/share/nls/sv_SE.ISO8859-15
 OLD_DIRS+=usr/share/nls/sv_SE.UTF-8
 OLD_DIRS+=usr/share/nls/tr_TR.ISO8859-9
 OLD_DIRS+=usr/share/nls/tr_TR.UTF-8
 OLD_DIRS+=usr/share/nls/uk_UA.ISO8859-5
 OLD_FILES+=usr/share/nls/uk_UA.ISO8859-5/tcsh.cat
 OLD_DIRS+=usr/share/nls/uk_UA.KOI8-U
 OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/ee.cat
 OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/tcsh.cat
 OLD_DIRS+=usr/share/nls/uk_UA.UTF-8
 OLD_FILES+=usr/share/nls/uk_UA.UTF-8/libc.cat
 OLD_FILES+=usr/share/nls/uk_UA.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/zh_CN.GB18030
 OLD_FILES+=usr/share/nls/zh_CN.GB18030/libc.cat
 OLD_DIRS+=usr/share/nls/zh_CN.GBK
 OLD_DIRS+=usr/share/nls/zh_CN.GB2312
 OLD_FILES+=usr/share/nls/zh_CN.GB2312/libc.cat
 OLD_DIRS+=usr/share/nls/zh_CN.UTF-8
 OLD_FILES+=usr/share/nls/zh_CN.UTF-8/libc.cat
 OLD_DIRS+=usr/share/nls/zh_CN.eucCN
 OLD_DIRS+=usr/share/nls/zh_HK.UTF-8
 OLD_DIRS+=usr/share/nls/zh_TW.UTF-8
 OLD_FILES+=usr/tests/bin/sh/builtins/locale1.0
 .endif
 
 .if ${MK_NLS_CATALOGS} == no
 OLD_FILES+=usr/share/nls/de_AT.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/de_CH.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/de_DE.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/el_GR.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/es_ES.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/et_EE.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fi_FI.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_BE.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CA.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CH.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_FR.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/it_CH.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/it_IT.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/ja_JP.SJIS/tcsh.cat
 OLD_FILES+=usr/share/nls/ja_JP.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.CP1251/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.CP866/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.ISO8859-5/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/uk_UA.ISO8859-5/tcsh.cat
 OLD_FILES+=usr/share/nls/uk_UA.UTF-8/tcsh.cat
 .endif
 
 .if ${MK_NS_CACHING} == no
 OLD_FILES+=etc/nscd.conf
 OLD_FILES+=etc/rc.d/nscd
 OLD_FILES+=usr/sbin/nscd
 OLD_FILES+=usr/share/examples/etc/nscd.conf
 OLD_FILES+=usr/share/man/man5/nscd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/nscd.8.gz
 .endif
 
 .if ${MK_NTP} == no
 OLD_FILES+=etc/ntp/leap-seconds
 OLD_DIRS+=etc/ntp
 OLD_FILES+=etc/ntp.conf
 OLD_FILES+=etc/periodic/daily/480.status-ntpd
 OLD_FILES+=etc/periodic/daily/480.leapfile-ntpd
 OLD_FILES+=etc/rc.d/ntpd
 OLD_FILES+=usr/bin/ntpq
 OLD_FILES+=usr/sbin/ntp-keygen
 OLD_FILES+=usr/sbin/ntpd
 OLD_FILES+=usr/sbin/ntpdate
 OLD_FILES+=usr/sbin/ntpdc
 OLD_FILES+=usr/sbin/ntptime
 OLD_FILES+=usr/sbin/sntp
 OLD_FILES+=usr/share/doc/ntp/access.html
 OLD_FILES+=usr/share/doc/ntp/accopt.html
 OLD_FILES+=usr/share/doc/ntp/assoc.html
 OLD_FILES+=usr/share/doc/ntp/audio.html
 OLD_FILES+=usr/share/doc/ntp/authentic.html
 OLD_FILES+=usr/share/doc/ntp/authopt.html
 OLD_FILES+=usr/share/doc/ntp/autokey.html
 OLD_FILES+=usr/share/doc/ntp/bugs.html
 OLD_FILES+=usr/share/doc/ntp/build.html
 OLD_FILES+=usr/share/doc/ntp/clock.html
 OLD_FILES+=usr/share/doc/ntp/clockopt.html
 OLD_FILES+=usr/share/doc/ntp/cluster.html
 OLD_FILES+=usr/share/doc/ntp/comdex.html
 OLD_FILES+=usr/share/doc/ntp/config.html
 OLD_FILES+=usr/share/doc/ntp/confopt.html
 OLD_FILES+=usr/share/doc/ntp/copyright.html
 OLD_FILES+=usr/share/doc/ntp/debug.html
 OLD_FILES+=usr/share/doc/ntp/decode.html
 OLD_FILES+=usr/share/doc/ntp/discipline.html
 OLD_FILES+=usr/share/doc/ntp/discover.html
 OLD_FILES+=usr/share/doc/ntp/driver1.html
 OLD_FILES+=usr/share/doc/ntp/driver10.html
 OLD_FILES+=usr/share/doc/ntp/driver11.html
 OLD_FILES+=usr/share/doc/ntp/driver12.html
 OLD_FILES+=usr/share/doc/ntp/driver16.html
 OLD_FILES+=usr/share/doc/ntp/driver18.html
 OLD_FILES+=usr/share/doc/ntp/driver19.html
 OLD_FILES+=usr/share/doc/ntp/driver2.html
 OLD_FILES+=usr/share/doc/ntp/driver20.html
 OLD_FILES+=usr/share/doc/ntp/driver22.html
 OLD_FILES+=usr/share/doc/ntp/driver26.html
 OLD_FILES+=usr/share/doc/ntp/driver27.html
 OLD_FILES+=usr/share/doc/ntp/driver28.html
 OLD_FILES+=usr/share/doc/ntp/driver29.html
 OLD_FILES+=usr/share/doc/ntp/driver3.html
 OLD_FILES+=usr/share/doc/ntp/driver30.html
 OLD_FILES+=usr/share/doc/ntp/driver32.html
 OLD_FILES+=usr/share/doc/ntp/driver33.html
 OLD_FILES+=usr/share/doc/ntp/driver34.html
 OLD_FILES+=usr/share/doc/ntp/driver35.html
 OLD_FILES+=usr/share/doc/ntp/driver36.html
 OLD_FILES+=usr/share/doc/ntp/driver37.html
 OLD_FILES+=usr/share/doc/ntp/driver4.html
 OLD_FILES+=usr/share/doc/ntp/driver5.html
 OLD_FILES+=usr/share/doc/ntp/driver6.html
 OLD_FILES+=usr/share/doc/ntp/driver7.html
 OLD_FILES+=usr/share/doc/ntp/driver8.html
 OLD_FILES+=usr/share/doc/ntp/driver9.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver1.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver10.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver11.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver12.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver16.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver18.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver19.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver20.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver22.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver26.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver27.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver28.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver29.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver3.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver30.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver31.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver32.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver33.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver34.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver35.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver36.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver37.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver38.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver39.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver4.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver40.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver42.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver43.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver44.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver45.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver46.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver5.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver6.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver7.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver8.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver9.html
 OLD_FILES+=usr/share/doc/ntp/drivers/icons/home.gif
 OLD_FILES+=usr/share/doc/ntp/drivers/icons/mail2.gif
 OLD_FILES+=usr/share/doc/ntp/drivers/mx4200data.html
 OLD_FILES+=usr/share/doc/ntp/drivers/oncore-shmem.html
 OLD_FILES+=usr/share/doc/ntp/drivers/scripts/footer.txt
 OLD_FILES+=usr/share/doc/ntp/drivers/scripts/style.css
 OLD_FILES+=usr/share/doc/ntp/drivers/tf582_4.html
 OLD_FILES+=usr/share/doc/ntp/extern.html
 OLD_FILES+=usr/share/doc/ntp/filter.html
 OLD_FILES+=usr/share/doc/ntp/hints.html
 OLD_FILES+=usr/share/doc/ntp/hints/a-ux
 OLD_FILES+=usr/share/doc/ntp/hints/aix
 OLD_FILES+=usr/share/doc/ntp/hints/bsdi
 OLD_FILES+=usr/share/doc/ntp/hints/changes
 OLD_FILES+=usr/share/doc/ntp/hints/decosf1
 OLD_FILES+=usr/share/doc/ntp/hints/decosf2
 OLD_FILES+=usr/share/doc/ntp/hints/freebsd
 OLD_FILES+=usr/share/doc/ntp/hints/hpux
 OLD_FILES+=usr/share/doc/ntp/hints/linux
 OLD_FILES+=usr/share/doc/ntp/hints/mpeix
 OLD_FILES+=usr/share/doc/ntp/hints/notes-xntp-v3
 OLD_FILES+=usr/share/doc/ntp/hints/parse
 OLD_FILES+=usr/share/doc/ntp/hints/refclocks
 OLD_FILES+=usr/share/doc/ntp/hints/rs6000
 OLD_FILES+=usr/share/doc/ntp/hints/sco.html
 OLD_FILES+=usr/share/doc/ntp/hints/sgi
 OLD_FILES+=usr/share/doc/ntp/hints/solaris-dosynctodr.html
 OLD_FILES+=usr/share/doc/ntp/hints/solaris.html
 OLD_FILES+=usr/share/doc/ntp/hints/solaris.xtra.4023118
 OLD_FILES+=usr/share/doc/ntp/hints/solaris.xtra.4095849
 OLD_FILES+=usr/share/doc/ntp/hints/solaris.xtra.S99ntpd
 OLD_FILES+=usr/share/doc/ntp/hints/solaris.xtra.patchfreq
 OLD_FILES+=usr/share/doc/ntp/hints/sun4
 OLD_FILES+=usr/share/doc/ntp/hints/svr4-dell
 OLD_FILES+=usr/share/doc/ntp/hints/svr4_package
 OLD_FILES+=usr/share/doc/ntp/hints/todo
 OLD_FILES+=usr/share/doc/ntp/hints/vxworks.html
 OLD_FILES+=usr/share/doc/ntp/hints/winnt.html
 OLD_FILES+=usr/share/doc/ntp/history.html
 OLD_FILES+=usr/share/doc/ntp/howto.html
 OLD_FILES+=usr/share/doc/ntp/huffpuff.html
 OLD_FILES+=usr/share/doc/ntp/icons/home.gif
 OLD_FILES+=usr/share/doc/ntp/icons/mail2.gif
 OLD_FILES+=usr/share/doc/ntp/icons/sitemap.png
 OLD_FILES+=usr/share/doc/ntp/index.html
 OLD_FILES+=usr/share/doc/ntp/kern.html
 OLD_FILES+=usr/share/doc/ntp/kernpps.html
 OLD_FILES+=usr/share/doc/ntp/keygen.html
 OLD_FILES+=usr/share/doc/ntp/ldisc.html
 OLD_FILES+=usr/share/doc/ntp/leap.html
 OLD_FILES+=usr/share/doc/ntp/measure.html
 OLD_FILES+=usr/share/doc/ntp/miscopt.html
 OLD_FILES+=usr/share/doc/ntp/monopt.html
 OLD_FILES+=usr/share/doc/ntp/msyslog.html
 OLD_FILES+=usr/share/doc/ntp/mx4200data.html
 OLD_FILES+=usr/share/doc/ntp/notes.html
 OLD_FILES+=usr/share/doc/ntp/ntp-keygen.html
 OLD_FILES+=usr/share/doc/ntp/ntp-wait.html
 OLD_FILES+=usr/share/doc/ntp/ntp.conf.html
 OLD_FILES+=usr/share/doc/ntp/ntp.keys.html
 OLD_FILES+=usr/share/doc/ntp/ntp_conf.html
 OLD_FILES+=usr/share/doc/ntp/ntpd.html
 OLD_FILES+=usr/share/doc/ntp/ntpdate.html
 OLD_FILES+=usr/share/doc/ntp/ntpdc.html
 OLD_FILES+=usr/share/doc/ntp/ntpdsim.html
 OLD_FILES+=usr/share/doc/ntp/ntpdsim_new.html
 OLD_FILES+=usr/share/doc/ntp/ntpq.html
 OLD_FILES+=usr/share/doc/ntp/ntpsnmpd.html
 OLD_FILES+=usr/share/doc/ntp/ntptime.html
 OLD_FILES+=usr/share/doc/ntp/ntptrace.html
 OLD_FILES+=usr/share/doc/ntp/orphan.html
 OLD_FILES+=usr/share/doc/ntp/parsedata.html
 OLD_FILES+=usr/share/doc/ntp/parsenew.html
 OLD_FILES+=usr/share/doc/ntp/patches.html
 OLD_FILES+=usr/share/doc/ntp/pic/9400n.jpg
 OLD_FILES+=usr/share/doc/ntp/pic/alice11.gif
 OLD_FILES+=usr/share/doc/ntp/pic/alice13.gif
 OLD_FILES+=usr/share/doc/ntp/pic/alice15.gif
 OLD_FILES+=usr/share/doc/ntp/pic/alice23.gif
 OLD_FILES+=usr/share/doc/ntp/pic/alice31.gif
 OLD_FILES+=usr/share/doc/ntp/pic/alice32.gif
 OLD_FILES+=usr/share/doc/ntp/pic/alice35.gif
 OLD_FILES+=usr/share/doc/ntp/pic/alice38.gif
 OLD_FILES+=usr/share/doc/ntp/pic/alice44.gif
 OLD_FILES+=usr/share/doc/ntp/pic/alice47.gif
 OLD_FILES+=usr/share/doc/ntp/pic/alice51.gif
 OLD_FILES+=usr/share/doc/ntp/pic/alice61.gif
 OLD_FILES+=usr/share/doc/ntp/pic/barnstable.gif
 OLD_FILES+=usr/share/doc/ntp/pic/beaver.gif
 OLD_FILES+=usr/share/doc/ntp/pic/boom3.gif
 OLD_FILES+=usr/share/doc/ntp/pic/boom3a.gif
 OLD_FILES+=usr/share/doc/ntp/pic/boom4.gif
 OLD_FILES+=usr/share/doc/ntp/pic/broad.gif
 OLD_FILES+=usr/share/doc/ntp/pic/bustardfly.gif
 OLD_FILES+=usr/share/doc/ntp/pic/c51.jpg
 OLD_FILES+=usr/share/doc/ntp/pic/description.jpg
 OLD_FILES+=usr/share/doc/ntp/pic/discipline.gif
 OLD_FILES+=usr/share/doc/ntp/pic/dogsnake.gif
 OLD_FILES+=usr/share/doc/ntp/pic/driver29.gif
 OLD_FILES+=usr/share/doc/ntp/pic/driver43_1.gif
 OLD_FILES+=usr/share/doc/ntp/pic/driver43_2.jpg
 OLD_FILES+=usr/share/doc/ntp/pic/fg6021.gif
 OLD_FILES+=usr/share/doc/ntp/pic/fg6039.jpg
 OLD_FILES+=usr/share/doc/ntp/pic/fig_3_1.gif
 OLD_FILES+=usr/share/doc/ntp/pic/flatheads.gif
 OLD_FILES+=usr/share/doc/ntp/pic/flt1.gif
 OLD_FILES+=usr/share/doc/ntp/pic/flt2.gif
 OLD_FILES+=usr/share/doc/ntp/pic/flt3.gif
 OLD_FILES+=usr/share/doc/ntp/pic/flt4.gif
 OLD_FILES+=usr/share/doc/ntp/pic/flt5.gif
 OLD_FILES+=usr/share/doc/ntp/pic/flt6.gif
 OLD_FILES+=usr/share/doc/ntp/pic/flt7.gif
 OLD_FILES+=usr/share/doc/ntp/pic/flt8.gif
 OLD_FILES+=usr/share/doc/ntp/pic/flt9.gif
 OLD_FILES+=usr/share/doc/ntp/pic/freq1211.gif
 OLD_FILES+=usr/share/doc/ntp/pic/gadget.jpg
 OLD_FILES+=usr/share/doc/ntp/pic/gps167.jpg
 OLD_FILES+=usr/share/doc/ntp/pic/group.gif
 OLD_FILES+=usr/share/doc/ntp/pic/hornraba.gif
 OLD_FILES+=usr/share/doc/ntp/pic/igclock.gif
 OLD_FILES+=usr/share/doc/ntp/pic/neoclock4x.gif
 OLD_FILES+=usr/share/doc/ntp/pic/offset1211.gif
 OLD_FILES+=usr/share/doc/ntp/pic/oncore_evalbig.gif
 OLD_FILES+=usr/share/doc/ntp/pic/oncore_remoteant.jpg
 OLD_FILES+=usr/share/doc/ntp/pic/oncore_utplusbig.gif
 OLD_FILES+=usr/share/doc/ntp/pic/oz2.gif
 OLD_FILES+=usr/share/doc/ntp/pic/panda.gif
 OLD_FILES+=usr/share/doc/ntp/pic/pd_om006.gif
 OLD_FILES+=usr/share/doc/ntp/pic/pd_om011.gif
 OLD_FILES+=usr/share/doc/ntp/pic/peer.gif
 OLD_FILES+=usr/share/doc/ntp/pic/pogo.gif
 OLD_FILES+=usr/share/doc/ntp/pic/pogo1a.gif
 OLD_FILES+=usr/share/doc/ntp/pic/pogo3a.gif
 OLD_FILES+=usr/share/doc/ntp/pic/pogo4.gif
 OLD_FILES+=usr/share/doc/ntp/pic/pogo5.gif
 OLD_FILES+=usr/share/doc/ntp/pic/pogo6.gif
 OLD_FILES+=usr/share/doc/ntp/pic/pogo7.gif
 OLD_FILES+=usr/share/doc/ntp/pic/pogo8.gif
 OLD_FILES+=usr/share/doc/ntp/pic/pzf509.jpg
 OLD_FILES+=usr/share/doc/ntp/pic/pzf511.jpg
 OLD_FILES+=usr/share/doc/ntp/pic/rabbit.gif
 OLD_FILES+=usr/share/doc/ntp/pic/radio2.jpg
 OLD_FILES+=usr/share/doc/ntp/pic/sheepb.jpg
 OLD_FILES+=usr/share/doc/ntp/pic/stack1a.jpg
 OLD_FILES+=usr/share/doc/ntp/pic/stats.gif
 OLD_FILES+=usr/share/doc/ntp/pic/sx5.gif
 OLD_FILES+=usr/share/doc/ntp/pic/thunderbolt.jpg
 OLD_FILES+=usr/share/doc/ntp/pic/time1.gif
 OLD_FILES+=usr/share/doc/ntp/pic/tonea.gif
 OLD_FILES+=usr/share/doc/ntp/pic/tribeb.gif
 OLD_FILES+=usr/share/doc/ntp/pic/wingdorothy.gif
 OLD_FILES+=usr/share/doc/ntp/poll.html
 OLD_FILES+=usr/share/doc/ntp/porting.html
 OLD_FILES+=usr/share/doc/ntp/pps.html
 OLD_FILES+=usr/share/doc/ntp/prefer.html
 OLD_FILES+=usr/share/doc/ntp/quick.html
 OLD_FILES+=usr/share/doc/ntp/rate.html
 OLD_FILES+=usr/share/doc/ntp/rdebug.html
 OLD_FILES+=usr/share/doc/ntp/refclock.html
 OLD_FILES+=usr/share/doc/ntp/release.html
 OLD_FILES+=usr/share/doc/ntp/scripts/accopt.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/audio.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/authopt.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/clockopt.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/command.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/config.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/confopt.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/external.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/footer.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/hand.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/install.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/manual.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/misc.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/miscopt.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/monopt.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/refclock.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/special.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/style.css
 OLD_FILES+=usr/share/doc/ntp/select.html
 OLD_FILES+=usr/share/doc/ntp/sitemap.html
 OLD_FILES+=usr/share/doc/ntp/sntp.html
 OLD_FILES+=usr/share/doc/ntp/stats.html
 OLD_FILES+=usr/share/doc/ntp/tickadj.html
 OLD_FILES+=usr/share/doc/ntp/warp.html
 OLD_FILES+=usr/share/doc/ntp/xleave.html
 OLD_DIRS+=usr/share/doc/ntp/drivers
 OLD_DIRS+=usr/share/doc/ntp/drivers/scripts
 OLD_DIRS+=usr/share/doc/ntp/drivers/icons
 OLD_DIRS+=usr/share/doc/ntp/hints
 OLD_DIRS+=usr/share/doc/ntp/icons
 OLD_DIRS+=usr/share/doc/ntp/pic
 OLD_DIRS+=usr/share/doc/ntp/scripts
 OLD_DIRS+=usr/share/doc/ntp
 OLD_FILES+=usr/share/examples/etc/ntp.conf
 OLD_FILES+=usr/share/man/man1/sntp.1.gz
 OLD_FILES+=usr/share/man/man5/ntp.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ntp.keys.5.gz
 OLD_FILES+=usr/share/man/man8/ntp-keygen.8.gz
 OLD_FILES+=usr/share/man/man8/ntpd.8.gz
 OLD_FILES+=usr/share/man/man8/ntpdate.8.gz
 OLD_FILES+=usr/share/man/man8/ntpdc.8.gz
 OLD_FILES+=usr/share/man/man8/ntpq.8.gz
 OLD_FILES+=usr/share/man/man8/ntptime.8.gz
 .endif
 
 .if ${MK_OFED} == no
 OLD_FILES+=etc/newsyslog.conf.d/opensm.conf
 OLD_FILES+=etc/rc.d/opensm
 OLD_FILES+=usr/bin/ibstat
 OLD_FILES+=usr/bin/ibv_asyncwatch
 OLD_FILES+=usr/bin/ibv_devices
 OLD_FILES+=usr/bin/ibv_devinfo
 OLD_FILES+=usr/bin/ibv_rc_pingpong
 OLD_FILES+=usr/bin/ibv_srq_pingpong
 OLD_FILES+=usr/bin/ibv_uc_pingpong
 OLD_FILES+=usr/bin/ibv_ud_pingpong
 OLD_FILES+=usr/bin/mckey
 OLD_FILES+=usr/bin/rping
 OLD_FILES+=usr/bin/ucmatose
 OLD_FILES+=usr/bin/udaddy
 OLD_FILES+=usr/include/infiniband/marshall.h
 OLD_FILES+=usr/include/infiniband/kern-abi.h
 OLD_FILES+=usr/include/infiniband/umad_sm.h
 OLD_FILES+=usr/include/infiniband/umad.h
 OLD_FILES+=usr/include/infiniband/arch.h
 OLD_FILES+=usr/include/infiniband/verbs.h
 OLD_FILES+=usr/include/infiniband/ib.h
 OLD_FILES+=usr/include/infiniband/cm.h
 OLD_FILES+=usr/include/infiniband/opcode.h
 OLD_FILES+=usr/include/infiniband/ibnetdisc.h
 OLD_FILES+=usr/include/infiniband/driver.h
 OLD_FILES+=usr/include/infiniband/mad_osd.h
 OLD_FILES+=usr/include/infiniband/umad_types.h
 OLD_FILES+=usr/include/infiniband/umad_cm.h
 OLD_FILES+=usr/include/infiniband/cm_abi.h
 OLD_FILES+=usr/include/infiniband/sa-kern-abi.h
 OLD_FILES+=usr/include/infiniband/ibnetdisc_osd.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_event_plugin.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_console_io.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_ucast_cache.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_port.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_path.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_mtree.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_log.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_mcm_port.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_subnet.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_pkey.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_remote_sm.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_qos_policy.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_sm.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_node.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_mcast_mgr.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_madw.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_lid_mgr.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_congestion_control.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_port_profile.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_perfmgr.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_service.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_base.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_vl15intf.h
 OLD_FILES+=usr/include/infiniband/opensm/st.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_attrib_req.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_ucast_mgr.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_db.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_sa_mad_ctrl.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_db_pack.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_opensm.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_mesh.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_mcast_tbl.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_sm_mad_ctrl.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_stats.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_mad_pool.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_switch.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_ucast_lash.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_errors.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_partition.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_prefix_route.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_helper.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_version.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_sa.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_config.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_multicast.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_file_ids.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_perfmgr_db.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_console.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_msgdef.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_router.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_guid.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_inform.h
 OLD_DIRS+=usr/include/infiniband/opensm
 OLD_FILES+=usr/include/infiniband/iba/ib_types.h
 OLD_FILES+=usr/include/infiniband/iba/ib_cm_types.h
 OLD_DIRS+=usr/include/infiniband/iba
 OLD_FILES+=usr/include/infiniband/umad_str.h
 OLD_FILES+=usr/include/infiniband/udma_barrier.h
 OLD_FILES+=usr/include/infiniband/umad_sa.h
 OLD_FILES+=usr/include/infiniband/mad.h
 OLD_FILES+=usr/include/infiniband/sa.h
 OLD_FILES+=usr/include/infiniband/byteorder.h
 OLD_FILES+=usr/include/infiniband/types.h
 OLD_FILES+=usr/include/infiniband/byteswap.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_pkt_randomizer.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mlx_rmpp_ctx.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mtl_hca_guid.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mlx_txn.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mlx.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mlx_svc.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_test.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mlx_inout.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_mtl_bind.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mlx_hca.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_sa_api.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mlx_sender.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_umadt.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mtl_transaction_mgr.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mlx_defs.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mlx_dispatcher.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_api.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mtl.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mlx_transport.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_al.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mlx_sar.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_umadt.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_ts_useraccess.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_ts.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mlx_transport_anafa.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_ibumad.h
 OLD_DIRS+=usr/include/infiniband/vendor
 OLD_FILES+=usr/include/infiniband/endian.h
 OLD_FILES+=usr/include/infiniband/complib/cl_byteswap.h
 OLD_FILES+=usr/include/infiniband/complib/cl_types.h
 OLD_FILES+=usr/include/infiniband/complib/cl_map.h
 OLD_FILES+=usr/include/infiniband/complib/cl_packon.h
 OLD_FILES+=usr/include/infiniband/complib/cl_timer.h
 OLD_FILES+=usr/include/infiniband/complib/cl_thread_osd.h
 OLD_FILES+=usr/include/infiniband/complib/cl_thread.h
 OLD_FILES+=usr/include/infiniband/complib/cl_event.h
 OLD_FILES+=usr/include/infiniband/complib/cl_byteswap_osd.h
 OLD_FILES+=usr/include/infiniband/complib/cl_passivelock.h
 OLD_FILES+=usr/include/infiniband/complib/cl_vector.h
 OLD_FILES+=usr/include/infiniband/complib/cl_nodenamemap.h
 OLD_FILES+=usr/include/infiniband/complib/cl_event_wheel.h
 OLD_FILES+=usr/include/infiniband/complib/cl_log.h
 OLD_FILES+=usr/include/infiniband/complib/cl_fleximap.h
 OLD_FILES+=usr/include/infiniband/complib/cl_qlist.h
 OLD_FILES+=usr/include/infiniband/complib/cl_timer_osd.h
 OLD_FILES+=usr/include/infiniband/complib/cl_pool.h
 OLD_FILES+=usr/include/infiniband/complib/cl_debug.h
 OLD_FILES+=usr/include/infiniband/complib/cl_types_osd.h
 OLD_FILES+=usr/include/infiniband/complib/cl_dispatcher.h
 OLD_FILES+=usr/include/infiniband/complib/cl_ptr_vector.h
 OLD_FILES+=usr/include/infiniband/complib/cl_atomic_osd.h
 OLD_FILES+=usr/include/infiniband/complib/cl_qmap.h
 OLD_FILES+=usr/include/infiniband/complib/cl_spinlock_osd.h
 OLD_FILES+=usr/include/infiniband/complib/cl_qcomppool.h
 OLD_FILES+=usr/include/infiniband/complib/cl_threadpool.h
 OLD_FILES+=usr/include/infiniband/complib/cl_list.h
 OLD_FILES+=usr/include/infiniband/complib/cl_debug_osd.h
 OLD_FILES+=usr/include/infiniband/complib/cl_packoff.h
 OLD_FILES+=usr/include/infiniband/complib/cl_qpool.h
 OLD_FILES+=usr/include/infiniband/complib/cl_spinlock.h
 OLD_FILES+=usr/include/infiniband/complib/cl_event_osd.h
 OLD_FILES+=usr/include/infiniband/complib/cl_atomic.h
 OLD_FILES+=usr/include/infiniband/complib/cl_math.h
 OLD_FILES+=usr/include/infiniband/complib/cl_comppool.h
 OLD_DIRS+=usr/include/infiniband/complib
 OLD_DIRS+=usr/include/infiniband
 OLD_FILES+=usr/lib/libcxgb4.a
 OLD_FILES+=usr/lib/libcxgb4.so
 OLD_LIBS+=usr/lib/libcxgb4.so.1
 OLD_FILES+=usr/lib/libibcm.a
 OLD_FILES+=usr/lib/libibcm.so
 OLD_LIBS+=usr/lib/libibcm.so.1
 OLD_FILES+=usr/lib/libibmad.a
 OLD_FILES+=usr/lib/libibmad.so
 OLD_LIBS+=usr/lib/libibmad.so.5
 OLD_FILES+=usr/lib/libibnetdisc.a
 OLD_FILES+=usr/lib/libibnetdisc.so
 OLD_LIBS+=usr/lib/libibnetdisc.so.5
 OLD_FILES+=usr/lib/libibumad.a
 OLD_FILES+=usr/lib/libibumad.so
 OLD_LIBS+=usr/lib/libibumad.so.1
 OLD_FILES+=usr/lib/libibverbs.a
 OLD_FILES+=usr/lib/libibverbs.so
 OLD_LIBS+=lib/libibverbs.so.1
 OLD_FILES+=usr/lib/libmlx4.a
 OLD_FILES+=usr/lib/libmlx4.so
 OLD_LIBS+=usr/lib/libmlx4.so.1
 OLD_FILES+=usr/lib/libmlx5.a
 OLD_FILES+=usr/lib/libmlx5.so
 OLD_LIBS+=lib/libmlx5.so.1
 OLD_FILES+=usr/lib/libopensm.a
 OLD_FILES+=usr/lib/libopensm.so
 OLD_LIBS+=usr/lib/libopensm.so.5
 OLD_FILES+=usr/lib/libosmcomp.a
 OLD_FILES+=usr/lib/libosmcomp.so
 OLD_LIBS+=usr/lib/libosmcomp.so.3
 OLD_FILES+=usr/lib/libosmvendor.a
 OLD_FILES+=usr/lib/libosmvendor.so
 OLD_LIBS+=usr/lib/libosmvendor.so.4
 OLD_FILES+=usr/lib/librdmacm.a
 OLD_FILES+=usr/lib/librdmacm.so
 OLD_LIBS+=usr/lib/librdmacm.so.1
 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
 OLD_FILES+=usr/share/man/man1/ibv_rc_pingpong.1.gz
 OLD_FILES+=usr/share/man/man1/ibv_srq_pingpong.1.gz
 OLD_FILES+=usr/share/man/man1/ibv_uc_pingpong.1.gz
 OLD_FILES+=usr/share/man/man1/ibv_ud_pingpong.1.gz
 OLD_FILES+=usr/share/man/man1/mckey.1.gz
 OLD_FILES+=usr/share/man/man1/rping.1.gz
 OLD_FILES+=usr/share/man/man1/ucmatose.1.gz
 OLD_FILES+=usr/share/man/man1/udaddy.1.gz
 OLD_FILES+=usr/share/man/man3/ibnd_debug.3.gz
 OLD_FILES+=usr/share/man/man3/ibnd_destroy_fabric.3.gz
 OLD_FILES+=usr/share/man/man3/ibnd_discover_fabric.3.gz
 OLD_FILES+=usr/share/man/man3/ibnd_find_node_dr.3.gz
 OLD_FILES+=usr/share/man/man3/ibnd_find_node_guid.3.gz
 OLD_FILES+=usr/share/man/man3/ibnd_iter_nodes.3.gz
 OLD_FILES+=usr/share/man/man3/ibnd_iter_nodes_type.3.gz
 OLD_FILES+=usr/share/man/man3/ibnd_show_progress.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_alloc_mw.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_alloc_pd.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_attach_mcast.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_bind_mw.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_create_ah.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_create_ah_from_wc.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_create_comp_channel.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_create_cq.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_create_cq_ex.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_create_flow.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_create_qp.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_create_qp_ex.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_create_rwq_ind_table.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_create_srq.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_create_srq_ex.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_create_wq.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_event_type_str.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_fork_init.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_get_async_event.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_get_cq_event.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_get_device_guid.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_get_device_list.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_get_device_name.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_get_srq_num.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_inc_rkey.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_modify_qp.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_modify_srq.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_modify_wq.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_open_device.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_open_qp.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_open_xrcd.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_poll_cq.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_post_recv.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_post_send.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_post_srq_recv.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_query_device.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_query_device_ex.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_query_gid.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_query_pkey.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_query_port.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_query_qp.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_query_rt_values_ex.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_query_srq.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_rate_to_mbps.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_rate_to_mult.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_reg_mr.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_req_notify_cq.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_rereg_mr.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_resize_cq.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_accept.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_ack_cm_event.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_bind_addr.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_connect.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_create_ep.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_create_event_channel.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_create_id.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_create_qp.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_create_srq.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_dereg_mr.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_destroy_ep.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_destroy_event_channel.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_destroy_id.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_destroy_qp.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_destroy_srq.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_disconnect.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_event_str.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_free_devices.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_get_cm_event.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_get_devices.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_get_dst_port.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_get_local_addr.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_get_peer_addr.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_get_recv_comp.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_get_request.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_get_send_comp.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_get_src_port.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_getaddrinfo.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_join_multicast.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_leave_multicast.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_listen.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_migrate_id.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_notify.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_post_read.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_post_readv.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_post_recv.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_post_recvv.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_post_send.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_post_sendv.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_post_ud_send.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_post_write.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_post_writev.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_reg_msgs.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_reg_read.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_reg_write.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_reject.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_resolve_addr.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_resolve_route.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_set_option.3.gz
 OLD_FILES+=usr/share/man/man4/mlx4ib.4.gz
 OLD_FILES+=usr/share/man/man4/mlx5ib.4.gz
 OLD_FILES+=usr/share/man/man8/ibstat.8.gz
 .endif
 
 .if ${MK_OFED_EXTRA} == no
 OLD_FILES+=usr/bin/dump_fts
 OLD_FILES+=usr/bin/ibaddr
 OLD_FILES+=usr/bin/ibcacheedit
 OLD_FILES+=usr/bin/ibccconfig
 OLD_FILES+=usr/bin/ibccquery
 OLD_FILES+=usr/bin/iblinkinfo
 OLD_FILES+=usr/bin/ibmirror
 OLD_FILES+=usr/bin/ibnetdiscover
 OLD_FILES+=usr/bin/ibping
 OLD_FILES+=usr/bin/ibportstate
 OLD_FILES+=usr/bin/ibqueryerrors
 OLD_FILES+=usr/bin/ibroute
 OLD_FILES+=usr/bin/ibsysstat
 OLD_FILES+=usr/bin/ibtracert
 OLD_FILES+=usr/bin/opensm
 OLD_FILES+=usr/bin/perfquery
 OLD_FILES+=usr/bin/saquery
 OLD_FILES+=usr/bin/sminfo
 OLD_FILES+=usr/bin/smpdump
 OLD_FILES+=usr/bin/smpquery
 OLD_FILES+=usr/bin/vendstat
 OLD_FILES+=usr/share/man/man8/dump_fts.8.gz
 OLD_FILES+=usr/share/man/man8/ibaddr.8.gz
 OLD_FILES+=usr/share/man/man8/ibcacheedit.8.gz
 OLD_FILES+=usr/share/man/man8/ibccconfig.8.gz
 OLD_FILES+=usr/share/man/man8/ibccquery.8.gz
 OLD_FILES+=usr/share/man/man8/iblinkinfo.8.gz
 OLD_FILES+=usr/share/man/man8/ibnetdiscover.8.gz
 OLD_FILES+=usr/share/man/man8/ibping.8.gz
 OLD_FILES+=usr/share/man/man8/ibportstate.8.gz
 OLD_FILES+=usr/share/man/man8/ibqueryerrors.8.gz
 OLD_FILES+=usr/share/man/man8/ibroute.8.gz
 OLD_FILES+=usr/share/man/man8/ibsysstat.8.gz
 OLD_FILES+=usr/share/man/man8/ibtracert.8.gz
 OLD_FILES+=usr/share/man/man8/opensm.8.gz
 OLD_FILES+=usr/share/man/man8/perfquery.8.gz
 OLD_FILES+=usr/share/man/man8/saquery.8.gz
 OLD_FILES+=usr/share/man/man8/sminfo.8.gz
 OLD_FILES+=usr/share/man/man8/smpdump.8.gz
 OLD_FILES+=usr/share/man/man8/smpquery.8.gz
 OLD_FILES+=usr/share/man/man8/vendstat.8.gz
 .endif
 
 .if ${MK_OPENMP} == no
 OLD_FILES+=usr/include/omp.h
 OLD_FILES+=usr/lib/libgomp.so
 OLD_LIBS+=usr/lib/libomp.so
 .endif
 
 .if ${MK_OPENSSH} == no
 OLD_FILES+=etc/rc.d/sshd
 OLD_FILES+=etc/ssh/moduli
 OLD_FILES+=etc/ssh/ssh_config
 OLD_FILES+=etc/ssh/sshd_config
 OLD_DIRS+=etc/ssh
 OLD_FILES+=usr/bin/scp
 OLD_FILES+=usr/bin/sftp
 OLD_FILES+=usr/bin/slogin
 OLD_FILES+=usr/bin/ssh
 OLD_FILES+=usr/bin/ssh-add
 OLD_FILES+=usr/bin/ssh-agent
 OLD_FILES+=usr/bin/ssh-copy-id
 OLD_FILES+=usr/bin/ssh-keygen
 OLD_FILES+=usr/bin/ssh-keyscan
 OLD_FILES+=usr/lib/libprivatecbor.a
 OLD_FILES+=usr/lib/libprivatecbor.so
 OLD_LIBS+=usr/lib/libprivatecbor.so.5
 OLD_FILES+=/usr/lib/libprivatefido2.a
 OLD_FILES+=/usr/lib/libprivatefido2.so
 OLD_LIBS+=/usr/lib/libprivatefido2.so.5
 OLD_FILES+=usr/lib/pam_ssh.so
 OLD_LIBS+=usr/lib/pam_ssh.so.6
 OLD_FILES+=usr/lib/libprivatessh.a
 OLD_FILES+=usr/lib/libprivatessh.so
 OLD_LIBS+=usr/lib/libprivatessh.so.5
 OLD_FILES+=usr/lib/libprivatessh_p.a
 OLD_FILES+=usr/libexec/sftp-server
 OLD_FILES+=usr/libexec/ssh-keysign
 OLD_FILES+=usr/libexec/ssh-pkcs11-helper
 OLD_FILES+=usr/libexec/ssh-sk-helper
 OLD_FILES+=usr/sbin/sshd
 OLD_FILES+=usr/share/man/man1/scp.1.gz
 OLD_FILES+=usr/share/man/man1/sftp.1.gz
 OLD_FILES+=usr/share/man/man1/slogin.1.gz
 OLD_FILES+=usr/share/man/man1/ssh-add.1.gz
 OLD_FILES+=usr/share/man/man1/ssh-agent.1.gz
 OLD_FILES+=usr/share/man/man1/ssh-copy-id.1.gz
 OLD_FILES+=usr/share/man/man1/ssh-keygen.1.gz
 OLD_FILES+=usr/share/man/man1/ssh-keyscan.1.gz
 OLD_FILES+=usr/share/man/man1/ssh.1.gz
 OLD_FILES+=usr/share/man/man5/ssh_config.5.gz
 OLD_FILES+=usr/share/man/man5/sshd_config.5.gz
 OLD_FILES+=usr/share/man/man8/pam_ssh.8.gz
 OLD_FILES+=usr/share/man/man8/sftp-server.8.gz
 OLD_FILES+=usr/share/man/man8/ssh-keysign.8.gz
 OLD_FILES+=usr/share/man/man8/ssh-pkcs11-helper.8.gz
 OLD_FILES+=usr/share/man/man8/ssh-sk-helper.8.gz
 OLD_FILES+=usr/share/man/man8/sshd.8.gz
 .endif
 
 .if ${MK_OPENSSL} == no
 OLD_FILES+=etc/rc.d/keyserv
 .endif
 
 .if ${MK_PF} == no
 OLD_FILES+=etc/newsyslog.conf.d/pf.conf
 OLD_FILES+=etc/periodic/security/520.pfdenied
 OLD_FILES+=etc/pf.os
 OLD_FILES+=etc/rc.d/ftp-proxy
 OLD_FILES+=sbin/pfctl
 OLD_FILES+=sbin/pflogd
 OLD_FILES+=usr/include/netpfil/pf/pf.h
 OLD_FILES+=usr/include/netpfil/pf/pf_altq.h
 OLD_FILES+=usr/include/netpfil/pf/pf_mtag.h
 OLD_FILES+=usr/lib/snmp_pf.so
 OLD_LIBS+=usr/lib/snmp_pf.so.6
 OLD_FILES+=usr/libexec/tftp-proxy
 OLD_FILES+=usr/sbin/ftp-proxy
 OLD_FILES+=usr/share/examples/etc/pf.os
 OLD_FILES+=usr/share/examples/pf/ackpri
 OLD_FILES+=usr/share/examples/pf/faq-example1
 OLD_FILES+=usr/share/examples/pf/faq-example2
 OLD_FILES+=usr/share/examples/pf/faq-example3
 OLD_FILES+=usr/share/examples/pf/pf.conf
 OLD_FILES+=usr/share/examples/pf/queue1
 OLD_FILES+=usr/share/examples/pf/queue2
 OLD_FILES+=usr/share/examples/pf/queue3
 OLD_FILES+=usr/share/examples/pf/queue4
 OLD_FILES+=usr/share/examples/pf/spamd
 OLD_DIRS+=usr/share/examples/pf
 OLD_FILES+=usr/share/man/man4/pf.4.gz
 OLD_FILES+=usr/share/man/man4/pflog.4.gz
 OLD_FILES+=usr/share/man/man4/pfsync.4.gz
 OLD_FILES+=usr/share/man/man5/pf.conf.5.gz
 OLD_FILES+=usr/share/man/man5/pf.os.5.gz
 OLD_FILES+=usr/share/man/man8/ftp-proxy.8.gz
 OLD_FILES+=usr/share/man/man8/pfctl.8.gz
 OLD_FILES+=usr/share/man/man8/pflogd.8.gz
 OLD_FILES+=usr/share/man/man8/tftp-proxy.8.gz
 OLD_FILES+=usr/share/snmp/defs/pf_tree.def
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-PF-MIB.txt
 .endif
 
 .if ${MK_PKGBOOTSTRAP} == no
 OLD_FILES+=usr/sbin/pkg
 OLD_FILES+=usr/share/man/man7/pkg.7.gz
 .endif
 
 .if ${MK_PMC} == no
 OLD_FILES+=usr/bin/pmcstudy
 .if ${TARGET_ARCH} == "amd64"
 OLD_FILES+=usr/include/libipt/pt_last_ip.h
 OLD_FILES+=usr/include/libipt/intel-pt.h
 OLD_FILES+=usr/include/libipt/pt_time.h
 OLD_FILES+=usr/include/libipt/pt_cpu.h
 OLD_FILES+=usr/include/libipt/pt_compiler.h
 OLD_DIRS+=usr/include/libipt
 .endif
 .if ${TARGET_ARCH} == "aarch64"
 OLD_FILES+=usr/include/opencsd/c_api/opencsd_c_api.h
 OLD_FILES+=usr/include/opencsd/c_api/ocsd_c_api_cust_impl.h
 OLD_FILES+=usr/include/opencsd/c_api/ocsd_c_api_types.h
 OLD_FILES+=usr/include/opencsd/c_api/ocsd_c_api_cust_fact.h
 OLD_FILES+=usr/include/opencsd/c_api/ocsd_c_api_custom.h
 OLD_DIRS+=usr/include/opencsd/c_api
 OLD_FILES+=usr/include/opencsd/ocsd_if_types.h
 OLD_FILES+=usr/include/opencsd/ptm/trc_dcd_mngr_ptm.h
 OLD_FILES+=usr/include/opencsd/ptm/trc_pkt_proc_ptm.h
 OLD_FILES+=usr/include/opencsd/ptm/trc_cmp_cfg_ptm.h
 OLD_FILES+=usr/include/opencsd/ptm/ptm_decoder.h
 OLD_FILES+=usr/include/opencsd/ptm/trc_pkt_elem_ptm.h
 OLD_FILES+=usr/include/opencsd/ptm/trc_pkt_decode_ptm.h
 OLD_FILES+=usr/include/opencsd/ptm/trc_pkt_types_ptm.h
 OLD_DIRS+=usr/include/opencsd/ptm
 OLD_FILES+=usr/include/opencsd/trc_gen_elem_types.h
 OLD_FILES+=usr/include/opencsd/etmv4/trc_pkt_proc_etmv4.h
 OLD_FILES+=usr/include/opencsd/etmv4/trc_etmv4_stack_elem.h
 OLD_FILES+=usr/include/opencsd/etmv4/etmv4_decoder.h
 OLD_FILES+=usr/include/opencsd/etmv4/trc_pkt_elem_etmv4i.h
 OLD_FILES+=usr/include/opencsd/etmv4/trc_dcd_mngr_etmv4i.h
 OLD_FILES+=usr/include/opencsd/etmv4/trc_pkt_types_etmv4.h
 OLD_FILES+=usr/include/opencsd/etmv4/trc_pkt_elem_etmv4d.h
 OLD_FILES+=usr/include/opencsd/etmv4/trc_pkt_decode_etmv4i.h
 OLD_FILES+=usr/include/opencsd/etmv4/trc_cmp_cfg_etmv4.h
 OLD_DIRS+=usr/include/opencsd/etmv4
 OLD_FILES+=usr/include/opencsd/etmv3/trc_pkt_decode_etmv3.h
 OLD_FILES+=usr/include/opencsd/etmv3/trc_cmp_cfg_etmv3.h
 OLD_FILES+=usr/include/opencsd/etmv3/etmv3_decoder.h
 OLD_FILES+=usr/include/opencsd/etmv3/trc_pkt_proc_etmv3.h
 OLD_FILES+=usr/include/opencsd/etmv3/trc_pkt_elem_etmv3.h
 OLD_FILES+=usr/include/opencsd/etmv3/trc_pkt_types_etmv3.h
 OLD_FILES+=usr/include/opencsd/etmv3/trc_dcd_mngr_etmv3.h
 OLD_DIRS+=usr/include/opencsd/etmv3
 OLD_FILES+=usr/include/opencsd/trc_pkt_types.h
 OLD_FILES+=usr/include/opencsd/stm/trc_pkt_proc_stm.h
 OLD_FILES+=usr/include/opencsd/stm/trc_pkt_types_stm.h
 OLD_FILES+=usr/include/opencsd/stm/stm_decoder.h
 OLD_FILES+=usr/include/opencsd/stm/trc_dcd_mngr_stm.h
 OLD_FILES+=usr/include/opencsd/stm/trc_cmp_cfg_stm.h
 OLD_FILES+=usr/include/opencsd/stm/trc_pkt_elem_stm.h
 OLD_FILES+=usr/include/opencsd/stm/trc_pkt_decode_stm.h
 OLD_DIRS+=usr/include/opencsd/stm
 OLD_DIRS+=usr/include/opencsd
 .endif
 OLD_FILES+=usr/include/pmc.h
 OLD_FILES+=usr/include/pmclog.h
 OLD_FILES+=usr/include/pmcformat.h
 OLD_FILES+=usr/include/libpmcstat.h
 .if ${TARGET_ARCH} == "amd64"
 OLD_FILES+=usr/lib/libipt.a
 OLD_FILES+=usr/lib/libipt.so
 OLD_LIBS+=lib/libipt.so.0
 OLD_FILES+=usr/lib/libipt_p.a
 .endif
 .if ${TARGET_ARCH} == "aarch64"
 OLD_FILES+=usr/lib/libopencsd.a
 OLD_FILES+=usr/lib/libopencsd.so
 OLD_LIBS+=lib/libopencsd.so.0
 OLD_FILES+=usr/lib/libopencsd_p.a
 .endif
 OLD_FILES+=usr/lib/libpmc.a
 OLD_FILES+=usr/lib/libpmc.so
 OLD_LIBS+=usr/lib/libpmc.so.5
 OLD_FILES+=usr/lib/libpmc_p.a
 OLD_FILES+=usr/sbin/pmc
 OLD_FILES+=usr/sbin/pmcannotate
 OLD_FILES+=usr/sbin/pmccontrol
 OLD_FILES+=usr/sbin/pmcstat
 OLD_FILES+=usr/share/man/man3/pmc.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.atom.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.atomsilvermont.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.core.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.core2.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.corei7.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.corei7uc.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.haswell.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.haswelluc.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.haswellxeon.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.iaf.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.ivybridge.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.ivybridgexeon.3.gz
-OLD_FILES+=usr/share/man/man3/pmc.k7.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.k8.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.sandybridge.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.sandybridgeuc.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.sandybridgexeon.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.soft.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.tsc.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.ucf.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.westmere.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.westmereuc.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.xscale.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_allocate.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_attach.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_capabilities.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_configure_logfile.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_cpuinfo.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_detach.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_disable.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_enable.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_event_names_of_class.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_flush_logfile.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_get_driver_stats.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_get_msr.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_init.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_name_of_capability.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_name_of_class.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_name_of_cputype.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_name_of_disposition.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_name_of_event.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_name_of_mode.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_name_of_state.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_ncpu.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_npmc.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_pmcinfo.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_read.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_release.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_rw.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_set.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_start.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_stop.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_width.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_write.3.gz
 OLD_FILES+=usr/share/man/man3/pmc_writelog.3.gz
 OLD_FILES+=usr/share/man/man3/pmclog.3.gz
 OLD_FILES+=usr/share/man/man3/pmclog_close.3.gz
 OLD_FILES+=usr/share/man/man3/pmclog_feed.3.gz
 OLD_FILES+=usr/share/man/man3/pmclog_open.3.gz
 OLD_FILES+=usr/share/man/man3/pmclog_read.3.gz
 OLD_FILES+=usr/share/man/man8/pmcannotate.8.gz
 OLD_FILES+=usr/share/man/man8/pmccontrol.8.gz
 OLD_FILES+=usr/share/man/man8/pmcstat.8.gz
 OLD_FILES+=usr/share/man/man8/pmcstudy.8.gz
 .endif
 
 .if ${MK_PPP} == no
 OLD_FILES+=etc/newsyslog.conf.d/ppp.conf
 OLD_FILES+=etc/ppp/ppp.conf
 OLD_FILES+=etc/syslog.d/ppp.conf
 OLD_DIRS+=etc/ppp
 OLD_FILES+=usr/sbin/ppp
 OLD_FILES+=usr/sbin/pppctl
 OLD_FILES+=usr/share/man/man8/ppp.8.gz
 OLD_FILES+=usr/share/man/man8/pppctl.8.gz
 .endif
 
 .if ${MK_PROFILE} == no
 OLD_FILES+=usr/lib/lib80211_p.a
 OLD_FILES+=usr/lib/lib9p_p.a
 OLD_FILES+=usr/lib/libBlocksRuntime_p.a
 OLD_FILES+=usr/lib/libalias_dummy_p.a
 OLD_FILES+=usr/lib/libalias_ftp_p.a
 OLD_FILES+=usr/lib/libalias_irc_p.a
 OLD_FILES+=usr/lib/libalias_nbt_p.a
 OLD_FILES+=usr/lib/libalias_p.a
 OLD_FILES+=usr/lib/libalias_pptp_p.a
 OLD_FILES+=usr/lib/libalias_skinny_p.a
 OLD_FILES+=usr/lib/libalias_smedia_p.a
 OLD_FILES+=usr/lib/libarchive_p.a
 OLD_FILES+=usr/lib/libasn1_p.a
 OLD_FILES+=usr/lib/libauditd_p.a
 OLD_FILES+=usr/lib/libavl_p.a
 OLD_FILES+=usr/lib/libbe_p.a
 OLD_FILES+=usr/lib/libbegemot_p.a
 OLD_FILES+=usr/lib/libblacklist_p.a
 OLD_FILES+=usr/lib/libbluetooth_p.a
 OLD_FILES+=usr/lib/libbsdxml_p.a
 OLD_FILES+=usr/lib/libbsm_p.a
 OLD_FILES+=usr/lib/libbsnmp_p.a
 OLD_FILES+=usr/lib/libbz2_p.a
 OLD_FILES+=usr/lib/libc++_p.a
 OLD_FILES+=usr/lib/libc_p.a
 OLD_FILES+=usr/lib/libcalendar_p.a
 OLD_FILES+=usr/lib/libcam_p.a
 OLD_FILES+=usr/lib/libcom_err_p.a
 OLD_FILES+=usr/lib/libcompat_p.a
 OLD_FILES+=usr/lib/libcompiler_rt_p.a
 OLD_FILES+=usr/lib/libcrypt_p.a
 OLD_FILES+=usr/lib/libcrypto_p.a
 OLD_FILES+=usr/lib/libctf_p.a
 OLD_FILES+=usr/lib/libcurses_p.a
 OLD_FILES+=usr/lib/libcursesw_p.a
 OLD_FILES+=usr/lib/libcuse_p.a
 OLD_FILES+=usr/lib/libcxxrt_p.a
 OLD_FILES+=usr/lib/libdevctl_p.a
 OLD_FILES+=usr/lib/libdevinfo_p.a
 OLD_FILES+=usr/lib/libdevstat_p.a
 OLD_FILES+=usr/lib/libdialog_p.a
 OLD_FILES+=usr/lib/libdl_p.a
 OLD_FILES+=usr/lib/libdpv_p.a
 OLD_FILES+=usr/lib/libdtrace_p.a
 OLD_FILES+=usr/lib/libdwarf_p.a
 OLD_FILES+=usr/lib/libedit_p.a
 OLD_FILES+=usr/lib/libefivar_p.a
 OLD_FILES+=usr/lib/libelf_p.a
 OLD_FILES+=usr/lib/libexecinfo_p.a
 OLD_FILES+=usr/lib/libfetch_p.a
 OLD_FILES+=usr/lib/libfigpar_p.a
 OLD_FILES+=usr/lib/libfl_p.a
 OLD_FILES+=usr/lib/libform_p.a
 OLD_FILES+=usr/lib/libformw_p.a
 OLD_FILES+=usr/lib/libgcc_eh_p.a
 OLD_FILES+=usr/lib/libgcc_p.a
 OLD_FILES+=usr/lib/libgeom_p.a
 OLD_FILES+=usr/lib/libgpio_p.a
 OLD_FILES+=usr/lib/libgssapi_krb5_p.a
 OLD_FILES+=usr/lib/libgssapi_ntlm_p.a
 OLD_FILES+=usr/lib/libgssapi_p.a
 OLD_FILES+=usr/lib/libgssapi_spnego_p.a
 OLD_FILES+=usr/lib/libhdb_p.a
 OLD_FILES+=usr/lib/libheimbase_p.a
 OLD_FILES+=usr/lib/libheimntlm_p.a
 OLD_FILES+=usr/lib/libheimsqlite_p.a
 OLD_FILES+=usr/lib/libhistory_p.a
 OLD_FILES+=usr/lib/libhx509_p.a
 OLD_FILES+=usr/lib/libicp_p.a
 OLD_FILES+=usr/lib/libicp_rescue_p.a
 OLD_FILES+=usr/lib/libipsec_p.a
 OLD_FILES+=usr/lib/libipt_p.a
 OLD_FILES+=usr/lib/libjail_p.a
 OLD_FILES+=usr/lib/libkadm5clnt_p.a
 OLD_FILES+=usr/lib/libkadm5srv_p.a
 OLD_FILES+=usr/lib/libkafs5_p.a
 OLD_FILES+=usr/lib/libkdc_p.a
 OLD_FILES+=usr/lib/libkiconv_p.a
 OLD_FILES+=usr/lib/libkrb5_p.a
 OLD_FILES+=usr/lib/libkvm_p.a
 OLD_FILES+=usr/lib/libl_p.a
 OLD_FILES+=usr/lib/libln_p.a
 OLD_FILES+=usr/lib/liblzma_p.a
 OLD_FILES+=usr/lib/libm_p.a
 OLD_FILES+=usr/lib/libmagic_p.a
 OLD_FILES+=usr/lib/libmd_p.a
 OLD_FILES+=usr/lib/libmemstat_p.a
 OLD_FILES+=usr/lib/libmenu_p.a
 OLD_FILES+=usr/lib/libmenuw_p.a
 OLD_FILES+=usr/lib/libmilter_p.a
 OLD_FILES+=usr/lib/libmp_p.a
 OLD_FILES+=usr/lib/libmt_p.a
 OLD_FILES+=usr/lib/libncurses_p.a
 OLD_FILES+=usr/lib/libncursesw_p.a
 OLD_FILES+=usr/lib/libnetgraph_p.a
 OLD_FILES+=usr/lib/libnetmap_p.a
 OLD_FILES+=usr/lib/libnv_p.a
 OLD_FILES+=usr/lib/libnvpair_p.a
 OLD_FILES+=usr/lib/libopencsd_p.a
 OLD_FILES+=usr/lib/libopie_p.a
 OLD_FILES+=usr/lib/libpanel_p.a
 OLD_FILES+=usr/lib/libpanelw_p.a
 OLD_FILES+=usr/lib/libpathconv_p.a
 OLD_FILES+=usr/lib/libpcap_p.a
 OLD_FILES+=usr/lib/libpjdlog_p.a
 OLD_FILES+=usr/lib/libpmc_p.a
 OLD_FILES+=usr/lib/libprivateatf-c++_p.a
 OLD_FILES+=usr/lib/libprivateatf-c_p.a
 OLD_FILES+=usr/lib/libprivateauditd_p.a
 OLD_FILES+=usr/lib/libprivatebsdstat_p.a
 OLD_FILES+=usr/lib/libprivatecbor_p.a
 OLD_FILES+=usr/lib/libprivatedevdctl_p.a
 OLD_FILES+=usr/lib/libprivateevent_p.a
 OLD_FILES+=usr/lib/libprivateevent1_p.a
 OLD_FILES+=usr/lib/libprivatefido2_p.a
 OLD_FILES+=usr/lib/libprivategmock_main_p.a
 OLD_FILES+=usr/lib/libprivategmock_p.a
 OLD_FILES+=usr/lib/libprivategtest_main_p.a
 OLD_FILES+=usr/lib/libprivategtest_p.a
 OLD_FILES+=usr/lib/libprivateheimipcc_p.a
 OLD_FILES+=usr/lib/libprivateheimipcs_p.a
 OLD_FILES+=usr/lib/libprivateifconfig_p.a
 OLD_FILES+=usr/lib/libprivateldns_p.a
 OLD_FILES+=usr/lib/libprivatesqlite3_p.a
 OLD_FILES+=usr/lib/libprivatessh_p.a
 OLD_FILES+=usr/lib/libprivateucl_p.a
 OLD_FILES+=usr/lib/libprivateunbound_p.a
 OLD_FILES+=usr/lib/libprivatezstd_p.a
 OLD_FILES+=usr/lib/libproc_p.a
 OLD_FILES+=usr/lib/libprocstat_p.a
 OLD_FILES+=usr/lib/libpthread_p.a
 OLD_FILES+=usr/lib/libradius_p.a
 OLD_FILES+=usr/lib/libregex_p.a
 OLD_FILES+=usr/lib/libroken_p.a
 OLD_FILES+=usr/lib/librpcsvc_p.a
 OLD_FILES+=usr/lib/librss_p.a
 OLD_FILES+=usr/lib/librt_p.a
 OLD_FILES+=usr/lib/librtld_db_p.a
 OLD_FILES+=usr/lib/libsbuf_p.a
 OLD_FILES+=usr/lib/libsdp_p.a
 OLD_FILES+=usr/lib/libsmb_p.a
 OLD_FILES+=usr/lib/libspl_p.a
 OLD_FILES+=usr/lib/libssl_p.a
 OLD_FILES+=usr/lib/libstats_p.a
 OLD_FILES+=usr/lib/libstdbuf_p.a
 OLD_FILES+=usr/lib/libstdc++_p.a
 OLD_FILES+=usr/lib/libstdthreads_p.a
 OLD_FILES+=usr/lib/libsupc++_p.a
 OLD_FILES+=usr/lib/libsysdecode_p.a
 OLD_FILES+=usr/lib/libtacplus_p.a
 OLD_FILES+=usr/lib/libtermcap_p.a
 OLD_FILES+=usr/lib/libtermcapw_p.a
 OLD_FILES+=usr/lib/libtermlib_p.a
 OLD_FILES+=usr/lib/libtermlibw_p.a
 OLD_FILES+=usr/lib/libthr_p.a
 OLD_FILES+=usr/lib/libthread_db_p.a
 OLD_FILES+=usr/lib/libtinfo_p.a
 OLD_FILES+=usr/lib/libtinfow_p.a
 OLD_FILES+=usr/lib/libtpool_p.a
 OLD_FILES+=usr/lib/libufs_p.a
 OLD_FILES+=usr/lib/libugidfw_p.a
 OLD_FILES+=usr/lib/libulog_p.a
 OLD_FILES+=usr/lib/libumem_p.a
 OLD_FILES+=usr/lib/libusb_p.a
 OLD_FILES+=usr/lib/libusbhid_p.a
 OLD_FILES+=usr/lib/libutempter_p.a
 OLD_FILES+=usr/lib/libutil_p.a
 OLD_FILES+=usr/lib/libuutil_p.a
 OLD_FILES+=usr/lib/libvgl_p.a
 OLD_FILES+=usr/lib/libvmmapi_p.a
 OLD_FILES+=usr/lib/libwind_p.a
 OLD_FILES+=usr/lib/libwrap_p.a
 OLD_FILES+=usr/lib/libxo_p.a
 OLD_FILES+=usr/lib/liby_p.a
 OLD_FILES+=usr/lib/libypclnt_p.a
 OLD_FILES+=usr/lib/libz_p.a
 OLD_FILES+=usr/lib/libzfs_core_p.a
 OLD_FILES+=usr/lib/libzfs_p.a
 OLD_FILES+=usr/lib/libzfsbootenv_p.a
 OLD_FILES+=usr/lib/libzutil_p.a
 .endif
 
 .if ${MK_QUOTAS} == no
 OLD_FILES+=sbin/quotacheck
 OLD_FILES+=usr/bin/quota
 OLD_FILES+=usr/sbin/edquota
 OLD_FILES+=usr/sbin/quotaoff
 OLD_FILES+=usr/sbin/quotaon
 OLD_FILES+=usr/sbin/repquota
 OLD_FILES+=usr/share/man/man1/quota.1.gz
 OLD_FILES+=usr/share/man/man8/edquota.8.gz
 OLD_FILES+=usr/share/man/man8/quotacheck.8.gz
 OLD_FILES+=usr/share/man/man8/quotaoff.8.gz
 OLD_FILES+=usr/share/man/man8/quotaon.8.gz
 OLD_FILES+=usr/share/man/man8/repquota.8.gz
 .endif
 
 .if ${MK_RADIUS_SUPPORT} == no
 OLD_FILES+=usr/lib/libradius.a
 OLD_FILES+=usr/lib/libradius.so
 OLD_LIBS+=usr/lib/libradius.so.4
 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/include/radlib.h
 OLD_FILES+=usr/include/radlib_vs.h
 OLD_FILES+=usr/share/man/man3/libradius.3.gz
 OLD_FILES+=usr/share/man/man3/rad_acct_open.3.gz
 OLD_FILES+=usr/share/man/man3/rad_add_server.3.gz
 OLD_FILES+=usr/share/man/man3/rad_add_server_ex.3.gz
 OLD_FILES+=usr/share/man/man3/rad_auth_open.3.gz
 OLD_FILES+=usr/share/man/man3/rad_bind_to.3.gz
 OLD_FILES+=usr/share/man/man3/rad_close.3.gz
 OLD_FILES+=usr/share/man/man3/rad_config.3.gz
 OLD_FILES+=usr/share/man/man3/rad_continue_send_request.3.gz
 OLD_FILES+=usr/share/man/man3/rad_create_request.3.gz
 OLD_FILES+=usr/share/man/man3/rad_create_response.3.gz
 OLD_FILES+=usr/share/man/man3/rad_cvt_addr.3.gz
 OLD_FILES+=usr/share/man/man3/rad_cvt_int.3.gz
 OLD_FILES+=usr/share/man/man3/rad_cvt_string.3.gz
 OLD_FILES+=usr/share/man/man3/rad_demangle.3.gz
 OLD_FILES+=usr/share/man/man3/rad_demangle_mppe_key.3.gz
 OLD_FILES+=usr/share/man/man3/rad_get_attr.3.gz
 OLD_FILES+=usr/share/man/man3/rad_get_vendor_attr.3.gz
 OLD_FILES+=usr/share/man/man3/rad_init_send_request.3.gz
 OLD_FILES+=usr/share/man/man3/rad_put_addr.3.gz
 OLD_FILES+=usr/share/man/man3/rad_put_attr.3.gz
 OLD_FILES+=usr/share/man/man3/rad_put_int.3.gz
 OLD_FILES+=usr/share/man/man3/rad_put_message_authentic.3.gz
 OLD_FILES+=usr/share/man/man3/rad_put_string.3.gz
 OLD_FILES+=usr/share/man/man3/rad_put_vendor_addr.3.gz
 OLD_FILES+=usr/share/man/man3/rad_put_vendor_attr.3.gz
 OLD_FILES+=usr/share/man/man3/rad_put_vendor_int.3.gz
 OLD_FILES+=usr/share/man/man3/rad_put_vendor_string.3.gz
 OLD_FILES+=usr/share/man/man3/rad_receive_request.3.gz
 OLD_FILES+=usr/share/man/man3/rad_request_authenticator.3.gz
 OLD_FILES+=usr/share/man/man3/rad_send_request.3.gz
 OLD_FILES+=usr/share/man/man3/rad_send_response.3.gz
 OLD_FILES+=usr/share/man/man3/rad_server_open.3.gz
 OLD_FILES+=usr/share/man/man3/rad_server_secret.3.gz
 OLD_FILES+=usr/share/man/man3/rad_strerror.3.gz
 OLD_FILES+=usr/share/man/man5/radius.conf.5.gz
 OLD_FILES+=usr/share/man/man8/pam_radius.8.gz
 .endif
 
 .if ${MK_RBOOTD} == no
 OLD_FILES+=usr/libexec/rbootd
 OLD_FILES+=usr/share/man/man8/rbootd.8.gz
 .endif
 
 .if ${MK_RESCUE} == no
 . if exists(${DESTDIR}${TESTSBASE})
 RESCUE_DIRS!=find ${DESTDIR}/rescue -type d 2>/dev/null | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_DIRS+=${RESCUE_DIRS}
 RESCUE_FILES!=find ${DESTDIR}/rescue \! -type d 2>/dev/null | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_FILES+=${RESCUE_FILES}
 . endif
 .endif
 
 .if ${MK_ROUTED} == no
 OLD_FILES+=etc/rc.d/routed
 OLD_FILES+=rescue/routed
 OLD_FILES+=rescue/rtquery
 OLD_FILES+=sbin/routed
 OLD_FILES+=sbin/rtquery
 OLD_FILES+=usr/share/man/man8/routed.8.gz
 OLD_FILES+=usr/share/man/man8/rtquery.8.gz
 .endif
 
 .if ${MK_SENDMAIL} == no
 OLD_FILES+=etc/mtree/BSD.sendmail.dist
 OLD_FILES+=etc/newsyslog.conf.d/sendmail.conf
 OLD_FILES+=etc/periodic/daily/150.clean-hoststat
 OLD_FILES+=etc/periodic/daily/440.status-mailq
 OLD_FILES+=etc/periodic/daily/460.status-mail-rejects
 OLD_FILES+=etc/periodic/daily/500.queuerun
 OLD_FILES+=etc/rc.d/sendmail
 .if ${MK_MAILWRAPPER} == no
 OLD_FILES+=bin/rmail
 .endif
 OLD_FILES+=usr/bin/vacation
 OLD_FILES+=usr/include/libmilter/mfapi.h
 OLD_FILES+=usr/include/libmilter/mfdef.h
 OLD_DIRS+=usr/include/libmilter
 OLD_FILES+=usr/lib/libmilter.a
 OLD_FILES+=usr/lib/libmilter.so
 OLD_LIBS+=usr/lib/libmilter.so.5
 OLD_FILES+=usr/lib/libmilter_p.a
 OLD_FILES+=usr/libexec/mail.local
 OLD_FILES+=usr/libexec/sendmail/sendmail
 OLD_FILES+=usr/libexec/smrsh
 OLD_FILES+=usr/sbin/editmap
 OLD_FILES+=usr/sbin/mailstats
 OLD_FILES+=usr/sbin/makemap
 OLD_FILES+=usr/sbin/praliases
 OLD_FILES+=usr/share/doc/smm/08.sendmailop/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/08.sendmailop
 OLD_FILES+=usr/share/examples/sendmail/mailer.conf
 OLD_DIRS+=usr/share/examples/sendmail
 OLD_FILES+=usr/share/man/man1/mailq.1.gz
 OLD_FILES+=usr/share/man/man1/newaliases.1.gz
 OLD_FILES+=usr/share/man/man1/vacation.1.gz
 OLD_FILES+=usr/share/man/man5/aliases.5.gz
 OLD_FILES+=usr/share/man/man8/editmap.8.gz
 OLD_FILES+=usr/share/man/man8/hoststat.8.gz
 OLD_FILES+=usr/share/man/man8/mail.local.8.gz
 OLD_FILES+=usr/share/man/man8/mailstats.8.gz
 OLD_FILES+=usr/share/man/man8/makemap.8.gz
 OLD_FILES+=usr/share/man/man8/praliases.8.gz
 OLD_FILES+=usr/share/man/man8/purgestat.8.gz
 OLD_FILES+=usr/share/man/man8/rmail.8.gz
 OLD_FILES+=usr/share/man/man8/sendmail.8.gz
 OLD_FILES+=usr/share/man/man8/smrsh.8.gz
 OLD_FILES+=usr/share/sendmail/cf/README
 OLD_FILES+=usr/share/sendmail/cf/cf/Makefile
 OLD_FILES+=usr/share/sendmail/cf/cf/README
 OLD_FILES+=usr/share/sendmail/cf/cf/chez.cs.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/clientproto.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/cs-hpux10.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/cs-hpux9.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/cs-osf1.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/cs-solaris2.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/cs-sunos4.1.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/cs-ultrix4.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/cyrusproto.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-bsd4.4.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-hpux10.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-hpux9.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-linux.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-mpeix.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-nextstep3.3.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-osf1.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-solaris.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-sunos4.1.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-ultrix4.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/huginn.cs.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/knecht.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/mail.cs.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/mail.eecs.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/mailspool.cs.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/python.cs.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/s2k-osf1.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/s2k-ultrix4.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/submit.cf
 OLD_FILES+=usr/share/sendmail/cf/cf/submit.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/tcpproto.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/ucbarpa.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/ucbvax.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/uucpproto.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/vangogh.cs.mc
 OLD_DIRS+=usr/share/sendmail/cf/cf
 OLD_FILES+=usr/share/sendmail/cf/domain/Berkeley.EDU.m4
 OLD_FILES+=usr/share/sendmail/cf/domain/CS.Berkeley.EDU.m4
 OLD_FILES+=usr/share/sendmail/cf/domain/EECS.Berkeley.EDU.m4
 OLD_FILES+=usr/share/sendmail/cf/domain/S2K.Berkeley.EDU.m4
 OLD_FILES+=usr/share/sendmail/cf/domain/berkeley-only.m4
 OLD_FILES+=usr/share/sendmail/cf/domain/generic.m4
 OLD_DIRS+=usr/share/sendmail/cf/domain
 OLD_FILES+=usr/share/sendmail/cf/feature/accept_unqualified_senders.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/accept_unresolvable_domains.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/access_db.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/allmasquerade.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/always_add_domain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/authinfo.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/blocklist_recipients.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/badmx.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/bcc.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/bestmx_is_local.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/bitdomain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/blacklist_recipients.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/block_bad_helo.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/check_other.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/check_cert_altnames.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/check_other.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/compat_check.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/conncontrol.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/delay_checks.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/dnsbl.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/domaintable.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/enhdnsbl.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/generics_entire_domain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/genericstable.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/greet_pause.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/ldap_routing.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/limited_masquerade.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/local_lmtp.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/local_no_masquerade.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/local_procmail.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/lookupdotdomain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/loose_relay_check.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/mailertable.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/masquerade_entire_domain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/masquerade_envelope.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/msp.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/mtamark.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/no_default_msa.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/nocanonify.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/nopercenthack.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/notsticky.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/nouucp.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/nullclient.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/prefixmod.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/preserve_local_plus_detail.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/preserve_luser_host.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/promiscuous_relay.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/queuegroup.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/ratecontrol.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/redirect.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/relay_based_on_MX.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/relay_entire_domain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/relay_hosts_only.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/relay_local_from.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/relay_mail_from.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/require_rdns.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/smrsh.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/stickyhost.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/sts.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/tls_failures.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/tls_session_features.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/use_client_ptr.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/use_ct_file.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/use_cw_file.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/uucpdomain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/virtuser_entire_domain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/virtusertable.m4
 OLD_DIRS+=usr/share/sendmail/cf/feature
 OLD_FILES+=usr/share/sendmail/cf/hack/cssubdomain.m4
 OLD_FILES+=usr/share/sendmail/cf/hack/xconnect.m4
 OLD_DIRS+=usr/share/sendmail/cf/hack
 OLD_FILES+=usr/share/sendmail/cf/m4/cf.m4
 OLD_FILES+=usr/share/sendmail/cf/m4/cfhead.m4
 OLD_FILES+=usr/share/sendmail/cf/m4/proto.m4
 OLD_FILES+=usr/share/sendmail/cf/m4/version.m4
 OLD_DIRS+=usr/share/sendmail/cf/m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/cyrus.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/cyrusv2.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/fax.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/local.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/mail11.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/phquery.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/pop.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/procmail.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/qpage.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/smtp.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/usenet.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/uucp.m4
 OLD_DIRS+=usr/share/sendmail/cf/mailer
 OLD_FILES+=usr/share/sendmail/cf/ostype/a-ux.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/aix3.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/aix4.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/aix5.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/altos.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/amdahl-uts.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/bsd4.3.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/bsd4.4.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/bsdi.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/bsdi1.0.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/bsdi2.0.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/darwin.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/dgux.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/domainos.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/dragonfly.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/dynix3.2.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/freebsd4.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/freebsd5.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/freebsd6.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/gnu.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/hpux10.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/hpux11.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/hpux9.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/irix4.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/irix5.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/irix6.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/isc4.1.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/linux.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/maxion.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/mklinux.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/mpeix.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/nextstep.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/openbsd.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/osf1.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/powerux.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/ptx2.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/qnx.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/riscos4.5.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/sco-uw-2.1.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/sco3.2.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/sinix.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/solaris11.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/solaris2.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/solaris2.ml.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/solaris2.pre5.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/solaris8.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/sunos3.5.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/sunos4.1.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/svr4.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/ultrix4.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/unicos.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/unicosmk.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/unicosmp.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/unixware7.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/unknown.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/uxpds.m4
 OLD_DIRS+=usr/share/sendmail/cf/ostype
 OLD_FILES+=usr/share/sendmail/cf/sendmail.schema
 OLD_FILES+=usr/share/sendmail/cf/sh/makeinfo.sh
 OLD_DIRS+=usr/share/sendmail/cf/sh
 OLD_FILES+=usr/share/sendmail/cf/siteconfig/uucp.cogsci.m4
 OLD_FILES+=usr/share/sendmail/cf/siteconfig/uucp.old.arpa.m4
 OLD_FILES+=usr/share/sendmail/cf/siteconfig/uucp.ucbarpa.m4
 OLD_FILES+=usr/share/sendmail/cf/siteconfig/uucp.ucbvax.m4
 OLD_DIRS+=usr/share/sendmail/cf/siteconfig
 OLD_DIRS+=usr/share/sendmail/cf
 OLD_DIRS+=usr/share/sendmail
 OLD_DIRS+=var/spool/clientmqueue
 .endif
 
 .if ${MK_SERVICESDB} == no
 OLD_FILES+=var/db/services.db
 .endif
 
 .if ${MK_SHAREDOCS} == no
 OLD_FILES+=usr/share/doc/pjdfstest/README
 OLD_DIRS+=usr/share/doc/pjdfstest
 .endif
 
 .if ${MK_SYSCONS} == no
 OLD_FILES+=usr/share/syscons/fonts/INDEX.fonts
 OLD_FILES+=usr/share/syscons/fonts/armscii8-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/armscii8-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/armscii8-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp1251-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp1251-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp1251-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp437-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp437-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp437-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp437-thin-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp437-thin-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp850-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp850-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp850-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp850-thin-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp850-thin-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp865-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp865-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp865-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp865-thin-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp865-thin-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp866-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp866-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp866-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp866b-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp866c-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp866u-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp866u-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp866u-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/haik8-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/haik8-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/haik8-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso-thin-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso02-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso02-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso02-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso04-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso04-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso04-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-wide-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso04-wide-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso05-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso05-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso05-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso07-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso07-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso07-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso08-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso08-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso08-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso09-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso15-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso15-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso15-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso15-thin-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/koi8-r-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/koi8-r-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/koi8-r-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/koi8-rb-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/koi8-rc-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/koi8-u-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/koi8-u-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/koi8-u-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/swiss-1131-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/swiss-1251-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/swiss-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/swiss-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/swiss-8x8.fnt
 OLD_FILES+=usr/share/syscons/keymaps/INDEX.keymaps
 OLD_FILES+=usr/share/syscons/keymaps/be.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/be.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/bg.bds.ctrlcaps.kbd
 OLD_FILES+=usr/share/syscons/keymaps/bg.phonetic.ctrlcaps.kbd
 OLD_FILES+=usr/share/syscons/keymaps/br275.cp850.kbd
 OLD_FILES+=usr/share/syscons/keymaps/br275.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/br275.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/by.cp1131.kbd
 OLD_FILES+=usr/share/syscons/keymaps/by.cp1251.kbd
 OLD_FILES+=usr/share/syscons/keymaps/by.iso5.kbd
 OLD_FILES+=usr/share/syscons/keymaps/ce.iso2.kbd
 OLD_FILES+=usr/share/syscons/keymaps/colemak-dh.iso15.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/colemak.iso15.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/cs.latin2.qwertz.kbd
 OLD_FILES+=usr/share/syscons/keymaps/cz.iso2.kbd
 OLD_FILES+=usr/share/syscons/keymaps/danish.cp865.kbd
 OLD_FILES+=usr/share/syscons/keymaps/danish.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/danish.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/danish.iso.macbook.kbd
 OLD_FILES+=usr/share/syscons/keymaps/dutch.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/eee_nordic.kbd
 OLD_FILES+=usr/share/syscons/keymaps/el.iso07.kbd
 OLD_FILES+=usr/share/syscons/keymaps/estonian.cp850.kbd
 OLD_FILES+=usr/share/syscons/keymaps/estonian.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/estonian.iso15.kbd
 OLD_FILES+=usr/share/syscons/keymaps/finnish.cp850.kbd
 OLD_FILES+=usr/share/syscons/keymaps/finnish.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/fr.dvorak.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/fr.dvorak.kbd
 OLD_FILES+=usr/share/syscons/keymaps/fr.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/fr.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/fr.macbook.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/fr_CA.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/german.cp850.kbd
 OLD_FILES+=usr/share/syscons/keymaps/german.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/german.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/gr.elot.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/gr.us101.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/hr.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/hu.iso2.101keys.kbd
 OLD_FILES+=usr/share/syscons/keymaps/hu.iso2.102keys.kbd
 OLD_FILES+=usr/share/syscons/keymaps/hy.armscii-8.kbd
 OLD_FILES+=usr/share/syscons/keymaps/icelandic.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/icelandic.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/it.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/iw.iso8.kbd
 OLD_FILES+=usr/share/syscons/keymaps/jp.106.kbd
 OLD_FILES+=usr/share/syscons/keymaps/jp.106x.kbd
 OLD_FILES+=usr/share/syscons/keymaps/kk.pt154.io.kbd
 OLD_FILES+=usr/share/syscons/keymaps/kk.pt154.kst.kbd
 OLD_FILES+=usr/share/syscons/keymaps/latinamerican.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/latinamerican.kbd
 OLD_FILES+=usr/share/syscons/keymaps/lt.iso4.kbd
 OLD_FILES+=usr/share/syscons/keymaps/norwegian.dvorak.kbd
 OLD_FILES+=usr/share/syscons/keymaps/norwegian.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/pl_PL.ISO8859-2.kbd
 OLD_FILES+=usr/share/syscons/keymaps/pl_PL.dvorak.kbd
 OLD_FILES+=usr/share/syscons/keymaps/pt.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/pt.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/ru.cp866.kbd
 OLD_FILES+=usr/share/syscons/keymaps/ru.iso5.kbd
 OLD_FILES+=usr/share/syscons/keymaps/ru.koi8-r.kbd
 OLD_FILES+=usr/share/syscons/keymaps/ru.koi8-r.shift.kbd
 OLD_FILES+=usr/share/syscons/keymaps/ru.koi8-r.win.kbd
 OLD_FILES+=usr/share/syscons/keymaps/si.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/sk.iso2.kbd
 OLD_FILES+=usr/share/syscons/keymaps/spanish.dvorak.kbd
 OLD_FILES+=usr/share/syscons/keymaps/spanish.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/spanish.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/spanish.iso15.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/swedish.cp850.kbd
 OLD_FILES+=usr/share/syscons/keymaps/swedish.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/swissfrench.cp850.kbd
 OLD_FILES+=usr/share/syscons/keymaps/swissfrench.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/swissfrench.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/swissgerman.cp850.kbd
 OLD_FILES+=usr/share/syscons/keymaps/swissgerman.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/swissgerman.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/swissgerman.macbook.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/tr.iso9.q.kbd
 OLD_FILES+=usr/share/syscons/keymaps/ua.iso5.kbd
 OLD_FILES+=usr/share/syscons/keymaps/ua.koi8-u.kbd
 OLD_FILES+=usr/share/syscons/keymaps/ua.koi8-u.shift.alt.kbd
 OLD_FILES+=usr/share/syscons/keymaps/uk.cp850-ctrl.kbd
 OLD_FILES+=usr/share/syscons/keymaps/uk.cp850.kbd
 OLD_FILES+=usr/share/syscons/keymaps/uk.dvorak.kbd
 OLD_FILES+=usr/share/syscons/keymaps/uk.iso-ctrl.kbd
 OLD_FILES+=usr/share/syscons/keymaps/uk.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/us.dvorak.kbd
 OLD_FILES+=usr/share/syscons/keymaps/us.dvorakl.kbd
 OLD_FILES+=usr/share/syscons/keymaps/us.dvorakp.kbd
 OLD_FILES+=usr/share/syscons/keymaps/us.dvorakr.kbd
 OLD_FILES+=usr/share/syscons/keymaps/us.dvorakx.kbd
 OLD_FILES+=usr/share/syscons/keymaps/us.emacs.kbd
 OLD_FILES+=usr/share/syscons/keymaps/us.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/us.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/us.iso.macbook.kbd
 OLD_FILES+=usr/share/syscons/keymaps/us.pc-ctrl.kbd
 OLD_FILES+=usr/share/syscons/keymaps/us.unix.kbd
 OLD_FILES+=usr/share/syscons/scrnmaps/armscii8-2haik8.scm
 OLD_FILES+=usr/share/syscons/scrnmaps/iso-8859-1_to_cp437.scm
 OLD_FILES+=usr/share/syscons/scrnmaps/iso-8859-4_for_vga9.scm
 OLD_FILES+=usr/share/syscons/scrnmaps/iso-8859-7_to_cp437.scm
 OLD_FILES+=usr/share/syscons/scrnmaps/koi8-r2cp866.scm
 OLD_FILES+=usr/share/syscons/scrnmaps/koi8-u2cp866u.scm
 OLD_FILES+=usr/share/syscons/scrnmaps/us-ascii_to_cp437.scm
 OLD_DIRS+=usr/share/syscons/fonts
 OLD_DIRS+=usr/share/syscons/scrnmaps
 OLD_DIRS+=usr/share/syscons/keymaps
 OLD_DIRS+=usr/share/syscons
 .endif
 
 .if ${MK_TALK} == no
 OLD_FILES+=usr/bin/talk
 OLD_FILES+=usr/libexec/ntalkd
 OLD_FILES+=usr/share/man/man1/talk.1.gz
 OLD_FILES+=usr/share/man/man8/talkd.8.gz
 .endif
 
 .if ${MK_TCSH} == no
 OLD_FILES+=.cshrc
 OLD_FILES+=etc/csh.cshrc
 OLD_FILES+=etc/csh.login
 OLD_FILES+=etc/csh.logout
 OLD_FILES+=bin/csh
 OLD_FILES+=bin/tcsh
 OLD_FILES+=rescue/csh
 OLD_FILES+=rescue/tcsh
 OLD_FILES+=root/.cshrc
 OLD_FILES+=root/.login
 OLD_FILES+=usr/share/examples/etc/csh.cshrc
 OLD_FILES+=usr/share/examples/etc/csh.login
 OLD_FILES+=usr/share/examples/etc/csh.logout
 OLD_FILES+=usr/share/examples/tcsh/complete.tcsh
 OLD_FILES+=usr/share/examples/tcsh/csh-mode.el
 OLD_DIRS+=usr/share/examples/tcsh
 OLD_FILES+=usr/share/man/man1/csh.1.gz
 OLD_FILES+=usr/share/man/man1/tcsh.1.gz
 OLD_FILES+=usr/share/nls/de_AT.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/de_AT.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/de_AT.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/de_CH.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/de_CH.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/de_CH.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/de_DE.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/de_DE.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/de_DE.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/el_GR.ISO8859-7/tcsh.cat
 OLD_FILES+=usr/share/nls/el_GR.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/es_ES.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/es_ES.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/es_ES.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/et_EE.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/et_EE.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fi_FI.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/fi_FI.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/fi_FI.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_BE.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_BE.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_BE.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CA.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CA.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CA.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CH.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CH.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CH.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_FR.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_FR.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_FR.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/it_CH.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/it_CH.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/it_CH.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/it_IT.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/it_IT.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/it_IT.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/ja_JP.SJIS/tcsh.cat
 OLD_FILES+=usr/share/nls/ja_JP.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/ja_JP.eucJP/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.CP1251/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.CP866/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.ISO8859-5/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/uk_UA.ISO8859-5/tcsh.cat
 OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/tcsh.cat
 OLD_FILES+=usr/share/nls/uk_UA.UTF-8/tcsh.cat
 .endif
 
 .if ${MK_TELNET} == no
 OLD_FILES+=usr/bin/telnet
 OLD_FILES+=usr/share/man/man1/telnet.1.gz
 .endif
 
 .if ${MK_TESTS} == yes
 OLD_FILES+=usr/bin/atf-sh
 OLD_FILES+=usr/include/atf-c++/config.hpp
 OLD_FILES+=usr/include/atf-c/config.h
 OLD_FILES+=usr/lib/libatf-c++.a
 OLD_FILES+=usr/lib/libatf-c++.so
 OLD_LIBS+=usr/lib/libatf-c++.so.1
 OLD_LIBS+=usr/lib/libatf-c++.so.2
 OLD_FILES+=usr/lib/libatf-c++_p.a
 OLD_FILES+=usr/lib/libatf-c.a
 OLD_FILES+=usr/lib/libatf-c.so
 OLD_LIBS+=usr/lib/libatf-c.so.1
 OLD_FILES+=usr/lib/libatf-c_p.a
 OLD_LIBS+=usr/lib/libprivateatf-c.so.0
 OLD_LIBS+=usr/lib/libprivateatf-c++.so.1
 OLD_FILES+=usr/libdata/pkgconfig/atf-c++.pc
 OLD_FILES+=usr/libdata/pkgconfig/atf-c.pc
 OLD_FILES+=usr/libdata/pkgconfig/atf-sh.pc
 OLD_FILES+=usr/share/aclocal/atf-c++.m4
 OLD_FILES+=usr/share/aclocal/atf-c.m4
 OLD_FILES+=usr/share/aclocal/atf-common.m4
 OLD_FILES+=usr/share/aclocal/atf-sh.m4
 OLD_DIRS+=usr/share/aclocal
 OLD_DIRS+=usr/tests/bin/chown
 OLD_FILES+=usr/tests/bin/chown/Kyuafile
 OLD_FILES+=usr/tests/bin/chown/chown-f_test
 OLD_FILES+=usr/tests/bin/chown/units_basics
 OLD_FILES+=usr/tests/bin/date/legacy_test
 OLD_FILES+=usr/tests/bin/sh/legacy_test
 OLD_FILES+=usr/tests/usr.bin/atf/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/atf_check_test
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/config_test
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/integration_test
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/misc_helpers
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/normalize_test
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/tc_test
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/tp_test
 OLD_DIRS+=usr/tests/usr.bin/atf/atf-sh
 OLD_DIRS+=usr/tests/usr.bin/atf
 OLD_FILES+=usr/tests/lib/atf/libatf-c/test_helpers_test
 OLD_FILES+=usr/tests/lib/atf/test-programs/fork_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/application_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/config_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/expand_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/parser_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/sanity_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/ui_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/env_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/exceptions_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/expand_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/fs_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/parser_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/process_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/sanity_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/pkg_config_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/text_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/ui_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/config_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/dynstr_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/env_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/fs_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/list_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/map_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/pkg_config_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/process_helpers
 OLD_FILES+=usr/tests/lib/atf/libatf-c/process_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/sanity_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/text_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/user_test
 .if ${MK_MAKE} == yes
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/libtest.a
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/libtest.a
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/libtest.a
 OLD_FILES+=usr/tests/usr.bin/make/archives/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/basic/t0/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/basic/t0/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/basic/t0/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t0/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t0/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/basic/t1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/basic/t1/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/basic/t1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t2/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/basic/t2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/basic/t2/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/basic/t2/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t2/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t2/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t3/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/basic/t3/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/basic/t3/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t3/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t3/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/empty/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/execution/empty/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/execution/empty/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/execution/empty/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/empty/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/empty/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/plus/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/execution/plus/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/execution/plus/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/execution/plus/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/plus/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/plus/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/sh
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/sh
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/sh
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/shell
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/shell
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/TEST1.a
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/TEST1.a
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/TEST2.a
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/TEST1.a
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/TEST2.a
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.4
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.5
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.4
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.5
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.4
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.5
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/mk/sys.mk
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/mk/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/cleanup
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/mk/sys.mk
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/mk/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/cleanup
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/mk/sys.mk
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/mk/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/variables/t0/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/variables/t0/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/variables/t0/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/variables/t0/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/t0/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/t0/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/common.sh
 OLD_FILES+=usr/tests/usr.bin/make/test-new.mk
 OLD_DIRS+=usr/tests/usr.bin/make/variables/t0
 OLD_DIRS+=usr/tests/usr.bin/make/variables/opt_V
 OLD_DIRS+=usr/tests/usr.bin/make/variables/modifier_t
 OLD_DIRS+=usr/tests/usr.bin/make/variables/modifier_M
 OLD_DIRS+=usr/tests/usr.bin/make/variables
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2/mk
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2/2/1
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2/2
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1/mk
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1/2/1
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1/2
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0/mk
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0/2/1
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0/2
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk
 OLD_DIRS+=usr/tests/usr.bin/make/syntax/semi
 OLD_DIRS+=usr/tests/usr.bin/make/syntax/funny-targets
 OLD_DIRS+=usr/tests/usr.bin/make/syntax/enl
 OLD_DIRS+=usr/tests/usr.bin/make/syntax/directive-t0
 OLD_DIRS+=usr/tests/usr.bin/make/syntax
 OLD_DIRS+=usr/tests/usr.bin/make/suffixes/src_wild2
 OLD_DIRS+=usr/tests/usr.bin/make/suffixes/src_wild1
 OLD_DIRS+=usr/tests/usr.bin/make/suffixes/basic
 OLD_DIRS+=usr/tests/usr.bin/make/suffixes
 OLD_DIRS+=usr/tests/usr.bin/make/shell/select
 OLD_DIRS+=usr/tests/usr.bin/make/shell/replace
 OLD_DIRS+=usr/tests/usr.bin/make/shell/path_select
 OLD_DIRS+=usr/tests/usr.bin/make/shell/path
 OLD_DIRS+=usr/tests/usr.bin/make/shell/meta
 OLD_DIRS+=usr/tests/usr.bin/make/shell/builtin
 OLD_DIRS+=usr/tests/usr.bin/make/shell
 OLD_DIRS+=usr/tests/usr.bin/make/execution/plus
 OLD_DIRS+=usr/tests/usr.bin/make/execution/joberr
 OLD_DIRS+=usr/tests/usr.bin/make/execution/empty
 OLD_DIRS+=usr/tests/usr.bin/make/execution/ellipsis
 OLD_DIRS+=usr/tests/usr.bin/make/execution
 OLD_DIRS+=usr/tests/usr.bin/make/basic/t3
 OLD_DIRS+=usr/tests/usr.bin/make/basic/t2
 OLD_DIRS+=usr/tests/usr.bin/make/basic/t1
 OLD_DIRS+=usr/tests/usr.bin/make/basic/t0
 OLD_DIRS+=usr/tests/usr.bin/make/basic
 OLD_DIRS+=usr/tests/usr.bin/make/archives/fmt_oldbsd
 OLD_DIRS+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod
 OLD_DIRS+=usr/tests/usr.bin/make/archives/fmt_44bsd
 OLD_DIRS+=usr/tests/usr.bin/make/archives
 OLD_DIRS+=usr/tests/usr.bin/make
 OLD_FILES+=usr/tests/usr.bin/yacc/legacy_test
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.00.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.01.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.02.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.03.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.04.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.05.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.06.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.07.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.08.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.09.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.10.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.11.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.12.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.13.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.14.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.sh
 OLD_FILES+=usr/tests/usr.bin/yacc/undefined.y
 .endif
 .else
 # ATF libraries.
 OLD_FILES+=etc/mtree/BSD.tests.dist
 OLD_FILES+=usr/bin/atf-sh
 OLD_DIRS+=usr/include/atf-c
 OLD_FILES+=usr/include/atf-c/build.h
 OLD_FILES+=usr/include/atf-c/check.h
 OLD_FILES+=usr/include/atf-c/config.h
 OLD_FILES+=usr/include/atf-c/defs.h
 OLD_FILES+=usr/include/atf-c/error.h
 OLD_FILES+=usr/include/atf-c/error_fwd.h
 OLD_FILES+=usr/include/atf-c/macros.h
 OLD_FILES+=usr/include/atf-c/tc.h
 OLD_FILES+=usr/include/atf-c/tp.h
 OLD_FILES+=usr/include/atf-c/utils.h
 OLD_FILES+=usr/include/atf-c.h
 OLD_DIRS+=usr/include/atf-c++
 OLD_FILES+=usr/include/atf-c++/build.hpp
 OLD_FILES+=usr/include/atf-c++/check.hpp
 OLD_FILES+=usr/include/atf-c++/config.hpp
 OLD_FILES+=usr/include/atf-c++/macros.hpp
 OLD_FILES+=usr/include/atf-c++/tests.hpp
 OLD_FILES+=usr/include/atf-c++/utils.hpp
 OLD_FILES+=usr/include/atf-c++.hpp
 OLD_FILES+=usr/lib/libatf-c_p.a
 OLD_FILES+=usr/lib/libatf-c.so.1
 OLD_FILES+=usr/lib/libatf-c.so
 OLD_FILES+=usr/lib/libatf-c++.a
 OLD_FILES+=usr/lib/libatf-c++_p.a
 OLD_FILES+=usr/lib/libatf-c++.so.1
 OLD_FILES+=usr/lib/libatf-c++.so
 OLD_FILES+=usr/lib/libatf-c.a
 OLD_FILES+=usr/libexec/atf-check
 OLD_FILES+=usr/libexec/atf-sh
 OLD_DIRS+=usr/share/atf
 OLD_FILES+=usr/share/atf/libatf-sh.subr
 OLD_DIRS+=usr/share/doc/atf
 OLD_FILES+=usr/share/doc/atf/AUTHORS
 OLD_FILES+=usr/share/doc/atf/COPYING
 OLD_FILES+=usr/share/doc/atf/NEWS
 OLD_FILES+=usr/share/doc/atf/README
 OLD_FILES+=usr/share/doc/pjdfstest/README
 OLD_FILES+=usr/share/man/man1/atf-check.1.gz
 OLD_FILES+=usr/share/man/man1/atf-sh.1.gz
 OLD_FILES+=usr/share/man/man1/atf-test-program.1.gz
 OLD_FILES+=usr/share/man/man3/atf-c-api.3.gz
 OLD_FILES+=usr/share/man/man3/atf-c++-api.3.gz
 OLD_FILES+=usr/share/man/man3/atf-sh-api.3.gz
 OLD_FILES+=usr/share/man/man3/atf-sh.3.gz
 OLD_FILES+=usr/share/man/man4/atf-test-case.4.gz
 OLD_FILES+=usr/share/man/man7/atf.7.gz
 OLD_FILES+=usr/share/mk/atf.test.mk
 OLD_FILES+=usr/share/mk/plain.test.mk
 OLD_FILES+=usr/share/mk/suite.test.mk
 OLD_FILES+=usr/share/mk/tap.test.mk
 
 # Test suite.
 . if exists(${DESTDIR}${TESTSBASE})
 TESTS_DIRS!=find ${DESTDIR}${TESTSBASE} -type d | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_DIRS+=${TESTS_DIRS}
 TESTS_FILES!=find ${DESTDIR}${TESTSBASE} \! -type d | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_FILES+=${TESTS_FILES}
 . endif
 .endif	# Test suite.
 
 .if ${MK_TESTS_SUPPORT} == no
 OLD_FILES+=usr/bin/kyua
 OLD_FILES+=usr/include/atf-c++.hpp
 OLD_FILES+=usr/include/atf-c++/build.hpp
 OLD_FILES+=usr/include/atf-c++/check.hpp
 OLD_FILES+=usr/include/atf-c++/macros.hpp
 OLD_FILES+=usr/include/atf-c++/tests.hpp
 OLD_FILES+=usr/include/atf-c++/utils.hpp
 OLD_FILES+=usr/include/atf-c.h
 OLD_FILES+=usr/include/atf-c/build.h
 OLD_FILES+=usr/include/atf-c/check.h
 OLD_FILES+=usr/include/atf-c/defs.h
 OLD_FILES+=usr/include/atf-c/error.h
 OLD_FILES+=usr/include/atf-c/error_fwd.h
 OLD_FILES+=usr/include/atf-c/macros.h
 OLD_FILES+=usr/include/atf-c/tc.h
 OLD_FILES+=usr/include/atf-c/tp.h
 OLD_FILES+=usr/include/atf-c/utils.h
 OLD_LIBS+=usr/lib/libprivateatf-c++.so.2
 OLD_LIBS+=usr/lib/libprivateatf-c.so.1
 OLD_FILES+=usr/share/examples/kyua/kyua.conf
 OLD_FILES+=usr/share/examples/kyua/Kyuafile.top
 OLD_FILES+=usr/share/kyua/misc/context.html
 OLD_FILES+=usr/share/kyua/misc/index.html
 OLD_FILES+=usr/share/kyua/misc/report.css
 OLD_FILES+=usr/share/kyua/misc/test_result.html
 OLD_FILES+=usr/share/kyua/store/migrate_v1_v2.sql
 OLD_FILES+=usr/share/kyua/store/migrate_v2_v3.sql
 OLD_FILES+=usr/share/kyua/store/schema_v3.sql
 OLD_FILES+=usr/share/man/man1/kyua-about.1.gz
 OLD_FILES+=usr/share/man/man1/kyua-config.1.gz
 OLD_FILES+=usr/share/man/man1/kyua-db-exec.1.gz
 OLD_FILES+=usr/share/man/man1/kyua-db-migrate.1.gz
 OLD_FILES+=usr/share/man/man1/kyua-debug.1.gz
 OLD_FILES+=usr/share/man/man1/kyua-help.1.gz
 OLD_FILES+=usr/share/man/man1/kyua-list.1.gz
 OLD_FILES+=usr/share/man/man1/kyua-report-html.1.gz
 OLD_FILES+=usr/share/man/man1/kyua-report-junit.1.gz
 OLD_FILES+=usr/share/man/man1/kyua-report.1.gz
 OLD_FILES+=usr/share/man/man1/kyua-test.1.gz
 OLD_FILES+=usr/share/man/man1/kyua.1.gz
 OLD_FILES+=usr/share/man/man3/atf-c++.3.gz
 OLD_FILES+=usr/share/man/man3/atf-c-api++.3.gz
 OLD_FILES+=usr/share/man/man3/atf-c-api.3.gz
 OLD_FILES+=usr/share/man/man3/atf-c.3.gz
 OLD_FILES+=usr/share/man/man5/kyua.conf.5.gz
 OLD_FILES+=usr/share/man/man5/kyuafile.5.gz
 OLD_FILES+=usr/tests/lib/atf/Kyuafile
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/Kyuafile
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/atf_c++_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/build_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/check_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/Kyuafile
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/application_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/env_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/exceptions_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/fs_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/process_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/text_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/version_helper
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/macros_hpp_test.cpp
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/macros_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/tests_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/unused_test.cpp
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/utils_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/Kyuafile
 OLD_FILES+=usr/tests/lib/atf/libatf-c/atf_c_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/build_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/check_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/Kyuafile
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/dynstr_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/env_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/fs_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/list_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/map_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/process_helpers
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/process_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/sanity_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/text_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/user_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/version_helper
 OLD_FILES+=usr/tests/lib/atf/libatf-c/error_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/macros_h_test.c
 OLD_FILES+=usr/tests/lib/atf/libatf-c/macros_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/tc_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/tp_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/unused_test.c
 OLD_FILES+=usr/tests/lib/atf/libatf-c/utils_test
 OLD_FILES+=usr/tests/lib/atf/test-programs/Kyuafile
 OLD_FILES+=usr/tests/lib/atf/test-programs/c_helpers
 OLD_FILES+=usr/tests/lib/atf/test-programs/config_test
 OLD_FILES+=usr/tests/lib/atf/test-programs/cpp_helpers
 OLD_FILES+=usr/tests/lib/atf/test-programs/expect_test
 OLD_FILES+=usr/tests/lib/atf/test-programs/meta_data_test
 OLD_FILES+=usr/tests/lib/atf/test-programs/result_test
 OLD_FILES+=usr/tests/lib/atf/test-programs/sh_helpers
 OLD_FILES+=usr/tests/lib/atf/test-programs/srcdir_test
 .endif
 
 .if ${MK_TEXTPROC} == no
 OLD_FILES+=usr/bin/checknr
 OLD_FILES+=usr/bin/colcrt
 OLD_FILES+=usr/bin/ul
 OLD_FILES+=usr/share/man/man1/checknr.1.gz
 OLD_FILES+=usr/share/man/man1/colcrt.1.gz
 OLD_FILES+=usr/share/man/man1/ul.1.gz
 .endif
 
 .if ${MK_TFTP} == no
 OLD_FILES+=usr/bin/tftp
 OLD_FILES+=usr/libexec/tftpd
 OLD_FILES+=usr/share/man/man1/tftp.1.gz
 OLD_FILES+=usr/share/man/man8/tftpd.8.gz
 .endif
 
 .if ${MK_TOOLCHAIN} == no
 OLD_FILES+=usr/bin/CC
 OLD_FILES+=usr/bin/addr2line
 OLD_FILES+=usr/bin/as
 OLD_FILES+=usr/bin/byacc
 OLD_FILES+=usr/bin/cc
 OLD_FILES+=usr/bin/c88
 OLD_FILES+=usr/bin/c++
 OLD_FILES+=usr/bin/c++filt
 OLD_FILES+=usr/bin/ld
 OLD_FILES+=usr/bin/ld.bfd
 OLD_FILES+=usr/bin/nm
 OLD_FILES+=usr/bin/objcopy
 OLD_FILES+=usr/bin/readelf
 OLD_FILES+=usr/bin/size
 OLD_FILES+=usr/bin/strip
 OLD_FILES+=usr/bin/yacc
 OLD_FILES+=usr/share/man/man1/addr2line.1.gz
 OLD_FILES+=usr/share/man/man1/c++filt.1.gz
 OLD_FILES+=usr/share/man/man1/nm.1.gz
 OLD_FILES+=usr/share/man/man1/readelf.1.gz
 OLD_FILES+=usr/share/man/man1/size.1.gz
 OLD_FILES+=usr/share/man/man1/strip.1.gz
 OLD_FILES+=usr/share/man/man1/objcopy.1.gz
 # lib/libelf
 OLD_FILES+=usr/share/man/man3/elf.3.gz
 OLD_FILES+=usr/share/man/man3/elf_begin.3.gz
 OLD_FILES+=usr/share/man/man3/elf_cntl.3.gz
 OLD_FILES+=usr/share/man/man3/elf_end.3.gz
 OLD_FILES+=usr/share/man/man3/elf_errmsg.3.gz
 OLD_FILES+=usr/share/man/man3/elf_fill.3.gz
 OLD_FILES+=usr/share/man/man3/elf_flagdata.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getarhdr.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getarsym.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getbase.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getdata.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getident.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getscn.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getphdrnum.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getphnum.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getshdrnum.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getshnum.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getshdrstrndx.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getshstrndx.3.gz
 OLD_FILES+=usr/share/man/man3/elf_hash.3.gz
 OLD_FILES+=usr/share/man/man3/elf_kind.3.gz
 OLD_FILES+=usr/share/man/man3/elf_memory.3.gz
 OLD_FILES+=usr/share/man/man3/elf_next.3.gz
 OLD_FILES+=usr/share/man/man3/elf_open.3.gz
 OLD_FILES+=usr/share/man/man3/elf_rawfile.3.gz
 OLD_FILES+=usr/share/man/man3/elf_rand.3.gz
 OLD_FILES+=usr/share/man/man3/elf_strptr.3.gz
 OLD_FILES+=usr/share/man/man3/elf_update.3.gz
 OLD_FILES+=usr/share/man/man3/elf_version.3.gz
 OLD_FILES+=usr/share/man/man3/gelf.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_checksum.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_fsize.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getcap.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getclass.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getdyn.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getehdr.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getmove.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getphdr.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getrel.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getrela.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getshdr.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getsym.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getsyminfo.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getsymshndx.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_newehdr.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_newphdr.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_update_ehdr.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_xlatetof.3.gz
 # lib/libelftc
 OLD_FILES+=usr/share/man/man3/elftc.3.gz
 OLD_FILES+=usr/share/man/man3/elftc_bfd_find_target.3.gz
 OLD_FILES+=usr/share/man/man3/elftc_copyfile.3.gz
 OLD_FILES+=usr/share/man/man3/elftc_demangle.3.gz
 OLD_FILES+=usr/share/man/man3/elftc_reloc_type_str.3.gz
 OLD_FILES+=usr/share/man/man3/elftc_set_timestamps.3.gz
 OLD_FILES+=usr/share/man/man3/elftc_timestamp.3.gz
 OLD_FILES+=usr/share/man/man3/elftc_string_table_create.3.gz
 OLD_FILES+=usr/share/man/man3/elftc_version.3.gz
 OLD_FILES+=usr/tests/usr.bin/yacc/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_calc1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_demo.y
 OLD_FILES+=usr/tests/usr.bin/yacc/calc.y
 OLD_FILES+=usr/tests/usr.bin/yacc/calc1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/calc2.y
 OLD_FILES+=usr/tests/usr.bin/yacc/calc3.y
 OLD_FILES+=usr/tests/usr.bin/yacc/code_calc.y
 OLD_FILES+=usr/tests/usr.bin/yacc/code_debug.y
 OLD_FILES+=usr/tests/usr.bin/yacc/code_error.y
 OLD_FILES+=usr/tests/usr.bin/yacc/empty.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit2.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit3.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit4.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit5.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax10.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax11.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax12.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax13.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax14.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax15.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax16.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax17.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax18.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax19.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax2.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax20.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax21.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax22.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax23.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax24.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax25.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax26.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax27.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax3.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax4.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax5.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax6.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax7.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax7a.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax7b.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax8.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax8a.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax9.y
 OLD_FILES+=usr/tests/usr.bin/yacc/error.y
 OLD_FILES+=usr/tests/usr.bin/yacc/grammar.y
 OLD_FILES+=usr/tests/usr.bin/yacc/inherit0.y
 OLD_FILES+=usr/tests/usr.bin/yacc/inherit1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/inherit2.y
 OLD_FILES+=usr/tests/usr.bin/yacc/ok_syntax1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/pure_calc.y
 OLD_FILES+=usr/tests/usr.bin/yacc/pure_error.y
 OLD_FILES+=usr/tests/usr.bin/yacc/quote_calc.y
 OLD_FILES+=usr/tests/usr.bin/yacc/quote_calc2.y
 OLD_FILES+=usr/tests/usr.bin/yacc/quote_calc3.y
 OLD_FILES+=usr/tests/usr.bin/yacc/quote_calc4.y
 OLD_FILES+=usr/tests/usr.bin/yacc/run_test
 OLD_FILES+=usr/tests/usr.bin/yacc/varsyntax_calc1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/big_b.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/big_b.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/big_l.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/big_l.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc1.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc1.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc1.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc1.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc2.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc2.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc2.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc2.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc3.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc3.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc3.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc3.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_calc.code.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_calc.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_calc.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_calc.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_calc.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_error.code.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_error.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_error.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_error.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_error.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/empty.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/empty.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/empty.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/empty.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax1.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax1.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax1.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax1.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax10.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax10.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax10.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax10.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax11.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax11.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax11.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax11.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax12.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax12.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax12.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax12.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax13.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax13.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax13.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax13.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax14.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax14.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax14.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax14.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax15.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax15.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax15.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax15.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax16.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax16.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax16.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax16.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax17.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax17.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax17.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax17.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax18.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax18.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax18.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax18.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax19.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax19.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax19.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax19.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax2.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax2.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax2.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax2.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax20.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax20.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax20.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax20.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax21.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax21.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax21.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax21.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax22.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax22.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax22.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax22.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax23.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax23.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax23.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax23.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax24.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax24.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax24.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax24.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax25.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax25.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax25.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax25.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax26.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax26.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax26.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax26.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax27.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax27.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax27.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax27.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax3.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax3.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax3.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax3.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax4.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax4.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax4.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax4.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax5.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax5.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax5.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax5.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax6.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax6.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax6.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax6.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7a.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7a.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7a.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7a.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7b.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7b.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7b.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7b.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax8.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax8.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax8.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax8.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax8a.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax8a.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax8a.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax8a.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax9.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax9.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax9.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax9.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/error.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/error.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/error.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/error.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/grammar.dot
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/grammar.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/grammar.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/grammar.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/grammar.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/help.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/help.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_b_opt.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_b_opt.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_b_opt1.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_b_opt1.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_code_c.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_code_c.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_defines.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_defines.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_graph.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_graph.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_include.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_include.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_opts.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_opts.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_output.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_output.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_output1.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_output1.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_output2.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_output2.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_p_opt.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_p_opt.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_p_opt1.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_p_opt1.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_verbose.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_verbose.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/nostdin.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/nostdin.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/ok_syntax1.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/ok_syntax1.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/ok_syntax1.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/ok_syntax1.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/pure_calc.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/pure_calc.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/pure_calc.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/pure_calc.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/pure_error.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/pure_error.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/pure_error.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/pure_error.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc-s.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc-s.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc-s.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc-s.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc2-s.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc2-s.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc2-s.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc2-s.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc2.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc2.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc2.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc2.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc3-s.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc3-s.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc3-s.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc3-s.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc3.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc3.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc3.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc3.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc4-s.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc4-s.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc4-s.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc4-s.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc4.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc4.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc4.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc4.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/rename_debug.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/rename_debug.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/rename_debug.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/rename_debug.i
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/rename_debug.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/varsyntax_calc1.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/varsyntax_calc1.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/varsyntax_calc1.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/varsyntax_calc1.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc_tests
 OLD_DIRS+=usr/tests/usr.bin/yacc/yacc
 OLD_DIRS+=usr/tests/usr.bin/yacc
 .endif
 
 .if ${MK_UNBOUND} == no
 OLD_FILES+=etc/rc.d/local_unbound
 OLD_FILES+=etc/unbound
 OLD_FILES+=usr/lib/libprivateunbound.a
 OLD_FILES+=usr/lib/libprivateunbound.so
 OLD_LIBS+=usr/lib/libprivateunbound.so.5
 OLD_FILES+=usr/lib/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
 OLD_FILES+=usr/sbin/local-unbound-setup
 OLD_FILES+=usr/sbin/local-unbound
 OLD_FILES+=usr/sbin/local-unbound-anchor
 OLD_FILES+=usr/sbin/local-unbound-checkconf
 OLD_FILES+=usr/sbin/local-unbound-control
 .endif
 
 .if ${MK_USB} == no
 OLD_FILES+=etc/devd/uath.conf
 OLD_FILES+=etc/devd/uauth.conf
 OLD_FILES+=etc/devd/ulpt.conf
 OLD_FILES+=etc/devd/usb.conf
 OLD_FILES+=usr/bin/usbhidaction
 OLD_FILES+=usr/bin/usbhidctl
 OLD_FILES+=usr/include/libusb.h
 OLD_FILES+=usr/include/libusb20.h
 OLD_FILES+=usr/include/libusb20_desc.h
 OLD_FILES+=usr/include/usb.h
 OLD_FILES+=usr/include/usbhid.h
 OLD_FILES+=usr/lib/libusb.a
 OLD_FILES+=usr/lib/libusb.so
 OLD_LIBS+=usr/lib/libusb.so.3
 OLD_FILES+=usr/lib/libusb_p.a
 OLD_FILES+=usr/lib/libusbhid.a
 OLD_FILES+=usr/lib/libusbhid.so
 OLD_LIBS+=usr/lib/libusbhid.so.4
 OLD_FILES+=usr/lib/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
 OLD_FILES+=usr/sbin/uathload
 OLD_FILES+=usr/sbin/uhsoctl
 OLD_FILES+=usr/sbin/usbconfig
 OLD_FILES+=usr/sbin/usbdump
 OLD_FILES+=usr/share/examples/libusb20/Makefile
 OLD_FILES+=usr/share/examples/libusb20/README
 OLD_FILES+=usr/share/examples/libusb20/bulk.c
 OLD_FILES+=usr/share/examples/libusb20/control.c
 OLD_FILES+=usr/share/examples/libusb20/util.c
 OLD_FILES+=usr/share/examples/libusb20/util.h
 OLD_DIRS+=usr/share/examples/libusb20
 OLD_FILES+=usr/share/firmware/ar5523.bin
 OLD_FILES+=usr/share/man/man1/uhsoctl.1.gz
 OLD_FILES+=usr/share/man/man1/usbhidaction.1.gz
 OLD_FILES+=usr/share/man/man1/usbhidctl.1.gz
 OLD_FILES+=usr/share/man/man3/hid_dispose_report_desc.3.gz
 OLD_FILES+=usr/share/man/man3/hid_end_parse.3.gz
 OLD_FILES+=usr/share/man/man3/hid_get_data.3.gz
 OLD_FILES+=usr/share/man/man3/hid_get_item.3.gz
 OLD_FILES+=usr/share/man/man3/hid_get_report_desc.3.gz
 OLD_FILES+=usr/share/man/man3/hid_init.3.gz
 OLD_FILES+=usr/share/man/man3/hid_locate.3.gz
 OLD_FILES+=usr/share/man/man3/hid_report_size.3.gz
 OLD_FILES+=usr/share/man/man3/hid_set_data.3.gz
 OLD_FILES+=usr/share/man/man3/hid_start_parse.3.gz
 OLD_FILES+=usr/share/man/man3/hid_usage_in_page.3.gz
 OLD_FILES+=usr/share/man/man3/hid_usage_page.3.gz
 OLD_FILES+=usr/share/man/man3/libusb.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_add_dev_quirk.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_alloc_default.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_dequeue_device.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_device_foreach.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_enqueue_device.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_free.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_get_dev_quirk.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_get_quirk_name.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_get_template.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_remove_dev_quirk.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_set_template.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_desc_foreach.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_alloc_config.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_check_connected.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_close.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_detach_kernel_driver.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_free.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_address.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_backend_name.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_bus_number.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_config_index.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_debug.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_desc.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_device_desc.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_fd.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_iface_desc.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_info.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_mode.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_parent_address.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_parent_port.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_port_path.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_power_mode.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_power_usage.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_speed.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_kernel_driver_active.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_open.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_process.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_req_string_simple_sync.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_req_string_sync.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_request_sync.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_reset.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_set_alt_index.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_set_config_index.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_set_debug.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_set_power_mode.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_wait_process.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_error_name.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_me_decode.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_me_encode.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_me_get_1.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_me_get_2.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_strerror.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_bulk_intr_sync.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_callback_wrapper.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_clear_stall_sync.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_close.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_drain.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_actual_frames.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_actual_length.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_length.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_max_frames.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_max_packet_length.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_max_total_length.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_pointer.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_priv_sc0.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_priv_sc1.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_status.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_time_complete.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_open.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_pending.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_set_buffer.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_set_callback.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_set_flags.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_set_length.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_set_priv_sc0.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_set_priv_sc1.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_set_timeout.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_set_total_frames.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_setup_bulk.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_setup_control.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_setup_intr.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_setup_isoc.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_start.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_stop.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_submit.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_alloc_transfer.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_attach_kernel_driver.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_bulk_transfer.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_cancel_transfer.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_check_connected.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_claim_interface.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_clear_halt.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_close.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_control_transfer.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_detach_kernel_driver.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_detach_kernel_driver_np.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_error_name.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_event_handler_active.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_event_handling_ok.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_exit.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_free_bos_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_free_config_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_free_device_list.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_free_ss_endpoint_comp.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_free_transfer.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_active_config_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_bus_number.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_config_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_config_descriptor_by_value.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_configuration.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_device.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_device_address.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_device_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_device_list.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_device_speed.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_driver.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_driver_np.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_max_iso_packet_size.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_max_packet_size.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_next_timeout.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_pollfds.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_string_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_string_descriptor_ascii.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_handle_events.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_handle_events_completed.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_handle_events_locked.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_handle_events_timeout.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_handle_events_timeout_completed.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_init.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_interrupt_transfer.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_kernel_driver_active.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_lock_event_waiters.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_lock_events.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_open.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_open_device_with_vid_pid.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_parse_bos_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_parse_ss_endpoint_comp.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_ref_device.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_release_interface.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_reset_device.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_set_configuration.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_set_debug.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_set_interface_alt_setting.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_set_pollfd_notifiers.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_strerror.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_submit_transfer.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_try_lock_events.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_unlock_event_waiters.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_unlock_events.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_unref_device.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_wait_for_event.3.gz
 OLD_FILES+=usr/share/man/man3/libusbhid.3.gz
 OLD_FILES+=usr/share/man/man3/usb.3.gz
 OLD_FILES+=usr/share/man/man3/usb_bulk_read.3.gz
 OLD_FILES+=usr/share/man/man3/usb_bulk_write.3.gz
 OLD_FILES+=usr/share/man/man3/usb_check_connected.3.gz
 OLD_FILES+=usr/share/man/man3/usb_claim_interface.3.gz
 OLD_FILES+=usr/share/man/man3/usb_clear_halt.3.gz
 OLD_FILES+=usr/share/man/man3/usb_close.3.gz
 OLD_FILES+=usr/share/man/man3/usb_control_msg.3.gz
 OLD_FILES+=usr/share/man/man3/usb_destroy_configuration.3.gz
 OLD_FILES+=usr/share/man/man3/usb_device.3.gz
 OLD_FILES+=usr/share/man/man3/usb_fetch_and_parse_descriptors.3.gz
 OLD_FILES+=usr/share/man/man3/usb_find_busses.3.gz
 OLD_FILES+=usr/share/man/man3/usb_find_devices.3.gz
 OLD_FILES+=usr/share/man/man3/usb_get_busses.3.gz
 OLD_FILES+=usr/share/man/man3/usb_get_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/usb_get_descriptor_by_endpoint.3.gz
 OLD_FILES+=usr/share/man/man3/usb_get_string.3.gz
 OLD_FILES+=usr/share/man/man3/usb_get_string_simple.3.gz
 OLD_FILES+=usr/share/man/man3/usb_init.3.gz
 OLD_FILES+=usr/share/man/man3/usb_interrupt_read.3.gz
 OLD_FILES+=usr/share/man/man3/usb_interrupt_write.3.gz
 OLD_FILES+=usr/share/man/man3/usb_open.3.gz
 OLD_FILES+=usr/share/man/man3/usb_parse_configuration.3.gz
 OLD_FILES+=usr/share/man/man3/usb_parse_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/usb_release_interface.3.gz
 OLD_FILES+=usr/share/man/man3/usb_reset.3.gz
 OLD_FILES+=usr/share/man/man3/usb_resetep.3.gz
 OLD_FILES+=usr/share/man/man3/usb_set_altinterface.3.gz
 OLD_FILES+=usr/share/man/man3/usb_set_configuration.3.gz
 OLD_FILES+=usr/share/man/man3/usb_set_debug.3.gz
 OLD_FILES+=usr/share/man/man3/usb_strerror.3.gz
 OLD_FILES+=usr/share/man/man3/usbhid.3.gz
 OLD_FILES+=usr/share/man/man4/if_otus.4.gz
 OLD_FILES+=usr/share/man/man4/if_rsu.4.gz
 OLD_FILES+=usr/share/man/man4/if_rtwn_usb.4.gz
 OLD_FILES+=usr/share/man/man4/if_rum.4.gz
 OLD_FILES+=usr/share/man/man4/if_run.4.gz
 OLD_FILES+=usr/share/man/man4/if_zyd.4.gz
 OLD_FILES+=usr/share/man/man4/otus.4.gz
 OLD_FILES+=usr/share/man/man4/otusfw.4.gz
 OLD_FILES+=usr/share/man/man4/rsu.4.gz
 OLD_FILES+=usr/share/man/man4/rsufw.4.gz
 OLD_FILES+=usr/share/man/man4/rtwn_usb.4.gz
 OLD_FILES+=usr/share/man/man4/rum.4.gz
 OLD_FILES+=usr/share/man/man4/run.4.gz
 OLD_FILES+=usr/share/man/man4/runfw.4.gz
 OLD_FILES+=usr/share/man/man4/u3g.4.gz
 OLD_FILES+=usr/share/man/man4/u3gstub.4.gz
 OLD_FILES+=usr/share/man/man4/uark.4.gz
 OLD_FILES+=usr/share/man/man4/uart.4.gz
 OLD_FILES+=usr/share/man/man4/uath.4.gz
 OLD_FILES+=usr/share/man/man4/ubsa.4.gz
 OLD_FILES+=usr/share/man/man4/ubser.4.gz
 OLD_FILES+=usr/share/man/man4/ubtbcmfw.4.gz
 OLD_FILES+=usr/share/man/man4/uchcom.4.gz
 OLD_FILES+=usr/share/man/man4/ucom.4.gz
 OLD_FILES+=usr/share/man/man4/ucycom.4.gz
 OLD_FILES+=usr/share/man/man4/udav.4.gz
 OLD_FILES+=usr/share/man/man4/udbp.4.gz
 OLD_FILES+=usr/share/man/man4/uep.4.gz
 OLD_FILES+=usr/share/man/man4/ufm.4.gz
 OLD_FILES+=usr/share/man/man4/ufoma.4.gz
 OLD_FILES+=usr/share/man/man4/uftdi.4.gz
 OLD_FILES+=usr/share/man/man4/ugen.4.gz
 OLD_FILES+=usr/share/man/man4/uhci.4.gz
 OLD_FILES+=usr/share/man/man4/uhid.4.gz
 OLD_FILES+=usr/share/man/man4/uhso.4.gz
 OLD_FILES+=usr/share/man/man4/uipaq.4.gz
 OLD_FILES+=usr/share/man/man4/ukbd.4.gz
 OLD_FILES+=usr/share/man/man4/uled.4.gz
 OLD_FILES+=usr/share/man/man4/ulpt.4.gz
 OLD_FILES+=usr/share/man/man4/umass.4.gz
 OLD_FILES+=usr/share/man/man4/umcs.4.gz
 OLD_FILES+=usr/share/man/man4/umct.4.gz
 OLD_FILES+=usr/share/man/man4/umodem.4.gz
 OLD_FILES+=usr/share/man/man4/umoscom.4.gz
 OLD_FILES+=usr/share/man/man4/ums.4.gz
 OLD_FILES+=usr/share/man/man4/unix.4.gz
 OLD_FILES+=usr/share/man/man4/upgt.4.gz
 OLD_FILES+=usr/share/man/man4/uplcom.4.gz
 OLD_FILES+=usr/share/man/man4/ural.4.gz
 OLD_FILES+=usr/share/man/man4/urio.4.gz
 OLD_FILES+=usr/share/man/man4/urndis.4.gz
 OLD_FILES+=usr/share/man/man4/urtw.4.gz
 OLD_FILES+=usr/share/man/man4/usb.4.gz
 OLD_FILES+=usr/share/man/man4/usb_quirk.4.gz
 OLD_FILES+=usr/share/man/man4/usb_template.4.gz
 OLD_FILES+=usr/share/man/man4/usfs.4.gz
 OLD_FILES+=usr/share/man/man4/uslcom.4.gz
 OLD_FILES+=usr/share/man/man4/uvisor.4.gz
 OLD_FILES+=usr/share/man/man4/uvscom.4.gz
 OLD_FILES+=usr/share/man/man4/zyd.4.gz
 OLD_FILES+=usr/share/man/man8/uathload.8.gz
 OLD_FILES+=usr/share/man/man8/usbconfig.8.gz
 OLD_FILES+=usr/share/man/man8/usbdump.8.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_alloc_buffer.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_attach.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_detach.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_free_buffer.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_get_data.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_get_data_buffer.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_get_data_error.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_get_data_linear.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_put_bytes_max.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_put_data.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_put_data_buffer.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_put_data_error.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_put_data_linear.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_reset.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_softc.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_wakeup.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_do_request.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_do_request_flags.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_errstr.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_lookup_id_by_info.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_lookup_id_by_uaa.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer_clear_stall.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer_drain.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer_pending.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer_poll.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer_setup.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer_start.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer_stop.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer_submit.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer_unsetup.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_clr_flag.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_frame_data.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_frame_len.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_get_frame.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_get_priv.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_is_stalled.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_max_framelen.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_max_frames.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_max_len.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_set_flag.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_set_frame_data.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_set_frame_len.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_set_frame_offset.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_set_frames.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_set_interval.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_set_priv.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_set_stall.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_set_timeout.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_softc.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_state.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_status.9.gz
 OLD_FILES+=usr/share/man/man9/usbdi.9.gz
 OLD_FILES+=usr/share/misc/usb_hid_usages
 OLD_FILES+=usr/share/misc/usbdevs
 .endif
 
 .if ${MK_UTMPX} == no
 OLD_FILES+=etc/periodic/monthly/200.accounting
 OLD_FILES+=etc/rc.d/utx
 OLD_FILES+=usr/bin/last
 OLD_FILES+=usr/bin/users
 OLD_FILES+=usr/bin/who
 OLD_FILES+=usr/sbin/ac
 OLD_FILES+=usr/sbin/lastlogin
 OLD_FILES+=usr/sbin/utx
 OLD_FILES+=usr/share/man/man1/last.1.gz
 OLD_FILES+=usr/share/man/man1/users.1.gz
 OLD_FILES+=usr/share/man/man1/who.1.gz
 OLD_FILES+=usr/share/man/man8/ac.8.gz
 OLD_FILES+=usr/share/man/man8/lastlogin.8.gz
 OLD_FILES+=usr/share/man/man8/utx.8.gz
 .endif
 
 .if ${MK_VERIEXEC} == no
 OLD_FILES+=sbin/veriexec
 OLD_FILES+=usr/share/man/man8/veriexec.8.gz
 OLD_FILES+=usr/lib/libveriexec.a
 OLD_FILES+=usr/lib/libveriexec.so
 OLD_LIBS+=usr/lib/libveriexec.so.5
 .endif
 
 .if ${MK_VI} == no
 OLD_FILES+=etc/rc.d/virecover
 OLD_FILES+=rescue/ex
 OLD_FILES+=rescue/vi
 OLD_FILES+=usr/bin/ex
 OLD_FILES+=usr/bin/nex
 OLD_FILES+=usr/bin/nvi
 OLD_FILES+=usr/bin/nview
 OLD_FILES+=usr/bin/vi
 OLD_FILES+=usr/bin/view
 OLD_FILES+=usr/share/man/man1/ex.1.gz
 OLD_FILES+=usr/share/man/man1/nex.1.gz
 OLD_FILES+=usr/share/man/man1/nvi.1.gz
 OLD_FILES+=usr/share/man/man1/nview.1.gz
 OLD_FILES+=usr/share/man/man1/vi.1.gz
 OLD_FILES+=usr/share/man/man1/view.1.gz
 .  if exists(${DESTDIR}/usr/share/vi)
 VI_DIRS!=find ${DESTDIR}/usr/share/vi -type d \
     | sed -e 's,^${DESTDIR}/,,'; echo
 VI_FILES!=find ${DESTDIR}/usr/share/vi \! -type d \
     | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_DIRS+=${VI_DIRS}
 OLD_FILES+=${VI_FILES}
 .  endif
 .endif
 
 .if ${MK_WIRELESS} == no
 OLD_FILES+=etc/regdomain.xml
 OLD_FILES+=etc/rc.d/hostapd
 OLD_FILES+=etc/rc.d/wpa_supplicant
 OLD_FILES+=usr/sbin/ancontrol
 OLD_FILES+=usr/sbin/hostapd
 OLD_FILES+=usr/sbin/hostapd_cli
 OLD_FILES+=usr/sbin/ndis_events
 OLD_FILES+=usr/sbin/wlandebug
 OLD_FILES+=usr/sbin/wpa_cli
 OLD_FILES+=usr/sbin/wpa_passphrase
 OLD_FILES+=usr/sbin/wpa_supplicant
 OLD_FILES+=usr/share/examples/etc/regdomain.xml
 OLD_FILES+=usr/share/examples/etc/wpa_supplicant.conf
 OLD_FILES+=usr/share/examples/hostapd/hostapd.conf
 OLD_FILES+=usr/share/examples/hostapd/hostapd.eap_user
 OLD_FILES+=usr/share/examples/hostapd/hostapd.wpa_psk
 OLD_DIRS+=usr/share/examples/hostapd
 OLD_FILES+=usr/share/man/man5/hostapd.conf.5.gz
 OLD_FILES+=usr/share/man/man5/wpa_supplicant.conf.5.gz
 OLD_FILES+=usr/share/man/man8/ancontrol.8.gz
 OLD_FILES+=usr/share/man/man8/hostapd.8.gz
 OLD_FILES+=usr/share/man/man8/hostapd_cli.8.gz
 OLD_FILES+=usr/share/man/man8/ndis_events.8.gz
 OLD_FILES+=usr/share/man/man8/wlandebug.8.gz
 OLD_FILES+=usr/share/man/man8/wpa_cli.8.gz
 OLD_FILES+=usr/share/man/man8/wpa_passphrase.8.gz
 OLD_FILES+=usr/share/man/man8/wpa_supplicant.8.gz
 OLD_FILES+=usr/lib/snmp_wlan.so
 OLD_LIBS+=usr/lib/snmp_wlan.so.6
 # bsnmp module
 OLD_FILES+=usr/share/man/man3/snmp_wlan.3.gz
 OLD_FILES+=usr/share/snmp/defs/wlan_tree.def
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-WIRELESS-MIB.txt
 .endif
 
 .if ${MK_HYPERV} == no
 OLD_FILES+=etc/devd/hyperv.conf
 OLD_FILES+=usr/libexec/hyperv/hv_set_ifconfig
 OLD_FILES+=usr/libexec/hyperv/hv_get_dns_info
 OLD_FILES+=usr/libexec/hyperv/hv_get_dhcp_info
 OLD_FILES+=usr/sbin/hv_kvp_daemon
 OLD_FILES+=usr/sbin/hv_vss_daemon
 OLD_FILES+=usr/share/man/man8/hv_kvp_daemon.8.gz
 .endif
 
 .if ${MK_ZONEINFO} == no
 OLD_FILES+=usr/share/zoneinfo/Africa/Abidjan
 OLD_FILES+=usr/share/zoneinfo/Africa/Accra
 OLD_FILES+=usr/share/zoneinfo/Africa/Addis_Ababa
 OLD_FILES+=usr/share/zoneinfo/Africa/Algiers
 OLD_FILES+=usr/share/zoneinfo/Africa/Asmara
 OLD_FILES+=usr/share/zoneinfo/Africa/Bamako
 OLD_FILES+=usr/share/zoneinfo/Africa/Bangui
 OLD_FILES+=usr/share/zoneinfo/Africa/Banjul
 OLD_FILES+=usr/share/zoneinfo/Africa/Bissau
 OLD_FILES+=usr/share/zoneinfo/Africa/Blantyre
 OLD_FILES+=usr/share/zoneinfo/Africa/Brazzaville
 OLD_FILES+=usr/share/zoneinfo/Africa/Bujumbura
 OLD_FILES+=usr/share/zoneinfo/Africa/Cairo
 OLD_FILES+=usr/share/zoneinfo/Africa/Casablanca
 OLD_FILES+=usr/share/zoneinfo/Africa/Ceuta
 OLD_FILES+=usr/share/zoneinfo/Africa/Conakry
 OLD_FILES+=usr/share/zoneinfo/Africa/Dakar
 OLD_FILES+=usr/share/zoneinfo/Africa/Dar_es_Salaam
 OLD_FILES+=usr/share/zoneinfo/Africa/Djibouti
 OLD_FILES+=usr/share/zoneinfo/Africa/Douala
 OLD_FILES+=usr/share/zoneinfo/Africa/El_Aaiun
 OLD_FILES+=usr/share/zoneinfo/Africa/Freetown
 OLD_FILES+=usr/share/zoneinfo/Africa/Gaborone
 OLD_FILES+=usr/share/zoneinfo/Africa/Harare
 OLD_FILES+=usr/share/zoneinfo/Africa/Johannesburg
 OLD_FILES+=usr/share/zoneinfo/Africa/Juba
 OLD_FILES+=usr/share/zoneinfo/Africa/Kampala
 OLD_FILES+=usr/share/zoneinfo/Africa/Khartoum
 OLD_FILES+=usr/share/zoneinfo/Africa/Kigali
 OLD_FILES+=usr/share/zoneinfo/Africa/Kinshasa
 OLD_FILES+=usr/share/zoneinfo/Africa/Lagos
 OLD_FILES+=usr/share/zoneinfo/Africa/Libreville
 OLD_FILES+=usr/share/zoneinfo/Africa/Lome
 OLD_FILES+=usr/share/zoneinfo/Africa/Luanda
 OLD_FILES+=usr/share/zoneinfo/Africa/Lubumbashi
 OLD_FILES+=usr/share/zoneinfo/Africa/Lusaka
 OLD_FILES+=usr/share/zoneinfo/Africa/Malabo
 OLD_FILES+=usr/share/zoneinfo/Africa/Maputo
 OLD_FILES+=usr/share/zoneinfo/Africa/Maseru
 OLD_FILES+=usr/share/zoneinfo/Africa/Mbabane
 OLD_FILES+=usr/share/zoneinfo/Africa/Mogadishu
 OLD_FILES+=usr/share/zoneinfo/Africa/Monrovia
 OLD_FILES+=usr/share/zoneinfo/Africa/Nairobi
 OLD_FILES+=usr/share/zoneinfo/Africa/Ndjamena
 OLD_FILES+=usr/share/zoneinfo/Africa/Niamey
 OLD_FILES+=usr/share/zoneinfo/Africa/Nouakchott
 OLD_FILES+=usr/share/zoneinfo/Africa/Ouagadougou
 OLD_FILES+=usr/share/zoneinfo/Africa/Porto-Novo
 OLD_FILES+=usr/share/zoneinfo/Africa/Sao_Tome
 OLD_FILES+=usr/share/zoneinfo/Africa/Tripoli
 OLD_FILES+=usr/share/zoneinfo/Africa/Tunis
 OLD_FILES+=usr/share/zoneinfo/Africa/Windhoek
 OLD_FILES+=usr/share/zoneinfo/America/Adak
 OLD_FILES+=usr/share/zoneinfo/America/Anchorage
 OLD_FILES+=usr/share/zoneinfo/America/Anguilla
 OLD_FILES+=usr/share/zoneinfo/America/Antigua
 OLD_FILES+=usr/share/zoneinfo/America/Araguaina
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/Buenos_Aires
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/Catamarca
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/Cordoba
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/Jujuy
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/La_Rioja
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/Mendoza
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/Rio_Gallegos
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/Salta
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/San_Juan
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/San_Luis
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/Tucuman
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/Ushuaia
 OLD_FILES+=usr/share/zoneinfo/America/Aruba
 OLD_FILES+=usr/share/zoneinfo/America/Asuncion
 OLD_FILES+=usr/share/zoneinfo/America/Atikokan
 OLD_FILES+=usr/share/zoneinfo/America/Bahia
 OLD_FILES+=usr/share/zoneinfo/America/Bahia_Banderas
 OLD_FILES+=usr/share/zoneinfo/America/Barbados
 OLD_FILES+=usr/share/zoneinfo/America/Belem
 OLD_FILES+=usr/share/zoneinfo/America/Belize
 OLD_FILES+=usr/share/zoneinfo/America/Blanc-Sablon
 OLD_FILES+=usr/share/zoneinfo/America/Boa_Vista
 OLD_FILES+=usr/share/zoneinfo/America/Bogota
 OLD_FILES+=usr/share/zoneinfo/America/Boise
 OLD_FILES+=usr/share/zoneinfo/America/Cambridge_Bay
 OLD_FILES+=usr/share/zoneinfo/America/Campo_Grande
 OLD_FILES+=usr/share/zoneinfo/America/Cancun
 OLD_FILES+=usr/share/zoneinfo/America/Caracas
 OLD_FILES+=usr/share/zoneinfo/America/Cayenne
 OLD_FILES+=usr/share/zoneinfo/America/Cayman
 OLD_FILES+=usr/share/zoneinfo/America/Chicago
 OLD_FILES+=usr/share/zoneinfo/America/Chihuahua
 OLD_FILES+=usr/share/zoneinfo/America/Ciudad_Juarez
 OLD_FILES+=usr/share/zoneinfo/America/Costa_Rica
 OLD_FILES+=usr/share/zoneinfo/America/Creston
 OLD_FILES+=usr/share/zoneinfo/America/Cuiaba
 OLD_FILES+=usr/share/zoneinfo/America/Curacao
 OLD_FILES+=usr/share/zoneinfo/America/Danmarkshavn
 OLD_FILES+=usr/share/zoneinfo/America/Dawson
 OLD_FILES+=usr/share/zoneinfo/America/Dawson_Creek
 OLD_FILES+=usr/share/zoneinfo/America/Denver
 OLD_FILES+=usr/share/zoneinfo/America/Detroit
 OLD_FILES+=usr/share/zoneinfo/America/Dominica
 OLD_FILES+=usr/share/zoneinfo/America/Edmonton
 OLD_FILES+=usr/share/zoneinfo/America/Eirunepe
 OLD_FILES+=usr/share/zoneinfo/America/El_Salvador
 OLD_FILES+=usr/share/zoneinfo/America/Fortaleza
 OLD_FILES+=usr/share/zoneinfo/America/Glace_Bay
 OLD_FILES+=usr/share/zoneinfo/America/Godthab
 OLD_FILES+=usr/share/zoneinfo/America/Goose_Bay
 OLD_FILES+=usr/share/zoneinfo/America/Grand_Turk
 OLD_FILES+=usr/share/zoneinfo/America/Grenada
 OLD_FILES+=usr/share/zoneinfo/America/Guadeloupe
 OLD_FILES+=usr/share/zoneinfo/America/Guatemala
 OLD_FILES+=usr/share/zoneinfo/America/Guayaquil
 OLD_FILES+=usr/share/zoneinfo/America/Guyana
 OLD_FILES+=usr/share/zoneinfo/America/Halifax
 OLD_FILES+=usr/share/zoneinfo/America/Havana
 OLD_FILES+=usr/share/zoneinfo/America/Hermosillo
 OLD_FILES+=usr/share/zoneinfo/America/Indiana/Indianapolis
 OLD_FILES+=usr/share/zoneinfo/America/Indiana/Knox
 OLD_FILES+=usr/share/zoneinfo/America/Indiana/Marengo
 OLD_FILES+=usr/share/zoneinfo/America/Indiana/Petersburg
 OLD_FILES+=usr/share/zoneinfo/America/Indiana/Tell_City
 OLD_FILES+=usr/share/zoneinfo/America/Indiana/Vevay
 OLD_FILES+=usr/share/zoneinfo/America/Indiana/Vincennes
 OLD_FILES+=usr/share/zoneinfo/America/Indiana/Winamac
 OLD_FILES+=usr/share/zoneinfo/America/Inuvik
 OLD_FILES+=usr/share/zoneinfo/America/Iqaluit
 OLD_FILES+=usr/share/zoneinfo/America/Jamaica
 OLD_FILES+=usr/share/zoneinfo/America/Juneau
 OLD_FILES+=usr/share/zoneinfo/America/Kentucky/Louisville
 OLD_FILES+=usr/share/zoneinfo/America/Kentucky/Monticello
 OLD_FILES+=usr/share/zoneinfo/America/Kralendijk
 OLD_FILES+=usr/share/zoneinfo/America/La_Paz
 OLD_FILES+=usr/share/zoneinfo/America/Lima
 OLD_FILES+=usr/share/zoneinfo/America/Los_Angeles
 OLD_FILES+=usr/share/zoneinfo/America/Lower_Princes
 OLD_FILES+=usr/share/zoneinfo/America/Maceio
 OLD_FILES+=usr/share/zoneinfo/America/Managua
 OLD_FILES+=usr/share/zoneinfo/America/Manaus
 OLD_FILES+=usr/share/zoneinfo/America/Marigot
 OLD_FILES+=usr/share/zoneinfo/America/Martinique
 OLD_FILES+=usr/share/zoneinfo/America/Matamoros
 OLD_FILES+=usr/share/zoneinfo/America/Mazatlan
 OLD_FILES+=usr/share/zoneinfo/America/Menominee
 OLD_FILES+=usr/share/zoneinfo/America/Merida
 OLD_FILES+=usr/share/zoneinfo/America/Metlakatla
 OLD_FILES+=usr/share/zoneinfo/America/Mexico_City
 OLD_FILES+=usr/share/zoneinfo/America/Miquelon
 OLD_FILES+=usr/share/zoneinfo/America/Moncton
 OLD_FILES+=usr/share/zoneinfo/America/Monterrey
 OLD_FILES+=usr/share/zoneinfo/America/Montevideo
 OLD_FILES+=usr/share/zoneinfo/America/Montreal
 OLD_FILES+=usr/share/zoneinfo/America/Montserrat
 OLD_FILES+=usr/share/zoneinfo/America/Nassau
 OLD_FILES+=usr/share/zoneinfo/America/New_York
 OLD_FILES+=usr/share/zoneinfo/America/Nipigon
 OLD_FILES+=usr/share/zoneinfo/America/Nome
 OLD_FILES+=usr/share/zoneinfo/America/Noronha
 OLD_FILES+=usr/share/zoneinfo/America/North_Dakota/Beulah
 OLD_FILES+=usr/share/zoneinfo/America/North_Dakota/Center
 OLD_FILES+=usr/share/zoneinfo/America/North_Dakota/New_Salem
 OLD_FILES+=usr/share/zoneinfo/America/Ojinaga
 OLD_FILES+=usr/share/zoneinfo/America/Panama
 OLD_FILES+=usr/share/zoneinfo/America/Pangnirtung
 OLD_FILES+=usr/share/zoneinfo/America/Paramaribo
 OLD_FILES+=usr/share/zoneinfo/America/Phoenix
 OLD_FILES+=usr/share/zoneinfo/America/Port-au-Prince
 OLD_FILES+=usr/share/zoneinfo/America/Port_of_Spain
 OLD_FILES+=usr/share/zoneinfo/America/Porto_Velho
 OLD_FILES+=usr/share/zoneinfo/America/Puerto_Rico
 OLD_FILES+=usr/share/zoneinfo/America/Rainy_River
 OLD_FILES+=usr/share/zoneinfo/America/Rankin_Inlet
 OLD_FILES+=usr/share/zoneinfo/America/Recife
 OLD_FILES+=usr/share/zoneinfo/America/Regina
 OLD_FILES+=usr/share/zoneinfo/America/Resolute
 OLD_FILES+=usr/share/zoneinfo/America/Rio_Branco
 OLD_FILES+=usr/share/zoneinfo/America/Santa_Isabel
 OLD_FILES+=usr/share/zoneinfo/America/Santarem
 OLD_FILES+=usr/share/zoneinfo/America/Santiago
 OLD_FILES+=usr/share/zoneinfo/America/Santo_Domingo
 OLD_FILES+=usr/share/zoneinfo/America/Sao_Paulo
 OLD_FILES+=usr/share/zoneinfo/America/Scoresbysund
 OLD_FILES+=usr/share/zoneinfo/America/Sitka
 OLD_FILES+=usr/share/zoneinfo/America/St_Barthelemy
 OLD_FILES+=usr/share/zoneinfo/America/St_Johns
 OLD_FILES+=usr/share/zoneinfo/America/St_Kitts
 OLD_FILES+=usr/share/zoneinfo/America/St_Lucia
 OLD_FILES+=usr/share/zoneinfo/America/St_Thomas
 OLD_FILES+=usr/share/zoneinfo/America/St_Vincent
 OLD_FILES+=usr/share/zoneinfo/America/Swift_Current
 OLD_FILES+=usr/share/zoneinfo/America/Tegucigalpa
 OLD_FILES+=usr/share/zoneinfo/America/Thule
 OLD_FILES+=usr/share/zoneinfo/America/Thunder_Bay
 OLD_FILES+=usr/share/zoneinfo/America/Tijuana
 OLD_FILES+=usr/share/zoneinfo/America/Toronto
 OLD_FILES+=usr/share/zoneinfo/America/Tortola
 OLD_FILES+=usr/share/zoneinfo/America/Vancouver
 OLD_FILES+=usr/share/zoneinfo/America/Whitehorse
 OLD_FILES+=usr/share/zoneinfo/America/Winnipeg
 OLD_FILES+=usr/share/zoneinfo/America/Yakutat
 OLD_FILES+=usr/share/zoneinfo/America/Yellowknife
 OLD_FILES+=usr/share/zoneinfo/Antarctica/Casey
 OLD_FILES+=usr/share/zoneinfo/Antarctica/Davis
 OLD_FILES+=usr/share/zoneinfo/Antarctica/DumontDUrville
 OLD_FILES+=usr/share/zoneinfo/Antarctica/Macquarie
 OLD_FILES+=usr/share/zoneinfo/Antarctica/Mawson
 OLD_FILES+=usr/share/zoneinfo/Antarctica/McMurdo
 OLD_FILES+=usr/share/zoneinfo/Antarctica/Palmer
 OLD_FILES+=usr/share/zoneinfo/Antarctica/Rothera
 OLD_FILES+=usr/share/zoneinfo/Antarctica/Syowa
 OLD_FILES+=usr/share/zoneinfo/Antarctica/Troll
 OLD_FILES+=usr/share/zoneinfo/Antarctica/Vostok
 OLD_FILES+=usr/share/zoneinfo/Arctic/Longyearbyen
 OLD_FILES+=usr/share/zoneinfo/Asia/Aden
 OLD_FILES+=usr/share/zoneinfo/Asia/Almaty
 OLD_FILES+=usr/share/zoneinfo/Asia/Amman
 OLD_FILES+=usr/share/zoneinfo/Asia/Anadyr
 OLD_FILES+=usr/share/zoneinfo/Asia/Aqtau
 OLD_FILES+=usr/share/zoneinfo/Asia/Aqtobe
 OLD_FILES+=usr/share/zoneinfo/Asia/Ashgabat
 OLD_FILES+=usr/share/zoneinfo/Asia/Baghdad
 OLD_FILES+=usr/share/zoneinfo/Asia/Bahrain
 OLD_FILES+=usr/share/zoneinfo/Asia/Baku
 OLD_FILES+=usr/share/zoneinfo/Asia/Bangkok
 OLD_FILES+=usr/share/zoneinfo/Asia/Beirut
 OLD_FILES+=usr/share/zoneinfo/Asia/Bishkek
 OLD_FILES+=usr/share/zoneinfo/Asia/Brunei
 OLD_FILES+=usr/share/zoneinfo/Asia/Chita
 OLD_FILES+=usr/share/zoneinfo/Asia/Choibalsan
 OLD_FILES+=usr/share/zoneinfo/Asia/Colombo
 OLD_FILES+=usr/share/zoneinfo/Asia/Damascus
 OLD_FILES+=usr/share/zoneinfo/Asia/Dhaka
 OLD_FILES+=usr/share/zoneinfo/Asia/Dili
 OLD_FILES+=usr/share/zoneinfo/Asia/Dubai
 OLD_FILES+=usr/share/zoneinfo/Asia/Dushanbe
 OLD_FILES+=usr/share/zoneinfo/Asia/Gaza
 OLD_FILES+=usr/share/zoneinfo/Asia/Hebron
 OLD_FILES+=usr/share/zoneinfo/Asia/Ho_Chi_Minh
 OLD_FILES+=usr/share/zoneinfo/Asia/Hong_Kong
 OLD_FILES+=usr/share/zoneinfo/Asia/Hovd
 OLD_FILES+=usr/share/zoneinfo/Asia/Irkutsk
 OLD_FILES+=usr/share/zoneinfo/Asia/Istanbul
 OLD_FILES+=usr/share/zoneinfo/Asia/Jakarta
 OLD_FILES+=usr/share/zoneinfo/Asia/Jayapura
 OLD_FILES+=usr/share/zoneinfo/Asia/Jerusalem
 OLD_FILES+=usr/share/zoneinfo/Asia/Kabul
 OLD_FILES+=usr/share/zoneinfo/Asia/Kamchatka
 OLD_FILES+=usr/share/zoneinfo/Asia/Karachi
 OLD_FILES+=usr/share/zoneinfo/Asia/Kathmandu
 OLD_FILES+=usr/share/zoneinfo/Asia/Khandyga
 OLD_FILES+=usr/share/zoneinfo/Asia/Kolkata
 OLD_FILES+=usr/share/zoneinfo/Asia/Krasnoyarsk
 OLD_FILES+=usr/share/zoneinfo/Asia/Kuala_Lumpur
 OLD_FILES+=usr/share/zoneinfo/Asia/Kuching
 OLD_FILES+=usr/share/zoneinfo/Asia/Kuwait
 OLD_FILES+=usr/share/zoneinfo/Asia/Macau
 OLD_FILES+=usr/share/zoneinfo/Asia/Magadan
 OLD_FILES+=usr/share/zoneinfo/Asia/Makassar
 OLD_FILES+=usr/share/zoneinfo/Asia/Manila
 OLD_FILES+=usr/share/zoneinfo/Asia/Muscat
 OLD_FILES+=usr/share/zoneinfo/Asia/Nicosia
 OLD_FILES+=usr/share/zoneinfo/Asia/Novokuznetsk
 OLD_FILES+=usr/share/zoneinfo/Asia/Novosibirsk
 OLD_FILES+=usr/share/zoneinfo/Asia/Omsk
 OLD_FILES+=usr/share/zoneinfo/Asia/Oral
 OLD_FILES+=usr/share/zoneinfo/Asia/Phnom_Penh
 OLD_FILES+=usr/share/zoneinfo/Asia/Pontianak
 OLD_FILES+=usr/share/zoneinfo/Asia/Pyongyang
 OLD_FILES+=usr/share/zoneinfo/Asia/Qatar
 OLD_FILES+=usr/share/zoneinfo/Asia/Qyzylorda
 OLD_FILES+=usr/share/zoneinfo/Asia/Rangoon
 OLD_FILES+=usr/share/zoneinfo/Asia/Riyadh
 OLD_FILES+=usr/share/zoneinfo/Asia/Sakhalin
 OLD_FILES+=usr/share/zoneinfo/Asia/Samarkand
 OLD_FILES+=usr/share/zoneinfo/Asia/Seoul
 OLD_FILES+=usr/share/zoneinfo/Asia/Shanghai
 OLD_FILES+=usr/share/zoneinfo/Asia/Singapore
 OLD_FILES+=usr/share/zoneinfo/Asia/Srednekolymsk
 OLD_FILES+=usr/share/zoneinfo/Asia/Taipei
 OLD_FILES+=usr/share/zoneinfo/Asia/Tashkent
 OLD_FILES+=usr/share/zoneinfo/Asia/Tbilisi
 OLD_FILES+=usr/share/zoneinfo/Asia/Tehran
 OLD_FILES+=usr/share/zoneinfo/Asia/Thimphu
 OLD_FILES+=usr/share/zoneinfo/Asia/Tokyo
 OLD_FILES+=usr/share/zoneinfo/Asia/Ulaanbaatar
 OLD_FILES+=usr/share/zoneinfo/Asia/Urumqi
 OLD_FILES+=usr/share/zoneinfo/Asia/Ust-Nera
 OLD_FILES+=usr/share/zoneinfo/Asia/Vientiane
 OLD_FILES+=usr/share/zoneinfo/Asia/Vladivostok
 OLD_FILES+=usr/share/zoneinfo/Asia/Yakutsk
 OLD_FILES+=usr/share/zoneinfo/Asia/Yekaterinburg
 OLD_FILES+=usr/share/zoneinfo/Asia/Yerevan
 OLD_FILES+=usr/share/zoneinfo/Atlantic/Azores
 OLD_FILES+=usr/share/zoneinfo/Atlantic/Bermuda
 OLD_FILES+=usr/share/zoneinfo/Atlantic/Canary
 OLD_FILES+=usr/share/zoneinfo/Atlantic/Cape_Verde
 OLD_FILES+=usr/share/zoneinfo/Atlantic/Faroe
 OLD_FILES+=usr/share/zoneinfo/Atlantic/Madeira
 OLD_FILES+=usr/share/zoneinfo/Atlantic/Reykjavik
 OLD_FILES+=usr/share/zoneinfo/Atlantic/South_Georgia
 OLD_FILES+=usr/share/zoneinfo/Atlantic/St_Helena
 OLD_FILES+=usr/share/zoneinfo/Atlantic/Stanley
 OLD_FILES+=usr/share/zoneinfo/Australia/Adelaide
 OLD_FILES+=usr/share/zoneinfo/Australia/Brisbane
 OLD_FILES+=usr/share/zoneinfo/Australia/Broken_Hill
 OLD_FILES+=usr/share/zoneinfo/Australia/Currie
 OLD_FILES+=usr/share/zoneinfo/Australia/Darwin
 OLD_FILES+=usr/share/zoneinfo/Australia/Eucla
 OLD_FILES+=usr/share/zoneinfo/Australia/Hobart
 OLD_FILES+=usr/share/zoneinfo/Australia/Lindeman
 OLD_FILES+=usr/share/zoneinfo/Australia/Lord_Howe
 OLD_FILES+=usr/share/zoneinfo/Australia/Melbourne
 OLD_FILES+=usr/share/zoneinfo/Australia/Perth
 OLD_FILES+=usr/share/zoneinfo/Australia/Sydney
 OLD_FILES+=usr/share/zoneinfo/CET
 OLD_FILES+=usr/share/zoneinfo/CST6CDT
 OLD_FILES+=usr/share/zoneinfo/EET
 OLD_FILES+=usr/share/zoneinfo/EST
 OLD_FILES+=usr/share/zoneinfo/EST5EDT
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+0
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+1
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+10
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+11
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+12
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+2
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+3
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+4
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+5
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+6
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+7
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+8
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+9
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-0
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-1
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-10
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-11
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-12
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-13
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-14
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-2
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-3
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-4
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-5
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-6
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-7
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-8
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-9
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT0
 OLD_FILES+=usr/share/zoneinfo/Etc/Greenwich
 OLD_FILES+=usr/share/zoneinfo/Etc/UCT
 OLD_FILES+=usr/share/zoneinfo/Etc/UTC
 OLD_FILES+=usr/share/zoneinfo/Etc/Universal
 OLD_FILES+=usr/share/zoneinfo/Etc/Zulu
 OLD_FILES+=usr/share/zoneinfo/Europe/Amsterdam
 OLD_FILES+=usr/share/zoneinfo/Europe/Andorra
 OLD_FILES+=usr/share/zoneinfo/Europe/Athens
 OLD_FILES+=usr/share/zoneinfo/Europe/Belgrade
 OLD_FILES+=usr/share/zoneinfo/Europe/Berlin
 OLD_FILES+=usr/share/zoneinfo/Europe/Bratislava
 OLD_FILES+=usr/share/zoneinfo/Europe/Brussels
 OLD_FILES+=usr/share/zoneinfo/Europe/Bucharest
 OLD_FILES+=usr/share/zoneinfo/Europe/Budapest
 OLD_FILES+=usr/share/zoneinfo/Europe/Busingen
 OLD_FILES+=usr/share/zoneinfo/Europe/Chisinau
 OLD_FILES+=usr/share/zoneinfo/Europe/Copenhagen
 OLD_FILES+=usr/share/zoneinfo/Europe/Dublin
 OLD_FILES+=usr/share/zoneinfo/Europe/Gibraltar
 OLD_FILES+=usr/share/zoneinfo/Europe/Guernsey
 OLD_FILES+=usr/share/zoneinfo/Europe/Helsinki
 OLD_FILES+=usr/share/zoneinfo/Europe/Isle_of_Man
 OLD_FILES+=usr/share/zoneinfo/Europe/Istanbul
 OLD_FILES+=usr/share/zoneinfo/Europe/Jersey
 OLD_FILES+=usr/share/zoneinfo/Europe/Kaliningrad
 OLD_FILES+=usr/share/zoneinfo/Europe/Kiev
 OLD_FILES+=usr/share/zoneinfo/Europe/Lisbon
 OLD_FILES+=usr/share/zoneinfo/Europe/Ljubljana
 OLD_FILES+=usr/share/zoneinfo/Europe/London
 OLD_FILES+=usr/share/zoneinfo/Europe/Luxembourg
 OLD_FILES+=usr/share/zoneinfo/Europe/Madrid
 OLD_FILES+=usr/share/zoneinfo/Europe/Malta
 OLD_FILES+=usr/share/zoneinfo/Europe/Mariehamn
 OLD_FILES+=usr/share/zoneinfo/Europe/Minsk
 OLD_FILES+=usr/share/zoneinfo/Europe/Monaco
 OLD_FILES+=usr/share/zoneinfo/Europe/Moscow
 OLD_FILES+=usr/share/zoneinfo/Europe/Nicosia
 OLD_FILES+=usr/share/zoneinfo/Europe/Oslo
 OLD_FILES+=usr/share/zoneinfo/Europe/Paris
 OLD_FILES+=usr/share/zoneinfo/Europe/Podgorica
 OLD_FILES+=usr/share/zoneinfo/Europe/Prague
 OLD_FILES+=usr/share/zoneinfo/Europe/Riga
 OLD_FILES+=usr/share/zoneinfo/Europe/Rome
 OLD_FILES+=usr/share/zoneinfo/Europe/Samara
 OLD_FILES+=usr/share/zoneinfo/Europe/San_Marino
 OLD_FILES+=usr/share/zoneinfo/Europe/Sarajevo
 OLD_FILES+=usr/share/zoneinfo/Europe/Simferopol
 OLD_FILES+=usr/share/zoneinfo/Europe/Skopje
 OLD_FILES+=usr/share/zoneinfo/Europe/Sofia
 OLD_FILES+=usr/share/zoneinfo/Europe/Stockholm
 OLD_FILES+=usr/share/zoneinfo/Europe/Tallinn
 OLD_FILES+=usr/share/zoneinfo/Europe/Tirane
 OLD_FILES+=usr/share/zoneinfo/Europe/Uzhgorod
 OLD_FILES+=usr/share/zoneinfo/Europe/Vaduz
 OLD_FILES+=usr/share/zoneinfo/Europe/Vatican
 OLD_FILES+=usr/share/zoneinfo/Europe/Vienna
 OLD_FILES+=usr/share/zoneinfo/Europe/Vilnius
 OLD_FILES+=usr/share/zoneinfo/Europe/Volgograd
 OLD_FILES+=usr/share/zoneinfo/Europe/Warsaw
 OLD_FILES+=usr/share/zoneinfo/Europe/Zagreb
 OLD_FILES+=usr/share/zoneinfo/Europe/Zaporozhye
 OLD_FILES+=usr/share/zoneinfo/Europe/Zurich
 OLD_FILES+=usr/share/zoneinfo/Factory
 OLD_FILES+=usr/share/zoneinfo/HST
 OLD_FILES+=usr/share/zoneinfo/Indian/Antananarivo
 OLD_FILES+=usr/share/zoneinfo/Indian/Chagos
 OLD_FILES+=usr/share/zoneinfo/Indian/Christmas
 OLD_FILES+=usr/share/zoneinfo/Indian/Cocos
 OLD_FILES+=usr/share/zoneinfo/Indian/Comoro
 OLD_FILES+=usr/share/zoneinfo/Indian/Kerguelen
 OLD_FILES+=usr/share/zoneinfo/Indian/Mahe
 OLD_FILES+=usr/share/zoneinfo/Indian/Maldives
 OLD_FILES+=usr/share/zoneinfo/Indian/Mauritius
 OLD_FILES+=usr/share/zoneinfo/Indian/Mayotte
 OLD_FILES+=usr/share/zoneinfo/Indian/Reunion
 OLD_FILES+=usr/share/zoneinfo/MET
 OLD_FILES+=usr/share/zoneinfo/MST
 OLD_FILES+=usr/share/zoneinfo/MST7MDT
 OLD_FILES+=usr/share/zoneinfo/PST8PDT
 OLD_FILES+=usr/share/zoneinfo/Pacific/Apia
 OLD_FILES+=usr/share/zoneinfo/Pacific/Auckland
 OLD_FILES+=usr/share/zoneinfo/Pacific/Bougainville
 OLD_FILES+=usr/share/zoneinfo/Pacific/Chatham
 OLD_FILES+=usr/share/zoneinfo/Pacific/Chuuk
 OLD_FILES+=usr/share/zoneinfo/Pacific/Easter
 OLD_FILES+=usr/share/zoneinfo/Pacific/Efate
 OLD_FILES+=usr/share/zoneinfo/Pacific/Enderbury
 OLD_FILES+=usr/share/zoneinfo/Pacific/Fakaofo
 OLD_FILES+=usr/share/zoneinfo/Pacific/Fiji
 OLD_FILES+=usr/share/zoneinfo/Pacific/Funafuti
 OLD_FILES+=usr/share/zoneinfo/Pacific/Galapagos
 OLD_FILES+=usr/share/zoneinfo/Pacific/Gambier
 OLD_FILES+=usr/share/zoneinfo/Pacific/Guadalcanal
 OLD_FILES+=usr/share/zoneinfo/Pacific/Guam
 OLD_FILES+=usr/share/zoneinfo/Pacific/Honolulu
 OLD_FILES+=usr/share/zoneinfo/Pacific/Johnston
 OLD_FILES+=usr/share/zoneinfo/Pacific/Kiritimati
 OLD_FILES+=usr/share/zoneinfo/Pacific/Kosrae
 OLD_FILES+=usr/share/zoneinfo/Pacific/Kwajalein
 OLD_FILES+=usr/share/zoneinfo/Pacific/Majuro
 OLD_FILES+=usr/share/zoneinfo/Pacific/Marquesas
 OLD_FILES+=usr/share/zoneinfo/Pacific/Midway
 OLD_FILES+=usr/share/zoneinfo/Pacific/Nauru
 OLD_FILES+=usr/share/zoneinfo/Pacific/Niue
 OLD_FILES+=usr/share/zoneinfo/Pacific/Norfolk
 OLD_FILES+=usr/share/zoneinfo/Pacific/Noumea
 OLD_FILES+=usr/share/zoneinfo/Pacific/Pago_Pago
 OLD_FILES+=usr/share/zoneinfo/Pacific/Palau
 OLD_FILES+=usr/share/zoneinfo/Pacific/Pitcairn
 OLD_FILES+=usr/share/zoneinfo/Pacific/Pohnpei
 OLD_FILES+=usr/share/zoneinfo/Pacific/Port_Moresby
 OLD_FILES+=usr/share/zoneinfo/Pacific/Rarotonga
 OLD_FILES+=usr/share/zoneinfo/Pacific/Saipan
 OLD_FILES+=usr/share/zoneinfo/Pacific/Tahiti
 OLD_FILES+=usr/share/zoneinfo/Pacific/Tarawa
 OLD_FILES+=usr/share/zoneinfo/Pacific/Tongatapu
 OLD_FILES+=usr/share/zoneinfo/Pacific/Wake
 OLD_FILES+=usr/share/zoneinfo/Pacific/Wallis
 OLD_FILES+=usr/share/zoneinfo/UTC
 OLD_FILES+=usr/share/zoneinfo/WET
 OLD_FILES+=usr/share/zoneinfo/posixrules
 OLD_FILES+=usr/share/zoneinfo/zone.tab
 .endif