diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 1d0766ec894a..29cf25e152e6 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -1,11972 +1,11981 @@
 #
 # $FreeBSD$
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
 # removed entries first (with the date as a comment). Dynamic libraries are
 # special cased (OLD_LIBS). Static libraries or the generic links to
 # the dynamic libraries (lib*.so) should (if you don't know why to make an
 # exception, make this a "must") be viewed as normal files (OLD_FILES).
 #
 # In case of a complete directory hierarchy the sorting is in depth first
 # order.
 #
 # 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 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 OLD_DIRS check-old | \
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20210125: ndis driver support removed
+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/ndiscvt.8.gz
+OLD_FILES+=usr/share/man/man8/ndisgen.8.gz
+OLD_FILES+=usr/share/misc/windrv_stub.c
+
 # 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/sbin/bt3cfw
 OLD_FILES+=usr/share/man/man4/cmw.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
 
 # 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
 
 # 20201225: libregex removed
 OLD_FILES+=usr/lib/libgnuregex.so
 OLD_LIBS+=usr/lib/libgnuregex.so.5
 OLD_FILES+=usr/lib/libgnuregex_p.a
 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
 
 # 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
 
 # 20201124: ping6(8) was merged into ping(8)
 OLD_FILES+=usr/lib/debug/sbin/ping6.debug
 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
 
 # 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
 
 # 20200825: merged OpenZFS support
 OLD_LIBS+=lib/libzfs.so.3
 OLD_LIBS+=usr/lib32/libzfs.so.3
 
 # 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
 
 # 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
 .if !defined(WITH_PORT_BASE_BINUTILS)
 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/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
 .endif
 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_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
 OLD_DIRS+=usr/include/private/event
 
 # 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
 
 # 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 ubsec(4)
 OLD_FILES+=usr/share/man/man4/ubsec.4.gz
 
 # 20200506: GNU objdump 2.17.50 retired
 OLD_FILES+=usr/bin/objdump
 OLD_FILES+=usr/share/man/man1/objdump.1.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/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
 
 # 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
 
 # 20200229: GCC 4.2.1 removed
 .if !defined(WITH_PORT_BASE_GCC)
 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
 .endif
 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
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libstdc++.a
 OLD_FILES+=usr/lib32/libstdc++.so
 OLD_LIBS+=usr/lib32/libstdc++.so.6
 OLD_FILES+=usr/lib32/libstdc++_p.a
 OLD_FILES+=usr/lib32/libsupc++.a
 OLD_FILES+=usr/lib32/libsupc++.so
 OLD_LIBS+=usr/lib32/libsupc++.so.1
 OLD_FILES+=usr/lib32/libsupc++_p.a
 .endif
 OLD_LIBS+=usr/lib/libgomp.so.1
 OLD_FILES+=usr/lib/libgomp_p.a
 OLD_FILES+=usr/lib32/libgcov.a
 OLD_FILES+=usr/lib32/libgomp.a
 OLD_LIBS+=usr/lib32/libgomp.so.1
 OLD_FILES+=usr/lib32/libgomp_p.a
 OLD_FILES+=usr/libexec/cc1
 OLD_FILES+=usr/libexec/cc1plus
 OLD_FILES+=usr/share/man/man1/gcpp.1.gz
 OLD_FILES+=usr/share/man/man1/gperf.1.gz
 OLD_FILES+=usr/share/man/man1/gperf.7.gz
 
 # 20200220: Upgrade of ncurses, shlib bumped to version 9
 OLD_LIBS+=lib/libncurses.so.8
 OLD_LIBS+=lib/libncursesw.so.8
 OLD_LIBS+=usr/lib32/libncurses.so.8
 OLD_LIBS+=usr/lib32/libncursesw.so.8
 
 # 20200206: Remove elf2aout
 OLD_FILES+=usr/bin/elf2aout
 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/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
 
 # 20191229: GEOM_SCHED class and gsched tool removed
 OLD_FILES+=sbin/gsched
 OLD_LIBS+=lib/geom/geom_sched.so
 
 # 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
 # 20191214: Removal of sranddev(3)
 OLD_FILES+=usr/share/man/man3/sranddev.3.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
 # 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
 OLD_FILES+=usr/lib32/libc++fs.a
 # 20191003: Remove useless ZFS tests
 OLD_FILES+=usr/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_013_neg.ksh
 OLD_FILES+=usr/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_014_neg.ksh
 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
 OLD_FILES+=boot/boot1.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
 # 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/casper/libcap_random.so
 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
 # 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/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
 OLD_FILES+=usr/lib32/libprivateifconfig.a
 OLD_FILES+=usr/lib32/libprivateifconfig_p.a
 # 20190131: pfil(9) changed
 OLD_FILES+=usr/share/man/man9/pfil_hook_get.9.gz
 OLD_FILES+=usr/share/man/man9/pfil_rlock.9.gz
 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
 OLD_LIBS+=usr/lib32/libufs.so.6
 # 20181112: Cleanup old libcap_dns.
 OLD_LIBS+=lib/casper/libcap_dns.so.1
 OLD_LIBS+=usr/lib32/libcap_dns.so.1
 # 20181030: malloc_domain(9) KPI change
 OLD_FILES+=usr/share/man/man9/malloc_domain.9.gz
 # 20181026: joy(4) removal
 OLD_FILES+=usr/share/man/man4/joy.4.gz
 # 20181025: OpenSSL libraries version bump to avoid conflict with ports
 OLD_LIBS+=lib/libcrypto.so.9
 OLD_LIBS+=usr/lib/libssl.so.9
 OLD_LIBS+=usr/lib32/libcrypto.so.9
 OLD_LIBS+=usr/lib32/libssl.so.9
 # 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
 OLD_LIBS+=usr/lib32/libcap_sysctl.so.0
 OLD_LIBS+=usr/lib32/libcap_grp.so.0
 OLD_LIBS+=usr/lib32/libcap_pwd.so.0
 OLD_LIBS+=usr/lib32/libcap_random.so.0
 OLD_LIBS+=usr/lib32/libcap_dns.so.0
 OLD_LIBS+=usr/lib32/libcap_syslog.so.0
 # 20181012: rename of ixlv(4) to iavf(4)
 OLD_FILES+=usr/share/man/man4/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/lib/debug/usr/lib/engines/lib4758cca.so.debug
 OLD_FILES+=usr/lib/debug/usr/lib/engines/libaep.so.debug
 OLD_FILES+=usr/lib/debug/usr/lib/engines/libatalla.so.debug
 OLD_FILES+=usr/lib/debug/usr/lib/engines/libcapi.so.debug
 OLD_FILES+=usr/lib/debug/usr/lib/engines/libchil.so.debug
 OLD_FILES+=usr/lib/debug/usr/lib/engines/libcswift.so.debug
 OLD_FILES+=usr/lib/debug/usr/lib/engines/libgost.so.debug
 OLD_FILES+=usr/lib/debug/usr/lib/engines/libnuron.so.debug
 OLD_FILES+=usr/lib/debug/usr/lib/engines/libsureware.so.debug
 OLD_FILES+=usr/lib/debug/usr/lib/engines/libubsec.so.debug
 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_get_ex_new_index.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_ecdh_auto.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_SESSION_get_ex_new_index.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_ex_new_index.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_ecdh_auto.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/d2i_X509_bio.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/d2i_X509_fp.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/i2d_X509_bio.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/i2d_X509_fp.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/libcrypto.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
 OLD_LIBS+=usr/lib32/libssl.so.8
 # 20180824: libbe(3) SHLIBDIR fixed to reflect correct location
 OLD_LIBS+=usr/lib/libbe.so.1
 # 20180819: Remove deprecated arc4random(3) stir/addrandom interfaces
 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
 # 20180725: Cleanup old libcasper.so.0
 OLD_LIBS+=lib/libcasper.so.0
 OLD_LIBS+=usr/lib32/libcasper.so.0
 # 20180722: indent(1) option renamed, test files follow
 OLD_FILES+=usr/bin/indent/tests/nsac.0
 OLD_FILES+=usr/bin/indent/tests/nsac.0.pro
 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
 OLD_LIBS+=usr/lib/libmlx5.so.1
 OLD_LIBS+=usr/lib/libibverbs.so.1
 # 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
 # 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
 OLD_LIBS+=usr/lib32/libproc.so.4
 # 20171203: new clang import which bumps version from 5.0.0 to 5.0.1.
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/asan_interface.h
 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: 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
 OLD_FILES+=usr/lib32/libcap_dns.a
 OLD_FILES+=usr/lib32/libcap_dns_p.a
 OLD_FILES+=usr/lib32/libcap_grp.a
 OLD_FILES+=usr/lib32/libcap_grp_p.a
 OLD_FILES+=usr/lib32/libcap_pwd.a
 OLD_FILES+=usr/lib32/libcap_pwd_p.a
 OLD_FILES+=usr/lib32/libcap_random.a
 OLD_FILES+=usr/lib32/libcap_random_p.a
 OLD_FILES+=usr/lib32/libcap_sysctl.a
 OLD_FILES+=usr/lib32/libcap_sysctl_p.a
 OLD_FILES+=usr/lib32/libcasper.a
 OLD_FILES+=usr/lib32/libcasper_p.a
 # 20171031: Removal of adding_user man page
 OLD_FILES+=usr/share/man/man7/adding_user.7.gz
 # 20171031: Disconnected libpathconv tests
 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/lib32/libstand.a
 OLD_FILES+=usr/lib32/libstand_p.a
 OLD_FILES+=usr/include/stand.h
 OLD_FILES+=usr/share/man/man3/libstand.3.gz
 # 20171003: remove RCMDS
 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
 # 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
 # 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
 OLD_FILES+=usr/lib32/libifc.a
 OLD_FILES+=usr/lib32/libifc_p.a
 OLD_FILES+=usr/lib32/libifconfig.a
 OLD_FILES+=usr/lib32/libifconfig_p.a
 # 20170529: mount.conf(8) -> mount.conf(5)
 OLD_FILES+=usr/share/man/man8/mount.conf.8.gz
 # 20170525: remove misleading template
 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
 OLD_LIBS+=usr/lib32/libzfs.so.2
 OLD_LIBS+=usr/lib32/libarchive.so.6
 OLD_LIBS+=usr/lib32/libmilter.so.5
 # 20170427: NATM configuration support removed
 OLD_FILES+=etc/rc.d/atm1
 OLD_FILES+=etc/rc.d/atm2
 OLD_FILES+=etc/rc.d/atm3
 # 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/debug/sbin/atmconfig.debug
 OLD_FILES+=usr/lib/debug/usr/lib/snmp_atm.so.6.debug
 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
 # 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
 # 20170206: remove bdes(1)
 OLD_FILES+=usr/bin/bdes
 OLD_FILES+=usr/lib/debug/usr/bin/bdes.debug
 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_LIBS+=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
 OLD_LIBS+=usr/lib32/libproc.so.3
 # 20161127: Remove vm_page_cache(9)
 OLD_FILES+=usr/share/man/man9/vm_page_cache.9.gz
 # 20161124: new clang import which bumps version from 3.8.0 to 3.9.0.
 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/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
 OLD_LIBS+=usr/lib32/libpam.so.5
 OLD_LIBS+=usr/lib32/pam_chroot.so.5
 OLD_LIBS+=usr/lib32/pam_deny.so.5
 OLD_LIBS+=usr/lib32/pam_echo.so.5
 OLD_LIBS+=usr/lib32/pam_exec.so.5
 OLD_LIBS+=usr/lib32/pam_ftpusers.so.5
 OLD_LIBS+=usr/lib32/pam_group.so.5
 OLD_LIBS+=usr/lib32/pam_guest.so.5
 OLD_LIBS+=usr/lib32/pam_krb5.so.5
 OLD_LIBS+=usr/lib32/pam_ksu.so.5
 OLD_LIBS+=usr/lib32/pam_lastlog.so.5
 OLD_LIBS+=usr/lib32/pam_login_access.so.5
 OLD_LIBS+=usr/lib32/pam_nologin.so.5
 OLD_LIBS+=usr/lib32/pam_opie.so.5
 OLD_LIBS+=usr/lib32/pam_opieaccess.so.5
 OLD_LIBS+=usr/lib32/pam_passwdqc.so.5
 OLD_LIBS+=usr/lib32/pam_permit.so.5
 OLD_LIBS+=usr/lib32/pam_radius.so.5
 OLD_LIBS+=usr/lib32/pam_rhosts.so.5
 OLD_LIBS+=usr/lib32/pam_rootok.so.5
 OLD_LIBS+=usr/lib32/pam_securetty.so.5
 OLD_LIBS+=usr/lib32/pam_self.so.5
 OLD_LIBS+=usr/lib32/pam_ssh.so.5
 OLD_LIBS+=usr/lib32/pam_tacplus.so.5
 OLD_LIBS+=usr/lib32/pam_unix.so.5
 # 20160523: remove extranous ALTQ files
 OLD_FILES+=usr/include/altq/altq_codel.h
 OLD_FILES+=usr/include/altq/altq_fairq.h
 # 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_LIBS+=usr/lib32/libkvm.so.6
 OLD_FILES+=usr/share/man/man3/kvm_getfiles.3.gz
 # 20160423: remove mroute6d
 OLD_FILES+=etc/rc.d/mroute6d
 # 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
 OLD_LIBS+=usr/lib32/libdevinfo.so.5
 # 20160305: new clang import which bumps version from 3.7.1 to 3.8.0.
 OLD_FILES+=usr/bin/macho-dump
 OLD_FILES+=usr/bin/tblgen
 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
 # 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
 OLD_FILES+=usr/lib32/libcapsicum.a
 OLD_FILES+=usr/lib32/libcapsicum.so
 OLD_LIBS+=usr/lib32/libcapsicum.so.0
 OLD_FILES+=usr/lib32/libcapsicum_p.a
 # 20160223: functionality from mkulzma(1) merged into mkuzip(1)
 OLD_FILES+=usr/bin/mkulzma
 OLD_FILES+=usr/share/man/man4/geom_uncompress.4.gz
 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)
 OLD_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
 OLD_LIBS+=usr/lib32/libcrypto.so.7
 OLD_LIBS+=usr/lib32/libssl.so.7
 # 20151029: LinuxKPI moved to sys/compat/linuxkpi
 OLD_FILES+=usr/include/dev/usb/usb_compat_linux.h
 # 20151015: test symbols moved to /usr/lib/debug
 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
 OLD_LIBS+=usr/lib32/libugidfw.so.4
 # 20150604: Move nvlist man pages to section 9.
 OLD_FILES+=usr/share/man/man3/libnv.3.gz
 OLD_FILES+=usr/share/man/man3/nv.3.gz
 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
 OLD_FILES+=usr/lib32/libheimsqlite.a
 OLD_FILES+=usr/lib32/libheimsqlite.so
 OLD_LIBS+=usr/lib32/libheimsqlite.so.11
 OLD_FILES+=usr/lib32/libheimsqlite_p.a
 # 20150506
 OLD_FILES+=usr/share/man/man9/NDHASGIANT.9.gz
 # 20150504
 OLD_FILES+=usr/share/examples/etc/libmap32.conf
 OLD_FILES+=usr/include/bsdstat.h
 OLD_LIBS+=usr/lib32/private/libatf-c++.so.2
 OLD_LIBS+=usr/lib32/private/libbsdstat.so.1
 OLD_LIBS+=usr/lib32/private/libheimipcs.so.11
 OLD_LIBS+=usr/lib32/private/libsqlite3.so.0
 OLD_LIBS+=usr/lib32/private/libunbound.so.5
 OLD_LIBS+=usr/lib32/private/libatf-c.so.1
 OLD_LIBS+=usr/lib32/private/libheimipcc.so.11
 OLD_LIBS+=usr/lib32/private/libldns.so.5
 OLD_LIBS+=usr/lib32/private/libssh.so.5
 OLD_LIBS+=usr/lib32/private/libucl.so.1
 OLD_DIRS+=usr/lib32/private
 OLD_LIBS+=usr/lib/private/libatf-c++.so.2
 OLD_LIBS+=usr/lib/private/libbsdstat.so.1
 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/lib/libgpib_p.a
 OLD_FILES+=usr/lib32/libgpib.a
 OLD_FILES+=usr/lib32/libgpib_p.a
 OLD_FILES+=usr/lib32/libgpib.so
 OLD_LIBS+=usr/lib32/libgpib.so.3
 OLD_FILES+=usr/share/man/man3/gpib.3.gz
 OLD_FILES+=usr/share/man/man3/ibclr.3.gz
 OLD_FILES+=usr/share/man/man3/ibdev.3.gz
 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
 OLD_LIBS+=usr/lib/libxo.so.0
 # 20141223: remove in6_gif.h, in_gif.h and if_stf.h
 OLD_FILES+=usr/include/net/if_stf.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+=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
 OLD_LIBS+=usr/lib32/libproc.so.2
 # 20140922: sleepq_calc_signal_retval.9 and sleepq_catch_signals.9 removed
 OLD_FILES+=usr/share/man/man9/sleepq_calc_signal_retval.9.gz
 OLD_FILES+=usr/share/man/man9/sleepq_catch_signals.9.gz
 # 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
 OLD_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
 OLD_LIBS+=usr/lib32/libopie.so.7
 # 20140811: otp-sha renamed to otp-sha1
 OLD_FILES+=usr/bin/otp-sha
 OLD_FILES+=usr/share/man/man1/otp-sha.1.gz
 # 20140807: Remove private lib files that should not be installed.
 OLD_FILES+=usr/lib32/private/libatf-c.a
 OLD_FILES+=usr/lib32/private/libatf-c.so
 OLD_FILES+=usr/lib32/private/libatf-c_p.a
 OLD_FILES+=usr/lib32/private/libatf-c++.a
 OLD_FILES+=usr/lib32/private/libatf-c++.so
 OLD_FILES+=usr/lib32/private/libatf-c++_p.a
 OLD_FILES+=usr/lib32/private/libbsdstat.a
 OLD_FILES+=usr/lib32/private/libbsdstat.so
 OLD_FILES+=usr/lib32/private/libbsdstat_p.a
 OLD_FILES+=usr/lib32/private/libheimipcc.a
 OLD_FILES+=usr/lib32/private/libheimipcc.so
 OLD_FILES+=usr/lib32/private/libheimipcc_p.a
 OLD_FILES+=usr/lib32/private/libheimipcs.a
 OLD_FILES+=usr/lib32/private/libheimipcs.so
 OLD_FILES+=usr/lib32/private/libheimipcs_p.a
 OLD_FILES+=usr/lib32/private/libldns.a
 OLD_FILES+=usr/lib32/private/libldns.so
 OLD_FILES+=usr/lib32/private/libldns_p.a
 OLD_FILES+=usr/lib32/private/libssh.a
 OLD_FILES+=usr/lib32/private/libssh.so
 OLD_FILES+=usr/lib32/private/libssh_p.a
 OLD_FILES+=usr/lib32/private/libunbound.a
 OLD_FILES+=usr/lib32/private/libunbound.so
 OLD_FILES+=usr/lib32/private/libunbound_p.a
 OLD_FILES+=usr/lib32/private/libucl.a
 OLD_FILES+=usr/lib32/private/libucl.so
 OLD_FILES+=usr/lib32/private/libucl_p.a
 OLD_FILES+=usr/lib/private/libatf-c.a
 OLD_FILES+=usr/lib/private/libatf-c.so
 OLD_FILES+=usr/lib/private/libatf-c_p.a
 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
 OLD_LIBS+=usr/lib32/libsbuf.so.7
 # 20140728: Remove an obsolete man page
 OLD_FILES+=usr/share/man/man9/VOP_GETVOBJECT.9.gz
 OLD_FILES+=usr/share/man/man9/VOP_CREATEVOBJECT.9.gz
 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/lib32/libhistory.a
 OLD_FILES+=usr/lib32/libhistory.so
 OLD_LIBS+=usr/lib32/libhistory.so.8
 OLD_FILES+=usr/lib32/libhistory_p.a
 OLD_FILES+=usr/lib32/libreadline.a
 OLD_FILES+=usr/lib32/libreadline.so
 OLD_LIBS+=usr/lib32/libreadline.so.8
 OLD_FILES+=usr/lib32/libreadline_p.a
 OLD_FILES+=usr/include/readline/chardefs.h
 OLD_FILES+=usr/include/readline/history.h
 OLD_FILES+=usr/include/readline/keymaps.h
 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
 OLD_FILES+=usr/lib32/libssp_p.a
 OLD_FILES+=usr/lib32/libstand_p.a
 # 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/lib32/libipx.a
 OLD_FILES+=usr/lib32/libipx.so
 OLD_LIBS+=usr/lib32/libipx.so.5
 OLD_FILES+=usr/lib32/libipx_p.a
 OLD_FILES+=usr/sbin/IPXrouted
 OLD_FILES+=usr/share/man/man3/ipx.3.gz
 OLD_FILES+=usr/share/man/man3/ipx_addr.3.gz
 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
 OLD_FILES+=usr/lib32/private/libyaml.a
 OLD_FILES+=usr/lib32/private/libyaml.so
 OLD_LIBS+=usr/lib32/private/libyaml.so.1
 OLD_FILES+=usr/lib32/private/libyaml_p.a
 # 20140216: new clang import which bumps version from 3.3 to 3.4.
 OLD_FILES+=usr/bin/llvm-prof
 OLD_FILES+=usr/include/clang/3.3/__wmmintrin_aes.h
 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/lib32/libelf.so.1
 OLD_LIBS+=usr/lib/libdwarf.so.3
 OLD_LIBS+=usr/lib32/libdwarf.so.3
 # 20140123: apicvar header moved to x86
 OLD_FILES+=usr/include/machine/apicvar.h
 # 20131215: libcam version bumped
 OLD_LIBS+=lib/libcam.so.6 usr/lib32/libcam.so.6
 # 20131202: libcapsicum and libcasper moved to /lib/
 OLD_LIBS+=usr/lib/libcapsicum.so.0
 OLD_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
 OLD_FILES+=usr/lib32/libiconv.a
 OLD_FILES+=usr/lib32/libiconv.so
 OLD_LIBS+=usr/lib32/libiconv.so.3
 OLD_FILES+=usr/lib32/libiconv_p.a
 # 20131103: removal of utxrm(8), use 'utx rm' instead.
 OLD_FILES+=usr/sbin/utxrm
 OLD_FILES+=usr/share/man/man8/utxrm.8.gz
 # 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/lib32/libbsdyml.a
 OLD_FILES+=usr/lib32/libbsdyml.so
 OLD_LIBS+=usr/lib32/libbsdyml.so.0
 OLD_FILES+=usr/lib32/libbsdyml_p.a
 OLD_FILES+=usr/share/man/man3/libbsdyml.3.gz
 OLD_FILES+=usr/include/bsdyml.h
 # 20131013: Removal of the ATF tools
 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
 OLD_FILES+=usr/lib32/libssh.a
 OLD_FILES+=usr/lib32/libssh.so
 OLD_LIBS+=usr/lib32/libssh.so.5
 OLD_FILES+=usr/lib32/libssh_p.a
 # 20130903: gnupatch is no more
 OLD_FILES+=usr/bin/gnupatch
 OLD_FILES+=usr/share/man/man1/gnupatch.1.gz
 # 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
 OLD_LIBS+=usr/lib32/libkvm.so.5
 # 20130623: dialog update from 1.1 to 1.2
 OLD_LIBS+=usr/lib/libdialog.so.7
 OLD_LIBS+=usr/lib32/libdialog.so.7
 # 20130616: vfs_mount.9 removed
 OLD_FILES+=usr/share/man/man9/vfs_mount.9.gz
 # 20130614: remove CVS from base
 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
 OLD_FILES+=usr/lib32/libufs.so.6.symbols
 # 20130417: nfs fha moved from nfsserver to nfs
 OLD_FILES+=usr/include/nfsserver/nfs_fha.h
 # 20130411: new clang import which bumps version from 3.2 to 3.3.
 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/lib32/libncp.a
 OLD_FILES+=usr/lib32/libncp.so
 OLD_LIBS+=usr/lib32/libncp.so.4
 OLD_FILES+=usr/lib32/libncp_p.a
 OLD_FILES+=usr/sbin/mount_nwfs
 OLD_FILES+=usr/share/examples/nwclient/dot.nwfsrc
 OLD_FILES+=usr/share/examples/nwclient/nwfs.sh.sample
 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 usr/lib32/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_LIBS+=usr/lib32/libcrypto.so.6
 OLD_LIBS+=usr/lib32/libssl.so.6
 OLD_FILES+=usr/include/openssl/aes_locl.h
 OLD_FILES+=usr/include/openssl/bio_lcl.h
 OLD_FILES+=usr/include/openssl/e_os.h
 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_LIBS+=usr/lib32/libmd.so.5
 OLD_FILES+=usr/share/man/man3/MD2Data.3.gz
 OLD_FILES+=usr/share/man/man3/MD2End.3.gz
 OLD_FILES+=usr/share/man/man3/MD2File.3.gz
 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_LIBS+=usr/lib32/libusb.so.2
 OLD_FILES+=usr/share/man/man3/libsub_get_active_config_descriptor.3.gz
 # 20120415: new clang import which bumps version from 3.0 to 3.1
 OLD_FILES+=usr/include/clang/3.0/altivec.h
 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 \
 	usr/lib32/libasn1.so.10 \
 	usr/lib32/libhdb.so.10 \
 	usr/lib32/libheimntlm.so.10 \
 	usr/lib32/libhx509.so.10 \
 	usr/lib32/libkadm5clnt.so.10 \
 	usr/lib32/libkadm5srv.so.10 \
 	usr/lib32/libkafs5.so.10 \
 	usr/lib32/libkrb5.so.10 \
 	usr/lib32/libroken.so.10
 # 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
 OLD_LIBS+=usr/lib32/libarchive.so.5
 # 20120113: removal of wtmpcvt(1)
 OLD_FILES+=usr/bin/wtmpcvt
 OLD_FILES+=usr/share/man/man1/wtmpcvt.1.gz
 # 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
 OLD_FILES+=usr/lib32/libodialog.a
 OLD_FILES+=usr/lib32/libodialog.so
 OLD_LIBS+=usr/lib32/libodialog.so.7
 OLD_FILES+=usr/lib32/libodialog_p.a
 # 20110930: sysinstall removed
 OLD_FILES+=usr/sbin/sysinstall
 OLD_FILES+=usr/share/man/man8/sysinstall.8.gz
 OLD_FILES+=usr/lib/libftpio.a
 OLD_FILES+=usr/lib/libftpio.so
 OLD_LIBS+=usr/lib/libftpio.so.8
 OLD_FILES+=usr/lib/libftpio_p.a
 OLD_FILES+=usr/lib32/libftpio.a
 OLD_FILES+=usr/lib32/libftpio.so
 OLD_LIBS+=usr/lib32/libftpio.so.8
 OLD_FILES+=usr/lib32/libftpio_p.a
 OLD_FILES+=usr/include/ftpio.h
 OLD_FILES+=usr/share/man/man3/ftpio.3.gz
 # 20110915: rename congestion control manpages
 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
 OLD_LIBS+=usr/lib32/libcam.so.5
 OLD_LIBS+=usr/lib32/libpcap.so.7
 OLD_LIBS+=usr/lib32/libufs.so.5
 OLD_LIBS+=usr/lib32/libbsnmp.so.5
 OLD_LIBS+=usr/lib32/libdwarf.so.2
 OLD_LIBS+=usr/lib32/libopie.so.6
 OLD_LIBS+=usr/lib32/librtld_db.so.1
 OLD_LIBS+=usr/lib32/libtacplus.so.4
 # 20110817: no more acd.4, ad.4, afd.4 and ast.4
 OLD_FILES+=usr/share/man/man4/acd.4.gz
 OLD_FILES+=usr/share/man/man4/ad.4.gz
 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
 OLD_FILES+=usr/lib32/libpkg.a
 OLD_FILES+=usr/lib32/libpkg.so
 OLD_LIBS+=usr/lib32/libpkg.so.0
 OLD_FILES+=usr/lib32/libpkg_p.a
 # 20110517: libsbuf version bump
 OLD_LIBS+=lib/libsbuf.so.5
 OLD_LIBS+=usr/lib32/libsbuf.so.5
 # 20110502: new clang import which bumps version from 2.9 to 3.0
 OLD_FILES+=usr/include/clang/2.9/emmintrin.h
 OLD_FILES+=usr/include/clang/2.9/mm_malloc.h
 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
 OLD_FILES+=usr/lib32/libobjc.a
 OLD_FILES+=usr/lib32/libobjc.so
 OLD_FILES+=usr/lib32/libobjc_p.a
 OLD_LIBS+=usr/lib32/libobjc.so.4
 # 20110331: firmware.img created at build time
 OLD_FILES+=usr/share/examples/kld/firmware/fwimage/firmware.img
 # 20110224: sticky.8 -> sticky.7
 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
 OLD_LIBS+=usr/lib32/liblzma.so.0
 # 20100511: move GCC-specific headers to /usr/include/gcc
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/emmintrin.h
 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
 OLD_LIBS+=usr/lib32/libz.so.5
 # 20100314: removal of regexp.h
 OLD_FILES+=usr/include/regexp.h
 OLD_FILES+=usr/share/man/man3/regexp.3.gz
 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
 OLD_LIBS+=usr/lib32/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
 # 20091117: usr/share/zoneinfo/GMT link removed
 OLD_FILES+=usr/share/zoneinfo/GMT
 # 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
 OLD_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
 OLD_LIBS+=usr/lib32/libalias.so.6
 OLD_LIBS+=usr/lib32/libarchive.so.4
 OLD_LIBS+=usr/lib32/libauditd.so.4
 OLD_LIBS+=usr/lib32/libavl.so.1
 OLD_LIBS+=usr/lib32/libbegemot.so.3
 OLD_LIBS+=usr/lib32/libbluetooth.so.3
 OLD_LIBS+=usr/lib32/libbsdxml.so.3
 OLD_LIBS+=usr/lib32/libbsm.so.2
 OLD_LIBS+=usr/lib32/libbsnmp.so.4
 OLD_LIBS+=usr/lib32/libbz2.so.3
 OLD_LIBS+=usr/lib32/libcalendar.so.4
 OLD_LIBS+=usr/lib32/libcam.so.4
 OLD_LIBS+=usr/lib32/libcom_err.so.4
 OLD_LIBS+=usr/lib32/libcrypt.so.4
 OLD_LIBS+=usr/lib32/libcrypto.so.5
 OLD_LIBS+=usr/lib32/libctf.so.1
 OLD_LIBS+=usr/lib32/libdevinfo.so.4
 OLD_LIBS+=usr/lib32/libdevstat.so.6
 OLD_LIBS+=usr/lib32/libdialog.so.6
 OLD_LIBS+=usr/lib32/libdtrace.so.1
 OLD_LIBS+=usr/lib32/libdwarf.so.1
 OLD_LIBS+=usr/lib32/libedit.so.6
 OLD_LIBS+=usr/lib32/libfetch.so.5
 OLD_LIBS+=usr/lib32/libform.so.4
 OLD_LIBS+=usr/lib32/libformw.so.4
 OLD_LIBS+=usr/lib32/libftpio.so.7
 OLD_LIBS+=usr/lib32/libgeom.so.4
 OLD_LIBS+=usr/lib32/libgnuregex.so.4
 OLD_LIBS+=usr/lib32/libgpib.so.2
 OLD_LIBS+=usr/lib32/libhistory.so.7
 OLD_LIBS+=usr/lib32/libipsec.so.3
 OLD_LIBS+=usr/lib32/libipx.so.4
 OLD_LIBS+=usr/lib32/libkiconv.so.3
 OLD_LIBS+=usr/lib32/libkvm.so.4
 OLD_LIBS+=usr/lib32/libmagic.so.3
 OLD_LIBS+=usr/lib32/libmd.so.4
 OLD_LIBS+=usr/lib32/libmemstat.so.2
 OLD_LIBS+=usr/lib32/libmenu.so.4
 OLD_LIBS+=usr/lib32/libmenuw.so.4
 OLD_LIBS+=usr/lib32/libmilter.so.4
 OLD_LIBS+=usr/lib32/libncp.so.3
 OLD_LIBS+=usr/lib32/libncurses.so.7
 OLD_LIBS+=usr/lib32/libncursesw.so.7
 OLD_LIBS+=usr/lib32/libnetgraph.so.3
 OLD_LIBS+=usr/lib32/libngatm.so.3
 OLD_LIBS+=usr/lib32/libnvpair.so.1
 OLD_LIBS+=usr/lib32/libobjc.so.3
 OLD_LIBS+=usr/lib32/libopie.so.5
 OLD_LIBS+=usr/lib32/libpam.so.4
 OLD_LIBS+=usr/lib32/libpanel.so.4
 OLD_LIBS+=usr/lib32/libpanelw.so.4
 OLD_LIBS+=usr/lib32/libpcap.so.6
 OLD_LIBS+=usr/lib32/libpmc.so.4
 OLD_LIBS+=usr/lib32/libproc.so.1
 OLD_LIBS+=usr/lib32/libradius.so.3
 OLD_LIBS+=usr/lib32/libreadline.so.7
 OLD_LIBS+=usr/lib32/librpcsvc.so.4
 OLD_LIBS+=usr/lib32/libsbuf.so.4
 OLD_LIBS+=usr/lib32/libsdp.so.3
 OLD_LIBS+=usr/lib32/libsmb.so.3
 OLD_LIBS+=usr/lib32/libssh.so.4
 OLD_LIBS+=usr/lib32/libssl.so.5
 OLD_LIBS+=usr/lib32/libtacplus.so.3
 OLD_LIBS+=usr/lib32/libufs.so.4
 OLD_LIBS+=usr/lib32/libugidfw.so.3
 OLD_LIBS+=usr/lib32/libumem.so.1
 OLD_LIBS+=usr/lib32/libusb.so.1
 OLD_LIBS+=usr/lib32/libusbhid.so.3
 OLD_LIBS+=usr/lib32/libutil.so.7
 OLD_LIBS+=usr/lib32/libuutil.so.1
 OLD_LIBS+=usr/lib32/libvgl.so.5
 OLD_LIBS+=usr/lib32/libwrap.so.5
 OLD_LIBS+=usr/lib32/libypclnt.so.3
 OLD_LIBS+=usr/lib32/libz.so.4
 OLD_LIBS+=usr/lib32/libzfs.so.1
 OLD_LIBS+=usr/lib32/libzpool.so.1
 OLD_LIBS+=usr/lib32/pam_chroot.so.4
 OLD_LIBS+=usr/lib32/pam_deny.so.4
 OLD_LIBS+=usr/lib32/pam_echo.so.4
 OLD_LIBS+=usr/lib32/pam_exec.so.4
 OLD_LIBS+=usr/lib32/pam_ftpusers.so.4
 OLD_LIBS+=usr/lib32/pam_group.so.4
 OLD_LIBS+=usr/lib32/pam_guest.so.4
 OLD_LIBS+=usr/lib32/pam_krb5.so.4
 OLD_LIBS+=usr/lib32/pam_ksu.so.4
 OLD_LIBS+=usr/lib32/pam_lastlog.so.4
 OLD_LIBS+=usr/lib32/pam_login_access.so.4
 OLD_LIBS+=usr/lib32/pam_nologin.so.4
 OLD_LIBS+=usr/lib32/pam_opie.so.4
 OLD_LIBS+=usr/lib32/pam_opieaccess.so.4
 OLD_LIBS+=usr/lib32/pam_passwdqc.so.4
 OLD_LIBS+=usr/lib32/pam_permit.so.4
 OLD_LIBS+=usr/lib32/pam_radius.so.4
 OLD_LIBS+=usr/lib32/pam_rhosts.so.4
 OLD_LIBS+=usr/lib32/pam_rootok.so.4
 OLD_LIBS+=usr/lib32/pam_securetty.so.4
 OLD_LIBS+=usr/lib32/pam_self.so.4
 OLD_LIBS+=usr/lib32/pam_ssh.so.4
 OLD_LIBS+=usr/lib32/pam_tacplus.so.4
 OLD_LIBS+=usr/lib32/pam_unix.so.4
 # 20090718: the gdm pam.d file is no longer required.
 OLD_FILES+=etc/pam.d/gdm
 # 20090714: net_add_domain(9) renamed to domain_add(9)
 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
 OLD_LIBS+=usr/lib32/libpcap.so.5
 # 20090319: uscanner(4) has been removed
 OLD_FILES+=usr/share/man/man4/uscanner.4.gz
 # 20090313: k8temp(4) renamed to amdtemp(4)
 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
 OLD_LIBS+=usr/lib32/libusb20.so.1
 OLD_FILES+=usr/lib32/libusb20.a
 OLD_FILES+=usr/lib32/libusb20.so
 OLD_FILES+=usr/lib32/libusb20_p.a
 # 20090226: libmp(3) functions renamed
 OLD_LIBS+=usr/lib/libmp.so.6
 OLD_LIBS+=usr/lib32/libmp.so.6
 # 20090223: changeover of USB stacks
 OLD_FILES+=usr/include/dev/usb2/include/ufm2_ioctl.h
 OLD_FILES+=usr/include/dev/usb2/include/urio2_ioctl.h
 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
 OLD_LIBS+=usr/lib32/libgssapi.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
 OLD_FILES+=usr/lib32/libkse.so
 OLD_LIBS+=usr/lib32/libkse.so.3
 # 20080225: bsdar/bsdranlib rename to ar/ranlib
 OLD_FILES+=usr/bin/bsdar
 OLD_FILES+=usr/bin/bsdranlib
 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
 OLD_FILES+=usr/lib32/libkse.a
 OLD_FILES+=usr/lib32/libkse_p.a
 OLD_FILES+=usr/lib32/libkse_pic.a
 # 20071129: Removed a Solaris compatibility header
 OLD_FILES+=usr/include/sys/_elf_solaris.h
 # 20071125: Renamed to pmc_get_msr()
 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_LIBS+=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
 OLD_FILES+=usr/lib32/libatm.a
 OLD_FILES+=usr/lib32/libatm.so
 OLD_LIBS+=usr/lib32/libatm.so.5
 OLD_FILES+=usr/lib32/libatm_p.a
 # 20070705: I4B headers repo-copied to include/i4b/
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/i4b_cause.h
 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
 OLD_LIBS+=usr/lib32/libalias.so.5
 OLD_LIBS+=usr/lib32/libbsnmp.so.3
 OLD_LIBS+=usr/lib32/libdialog.so.5
 OLD_LIBS+=usr/lib32/libgnuregex.so.3
 OLD_LIBS+=usr/lib32/libhistory.so.6
 OLD_LIBS+=usr/lib32/libncurses.so.6
 OLD_LIBS+=usr/lib32/libncursesw.so.6
 OLD_LIBS+=usr/lib32/libpam.so.3
 OLD_LIBS+=usr/lib32/libreadline.so.6
 OLD_LIBS+=usr/lib32/libssh.so.3
 OLD_LIBS+=usr/lib32/pam_chroot.so.3
 OLD_LIBS+=usr/lib32/pam_deny.so.3
 OLD_LIBS+=usr/lib32/pam_echo.so.3
 OLD_LIBS+=usr/lib32/pam_exec.so.3
 OLD_LIBS+=usr/lib32/pam_ftpusers.so.3
 OLD_LIBS+=usr/lib32/pam_group.so.3
 OLD_LIBS+=usr/lib32/pam_guest.so.3
 OLD_LIBS+=usr/lib32/pam_krb5.so.3
 OLD_LIBS+=usr/lib32/pam_ksu.so.3
 OLD_LIBS+=usr/lib32/pam_lastlog.so.3
 OLD_LIBS+=usr/lib32/pam_login_access.so.3
 OLD_LIBS+=usr/lib32/pam_nologin.so.3
 OLD_LIBS+=usr/lib32/pam_opie.so.3
 OLD_LIBS+=usr/lib32/pam_opieaccess.so.3
 OLD_LIBS+=usr/lib32/pam_passwdqc.so.3
 OLD_LIBS+=usr/lib32/pam_permit.so.3
 OLD_LIBS+=usr/lib32/pam_radius.so.3
 OLD_LIBS+=usr/lib32/pam_rhosts.so.3
 OLD_LIBS+=usr/lib32/pam_rootok.so.3
 OLD_LIBS+=usr/lib32/pam_securetty.so.3
 OLD_LIBS+=usr/lib32/pam_self.so.3
 OLD_LIBS+=usr/lib32/pam_ssh.so.3
 OLD_LIBS+=usr/lib32/pam_tacplus.so.3
 OLD_LIBS+=usr/lib32/pam_unix.so.3
 # 20070613: IPX over IP tunnel removal
 OLD_FILES+=usr/include/netipx/ipx_ip.h
 # 20070605: sched_core removal
 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
 OLD_LIBS+=usr/lib32/libatm.so.4
 OLD_LIBS+=usr/lib32/libbegemot.so.2
 OLD_LIBS+=usr/lib32/libbluetooth.so.2
 OLD_LIBS+=usr/lib32/libbsdxml.so.2
 OLD_LIBS+=usr/lib32/libbsm.so.1
 OLD_LIBS+=usr/lib32/libbz2.so.2
 OLD_LIBS+=usr/lib32/libcalendar.so.3
 OLD_LIBS+=usr/lib32/libcam.so.3
 OLD_LIBS+=usr/lib32/libcom_err.so.3
 OLD_LIBS+=usr/lib32/libcrypt.so.3
 OLD_LIBS+=usr/lib32/libdevinfo.so.3
 OLD_LIBS+=usr/lib32/libdevstat.so.5
 OLD_LIBS+=usr/lib32/libedit.so.5
 OLD_LIBS+=usr/lib32/libfetch.so.4
 OLD_LIBS+=usr/lib32/libform.so.3
 OLD_LIBS+=usr/lib32/libformw.so.3
 OLD_LIBS+=usr/lib32/libftpio.so.6
 OLD_LIBS+=usr/lib32/libgeom.so.3
 OLD_LIBS+=usr/lib32/libgpib.so.1
 OLD_LIBS+=usr/lib32/libipsec.so.2
 OLD_LIBS+=usr/lib32/libipx.so.3
 OLD_LIBS+=usr/lib32/libkiconv.so.2
 OLD_LIBS+=usr/lib32/libkse.so.2
 OLD_LIBS+=usr/lib32/libkvm.so.3
 OLD_LIBS+=usr/lib32/libm.so.4
 OLD_LIBS+=usr/lib32/libmagic.so.2
 OLD_LIBS+=usr/lib32/libmd.so.3
 OLD_LIBS+=usr/lib32/libmemstat.so.1
 OLD_LIBS+=usr/lib32/libmenu.so.3
 OLD_LIBS+=usr/lib32/libmenuw.so.3
 OLD_LIBS+=usr/lib32/libmilter.so.3
 OLD_LIBS+=usr/lib32/libmp.so.5
 OLD_LIBS+=usr/lib32/libncp.so.2
 OLD_LIBS+=usr/lib32/libnetgraph.so.2
 OLD_LIBS+=usr/lib32/libngatm.so.2
 OLD_LIBS+=usr/lib32/libopie.so.4
 OLD_LIBS+=usr/lib32/libpanel.so.3
 OLD_LIBS+=usr/lib32/libpanelw.so.3
 OLD_LIBS+=usr/lib32/libpcap.so.4
 OLD_LIBS+=usr/lib32/libpmc.so.3
 OLD_LIBS+=usr/lib32/libpthread.so.2
 OLD_LIBS+=usr/lib32/libradius.so.2
 OLD_LIBS+=usr/lib32/librpcsvc.so.3
 OLD_LIBS+=usr/lib32/libsbuf.so.3
 OLD_LIBS+=usr/lib32/libsdp.so.2
 OLD_LIBS+=usr/lib32/libsmb.so.2
 OLD_LIBS+=usr/lib32/libstdc++.so.5
 OLD_LIBS+=usr/lib32/libtacplus.so.2
 OLD_LIBS+=usr/lib32/libthr.so.2
 OLD_LIBS+=usr/lib32/libthread_db.so.2
 OLD_LIBS+=usr/lib32/libufs.so.3
 OLD_LIBS+=usr/lib32/libugidfw.so.2
 OLD_LIBS+=usr/lib32/libusbhid.so.2
 OLD_LIBS+=usr/lib32/libutil.so.6
 OLD_LIBS+=usr/lib32/libvgl.so.4
 OLD_LIBS+=usr/lib32/libwrap.so.4
 OLD_LIBS+=usr/lib32/libypclnt.so.2
 OLD_LIBS+=usr/lib32/libz.so.3
 # 20070519: GCC 4.2
 OLD_FILES+=usr/bin/f77
 OLD_FILES+=usr/bin/protoize
 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
 OLD_LIBS+=usr/lib32/libarchive.so.3
 # 20070301: remove addr2ascii and ascii2addr
 OLD_FILES+=usr/share/man/man3/addr2ascii.3.gz
 OLD_FILES+=usr/share/man/man3/ascii2addr.3.gz
 # 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
 OLD_FILES+=usr/lib32/libmytinfo.a
 OLD_FILES+=usr/lib32/libmytinfo.so
 OLD_FILES+=usr/lib32/libmytinfo_p.a
 OLD_FILES+=usr/lib32/libmytinfow.a
 OLD_FILES+=usr/lib32/libmytinfow.so
 OLD_FILES+=usr/lib32/libmytinfow_p.a
 # 20070128: remove vnconfig
 OLD_FILES+=usr/sbin/vnconfig
 # 20070127: remove bpf_compat.h
 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
 # 20061201: remove symlink to *.so.4 libalias modules
 OLD_FILES+=usr/lib/libalias_cuseeme.so
 OLD_FILES+=usr/lib/libalias_dummy.so
 OLD_FILES+=usr/lib/libalias_ftp.so
 OLD_FILES+=usr/lib/libalias_irc.so
 OLD_FILES+=usr/lib/libalias_nbt.so
 OLD_FILES+=usr/lib/libalias_pptp.so
 OLD_FILES+=usr/lib/libalias_skinny.so
 OLD_FILES+=usr/lib/libalias_smedia.so
 # 20061201: remove old *.so.4 libalias modules
 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_ex_new_index.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/pthread_mutexattr_getpshared.3.gz
 OLD_FILES+=usr/share/man/man3/pthread_mutexattr_setpshared.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/apm.8.gz
 OLD_FILES+=usr/share/man/man8/apmconf.8.gz
 OLD_FILES+=usr/share/man/man8/apmd.8.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/sconfig.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_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
 .if ${TARGET_ARCH} != "aarch64" && ${TARGET} != "arm" && \
     ${TARGET_ARCH} != "powerpc" && ${TARGET_ARCH} != "powerpc64" && \
     ${TARGET_ARCH} != "sparc64" && ${TARGET} != "mips"
 OLD_FILES+=usr/share/man/man8/ofwdump.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
 OLD_LIBS+=usr/lib32/libgssapi.so.8
 OLD_LIBS+=usr/lib32/libobjc.so.2
 # 20070519: GCC 4.2
 OLD_LIBS+=usr/lib/libg2c.a
 OLD_LIBS+=usr/lib/libg2c.so
 OLD_LIBS+=usr/lib/libg2c.so.2
 OLD_LIBS+=usr/lib/libg2c_p.a
 OLD_LIBS+=usr/lib/libgcc_pic.a
 OLD_LIBS+=usr/lib32/libg2c.a
 OLD_LIBS+=usr/lib32/libg2c.so
 OLD_LIBS+=usr/lib32/libg2c.so.2
 OLD_LIBS+=usr/lib32/libg2c_p.a
 OLD_LIBS+=usr/lib32/libgcc_pic.a
 # 20060729: OpenSSL 0.9.7e -> 0.9.8b upgrade
 OLD_LIBS+=lib/libcrypto.so.4
 OLD_LIBS+=usr/lib/libssl.so.4
 OLD_LIBS+=usr/lib32/libcrypto.so.4
 OLD_LIBS+=usr/lib32/libssl.so.4
 # 20060521: gethostbyaddr(3) ABI change
 OLD_LIBS+=usr/lib/libroken.so.8
 OLD_LIBS+=lib/libatm.so.3
 OLD_LIBS+=lib/libc.so.6
 OLD_LIBS+=lib/libutil.so.5
 OLD_LIBS+=usr/lib32/libatm.so.3
 OLD_LIBS+=usr/lib32/libc.so.6
 OLD_LIBS+=usr/lib32/libutil.so.5
 # 20060413: shared library moved to /usr/lib
 OLD_LIBS+=lib/libgpib.so.1
 # 20060413: libpcap.so.4 moved to /lib/
 OLD_LIBS+=usr/lib/libpcap.so.4
 # 20060412: libpthread.so.2 moved to /lib/
 OLD_LIBS+=usr/lib/libpthread.so.2
 # 20060127: revert libdisk to static-only
 OLD_LIBS+=usr/lib/libdisk.so.3
 # 20051027: libc_r discontinued (removed 20101113)
 OLD_LIBS+=usr/lib/libc_r.a
 OLD_LIBS+=usr/lib/libc_r.so
 OLD_LIBS+=usr/lib/libc_r.so.7
 OLD_LIBS+=usr/lib/libc_r_p.a
 OLD_LIBS+=usr/lib32/libc_r.a
 OLD_LIBS+=usr/lib32/libc_r.so
 OLD_LIBS+=usr/lib32/libc_r.so.7
 OLD_LIBS+=usr/lib32/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.
 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/lib32/libarchive.so.2
 OLD_LIBS+=usr/lib32/libc_r.so.6
 OLD_LIBS+=usr/lib/libcipher.so.2
 OLD_LIBS+=usr/lib/libgssapi.so.6
 OLD_LIBS+=usr/lib/libkse.so.1
 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/share/man/man4/Makefile b/share/man/man4/Makefile
index 10034a72d608..65f8bc817db3 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,1044 +1,1040 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 MAN=	aac.4 \
 	aacraid.4 \
 	acpi.4 \
 	${_acpi_asus.4} \
 	${_acpi_asus_wmi.4} \
 	${_acpi_dock.4} \
 	${_acpi_fujitsu.4} \
 	${_acpi_hp.4} \
 	${_acpi_ibm.4} \
 	${_acpi_panasonic.4} \
 	${_acpi_rapidstart.4} \
 	${_acpi_sony.4} \
 	acpi_thermal.4 \
 	acpi_battery.4 \
 	${_acpi_toshiba.4} \
 	acpi_video.4 \
 	${_acpi_wmi.4} \
 	ada.4 \
 	adm6996fc.4 \
 	ads111x.4 \
 	ae.4 \
 	${_aesni.4} \
 	age.4 \
 	agp.4 \
 	ahc.4 \
 	ahci.4 \
 	ahd.4 \
 	${_aibs.4} \
 	aio.4 \
 	alc.4 \
 	ale.4 \
 	alpm.4 \
 	altera_atse.4 \
 	altera_avgen.4 \
 	altera_jtag_uart.4 \
 	altera_sdcard.4 \
 	altq.4 \
 	amdpm.4 \
 	${_amdsbwd.4} \
 	${_amdsmb.4} \
 	${_amdsmn.4} \
 	${_amdtemp.4} \
 	${_bxe.4} \
 	amr.4 \
 	an.4 \
 	${_aout.4} \
 	${_apic.4} \
 	arcmsr.4 \
 	${_asmc.4} \
 	at45d.4 \
 	ata.4 \
 	ath.4 \
 	ath_ahb.4 \
 	ath_hal.4 \
 	ath_pci.4 \
 	atkbd.4 \
 	atkbdc.4 \
 	atp.4 \
 	${_atf_test_case.4} \
 	${_atrtc.4} \
 	${_attimer.4} \
 	audit.4 \
 	auditpipe.4 \
 	aue.4 \
 	axe.4 \
 	axge.4 \
 	axp.4 \
 	bce.4 \
 	bcma.4 \
 	bfe.4 \
 	bge.4 \
 	${_bhyve.4} \
 	bhnd.4 \
 	bhnd_chipc.4 \
 	bhnd_pmu.4 \
 	bhndb.4 \
 	bhndb_pci.4 \
 	blackhole.4 \
 	bnxt.4 \
 	bpf.4 \
 	bridge.4 \
 	bt.4 \
 	bwi.4 \
 	bwn.4 \
 	${_bytgpio.4} \
 	capsicum.4 \
 	cardbus.4 \
 	carp.4 \
 	cas.4 \
 	cc_cdg.4 \
 	cc_chd.4 \
 	cc_cubic.4 \
 	cc_dctcp.4 \
 	cc_hd.4 \
 	cc_htcp.4 \
 	cc_newreno.4 \
 	cc_vegas.4 \
 	${_ccd.4} \
 	ccr.4 \
 	cd.4 \
 	cdce.4 \
 	cdceem.4 \
 	cfi.4 \
 	cfumass.4 \
 	${_cgem.4} \
 	ch.4 \
 	chromebook_platform.4 \
 	${_chvgpio.4} \
 	ciss.4 \
 	cloudabi.4 \
 	${_coretemp.4} \
 	cp2112.4 \
 	${_cpuctl.4} \
 	cpufreq.4 \
 	crypto.4 \
 	ctl.4 \
 	cue.4 \
 	cxgb.4 \
 	cxgbe.4 \
 	cxgbev.4 \
 	cyapa.4 \
 	da.4 \
 	dc.4 \
 	dcons.4 \
 	dcons_crom.4 \
 	ddb.4 \
 	devctl.4 \
 	disc.4 \
 	disk.4 \
 	divert.4 \
 	${_dpms.4} \
 	ds1307.4 \
 	ds3231.4 \
 	${_dtrace_provs} \
 	dummynet.4 \
 	edsc.4 \
 	ehci.4 \
 	em.4 \
 	ena.4 \
 	enc.4 \
 	epair.4 \
 	esp.4 \
 	est.4 \
 	et.4 \
 	etherswitch.4 \
 	eventtimers.4 \
 	exca.4 \
 	e6060sw.4 \
 	fd.4 \
 	fdc.4 \
 	fdt.4 \
 	fdt_pinctrl.4 \
 	fdtbus.4 \
 	ffclock.4 \
 	filemon.4 \
 	firewire.4 \
 	${_ftwd.4} \
 	full.4 \
 	fwe.4 \
 	fwip.4 \
 	fwohci.4 \
 	fxp.4 \
 	gbde.4 \
 	gdb.4 \
 	gem.4 \
 	geom.4 \
 	geom_linux_lvm.4 \
 	geom_map.4 \
 	geom_uzip.4 \
 	gif.4 \
 	gpio.4 \
 	gpioiic.4 \
 	gpiokeys.4 \
 	gpioled.4 \
 	gpioths.4 \
 	gre.4 \
 	h_ertt.4 \
 	hconf.4 \
 	hcons.4 \
 	hgame.4 \
 	hidbus.4 \
 	hidquirk.4 \
 	hidraw.4 \
 	hifn.4 \
 	hkbd.4 \
 	hms.4 \
 	hmt.4 \
 	hpen.4 \
 	hpet.4 \
 	${_hpt27xx.4} \
 	${_hptiop.4} \
 	${_hptmv.4} \
 	${_hptnr.4} \
 	${_hptrr.4} \
 	hsctrl.4 \
 	htu21.4 \
 	${_hv_kvp.4} \
 	${_hv_netvsc.4} \
 	${_hv_storvsc.4} \
 	${_hv_utils.4} \
 	${_hv_vmbus.4} \
 	${_hv_vss.4} \
 	hwpmc.4 \
 	${_hwpstate_intel.4} \
 	iavf.4 \
 	ichsmb.4 \
 	${_ichwd.4} \
 	icmp.4 \
 	icmp6.4 \
 	ida.4 \
 	if_ipsec.4 \
 	iflib.4 \
 	ifmib.4 \
 	ig4.4 \
 	igmp.4 \
 	iic.4 \
 	iic_gpiomux.4 \
 	iicbb.4 \
 	iicbus.4 \
 	iichid.4 \
 	iicmux.4 \
 	iicsmb.4 \
 	iir.4 \
 	${_imcsmb.4} \
 	inet.4 \
 	inet6.4 \
 	intpm.4 \
 	intro.4 \
 	${_io.4} \
 	${_ioat.4} \
 	ip.4 \
 	ip6.4 \
 	ipfirewall.4 \
 	ipheth.4 \
 	${_ipmi.4} \
 	ips.4 \
 	ipsec.4 \
 	ipw.4 \
 	ipwfw.4 \
 	isci.4 \
 	isl.4 \
 	ismt.4 \
 	isp.4 \
 	ispfw.4 \
 	${_itwd.4} \
 	iwi.4 \
 	iwifw.4 \
 	iwm.4 \
 	iwmfw.4 \
 	iwn.4 \
 	iwnfw.4 \
 	ixgbe.4 \
 	ixl.4 \
 	jedec_dimm.4 \
 	jme.4 \
 	kbdmux.4 \
 	kcov.4 \
 	keyboard.4 \
 	kld.4 \
 	ksyms.4 \
 	ksz8995ma.4 \
 	ktls.4 \
 	ktr.4 \
 	kue.4 \
 	lagg.4 \
 	le.4 \
 	led.4 \
 	lge.4 \
 	${_linux.4} \
 	liquidio.4 \
 	lm75.4 \
 	lo.4 \
 	lp.4 \
 	lpbb.4 \
 	lpt.4 \
 	ltc430x.4 \
 	mac.4 \
 	mac_biba.4 \
 	mac_bsdextended.4 \
 	mac_ifoff.4 \
 	mac_lomac.4 \
 	mac_mls.4 \
 	mac_none.4 \
 	mac_ntpd.4 \
 	mac_partition.4 \
 	mac_portacl.4 \
 	mac_seeotheruids.4 \
 	mac_stub.4 \
 	mac_test.4 \
 	malo.4 \
 	md.4 \
 	mdio.4 \
 	me.4 \
 	mem.4 \
 	meteor.4 \
 	mfi.4 \
 	miibus.4 \
 	mld.4 \
 	mlx.4 \
 	mlx4en.4 \
 	mlx5en.4 \
 	mly.4 \
 	mmc.4 \
 	mmcsd.4 \
 	mn.4 \
 	mod_cc.4 \
 	mos.4 \
 	mouse.4 \
 	mpr.4 \
 	mps.4 \
 	mpt.4 \
 	mrsas.4 \
 	msk.4 \
 	mtio.4 \
 	multicast.4 \
 	muge.4 \
 	mvs.4 \
 	mwl.4 \
 	mwlfw.4 \
 	mx25l.4 \
 	mxge.4 \
 	my.4 \
-	${_ndis.4} \
 	net80211.4 \
 	netdump.4 \
 	netfpga10g_nf10bmac.4 \
 	netgdb.4 \
 	netgraph.4 \
 	netintro.4 \
 	netmap.4 \
 	${_nfe.4} \
 	${_nfsmb.4} \
 	ng_async.4 \
 	ngatmbase.4 \
 	ng_atmllc.4 \
 	ng_bpf.4 \
 	ng_bridge.4 \
 	ng_btsocket.4 \
 	ng_car.4 \
 	ng_ccatm.4 \
 	ng_checksum.4 \
 	ng_cisco.4 \
 	ng_deflate.4 \
 	ng_device.4 \
 	nge.4 \
 	ng_echo.4 \
 	ng_eiface.4 \
 	ng_etf.4 \
 	ng_ether.4 \
 	ng_ether_echo.4 \
 	ng_frame_relay.4 \
 	ng_gif.4 \
 	ng_gif_demux.4 \
 	ng_h4.4 \
 	ng_hci.4 \
 	ng_hole.4 \
 	ng_hub.4 \
 	ng_iface.4 \
 	ng_ipfw.4 \
 	ng_ip_input.4 \
 	ng_ksocket.4 \
 	ng_l2cap.4 \
 	ng_l2tp.4 \
 	ng_lmi.4 \
 	ng_macfilter.4 \
 	ng_mppc.4 \
 	ng_nat.4 \
 	ng_netflow.4 \
 	ng_one2many.4 \
 	ng_patch.4 \
 	ng_pipe.4 \
 	ng_ppp.4 \
 	ng_pppoe.4 \
 	ng_pptpgre.4 \
 	ng_pred1.4 \
 	ng_rfc1490.4 \
 	ng_socket.4 \
 	ng_source.4 \
 	ng_split.4 \
 	ng_sppp.4 \
 	ng_sscfu.4 \
 	ng_sscop.4 \
 	ng_tag.4 \
 	ng_tcpmss.4 \
 	ng_tee.4 \
 	ng_tty.4 \
 	ng_ubt.4 \
 	ng_UI.4 \
 	ng_uni.4 \
 	ng_vjc.4 \
 	ng_vlan.4 \
 	nmdm.4 \
 	${_ntb.4} \
 	${_ntb_hw_amd.4} \
 	${_ntb_hw_intel.4} \
 	${_ntb_hw_plx.4} \
 	${_ntb_transport.4} \
 	${_nda.4} \
 	${_if_ntb.4} \
 	null.4 \
 	numa.4 \
 	${_nvd.4} \
 	${_nvdimm.4} \
 	${_nvme.4} \
 	${_nvram.4} \
 	${_nvram2env.4} \
 	oce.4 \
 	ocs_fc.4\
 	ohci.4 \
 	openfirm.4 \
 	orm.4 \
 	${_ossl.4} \
 	ow.4 \
 	ow_temp.4 \
 	owc.4 \
 	${_padlock.4} \
 	pass.4 \
 	pccard.4 \
 	pccbb.4 \
 	pcf.4 \
 	${_pchtherm.4} \
 	pci.4 \
 	pcib.4 \
 	pcic.4 \
 	pcm.4 \
 	${_pf.4} \
 	${_pflog.4} \
 	${_pfsync.4} \
 	pim.4 \
 	pms.4 \
 	polling.4 \
 	ppbus.4 \
 	ppc.4 \
 	ppi.4 \
 	procdesc.4 \
 	proto.4 \
 	ps4dshock.4 \
 	psm.4 \
 	pst.4 \
 	pt.4 \
 	ptnet.4 \
 	pts.4 \
 	pty.4 \
 	puc.4 \
 	pwmc.4 \
 	${_qat.4} \
 	${_qlxge.4} \
 	${_qlxgb.4} \
 	${_qlxgbe.4} \
 	${_qlnxe.4} \
 	ral.4 \
 	random.4 \
 	rctl.4 \
 	re.4 \
 	rgephy.4 \
 	rights.4 \
 	rl.4 \
 	rndtest.4 \
 	route.4 \
 	rtsx.4 \
 	rtwn.4 \
 	rtwnfw.4 \
 	rtwn_pci.4 \
 	rue.4 \
 	sa.4 \
 	safe.4 \
 	safexcel.4 \
 	sbp.4 \
 	sbp_targ.4 \
 	scc.4 \
 	sched_4bsd.4 \
 	sched_ule.4 \
 	screen.4 \
 	scsi.4 \
 	sctp.4 \
 	sdhci.4 \
 	sem.4 \
 	send.4 \
 	ses.4 \
 	${_sfxge.4} \
 	sge.4 \
 	siba.4 \
 	siftr.4 \
 	siis.4 \
 	simplebus.4 \
 	sis.4 \
 	sk.4 \
 	${_smartpqi.4} \
 	smb.4 \
 	smbios.4 \
 	smbus.4 \
 	smp.4 \
 	smsc.4 \
 	snd_ad1816.4 \
 	snd_als4000.4 \
 	snd_atiixp.4 \
 	snd_cmi.4 \
 	snd_cs4281.4 \
 	snd_csa.4 \
 	snd_ds1.4 \
 	snd_emu10k1.4 \
 	snd_emu10kx.4 \
 	snd_envy24.4 \
 	snd_envy24ht.4 \
 	snd_es137x.4 \
 	snd_ess.4 \
 	snd_fm801.4 \
 	snd_gusc.4 \
 	snd_hda.4 \
 	snd_hdspe.4 \
 	snd_ich.4 \
 	snd_maestro3.4 \
 	snd_maestro.4 \
 	snd_mss.4 \
 	snd_neomagic.4 \
 	snd_sbc.4 \
 	snd_solo.4 \
 	snd_spicds.4 \
 	snd_t4dwave.4 \
 	snd_uaudio.4 \
 	snd_via8233.4 \
 	snd_via82c686.4 \
 	snd_vibes.4 \
 	snp.4 \
 	spigen.4 \
 	${_spkr.4} \
 	splash.4 \
 	sppp.4 \
 	ste.4 \
 	stf.4 \
 	stge.4 \
 	${_sume.4} \
 	${_superio.4} \
 	sym.4 \
 	syncache.4 \
 	syncer.4 \
 	syscons.4 \
 	sysmouse.4 \
 	tap.4 \
 	targ.4 \
 	tcp.4 \
 	tcp_bbr.4 \
 	tdfx.4 \
 	terasic_mtl.4 \
 	termios.4 \
 	textdump.4 \
 	ti.4 \
 	timecounters.4 \
 	${_tpm.4} \
 	tty.4 \
 	tun.4 \
 	twa.4 \
 	twe.4 \
 	tws.4 \
 	udp.4 \
 	udplite.4 \
 	ure.4 \
 	vale.4 \
 	vga.4 \
 	vge.4 \
 	viapm.4 \
 	${_viawd.4} \
 	virtio.4 \
 	virtio_balloon.4 \
 	virtio_blk.4 \
 	virtio_console.4 \
 	virtio_random.4 \
 	virtio_scsi.4 \
 	${_vmci.4} \
 	vkbd.4 \
 	vlan.4 \
 	vxlan.4 \
 	${_vmd.4} \
 	${_vmm.4} \
 	${_vmx.4} \
 	vr.4 \
 	vt.4 \
 	vte.4 \
 	vtnet.4 \
 	watchdog.4 \
 	${_wbwd.4} \
 	witness.4 \
 	wlan.4 \
 	wlan_acl.4 \
 	wlan_amrr.4 \
 	wlan_ccmp.4 \
 	wlan_tkip.4 \
 	wlan_wep.4 \
 	wlan_xauth.4 \
 	wmt.4 \
 	${_wpi.4} \
 	wsp.4 \
 	xb360gp.4 \
 	${_xen.4} \
 	xhci.4 \
 	xl.4 \
 	${_xnb.4} \
 	xpt.4 \
 	zero.4
 
 MLINKS=	ads111x.4 ads1013.4 \
 	ads111x.4 ads1014.4 \
 	ads111x.4 ads1015.4 \
 	ads111x.4 ads1113.4 \
 	ads111x.4 ads1114.4 \
 	ads111x.4 ads1115.4
 MLINKS+=ae.4 if_ae.4
 MLINKS+=age.4 if_age.4
 MLINKS+=agp.4 agpgart.4
 MLINKS+=alc.4 if_alc.4
 MLINKS+=ale.4 if_ale.4
 MLINKS+=altera_atse.4 atse.4
 MLINKS+=altera_sdcard.4 altera_sdcardc.4
 MLINKS+=altq.4 ALTQ.4
 MLINKS+=ath.4 if_ath.4
 MLINKS+=ath_pci.4 if_ath_pci.4
 MLINKS+=an.4 if_an.4
 MLINKS+=aue.4 if_aue.4
 MLINKS+=axe.4 if_axe.4
 MLINKS+=bce.4 if_bce.4
 MLINKS+=bfe.4 if_bfe.4
 MLINKS+=bge.4 if_bge.4
 MLINKS+=bnxt.4 if_bnxt.4
 MLINKS+=bridge.4 if_bridge.4
 MLINKS+=bwi.4 if_bwi.4
 MLINKS+=bwn.4 if_bwn.4
 MLINKS+=${_bxe.4} ${_if_bxe.4}
 MLINKS+=cas.4 if_cas.4
 MLINKS+=cdce.4 if_cdce.4
 MLINKS+=cfi.4 cfid.4
 MLINKS+=cloudabi.4 cloudabi32.4 \
 	cloudabi.4 cloudabi64.4
 MLINKS+=crypto.4 cryptodev.4
 MLINKS+=cue.4 if_cue.4
 MLINKS+=cxgb.4 if_cxgb.4
 MLINKS+=cxgbe.4 if_cxgbe.4 \
 	cxgbe.4 vcxgbe.4 \
 	cxgbe.4 if_vcxgbe.4 \
 	cxgbe.4 cxl.4 \
 	cxgbe.4 if_cxl.4 \
 	cxgbe.4 vcxl.4 \
 	cxgbe.4 if_vcxl.4 \
 	cxgbe.4 cc.4 \
 	cxgbe.4 if_cc.4 \
 	cxgbe.4 vcc.4 \
 	cxgbe.4 if_vcc.4
 MLINKS+=cxgbev.4 if_cxgbev.4 \
 	cxgbev.4 cxlv.4 \
 	cxgbev.4 if_cxlv.4 \
 	cxgbev.4 ccv.4 \
 	cxgbev.4 if_ccv.4
 MLINKS+=dc.4 if_dc.4
 MLINKS+=disc.4 if_disc.4
 MLINKS+=edsc.4 if_edsc.4
 MLINKS+=em.4 if_em.4 \
 	em.4 igb.4 \
 	em.4 if_igb.4
 MLINKS+=enc.4 if_enc.4
 MLINKS+=epair.4 if_epair.4
 MLINKS+=et.4 if_et.4
 MLINKS+=fd.4 stderr.4 \
 	fd.4 stdin.4 \
 	fd.4 stdout.4
 MLINKS+=fdt.4 FDT.4
 MLINKS+=firewire.4 ieee1394.4
 MLINKS+=fwe.4 if_fwe.4
 MLINKS+=fwip.4 if_fwip.4
 MLINKS+=fxp.4 if_fxp.4
 MLINKS+=gem.4 if_gem.4
 MLINKS+=geom.4 GEOM.4
 MLINKS+=gif.4 if_gif.4
 MLINKS+=gpio.4 gpiobus.4
 MLINKS+=gpioths.4 dht11.4
 MLINKS+=gpioths.4 dht22.4
 MLINKS+=gre.4 if_gre.4
 MLINKS+=hpet.4 acpi_hpet.4
 MLINKS+=${_hptrr.4} ${_rr232x.4}
 MLINKS+=${_attimer.4} ${_i8254.4}
 MLINKS+=ip.4 rawip.4
 MLINKS+=ipfirewall.4 ipaccounting.4 \
 	ipfirewall.4 ipacct.4 \
 	ipfirewall.4 ipfw.4
 MLINKS+=ipheth.4 if_ipheth.4
 MLINKS+=ipw.4 if_ipw.4
 MLINKS+=iwi.4 if_iwi.4
 MLINKS+=iwm.4 if_iwm.4
 MLINKS+=iwn.4 if_iwn.4
 MLINKS+=ixgbe.4 ix.4
 MLINKS+=ixgbe.4 if_ix.4
 MLINKS+=ixgbe.4 if_ixgbe.4
 MLINKS+=ixl.4 if_ixl.4
 MLINKS+=iavf.4 if_iavf.4
 MLINKS+=jme.4 if_jme.4
 MLINKS+=kue.4 if_kue.4
 MLINKS+=lagg.4 trunk.4
 MLINKS+=lagg.4 if_lagg.4
 MLINKS+=le.4 if_le.4
 MLINKS+=lge.4 if_lge.4
 MLINKS+=lo.4 loop.4
 MLINKS+=lp.4 plip.4
 MLINKS+=malo.4 if_malo.4
 MLINKS+=md.4 vn.4
 MLINKS+=mem.4 kmem.4
 MLINKS+=mfi.4 mfi_linux.4 \
 	mfi.4 mfip.4
 MLINKS+=mlx5en.4 mce.4
 MLINKS+=mn.4 if_mn.4
 MLINKS+=mos.4 if_mos.4
 MLINKS+=msk.4 if_msk.4
 MLINKS+=mwl.4 if_mwl.4
 MLINKS+=mxge.4 if_mxge.4
 MLINKS+=my.4 if_my.4
-MLINKS+=${_ndis.4} ${_if_ndis.4}
 MLINKS+=netfpga10g_nf10bmac.4 if_nf10bmac.4
 MLINKS+=netintro.4 net.4 \
 	netintro.4 networking.4
 MLINKS+=${_nfe.4} ${_if_nfe.4}
 MLINKS+=nge.4 if_nge.4
 MLINKS+=openfirm.4 openfirmware.4
 MLINKS+=ow.4 onewire.4
 MLINKS+=pccbb.4 cbb.4
 MLINKS+=pcm.4 snd.4 \
 	pcm.4 sound.4
 MLINKS+=pms.4 pmspcv.4
 MLINKS+=ptnet.4 if_ptnet.4
 MLINKS+=ral.4 if_ral.4
 MLINKS+=re.4 if_re.4
 MLINKS+=rl.4 if_rl.4
 MLINKS+=rtwn_pci.4 if_rtwn_pci.4
 MLINKS+=rue.4 if_rue.4
 MLINKS+=scsi.4 CAM.4 \
 	scsi.4 cam.4 \
 	scsi.4 scbus.4 \
 	scsi.4 SCSI.4
 MLINKS+=sge.4 if_sge.4
 MLINKS+=sis.4 if_sis.4
 MLINKS+=sk.4 if_sk.4
 MLINKS+=smp.4 SMP.4
 MLINKS+=smsc.4 if_smsc.4
 MLINKS+=snd_envy24.4 snd_ak452x.4
 MLINKS+=snd_sbc.4 snd_sb16.4 \
 	snd_sbc.4 snd_sb8.4
 MLINKS+=${_spkr.4} ${_speaker.4}
 MLINKS+=splash.4 screensaver.4
 MLINKS+=ste.4 if_ste.4
 MLINKS+=stf.4 if_stf.4
 MLINKS+=stge.4 if_stge.4
 MLINKS+=syncache.4 syncookies.4
 MLINKS+=syscons.4 sc.4
 MLINKS+=tap.4 if_tap.4 \
 	tap.4 vmnet.4 \
 	tap.4 if_vmnet.4
 MLINKS+=tdfx.4 tdfx_linux.4
 MLINKS+=ti.4 if_ti.4
 MLINKS+=tun.4 if_tun.4
 MLINKS+=ure.4 if_ure.4
 MLINKS+=vge.4 if_vge.4
 MLINKS+=vlan.4 if_vlan.4
 MLINKS+=vxlan.4 if_vxlan.4
 MLINKS+=${_vmx.4} ${_if_vmx.4}
 MLINKS+=vr.4 if_vr.4
 MLINKS+=vte.4 if_vte.4
 MLINKS+=vtnet.4 if_vtnet.4
 MLINKS+=watchdog.4 SW_WATCHDOG.4
 MLINKS+=${_wpi.4} ${_if_wpi.4}
 MLINKS+=xl.4 if_xl.4
 
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
 _acpi_asus.4=	acpi_asus.4
 _acpi_asus_wmi.4=	acpi_asus_wmi.4
 _acpi_dock.4=	acpi_dock.4
 _acpi_fujitsu.4=acpi_fujitsu.4
 _acpi_hp.4=	acpi_hp.4
 _acpi_ibm.4=	acpi_ibm.4
 _acpi_panasonic.4=acpi_panasonic.4
 _acpi_rapidstart.4=acpi_rapidstart.4
 _acpi_sony.4=	acpi_sony.4
 _acpi_toshiba.4=acpi_toshiba.4
 _acpi_wmi.4=	acpi_wmi.4
 _aesni.4=	aesni.4
 _aout.4=	aout.4
 _apic.4=	apic.4
 _atrtc.4=	atrtc.4
 _attimer.4=	attimer.4
 _aibs.4=	aibs.4
 _amdsbwd.4=	amdsbwd.4
 _amdsmb.4=	amdsmb.4
 _amdsmn.4=	amdsmn.4
 _amdtemp.4=	amdtemp.4
 _asmc.4=	asmc.4
 _bxe.4=		bxe.4
 _bytgpio.4=	bytgpio.4
 _chvgpio.4=	chvgpio.4
 _coretemp.4=	coretemp.4
 _cpuctl.4=	cpuctl.4
 _dpms.4=	dpms.4
 _ftwd.4=	ftwd.4
 _hpt27xx.4=	hpt27xx.4
 _hptiop.4=	hptiop.4
 _hptmv.4=	hptmv.4
 _hptnr.4=	hptnr.4
 _hptrr.4=	hptrr.4
 _hv_kvp.4=	hv_kvp.4
 _hv_netvsc.4=	hv_netvsc.4
 _hv_storvsc.4=	hv_storvsc.4
 _hv_utils.4=	hv_utils.4
 _hv_vmbus.4=	hv_vmbus.4
 _hv_vss.4=	hv_vss.4
 _hwpstate_intel.4=	hwpstate_intel.4
 _i8254.4=	i8254.4
 _ichwd.4=	ichwd.4
 _if_bxe.4=	if_bxe.4
-_if_ndis.4=	if_ndis.4
 _if_nfe.4=	if_nfe.4
 _if_urtw.4=	if_urtw.4
 _if_vmx.4=	if_vmx.4
 _if_wpi.4=	if_wpi.4
 _imcsmb.4=	imcsmb.4
 _ipmi.4=	ipmi.4
 _io.4=		io.4
 _itwd.4=	itwd.4
 _linux.4=	linux.4
 _nda.4=		nda.4
-_ndis.4=	ndis.4
 _nfe.4=		nfe.4
 _nfsmb.4=	nfsmb.4
 _if_ntb.4=	if_ntb.4
 _ntb.4=		ntb.4
 _ntb_hw_amd.4=	ntb_hw_amd.4
 _ntb_hw_intel.4=	ntb_hw_intel.4
 _ntb_hw_plx.4=	ntb_hw_plx.4
 _ntb_transport.4=ntb_transport.4
 _nvd.4=		nvd.4
 _nvme.4=	nvme.4
 _nvram.4=	nvram.4
 _ossl.4=	ossl.4
 _padlock.4=	padlock.4
 _pchtherm.4=	pchtherm.4
 _qat.4=		qat.4
 _rr232x.4=	rr232x.4
 _speaker.4=	speaker.4
 _spkr.4=	spkr.4
 _superio.4=	superio.4
 _tpm.4=		tpm.4
 _urtw.4=	urtw.4
 _viawd.4=	viawd.4
 _vmci.4=	vmci.4
 _vmx.4=		vmx.4
 _wbwd.4=	wbwd.4
 _wpi.4=		wpi.4
 _xen.4=		xen.4
 _xnb.4=		xnb.4
 
 .endif
 
 .if ${MACHINE_CPUARCH} == "amd64"
 _ioat.4=	ioat.4
 _nvdimm.4=	nvdimm.4
 _qlxge.4=	qlxge.4
 _qlxgb.4=	qlxgb.4
 _qlxgbe.4=	qlxgbe.4
 _qlnxe.4=	qlnxe.4
 _sfxge.4=	sfxge.4
 _smartpqi.4=	smartpqi.4
 _sume.4=	sume.4
 _vmd.4=		vmd.4
 
 MLINKS+=qlxge.4 if_qlxge.4
 MLINKS+=qlxgb.4 if_qlxgb.4
 MLINKS+=qlxgbe.4 if_qlxgbe.4
 MLINKS+=qlnxe.4 if_qlnxe.4
 MLINKS+=sfxge.4 if_sfxge.4
 MLINKS+=sume.4 if_sume.4
 
 .if ${MK_BHYVE} != "no"
 _bhyve.4=	bhyve.4
 _vmm.4=		vmm.4
 .endif
 .endif
 
 .if ${MACHINE_CPUARCH} == "mips"
 _nvram2env.4=	nvram2env.4
 .endif
 
 .if ${MACHINE_CPUARCH} == "powerpc"
 _nvd.4= 	nvd.4
 _nvme.4=	nvme.4
 .endif
 
 .if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "aarch64" || \
 	 ${MACHINE_CPUARCH} == "riscv"
 _cgem.4=	cgem.4
 MLINKS+=cgem.4 if_cgem.4
 .endif
 
 .if empty(MAN_ARCH)
 __arches=	${MACHINE} ${MACHINE_ARCH} ${MACHINE_CPUARCH}
 .elif ${MAN_ARCH} == "all"
 __arches=	${:!/bin/sh -c "/bin/ls -d ${.CURDIR}/man4.*"!:E}
 .else
 __arches=	${MAN_ARCH}
 .endif
 .for __arch in ${__arches:O:u}
 .if exists(${.CURDIR}/man4.${__arch})
 SUBDIR+=	man4.${__arch}
 .endif
 .endfor
 
 .if ${MK_BLUETOOTH} != "no"
 MAN+=		ng_bluetooth.4
 .endif
 
 .if ${MK_CCD} != "no"
 _ccd.4=		ccd.4
 .endif
 
 .if ${MK_CDDL} != "no"
 _dtrace_provs=	dtrace_audit.4 \
 		dtrace_io.4 \
 		dtrace_ip.4 \
 		dtrace_lockstat.4 \
 		dtrace_proc.4 \
 		dtrace_sched.4 \
 		dtrace_sctp.4 \
 		dtrace_tcp.4 \
 		dtrace_udp.4 \
 		dtrace_udplite.4
 
 MLINKS+=	dtrace_audit.4 dtaudit.4
 .endif
 
 .if ${MK_EFI} != "no"
 MAN+=		efidev.4
 
 MLINKS+=	efidev.4 efirtc.4
 .endif
 
 .if ${MK_ISCSI} != "no"
 MAN+=		cfiscsi.4
 MAN+=		iscsi.4
 MAN+=		iscsi_initiator.4
 MAN+=		iser.4
 .endif
 
 .if ${MK_OFED} != "no"
 MAN+=		mlx4ib.4
 MAN+=		mlx5ib.4
 .endif
 
 .if ${MK_MLX5TOOL} != "no"
 MAN+=		mlx5io.4
 .endif
 
 .if ${MK_TESTS} != "no"
 ATF=            ${SRCTOP}/contrib/atf
 .PATH:          ${ATF}/doc
 _atf_test_case.4=	atf-test-case.4
 .endif
 
 .if ${MK_PF} != "no"
 _pf.4=		pf.4
 _pflog.4=	pflog.4
 _pfsync.4=	pfsync.4
 .endif
 
 .if ${MK_USB} != "no"
 MAN+=	\
 	otus.4 \
 	otusfw.4 \
 	rsu.4 \
 	rsufw.4 \
 	rtwn_usb.4 \
 	rum.4 \
 	run.4 \
 	runfw.4 \
 	u3g.4 \
 	uark.4 \
 	uart.4 \
 	uath.4 \
 	ubsa.4 \
 	ubser.4 \
 	ubtbcmfw.4 \
 	uchcom.4 \
 	ucom.4 \
 	ucycom.4 \
 	udav.4 \
 	udbp.4 \
 	udl.4 \
 	uep.4 \
 	ufoma.4 \
 	uftdi.4 \
 	ugen.4 \
 	ugold.4 \
 	uhci.4 \
 	uhid.4 \
 	uhso.4 \
 	uipaq.4 \
 	ukbd.4 \
 	uled.4 \
 	ulpt.4 \
 	umass.4 \
 	umcs.4 \
 	umct.4 \
 	umodem.4 \
 	umoscom.4 \
 	ums.4 \
 	unix.4 \
 	upgt.4 \
 	uplcom.4 \
 	ural.4 \
 	urio.4 \
 	urndis.4 \
 	${_urtw.4} \
 	usb.4 \
 	usb_quirk.4 \
 	usb_template.4 \
 	usbhid.4 \
 	usfs.4 \
 	uslcom.4 \
 	uvisor.4 \
 	uvscom.4 \
 	zyd.4
 
 MLINKS+=otus.4 if_otus.4
 MLINKS+=rsu.4 if_rsu.4
 MLINKS+=rtwn_usb.4 if_rtwn_usb.4
 MLINKS+=rum.4 if_rum.4
 MLINKS+=run.4 if_run.4
 MLINKS+=u3g.4 u3gstub.4
 MLINKS+=uath.4 if_uath.4
 MLINKS+=udav.4 if_udav.4
 MLINKS+=upgt.4 if_upgt.4
 MLINKS+=ural.4 if_ural.4
 MLINKS+=urndis.4 if_urndis.4
 MLINKS+=${_urtw.4} ${_if_urtw.4}
 MLINKS+=zyd.4 if_zyd.4
 .endif
 
 .include <bsd.prog.mk>
diff --git a/share/man/man4/ndis.4 b/share/man/man4/ndis.4
deleted file mode 100644
index 0a1ae39bff62..000000000000
--- a/share/man/man4/ndis.4
+++ /dev/null
@@ -1,155 +0,0 @@
-.\" Copyright (c) 2003
-.\"	Bill Paul <wpaul@windriver.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.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by Bill Paul.
-.\" 4. Neither the name of the author nor the names of any co-contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"   without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
-.\" 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.
-.\"
-.\" $FreeBSD$
-.\"
-.Dd March 14, 2010
-.Dt NDIS 4
-.Os
-.Sh NAME
-.Nm ndis
-.Nd NDIS miniport driver wrapper
-.Sh SYNOPSIS
-.Cd "options NDISAPI"
-.Cd "device ndis"
-.Cd "device wlan"
-.Sh DESCRIPTION
-The
-.Nm
-driver is a wrapper designed to allow binary
-.Tn Windows\[rg]
-NDIS miniport
-network drivers to be used with
-.Fx .
-The
-.Nm
-driver is provided in source code form and must be combined with
-the
-.Tn Windows\[rg]
-driver supplied with your network adapter.
-The
-.Nm
-driver uses the
-.Nm ndisapi
-kernel subsystem to relocate and link the
-.Tn Windows\[rg]
-binary so
-that it can be used in conjunction with native code.
-The
-.Nm ndisapi
-subsystem provides an interface between the NDIS API and the
-.Fx
-networking infrastructure.
-The
-.Tn Windows\[rg]
-driver is essentially
-fooled into thinking it is running on
-.Tn Windows\[rg] .
-Note that this
-means the
-.Nm
-driver is only useful on x86 machines.
-.Pp
-To build a functional driver, the user must have a copy of the
-driver distribution media for his or her card.
-From this distribution,
-the user must extract two files: the
-.Pa .SYS
-file containing the driver
-binary code, and its companion
-.Pa .INF
-file, which contains the
-definitions for driver-specific registry keys and other installation
-data such as device identifiers.
-These two files can be converted
-into a kernel module file using the
-.Xr ndisgen 8
-utility.
-This file contains a binary image of the driver plus
-registry key data.
-When the
-.Nm
-driver loads, it will create
-.Xr sysctl 3
-nodes for each registry key extracted from the
-.Pa .INF
-file.
-.Pp
-The
-.Nm
-driver is designed to support mainly Ethernet and wireless
-network devices with PCI and USB bus attachments.
-(Cardbus devices are also supported as PCI.)
-It can
-support many different media types and speeds.
-One limitation
-however, is that there is no consistent way to learn if an
-Ethernet device is operating in full or half duplex mode.
-The NDIS API allows for a generic means for determining link
-state and speed, but not the duplex setting.
-There may be
-driver-specific registry keys to control the media setting
-which can be configured via the
-.Xr sysctl 8
-command.
-.Sh DEPRECATION NOTICE
-This driver is scheduled for removal prior to the release of
-.Fx 14.0
-.Sh DIAGNOSTICS
-.Bl -diag
-.It "ndis%d: watchdog timeout"
-A packet was queued for transmission and a transmit command was
-issued, however the device failed to acknowledge the transmission
-before a timeout expired.
-.El
-.Sh SEE ALSO
-.Xr altq 4 ,
-.Xr arp 4 ,
-.Xr netintro 4 ,
-.Xr ng_ether 4 ,
-.Xr ifconfig 8 ,
-.Xr ndis_events 8 ,
-.Xr ndiscvt 8 ,
-.Xr ndisgen 8 ,
-.Xr wpa_supplicant 8
-.Rs
-.%T "NDIS 5.1 specification"
-.%U http://www.microsoft.com
-.Re
-.Sh HISTORY
-The
-.Nm
-device driver first appeared in
-.Fx 5.3 .
-.Sh AUTHORS
-The
-.Nm
-driver was written by
-.An Bill Paul Aq Mt wpaul@windriver.com .
diff --git a/sys/compat/ndis/cfg_var.h b/sys/compat/ndis/cfg_var.h
deleted file mode 100644
index ff40a85926be..000000000000
--- a/sys/compat/ndis/cfg_var.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
- * Copyright (c) 2003
- *	Bill Paul <wpaul@windriver.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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.
- *
- * $FreeBSD$
- */
-
-#ifndef _CFG_VAR_H_
-#define _CFG_VAR_H_
-
-struct ndis_cfg {
-	char			*nc_cfgkey;
-	char			*nc_cfgdesc;
-	char			nc_val[256];
-	int			nc_idx;
-};
-
-typedef struct ndis_cfg ndis_cfg;
-
-#endif /* _CFG_VAR_H_ */
diff --git a/sys/compat/ndis/hal_var.h b/sys/compat/ndis/hal_var.h
deleted file mode 100644
index f8864e2e7071..000000000000
--- a/sys/compat/ndis/hal_var.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
- * Copyright (c) 2003
- *	Bill Paul <wpaul@windriver.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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.
- *
- * $FreeBSD$
- */
-
-#ifndef _HAL_VAR_H_
-#define _HAL_VAR_H_
-
-#define NDIS_BUS_SPACE_IO	X86_BUS_SPACE_IO
-#define NDIS_BUS_SPACE_MEM	X86_BUS_SPACE_MEM
-
-extern image_patch_table hal_functbl[];
-
-__BEGIN_DECLS
-extern int hal_libinit(void);
-extern int hal_libfini(void);
-extern uint8_t KfAcquireSpinLock(kspin_lock *);
-extern void KfReleaseSpinLock(kspin_lock *, uint8_t);
-extern uint8_t KfRaiseIrql(uint8_t);
-extern void KfLowerIrql(uint8_t);
-extern uint8_t KeGetCurrentIrql(void);
-__END_DECLS
-
-#endif /* _HAL_VAR_H_ */
diff --git a/sys/compat/ndis/kern_ndis.c b/sys/compat/ndis/kern_ndis.c
deleted file mode 100644
index 153849fa1cf6..000000000000
--- a/sys/compat/ndis/kern_ndis.c
+++ /dev/null
@@ -1,1447 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
- * Copyright (c) 2003
- *	Bill Paul <wpaul@windriver.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/unistd.h>
-#include <sys/types.h>
-#include <sys/errno.h>
-#include <sys/callout.h>
-#include <sys/socket.h>
-#include <sys/queue.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
-#include <sys/malloc.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/conf.h>
-
-#include <sys/kernel.h>
-#include <sys/module.h>
-#include <sys/kthread.h>
-#include <machine/bus.h>
-#include <machine/resource.h>
-#include <sys/bus.h>
-#include <sys/rman.h>
-
-#include <net/if.h>
-#include <net/if_var.h>
-#include <net/if_arp.h>
-#include <net/ethernet.h>
-#include <net/if_dl.h>
-#include <net/if_media.h>
-
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_ioctl.h>
-
-#include <dev/usb/usb.h>
-#include <dev/usb/usbdi.h>
-
-#include <compat/ndis/pe_var.h>
-#include <compat/ndis/cfg_var.h>
-#include <compat/ndis/resource_var.h>
-#include <compat/ndis/ntoskrnl_var.h>
-#include <compat/ndis/ndis_var.h>
-#include <compat/ndis/hal_var.h>
-#include <compat/ndis/usbd_var.h>
-#include <dev/if_ndis/if_ndisvar.h>
-
-#define NDIS_DUMMY_PATH "\\\\some\\bogus\\path"
-#define	NDIS_FLAG_RDONLY 1
-
-static void ndis_status_func(ndis_handle, ndis_status, void *, uint32_t);
-static void ndis_statusdone_func(ndis_handle);
-static void ndis_setdone_func(ndis_handle, ndis_status);
-static void ndis_getdone_func(ndis_handle, ndis_status);
-static void ndis_resetdone_func(ndis_handle, ndis_status, uint8_t);
-static void ndis_sendrsrcavail_func(ndis_handle);
-static void ndis_intrsetup(kdpc *, device_object *,
-	irp *, struct ndis_softc *);
-static void ndis_return(device_object *, void *);
-
-static image_patch_table kernndis_functbl[] = {
-	IMPORT_SFUNC(ndis_status_func, 4),
-	IMPORT_SFUNC(ndis_statusdone_func, 1),
-	IMPORT_SFUNC(ndis_setdone_func, 2),
-	IMPORT_SFUNC(ndis_getdone_func, 2),
-	IMPORT_SFUNC(ndis_resetdone_func, 3),
-	IMPORT_SFUNC(ndis_sendrsrcavail_func, 1),
-	IMPORT_SFUNC(ndis_intrsetup, 4),
-	IMPORT_SFUNC(ndis_return, 1),
-	{ NULL, NULL, NULL }
-};
-
-static struct nd_head ndis_devhead;
-
-/*
- * This allows us to export our symbols to other modules.
- * Note that we call ourselves 'ndisapi' to avoid a namespace
- * collision with if_ndis.ko, which internally calls itself
- * 'ndis.'
- *
- * Note: some of the subsystems depend on each other, so the
- * order in which they're started is important. The order of
- * importance is:
- *
- * HAL - spinlocks and IRQL manipulation
- * ntoskrnl - DPC and workitem threads, object waiting
- * windrv - driver/device registration
- *
- * The HAL should also be the last thing shut down, since
- * the ntoskrnl subsystem will use spinlocks right up until
- * the DPC and workitem threads are terminated.
- */
-
-static int
-ndis_modevent(module_t mod, int cmd, void *arg)
-{
-	int			error = 0;
-	image_patch_table	*patch;
-
-	switch (cmd) {
-	case MOD_LOAD:
-		/* Initialize subsystems */
-		hal_libinit();
-		ntoskrnl_libinit();
-		windrv_libinit();
-		ndis_libinit();
-		usbd_libinit();
-
-		patch = kernndis_functbl;
-		while (patch->ipt_func != NULL) {
-			windrv_wrap((funcptr)patch->ipt_func,
-			    (funcptr *)&patch->ipt_wrap,
-			    patch->ipt_argcnt, patch->ipt_ftype);
-			patch++;
-		}
-
-		TAILQ_INIT(&ndis_devhead);
-		break;
-	case MOD_SHUTDOWN:
-		if (TAILQ_FIRST(&ndis_devhead) == NULL) {
-			/* Shut down subsystems */
-			ndis_libfini();
-			usbd_libfini();
-			windrv_libfini();
-			ntoskrnl_libfini();
-			hal_libfini();
-
-			patch = kernndis_functbl;
-			while (patch->ipt_func != NULL) {
-				windrv_unwrap(patch->ipt_wrap);
-				patch++;
-			}
-		}
-		break;
-	case MOD_UNLOAD:
-		/* Shut down subsystems */
-		ndis_libfini();
-		usbd_libfini();
-		windrv_libfini();
-		ntoskrnl_libfini();
-		hal_libfini();
-
-		patch = kernndis_functbl;
-		while (patch->ipt_func != NULL) {
-			windrv_unwrap(patch->ipt_wrap);
-			patch++;
-		}
-
-		break;
-	default:
-		error = EINVAL;
-		break;
-	}
-
-	return (error);
-}
-DEV_MODULE(ndisapi, ndis_modevent, NULL);
-MODULE_VERSION(ndisapi, 1);
-
-static void
-ndis_sendrsrcavail_func(adapter)
-	ndis_handle		adapter;
-{
-}
-
-static void
-ndis_status_func(adapter, status, sbuf, slen)
-	ndis_handle		adapter;
-	ndis_status		status;
-	void			*sbuf;
-	uint32_t		slen;
-{
-	ndis_miniport_block	*block;
-	struct ndis_softc	*sc;
-	struct ifnet		*ifp;
-
-	block = adapter;
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-	ifp = NDISUSB_GET_IFNET(sc);
-	if ( ifp && ifp->if_flags & IFF_DEBUG)
-		device_printf(sc->ndis_dev, "status: %x\n", status);
-}
-
-static void
-ndis_statusdone_func(adapter)
-	ndis_handle		adapter;
-{
-	ndis_miniport_block	*block;
-	struct ndis_softc	*sc;
-	struct ifnet		*ifp;
-
-	block = adapter;
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-	ifp = NDISUSB_GET_IFNET(sc);
-	if (ifp && ifp->if_flags & IFF_DEBUG)
-		device_printf(sc->ndis_dev, "status complete\n");
-}
-
-static void
-ndis_setdone_func(adapter, status)
-	ndis_handle		adapter;
-	ndis_status		status;
-{
-	ndis_miniport_block	*block;
-	block = adapter;
-
-	block->nmb_setstat = status;
-	KeSetEvent(&block->nmb_setevent, IO_NO_INCREMENT, FALSE);
-}
-
-static void
-ndis_getdone_func(adapter, status)
-	ndis_handle		adapter;
-	ndis_status		status;
-{
-	ndis_miniport_block	*block;
-	block = adapter;
-
-	block->nmb_getstat = status;
-	KeSetEvent(&block->nmb_getevent, IO_NO_INCREMENT, FALSE);
-}
-
-static void
-ndis_resetdone_func(ndis_handle adapter, ndis_status status,
-	uint8_t addressingreset)
-{
-	ndis_miniport_block	*block;
-	struct ndis_softc	*sc;
-	struct ifnet		*ifp;
-
-	block = adapter;
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-	ifp = NDISUSB_GET_IFNET(sc);
-
-	if (ifp && ifp->if_flags & IFF_DEBUG)
-		device_printf(sc->ndis_dev, "reset done...\n");
-	KeSetEvent(&block->nmb_resetevent, IO_NO_INCREMENT, FALSE);
-}
-
-int
-ndis_create_sysctls(arg)
-	void			*arg;
-{
-	struct ndis_softc	*sc;
-	ndis_cfg		*vals;
-	char			buf[256];
-	struct sysctl_oid	*oidp;
-	struct sysctl_ctx_entry	*e;
-
-	if (arg == NULL)
-		return (EINVAL);
-
-	sc = arg;
-	/*
-	device_printf(sc->ndis_dev, "ndis_create_sysctls() sc=%p\n", sc);
-	*/
-	vals = sc->ndis_regvals;
-
-	TAILQ_INIT(&sc->ndis_cfglist_head);
-
-	/* Add the driver-specific registry keys. */
-
-	while(1) {
-		if (vals->nc_cfgkey == NULL)
-			break;
-
-		if (vals->nc_idx != sc->ndis_devidx) {
-			vals++;
-			continue;
-		}
-
-		/* See if we already have a sysctl with this name */
-
-		oidp = NULL;
-		TAILQ_FOREACH(e, device_get_sysctl_ctx(sc->ndis_dev), link) {
-			oidp = e->entry;
-			if (strcasecmp(oidp->oid_name, vals->nc_cfgkey) == 0)
-				break;
-			oidp = NULL;
-		}
-
-		if (oidp != NULL) {
-			vals++;
-			continue;
-		}
-
-		ndis_add_sysctl(sc, vals->nc_cfgkey, vals->nc_cfgdesc,
-		    vals->nc_val, CTLFLAG_RW);
-		vals++;
-	}
-
-	/* Now add a couple of builtin keys. */
-
-	/*
-	 * Environment can be either Windows (0) or WindowsNT (1).
-	 * We qualify as the latter.
-	 */
-	ndis_add_sysctl(sc, "Environment",
-	    "Windows environment", "1", NDIS_FLAG_RDONLY);
-
-	/* NDIS version should be 5.1. */
-	ndis_add_sysctl(sc, "NdisVersion",
-	    "NDIS API Version", "0x00050001", NDIS_FLAG_RDONLY);
-
-	/*
-	 * Some miniport drivers rely on the existence of the SlotNumber,
-	 * NetCfgInstanceId and DriverDesc keys.
-	 */
-	ndis_add_sysctl(sc, "SlotNumber", "Slot Numer", "01", NDIS_FLAG_RDONLY);
-	ndis_add_sysctl(sc, "NetCfgInstanceId", "NetCfgInstanceId",
-	    "{12345678-1234-5678-CAFE0-123456789ABC}", NDIS_FLAG_RDONLY);
-	ndis_add_sysctl(sc, "DriverDesc", "Driver Description",
-	    "NDIS Network Adapter", NDIS_FLAG_RDONLY);
-
-	/* Bus type (PCI, PCMCIA, etc...) */
-	sprintf(buf, "%d", (int)sc->ndis_iftype);
-	ndis_add_sysctl(sc, "BusType", "Bus Type", buf, NDIS_FLAG_RDONLY);
-
-	if (sc->ndis_res_io != NULL) {
-		sprintf(buf, "0x%jx", rman_get_start(sc->ndis_res_io));
-		ndis_add_sysctl(sc, "IOBaseAddress",
-		    "Base I/O Address", buf, NDIS_FLAG_RDONLY);
-	}
-
-	if (sc->ndis_irq != NULL) {
-		sprintf(buf, "%ju", rman_get_start(sc->ndis_irq));
-		ndis_add_sysctl(sc, "InterruptNumber",
-		    "Interrupt Number", buf, NDIS_FLAG_RDONLY);
-	}
-
-	return (0);
-}
-
-int
-ndis_add_sysctl(arg, key, desc, val, flag_rdonly)
-	void			*arg;
-	char			*key;
-	char			*desc;
-	char			*val;
-	int			flag_rdonly;
-{
-	struct ndis_softc	*sc;
-	struct ndis_cfglist	*cfg;
-	char			descstr[256];
-
-	sc = arg;
-
-	cfg = malloc(sizeof(struct ndis_cfglist), M_DEVBUF, M_NOWAIT|M_ZERO);
-
-	if (cfg == NULL) {
-		printf("failed for %s\n", key);
-		return (ENOMEM);
-	}
-
-	cfg->ndis_cfg.nc_cfgkey = strdup(key, M_DEVBUF);
-	if (desc == NULL) {
-		snprintf(descstr, sizeof(descstr), "%s (dynamic)", key);
-		cfg->ndis_cfg.nc_cfgdesc = strdup(descstr, M_DEVBUF);
-	} else
-		cfg->ndis_cfg.nc_cfgdesc = strdup(desc, M_DEVBUF);
-	strcpy(cfg->ndis_cfg.nc_val, val);
-
-	TAILQ_INSERT_TAIL(&sc->ndis_cfglist_head, cfg, link);
-
-	if (flag_rdonly != 0) {
-		cfg->ndis_oid =
-		    SYSCTL_ADD_STRING(device_get_sysctl_ctx(sc->ndis_dev),
-		    SYSCTL_CHILDREN(device_get_sysctl_tree(sc->ndis_dev)),
-		    OID_AUTO, cfg->ndis_cfg.nc_cfgkey, CTLFLAG_RD,
-		    cfg->ndis_cfg.nc_val, sizeof(cfg->ndis_cfg.nc_val),
-		    cfg->ndis_cfg.nc_cfgdesc);
-	} else {
-		cfg->ndis_oid =
-		    SYSCTL_ADD_STRING(device_get_sysctl_ctx(sc->ndis_dev),
-		    SYSCTL_CHILDREN(device_get_sysctl_tree(sc->ndis_dev)),
-		    OID_AUTO, cfg->ndis_cfg.nc_cfgkey, CTLFLAG_RW,
-		    cfg->ndis_cfg.nc_val, sizeof(cfg->ndis_cfg.nc_val),
-		    cfg->ndis_cfg.nc_cfgdesc);
-	}
-	return (0);
-}
-
-/*
- * Somewhere, somebody decided "hey, let's automatically create
- * a sysctl tree for each device instance as it's created -- it'll
- * make life so much easier!" Lies. Why must they turn the kernel
- * into a house of lies?
- */
-
-int
-ndis_flush_sysctls(arg)
-	void			*arg;
-{
-	struct ndis_softc	*sc;
-	struct ndis_cfglist	*cfg;
-	struct sysctl_ctx_list	*clist;
-
-	sc = arg;
-
-	clist = device_get_sysctl_ctx(sc->ndis_dev);
-
-	while (!TAILQ_EMPTY(&sc->ndis_cfglist_head)) {
-		cfg = TAILQ_FIRST(&sc->ndis_cfglist_head);
-		TAILQ_REMOVE(&sc->ndis_cfglist_head, cfg, link);
-		sysctl_ctx_entry_del(clist, cfg->ndis_oid);
-		sysctl_remove_oid(cfg->ndis_oid, 1, 0);
-		free(cfg->ndis_cfg.nc_cfgkey, M_DEVBUF);
-		free(cfg->ndis_cfg.nc_cfgdesc, M_DEVBUF);
-		free(cfg, M_DEVBUF);
-	}
-
-	return (0);
-}
-
-void *
-ndis_get_routine_address(functbl, name)
-	struct image_patch_table *functbl;
-	char			*name;
-{
-	int			i;
-
-	for (i = 0; functbl[i].ipt_name != NULL; i++)
-		if (strcmp(name, functbl[i].ipt_name) == 0)
-			return (functbl[i].ipt_wrap);
-	return (NULL);
-}
-
-static void
-ndis_return(dobj, arg)
-	device_object		*dobj;
-	void			*arg;
-{
-	ndis_miniport_block	*block;
-	ndis_miniport_characteristics	*ch;
-	ndis_return_handler	returnfunc;
-	ndis_handle		adapter;
-	ndis_packet		*p;
-	uint8_t			irql;
-	list_entry		*l;
-
-	block = arg;
-	ch = IoGetDriverObjectExtension(dobj->do_drvobj, (void *)1);
-
-	p = arg;
-	adapter = block->nmb_miniportadapterctx;
-
-	if (adapter == NULL)
-		return;
-
-	returnfunc = ch->nmc_return_packet_func;
-
-	KeAcquireSpinLock(&block->nmb_returnlock, &irql);
-	while (!IsListEmpty(&block->nmb_returnlist)) {
-		l = RemoveHeadList((&block->nmb_returnlist));
-		p = CONTAINING_RECORD(l, ndis_packet, np_list);
-		InitializeListHead((&p->np_list));
-		KeReleaseSpinLock(&block->nmb_returnlock, irql);
-		MSCALL2(returnfunc, adapter, p);
-		KeAcquireSpinLock(&block->nmb_returnlock, &irql);
-	}
-	KeReleaseSpinLock(&block->nmb_returnlock, irql);
-}
-
-static void
-ndis_ext_free(struct mbuf *m)
-{
-
-	return (ndis_return_packet(m->m_ext.ext_arg1));
-}
-
-void
-ndis_return_packet(ndis_packet *p)
-{
-	ndis_miniport_block	*block;
-
-	if (p == NULL)
-		return;
-
-	/* Decrement refcount. */
-	p->np_refcnt--;
-
-	/* Release packet when refcount hits zero, otherwise return. */
-	if (p->np_refcnt)
-		return;
-
-	block = ((struct ndis_softc *)p->np_softc)->ndis_block;
-
-	KeAcquireSpinLockAtDpcLevel(&block->nmb_returnlock);
-	InitializeListHead((&p->np_list));
-	InsertHeadList((&block->nmb_returnlist), (&p->np_list));
-	KeReleaseSpinLockFromDpcLevel(&block->nmb_returnlock);
-
-	IoQueueWorkItem(block->nmb_returnitem,
-	    (io_workitem_func)kernndis_functbl[7].ipt_wrap,
-	    WORKQUEUE_CRITICAL, block);
-}
-
-void
-ndis_free_bufs(b0)
-	ndis_buffer		*b0;
-{
-	ndis_buffer		*next;
-
-	if (b0 == NULL)
-		return;
-
-	while(b0 != NULL) {
-		next = b0->mdl_next;
-		IoFreeMdl(b0);
-		b0 = next;
-	}
-}
-
-void
-ndis_free_packet(p)
-	ndis_packet		*p;
-{
-	if (p == NULL)
-		return;
-
-	ndis_free_bufs(p->np_private.npp_head);
-	NdisFreePacket(p);
-}
-
-int
-ndis_convert_res(arg)
-	void			*arg;
-{
-	struct ndis_softc	*sc;
-	ndis_resource_list	*rl = NULL;
-	cm_partial_resource_desc	*prd = NULL;
-	ndis_miniport_block	*block;
-	device_t		dev;
-	struct resource_list	*brl;
-	struct resource_list_entry	*brle;
-	int			error = 0;
-
-	sc = arg;
-	block = sc->ndis_block;
-	dev = sc->ndis_dev;
-
-	rl = malloc(sizeof(ndis_resource_list) +
-	    (sizeof(cm_partial_resource_desc) * (sc->ndis_rescnt - 1)),
-	    M_DEVBUF, M_NOWAIT|M_ZERO);
-
-	if (rl == NULL)
-		return (ENOMEM);
-
-	rl->cprl_version = 5;
-	rl->cprl_revision = 1;
-	rl->cprl_count = sc->ndis_rescnt;
-	prd = rl->cprl_partial_descs;
-
-	brl = BUS_GET_RESOURCE_LIST(dev, dev);
-
-	if (brl != NULL) {
-		STAILQ_FOREACH(brle, brl, link) {
-			switch (brle->type) {
-			case SYS_RES_IOPORT:
-				prd->cprd_type = CmResourceTypePort;
-				prd->cprd_flags = CM_RESOURCE_PORT_IO;
-				prd->cprd_sharedisp =
-				    CmResourceShareDeviceExclusive;
-				prd->u.cprd_port.cprd_start.np_quad =
-				    brle->start;
-				prd->u.cprd_port.cprd_len = brle->count;
-				break;
-			case SYS_RES_MEMORY:
-				prd->cprd_type = CmResourceTypeMemory;
-				prd->cprd_flags =
-				    CM_RESOURCE_MEMORY_READ_WRITE;
-				prd->cprd_sharedisp =
-				    CmResourceShareDeviceExclusive;
-				prd->u.cprd_mem.cprd_start.np_quad =
-				    brle->start;
-				prd->u.cprd_mem.cprd_len = brle->count;
-				break;
-			case SYS_RES_IRQ:
-				prd->cprd_type = CmResourceTypeInterrupt;
-				prd->cprd_flags = 0;
-				/*
-				 * Always mark interrupt resources as
-				 * shared, since in our implementation,
-				 * they will be.
-				 */
-				prd->cprd_sharedisp =
-				    CmResourceShareShared;
-				prd->u.cprd_intr.cprd_level = brle->start;
-				prd->u.cprd_intr.cprd_vector = brle->start;
-				prd->u.cprd_intr.cprd_affinity = 0;
-				break;
-			default:
-				break;
-			}
-			prd++;
-		}
-	}
-
-	block->nmb_rlist = rl;
-
-	return (error);
-}
-
-/*
- * Map an NDIS packet to an mbuf list. When an NDIS driver receives a
- * packet, it will hand it to us in the form of an ndis_packet,
- * which we need to convert to an mbuf that is then handed off
- * to the stack. Note: we configure the mbuf list so that it uses
- * the memory regions specified by the ndis_buffer structures in
- * the ndis_packet as external storage. In most cases, this will
- * point to a memory region allocated by the driver (either by
- * ndis_malloc_withtag() or ndis_alloc_sharedmem()). We expect
- * the driver to handle free()ing this region for is, so we set up
- * a dummy no-op free handler for it.
- */ 
-
-int
-ndis_ptom(m0, p)
-	struct mbuf		**m0;
-	ndis_packet		*p;
-{
-	struct mbuf		*m = NULL, *prev = NULL;
-	ndis_buffer		*buf;
-	ndis_packet_private	*priv;
-	uint32_t		totlen = 0;
-	struct ifnet		*ifp;
-	struct ether_header	*eh;
-	int			diff;
-
-	if (p == NULL || m0 == NULL)
-		return (EINVAL);
-
-	priv = &p->np_private;
-	buf = priv->npp_head;
-	p->np_refcnt = 0;
-
-	for (buf = priv->npp_head; buf != NULL; buf = buf->mdl_next) {
-		if (buf == priv->npp_head)
-			m = m_gethdr(M_NOWAIT, MT_DATA);
-		else
-			m = m_get(M_NOWAIT, MT_DATA);
-		if (m == NULL) {
-			m_freem(*m0);
-			*m0 = NULL;
-			return (ENOBUFS);
-		}
-		m->m_len = MmGetMdlByteCount(buf);
-		m_extadd(m, MmGetMdlVirtualAddress(buf), m->m_len,
-		    ndis_ext_free, p, NULL, 0, EXT_NDIS);
-		p->np_refcnt++;
-
-		totlen += m->m_len;
-		if (m->m_flags & M_PKTHDR)
-			*m0 = m;
-		else
-			prev->m_next = m;
-		prev = m;
-	}
-
-	/*
-	 * This is a hack to deal with the Marvell 8335 driver
-	 * which, when associated with an AP in WPA-PSK mode,
-	 * seems to overpad its frames by 8 bytes. I don't know
-	 * that the extra 8 bytes are for, and they're not there
-	 * in open mode, so for now clamp the frame size at 1514
-	 * until I can figure out how to deal with this properly,
-	 * otherwise if_ethersubr() will spank us by discarding
-	 * the 'oversize' frames.
-	 */
-
-	eh = mtod((*m0), struct ether_header *);
-	ifp = NDISUSB_GET_IFNET((struct ndis_softc *)p->np_softc);
-	if (ifp && totlen > ETHER_MAX_FRAME(ifp, eh->ether_type, FALSE)) {
-		diff = totlen - ETHER_MAX_FRAME(ifp, eh->ether_type, FALSE);
-		totlen -= diff;
-		m->m_len -= diff;
-	}
-	(*m0)->m_pkthdr.len = totlen;
-
-	return (0);
-}
-
-/*
- * Create an NDIS packet from an mbuf chain.
- * This is used mainly when transmitting packets, where we need
- * to turn an mbuf off an interface's send queue and transform it
- * into an NDIS packet which will be fed into the NDIS driver's
- * send routine.
- *
- * NDIS packets consist of two parts: an ndis_packet structure,
- * which is vaguely analogous to the pkthdr portion of an mbuf,
- * and one or more ndis_buffer structures, which define the
- * actual memory segments in which the packet data resides.
- * We need to allocate one ndis_buffer for each mbuf in a chain,
- * plus one ndis_packet as the header.
- */
-
-int
-ndis_mtop(m0, p)
-	struct mbuf		*m0;
-	ndis_packet		**p;
-{
-	struct mbuf		*m;
-	ndis_buffer		*buf = NULL, *prev = NULL;
-	ndis_packet_private	*priv;
-
-	if (p == NULL || *p == NULL || m0 == NULL)
-		return (EINVAL);
-
-	priv = &(*p)->np_private;
-	priv->npp_totlen = m0->m_pkthdr.len;
-
-	for (m = m0; m != NULL; m = m->m_next) {
-		if (m->m_len == 0)
-			continue;
-		buf = IoAllocateMdl(m->m_data, m->m_len, FALSE, FALSE, NULL);
-		if (buf == NULL) {
-			ndis_free_packet(*p);
-			*p = NULL;
-			return (ENOMEM);
-		}
-		MmBuildMdlForNonPagedPool(buf);
-
-		if (priv->npp_head == NULL)
-			priv->npp_head = buf;
-		else
-			prev->mdl_next = buf;
-		prev = buf;
-	}
-
-	priv->npp_tail = buf;
-
-	return (0);
-}
-
-int
-ndis_get_supported_oids(arg, oids, oidcnt)
-	void			*arg;
-	ndis_oid		**oids;
-	int			*oidcnt;
-{
-	int			len, rval;
-	ndis_oid		*o;
-
-	if (arg == NULL || oids == NULL || oidcnt == NULL)
-		return (EINVAL);
-	len = 0;
-	ndis_get_info(arg, OID_GEN_SUPPORTED_LIST, NULL, &len);
-
-	o = malloc(len, M_DEVBUF, M_NOWAIT);
-	if (o == NULL)
-		return (ENOMEM);
-
-	rval = ndis_get_info(arg, OID_GEN_SUPPORTED_LIST, o, &len);
-
-	if (rval) {
-		free(o, M_DEVBUF);
-		return (rval);
-	}
-
-	*oids = o;
-	*oidcnt = len / 4;
-
-	return (0);
-}
-
-int
-ndis_set_info(arg, oid, buf, buflen)
-	void			*arg;
-	ndis_oid		oid;
-	void			*buf;
-	int			*buflen;
-{
-	struct ndis_softc	*sc;
-	ndis_status		rval;
-	ndis_handle		adapter;
-	ndis_setinfo_handler	setfunc;
-	uint32_t		byteswritten = 0, bytesneeded = 0;
-	uint8_t			irql;
-	uint64_t		duetime;
-
-	/*
-	 * According to the NDIS spec, MiniportQueryInformation()
-	 * and MiniportSetInformation() requests are handled serially:
-	 * once one request has been issued, we must wait for it to
- 	 * finish before allowing another request to proceed.
-	 */
-
-	sc = arg;
-
-	KeResetEvent(&sc->ndis_block->nmb_setevent);
-
-	KeAcquireSpinLock(&sc->ndis_block->nmb_lock, &irql);
-
-	if (sc->ndis_block->nmb_pendingreq != NULL) {
-		KeReleaseSpinLock(&sc->ndis_block->nmb_lock, irql);
-		panic("ndis_set_info() called while other request pending");
-	} else
-		sc->ndis_block->nmb_pendingreq = (ndis_request *)sc;
-
-	setfunc = sc->ndis_chars->nmc_setinfo_func;
-	adapter = sc->ndis_block->nmb_miniportadapterctx;
-
-	if (adapter == NULL || setfunc == NULL ||
-	    sc->ndis_block->nmb_devicectx == NULL) {
-		sc->ndis_block->nmb_pendingreq = NULL;
-		KeReleaseSpinLock(&sc->ndis_block->nmb_lock, irql);
-		return (ENXIO);
-	}
-
-	rval = MSCALL6(setfunc, adapter, oid, buf, *buflen,
-	    &byteswritten, &bytesneeded);
-
-	sc->ndis_block->nmb_pendingreq = NULL;
-
-	KeReleaseSpinLock(&sc->ndis_block->nmb_lock, irql);
-
-	if (rval == NDIS_STATUS_PENDING) {
-		/* Wait up to 5 seconds. */
-		duetime = (5 * 1000000) * -10;
-		KeWaitForSingleObject(&sc->ndis_block->nmb_setevent,
-		    0, 0, FALSE, &duetime);
-		rval = sc->ndis_block->nmb_setstat;
-	}
-
-	if (byteswritten)
-		*buflen = byteswritten;
-	if (bytesneeded)
-		*buflen = bytesneeded;
-
-	if (rval == NDIS_STATUS_INVALID_LENGTH)
-		return (ENOSPC);
-
-	if (rval == NDIS_STATUS_INVALID_OID)
-		return (EINVAL);
-
-	if (rval == NDIS_STATUS_NOT_SUPPORTED ||
-	    rval == NDIS_STATUS_NOT_ACCEPTED)
-		return (ENOTSUP);
-
-	if (rval != NDIS_STATUS_SUCCESS)
-		return (ENODEV);
-
-	return (0);
-}
-
-typedef void (*ndis_senddone_func)(ndis_handle, ndis_packet *, ndis_status);
-
-int
-ndis_send_packets(arg, packets, cnt)
-	void			*arg;
-	ndis_packet		**packets;
-	int			cnt;
-{
-	struct ndis_softc	*sc;
-	ndis_handle		adapter;
-	ndis_sendmulti_handler	sendfunc;
-	ndis_senddone_func		senddonefunc;
-	int			i;
-	ndis_packet		*p;
-	uint8_t			irql = 0;
-
-	sc = arg;
-	adapter = sc->ndis_block->nmb_miniportadapterctx;
-	if (adapter == NULL)
-		return (ENXIO);
-	sendfunc = sc->ndis_chars->nmc_sendmulti_func;
-	senddonefunc = sc->ndis_block->nmb_senddone_func;
-
-	if (NDIS_SERIALIZED(sc->ndis_block))
-		KeAcquireSpinLock(&sc->ndis_block->nmb_lock, &irql);
-
-	MSCALL3(sendfunc, adapter, packets, cnt);
-
-	for (i = 0; i < cnt; i++) {
-		p = packets[i];
-		/*
-		 * Either the driver already handed the packet to
-		 * ndis_txeof() due to a failure, or it wants to keep
-		 * it and release it asynchronously later. Skip to the
-		 * next one.
-		 */
-		if (p == NULL || p->np_oob.npo_status == NDIS_STATUS_PENDING)
-			continue;
-		MSCALL3(senddonefunc, sc->ndis_block, p, p->np_oob.npo_status);
-	}
-
-	if (NDIS_SERIALIZED(sc->ndis_block))
-		KeReleaseSpinLock(&sc->ndis_block->nmb_lock, irql);
-
-	return (0);
-}
-
-int
-ndis_send_packet(arg, packet)
-	void			*arg;
-	ndis_packet		*packet;
-{
-	struct ndis_softc	*sc;
-	ndis_handle		adapter;
-	ndis_status		status;
-	ndis_sendsingle_handler	sendfunc;
-	ndis_senddone_func		senddonefunc;
-	uint8_t			irql = 0;
-
-	sc = arg;
-	adapter = sc->ndis_block->nmb_miniportadapterctx;
-	if (adapter == NULL)
-		return (ENXIO);
-	sendfunc = sc->ndis_chars->nmc_sendsingle_func;
-	senddonefunc = sc->ndis_block->nmb_senddone_func;
-
-	if (NDIS_SERIALIZED(sc->ndis_block))
-		KeAcquireSpinLock(&sc->ndis_block->nmb_lock, &irql);
-	status = MSCALL3(sendfunc, adapter, packet,
-	    packet->np_private.npp_flags);
-
-	if (status == NDIS_STATUS_PENDING) {
-		if (NDIS_SERIALIZED(sc->ndis_block))
-			KeReleaseSpinLock(&sc->ndis_block->nmb_lock, irql);
-		return (0);
-	}
-
-	MSCALL3(senddonefunc, sc->ndis_block, packet, status);
-
-	if (NDIS_SERIALIZED(sc->ndis_block))
-		KeReleaseSpinLock(&sc->ndis_block->nmb_lock, irql);
-
-	return (0);
-}
-
-int
-ndis_init_dma(arg)
-	void			*arg;
-{
-	struct ndis_softc	*sc;
-	int			i, error;
-
-	sc = arg;
-
-	sc->ndis_tmaps = malloc(sizeof(bus_dmamap_t) * sc->ndis_maxpkts,
-	    M_DEVBUF, M_NOWAIT|M_ZERO);
-
-	if (sc->ndis_tmaps == NULL)
-		return (ENOMEM);
-
-	for (i = 0; i < sc->ndis_maxpkts; i++) {
-		error = bus_dmamap_create(sc->ndis_ttag, 0,
-		    &sc->ndis_tmaps[i]);
-		if (error) {
-			free(sc->ndis_tmaps, M_DEVBUF);
-			return (ENODEV);
-		}
-	}
-
-	return (0);
-}
-
-int
-ndis_destroy_dma(arg)
-	void			*arg;
-{
-	struct ndis_softc	*sc;
-	struct mbuf		*m;
-	ndis_packet		*p = NULL;
-	int			i;
-
-	sc = arg;
-
-	for (i = 0; i < sc->ndis_maxpkts; i++) {
-		if (sc->ndis_txarray[i] != NULL) {
-			p = sc->ndis_txarray[i];
-			m = (struct mbuf *)p->np_rsvd[1];
-			if (m != NULL)
-				m_freem(m);
-			ndis_free_packet(sc->ndis_txarray[i]);
-		}
-		bus_dmamap_destroy(sc->ndis_ttag, sc->ndis_tmaps[i]);
-	}
-
-	free(sc->ndis_tmaps, M_DEVBUF);
-
-	bus_dma_tag_destroy(sc->ndis_ttag);
-
-	return (0);
-}
-
-int
-ndis_reset_nic(arg)
-	void			*arg;
-{
-	struct ndis_softc	*sc;
-	ndis_handle		adapter;
-	ndis_reset_handler	resetfunc;
-	uint8_t			addressing_reset;
-	int			rval;
-	uint8_t			irql = 0;
-
-	sc = arg;
-
-	NDIS_LOCK(sc);
-	adapter = sc->ndis_block->nmb_miniportadapterctx;
-	resetfunc = sc->ndis_chars->nmc_reset_func;
-
-	if (adapter == NULL || resetfunc == NULL ||
-	    sc->ndis_block->nmb_devicectx == NULL) {
-		NDIS_UNLOCK(sc);
-		return (EIO);
-	}
-
-	NDIS_UNLOCK(sc);
-
-	KeResetEvent(&sc->ndis_block->nmb_resetevent);
-
-	if (NDIS_SERIALIZED(sc->ndis_block))
-		KeAcquireSpinLock(&sc->ndis_block->nmb_lock, &irql);
-
-	rval = MSCALL2(resetfunc, &addressing_reset, adapter);
-
-	if (NDIS_SERIALIZED(sc->ndis_block))
-		KeReleaseSpinLock(&sc->ndis_block->nmb_lock, irql);
-
-	if (rval == NDIS_STATUS_PENDING)
-		KeWaitForSingleObject(&sc->ndis_block->nmb_resetevent,
-		    0, 0, FALSE, NULL);
-
-	return (0);
-}
-
-int
-ndis_halt_nic(arg)
-	void			*arg;
-{
-	struct ndis_softc	*sc;
-	ndis_handle		adapter;
-	ndis_halt_handler	haltfunc;
-	ndis_miniport_block	*block;
-	int			empty = 0;
-	uint8_t			irql;
-
-	sc = arg;
-	block = sc->ndis_block;
-
-	if (!cold)
-		KeFlushQueuedDpcs();
-
-	/*
-	 * Wait for all packets to be returned.
-	 */
-
-	while (1) {
-		KeAcquireSpinLock(&block->nmb_returnlock, &irql);
-		empty = IsListEmpty(&block->nmb_returnlist);
-		KeReleaseSpinLock(&block->nmb_returnlock, irql);
-		if (empty)
-			break;
-		NdisMSleep(1000);
-	}
-
-	NDIS_LOCK(sc);
-	adapter = sc->ndis_block->nmb_miniportadapterctx;
-	if (adapter == NULL) {
-		NDIS_UNLOCK(sc);
-		return (EIO);
-	}
-
-	sc->ndis_block->nmb_devicectx = NULL;
-
-	/*
-	 * The adapter context is only valid after the init
-	 * handler has been called, and is invalid once the
-	 * halt handler has been called.
-	 */
-
-	haltfunc = sc->ndis_chars->nmc_halt_func;
-	NDIS_UNLOCK(sc);
-
-	MSCALL1(haltfunc, adapter);
-
-	NDIS_LOCK(sc);
-	sc->ndis_block->nmb_miniportadapterctx = NULL;
-	NDIS_UNLOCK(sc);
-
-	return (0);
-}
-
-int
-ndis_shutdown_nic(arg)
-	void			*arg;
-{
-	struct ndis_softc	*sc;
-	ndis_handle		adapter;
-	ndis_shutdown_handler	shutdownfunc;
-
-	sc = arg;
-	NDIS_LOCK(sc);
-	adapter = sc->ndis_block->nmb_miniportadapterctx;
-	shutdownfunc = sc->ndis_chars->nmc_shutdown_handler;
-	NDIS_UNLOCK(sc);
-	if (adapter == NULL || shutdownfunc == NULL)
-		return (EIO);
-
-	if (sc->ndis_chars->nmc_rsvd0 == NULL)
-		MSCALL1(shutdownfunc, adapter);
-	else
-		MSCALL1(shutdownfunc, sc->ndis_chars->nmc_rsvd0);
-
-	TAILQ_REMOVE(&ndis_devhead, sc->ndis_block, link);
-
-	return (0);
-}
-
-int
-ndis_pnpevent_nic(arg, type)
-	void			*arg;
-	int			type;
-{
-	device_t		dev;
-	struct ndis_softc	*sc;
-	ndis_handle		adapter;
-	ndis_pnpevent_handler	pnpeventfunc;
-
-	dev = arg;
-	sc = device_get_softc(arg);
-	NDIS_LOCK(sc);
-	adapter = sc->ndis_block->nmb_miniportadapterctx;
-	pnpeventfunc = sc->ndis_chars->nmc_pnpevent_handler;
-	NDIS_UNLOCK(sc);
-	if (adapter == NULL || pnpeventfunc == NULL)
-		return (EIO);
-
-	if (sc->ndis_chars->nmc_rsvd0 == NULL)
-		MSCALL4(pnpeventfunc, adapter, type, NULL, 0);
-	else
-		MSCALL4(pnpeventfunc, sc->ndis_chars->nmc_rsvd0, type, NULL, 0);
-
-	return (0);
-}
-
-int
-ndis_init_nic(arg)
-	void			*arg;
-{
-	struct ndis_softc	*sc;
-	ndis_miniport_block	*block;
-	ndis_init_handler	initfunc;
-	ndis_status		status, openstatus = 0;
-	ndis_medium		mediumarray[NdisMediumMax];
-	uint32_t		chosenmedium, i;
-
-	if (arg == NULL)
-		return (EINVAL);
-
-	sc = arg;
-	NDIS_LOCK(sc);
-	block = sc->ndis_block;
-	initfunc = sc->ndis_chars->nmc_init_func;
-	NDIS_UNLOCK(sc);
-
-	sc->ndis_block->nmb_timerlist = NULL;
-
-	for (i = 0; i < NdisMediumMax; i++)
-		mediumarray[i] = i;
-
-	status = MSCALL6(initfunc, &openstatus, &chosenmedium,
-	    mediumarray, NdisMediumMax, block, block);
-
-	/*
-	 * If the init fails, blow away the other exported routines
-	 * we obtained from the driver so we can't call them later.
-	 * If the init failed, none of these will work.
-	 */
-	if (status != NDIS_STATUS_SUCCESS) {
-		NDIS_LOCK(sc);
-		sc->ndis_block->nmb_miniportadapterctx = NULL;
-		NDIS_UNLOCK(sc);
-		return (ENXIO);
-	}
-
-	/*
-	 * This may look really goofy, but apparently it is possible
-	 * to halt a miniport too soon after it's been initialized.
-	 * After MiniportInitialize() finishes, pause for 1 second
-	 * to give the chip a chance to handle any short-lived timers
-	 * that were set in motion. If we call MiniportHalt() too soon,
-	 * some of the timers may not be cancelled, because the driver
-	 * expects them to fire before the halt is called.
-	 */
-
-	pause("ndwait", hz);
-
-	NDIS_LOCK(sc);
-	sc->ndis_block->nmb_devicectx = sc;
-	NDIS_UNLOCK(sc);
-
-	return (0);
-}
-
-static void
-ndis_intrsetup(dpc, dobj, ip, sc)
-	kdpc			*dpc;
-	device_object		*dobj;
-	irp			*ip;
-	struct ndis_softc	*sc;
-{
-	ndis_miniport_interrupt	*intr;
-
-	intr = sc->ndis_block->nmb_interrupt;
-
-	/* Sanity check. */
-
-	if (intr == NULL)
-		return;
-
-	KeAcquireSpinLockAtDpcLevel(&intr->ni_dpccountlock);
-	KeResetEvent(&intr->ni_dpcevt);
-	if (KeInsertQueueDpc(&intr->ni_dpc, NULL, NULL) == TRUE)
-		intr->ni_dpccnt++;
-	KeReleaseSpinLockFromDpcLevel(&intr->ni_dpccountlock);
-}
-
-int
-ndis_get_info(arg, oid, buf, buflen)
-	void			*arg;
-	ndis_oid		oid;
-	void			*buf;
-	int			*buflen;
-{
-	struct ndis_softc	*sc;
-	ndis_status		rval;
-	ndis_handle		adapter;
-	ndis_queryinfo_handler	queryfunc;
-	uint32_t		byteswritten = 0, bytesneeded = 0;
-	uint8_t			irql;
-	uint64_t		duetime;
-
-	sc = arg;
-
-	KeResetEvent(&sc->ndis_block->nmb_getevent);
-
-	KeAcquireSpinLock(&sc->ndis_block->nmb_lock, &irql);
-
-	if (sc->ndis_block->nmb_pendingreq != NULL) {
-		KeReleaseSpinLock(&sc->ndis_block->nmb_lock, irql);
-		panic("ndis_get_info() called while other request pending");
-	} else
-		sc->ndis_block->nmb_pendingreq = (ndis_request *)sc;
-
-	queryfunc = sc->ndis_chars->nmc_queryinfo_func;
-	adapter = sc->ndis_block->nmb_miniportadapterctx;
-
-	if (adapter == NULL || queryfunc == NULL ||
-	    sc->ndis_block->nmb_devicectx == NULL) {
-		sc->ndis_block->nmb_pendingreq = NULL;
-		KeReleaseSpinLock(&sc->ndis_block->nmb_lock, irql);
-		return (ENXIO);
-	}
-
-	rval = MSCALL6(queryfunc, adapter, oid, buf, *buflen,
-	    &byteswritten, &bytesneeded);
-
-	sc->ndis_block->nmb_pendingreq = NULL;
-
-	KeReleaseSpinLock(&sc->ndis_block->nmb_lock, irql);
-
-	/* Wait for requests that block. */
-
-	if (rval == NDIS_STATUS_PENDING) {
-		/* Wait up to 5 seconds. */
-		duetime = (5 * 1000000) * -10;
-		KeWaitForSingleObject(&sc->ndis_block->nmb_getevent,
-		    0, 0, FALSE, &duetime);
-		rval = sc->ndis_block->nmb_getstat;
-	}
-
-	if (byteswritten)
-		*buflen = byteswritten;
-	if (bytesneeded)
-		*buflen = bytesneeded;
-
-	if (rval == NDIS_STATUS_INVALID_LENGTH ||
-	    rval == NDIS_STATUS_BUFFER_TOO_SHORT)
-		return (ENOSPC);
-
-	if (rval == NDIS_STATUS_INVALID_OID)
-		return (EINVAL);
-
-	if (rval == NDIS_STATUS_NOT_SUPPORTED ||
-	    rval == NDIS_STATUS_NOT_ACCEPTED)
-		return (ENOTSUP);
-
-	if (rval != NDIS_STATUS_SUCCESS)
-		return (ENODEV);
-
-	return (0);
-}
-
-uint32_t
-NdisAddDevice(drv, pdo)
-	driver_object		*drv;
-	device_object		*pdo;
-{
-	device_object		*fdo;
-	ndis_miniport_block	*block;
-	struct ndis_softc	*sc;
-	uint32_t		status;
-	int			error;
-
-	sc = device_get_softc(pdo->do_devext);
-
-	if (sc->ndis_iftype == PCMCIABus || sc->ndis_iftype == PCIBus) {
-		error = bus_setup_intr(sc->ndis_dev, sc->ndis_irq,
-		    INTR_TYPE_NET | INTR_MPSAFE,
-		    NULL, ntoskrnl_intr, NULL, &sc->ndis_intrhand);
-		if (error)
-			return (NDIS_STATUS_FAILURE);
-	}
-
-	status = IoCreateDevice(drv, sizeof(ndis_miniport_block), NULL,
-	    FILE_DEVICE_UNKNOWN, 0, FALSE, &fdo);
-
-	if (status != STATUS_SUCCESS)
-		return (status);
-
-	block = fdo->do_devext;
-
-	block->nmb_filterdbs.nf_ethdb = block;
-	block->nmb_deviceobj = fdo;
-	block->nmb_physdeviceobj = pdo;
-	block->nmb_nextdeviceobj = IoAttachDeviceToDeviceStack(fdo, pdo);
-	KeInitializeSpinLock(&block->nmb_lock);
-	KeInitializeSpinLock(&block->nmb_returnlock);
-	KeInitializeEvent(&block->nmb_getevent, EVENT_TYPE_NOTIFY, TRUE);
-	KeInitializeEvent(&block->nmb_setevent, EVENT_TYPE_NOTIFY, TRUE);
-	KeInitializeEvent(&block->nmb_resetevent, EVENT_TYPE_NOTIFY, TRUE);
-	InitializeListHead(&block->nmb_parmlist);
-	InitializeListHead(&block->nmb_returnlist);
-	block->nmb_returnitem = IoAllocateWorkItem(fdo);
-
-	/*
-	 * Stash pointers to the miniport block and miniport
-	 * characteristics info in the if_ndis softc so the
-	 * UNIX wrapper driver can get to them later.
-	 */
-	sc->ndis_block = block;
-	sc->ndis_chars = IoGetDriverObjectExtension(drv, (void *)1);
-
-	/*
-	 * If the driver has a MiniportTransferData() function,
-	 * we should allocate a private RX packet pool.
-	 */
-
-	if (sc->ndis_chars->nmc_transferdata_func != NULL) {
-		NdisAllocatePacketPool(&status, &block->nmb_rxpool,
-		    32, PROTOCOL_RESERVED_SIZE_IN_PACKET);
-		if (status != NDIS_STATUS_SUCCESS) {
-			IoDetachDevice(block->nmb_nextdeviceobj);
-			IoDeleteDevice(fdo);
-			return (status);
-		}
-		InitializeListHead((&block->nmb_packetlist));
-	}
-
-	/* Give interrupt handling priority over timers. */
-	IoInitializeDpcRequest(fdo, kernndis_functbl[6].ipt_wrap);
-	KeSetImportanceDpc(&fdo->do_dpc, KDPC_IMPORTANCE_HIGH);
-
-	/* Finish up BSD-specific setup. */
-
-	block->nmb_signature = (void *)0xcafebabe;
-	block->nmb_status_func = kernndis_functbl[0].ipt_wrap;
-	block->nmb_statusdone_func = kernndis_functbl[1].ipt_wrap;
-	block->nmb_setdone_func = kernndis_functbl[2].ipt_wrap;
-	block->nmb_querydone_func = kernndis_functbl[3].ipt_wrap;
-	block->nmb_resetdone_func = kernndis_functbl[4].ipt_wrap;
-	block->nmb_sendrsrc_func = kernndis_functbl[5].ipt_wrap;
-	block->nmb_pendingreq = NULL;
-
-	TAILQ_INSERT_TAIL(&ndis_devhead, block, link);
-
-	return (STATUS_SUCCESS);
-}
-
-int
-ndis_unload_driver(arg)
-	void			*arg;
-{
-	struct ndis_softc	*sc;
-	device_object		*fdo;
-
-	sc = arg;
-
-	if (sc->ndis_intrhand)
-		bus_teardown_intr(sc->ndis_dev,
-		    sc->ndis_irq, sc->ndis_intrhand);
-
-	if (sc->ndis_block->nmb_rlist != NULL)
-		free(sc->ndis_block->nmb_rlist, M_DEVBUF);
-
-	ndis_flush_sysctls(sc);
-
-	TAILQ_REMOVE(&ndis_devhead, sc->ndis_block, link);
-
-	if (sc->ndis_chars->nmc_transferdata_func != NULL)
-		NdisFreePacketPool(sc->ndis_block->nmb_rxpool);
-	fdo = sc->ndis_block->nmb_deviceobj;
-	IoFreeWorkItem(sc->ndis_block->nmb_returnitem);
-	IoDetachDevice(sc->ndis_block->nmb_nextdeviceobj);
-	IoDeleteDevice(fdo);
-
-	return (0);
-}
diff --git a/sys/compat/ndis/kern_windrv.c b/sys/compat/ndis/kern_windrv.c
deleted file mode 100644
index 9ca7953a9384..000000000000
--- a/sys/compat/ndis/kern_windrv.c
+++ /dev/null
@@ -1,1170 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
- * Copyright (c) 2005
- *      Bill Paul <wpaul@windriver.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/unistd.h>
-#include <sys/types.h>
-
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/module.h>
-#include <sys/conf.h>
-#include <sys/mbuf.h>
-#include <sys/bus.h>
-#include <sys/proc.h>
-#include <sys/sched.h>
-#include <sys/smp.h>
-
-#include <sys/queue.h>
-
-#ifdef __i386__
-#include <machine/segments.h>
-#endif
-
-#ifdef __amd64__
-#include <machine/fpu.h>
-#endif
-
-#include <dev/usb/usb.h>
-
-#include <compat/ndis/pe_var.h>
-#include <compat/ndis/cfg_var.h>
-#include <compat/ndis/resource_var.h>
-#include <compat/ndis/ntoskrnl_var.h>
-#include <compat/ndis/ndis_var.h>
-#include <compat/ndis/hal_var.h>
-#include <compat/ndis/usbd_var.h>
-
-#ifdef __amd64__
-struct fpu_cc_ent {
-	struct fpu_kern_ctx	*ctx;
-	LIST_ENTRY(fpu_cc_ent)	entries;
-};
-static LIST_HEAD(fpu_ctx_free, fpu_cc_ent) fpu_free_head =
-    LIST_HEAD_INITIALIZER(fpu_free_head);
-static LIST_HEAD(fpu_ctx_busy, fpu_cc_ent) fpu_busy_head =
-    LIST_HEAD_INITIALIZER(fpu_busy_head);
-static struct mtx fpu_free_mtx;
-static struct mtx fpu_busy_mtx;
-#endif
-
-static struct mtx drvdb_mtx;
-static STAILQ_HEAD(drvdb, drvdb_ent) drvdb_head;
-
-static driver_object	fake_pci_driver; /* serves both PCI and cardbus */
-static driver_object	fake_pccard_driver;
-
-#ifdef __i386__
-static void x86_oldldt(void *);
-static void x86_newldt(void *);
-
-struct tid {
-	void			*tid_except_list;	/* 0x00 */
-	uint32_t		tid_oldfs;		/* 0x04 */
-	uint32_t		tid_selector;		/* 0x08 */
-	struct tid		*tid_self;		/* 0x0C */
-	int			tid_cpu;		/* 0x10 */
-};
-
-static struct tid	*my_tids;
-#endif /* __i386__ */
-
-#define DUMMY_REGISTRY_PATH "\\\\some\\bogus\\path"
-
-int
-windrv_libinit(void)
-{
-	STAILQ_INIT(&drvdb_head);
-	mtx_init(&drvdb_mtx, "Windows driver DB lock",
-	    "Windows internal lock", MTX_DEF);
-
-#ifdef __amd64__
-	LIST_INIT(&fpu_free_head);
-	LIST_INIT(&fpu_busy_head);
-	mtx_init(&fpu_free_mtx, "free fpu context list lock", NULL, MTX_DEF);
-	mtx_init(&fpu_busy_mtx, "busy fpu context list lock", NULL, MTX_DEF);
-#endif
-
-	/*
-	 * PCI and pccard devices don't need to use IRPs to
-	 * interact with their bus drivers (usually), so our
-	 * emulated PCI and pccard drivers are just stubs.
-	 * USB devices, on the other hand, do all their I/O
-	 * by exchanging IRPs with the USB bus driver, so
-	 * for that we need to provide emulator dispatcher
-	 * routines, which are in a separate module.
-	 */
-
-	windrv_bus_attach(&fake_pci_driver, "PCI Bus");
-	windrv_bus_attach(&fake_pccard_driver, "PCCARD Bus");
-
-#ifdef __i386__
-
-	/*
-	 * In order to properly support SMP machines, we have
-	 * to modify the GDT on each CPU, since we never know
-	 * on which one we'll end up running.
-	 */
-
-	my_tids = ExAllocatePoolWithTag(NonPagedPool,
-	    sizeof(struct tid) * mp_ncpus, 0);
-	if (my_tids == NULL)
-		panic("failed to allocate thread info blocks");
-	smp_rendezvous(NULL, x86_newldt, NULL, NULL);
-#endif
-	return (0);
-}
-
-int
-windrv_libfini(void)
-{
-	struct drvdb_ent	*d;
-#ifdef __amd64__
-	struct fpu_cc_ent	*ent;
-#endif
-
-	mtx_lock(&drvdb_mtx); 
-	while(STAILQ_FIRST(&drvdb_head) != NULL) {
-		d = STAILQ_FIRST(&drvdb_head);
-		STAILQ_REMOVE_HEAD(&drvdb_head, link);
-		free(d, M_DEVBUF);
-	}
-	mtx_unlock(&drvdb_mtx);
-
-	RtlFreeUnicodeString(&fake_pci_driver.dro_drivername);
-	RtlFreeUnicodeString(&fake_pccard_driver.dro_drivername);
-
-	mtx_destroy(&drvdb_mtx);
-
-#ifdef __i386__
-	smp_rendezvous(NULL, x86_oldldt, NULL, NULL);
-	ExFreePool(my_tids);
-#endif
-#ifdef __amd64__
-	while ((ent = LIST_FIRST(&fpu_free_head)) != NULL) {
-		LIST_REMOVE(ent, entries);
-		fpu_kern_free_ctx(ent->ctx);
-		free(ent, M_DEVBUF);
-	}
-	mtx_destroy(&fpu_free_mtx);
-
-	ent = LIST_FIRST(&fpu_busy_head);
-	KASSERT(ent == NULL, ("busy fpu context list is not empty"));
-	mtx_destroy(&fpu_busy_mtx);
-#endif
-	return (0);
-}
-
-/*
- * Given the address of a driver image, find its corresponding
- * driver_object.
- */
-
-driver_object *
-windrv_lookup(img, name)
-	vm_offset_t		img;
-	char			*name;
-{
-	struct drvdb_ent	*d;
-	unicode_string		us;
-	ansi_string		as;
-
-	bzero((char *)&us, sizeof(us));
-
-	/* Damn unicode. */
-
-	if (name != NULL) {
-		RtlInitAnsiString(&as, name);
-		if (RtlAnsiStringToUnicodeString(&us, &as, TRUE))
-			return (NULL);
-	}
-
-	mtx_lock(&drvdb_mtx); 
-	STAILQ_FOREACH(d, &drvdb_head, link) {
-		if (d->windrv_object->dro_driverstart == (void *)img ||
-		    (bcmp((char *)d->windrv_object->dro_drivername.us_buf,
-		    (char *)us.us_buf, us.us_len) == 0 && us.us_len)) {
-			mtx_unlock(&drvdb_mtx);
-			if (name != NULL)
-				ExFreePool(us.us_buf);
-			return (d->windrv_object);
-		}
-	}
-	mtx_unlock(&drvdb_mtx);
-
-	if (name != NULL)
-		RtlFreeUnicodeString(&us);
-
-	return (NULL);
-}
-
-struct drvdb_ent *
-windrv_match(matchfunc, ctx)
-	matchfuncptr		matchfunc;
-	void			*ctx;
-{
-	struct drvdb_ent	*d;
-	int			match;
-
-	mtx_lock(&drvdb_mtx); 
-	STAILQ_FOREACH(d, &drvdb_head, link) {
-		if (d->windrv_devlist == NULL)
-			continue;
-		match = matchfunc(d->windrv_bustype, d->windrv_devlist, ctx);
-		if (match == TRUE) {
-			mtx_unlock(&drvdb_mtx);
-			return (d);
-		}
-	}
-	mtx_unlock(&drvdb_mtx);
-
-	return (NULL);
-}
-
-/*
- * Remove a driver_object from our datatabase and destroy it. Throw
- * away any custom driver extension info that may have been added.
- */
-
-int
-windrv_unload(mod, img, len)
-	module_t		mod;
-	vm_offset_t		img;
-	int			len;
-{
-	struct drvdb_ent	*db, *r = NULL;
-	driver_object		*drv;
-	device_object		*d, *pdo;
-	device_t		dev;
-	list_entry		*e;
-
-	drv = windrv_lookup(img, NULL);
-
-	/*
-	 * When we unload a driver image, we need to force a
-	 * detach of any devices that might be using it. We
-	 * need the PDOs of all attached devices for this.
-	 * Getting at them is a little hard. We basically
-	 * have to walk the device lists of all our bus
-	 * drivers.
-	 */
-
-	mtx_lock(&drvdb_mtx); 
-	STAILQ_FOREACH(db, &drvdb_head, link) {
-		/*
-		 * Fake bus drivers have no devlist info.
-		 * If this driver has devlist info, it's
-		 * a loaded Windows driver and has no PDOs,
-		 * so skip it.
-		 */
-		if (db->windrv_devlist != NULL)
-			continue;
-		pdo = db->windrv_object->dro_devobj;
-		while (pdo != NULL) {
-			d = pdo->do_attacheddev;
-			if (d->do_drvobj != drv) {
-				pdo = pdo->do_nextdev;
-				continue;
-			}
-			dev = pdo->do_devext;
-			pdo = pdo->do_nextdev;
-			mtx_unlock(&drvdb_mtx); 
-			device_detach(dev);
-			mtx_lock(&drvdb_mtx);
-		}
-	}
-
-	STAILQ_FOREACH(db, &drvdb_head, link) {
-		if (db->windrv_object->dro_driverstart == (void *)img) {
-			r = db;
-			STAILQ_REMOVE(&drvdb_head, db, drvdb_ent, link);
-			break;
-		}
-	}
-	mtx_unlock(&drvdb_mtx);
-
-	if (r == NULL)
-		return (ENOENT);
-
-	if (drv == NULL)
-		return (ENOENT);
-
-	/*
-	 * Destroy any custom extensions that may have been added.
-	 */
-	drv = r->windrv_object;
-	while (!IsListEmpty(&drv->dro_driverext->dre_usrext)) {
-		e = RemoveHeadList(&drv->dro_driverext->dre_usrext);
-		ExFreePool(e);
-	}
-
-	/* Free the driver extension */
-	free(drv->dro_driverext, M_DEVBUF);
-
-	/* Free the driver name */
-	RtlFreeUnicodeString(&drv->dro_drivername);
-
-	/* Free driver object */
-	free(drv, M_DEVBUF);
-
-	/* Free our DB handle */
-	free(r, M_DEVBUF);
-
-	return (0);
-}
-
-#define WINDRV_LOADED		htonl(0x42534F44)
-
-#ifdef __amd64__
-static void
-patch_user_shared_data_address(vm_offset_t img, size_t len)
-{
-	unsigned long i, n, max_addr, *addr;
-
-	n = len - sizeof(unsigned long);
-	max_addr = KI_USER_SHARED_DATA + sizeof(kuser_shared_data);
-	for (i = 0; i < n; i++) {
-		addr = (unsigned long *)(img + i);
-		if (*addr >= KI_USER_SHARED_DATA && *addr < max_addr) {
-			*addr -= KI_USER_SHARED_DATA;
-			*addr += (unsigned long)&kuser_shared_data;
-		}
-	}
-}
-#endif
-
-/*
- * Loader routine for actual Windows driver modules, ultimately
- * calls the driver's DriverEntry() routine.
- */
-
-int
-windrv_load(mod, img, len, bustype, devlist, regvals)
-	module_t		mod;
-	vm_offset_t		img;
-	int			len;
-	interface_type		bustype;
-	void			*devlist;
-	ndis_cfg		*regvals;
-{
-	image_import_descriptor	imp_desc;
-	image_optional_header	opt_hdr;
-	driver_entry		entry;
-	struct drvdb_ent	*new;
-	struct driver_object	*drv;
-	int			status;
-	uint32_t		*ptr;
-	ansi_string		as;
-
-	/*
-	 * First step: try to relocate and dynalink the executable
-	 * driver image.
-	 */
-
-	ptr = (uint32_t *)(img + 8);
-	if (*ptr == WINDRV_LOADED)
-		goto skipreloc;
-
-	/* Perform text relocation */
-	if (pe_relocate(img))
-		return (ENOEXEC);
-
-	/* Dynamically link the NDIS.SYS routines -- required. */
-	if (pe_patch_imports(img, "NDIS", ndis_functbl))
-		return (ENOEXEC);
-
-	/* Dynamically link the HAL.dll routines -- optional. */
-	if (pe_get_import_descriptor(img, &imp_desc, "HAL") == 0) {
-		if (pe_patch_imports(img, "HAL", hal_functbl))
-			return (ENOEXEC);
-	}
-
-	/* Dynamically link ntoskrnl.exe -- optional. */
-	if (pe_get_import_descriptor(img, &imp_desc, "ntoskrnl") == 0) {
-		if (pe_patch_imports(img, "ntoskrnl", ntoskrnl_functbl))
-			return (ENOEXEC);
-	}
-
-#ifdef __amd64__
-	patch_user_shared_data_address(img, len);
-#endif
-
-	/* Dynamically link USBD.SYS -- optional */
-	if (pe_get_import_descriptor(img, &imp_desc, "USBD") == 0) {
-		if (pe_patch_imports(img, "USBD", usbd_functbl))
-			return (ENOEXEC);
-	}
-
-	*ptr = WINDRV_LOADED;
-
-skipreloc:
-
-	/* Next step: find the driver entry point. */
-
-	pe_get_optional_header(img, &opt_hdr);
-	entry = (driver_entry)pe_translate_addr(img, opt_hdr.ioh_entryaddr);
-
-	/* Next step: allocate and store a driver object. */
-
-	new = malloc(sizeof(struct drvdb_ent), M_DEVBUF, M_NOWAIT|M_ZERO);
-	if (new == NULL)
-		return (ENOMEM);
-
-	drv = malloc(sizeof(driver_object), M_DEVBUF, M_NOWAIT|M_ZERO);
-	if (drv == NULL) {
-		free (new, M_DEVBUF);
-		return (ENOMEM);
-	}
-
-	/* Allocate a driver extension structure too. */
-
-	drv->dro_driverext = malloc(sizeof(driver_extension),
-	    M_DEVBUF, M_NOWAIT|M_ZERO);
-
-	if (drv->dro_driverext == NULL) {
-		free(new, M_DEVBUF);
-		free(drv, M_DEVBUF);
-		return (ENOMEM);
-	}
-
-	InitializeListHead((&drv->dro_driverext->dre_usrext));
-
-	drv->dro_driverstart = (void *)img;
-	drv->dro_driversize = len;
-
-	RtlInitAnsiString(&as, DUMMY_REGISTRY_PATH);
-	if (RtlAnsiStringToUnicodeString(&drv->dro_drivername, &as, TRUE)) {
-		free(new, M_DEVBUF);
-		free(drv, M_DEVBUF);
-		return (ENOMEM);
-	}
-
-	new->windrv_object = drv;
-	new->windrv_regvals = regvals;
-	new->windrv_devlist = devlist;
-	new->windrv_bustype = bustype;
-
-	/* Now call the DriverEntry() function. */
-
-	status = MSCALL2(entry, drv, &drv->dro_drivername);
-
-	if (status != STATUS_SUCCESS) {
-		RtlFreeUnicodeString(&drv->dro_drivername);
-		free(drv, M_DEVBUF);
-		free(new, M_DEVBUF);
-		return (ENODEV);
-	}
-
-	mtx_lock(&drvdb_mtx); 
-	STAILQ_INSERT_HEAD(&drvdb_head, new, link);
-	mtx_unlock(&drvdb_mtx); 
-
-	return (0);
-}
-
-/*
- * Make a new Physical Device Object for a device that was
- * detected/plugged in. For us, the PDO is just a way to
- * get at the device_t.
- */
-
-int
-windrv_create_pdo(drv, bsddev)
-	driver_object		*drv;
-	device_t		bsddev;
-{
-	device_object		*dev;
-
-	/*
-	 * This is a new physical device object, which technically
-	 * is the "top of the stack." Consequently, we don't do
-	 * an IoAttachDeviceToDeviceStack() here.
-	 */
-
-	mtx_lock(&drvdb_mtx);
-	IoCreateDevice(drv, 0, NULL, FILE_DEVICE_UNKNOWN, 0, FALSE, &dev);
-	mtx_unlock(&drvdb_mtx);
-
-	/* Stash pointer to our BSD device handle. */
-
-	dev->do_devext = bsddev;
-
-	return (STATUS_SUCCESS);
-}
-
-void
-windrv_destroy_pdo(drv, bsddev)
-	driver_object		*drv;
-	device_t		bsddev;
-{
-	device_object		*pdo;
-
-	pdo = windrv_find_pdo(drv, bsddev);
-
-	/* Remove reference to device_t */
-
-	pdo->do_devext = NULL;
-
-	mtx_lock(&drvdb_mtx);
-	IoDeleteDevice(pdo);
-	mtx_unlock(&drvdb_mtx);
-}
-
-/*
- * Given a device_t, find the corresponding PDO in a driver's
- * device list.
- */
-
-device_object *
-windrv_find_pdo(drv, bsddev)
-	driver_object		*drv;
-	device_t		bsddev;
-{
-	device_object		*pdo;
-
-	mtx_lock(&drvdb_mtx);
-	pdo = drv->dro_devobj;
-	while (pdo != NULL) {
-		if (pdo->do_devext == bsddev) {
-			mtx_unlock(&drvdb_mtx);
-			return (pdo);
-		}
-		pdo = pdo->do_nextdev;
-	}
-	mtx_unlock(&drvdb_mtx);
-
-	return (NULL);
-}
-
-/*
- * Add an internally emulated driver to the database. We need this
- * to set up an emulated bus driver so that it can receive IRPs.
- */
-
-int
-windrv_bus_attach(drv, name)
-	driver_object		*drv;
-	char			*name;
-{
-	struct drvdb_ent	*new;
-	ansi_string		as;
-
-	new = malloc(sizeof(struct drvdb_ent), M_DEVBUF, M_NOWAIT|M_ZERO);
-	if (new == NULL)
-		return (ENOMEM);
-
-	RtlInitAnsiString(&as, name);
-	if (RtlAnsiStringToUnicodeString(&drv->dro_drivername, &as, TRUE))
-	{
-		free(new, M_DEVBUF);
-		return (ENOMEM);
-	}
-
-	/*
-	 * Set up a fake image pointer to avoid false matches
-	 * in windrv_lookup().
-	 */
-	drv->dro_driverstart = (void *)0xFFFFFFFF;
-
-	new->windrv_object = drv;
-	new->windrv_devlist = NULL;
-	new->windrv_regvals = NULL;
-
-	mtx_lock(&drvdb_mtx);
-	STAILQ_INSERT_HEAD(&drvdb_head, new, link);
-	mtx_unlock(&drvdb_mtx);
-
-	return (0);
-}
-
-#ifdef __amd64__
-
-extern void	x86_64_wrap(void);
-extern void	x86_64_wrap_call(void);
-extern void	x86_64_wrap_end(void);
-
-int
-windrv_wrap(func, wrap, argcnt, ftype)
-	funcptr			func;
-	funcptr			*wrap;
-	int			argcnt;
-	int			ftype;
-{
-	funcptr			p;
-	vm_offset_t		*calladdr;
-	vm_offset_t		wrapstart, wrapend, wrapcall;
-
-	wrapstart = (vm_offset_t)&x86_64_wrap;
-	wrapend = (vm_offset_t)&x86_64_wrap_end;
-	wrapcall = (vm_offset_t)&x86_64_wrap_call;
-
-	/* Allocate a new wrapper instance. */
-
-	p = malloc((wrapend - wrapstart), M_DEVBUF, M_NOWAIT);
-	if (p == NULL)
-		return (ENOMEM);
-
-	/* Copy over the code. */
-
-	bcopy((char *)wrapstart, p, (wrapend - wrapstart));
-
-	/* Insert the function address into the new wrapper instance. */
-
-	calladdr = (uint64_t *)((char *)p + (wrapcall - wrapstart) + 2);
-	*calladdr = (vm_offset_t)func;
-
-	*wrap = p;
-
-	return (0);
-}
-
-static struct fpu_cc_ent *
-request_fpu_cc_ent(void)
-{
-	struct fpu_cc_ent *ent;
-
-	mtx_lock(&fpu_free_mtx);
-	if ((ent = LIST_FIRST(&fpu_free_head)) != NULL) {
-		LIST_REMOVE(ent, entries);
-		mtx_unlock(&fpu_free_mtx);
-		mtx_lock(&fpu_busy_mtx);
-		LIST_INSERT_HEAD(&fpu_busy_head, ent, entries);
-		mtx_unlock(&fpu_busy_mtx);
-		return (ent);
-	}
-	mtx_unlock(&fpu_free_mtx);
-
-	if ((ent = malloc(sizeof(struct fpu_cc_ent), M_DEVBUF, M_NOWAIT |
-	    M_ZERO)) != NULL) {
-		ent->ctx = fpu_kern_alloc_ctx(FPU_KERN_NORMAL |
-		    FPU_KERN_NOWAIT);
-		if (ent->ctx != NULL) {
-			mtx_lock(&fpu_busy_mtx);
-			LIST_INSERT_HEAD(&fpu_busy_head, ent, entries);
-			mtx_unlock(&fpu_busy_mtx);
-		} else {
-			free(ent, M_DEVBUF);
-			ent = NULL;
-		}
-	}
-
-	return (ent);
-}
-
-static void
-release_fpu_cc_ent(struct fpu_cc_ent *ent)
-{
-	mtx_lock(&fpu_busy_mtx);
-	LIST_REMOVE(ent, entries);
-	mtx_unlock(&fpu_busy_mtx);
-	mtx_lock(&fpu_free_mtx);
-	LIST_INSERT_HEAD(&fpu_free_head, ent, entries);
-	mtx_unlock(&fpu_free_mtx);
-}
-
-uint64_t
-_x86_64_call1(void *fn, uint64_t a)
-{
-	struct fpu_cc_ent *ent;
-	uint64_t ret;
-
-	if ((ent = request_fpu_cc_ent()) == NULL)
-		return (ENOMEM);
-	fpu_kern_enter(curthread, ent->ctx, FPU_KERN_NORMAL);
-	ret = x86_64_call1(fn, a);
-	fpu_kern_leave(curthread, ent->ctx);
-	release_fpu_cc_ent(ent);
-
-	return (ret);
-}
-
-uint64_t
-_x86_64_call2(void *fn, uint64_t a, uint64_t b)
-{
-	struct fpu_cc_ent *ent;
-	uint64_t ret;
-
-	if ((ent = request_fpu_cc_ent()) == NULL)
-		return (ENOMEM);
-	fpu_kern_enter(curthread, ent->ctx, FPU_KERN_NORMAL);
-	ret = x86_64_call2(fn, a, b);
-	fpu_kern_leave(curthread, ent->ctx);
-	release_fpu_cc_ent(ent);
-
-	return (ret);
-}
-
-uint64_t
-_x86_64_call3(void *fn, uint64_t a, uint64_t b, uint64_t c)
-{
-	struct fpu_cc_ent *ent;
-	uint64_t ret;
-
-	if ((ent = request_fpu_cc_ent()) == NULL)
-		return (ENOMEM);
-	fpu_kern_enter(curthread, ent->ctx, FPU_KERN_NORMAL);
-	ret = x86_64_call3(fn, a, b, c);
-	fpu_kern_leave(curthread, ent->ctx);
-	release_fpu_cc_ent(ent);
-
-	return (ret);
-}
-
-uint64_t
-_x86_64_call4(void *fn, uint64_t a, uint64_t b, uint64_t c, uint64_t d)
-{
-	struct fpu_cc_ent *ent;
-	uint64_t ret;
-
-	if ((ent = request_fpu_cc_ent()) == NULL)
-		return (ENOMEM);
-	fpu_kern_enter(curthread, ent->ctx, FPU_KERN_NORMAL);
-	ret = x86_64_call4(fn, a, b, c, d);
-	fpu_kern_leave(curthread, ent->ctx);
-	release_fpu_cc_ent(ent);
-
-	return (ret);
-}
-
-uint64_t
-_x86_64_call5(void *fn, uint64_t a, uint64_t b, uint64_t c, uint64_t d,
-    uint64_t e)
-{
-	struct fpu_cc_ent *ent;
-	uint64_t ret;
-
-	if ((ent = request_fpu_cc_ent()) == NULL)
-		return (ENOMEM);
-	fpu_kern_enter(curthread, ent->ctx, FPU_KERN_NORMAL);
-	ret = x86_64_call5(fn, a, b, c, d, e);
-	fpu_kern_leave(curthread, ent->ctx);
-	release_fpu_cc_ent(ent);
-
-	return (ret);
-}
-
-uint64_t
-_x86_64_call6(void *fn, uint64_t a, uint64_t b, uint64_t c, uint64_t d,
-    uint64_t e, uint64_t f)
-{
-	struct fpu_cc_ent *ent;
-	uint64_t ret;
-
-	if ((ent = request_fpu_cc_ent()) == NULL)
-		return (ENOMEM);
-	fpu_kern_enter(curthread, ent->ctx, FPU_KERN_NORMAL);
-	ret = x86_64_call6(fn, a, b, c, d, e, f);
-	fpu_kern_leave(curthread, ent->ctx);
-	release_fpu_cc_ent(ent);
-
-	return (ret);
-}
-#endif /* __amd64__ */
-
-#ifdef __i386__
-
-struct x86desc {
-	uint16_t		x_lolimit;
-	uint16_t		x_base0;
-	uint8_t			x_base1;
-	uint8_t			x_flags;
-	uint8_t			x_hilimit;
-	uint8_t			x_base2;
-};
-
-struct gdt {
-	uint16_t		limit;
-	void			*base;
-} __attribute__((__packed__));
-
-extern uint16_t	x86_getfs(void);
-extern void x86_setfs(uint16_t);
-extern void *x86_gettid(void);
-extern void x86_critical_enter(void);
-extern void x86_critical_exit(void);
-extern void x86_getldt(struct gdt *, uint16_t *);
-extern void x86_setldt(struct gdt *, uint16_t);
-
-#define SEL_LDT	4		/* local descriptor table */
-#define SEL_TO_FS(x)		(((x) << 3))
-
-/*
- * FreeBSD 6.0 and later has a special GDT segment reserved
- * specifically for us, so if GNDIS_SEL is defined, use that.
- * If not, use GTGATE_SEL, which is uninitialized and infrequently
- * used.
- */
-
-#ifdef GNDIS_SEL
-#define FREEBSD_EMPTYSEL	GNDIS_SEL
-#else
-#define FREEBSD_EMPTYSEL	GTGATE_SEL	/* slot 7 */
-#endif
-
-/*
- * The meanings of various bits in a descriptor vary a little
- * depending on whether the descriptor will be used as a
- * code, data or system descriptor. (And that in turn depends
- * on which segment register selects the descriptor.)
- * We're only trying to create a data segment, so the definitions
- * below are the ones that apply to a data descriptor.
- */
-
-#define SEGFLAGLO_PRESENT	0x80	/* segment is present */
-#define SEGFLAGLO_PRIVLVL	0x60	/* privlevel needed for this seg */
-#define SEGFLAGLO_CD		0x10	/* 1 = code/data, 0 = system */
-#define SEGFLAGLO_MBZ		0x08	/* must be zero */
-#define SEGFLAGLO_EXPANDDOWN	0x04	/* limit expands down */
-#define SEGFLAGLO_WRITEABLE	0x02	/* segment is writeable */
-#define SEGGLAGLO_ACCESSED	0x01	/* segment has been accessed */
-
-#define SEGFLAGHI_GRAN		0x80	/* granularity, 1 = byte, 0 = page */
-#define SEGFLAGHI_BIG		0x40	/* 1 = 32 bit stack, 0 = 16 bit */
-
-/*
- * Context switch from UNIX to Windows. Save the existing value
- * of %fs for this processor, then change it to point to our
- * fake TID. Note that it is also possible to pin ourselves
- * to our current CPU, though I'm not sure this is really
- * necessary. It depends on whether or not an interrupt might
- * preempt us while Windows code is running and we wind up
- * scheduled onto another CPU as a result. So far, it doesn't
- * seem like this is what happens.
- */
-
-void
-ctxsw_utow(void)
-{
-	struct tid		*t;
-
-	t = &my_tids[curthread->td_oncpu];
-
-	/*
-	 * Ugly hack. During system bootstrap (cold == 1), only CPU 0
-	 * is running. So if we were loaded at bootstrap, only CPU 0
-	 * will have our special GDT entry. This is a problem for SMP
-	 * systems, so to deal with this, we check here to make sure
-	 * the TID for this processor has been initialized, and if it
-	 * hasn't, we need to do it right now or else things will
-	 * explode.
-	 */
-
-	if (t->tid_self != t)
-		x86_newldt(NULL);
-
-	x86_critical_enter();
-	t->tid_oldfs = x86_getfs();
-	t->tid_cpu = curthread->td_oncpu;
-	sched_pin();
-	x86_setfs(SEL_TO_FS(t->tid_selector));
-	x86_critical_exit();
-
-	/* Now entering Windows land, population: you. */
-}
-
-/*
- * Context switch from Windows back to UNIX. Restore %fs to
- * its previous value. This always occurs after a call to
- * ctxsw_utow().
- */
-
-void
-ctxsw_wtou(void)
-{
-	struct tid		*t;
-
-	x86_critical_enter();
-	t = x86_gettid();
-	x86_setfs(t->tid_oldfs);
-	sched_unpin();
-	x86_critical_exit();
-
-	/* Welcome back to UNIX land, we missed you. */
-
-#ifdef EXTRA_SANITY
-	if (t->tid_cpu != curthread->td_oncpu)
-		panic("ctxsw GOT MOVED TO OTHER CPU!");
-#endif
-}
-
-static int	windrv_wrap_stdcall(funcptr, funcptr *, int);
-static int	windrv_wrap_fastcall(funcptr, funcptr *, int);
-static int	windrv_wrap_regparm(funcptr, funcptr *);
-
-extern void	x86_fastcall_wrap(void);
-extern void	x86_fastcall_wrap_call(void);
-extern void	x86_fastcall_wrap_arg(void);
-extern void	x86_fastcall_wrap_end(void);
-
-static int
-windrv_wrap_fastcall(func, wrap, argcnt)
-	funcptr			func;
-	funcptr			*wrap;
-	int8_t			argcnt;
-{
-	funcptr			p;
-	vm_offset_t		*calladdr;
-	uint8_t			*argaddr;
-	vm_offset_t		wrapstart, wrapend, wrapcall, wraparg;
-
-	wrapstart = (vm_offset_t)&x86_fastcall_wrap;
-	wrapend = (vm_offset_t)&x86_fastcall_wrap_end;
-	wrapcall = (vm_offset_t)&x86_fastcall_wrap_call;
-	wraparg = (vm_offset_t)&x86_fastcall_wrap_arg;
-
-	/* Allocate a new wrapper instance. */
-
-	p = malloc((wrapend - wrapstart), M_DEVBUF, M_NOWAIT);
-	if (p == NULL)
-		return (ENOMEM);
-
-	/* Copy over the code. */
-
-	bcopy((char *)wrapstart, p, (wrapend - wrapstart));
-
-	/* Insert the function address into the new wrapper instance. */
-
-	calladdr = (vm_offset_t *)((char *)p + ((wrapcall - wrapstart) + 1));
-	*calladdr = (vm_offset_t)func;
-
-	argcnt -= 2;
-	if (argcnt < 1)
-		argcnt = 0;
-
-	argaddr = (u_int8_t *)((char *)p + ((wraparg - wrapstart) + 1));
-	*argaddr = argcnt * sizeof(uint32_t);
-
-	*wrap = p;
-
-	return (0);
-}
-
-extern void	x86_stdcall_wrap(void);
-extern void	x86_stdcall_wrap_call(void);
-extern void	x86_stdcall_wrap_arg(void);
-extern void	x86_stdcall_wrap_end(void);
-
-static int
-windrv_wrap_stdcall(func, wrap, argcnt)
-	funcptr			func;
-	funcptr			*wrap;
-	uint8_t			argcnt;
-{
-	funcptr			p;
-	vm_offset_t		*calladdr;
-	uint8_t			*argaddr;
-	vm_offset_t		wrapstart, wrapend, wrapcall, wraparg;
-
-	wrapstart = (vm_offset_t)&x86_stdcall_wrap;
-	wrapend = (vm_offset_t)&x86_stdcall_wrap_end;
-	wrapcall = (vm_offset_t)&x86_stdcall_wrap_call;
-	wraparg = (vm_offset_t)&x86_stdcall_wrap_arg;
-
-	/* Allocate a new wrapper instance. */
-
-	p = malloc((wrapend - wrapstart), M_DEVBUF, M_NOWAIT);
-	if (p == NULL)
-		return (ENOMEM);
-
-	/* Copy over the code. */
-
-	bcopy((char *)wrapstart, p, (wrapend - wrapstart));
-
-	/* Insert the function address into the new wrapper instance. */
-
-	calladdr = (vm_offset_t *)((char *)p + ((wrapcall - wrapstart) + 1));
-	*calladdr = (vm_offset_t)func;
-
-	argaddr = (u_int8_t *)((char *)p + ((wraparg - wrapstart) + 1));
-	*argaddr = argcnt * sizeof(uint32_t);
-
-	*wrap = p;
-
-	return (0);
-}
-
-extern void	x86_regparm_wrap(void);
-extern void	x86_regparm_wrap_call(void);
-extern void	x86_regparm_wrap_end(void);
-
-static int
-windrv_wrap_regparm(func, wrap)
-	funcptr			func;
-	funcptr			*wrap;
-{
-	funcptr			p;
-	vm_offset_t		*calladdr;
-	vm_offset_t		wrapstart, wrapend, wrapcall;
-
-	wrapstart = (vm_offset_t)&x86_regparm_wrap;
-	wrapend = (vm_offset_t)&x86_regparm_wrap_end;
-	wrapcall = (vm_offset_t)&x86_regparm_wrap_call;
-
-	/* Allocate a new wrapper instance. */
-
-	p = malloc((wrapend - wrapstart), M_DEVBUF, M_NOWAIT);
-	if (p == NULL)
-		return (ENOMEM);
-
-	/* Copy over the code. */
-
-	bcopy(x86_regparm_wrap, p, (wrapend - wrapstart));
-
-	/* Insert the function address into the new wrapper instance. */
-
-	calladdr = (vm_offset_t *)((char *)p + ((wrapcall - wrapstart) + 1));
-	*calladdr = (vm_offset_t)func;
-
-	*wrap = p;
-
-	return (0);
-}
-
-int
-windrv_wrap(func, wrap, argcnt, ftype)
-	funcptr			func;
-	funcptr			*wrap;
-	int			argcnt;
-	int			ftype;
-{
-	switch(ftype) {
-	case WINDRV_WRAP_FASTCALL:
-		return (windrv_wrap_fastcall(func, wrap, argcnt));
-	case WINDRV_WRAP_STDCALL:
-		return (windrv_wrap_stdcall(func, wrap, argcnt));
-	case WINDRV_WRAP_REGPARM:
-		return (windrv_wrap_regparm(func, wrap));
-	case WINDRV_WRAP_CDECL:
-		return (windrv_wrap_stdcall(func, wrap, 0));
-	default:
-		break;
-	}
-
-	return (EINVAL);
-}
-
-static void
-x86_oldldt(dummy)
-	void			*dummy;
-{
-	struct x86desc		*gdt;
-	struct gdt		gtable;
-	uint16_t		ltable;
-
-	mtx_lock_spin(&dt_lock);
-
-	/* Grab location of existing GDT. */
-
-	x86_getldt(&gtable, &ltable);
-
-	/* Find the slot we updated. */
-
-	gdt = gtable.base;
-	gdt += FREEBSD_EMPTYSEL;
-
-	/* Empty it out. */
-
-	bzero((char *)gdt, sizeof(struct x86desc));
-
-	/* Restore GDT. */
-
-	x86_setldt(&gtable, ltable);
-
-	mtx_unlock_spin(&dt_lock);
-}
-
-static void
-x86_newldt(dummy)
-	void			*dummy;
-{
-	struct gdt		gtable;
-	uint16_t		ltable;
-	struct x86desc		*l;
-	struct thread		*t;
-
-	t = curthread;
-
-	mtx_lock_spin(&dt_lock);
-
-	/* Grab location of existing GDT. */
-
-	x86_getldt(&gtable, &ltable);
-
-	/* Get pointer to the GDT table. */
-
-	l = gtable.base;
-
-	/* Get pointer to empty slot */
-
-	l += FREEBSD_EMPTYSEL;
-
-	/* Initialize TID for this CPU. */
-
-	my_tids[t->td_oncpu].tid_selector = FREEBSD_EMPTYSEL;
-	my_tids[t->td_oncpu].tid_self = &my_tids[t->td_oncpu];
-
-	/* Set up new GDT entry. */
-
-	l->x_lolimit = sizeof(struct tid);
-	l->x_hilimit = SEGFLAGHI_GRAN|SEGFLAGHI_BIG;
-	l->x_base0 = (vm_offset_t)(&my_tids[t->td_oncpu]) & 0xFFFF;
-	l->x_base1 = ((vm_offset_t)(&my_tids[t->td_oncpu]) >> 16) & 0xFF;
-	l->x_base2 = ((vm_offset_t)(&my_tids[t->td_oncpu]) >> 24) & 0xFF;
-	l->x_flags = SEGFLAGLO_PRESENT|SEGFLAGLO_CD|SEGFLAGLO_WRITEABLE;
-
-	/* Update the GDT. */
-
-	x86_setldt(&gtable, ltable);
-
-	mtx_unlock_spin(&dt_lock);
-
-	/* Whew. */
-}
-
-#endif /* __i386__ */
-
-int
-windrv_unwrap(func)
-	funcptr			func;
-{
-	free(func, M_DEVBUF);
-
-	return (0);
-}
diff --git a/sys/compat/ndis/ndis_var.h b/sys/compat/ndis/ndis_var.h
deleted file mode 100644
index 7af490e35e56..000000000000
--- a/sys/compat/ndis/ndis_var.h
+++ /dev/null
@@ -1,1763 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
- * Copyright (c) 2003
- *	Bill Paul <wpaul@windriver.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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.
- *
- * $FreeBSD$
- */
-
-#ifndef _NDIS_VAR_H_
-#define	_NDIS_VAR_H_
-
-/* Forward declarations */
-struct ndis_miniport_block;
-struct ndis_mdriver_block;
-typedef struct ndis_miniport_block ndis_miniport_block;
-typedef struct ndis_mdriver_block ndis_mdriver_block;
-
-/* Base types */
-typedef uint32_t ndis_status;
-typedef void *ndis_handle;
-typedef uint32_t ndis_oid;
-typedef uint32_t ndis_error_code;
-typedef register_t ndis_kspin_lock;
-typedef uint8_t ndis_kirql;
-
-/*
- * NDIS status codes (there are lots of them). The ones that
- * don't seem to fit the pattern are actually mapped to generic
- * NT status codes.
- */
-
-#define	NDIS_STATUS_SUCCESS		0
-#define	NDIS_STATUS_PENDING		0x00000103
-#define	NDIS_STATUS_NOT_RECOGNIZED	0x00010001
-#define	NDIS_STATUS_NOT_COPIED		0x00010002
-#define	NDIS_STATUS_NOT_ACCEPTED	0x00010003
-#define	NDIS_STATUS_CALL_ACTIVE		0x00010007
-#define	NDIS_STATUS_ONLINE		0x40010003
-#define	NDIS_STATUS_RESET_START		0x40010004
-#define	NDIS_STATUS_RESET_END		0x40010005
-#define	NDIS_STATUS_RING_STATUS		0x40010006
-#define	NDIS_STATUS_CLOSED		0x40010007
-#define	NDIS_STATUS_WAN_LINE_UP		0x40010008
-#define	NDIS_STATUS_WAN_LINE_DOWN	0x40010009
-#define	NDIS_STATUS_WAN_FRAGMENT	0x4001000A
-#define	NDIS_STATUS_MEDIA_CONNECT	0x4001000B
-#define	NDIS_STATUS_MEDIA_DISCONNECT	0x4001000C
-#define	NDIS_STATUS_HARDWARE_LINE_UP	0x4001000D
-#define	NDIS_STATUS_HARDWARE_LINE_DOWN	0x4001000E
-#define	NDIS_STATUS_INTERFACE_UP	0x4001000F
-#define	NDIS_STATUS_INTERFACE_DOWN	0x40010010
-#define	NDIS_STATUS_MEDIA_BUSY		0x40010011
-#define	NDIS_STATUS_MEDIA_SPECIFIC_INDICATION	0x40010012
-#define	NDIS_STATUS_WW_INDICATION NDIS_STATUS_MEDIA_SPECIFIC_INDICATION
-#define	NDIS_STATUS_LINK_SPEED_CHANGE	0x40010013
-#define	NDIS_STATUS_WAN_GET_STATS	0x40010014
-#define	NDIS_STATUS_WAN_CO_FRAGMENT	0x40010015
-#define	NDIS_STATUS_WAN_CO_LINKPARAMS	0x40010016
-#define	NDIS_STATUS_NOT_RESETTABLE	0x80010001
-#define	NDIS_STATUS_SOFT_ERRORS		0x80010003
-#define	NDIS_STATUS_HARD_ERRORS		0x80010004
-#define	NDIS_STATUS_BUFFER_OVERFLOW	0x80000005
-#define	NDIS_STATUS_FAILURE		0xC0000001
-#define	NDIS_STATUS_RESOURCES		0xC000009A
-#define	NDIS_STATUS_CLOSING		0xC0010002
-#define	NDIS_STATUS_BAD_VERSION		0xC0010004
-#define	NDIS_STATUS_BAD_CHARACTERISTICS	0xC0010005
-#define	NDIS_STATUS_ADAPTER_NOT_FOUND	0xC0010006
-#define	NDIS_STATUS_OPEN_FAILED		0xC0010007
-#define	NDIS_STATUS_DEVICE_FAILED	0xC0010008
-#define	NDIS_STATUS_MULTICAST_FULL	0xC0010009
-#define	NDIS_STATUS_MULTICAST_EXISTS	0xC001000A
-#define	NDIS_STATUS_MULTICAST_NOT_FOUND	0xC001000B
-#define	NDIS_STATUS_REQUEST_ABORTED	0xC001000C
-#define	NDIS_STATUS_RESET_IN_PROGRESS	0xC001000D
-#define	NDIS_STATUS_CLOSING_INDICATING	0xC001000E
-#define	NDIS_STATUS_NOT_SUPPORTED	0xC00000BB
-#define	NDIS_STATUS_INVALID_PACKET	0xC001000F
-#define	NDIS_STATUS_OPEN_LIST_FULL	0xC0010010
-#define	NDIS_STATUS_ADAPTER_NOT_READY	0xC0010011
-#define	NDIS_STATUS_ADAPTER_NOT_OPEN	0xC0010012
-#define	NDIS_STATUS_NOT_INDICATING	0xC0010013
-#define	NDIS_STATUS_INVALID_LENGTH	0xC0010014
-#define	NDIS_STATUS_INVALID_DATA	0xC0010015
-#define	NDIS_STATUS_BUFFER_TOO_SHORT	0xC0010016
-#define	NDIS_STATUS_INVALID_OID		0xC0010017
-#define	NDIS_STATUS_ADAPTER_REMOVED	0xC0010018
-#define	NDIS_STATUS_UNSUPPORTED_MEDIA	0xC0010019
-#define	NDIS_STATUS_GROUP_ADDRESS_IN_USE	0xC001001A
-#define	NDIS_STATUS_FILE_NOT_FOUND	0xC001001B
-#define	NDIS_STATUS_ERROR_READING_FILE	0xC001001C
-#define	NDIS_STATUS_ALREADY_MAPPED	0xC001001D
-#define	NDIS_STATUS_RESOURCE_CONFLICT	0xC001001E
-#define	NDIS_STATUS_NO_CABLE		0xC001001F
-#define	NDIS_STATUS_INVALID_SAP		0xC0010020
-#define	NDIS_STATUS_SAP_IN_USE		0xC0010021
-#define	NDIS_STATUS_INVALID_ADDRESS	0xC0010022
-#define	NDIS_STATUS_VC_NOT_ACTIVATED	0xC0010023
-#define	NDIS_STATUS_DEST_OUT_OF_ORDER	0xC0010024
-#define	NDIS_STATUS_VC_NOT_AVAILABLE	0xC0010025
-#define	NDIS_STATUS_CELLRATE_NOT_AVAILABLE	0xC0010026
-#define	NDIS_STATUS_INCOMPATABLE_QOS	0xC0010027
-#define	NDIS_STATUS_AAL_PARAMS_UNSUPPORTED	0xC0010028
-#define	NDIS_STATUS_NO_ROUTE_TO_DESTINATION	0xC0010029
-#define	NDIS_STATUS_TOKEN_RING_OPEN_ERROR	0xC0011000
-#define	NDIS_STATUS_INVALID_DEVICE_REQUEST	0xC0000010
-#define	NDIS_STATUS_NETWORK_UNREACHABLE         0xC000023C
-
-/*
- * NDIS event codes. They are usually reported to NdisWriteErrorLogEntry().
- */
-
-#define	EVENT_NDIS_RESOURCE_CONFLICT	0xC0001388
-#define	EVENT_NDIS_OUT_OF_RESOURCE	0xC0001389
-#define	EVENT_NDIS_HARDWARE_FAILURE	0xC000138A
-#define	EVENT_NDIS_ADAPTER_NOT_FOUND	0xC000138B
-#define	EVENT_NDIS_INTERRUPT_CONNECT	0xC000138C
-#define	EVENT_NDIS_DRIVER_FAILURE	0xC000138D
-#define	EVENT_NDIS_BAD_VERSION		0xC000138E
-#define	EVENT_NDIS_TIMEOUT		0x8000138F
-#define	EVENT_NDIS_NETWORK_ADDRESS	0xC0001390
-#define	EVENT_NDIS_UNSUPPORTED_CONFIGURATION	0xC0001391
-#define	EVENT_NDIS_INVALID_VALUE_FROM_ADAPTER	0xC0001392
-#define	EVENT_NDIS_MISSING_CONFIGURATION_PARAMETER	0xC0001393
-#define	EVENT_NDIS_BAD_IO_BASE_ADDRESS	0xC0001394
-#define	EVENT_NDIS_RECEIVE_SPACE_SMALL	0x40001395
-#define	EVENT_NDIS_ADAPTER_DISABLED	0x80001396
-#define	EVENT_NDIS_IO_PORT_CONFLICT	0x80001397
-#define	EVENT_NDIS_PORT_OR_DMA_CONFLICT	0x80001398
-#define	EVENT_NDIS_MEMORY_CONFLICT	0x80001399
-#define	EVENT_NDIS_INTERRUPT_CONFLICT	0x8000139A
-#define	EVENT_NDIS_DMA_CONFLICT		0x8000139B
-#define	EVENT_NDIS_INVALID_DOWNLOAD_FILE_ERROR	0xC000139C
-#define	EVENT_NDIS_MAXRECEIVES_ERROR	0x8000139D
-#define	EVENT_NDIS_MAXTRANSMITS_ERROR	0x8000139E
-#define	EVENT_NDIS_MAXFRAMESIZE_ERROR	0x8000139F
-#define	EVENT_NDIS_MAXINTERNALBUFS_ERROR	0x800013A0
-#define	EVENT_NDIS_MAXMULTICAST_ERROR	0x800013A1
-#define	EVENT_NDIS_PRODUCTID_ERROR	0x800013A2
-#define	EVENT_NDIS_LOBE_FAILUE_ERROR	0x800013A3
-#define	EVENT_NDIS_SIGNAL_LOSS_ERROR	0x800013A4
-#define	EVENT_NDIS_REMOVE_RECEIVED_ERROR	0x800013A5
-#define	EVENT_NDIS_TOKEN_RING_CORRECTION	0x400013A6
-#define	EVENT_NDIS_ADAPTER_CHECK_ERROR	0xC00013A7
-#define	EVENT_NDIS_RESET_FAILURE_ERROR	0x800013A8
-#define	EVENT_NDIS_CABLE_DISCONNECTED_ERROR	0x800013A9
-#define	EVENT_NDIS_RESET_FAILURE_CORRECTION	0x800013AA
-
-/*
- * NDIS OIDs used by the queryinfo/setinfo routines.
- * Some are required by all NDIS drivers, some are specific to
- * a particular type of device, and some are purely optional.
- * Unfortunately, one of the purely optional OIDs is the one
- * that lets us set the MAC address of the device.
- */
-
-/* Required OIDs */
-#define	OID_GEN_SUPPORTED_LIST			0x00010101
-#define	OID_GEN_HARDWARE_STATUS			0x00010102
-#define	OID_GEN_MEDIA_SUPPORTED			0x00010103
-#define	OID_GEN_MEDIA_IN_USE			0x00010104
-#define	OID_GEN_MAXIMUM_LOOKAHEAD		0x00010105
-#define	OID_GEN_MAXIMUM_FRAME_SIZE		0x00010106
-#define	OID_GEN_LINK_SPEED			0x00010107
-#define	OID_GEN_TRANSMIT_BUFFER_SPACE		0x00010108
-#define	OID_GEN_RECEIVE_BUFFER_SPACE		0x00010109
-#define	OID_GEN_TRANSMIT_BLOCK_SIZE		0x0001010A
-#define	OID_GEN_RECEIVE_BLOCK_SIZE		0x0001010B
-#define	OID_GEN_VENDOR_ID			0x0001010C
-#define	OID_GEN_VENDOR_DESCRIPTION		0x0001010D
-#define	OID_GEN_CURRENT_PACKET_FILTER		0x0001010E
-#define	OID_GEN_CURRENT_LOOKAHEAD		0x0001010F
-#define	OID_GEN_DRIVER_VERSION			0x00010110
-#define	OID_GEN_MAXIMUM_TOTAL_SIZE		0x00010111
-#define	OID_GEN_PROTOCOL_OPTIONS		0x00010112
-#define	OID_GEN_MAC_OPTIONS			0x00010113
-#define	OID_GEN_MEDIA_CONNECT_STATUS		0x00010114
-#define	OID_GEN_MAXIMUM_SEND_PACKETS		0x00010115
-#define	OID_GEN_VENDOR_DRIVER_VERSION		0x00010116
-#define	OID_GEN_SUPPORTED_GUIDS			0x00010117
-#define	OID_GEN_NETWORK_LAYER_ADDRESSES		0x00010118	/* Set only */
-#define	OID_GEN_TRANSPORT_HEADER_OFFSET		0x00010119	/* Set only */
-#define	OID_GEN_MACHINE_NAME			0x0001021A
-#define	OID_GEN_RNDIS_CONFIG_PARAMETER		0x0001021B	/* Set only */
-#define	OID_GEN_VLAN_ID				0x0001021C
-
-/* Optional OIDs. */
-#define	OID_GEN_MEDIA_CAPABILITIES		0x00010201
-#define	OID_GEN_PHYSICAL_MEDIUM			0x00010202
-
-/* Required statistics OIDs. */
-#define	OID_GEN_XMIT_OK				0x00020101
-#define	OID_GEN_RCV_OK				0x00020102
-#define	OID_GEN_XMIT_ERROR			0x00020103
-#define	OID_GEN_RCV_ERROR			0x00020104
-#define	OID_GEN_RCV_NO_BUFFER			0x00020105
-
-/* Optional OID statistics */
-#define	OID_GEN_DIRECTED_BYTES_XMIT		0x00020201
-#define	OID_GEN_DIRECTED_FRAMES_XMIT		0x00020202
-#define	OID_GEN_MULTICAST_BYTES_XMIT		0x00020203
-#define	OID_GEN_MULTICAST_FRAMES_XMIT		0x00020204
-#define	OID_GEN_BROADCAST_BYTES_XMIT		0x00020205
-#define	OID_GEN_BROADCAST_FRAMES_XMIT		0x00020206
-#define	OID_GEN_DIRECTED_BYTES_RCV		0x00020207
-#define	OID_GEN_DIRECTED_FRAMES_RCV		0x00020208
-#define	OID_GEN_MULTICAST_BYTES_RCV		0x00020209
-#define	OID_GEN_MULTICAST_FRAMES_RCV		0x0002020A
-#define	OID_GEN_BROADCAST_BYTES_RCV		0x0002020B
-#define	OID_GEN_BROADCAST_FRAMES_RCV		0x0002020C
-#define	OID_GEN_RCV_CRC_ERROR			0x0002020D
-#define	OID_GEN_TRANSMIT_QUEUE_LENGTH		0x0002020E
-#define	OID_GEN_GET_TIME_CAPS			0x0002020F
-#define	OID_GEN_GET_NETCARD_TIME		0x00020210
-#define	OID_GEN_NETCARD_LOAD			0x00020211
-#define	OID_GEN_DEVICE_PROFILE			0x00020212
-
-/* 802.3 (ethernet) OIDs */
-#define	OID_802_3_PERMANENT_ADDRESS		0x01010101
-#define	OID_802_3_CURRENT_ADDRESS		0x01010102
-#define	OID_802_3_MULTICAST_LIST		0x01010103
-#define	OID_802_3_MAXIMUM_LIST_SIZE		0x01010104
-#define	OID_802_3_MAC_OPTIONS			0x01010105
-#define	NDIS_802_3_MAC_OPTION_PRIORITY		0x00000001
-#define	OID_802_3_RCV_ERROR_ALIGNMENT		0x01020101
-#define	OID_802_3_XMIT_ONE_COLLISION		0x01020102
-#define	OID_802_3_XMIT_MORE_COLLISIONS		0x01020103
-#define	OID_802_3_XMIT_DEFERRED			0x01020201
-#define	OID_802_3_XMIT_MAX_COLLISIONS		0x01020202
-#define	OID_802_3_RCV_OVERRUN			0x01020203
-#define	OID_802_3_XMIT_UNDERRUN			0x01020204
-#define	OID_802_3_XMIT_HEARTBEAT_FAILURE	0x01020205
-#define	OID_802_3_XMIT_TIMES_CRS_LOST		0x01020206
-#define	OID_802_3_XMIT_LATE_COLLISIONS		0x01020207
-
-/* PnP and power management OIDs */
-#define	OID_PNP_CAPABILITIES			0xFD010100
-#define	OID_PNP_SET_POWER			0xFD010101
-#define	OID_PNP_QUERY_POWER			0xFD010102
-#define	OID_PNP_ADD_WAKE_UP_PATTERN		0xFD010103
-#define	OID_PNP_REMOVE_WAKE_UP_PATTERN		0xFD010104
-#define	OID_PNP_WAKE_UP_PATTERN_LIST		0xFD010105
-#define	OID_PNP_ENABLE_WAKE_UP			0xFD010106
-
-/*
- * These are the possible power states for
- * OID_PNP_SET_POWER and OID_PNP_QUERY_POWER.
- */
-#define	NDIS_POWERSTATE_UNSPEC			0
-#define	NDIS_POWERSTATE_D0			1
-#define	NDIS_POWERSTATE_D1			2
-#define	NDIS_POWERSTATE_D2			3
-#define	NDIS_POWERSTATE_D3			4
-
-/*
- * These are used with the MiniportPnpEventNotify() method.
- */
-
-#define	NDIS_POWERPROFILE_BATTERY		0
-#define	NDIS_POWERPROFILE_ACONLINE		1
-
-#define	NDIS_PNP_EVENT_QUERY_REMOVED		0
-#define	NDIS_PNP_EVENT_REMOVED			1
-#define	NDIS_PNP_EVENT_SURPRISE_REMOVED		2
-#define	NDIS_PNP_EVENT_QUERY_STOPPED		3
-#define	NDIS_PNP_EVENT_STOPPED			4
-#define	NDIS_PNP_EVENT_PROFILECHANGED		5
-
-/* PnP/PM Statistics (Optional). */
-#define	OID_PNP_WAKE_UP_OK			0xFD020200
-#define	OID_PNP_WAKE_UP_ERROR			0xFD020201
-
-/* The following bits are defined for OID_PNP_ENABLE_WAKE_UP */
-#define	NDIS_PNP_WAKE_UP_MAGIC_PACKET		0x00000001
-#define	NDIS_PNP_WAKE_UP_PATTERN_MATCH		0x00000002
-#define	NDIS_PNP_WAKE_UP_LINK_CHANGE		0x00000004
-
-/* 802.11 OIDs */
-#define	OID_802_11_BSSID			0x0D010101
-#define	OID_802_11_SSID				0x0D010102
-#define	OID_802_11_NETWORK_TYPES_SUPPORTED	0x0D010203
-#define	OID_802_11_NETWORK_TYPE_IN_USE		0x0D010204
-#define	OID_802_11_TX_POWER_LEVEL		0x0D010205
-#define	OID_802_11_RSSI				0x0D010206
-#define	OID_802_11_RSSI_TRIGGER			0x0D010207
-#define	OID_802_11_INFRASTRUCTURE_MODE		0x0D010108
-#define	OID_802_11_FRAGMENTATION_THRESHOLD	0x0D010209
-#define	OID_802_11_RTS_THRESHOLD		0x0D01020A
-#define	OID_802_11_NUMBER_OF_ANTENNAS		0x0D01020B
-#define	OID_802_11_RX_ANTENNA_SELECTED		0x0D01020C
-#define	OID_802_11_TX_ANTENNA_SELECTED		0x0D01020D
-#define	OID_802_11_SUPPORTED_RATES		0x0D01020E
-#define	OID_802_11_DESIRED_RATES		0x0D010210
-#define	OID_802_11_CONFIGURATION		0x0D010211
-#define	OID_802_11_STATISTICS			0x0D020212
-#define	OID_802_11_ADD_WEP			0x0D010113
-#define	OID_802_11_REMOVE_WEP			0x0D010114
-#define	OID_802_11_DISASSOCIATE			0x0D010115
-#define	OID_802_11_POWER_MODE			0x0D010216
-#define	OID_802_11_BSSID_LIST			0x0D010217
-#define	OID_802_11_AUTHENTICATION_MODE		0x0D010118
-#define	OID_802_11_PRIVACY_FILTER		0x0D010119
-#define	OID_802_11_BSSID_LIST_SCAN		0x0D01011A
-#define	OID_802_11_WEP_STATUS			0x0D01011B
-#define	OID_802_11_ENCRYPTION_STATUS		OID_802_11_WEP_STATUS
-#define	OID_802_11_RELOAD_DEFAULTS		0x0D01011C
-#define	OID_802_11_ADD_KEY			0x0D01011D
-#define	OID_802_11_REMOVE_KEY			0x0D01011E
-#define	OID_802_11_ASSOCIATION_INFORMATION	0x0D01011F
-#define	OID_802_11_TEST				0x0D010120
-#define	OID_802_11_CAPABILITY			0x0D010122
-#define	OID_802_11_PMKID			0x0D010123
-
-/* structures/definitions for 802.11 */
-#define	NDIS_80211_NETTYPE_11FH		0x00000000
-#define	NDIS_80211_NETTYPE_11DS		0x00000001
-#define	NDIS_80211_NETTYPE_11OFDM5	0x00000002
-#define	NDIS_80211_NETTYPE_11OFDM24	0x00000003
-#define	NDIS_80211_NETTYPE_AUTO		0x00000004
-
-struct ndis_80211_nettype_list {
-	uint32_t		ntl_items;
-	uint32_t		ntl_type[1];
-};
-
-#define	NDIS_80211_POWERMODE_CAM	0x00000000
-#define	NDIS_80211_POWERMODE_MAX_PSP	0x00000001
-#define	NDIS_80211_POWERMODE_FAST_PSP	0x00000002
-
-typedef uint32_t ndis_80211_power;	/* Power in milliwatts */
-typedef uint32_t ndis_80211_rssi;	/* Signal strength in dBm */
-
-struct ndis_80211_config_fh {
-	uint32_t		ncf_length;
-	uint32_t		ncf_hoppatterh;
-	uint32_t		ncf_hopset;
-	uint32_t		ncf_dwelltime;
-};
-
-typedef struct ndis_80211_config_fh ndis_80211_config_fh;
-
-struct ndis_80211_config {
-	uint32_t		nc_length;
-	uint32_t		nc_beaconperiod;
-	uint32_t		nc_atimwin;
-	uint32_t		nc_dsconfig;
-	ndis_80211_config_fh	nc_fhconfig;
-};
-
-typedef struct ndis_80211_config ndis_80211_config;
-
-struct ndis_80211_stats {
-	uint32_t		ns_length;
-	uint64_t		ns_txfragcnt;
-	uint64_t		ns_txmcastcnt;
-	uint64_t		ns_failedcnt;
-	uint64_t		ns_retrycnt;
-	uint64_t		ns_multiretrycnt;
-	uint64_t		ns_rtssuccesscnt;
-	uint64_t		ns_rtsfailcnt;
-	uint64_t		ns_ackfailcnt;
-	uint64_t		ns_dupeframecnt;
-	uint64_t		ns_rxfragcnt;
-	uint64_t		ns_rxmcastcnt;
-	uint64_t		ns_fcserrcnt;
-};
-
-typedef struct ndis_80211_stats ndis_80211_stats;
-
-typedef uint32_t ndis_80211_key_idx;
-
-struct ndis_80211_wep {
-	uint32_t		nw_length;
-	uint32_t		nw_keyidx;
-	uint32_t		nw_keylen;
-	uint8_t			nw_keydata[256];
-};
-
-typedef struct ndis_80211_wep ndis_80211_wep;
-
-#define	NDIS_80211_WEPKEY_TX		0x80000000
-#define	NDIS_80211_WEPKEY_PERCLIENT	0x40000000
-
-#define	NDIS_80211_NET_INFRA_IBSS	0x00000000
-#define	NDIS_80211_NET_INFRA_BSS	0x00000001
-#define	NDIS_80211_NET_INFRA_AUTO	0x00000002
-
-#define	NDIS_80211_AUTHMODE_OPEN	0x00000000
-#define	NDIS_80211_AUTHMODE_SHARED	0x00000001
-#define	NDIS_80211_AUTHMODE_AUTO	0x00000002
-#define	NDIS_80211_AUTHMODE_WPA		0x00000003
-#define	NDIS_80211_AUTHMODE_WPAPSK	0x00000004
-#define	NDIS_80211_AUTHMODE_WPANONE	0x00000005
-#define	NDIS_80211_AUTHMODE_WPA2	0x00000006
-#define	NDIS_80211_AUTHMODE_WPA2PSK	0x00000007
-
-typedef uint8_t ndis_80211_rates[8];
-typedef uint8_t ndis_80211_rates_ex[16];
-typedef uint8_t ndis_80211_macaddr[6];
-
-struct ndis_80211_ssid {
-	uint32_t		ns_ssidlen;
-	uint8_t			ns_ssid[32];
-};
-
-typedef struct ndis_80211_ssid ndis_80211_ssid;
-
-struct ndis_wlan_bssid {
-	uint32_t		nwb_length;
-	ndis_80211_macaddr	nwb_macaddr;
-	uint8_t			nwb_rsvd[2];
-	ndis_80211_ssid		nwb_ssid;
-	uint32_t		nwb_privacy;
-	ndis_80211_rssi		nwb_rssi;
-	uint32_t		nwb_nettype;
-	ndis_80211_config	nwb_config;
-	uint32_t		nwb_netinfra;
-	ndis_80211_rates	nwb_supportedrates;
-};
-
-typedef struct ndis_wlan_bssid ndis_wlan_bssid;
-
-struct ndis_80211_bssid_list {
-	uint32_t		nbl_items;
-	ndis_wlan_bssid		nbl_bssid[1];
-};
-
-typedef struct ndis_80211_bssid_list ndis_80211_bssid_list;
-
-struct ndis_wlan_bssid_ex {
-	uint32_t		nwbx_len;
-	ndis_80211_macaddr	nwbx_macaddr;
-	uint8_t			nwbx_rsvd[2];
-	ndis_80211_ssid		nwbx_ssid;
-	uint32_t		nwbx_privacy;
-	ndis_80211_rssi		nwbx_rssi;
-	uint32_t		nwbx_nettype;
-	ndis_80211_config	nwbx_config;
-	uint32_t		nwbx_netinfra;
-	ndis_80211_rates_ex	nwbx_supportedrates;
-	uint32_t		nwbx_ielen;
-	uint8_t			nwbx_ies[1];
-};
-
-typedef struct ndis_wlan_bssid_ex ndis_wlan_bssid_ex;
-
-struct ndis_80211_bssid_list_ex {
-	uint32_t		nblx_items;
-	ndis_wlan_bssid_ex	nblx_bssid[1];
-};
-
-typedef struct ndis_80211_bssid_list_ex ndis_80211_bssid_list_ex;
-
-struct ndis_80211_fixed_ies {
-	uint8_t			nfi_tstamp[8];
-	uint16_t		nfi_beaconint;
-	uint16_t		nfi_caps;
-};
-
-struct ndis_80211_variable_ies {
-	uint8_t			nvi_elemid;
-	uint8_t			nvi_len;
-	uint8_t			nvi_data[1];
-};
-
-typedef uint32_t ndis_80211_fragthresh;
-typedef uint32_t ndis_80211_rtsthresh;
-typedef uint32_t ndis_80211_antenna;
-
-#define	NDIS_80211_PRIVFILT_ACCEPTALL	0x00000000
-#define	NDIS_80211_PRIVFILT_8021XWEP	0x00000001
-
-#define	NDIS_80211_WEPSTAT_ENABLED	0x00000000
-#define	NDIS_80211_WEPSTAT_ENC1ENABLED	NDIS_80211_WEPSTAT_ENABLED
-#define	NDIS_80211_WEPSTAT_DISABLED	0x00000001
-#define	NDIS_80211_WEPSTAT_ENCDISABLED	NDIS_80211_WEPSTAT_DISABLED
-#define	NDIS_80211_WEPSTAT_KEYABSENT	0x00000002
-#define	NDIS_80211_WEPSTAT_ENC1KEYABSENT	NDIS_80211_WEPSTAT_KEYABSENT
-#define	NDIS_80211_WEPSTAT_NOTSUPPORTED	0x00000003
-#define	NDIS_80211_WEPSTAT_ENCNOTSUPPORTED	NDIS_80211_WEPSTAT_NOTSUPPORTED
-#define	NDIS_80211_WEPSTAT_ENC2ENABLED	0x00000004
-#define	NDIS_80211_WEPSTAT_ENC2KEYABSENT	0x00000005
-#define	NDIS_80211_WEPSTAT_ENC3ENABLED	0x00000006
-#define	NDIS_80211_WEPSTAT_ENC3KEYABSENT	0x00000007
-
-#define	NDIS_80211_RELOADDEFAULT_WEP	0x00000000
-
-#define	NDIS_80211_STATUSTYPE_AUTH	0x00000000
-#define	NDIS_80211_STATUSTYPE_PMKIDLIST	0x00000001
-
-struct ndis_80211_status_indication {
-	uint32_t		nsi_type;
-};
-
-typedef struct ndis_80211_status_indication ndis_80211_status_indication;
-
-#define	NDIS_802_11_AUTH_REQUEST_REAUTH		0x01
-#define	NDIS_802_11_AUTH_REQUEST_KEYUPDATE	0x02
-#define	NDIS_802_11_AUTH_REQUEST_PAIRWISE_ERROR	0x06
-#define	NDIS_802_11_AUTH_REQUEST_GROUP_ERROR	0x0E
-
-struct ndis_80211_auth_request {
-	uint32_t		nar_len;
-	ndis_80211_macaddr	nar_bssid;
-	uint32_t		nar_flags;
-};
-
-typedef struct ndis_80211_auth_request ndis_80211_auth_request;
-
-struct ndis_80211_key {
-	uint32_t		nk_len;
-	uint32_t		nk_keyidx;
-	uint32_t		nk_keylen;
-	ndis_80211_macaddr	nk_bssid;
-	uint8_t			nk_pad[6];
-	uint64_t		nk_keyrsc;
-	uint8_t			nk_keydata[32];
-};
-
-typedef struct ndis_80211_key ndis_80211_key;
-
-struct ndis_80211_remove_key {
-	uint32_t		nk_len;
-	uint32_t		nk_keyidx;
-	ndis_80211_macaddr	nk_bssid;
-};
-
-typedef struct ndis_80211_remove_key ndis_80211_remove_key;
-
-#define	NDIS_80211_AI_REQFI_CAPABILITIES	0x00000001
-#define	NDIS_80211_AI_REQFI_LISTENINTERVAL	0x00000002
-#define	NDIS_80211_AI_REQFI_CURRENTAPADDRESS	0x00000004
-
-#define	NDIS_80211_AI_RESFI_CAPABILITIES	0x00000001
-#define	NDIS_80211_AI_RESFI_STATUSCODE		0x00000002
-#define	NDIS_80211_AI_RESFI_ASSOCIATIONID	0x00000004
-
-struct ndis_80211_ai_reqfi {
-	uint16_t		naq_caps;
-	uint16_t		naq_listentint;
-	ndis_80211_macaddr	naq_currentapaddr;
-};
-
-typedef struct ndis_80211_ai_reqfi ndis_80211_ai_reqfi;
-
-struct ndis_80211_ai_resfi {
-	uint16_t		nas_caps;
-	uint16_t		nas_statuscode;
-	uint16_t		nas_associd;
-};
-
-typedef struct ndis_80211_ai_resfi ndis_80211_ai_resfi;
-
-struct ndis_80211_assoc_info {
-	uint32_t		nai_len;
-	uint16_t		nai_avail_req_fixed_ies;
-	ndis_80211_ai_reqfi	nai_req_fixed_ies;
-	uint32_t		nai_req_ielen;
-	uint32_t		nai_offset_req_ies;
-	uint16_t		nai_avail_resp_fixed_ies;
-	ndis_80211_ai_resfi	nai_resp_fixed_iex;
-	uint32_t		nai_resp_ielen;
-	uint32_t		nai_offset_resp_ies;
-};
-
-typedef struct ndis_80211_assoc_info ndis_80211_assoc_info;
-
-struct ndis_80211_auth_event {
-	ndis_80211_status_indication	nae_status;
-	ndis_80211_auth_request		nae_request[1];
-};
-
-typedef struct ndis_80211_auth_event ndis_80211_auth_event;
-
-struct ndis_80211_test {
-	uint32_t		nt_len;
-	uint32_t		nt_type;
-	union {
-		ndis_80211_auth_event	nt_authevent;
-		uint32_t		nt_rssitrigger;
-	} u;
-};
-
-typedef struct ndis_80211_test ndis_80211_test;
-
-struct ndis_80211_auth_encrypt {
-	uint32_t		ne_authmode;
-	uint32_t		ne_cryptstat;
-};
-
-typedef struct ndis_80211_auth_encrypt ndis_80211_auth_encrypt;
-
-struct ndis_80211_caps {
-	uint32_t		nc_len;
-	uint32_t		nc_ver;
-	uint32_t		nc_numpmkids;
-	ndis_80211_auth_encrypt	nc_authencs[1];
-};
-
-typedef struct ndis_80211_caps ndis_80211_caps;
-
-struct ndis_80211_bssidinfo {
-	ndis_80211_macaddr	nb_bssid;
-	uint8_t			nb_pmkid[16];
-};
-
-typedef struct ndis_80211_bssidinfo ndis_80211_bssidinfo;
-
-struct ndis_80211_pmkid {
-	uint32_t		np_len;
-	uint32_t		np_bssidcnt;
-	ndis_80211_bssidinfo	np_bssidinfo[1];
-};
-
-typedef struct ndis_80211_pmkid ndis_80211_pmkid;
-
-struct ndis_80211_pmkid_cand {
-	ndis_80211_macaddr	npc_bssid;
-	uint32_t		npc_flags;
-};
-
-typedef struct ndis_80211_pmkid_cand ndis_80211_pmkid_cand;
-
-#define	NDIS_802_11_PMKID_CANDIDATE_PREAUTH_ENABLED (0x01)
-
-struct ndis_80211_pmkid_candidate_list {
-	uint32_t		npcl_version;
-	uint32_t		npcl_numcandidates;
-	ndis_80211_pmkid_cand	npcl_candidatelist[1];
-};
-
-typedef struct ndis_80211_pmkid_candidate_list ndis_80211_pmkid_candidate_list;
-
-struct ndis_80211_enc_indication {
-	uint32_t		nei_statustype;
-	ndis_80211_pmkid_candidate_list nei_pmkidlist;
-};
-
-typedef struct ndis_80211_enc_indication ndis_80211_enc_indication;
-
-/* TCP OIDs. */
-
-#define	OID_TCP_TASK_OFFLOAD			0xFC010201
-#define	OID_TCP_TASK_IPSEC_ADD_SA		0xFC010202
-#define	OID_TCP_TASK_IPSEC_DELETE_SA		0xFC010203
-#define	OID_TCP_SAN_SUPPORT			0xFC010204
-
-#define	NDIS_TASK_OFFLOAD_VERSION 1
-
-#define	NDIS_TASK_TCPIP_CSUM			0x00000000
-#define	NDIS_TASK_IPSEC				0x00000001
-#define	NDIS_TASK_TCP_LARGESEND			0x00000002
-
-#define	NDIS_ENCAP_UNSPEC			0x00000000
-#define	NDIS_ENCAP_NULL				0x00000001
-#define	NDIS_ENCAP_IEEE802_3			0x00000002
-#define	NDIS_ENCAP_IEEE802_5			0x00000003
-#define	NDIS_ENCAP_SNAP_ROUTED			0x00000004
-#define	NDIS_ENCAP_SNAP_BRIDGED			0x00000005
-
-#define	NDIS_ENCAPFLAG_FIXEDHDRLEN		0x00000001
-
-struct ndis_encap_fmt {
-	uint32_t		nef_encap;
-	uint32_t		nef_flags;
-	uint32_t		nef_encaphdrlen;
-};
-
-typedef struct ndis_encap_fmt ndis_encap_fmt;
-
-struct ndis_task_offload_hdr {
-	uint32_t		ntoh_vers;
-	uint32_t		ntoh_len;
-	uint32_t		ntoh_rsvd;
-	uint32_t		ntoh_offset_firsttask;
-	ndis_encap_fmt		ntoh_encapfmt;
-};
-
-typedef struct ndis_task_offload_hdr ndis_task_offload_hdr;
-
-struct ndis_task_offload {
-	uint32_t		nto_vers;
-	uint32_t		nto_len;
-	uint32_t		nto_task;
-	uint32_t		nto_offset_nexttask;
-	uint32_t		nto_taskbuflen;
-	uint8_t			nto_taskbuf[1];
-};
-
-typedef struct ndis_task_offload ndis_task_offload;
-
-#define	NDIS_TCPSUM_FLAGS_IP_OPTS	0x00000001
-#define	NDIS_TCPSUM_FLAGS_TCP_OPTS	0x00000002
-#define	NDIS_TCPSUM_FLAGS_TCP_CSUM	0x00000004
-#define	NDIS_TCPSUM_FLAGS_UDP_CSUM	0x00000008
-#define	NDIS_TCPSUM_FLAGS_IP_CSUM	0x00000010
-
-struct ndis_task_tcpip_csum {
-	uint32_t		nttc_v4tx;
-	uint32_t		nttc_v4rx;
-	uint32_t		nttc_v6tx;
-	uint32_t		nttc_v6rx;
-};
-
-typedef struct ndis_task_tcpip_csum ndis_task_tcpip_csum;
-
-struct ndis_task_tcp_largesend {
-	uint32_t		nttl_vers;
-	uint32_t		nttl_maxofflen;
-	uint32_t		nttl_minsegcnt;
-	uint8_t			nttl_tcpopt;
-	uint8_t			nttl_ipopt;
-};
-
-typedef struct ndis_task_tcp_largesend ndis_task_tcp_largesend;
-
-#define	NDIS_IPSEC_AH_MD5		0x00000001
-#define	NDIS_IPSEC_AH_SHA1		0x00000002
-#define	NDIS_IPSEC_AH_TRANSPORT		0x00000004
-#define	NDIS_IPSEC_AH_TUNNEL		0x00000008
-#define	NDIS_IPSEC_AH_SEND		0x00000010
-#define	NDIS_IPSEC_AH_RECEIVE		0x00000020
-
-#define	NDIS_IPSEC_ESP_DES		0x00000001
-#define	NDIS_IPSEC_ESP_RSVD		0x00000002
-#define	NDIS_IPSEC_ESP_3DES		0x00000004
-#define	NDIS_IPSEC_ESP_NULL		0x00000008
-#define	NDIS_IPSEC_ESP_TRANSPORT	0x00000010
-#define	NDIS_IPSEC_ESP_TUNNEL		0x00000020
-#define	NDIS_IPSEC_ESP_SEND		0x00000040
-#define	NDIS_IPSEC_ESP_RECEIVE		0x00000080
-
-struct ndis_task_ipsec {
-	uint32_t		nti_ah_esp_combined;
-	uint32_t		nti_ah_transport_tunnel_combined;
-	uint32_t		nti_v4_options;
-	uint32_t		nti_rsvd;
-	uint32_t		nti_v4ah;
-	uint32_t		nti_v4esp;
-};
-
-typedef struct ndis_task_ipsec ndis_task_ipsec;
-
-/*
- * Attribures of NDIS drivers. Not all drivers support
- * all attributes.
- */
-
-#define	NDIS_ATTRIBUTE_IGNORE_PACKET_TIMEOUT		0x00000001
-#define	NDIS_ATTRIBUTE_IGNORE_REQUEST_TIMEOUT		0x00000002
-#define	NDIS_ATTRIBUTE_IGNORE_TOKEN_RING_ERRORS		0x00000004
-#define	NDIS_ATTRIBUTE_BUS_MASTER			0x00000008
-#define	NDIS_ATTRIBUTE_INTERMEDIATE_DRIVER		0x00000010
-#define	NDIS_ATTRIBUTE_DESERIALIZE			0x00000020
-#define	NDIS_ATTRIBUTE_NO_HALT_ON_SUSPEND		0x00000040
-#define	NDIS_ATTRIBUTE_SURPRISE_REMOVE_OK		0x00000080
-#define	NDIS_ATTRIBUTE_NOT_CO_NDIS			0x00000100
-#define	NDIS_ATTRIBUTE_USES_SAFE_BUFFER_APIS		0x00000200
-
-#define	NDIS_SERIALIZED(block)		\
-	(((block)->nmb_flags & NDIS_ATTRIBUTE_DESERIALIZE) == 0)
-
-enum ndis_media_state {
-	nmc_connected,
-	nmc_disconnected
-};
-
-typedef enum ndis_media_state ndis_media_state;
-
-/* Ndis Packet Filter Bits (OID_GEN_CURRENT_PACKET_FILTER). */
-
-#define	NDIS_PACKET_TYPE_DIRECTED               0x00000001
-#define	NDIS_PACKET_TYPE_MULTICAST              0x00000002
-#define	NDIS_PACKET_TYPE_ALL_MULTICAST          0x00000004
-#define	NDIS_PACKET_TYPE_BROADCAST              0x00000008
-#define	NDIS_PACKET_TYPE_SOURCE_ROUTING         0x00000010
-#define	NDIS_PACKET_TYPE_PROMISCUOUS            0x00000020
-#define	NDIS_PACKET_TYPE_SMT                    0x00000040
-#define	NDIS_PACKET_TYPE_ALL_LOCAL              0x00000080
-#define	NDIS_PACKET_TYPE_GROUP                  0x00001000
-#define	NDIS_PACKET_TYPE_ALL_FUNCTIONAL         0x00002000
-#define	NDIS_PACKET_TYPE_FUNCTIONAL             0x00004000
-#define	NDIS_PACKET_TYPE_MAC_FRAME              0x00008000
-
-/* Ndis MAC option bits (OID_GEN_MAC_OPTIONS). */
-
-#define	NDIS_MAC_OPTION_COPY_LOOKAHEAD_DATA             0x00000001
-#define	NDIS_MAC_OPTION_RECEIVE_SERIALIZED              0x00000002
-#define	NDIS_MAC_OPTION_TRANSFERS_NOT_PEND              0x00000004
-#define	NDIS_MAC_OPTION_NO_LOOPBACK                     0x00000008
-#define	NDIS_MAC_OPTION_FULL_DUPLEX                     0x00000010
-#define	NDIS_MAC_OPTION_EOTX_INDICATION                 0x00000020
-#define	NDIS_MAC_OPTION_8021P_PRIORITY                  0x00000040
-#define	NDIS_MAC_OPTION_SUPPORTS_MAC_ADDRESS_OVERWRITE  0x00000080
-#define	NDIS_MAC_OPTION_RECEIVE_AT_DPC                  0x00000100
-#define	NDIS_MAC_OPTION_8021Q_VLAN                      0x00000200
-#define	NDIS_MAC_OPTION_RESERVED                        0x80000000
-
-#define	NDIS_DMA_24BITS		0x00
-#define	NDIS_DMA_32BITS		0x01
-#define	NDIS_DMA_64BITS		0x02
-
-/*
-struct ndis_physaddr {
-#ifdef __i386__
-	uint64_t		np_quad;
-#endif
-#ifdef __amd64__
-	uint32_t		np_low;
-	uint32_t		np_high;
-#define	np_quad np_low
-#endif
-#ifdef notdef
-	uint32_t		np_low;
-	uint32_t		np_high;
-#endif
-};
-*/
-
-typedef struct physaddr ndis_physaddr;
-
-struct ndis_ansi_string {
-	uint16_t		nas_len;
-	uint16_t		nas_maxlen;
-	char			*nas_buf;
-};
-
-typedef struct ndis_ansi_string ndis_ansi_string;
-
-#ifdef notdef
-/*
- * nus_buf is really a wchar_t *, but it's inconvenient to include
- * all the necessary header goop needed to define it, and it's a
- * pointer anyway, so for now, just make it a uint16_t *.
- */
-struct ndis_unicode_string {
-	uint16_t		nus_len;
-	uint16_t		nus_maxlen;
-	uint16_t		*nus_buf;
-};
-typedef struct ndis_unicode_string ndis_unicode_string;
-#endif
-
-typedef unicode_string ndis_unicode_string;
-
-enum ndis_parm_type {
-	ndis_parm_int,
-	ndis_parm_hexint,
-	ndis_parm_string,
-	ndis_parm_multistring,
-	ndis_parm_binary
-};
-
-typedef enum ndis_parm_type ndis_parm_type;
-
-struct ndis_binary_data {
-	uint16_t		nbd_len;
-	void			*nbd_buf;
-};
-
-typedef struct ndis_binary_data ndis_binary_data;
-
-struct ndis_config_parm {
-	ndis_parm_type		ncp_type;
-	union {
-		uint32_t		ncp_intdata;
-		ndis_unicode_string	ncp_stringdata;
-		ndis_binary_data	ncp_binarydata;
-	} ncp_parmdata;
-};
-
-/*
- * Not part of Windows NDIS spec; we uses this to keep a
- * list of ndis_config_parm structures that we've allocated.
- */
-
-typedef struct ndis_config_parm ndis_config_parm;
-
-struct ndis_parmlist_entry {
-	list_entry		np_list;
-	ndis_config_parm	np_parm;
-};
-
-typedef struct ndis_parmlist_entry ndis_parmlist_entry;
-
-#ifdef notdef
-struct ndis_list_entry {
-	struct ndis_list_entry *nle_flink;
-	struct ndis_list_entry *nle_blink;
-};
-
-typedef struct ndis_list_entry ndis_list_entry;
-#endif
-
-struct ndis_bind_paths {
-	uint32_t		nbp_number;
-	ndis_unicode_string	nbp_paths[1];
-};
-
-typedef struct ndis_bind_paths ndis_bind_paths;
-
-#ifdef notdef
-struct dispatch_header {
-	uint8_t			dh_type;
-	uint8_t			dh_abs;
-	uint8_t			dh_size;
-	uint8_t			dh_inserted;
-	uint32_t		dh_sigstate;
-	list_entry		dh_waitlisthead;
-};
-#endif
-
-#define	dispatch_header nt_dispatch_header
-
-struct ndis_ktimer {
-	struct dispatch_header	nk_header;
-	uint64_t		nk_duetime;
-	list_entry		nk_timerlistentry;
-	void			*nk_dpc;
-	uint32_t		nk_period;
-};
-
-struct ndis_kevent {
-	struct dispatch_header	nk_header;
-};
-
-struct ndis_event {
-	struct nt_kevent	ne_event;
-};
-
-typedef struct ndis_event ndis_event;
-
-/* Kernel defered procedure call (i.e. timer callback) */
-
-struct ndis_kdpc;
-typedef void (*ndis_kdpc_func)(struct ndis_kdpc *, void *, void *, void *);
-
-struct ndis_kdpc {
-	uint16_t		nk_type;
-	uint8_t			nk_num;
-	uint8_t			nk_importance;
-	list_entry		nk_dpclistentry;
-	ndis_kdpc_func		nk_deferedfunc;
-	void			*nk_deferredctx;
-	void			*nk_sysarg1;
-	void			*nk_sysarg2;
-	uint32_t		*nk_lock;
-};
-
-struct ndis_timer {
-	struct ktimer		nt_ktimer;
-	struct kdpc		nt_kdpc;
-};
-
-typedef struct ndis_timer ndis_timer;
-
-typedef void (*ndis_timer_function)(void *, void *, void *, void *);
-
-struct ndis_miniport_timer {
-	struct ktimer		nmt_ktimer;
-	struct kdpc		nmt_kdpc;
-	ndis_timer_function	nmt_timerfunc;
-	void			*nmt_timerctx;
-	ndis_miniport_block	*nmt_block;
-	struct ndis_miniport_timer	*nmt_nexttimer;
-};
-
-typedef struct ndis_miniport_timer ndis_miniport_timer;
-
-struct ndis_spin_lock {
-	ndis_kspin_lock		nsl_spinlock;
-	ndis_kirql		nsl_kirql;
-};
-
-typedef struct ndis_spin_lock ndis_spin_lock;
-
-struct ndis_rw_lock {
-	union {
-		kspin_lock		nrl_spinlock;
-		void			*nrl_ctx;
-	} u;
-	uint8_t				nrl_rsvd[16];
-};
-
-#define	nrl_spinlock		u.nrl_spinlock
-#define	nrl_ctx			u.nrl_ctx;
-
-typedef struct ndis_rw_lock ndis_rw_lock;
-
-struct ndis_lock_state {
-	uint16_t			nls_lockstate;
-	ndis_kirql			nls_oldirql;
-};
-
-typedef struct ndis_lock_state ndis_lock_state;
-
-struct ndis_request {
-	uint8_t			nr_macreserved[4*sizeof(void *)];
-	uint32_t		nr_requesttype;
-	union _ndis_data {
-		struct _ndis_query_information {
-			ndis_oid	nr_oid;
-			void		*nr_infobuf;
-			uint32_t	nr_infobuflen;
-			uint32_t	nr_byteswritten;
-			uint32_t	nr_bytesneeded;
-		} ndis_query_information;
-		struct _ndis_set_information {
-			ndis_oid	nr_oid;
-			void		*nr_infobuf;
-			uint32_t	nr_infobuflen;
-			uint32_t	nr_byteswritten;
-			uint32_t	nr_bytesneeded;
-		} ndis_set_information;
-	} ndis_data;
-	/* NDIS 5.0 extensions */
-	uint8_t			nr_ndis_rsvd[9 * sizeof(void *)];
-	union {
-		uint8_t		nr_callmgr_rsvd[2 * sizeof(void *)];
-		uint8_t		nr_protocol_rsvd[2 * sizeof(void *)];
-	} u;
-	uint8_t			nr_miniport_rsvd[2 * sizeof(void *)];
-};
-
-typedef struct ndis_request ndis_request;
-
-/*
- * Filler, not used.
- */
-struct ndis_miniport_interrupt {
-	kinterrupt		*ni_introbj;
-	ndis_kspin_lock		ni_dpccountlock;
-	void			*ni_rsvd;
-	void			*ni_isrfunc;
-	void			*ni_dpcfunc;
-	kdpc			ni_dpc;
-	ndis_miniport_block	*ni_block;
-	uint8_t			ni_dpccnt;
-	uint8_t			ni_filler1;
-	struct nt_kevent	ni_dpcevt;
-	uint8_t			ni_shared;
-	uint8_t			ni_isrreq;
-};
-
-typedef struct ndis_miniport_interrupt ndis_miniport_interrupt;
-
-enum ndis_interrupt_mode {
-	nim_level,
-	nim_latched
-};
-
-typedef enum ndis_interrupt_mode ndis_interrupt_mode;
-
-#define	NUMBER_OF_SINGLE_WORK_ITEMS 6
-
-struct ndis_work_item;
-
-typedef void (*ndis_proc)(struct ndis_work_item *, void *);
-
-struct ndis_work_item {
-	void			*nwi_ctx;
-	ndis_proc		nwi_func;
-	uint8_t			nwi_wraprsvd[sizeof(void *) * 8];
-};
-
-typedef struct ndis_work_item ndis_work_item;
-
-#define	NdisInitializeWorkItem(w, f, c)	\
-	do {				\
-		(w)->nwi_ctx = c;	\
-		(w)->nwi_func = f;	\
-	} while (0)
-
-#ifdef notdef
-struct ndis_buffer {
-	struct ndis_buffer	*nb_next;
-	uint16_t		nb_size;
-	uint16_t		nb_flags;
-	void			*nb_process;
-	void			*nb_mappedsystemva;
-	void			*nb_startva;
-	uint32_t		nb_bytecount;
-	uint32_t		nb_byteoffset;
-};
-
-typedef struct ndis_buffer ndis_buffer;
-#endif
-
-struct ndis_sc_element {
-	ndis_physaddr		nse_addr;
-	uint32_t		nse_len;
-	uint32_t		*nse_rsvd;
-};
-
-typedef struct ndis_sc_element ndis_sc_element;
-
-#define	NDIS_MAXSEG		32
-#define	NDIS_BUS_SPACE_SHARED_MAXADDR	0x3E7FFFFF
-
-struct ndis_sc_list {
-	uint32_t		nsl_frags;
-	uint32_t		*nsl_rsvd;
-	ndis_sc_element		nsl_elements[NDIS_MAXSEG];
-};
-
-typedef struct ndis_sc_list ndis_sc_list;
-
-struct ndis_tcpip_csum {
-	union {
-		uint32_t		ntc_txflags;
-		uint32_t		ntc_rxflags;
-		uint32_t		ntc_val;
-	} u;
-};
-
-typedef struct ndis_tcpip_csum ndis_tcpip_csum;
-
-#define	NDIS_TXCSUM_DO_IPV4		0x00000001
-#define	NDIS_TXCSUM_DO_IPV6		0x00000002
-#define	NDIS_TXCSUM_DO_TCP		0x00000004
-#define	NDIS_TXCSUM_DO_UDP		0x00000008
-#define	NDIS_TXCSUM_DO_IP		0x00000010
-
-#define	NDIS_RXCSUM_TCP_FAILED		0x00000001
-#define	NDIS_RXCSUM_UDP_FAILED		0x00000002
-#define	NDIS_RXCSUM_IP_FAILED		0x00000004
-#define	NDIS_RXCSUM_TCP_PASSED		0x00000008
-#define	NDIS_RXCSUM_UDP_PASSED		0x00000010
-#define	NDIS_RXCSUM_IP_PASSED		0x00000020
-#define	NDIS_RXCSUM_LOOPBACK		0x00000040
-
-struct ndis_vlan {
-	union {
-		struct {
-			uint32_t			nvt_userprio:3;
-			uint32_t			nvt_canformatid:1;
-			uint32_t			nvt_vlanid:12;
-			uint32_t			nvt_rsvd:16;
-		} nv_taghdr;
-	} u;
-};
-
-typedef struct ndis_vlan ndis_vlan;
-
-enum ndis_perpkt_info {
-	ndis_tcpipcsum_info,
-	ndis_ipsec_info,
-	ndis_largesend_info,
-	ndis_classhandle_info,
-	ndis_rsvd,
-	ndis_sclist_info,
-	ndis_ieee8021q_info,
-	ndis_originalpkt_info,
-	ndis_packetcancelid,
-	ndis_maxpkt_info
-};
-
-typedef enum ndis_perpkt_info ndis_perpkt_info;
-
-struct ndis_packet_extension {
-	void			*npe_info[ndis_maxpkt_info];
-};
-
-typedef struct ndis_packet_extension ndis_packet_extension;
-
-struct ndis_packet_private {
-	uint32_t		npp_physcnt;
-	uint32_t		npp_totlen;
-	ndis_buffer		*npp_head;
-	ndis_buffer		*npp_tail;
-
-	void			*npp_pool;
-	uint32_t		npp_count;
-	uint32_t		npp_flags;
-	uint8_t			npp_validcounts;
-	uint8_t			npp_ndispktflags;
-	uint16_t		npp_packetooboffset;
-};
-
-#define	NDIS_FLAGS_PROTOCOL_ID_MASK             0x0000000F
-#define	NDIS_FLAGS_MULTICAST_PACKET             0x00000010
-#define	NDIS_FLAGS_RESERVED2                    0x00000020
-#define	NDIS_FLAGS_RESERVED3                    0x00000040
-#define	NDIS_FLAGS_DONT_LOOPBACK                0x00000080
-#define	NDIS_FLAGS_IS_LOOPBACK_PACKET           0x00000100
-#define	NDIS_FLAGS_LOOPBACK_ONLY                0x00000200
-#define	NDIS_FLAGS_RESERVED4                    0x00000400
-#define	NDIS_FLAGS_DOUBLE_BUFFERED              0x00000800
-#define	NDIS_FLAGS_SENT_AT_DPC                  0x00001000
-#define	NDIS_FLAGS_USES_SG_BUFFER_LIST          0x00002000
-
-#define	NDIS_PACKET_WRAPPER_RESERVED			0x3F
-#define	NDIS_PACKET_CONTAINS_MEDIA_SPECIFIC_INFO	0x40
-#define	NDIS_PACKET_ALLOCATED_BY_NDIS			0x80
-
-#define	NDIS_PROTOCOL_ID_DEFAULT        0x00
-#define	NDIS_PROTOCOL_ID_TCP_IP         0x02
-#define	NDIS_PROTOCOL_ID_IPX            0x06
-#define	NDIS_PROTOCOL_ID_NBF            0x07
-#define	NDIS_PROTOCOL_ID_MAX            0x0F
-#define	NDIS_PROTOCOL_ID_MASK           0x0F
-
-typedef struct ndis_packet_private ndis_packet_private;
-
-enum ndis_classid {
-	ndis_class_802_3prio,
-	ndis_class_wirelesswan_mbx,
-	ndis_class_irda_packetinfo,
-	ndis_class_atm_aainfo
-};
-
-typedef enum ndis_classid ndis_classid;
-
-struct ndis_mediaspecific_info {
-	uint32_t		nmi_nextentoffset;
-	ndis_classid		nmi_classid;
-	uint32_t		nmi_size;
-	uint8_t			nmi_classinfo[1];
-};
-
-typedef struct ndis_mediaspecific_info ndis_mediaspecific_info;
-
-struct ndis_packet_oob {
-	union {
-		uint64_t		npo_timetotx;
-		uint64_t		npo_timetxed;
-	} u;
-	uint64_t			npo_timerxed;
-	uint32_t			npo_hdrlen;
-	uint32_t			npo_mediaspecific_len;
-	void				*npo_mediaspecific;
-	ndis_status			npo_status;
-};
-
-typedef struct ndis_packet_oob ndis_packet_oob;
-
-/*
- * Our protocol private region for handling ethernet.
- * We need this to stash some of the things returned
- * by NdisMEthIndicateReceive().
- */
-
-struct ndis_ethpriv {
-	void			*nep_ctx;	/* packet context */
-	long			nep_offset;	/* residual data to transfer */
-	void			*nep_pad[2];
-};
-
-typedef struct ndis_ethpriv ndis_ethpriv;
-
-#define	PROTOCOL_RESERVED_SIZE_IN_PACKET	(4 * sizeof(void *))
-
-struct ndis_packet {
-	ndis_packet_private	np_private;
-	union {
-		/* For connectionless miniports. */
-		struct {
-			uint8_t		np_miniport_rsvd[2 * sizeof(void *)];
-			uint8_t		np_wrapper_rsvd[2 * sizeof(void *)];
-		} np_clrsvd;
-		/* For de-serialized miniports */
-		struct {
-			uint8_t		np_miniport_rsvdex[3 * sizeof(void *)];
-			uint8_t		np_wrapper_rsvdex[sizeof(void *)];
-		} np_dsrsvd;
-		struct {
-			uint8_t		np_mac_rsvd[4 * sizeof(void *)];
-		} np_macrsvd;
-	} u;
-	uint32_t		*np_rsvd[2];
-	uint8_t			np_protocolreserved[PROTOCOL_RESERVED_SIZE_IN_PACKET];
-
-	/*
-	 * This next part is probably wrong, but we need some place
-	 * to put the out of band data structure...
-	 */
-	ndis_packet_oob		np_oob;
-	ndis_packet_extension	np_ext;
-	ndis_sc_list		np_sclist;
-
-	/* BSD-specific stuff which should be invisible to drivers. */
-
-	uint32_t		np_refcnt;
-	void			*np_softc;
-	void			*np_m0;
-	int			np_txidx;
-	list_entry		np_list;
-};
-
-typedef struct ndis_packet ndis_packet;
-
-struct ndis_packet_pool {
-	slist_header		np_head;
-	int			np_dead;
-	nt_kevent		np_event;
-	kspin_lock		np_lock;
-	int			np_cnt;
-	int			np_len;
-	int			np_protrsvd;
-	void			*np_pktmem;
-};
-
-typedef struct ndis_packet_pool ndis_packet_pool;
-
-/* mbuf ext type for NDIS */
-#define	EXT_NDIS		EXT_NET_DRV
-
-/* mtx type for NDIS */
-#define	MTX_NDIS_LOCK "NDIS lock"
-
-struct ndis_filterdbs {
-	union {
-		void			*nf_ethdb;
-		void			*nf_nulldb;
-	} u;
-	void			*nf_trdb;
-	void			*nf_fddidb;
-	void			*nf_arcdb;
-};
-
-typedef struct ndis_filterdbs ndis_filterdbs;
-
-#define	nf_ethdb u.nf_ethdb
-
-enum ndis_medium {
-    NdisMedium802_3,
-    NdisMedium802_5,
-    NdisMediumFddi,
-    NdisMediumWan,
-    NdisMediumLocalTalk,
-    NdisMediumDix,              /* defined for convenience, not a real medium */
-    NdisMediumArcnetRaw,
-    NdisMediumArcnet878_2,
-    NdisMediumAtm,
-    NdisMediumWirelessWan,
-    NdisMediumIrda,
-    NdisMediumBpc,
-    NdisMediumCoWan,
-    NdisMedium1394,
-    NdisMediumMax
-};
-
-typedef enum ndis_medium ndis_medium;
-/*
-enum interface_type {
-	InterfaceTypeUndefined = -1,
-	Internal,
-	Isa,
-	Eisa,
-	MicroChannel,
-	TurboChannel,
-	PCIBus,
-	VMEBus,
-	NuBus,
-	PCMCIABus,
-	CBus,
-	MPIBus,
-	MPSABus,
-	ProcessorInternal,
-	InternalPowerBus,
-	PNPISABus,
-	PNPBus,
-	MaximumInterfaceType
-};
-*/
-enum ndis_interface_type {
-	NdisInterfaceInternal = Internal,
-	NdisInterfaceIsa = Isa,
-	NdisInterfaceEisa = Eisa,
-	NdisInterfaceMca = MicroChannel,
-	NdisInterfaceTurboChannel = TurboChannel,
-	NdisInterfacePci = PCIBus,
-	NdisInterfacePcMcia = PCMCIABus
-};
-
-typedef enum ndis_interface_type ndis_interface_type;
-
-struct ndis_paddr_unit {
-	ndis_physaddr		npu_physaddr;
-	uint32_t		npu_len;
-};
-
-typedef struct ndis_paddr_unit ndis_paddr_unit;
-
-struct ndis_map_arg {
-	ndis_paddr_unit		*nma_fraglist;
-	int			nma_cnt;
-	int			nma_max;
-};
-
-/*
- * Miniport characteristics were originally defined in the NDIS 3.0
- * spec and then extended twice, in NDIS 4.0 and 5.0.
- */
-
-struct ndis_miniport_characteristics {
-	/* NDIS 3.0 */
-
-	uint8_t			nmc_version_major;
-	uint8_t			nmc_version_minor;
-	uint16_t		nmc_pad;
-	uint32_t		nmc_rsvd;
-	void *			nmc_checkhang_func;
-	void *			nmc_disable_interrupts_func;
-	void *			nmc_enable_interrupts_func;
-	void *			nmc_halt_func;
-	void *			nmc_interrupt_func;
-	void *			nmc_init_func;
-	void *			nmc_isr_func;
-	void *			nmc_queryinfo_func;
-	void *			nmc_reconfig_func;
-	void *			nmc_reset_func;
-	void *			nmc_sendsingle_func;
-	void *			nmc_setinfo_func;
-	void *			nmc_transferdata_func;
-
-	/* NDIS 4.0 extensions */
-
-	void *			nmc_return_packet_func;
-	void *			nmc_sendmulti_func;
-	void *			nmc_allocate_complete_func;
-
-	/* NDIS 5.0 extensions */
-
-	void *			nmc_cocreatevc_func;
-	void *			nmc_codeletevc_func;
-	void *			nmc_coactivatevc_func;
-	void *			nmc_codeactivatevc_func;
-	void *			nmc_comultisend_func;
-	void *			nmc_corequest_func;
-
-	/* NDIS 5.1 extensions */
-
-	void *			nmc_canceltxpkts_handler;
-	void *			nmc_pnpevent_handler;
-	void *			nmc_shutdown_handler;
-	void *			nmc_rsvd0;
-	void *			nmc_rsvd1;
-	void *			nmc_rsvd2;
-	void *			nmc_rsvd3;
-};
-
-typedef struct ndis_miniport_characteristics ndis_miniport_characteristics;
-
-struct ndis_driver_object {
-	char			*ndo_ifname;
-	void			*ndo_softc;
-	ndis_miniport_characteristics ndo_chars;
-};
-
-typedef struct ndis_driver_object ndis_driver_object;
-
-struct ndis_reference {
-	ndis_kspin_lock		nr_spinlock;
-	uint16_t		nr_refcnt;
-	uint8_t			nr_closing;
-};
-
-typedef struct ndis_reference ndis_reference;
-
-struct ndis_timer_entry {
-	struct callout		nte_ch;
-	ndis_miniport_timer	*nte_timer;
-	TAILQ_ENTRY(ndis_timer_entry)	link;
-};
-
-TAILQ_HEAD(nte_head, ndis_timer_entry);
-
-#define	NDIS_FH_TYPE_VFS	0
-#define	NDIS_FH_TYPE_MODULE	1
-
-struct ndis_fh {
-	int			nf_type;
-	char			*nf_name;
-	void			*nf_vp;
-	void			*nf_map;
-	uint32_t		nf_maplen;
-};
-
-typedef struct ndis_fh ndis_fh;
-
-/*
- * The miniport block is basically the internal NDIS handle. We need
- * to define this because, unfortunately, it is not entirely opaque
- * to NDIS drivers. For one thing, it contains the function pointer
- * to the NDIS packet receive handler, which is invoked out of the
- * NDIS block via a macro rather than a function pointer. (The
- * NdisMIndicateReceivePacket() routine is a macro rather than
- * a function.) For another, the driver maintains a pointer to the
- * miniport block and passes it as a handle to various NDIS functions.
- * (The driver never really knows this because it's hidden behind
- * an ndis_handle though.)
- *
- * The miniport block has two parts: the first part contains fields
- * that must never change, since they are referenced by driver
- * binaries through macros. The second part is ignored by the driver,
- * but contains various things used internaly by NDIS.SYS. In our
- * case, we define the first 'immutable' part exactly as it appears
- * in Windows, but don't bother duplicating the Windows definitions
- * for the second part. Instead, we replace them with a few BSD-specific
- * things.
- */
-
-struct ndis_miniport_block {
-	/*
-	 * Windows-specific portion -- DO NOT MODIFY OR NDIS
-	 * DRIVERS WILL NOT WORK.
-	 */
-	void			*nmb_signature;	/* magic number */
-	ndis_miniport_block	*nmb_nextminiport;
-	ndis_mdriver_block	*nmb_driverhandle;
-	ndis_handle		nmb_miniportadapterctx;
-	ndis_unicode_string	nmb_name;
-	ndis_bind_paths		*nmb_bindpaths;
-	ndis_handle		nmb_openqueue;
-	ndis_reference		nmb_ref;
-	ndis_handle		nmb_devicectx;
-	uint8_t			nmb_padding;
-	uint8_t			nmb_lockacquired;
-	uint8_t			nmb_pmodeopens;
-	uint8_t			nmb_assignedcpu;
-	ndis_kspin_lock		nmb_lock;
-	ndis_request		*nmb_mediarequest;
-	ndis_miniport_interrupt	*nmb_interrupt;
-	uint32_t		nmb_flags;
-	uint32_t		nmb_pnpflags;
-	list_entry		nmb_packetlist;
-	ndis_packet		*nmb_firstpendingtxpacket;
-	ndis_packet		*nmb_returnpacketqueue;
-	uint32_t		nmb_requestbuffer;
-	void			*nmb_setmcastbuf;
-	ndis_miniport_block	*nmb_primaryminiport;
-	void			*nmb_wrapperctx;
-	void			*nmb_busdatactx;
-	uint32_t		nmb_pnpcaps;
-	cm_resource_list	*nmb_resources;
-	ndis_timer		nmb_wkupdpctimer;
-	ndis_unicode_string	nmb_basename;
-	ndis_unicode_string	nmb_symlinkname;
-	uint32_t		nmb_checkforhangsecs;
-	uint16_t		nmb_cfhticks;
-	uint16_t		nmb_cfhcurrticks;
-	ndis_status		nmb_resetstatus;
-	ndis_handle		nmb_resetopen;
-	ndis_filterdbs		nmb_filterdbs;
-	void			*nmb_pktind_func;
-	void			*nmb_senddone_func;
-	void			*nmb_sendrsrc_func;
-	void			*nmb_resetdone_func;
-	ndis_medium		nmb_medium;
-	uint32_t		nmb_busnum;
-	uint32_t		nmb_bustype;
-	uint32_t		nmb_adaptertype;
-	device_object		*nmb_deviceobj; /* Functional device */
-	device_object		*nmb_physdeviceobj; /* Physical device */
-	device_object		*nmb_nextdeviceobj; /* Next dev in stack */
-	void			*nmb_mapreg;
-	void			*nmb_callmgraflist;
-	void			*nmb_miniportthread;
-	void			*nmb_setinfobuf;
-	uint16_t		nmb_setinfobuflen;
-	uint16_t		nmb_maxsendpkts;
-	ndis_status		nmb_fakestatus;
-	void			*nmb_lockhandler;
-	ndis_unicode_string	*nmb_adapterinstancename;
-	void			*nmb_timerqueue;
-	uint32_t		nmb_mactoptions;
-	ndis_request		*nmb_pendingreq;
-	uint32_t		nmb_maxlongaddrs;
-	uint32_t		nmb_maxshortaddrs;
-	uint32_t		nmb_currlookahead;
-	uint32_t		nmb_maxlookahead;
-	void			*nmb_interrupt_func;
-	void			*nmb_disableintr_func;
-	void			*nmb_enableintr_func;
-	void			*nmb_sendpkts_func;
-	void			*nmb_deferredsend_func;
-	void			*nmb_ethrxindicate_func;
-	void			*nmb_txrxindicate_func;
-	void			*nmb_fddirxindicate_func;
-	void			*nmb_ethrxdone_func;
-	void			*nmb_txrxdone_func;
-	void			*nmb_fddirxcond_func;
-	void			*nmb_status_func;
-	void			*nmb_statusdone_func;
-	void			*nmb_tdcond_func;
-	void			*nmb_querydone_func;
-	void			*nmb_setdone_func;
-	void			*nmb_wantxdone_func;
-	void			*nmb_wanrx_func;
-	void			*nmb_wanrxdone_func;
-	/*
-	 * End of windows-specific portion of miniport block. Everything
-	 * below is BSD-specific.
-	 */
-	list_entry		nmb_parmlist;
-	ndis_resource_list	*nmb_rlist;
-	ndis_status		nmb_getstat;
-	nt_kevent		nmb_getevent;
-	ndis_status		nmb_setstat;
-	nt_kevent		nmb_setevent;
-	nt_kevent		nmb_resetevent;
-	io_workitem		*nmb_returnitem;
-	ndis_miniport_timer	*nmb_timerlist;
-	ndis_handle		nmb_rxpool;
-	list_entry		nmb_returnlist;
-	kspin_lock		nmb_returnlock;
-	TAILQ_ENTRY(ndis_miniport_block)	link;
-};
-
-TAILQ_HEAD(nd_head, ndis_miniport_block);
-
-typedef ndis_status (*ndis_init_handler)(ndis_status *, uint32_t *,
-		ndis_medium *, uint32_t, ndis_handle, ndis_handle);
-typedef ndis_status (*ndis_queryinfo_handler)(ndis_handle, ndis_oid,
-		void *, uint32_t, uint32_t *, uint32_t *);
-typedef ndis_status (*ndis_setinfo_handler)(ndis_handle, ndis_oid,
-		void *, uint32_t, uint32_t *, uint32_t *);
-typedef ndis_status (*ndis_sendsingle_handler)(ndis_handle,
-		ndis_packet *, uint32_t);
-typedef ndis_status (*ndis_sendmulti_handler)(ndis_handle,
-		ndis_packet **, uint32_t);
-typedef void (*ndis_isr_handler)(uint8_t *, uint8_t *, ndis_handle);
-typedef void (*ndis_interrupt_handler)(ndis_handle);
-typedef int (*ndis_reset_handler)(uint8_t *, ndis_handle);
-typedef void (*ndis_halt_handler)(ndis_handle);
-typedef void (*ndis_return_handler)(ndis_handle, ndis_packet *);
-typedef void (*ndis_enable_interrupts_handler)(ndis_handle);
-typedef void (*ndis_disable_interrupts_handler)(ndis_handle);
-typedef void (*ndis_shutdown_handler)(void *);
-typedef void (*ndis_pnpevent_handler)(void *, int, void *, uint32_t);
-typedef void (*ndis_allocdone_handler)(ndis_handle, void *,
-		ndis_physaddr *, uint32_t, void *);
-typedef uint8_t (*ndis_checkforhang_handler)(ndis_handle);
-
-typedef ndis_status (*driver_entry)(void *, unicode_string *);
-
-extern image_patch_table ndis_functbl[];
-
-#define	NDIS_TASKQUEUE	1
-#define	NDIS_SWI	2
-
-#define	NDIS_PSTATE_RUNNING	1
-#define	NDIS_PSTATE_SLEEPING	2
-
-#define	NdisQueryPacket(p, pbufcnt, bufcnt, firstbuf, plen)		\
-	do {								\
-		if ((firstbuf) != NULL) {				\
-			ndis_buffer		**_first;		\
-			_first = firstbuf;				\
-			*(_first) = (p)->np_private.npp_head;		\
-		}							\
-		if ((plen) || (bufcnt) || (pbufcnt)) {			\
-			if ((p)->np_private.npp_validcounts == FALSE) {	\
-				ndis_buffer		*tmp;		\
-				unsigned int		tlen = 0, pcnt = 0; \
-				unsigned int		add = 0;	\
-				unsigned int		pktlen, off;	\
-									\
-				tmp = (p)->np_private.npp_head;		\
-				while (tmp != NULL) {			\
-					off = MmGetMdlByteOffset(tmp);	\
-					pktlen = MmGetMdlByteCount(tmp);\
-					tlen += pktlen;			\
-					pcnt +=				\
-					    NDIS_BUFFER_TO_SPAN_PAGES(tmp); \
-					add++;				\
-					tmp = tmp->mdl_next;		\
-				}					\
-				(p)->np_private.npp_count = add;	\
-				(p)->np_private.npp_totlen = tlen;	\
-				(p)->np_private.npp_physcnt = pcnt;	\
-				(p)->np_private.npp_validcounts = TRUE;	\
-			}						\
-			if (pbufcnt) {					\
-				unsigned int		*_pbufcnt;	\
-				_pbufcnt = (pbufcnt);			\
-				*(_pbufcnt) = (p)->np_private.npp_physcnt; \
-			}						\
-			if (bufcnt) {					\
-				unsigned int		*_bufcnt;	\
-				_bufcnt = (bufcnt);			\
-				*(_bufcnt) = (p)->np_private.npp_count;	\
-			}						\
-			if (plen) {					\
-				unsigned int		*_plen;		\
-				_plen = (plen);				\
-				*(_plen) = (p)->np_private.npp_totlen;	\
-			}						\
-		}							\
-	} while (0)
-
-__BEGIN_DECLS
-extern int ndis_libinit(void);
-extern int ndis_libfini(void);
-extern int ndis_load_driver(vm_offset_t, void *);
-extern int ndis_unload_driver(void *);
-extern int ndis_mtop(struct mbuf *, ndis_packet **);
-extern int ndis_ptom(struct mbuf **, ndis_packet *);
-extern int ndis_get_info(void *, ndis_oid, void *, int *);
-extern int ndis_set_info(void *, ndis_oid, void *, int *);
-extern void *ndis_get_routine_address(struct image_patch_table *, char *);
-extern int ndis_get_supported_oids(void *, ndis_oid **, int *);
-extern int ndis_send_packets(void *, ndis_packet **, int);
-extern int ndis_send_packet(void *, ndis_packet *);
-extern int ndis_convert_res(void *);
-extern void ndis_free_packet(ndis_packet *);
-extern void ndis_free_bufs(ndis_buffer *);
-extern int ndis_reset_nic(void *);
-extern int ndis_halt_nic(void *);
-extern int ndis_shutdown_nic(void *);
-extern int ndis_pnpevent_nic(void *, int);
-extern int ndis_init_nic(void *);
-extern void ndis_return_packet(ndis_packet *);
-extern int ndis_init_dma(void *);
-extern int ndis_destroy_dma(void *);
-extern int ndis_create_sysctls(void *);
-extern int ndis_add_sysctl(void *, char *, char *, char *, int);
-extern int ndis_flush_sysctls(void *);
-
-extern uint32_t NdisAddDevice(driver_object *, device_object *);
-extern void NdisAllocatePacketPool(ndis_status *,
-    ndis_handle *, uint32_t, uint32_t);
-extern void NdisAllocatePacketPoolEx(ndis_status *,
-    ndis_handle *, uint32_t, uint32_t, uint32_t);
-extern uint32_t NdisPacketPoolUsage(ndis_handle);
-extern void NdisFreePacketPool(ndis_handle);
-extern void NdisAllocatePacket(ndis_status *,
-	ndis_packet **, ndis_handle);
-extern void NdisFreePacket(ndis_packet *);
-extern ndis_status NdisScheduleWorkItem(ndis_work_item *);
-extern void NdisMSleep(uint32_t);
-__END_DECLS
-
-#endif /* _NDIS_VAR_H_ */
diff --git a/sys/compat/ndis/ntoskrnl_var.h b/sys/compat/ndis/ntoskrnl_var.h
deleted file mode 100644
index 3f9f604da947..000000000000
--- a/sys/compat/ndis/ntoskrnl_var.h
+++ /dev/null
@@ -1,1517 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
- * Copyright (c) 2003
- *	Bill Paul <wpaul@windriver.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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.
- *
- * $FreeBSD$
- */
-
-#ifndef _NTOSKRNL_VAR_H_
-#define	_NTOSKRNL_VAR_H_
-
-#define	MTX_NTOSKRNL_SPIN_LOCK "NDIS thread lock"
-
-/*
- * us_buf is really a wchar_t *, but it's inconvenient to include
- * all the necessary header goop needed to define it, and it's a
- * pointer anyway, so for now, just make it a uint16_t *.
- */
-struct unicode_string {
-	uint16_t		us_len;
-	uint16_t		us_maxlen;
-	uint16_t		*us_buf;
-};
-
-typedef struct unicode_string unicode_string;
-
-struct ansi_string {
-	uint16_t		as_len;
-	uint16_t		as_maxlen;
-	char			*as_buf;
-};
-
-typedef struct ansi_string ansi_string;
-
-/*
- * Windows memory descriptor list. In Windows, it's possible for
- * buffers to be passed between user and kernel contexts without
- * copying. Buffers may also be allocated in either paged or
- * non-paged memory regions. An MDL describes the pages of memory
- * used to contain a particular buffer. Note that a single MDL
- * may describe a buffer that spans multiple pages. An array of
- * page addresses appears immediately after the MDL structure itself.
- * MDLs are therefore implicitly variably sized, even though they
- * don't look it.
- *
- * Note that in FreeBSD, we can take many shortcuts in the way
- * we handle MDLs because:
- *
- * - We are only concerned with pages in kernel context. This means
- *   we will only ever use the kernel's memory map, and remapping
- *   of buffers is never needed.
- *
- * - Kernel pages can never be paged out, so we don't have to worry
- *   about whether or not a page is actually mapped before going to
- *   touch it.
- */
-
-struct mdl {
-	struct mdl		*mdl_next;
-	uint16_t		mdl_size;
-	uint16_t		mdl_flags;
-	void			*mdl_process;
-	void			*mdl_mappedsystemva;
-	void			*mdl_startva;
-	uint32_t		mdl_bytecount;
-	uint32_t		mdl_byteoffset;
-};
-
-typedef struct mdl mdl, ndis_buffer;
-
-/* MDL flags */
-
-#define	MDL_MAPPED_TO_SYSTEM_VA		0x0001
-#define	MDL_PAGES_LOCKED		0x0002
-#define	MDL_SOURCE_IS_NONPAGED_POOL	0x0004
-#define	MDL_ALLOCATED_FIXED_SIZE	0x0008
-#define	MDL_PARTIAL			0x0010
-#define	MDL_PARTIAL_HAS_BEEN_MAPPED	0x0020
-#define	MDL_IO_PAGE_READ		0x0040
-#define	MDL_WRITE_OPERATION		0x0080
-#define	MDL_PARENT_MAPPED_SYSTEM_VA	0x0100
-#define	MDL_FREE_EXTRA_PTES		0x0200
-#define	MDL_IO_SPACE			0x0800
-#define	MDL_NETWORK_HEADER		0x1000
-#define	MDL_MAPPING_CAN_FAIL		0x2000
-#define	MDL_ALLOCATED_MUST_SUCCEED	0x4000
-#define	MDL_ZONE_ALLOCED		0x8000	/* BSD private */
-
-#define	MDL_ZONE_PAGES 16
-#define	MDL_ZONE_SIZE (sizeof(mdl) + (sizeof(vm_offset_t) * MDL_ZONE_PAGES))
-
-/* Note: assumes x86 page size of 4K. */
-
-#ifndef PAGE_SHIFT
-#if PAGE_SIZE == 4096
-#define	PAGE_SHIFT	12
-#elif PAGE_SIZE == 8192
-#define	PAGE_SHIFT	13
-#else
-#error PAGE_SHIFT undefined!
-#endif
-#endif
-
-#define	SPAN_PAGES(ptr, len)					\
-	((uint32_t)((((uintptr_t)(ptr) & (PAGE_SIZE - 1)) +	\
-	(len) + (PAGE_SIZE - 1)) >> PAGE_SHIFT))
-
-#define	PAGE_ALIGN(ptr)						\
-	((void *)((uintptr_t)(ptr) & ~(PAGE_SIZE - 1)))
-
-#define	BYTE_OFFSET(ptr)					\
-	((uint32_t)((uintptr_t)(ptr) & (PAGE_SIZE - 1)))
-
-#define	MDL_PAGES(m)	(vm_offset_t *)(m + 1)
-
-#define	MmInitializeMdl(b, baseva, len)					\
-	(b)->mdl_next = NULL;						\
-	(b)->mdl_size = (uint16_t)(sizeof(mdl) +			\
-		(sizeof(vm_offset_t) * SPAN_PAGES((baseva), (len))));	\
-	(b)->mdl_flags = 0;						\
-	(b)->mdl_startva = (void *)PAGE_ALIGN((baseva));		\
-	(b)->mdl_byteoffset = BYTE_OFFSET((baseva));			\
-	(b)->mdl_bytecount = (uint32_t)(len);
-
-#define	MmGetMdlByteOffset(mdl)		((mdl)->mdl_byteoffset)
-#define	MmGetMdlByteCount(mdl)		((mdl)->mdl_bytecount)
-#define	MmGetMdlVirtualAddress(mdl)					\
-	((void *)((char *)((mdl)->mdl_startva) + (mdl)->mdl_byteoffset))
-#define	MmGetMdlStartVa(mdl)		((mdl)->mdl_startva)
-#define	MmGetMdlPfnArray(mdl)		MDL_PAGES(mdl)
-
-#define	WDM_MAJOR		1
-#define	WDM_MINOR_WIN98		0x00
-#define	WDM_MINOR_WINME		0x05
-#define	WDM_MINOR_WIN2000	0x10
-#define	WDM_MINOR_WINXP		0x20
-#define	WDM_MINOR_WIN2003	0x30
-
-enum nt_caching_type {
-	MmNonCached			= 0,
-	MmCached			= 1,
-	MmWriteCombined			= 2,
-	MmHardwareCoherentCached	= 3,
-	MmNonCachedUnordered		= 4,
-	MmUSWCCached			= 5,
-	MmMaximumCacheType		= 6
-};
-
-/*-
- * The ndis_kspin_lock type is called KSPIN_LOCK in MS-Windows.
- * According to the Windows DDK header files, KSPIN_LOCK is defined like this:
- *	typedef ULONG_PTR KSPIN_LOCK;
- *
- * From basetsd.h (SDK, Feb. 2003):
- *	typedef [public] unsigned __int3264 ULONG_PTR, *PULONG_PTR;
- *	typedef unsigned __int64 ULONG_PTR, *PULONG_PTR;
- *	typedef _W64 unsigned long ULONG_PTR, *PULONG_PTR;
- *
- * The keyword __int3264 specifies an integral type that has the following
- * properties:
- *	+ It is 32-bit on 32-bit platforms
- *	+ It is 64-bit on 64-bit platforms
- *	+ It is 32-bit on the wire for backward compatibility.
- *	  It gets truncated on the sending side and extended appropriately
- *	  (signed or unsigned) on the receiving side.
- *
- * Thus register_t seems the proper mapping onto FreeBSD for spin locks.
- */
-
-typedef register_t kspin_lock;
-
-struct slist_entry {
-	struct slist_entry	*sl_next;
-};
-
-typedef struct slist_entry slist_entry;
-
-union slist_header {
-	uint64_t		slh_align;
-	struct {
-		struct slist_entry	*slh_next;
-		uint16_t		slh_depth;
-		uint16_t		slh_seq;
-	} slh_list;
-};
-
-typedef union slist_header slist_header;
-
-struct list_entry {
-	struct list_entry *nle_flink;
-	struct list_entry *nle_blink;
-};
-
-typedef struct list_entry list_entry;
-
-#define	InitializeListHead(l)			\
-	(l)->nle_flink = (l)->nle_blink = (l)
-
-#define	IsListEmpty(h)				\
-	((h)->nle_flink == (h))
-
-#define	RemoveEntryList(e)			\
-	do {					\
-		list_entry		*b;	\
-		list_entry		*f;	\
-						\
-		f = (e)->nle_flink;		\
-		b = (e)->nle_blink;		\
-		b->nle_flink = f;		\
-		f->nle_blink = b;		\
-	} while (0)
-
-/* These two have to be inlined since they return things. */
-
-static __inline__ list_entry *
-RemoveHeadList(list_entry *l)
-{
-	list_entry		*f;
-	list_entry		*e;
-
-	e = l->nle_flink;
-	f = e->nle_flink;
-	l->nle_flink = f;
-	f->nle_blink = l;
-
-	return (e);
-}
-
-static __inline__ list_entry *
-RemoveTailList(list_entry *l)
-{
-	list_entry		*b;
-	list_entry		*e;
-
-	e = l->nle_blink;
-	b = e->nle_blink;
-	l->nle_blink = b;
-	b->nle_flink = l;
-
-	return (e);
-}
-
-#define	InsertTailList(l, e)			\
-	do {					\
-		list_entry		*b;	\
-						\
-		b = l->nle_blink;		\
-		e->nle_flink = l;		\
-		e->nle_blink = b;		\
-		b->nle_flink = (e);		\
-		l->nle_blink = (e);		\
-	} while (0)
-
-#define	InsertHeadList(l, e)			\
-	do {					\
-		list_entry		*f;	\
-						\
-		f = l->nle_flink;		\
-		e->nle_flink = f;		\
-		e->nle_blink = l;		\
-		f->nle_blink = e;		\
-		l->nle_flink = e;		\
-	} while (0)
-
-#define	CONTAINING_RECORD(addr, type, field)	\
-	((type *)((vm_offset_t)(addr) - (vm_offset_t)(&((type *)0)->field)))
-
-struct nt_dispatch_header {
-	uint8_t			dh_type;
-	uint8_t			dh_abs;
-	uint8_t			dh_size;
-	uint8_t			dh_inserted;
-	int32_t			dh_sigstate;
-	list_entry		dh_waitlisthead;
-};
-
-typedef struct nt_dispatch_header nt_dispatch_header;
-
-/* Dispatcher object types */
-
-#define	DISP_TYPE_NOTIFICATION_EVENT	0	/* KEVENT */
-#define	DISP_TYPE_SYNCHRONIZATION_EVENT	1	/* KEVENT */
-#define	DISP_TYPE_MUTANT		2	/* KMUTANT/KMUTEX */
-#define	DISP_TYPE_PROCESS		3	/* KPROCESS */
-#define	DISP_TYPE_QUEUE			4	/* KQUEUE */
-#define	DISP_TYPE_SEMAPHORE		5	/* KSEMAPHORE */
-#define	DISP_TYPE_THREAD		6	/* KTHREAD */
-#define	DISP_TYPE_NOTIFICATION_TIMER	8	/* KTIMER */
-#define	DISP_TYPE_SYNCHRONIZATION_TIMER	9	/* KTIMER */
-
-#define	OTYPE_EVENT		0
-#define	OTYPE_MUTEX		1
-#define	OTYPE_THREAD		2
-#define	OTYPE_TIMER		3
-
-/* Windows dispatcher levels. */
-
-#define	PASSIVE_LEVEL		0
-#define	LOW_LEVEL		0
-#define	APC_LEVEL		1
-#define	DISPATCH_LEVEL		2
-#define	DEVICE_LEVEL		(DISPATCH_LEVEL + 1)
-#define	PROFILE_LEVEL		27
-#define	CLOCK1_LEVEL		28
-#define	CLOCK2_LEVEL		28
-#define	IPI_LEVEL		29
-#define	POWER_LEVEL		30
-#define	HIGH_LEVEL		31
-
-#define	SYNC_LEVEL_UP		DISPATCH_LEVEL
-#define	SYNC_LEVEL_MP		(IPI_LEVEL - 1)
-
-#define	AT_PASSIVE_LEVEL(td)		\
-	((td)->td_proc->p_flag & P_KPROC == FALSE)
-
-#define	AT_DISPATCH_LEVEL(td)		\
-	((td)->td_base_pri == PI_REALTIME)
-
-#define	AT_DIRQL_LEVEL(td)		\
-	((td)->td_priority <= PI_NET)
-
-#define	AT_HIGH_LEVEL(td)		\
-	((td)->td_critnest != 0)
-
-struct nt_objref {
-	nt_dispatch_header	no_dh;
-	void			*no_obj;
-	TAILQ_ENTRY(nt_objref)	link;
-};
-
-TAILQ_HEAD(nt_objref_head, nt_objref);
-
-typedef struct nt_objref nt_objref;
-
-#define	EVENT_TYPE_NOTIFY	0
-#define	EVENT_TYPE_SYNC		1
-
-struct ktimer {
-	nt_dispatch_header	k_header;
-	uint64_t		k_duetime;
-	union {
-		list_entry		k_timerlistentry;
-		struct callout		*k_callout;
-	} u;
-	void			*k_dpc;
-	uint32_t		k_period;
-};
-
-#define	k_timerlistentry	u.k_timerlistentry
-#define	k_callout		u.k_callout
-
-typedef struct ktimer ktimer;
-
-struct nt_kevent {
-	nt_dispatch_header	k_header;
-};
-
-typedef struct nt_kevent nt_kevent;
-
-/* Kernel defered procedure call (i.e. timer callback) */
-
-struct kdpc;
-typedef void (*kdpc_func)(struct kdpc *, void *, void *, void *);
-
-struct kdpc {
-	uint16_t		k_type;
-	uint8_t			k_num;		/* CPU number */
-	uint8_t			k_importance;	/* priority */
-	list_entry		k_dpclistentry;
-	void			*k_deferedfunc;
-	void			*k_deferredctx;
-	void			*k_sysarg1;
-	void			*k_sysarg2;
-	void			*k_lock;
-};
-
-#define	KDPC_IMPORTANCE_LOW	0
-#define	KDPC_IMPORTANCE_MEDIUM	1
-#define	KDPC_IMPORTANCE_HIGH	2
-
-#define	KDPC_CPU_DEFAULT	255
-
-typedef struct kdpc kdpc;
-
-/*
- * Note: the acquisition count is BSD-specific. The Microsoft
- * documentation says that mutexes can be acquired recursively
- * by a given thread, but that you must release the mutex as
- * many times as you acquired it before it will be set to the
- * signalled state (i.e. before any other threads waiting on
- * the object will be woken up). However the Windows KMUTANT
- * structure has no field for keeping track of the number of
- * acquisitions, so we need to add one ourselves. As long as
- * driver code treats the mutex as opaque, we should be ok.
- */
-struct kmutant {
-	nt_dispatch_header	km_header;
-	list_entry		km_listentry;
-	void			*km_ownerthread;
-	uint8_t			km_abandoned;
-	uint8_t			km_apcdisable;
-};
-
-typedef struct kmutant kmutant;
-
-#define	LOOKASIDE_DEPTH 256
-
-struct general_lookaside {
-	slist_header		gl_listhead;
-	uint16_t		gl_depth;
-	uint16_t		gl_maxdepth;
-	uint32_t		gl_totallocs;
-	union {
-		uint32_t		gl_allocmisses;
-		uint32_t		gl_allochits;
-	} u_a;
-	uint32_t		gl_totalfrees;
-	union {
-		uint32_t		gl_freemisses;
-		uint32_t		gl_freehits;
-	} u_m;
-	uint32_t		gl_type;
-	uint32_t		gl_tag;
-	uint32_t		gl_size;
-	void			*gl_allocfunc;
-	void			*gl_freefunc;
-	list_entry		gl_listent;
-	uint32_t		gl_lasttotallocs;
-	union {
-		uint32_t		gl_lastallocmisses;
-		uint32_t		gl_lastallochits;
-	} u_l;
-	uint32_t		gl_rsvd[2];
-};
-
-typedef struct general_lookaside general_lookaside;
-
-struct npaged_lookaside_list {
-	general_lookaside	nll_l;
-#ifdef __i386__
-	kspin_lock		nll_obsoletelock;
-#endif
-};
-
-typedef struct npaged_lookaside_list npaged_lookaside_list;
-typedef struct npaged_lookaside_list paged_lookaside_list;
-
-typedef void * (*lookaside_alloc_func)(uint32_t, size_t, uint32_t);
-typedef void (*lookaside_free_func)(void *);
-
-struct irp;
-
-struct kdevice_qentry {
-	list_entry		kqe_devlistent;
-	uint32_t		kqe_sortkey;
-	uint8_t			kqe_inserted;
-};
-
-typedef struct kdevice_qentry kdevice_qentry;
-
-struct kdevice_queue {
-	uint16_t		kq_type;
-	uint16_t		kq_size;
-	list_entry		kq_devlisthead;
-	kspin_lock		kq_lock;
-	uint8_t			kq_busy;
-};
-
-typedef struct kdevice_queue kdevice_queue;
-
-struct wait_ctx_block {
-	kdevice_qentry		wcb_waitqueue;
-	void			*wcb_devfunc;
-	void			*wcb_devctx;
-	uint32_t		wcb_mapregcnt;
-	void			*wcb_devobj;
-	void			*wcb_curirp;
-	void			*wcb_bufchaindpc;
-};
-
-typedef struct wait_ctx_block wait_ctx_block;
-
-struct wait_block {
-	list_entry		wb_waitlist;
-	void			*wb_kthread;
-	nt_dispatch_header	*wb_object;
-	struct wait_block	*wb_next;
-#ifdef notdef
-	uint16_t		wb_waitkey;
-	uint16_t		wb_waittype;
-#endif
-	uint8_t			wb_waitkey;
-	uint8_t			wb_waittype;
-	uint8_t			wb_awakened;
-	uint8_t			wb_oldpri;
-};
-
-typedef struct wait_block wait_block;
-
-#define	wb_ext wb_kthread
-
-#define	THREAD_WAIT_OBJECTS	3
-#define	MAX_WAIT_OBJECTS	64
-
-#define	WAITTYPE_ALL		0
-#define	WAITTYPE_ANY		1
-
-#define	WAITKEY_VALID		0x8000
-
-/* kthread priority  */
-#define	LOW_PRIORITY		0
-#define	LOW_REALTIME_PRIORITY	16
-#define	HIGH_PRIORITY		31
-
-struct thread_context {
-	void			*tc_thrctx;
-	void			*tc_thrfunc;
-};
-
-typedef struct thread_context thread_context;
-
-/* Forward declaration */
-struct driver_object;
-struct devobj_extension;
-
-struct driver_extension {
-	struct driver_object	*dre_driverobj;
-	void			*dre_adddevicefunc;
-	uint32_t		dre_reinitcnt;
-	unicode_string		dre_srvname;
-
-	/*
-	 * Drivers are allowed to add one or more custom extensions
-	 * to the driver object, but there's no special pointer
-	 * for them. Hang them off here for now.
-	 */
-
-	list_entry		dre_usrext;
-};
-
-typedef struct driver_extension driver_extension;
-
-struct custom_extension {
-	list_entry		ce_list;
-	void			*ce_clid;
-};
-
-typedef struct custom_extension custom_extension;
-
-/*
- * The KINTERRUPT structure in Windows is opaque to drivers.
- * We define our own custom version with things we need.
- */
-
-struct kinterrupt {
-	list_entry		ki_list;
-	device_t		ki_dev;
-	int			ki_rid;
-	void			*ki_cookie;
-	struct resource		*ki_irq;
-	kspin_lock		ki_lock_priv;
-	kspin_lock		*ki_lock;
-	void			*ki_svcfunc;
-	void			*ki_svcctx;
-};
-
-typedef struct kinterrupt kinterrupt;
-
-struct ksystem_time {
-	uint32_t	low_part;
-	int32_t		high1_time;
-	int32_t		high2_time;
-};
-
-enum nt_product_type {
-	NT_PRODUCT_WIN_NT = 1,
-	NT_PRODUCT_LAN_MAN_NT,
-	NT_PRODUCT_SERVER
-};
-
-enum alt_arch_type {
-	STANDARD_DESIGN,
-	NEC98x86,
-	END_ALTERNATIVES
-};
-
-struct kuser_shared_data {
-	uint32_t		tick_count;
-	uint32_t		tick_count_multiplier;
-	volatile struct		ksystem_time interrupt_time;
-	volatile struct		ksystem_time system_time;
-	volatile struct		ksystem_time time_zone_bias;
-	uint16_t		image_number_low;
-	uint16_t		image_number_high;
-	int16_t			nt_system_root[260];
-	uint32_t		max_stack_trace_depth;
-	uint32_t		crypto_exponent;
-	uint32_t		time_zone_id;
-	uint32_t		large_page_min;
-	uint32_t		reserved2[7];
-	enum nt_product_type	nt_product_type;
-	uint8_t			product_type_is_valid;
-	uint32_t		nt_major_version;
-	uint32_t		nt_minor_version;
-	uint8_t			processor_features[64];
-	uint32_t		reserved1;
-	uint32_t		reserved3;
-	volatile uint32_t	time_slip;
-	enum alt_arch_type	alt_arch_type;
-	int64_t			system_expiration_date;
-	uint32_t		suite_mask;
-	uint8_t			kdbg_enabled;
-	volatile uint32_t	active_console;
-	volatile uint32_t	dismount_count;
-	uint32_t		com_plus_package;
-	uint32_t		last_system_rit_event_tick_count;
-	uint32_t		num_phys_pages;
-	uint8_t			safe_boot_mode;
-	uint32_t		trace_log;
-	uint64_t		fill0;
-	uint64_t		sys_call[4];
-	union {
-		volatile struct	ksystem_time	tick_count;
-		volatile uint64_t		tick_count_quad;
-	} tick;
-};
-
-/*
- * In Windows, there are Physical Device Objects (PDOs) and
- * Functional Device Objects (FDOs). Physical Device Objects are
- * created and maintained by bus drivers. For example, the PCI
- * bus driver might detect two PCI ethernet cards on a given
- * bus. The PCI bus driver will then allocate two device_objects
- * for its own internal bookeeping purposes. This is analogous
- * to the device_t that the FreeBSD PCI code allocates and passes
- * into each PCI driver's probe and attach routines.
- *
- * When an ethernet driver claims one of the ethernet cards
- * on the bus, it will create its own device_object. This is
- * the Functional Device Object. This object is analogous to the
- * device-specific softc structure.
- */
-
-struct device_object {
-	uint16_t		do_type;
-	uint16_t		do_size;
-	uint32_t		do_refcnt;
-	struct driver_object	*do_drvobj;
-	struct device_object	*do_nextdev;
-	struct device_object	*do_attacheddev;
-	struct irp		*do_currirp;
-	void			*do_iotimer;
-	uint32_t		do_flags;
-	uint32_t		do_characteristics;
-	void			*do_vpb;
-	void			*do_devext;
-	uint32_t		do_devtype;
-	uint8_t			do_stacksize;
-	union {
-		list_entry		do_listent;
-		wait_ctx_block		do_wcb;
-	} queue;
-	uint32_t		do_alignreq;
-	kdevice_queue		do_devqueue;
-	struct kdpc		do_dpc;
-	uint32_t		do_activethreads;
-	void			*do_securitydesc;
-	struct nt_kevent	do_devlock;
-	uint16_t		do_sectorsz;
-	uint16_t		do_spare1;
-	struct devobj_extension	*do_devobj_ext;
-	void			*do_rsvd;
-};
-
-typedef struct device_object device_object;
-
-struct devobj_extension {
-	uint16_t		dve_type;
-	uint16_t		dve_size;
-	device_object		*dve_devobj;
-};
-
-typedef struct devobj_extension devobj_extension;
-
-/* Device object flags */
-
-#define	DO_VERIFY_VOLUME		0x00000002
-#define	DO_BUFFERED_IO			0x00000004
-#define	DO_EXCLUSIVE			0x00000008
-#define	DO_DIRECT_IO			0x00000010
-#define	DO_MAP_IO_BUFFER		0x00000020
-#define	DO_DEVICE_HAS_NAME		0x00000040
-#define	DO_DEVICE_INITIALIZING		0x00000080
-#define	DO_SYSTEM_BOOT_PARTITION	0x00000100
-#define	DO_LONG_TERM_REQUESTS		0x00000200
-#define	DO_NEVER_LAST_DEVICE		0x00000400
-#define	DO_SHUTDOWN_REGISTERED		0x00000800
-#define	DO_BUS_ENUMERATED_DEVICE	0x00001000
-#define	DO_POWER_PAGABLE		0x00002000
-#define	DO_POWER_INRUSH			0x00004000
-#define	DO_LOW_PRIORITY_FILESYSTEM	0x00010000
-
-/* Priority boosts */
-
-#define	IO_NO_INCREMENT			0
-#define	IO_CD_ROM_INCREMENT		1
-#define	IO_DISK_INCREMENT		1
-#define	IO_KEYBOARD_INCREMENT		6
-#define	IO_MAILSLOT_INCREMENT		2
-#define	IO_MOUSE_INCREMENT		6
-#define	IO_NAMED_PIPE_INCREMENT		2
-#define	IO_NETWORK_INCREMENT		2
-#define	IO_PARALLEL_INCREMENT		1
-#define	IO_SERIAL_INCREMENT		2
-#define	IO_SOUND_INCREMENT		8
-#define	IO_VIDEO_INCREMENT		1
-
-/* IRP major codes */
-
-#define	IRP_MJ_CREATE                   0x00
-#define	IRP_MJ_CREATE_NAMED_PIPE        0x01
-#define	IRP_MJ_CLOSE                    0x02
-#define	IRP_MJ_READ                     0x03
-#define	IRP_MJ_WRITE                    0x04
-#define	IRP_MJ_QUERY_INFORMATION        0x05
-#define	IRP_MJ_SET_INFORMATION          0x06
-#define	IRP_MJ_QUERY_EA                 0x07
-#define	IRP_MJ_SET_EA                   0x08
-#define	IRP_MJ_FLUSH_BUFFERS            0x09
-#define	IRP_MJ_QUERY_VOLUME_INFORMATION 0x0a
-#define	IRP_MJ_SET_VOLUME_INFORMATION   0x0b
-#define	IRP_MJ_DIRECTORY_CONTROL        0x0c
-#define	IRP_MJ_FILE_SYSTEM_CONTROL      0x0d
-#define	IRP_MJ_DEVICE_CONTROL           0x0e
-#define	IRP_MJ_INTERNAL_DEVICE_CONTROL  0x0f
-#define	IRP_MJ_SHUTDOWN                 0x10
-#define	IRP_MJ_LOCK_CONTROL             0x11
-#define	IRP_MJ_CLEANUP                  0x12
-#define	IRP_MJ_CREATE_MAILSLOT          0x13
-#define	IRP_MJ_QUERY_SECURITY           0x14
-#define	IRP_MJ_SET_SECURITY             0x15
-#define	IRP_MJ_POWER                    0x16
-#define	IRP_MJ_SYSTEM_CONTROL           0x17
-#define	IRP_MJ_DEVICE_CHANGE            0x18
-#define	IRP_MJ_QUERY_QUOTA              0x19
-#define	IRP_MJ_SET_QUOTA                0x1a
-#define	IRP_MJ_PNP                      0x1b
-#define	IRP_MJ_PNP_POWER                IRP_MJ_PNP      // Obsolete....
-#define	IRP_MJ_MAXIMUM_FUNCTION         0x1b
-#define	IRP_MJ_SCSI                     IRP_MJ_INTERNAL_DEVICE_CONTROL
-
-/* IRP minor codes */
-
-#define	IRP_MN_QUERY_DIRECTORY          0x01
-#define	IRP_MN_NOTIFY_CHANGE_DIRECTORY  0x02
-#define	IRP_MN_USER_FS_REQUEST          0x00
-
-#define	IRP_MN_MOUNT_VOLUME             0x01
-#define	IRP_MN_VERIFY_VOLUME            0x02
-#define	IRP_MN_LOAD_FILE_SYSTEM         0x03
-#define	IRP_MN_TRACK_LINK               0x04
-#define	IRP_MN_KERNEL_CALL              0x04
-
-#define	IRP_MN_LOCK                     0x01
-#define	IRP_MN_UNLOCK_SINGLE            0x02
-#define	IRP_MN_UNLOCK_ALL               0x03
-#define	IRP_MN_UNLOCK_ALL_BY_KEY        0x04
-
-#define	IRP_MN_NORMAL                   0x00
-#define	IRP_MN_DPC                      0x01
-#define	IRP_MN_MDL                      0x02
-#define	IRP_MN_COMPLETE                 0x04
-#define	IRP_MN_COMPRESSED               0x08
-
-#define	IRP_MN_MDL_DPC                  (IRP_MN_MDL | IRP_MN_DPC)
-#define	IRP_MN_COMPLETE_MDL             (IRP_MN_COMPLETE | IRP_MN_MDL)
-#define	IRP_MN_COMPLETE_MDL_DPC         (IRP_MN_COMPLETE_MDL | IRP_MN_DPC)
-
-#define	IRP_MN_SCSI_CLASS               0x01
-
-#define	IRP_MN_START_DEVICE                 0x00
-#define	IRP_MN_QUERY_REMOVE_DEVICE          0x01
-#define	IRP_MN_REMOVE_DEVICE                0x02
-#define	IRP_MN_CANCEL_REMOVE_DEVICE         0x03
-#define	IRP_MN_STOP_DEVICE                  0x04
-#define	IRP_MN_QUERY_STOP_DEVICE            0x05
-#define	IRP_MN_CANCEL_STOP_DEVICE           0x06
-
-#define	IRP_MN_QUERY_DEVICE_RELATIONS       0x07
-#define	IRP_MN_QUERY_INTERFACE              0x08
-#define	IRP_MN_QUERY_CAPABILITIES           0x09
-#define	IRP_MN_QUERY_RESOURCES              0x0A
-#define	IRP_MN_QUERY_RESOURCE_REQUIREMENTS  0x0B
-#define	IRP_MN_QUERY_DEVICE_TEXT            0x0C
-#define	IRP_MN_FILTER_RESOURCE_REQUIREMENTS 0x0D
-
-#define	IRP_MN_READ_CONFIG                  0x0F
-#define	IRP_MN_WRITE_CONFIG                 0x10
-#define	IRP_MN_EJECT                        0x11
-#define	IRP_MN_SET_LOCK                     0x12
-#define	IRP_MN_QUERY_ID                     0x13
-#define	IRP_MN_QUERY_PNP_DEVICE_STATE       0x14
-#define	IRP_MN_QUERY_BUS_INFORMATION        0x15
-#define	IRP_MN_DEVICE_USAGE_NOTIFICATION    0x16
-#define	IRP_MN_SURPRISE_REMOVAL             0x17
-#define	IRP_MN_QUERY_LEGACY_BUS_INFORMATION 0x18
-
-#define	IRP_MN_WAIT_WAKE                    0x00
-#define	IRP_MN_POWER_SEQUENCE               0x01
-#define	IRP_MN_SET_POWER                    0x02
-#define	IRP_MN_QUERY_POWER                  0x03
-
-#define	IRP_MN_QUERY_ALL_DATA               0x00
-#define	IRP_MN_QUERY_SINGLE_INSTANCE        0x01
-#define	IRP_MN_CHANGE_SINGLE_INSTANCE       0x02
-#define	IRP_MN_CHANGE_SINGLE_ITEM           0x03
-#define	IRP_MN_ENABLE_EVENTS                0x04
-#define	IRP_MN_DISABLE_EVENTS               0x05
-#define	IRP_MN_ENABLE_COLLECTION            0x06
-#define	IRP_MN_DISABLE_COLLECTION           0x07
-#define	IRP_MN_REGINFO                      0x08
-#define	IRP_MN_EXECUTE_METHOD               0x09
-#define	IRP_MN_REGINFO_EX                   0x0b
-
-/* IRP flags */
-
-#define	IRP_NOCACHE                     0x00000001
-#define	IRP_PAGING_IO                   0x00000002
-#define	IRP_MOUNT_COMPLETION            0x00000002
-#define	IRP_SYNCHRONOUS_API             0x00000004
-#define	IRP_ASSOCIATED_IRP              0x00000008
-#define	IRP_BUFFERED_IO                 0x00000010
-#define	IRP_DEALLOCATE_BUFFER           0x00000020
-#define	IRP_INPUT_OPERATION             0x00000040
-#define	IRP_SYNCHRONOUS_PAGING_IO       0x00000040
-#define	IRP_CREATE_OPERATION            0x00000080
-#define	IRP_READ_OPERATION              0x00000100
-#define	IRP_WRITE_OPERATION             0x00000200
-#define	IRP_CLOSE_OPERATION             0x00000400
-#define	IRP_DEFER_IO_COMPLETION         0x00000800
-#define	IRP_OB_QUERY_NAME               0x00001000
-#define	IRP_HOLD_DEVICE_QUEUE           0x00002000
-#define	IRP_RETRY_IO_COMPLETION         0x00004000
-#define	IRP_CLASS_CACHE_OPERATION       0x00008000
-#define	IRP_SET_USER_EVENT              IRP_CLOSE_OPERATION
-
-/* IRP I/O control flags */
-
-#define	IRP_QUOTA_CHARGED               0x01
-#define	IRP_ALLOCATED_MUST_SUCCEED      0x02
-#define	IRP_ALLOCATED_FIXED_SIZE        0x04
-#define	IRP_LOOKASIDE_ALLOCATION        0x08
-
-/* I/O method types */
-
-#define	METHOD_BUFFERED			0
-#define	METHOD_IN_DIRECT		1
-#define	METHOD_OUT_DIRECT		2
-#define	METHOD_NEITHER			3
-
-/* File access types */
-
-#define	FILE_ANY_ACCESS			0x0000
-#define	FILE_SPECIAL_ACCESS		FILE_ANY_ACCESS
-#define	FILE_READ_ACCESS		0x0001
-#define	FILE_WRITE_ACCESS		0x0002
-
-/* Recover I/O access method from IOCTL code. */
-
-#define	IO_METHOD(x)			((x) & 0xFFFFFFFC)
-
-/* Recover function code from IOCTL code */
-
-#define	IO_FUNC(x)			(((x) & 0x7FFC) >> 2)
-
-/* Macro to construct an IOCTL code. */
-
-#define	IOCTL_CODE(dev, func, iomethod, acc)	\
-	((dev) << 16) | (acc << 14) | (func << 2) | (iomethod))
-
-struct io_status_block {
-	union {
-		uint32_t		isb_status;
-		void			*isb_ptr;
-	} u;
-	register_t		isb_info;
-};
-#define	isb_status		u.isb_status
-#define	isb_ptr			u.isb_ptr
-
-typedef struct io_status_block io_status_block;
-
-struct kapc {
-	uint16_t		apc_type;
-	uint16_t		apc_size;
-	uint32_t		apc_spare0;
-	void			*apc_thread;
-	list_entry		apc_list;
-	void			*apc_kernfunc;
-	void			*apc_rundownfunc;
-	void			*apc_normalfunc;
-	void			*apc_normctx;
-	void			*apc_sysarg1;
-	void			*apc_sysarg2;
-	uint8_t			apc_stateidx;
-	uint8_t			apc_cpumode;
-	uint8_t			apc_inserted;
-};
-
-typedef struct kapc kapc;
-
-typedef uint32_t (*completion_func)(device_object *,
-	struct irp *, void *);
-typedef uint32_t (*cancel_func)(device_object *,
-	struct irp *);
-
-struct io_stack_location {
-	uint8_t			isl_major;
-	uint8_t			isl_minor;
-	uint8_t			isl_flags;
-	uint8_t			isl_ctl;
-
-	/*
-	 * There's a big-ass union here in the actual Windows
-	 * definition of the structure, but it contains stuff
-	 * that doesn't really apply to BSD, and defining it
-	 * all properly would require duplicating over a dozen
-	 * other structures that we'll never use. Since the
-	 * io_stack_location structure is opaque to drivers
-	 * anyway, I'm not going to bother with the extra crap.
-	 */
-
-	union {
-		struct {
-			uint32_t		isl_len;
-			uint32_t		*isl_key;
-			uint64_t		isl_byteoff;
-		} isl_read;
-		struct {
-			uint32_t		isl_len;
-			uint32_t		*isl_key;
-			uint64_t		isl_byteoff;
-		} isl_write;
-		struct {
-			uint32_t		isl_obuflen;
-			uint32_t		isl_ibuflen;
-			uint32_t		isl_iocode;
-			void			*isl_type3ibuf;
-		} isl_ioctl;
-		struct {
-			void			*isl_arg1;
-			void			*isl_arg2;
-			void			*isl_arg3;
-			void			*isl_arg4;
-		} isl_others;
-	} isl_parameters __attribute__((packed));
-
-	void			*isl_devobj;
-	void			*isl_fileobj;
-	completion_func		isl_completionfunc;
-	void			*isl_completionctx;
-};
-
-typedef struct io_stack_location io_stack_location;
-
-/* Stack location control flags */
-
-#define	SL_PENDING_RETURNED		0x01
-#define	SL_INVOKE_ON_CANCEL		0x20
-#define	SL_INVOKE_ON_SUCCESS		0x40
-#define	SL_INVOKE_ON_ERROR		0x80
-
-struct irp {
-	uint16_t		irp_type;
-	uint16_t		irp_size;
-	mdl			*irp_mdl;
-	uint32_t		irp_flags;
-	union {
-		struct irp		*irp_master;
-		uint32_t		irp_irpcnt;
-		void			*irp_sysbuf;
-	} irp_assoc;
-	list_entry		irp_thlist;
-	io_status_block		irp_iostat;
-	uint8_t			irp_reqmode;
-	uint8_t			irp_pendingreturned;
-	uint8_t			irp_stackcnt;
-	uint8_t			irp_currentstackloc;
-	uint8_t			irp_cancel;
-	uint8_t			irp_cancelirql;
-	uint8_t			irp_apcenv;
-	uint8_t			irp_allocflags;
-	io_status_block		*irp_usriostat;
-	nt_kevent		*irp_usrevent;
-	union {
-		struct {
-			void			*irp_apcfunc;
-			void			*irp_apcctx;
-		} irp_asyncparms;
-		uint64_t			irp_allocsz;
-	} irp_overlay;
-	cancel_func		irp_cancelfunc;
-	void			*irp_userbuf;
-
-	/* Windows kernel info */
-
-	union {
-		struct {
-			union {
-				kdevice_qentry			irp_dqe;
-				struct {
-					void			*irp_drvctx[4];
-				} s1;
-			} u1;
-			void			*irp_thread;
-			char			*irp_auxbuf;
-			struct {
-				list_entry			irp_list;
-				union {
-					io_stack_location	*irp_csl;
-					uint32_t		irp_pkttype;
-				} u2;
-			} s2;
-			void			*irp_fileobj;
-		} irp_overlay;
-		union {
-			kapc			irp_apc;
-			struct {
-				void		*irp_ep;
-				void		*irp_dev;
-			} irp_usb;
-		} irp_misc;
-		void			*irp_compkey;
-	} irp_tail;
-};
-
-#define	irp_csl			s2.u2.irp_csl
-#define	irp_pkttype		s2.u2.irp_pkttype
-
-#define	IRP_NDIS_DEV(irp)	(irp)->irp_tail.irp_misc.irp_usb.irp_dev
-#define	IRP_NDISUSB_EP(irp)	(irp)->irp_tail.irp_misc.irp_usb.irp_ep
-
-typedef struct irp irp;
-
-#define	InterlockedExchangePointer(dst, val)				\
-	(void *)InterlockedExchange((uint32_t *)(dst), (uintptr_t)(val))
-
-#define	IoSizeOfIrp(ssize)						\
-	((uint16_t) (sizeof(irp) + ((ssize) * (sizeof(io_stack_location)))))
-
-#define	IoSetCancelRoutine(irp, func)					\
-	(cancel_func)InterlockedExchangePointer(			\
-	(void *)&(ip)->irp_cancelfunc, (void *)(func))
-
-#define	IoSetCancelValue(irp, val)					\
-	(u_long)InterlockedExchangePointer(				\
-	(void *)&(ip)->irp_cancel, (void *)(val))
-
-#define	IoGetCurrentIrpStackLocation(irp)				\
-	(irp)->irp_tail.irp_overlay.irp_csl
-
-#define	IoGetNextIrpStackLocation(irp)					\
-	((irp)->irp_tail.irp_overlay.irp_csl - 1)
-
-#define	IoSetNextIrpStackLocation(irp)					\
-	do {								\
-		irp->irp_currentstackloc--;				\
-		irp->irp_tail.irp_overlay.irp_csl--;			\
-	} while(0)
-
-#define	IoSetCompletionRoutine(irp, func, ctx, ok, err, cancel)		\
-	do {								\
-		io_stack_location		*s;			\
-		s = IoGetNextIrpStackLocation((irp));			\
-		s->isl_completionfunc = (func);				\
-		s->isl_completionctx = (ctx);				\
-		s->isl_ctl = 0;						\
-		if (ok) s->isl_ctl = SL_INVOKE_ON_SUCCESS;		\
-		if (err) s->isl_ctl |= SL_INVOKE_ON_ERROR;		\
-		if (cancel) s->isl_ctl |= SL_INVOKE_ON_CANCEL;		\
-	} while(0)
-
-#define	IoMarkIrpPending(irp)						\
-	IoGetCurrentIrpStackLocation(irp)->isl_ctl |= SL_PENDING_RETURNED
-#define	IoUnmarkIrpPending(irp)						\
-	IoGetCurrentIrpStackLocation(irp)->isl_ctl &= ~SL_PENDING_RETURNED
-
-#define	IoCopyCurrentIrpStackLocationToNext(irp)			\
-	do {								\
-		io_stack_location *src, *dst;				\
-		src = IoGetCurrentIrpStackLocation(irp);		\
-		dst = IoGetNextIrpStackLocation(irp);			\
-		bcopy((char *)src, (char *)dst,				\
-		    offsetof(io_stack_location, isl_completionfunc));	\
-	} while(0)
-
-#define	IoSkipCurrentIrpStackLocation(irp)				\
-	do {								\
-		(irp)->irp_currentstackloc++;				\
-		(irp)->irp_tail.irp_overlay.irp_csl++;			\
-	} while(0)
-
-#define	IoInitializeDpcRequest(dobj, dpcfunc)				\
-	KeInitializeDpc(&(dobj)->do_dpc, dpcfunc, dobj)
-
-#define	IoRequestDpc(dobj, irp, ctx)					\
-	KeInsertQueueDpc(&(dobj)->do_dpc, irp, ctx)
-
-typedef uint32_t (*driver_dispatch)(device_object *, irp *);
-
-/*
- * The driver_object is allocated once for each driver that's loaded
- * into the system. A new one is allocated for each driver and
- * populated a bit via the driver's DriverEntry function.
- * In general, a Windows DriverEntry() function will provide a pointer
- * to its AddDevice() method and set up the dispatch table.
- * For NDIS drivers, this is all done behind the scenes in the
- * NdisInitializeWrapper() and/or NdisMRegisterMiniport() routines.
- */
-
-struct driver_object {
-	uint16_t		dro_type;
-	uint16_t		dro_size;
-	device_object		*dro_devobj;
-	uint32_t		dro_flags;
-	void			*dro_driverstart;
-	uint32_t		dro_driversize;
-	void			*dro_driversection;
-	driver_extension	*dro_driverext;
-	unicode_string		dro_drivername;
-	unicode_string		*dro_hwdb;
-	void			*dro_pfastiodispatch;
-	void			*dro_driverinitfunc;
-	void			*dro_driverstartiofunc;
-	void			*dro_driverunloadfunc;
-	driver_dispatch		dro_dispatch[IRP_MJ_MAXIMUM_FUNCTION + 1];
-};
-
-typedef struct driver_object driver_object;
-
-#define	DEVPROP_DEVICE_DESCRIPTION	0x00000000
-#define	DEVPROP_HARDWARE_ID		0x00000001
-#define	DEVPROP_COMPATIBLE_IDS		0x00000002
-#define	DEVPROP_BOOTCONF		0x00000003
-#define	DEVPROP_BOOTCONF_TRANSLATED	0x00000004
-#define	DEVPROP_CLASS_NAME		0x00000005
-#define	DEVPROP_CLASS_GUID		0x00000006
-#define	DEVPROP_DRIVER_KEYNAME		0x00000007
-#define	DEVPROP_MANUFACTURER		0x00000008
-#define	DEVPROP_FRIENDLYNAME		0x00000009
-#define	DEVPROP_LOCATION_INFO		0x0000000A
-#define	DEVPROP_PHYSDEV_NAME		0x0000000B
-#define	DEVPROP_BUSTYPE_GUID		0x0000000C
-#define	DEVPROP_LEGACY_BUSTYPE		0x0000000D
-#define	DEVPROP_BUS_NUMBER		0x0000000E
-#define	DEVPROP_ENUMERATOR_NAME		0x0000000F
-#define	DEVPROP_ADDRESS			0x00000010
-#define	DEVPROP_UINUMBER		0x00000011
-#define	DEVPROP_INSTALL_STATE		0x00000012
-#define	DEVPROP_REMOVAL_POLICY		0x00000013
-
-/* Various supported device types (used with IoCreateDevice()) */
-
-#define	FILE_DEVICE_BEEP		0x00000001
-#define	FILE_DEVICE_CD_ROM		0x00000002
-#define	FILE_DEVICE_CD_ROM_FILE_SYSTEM	0x00000003
-#define	FILE_DEVICE_CONTROLLER		0x00000004
-#define	FILE_DEVICE_DATALINK		0x00000005
-#define	FILE_DEVICE_DFS			0x00000006
-#define	FILE_DEVICE_DISK		0x00000007
-#define	FILE_DEVICE_DISK_FILE_SYSTEM	0x00000008
-#define	FILE_DEVICE_FILE_SYSTEM		0x00000009
-#define	FILE_DEVICE_INPORT_PORT		0x0000000A
-#define	FILE_DEVICE_KEYBOARD		0x0000000B
-#define	FILE_DEVICE_MAILSLOT		0x0000000C
-#define	FILE_DEVICE_MIDI_IN		0x0000000D
-#define	FILE_DEVICE_MIDI_OUT		0x0000000E
-#define	FILE_DEVICE_MOUSE		0x0000000F
-#define	FILE_DEVICE_MULTI_UNC_PROVIDER	0x00000010
-#define	FILE_DEVICE_NAMED_PIPE		0x00000011
-#define	FILE_DEVICE_NETWORK		0x00000012
-#define	FILE_DEVICE_NETWORK_BROWSER	0x00000013
-#define	FILE_DEVICE_NETWORK_FILE_SYSTEM	0x00000014
-#define	FILE_DEVICE_NULL		0x00000015
-#define	FILE_DEVICE_PARALLEL_PORT	0x00000016
-#define	FILE_DEVICE_PHYSICAL_NETCARD	0x00000017
-#define	FILE_DEVICE_PRINTER		0x00000018
-#define	FILE_DEVICE_SCANNER		0x00000019
-#define	FILE_DEVICE_SERIAL_MOUSE_PORT	0x0000001A
-#define	FILE_DEVICE_SERIAL_PORT		0x0000001B
-#define	FILE_DEVICE_SCREEN		0x0000001C
-#define	FILE_DEVICE_SOUND		0x0000001D
-#define	FILE_DEVICE_STREAMS		0x0000001E
-#define	FILE_DEVICE_TAPE		0x0000001F
-#define	FILE_DEVICE_TAPE_FILE_SYSTEM	0x00000020
-#define	FILE_DEVICE_TRANSPORT		0x00000021
-#define	FILE_DEVICE_UNKNOWN		0x00000022
-#define	FILE_DEVICE_VIDEO		0x00000023
-#define	FILE_DEVICE_VIRTUAL_DISK	0x00000024
-#define	FILE_DEVICE_WAVE_IN		0x00000025
-#define	FILE_DEVICE_WAVE_OUT		0x00000026
-#define	FILE_DEVICE_8042_PORT		0x00000027
-#define	FILE_DEVICE_NETWORK_REDIRECTOR	0x00000028
-#define	FILE_DEVICE_BATTERY		0x00000029
-#define	FILE_DEVICE_BUS_EXTENDER	0x0000002A
-#define	FILE_DEVICE_MODEM		0x0000002B
-#define	FILE_DEVICE_VDM			0x0000002C
-#define	FILE_DEVICE_MASS_STORAGE	0x0000002D
-#define	FILE_DEVICE_SMB			0x0000002E
-#define	FILE_DEVICE_KS			0x0000002F
-#define	FILE_DEVICE_CHANGER		0x00000030
-#define	FILE_DEVICE_SMARTCARD		0x00000031
-#define	FILE_DEVICE_ACPI		0x00000032
-#define	FILE_DEVICE_DVD			0x00000033
-#define	FILE_DEVICE_FULLSCREEN_VIDEO	0x00000034
-#define	FILE_DEVICE_DFS_FILE_SYSTEM	0x00000035
-#define	FILE_DEVICE_DFS_VOLUME		0x00000036
-#define	FILE_DEVICE_SERENUM		0x00000037
-#define	FILE_DEVICE_TERMSRV		0x00000038
-#define	FILE_DEVICE_KSEC		0x00000039
-#define	FILE_DEVICE_FIPS		0x0000003A
-
-/* Device characteristics */
-
-#define	FILE_REMOVABLE_MEDIA		0x00000001
-#define	FILE_READ_ONLY_DEVICE		0x00000002
-#define	FILE_FLOPPY_DISKETTE		0x00000004
-#define	FILE_WRITE_ONCE_MEDIA		0x00000008
-#define	FILE_REMOTE_DEVICE		0x00000010
-#define	FILE_DEVICE_IS_MOUNTED		0x00000020
-#define	FILE_VIRTUAL_VOLUME		0x00000040
-#define	FILE_AUTOGENERATED_DEVICE_NAME	0x00000080
-#define	FILE_DEVICE_SECURE_OPEN		0x00000100
-
-/* Status codes */
-
-#define	STATUS_SUCCESS			0x00000000
-#define	STATUS_USER_APC			0x000000C0
-#define	STATUS_KERNEL_APC		0x00000100
-#define	STATUS_ALERTED			0x00000101
-#define	STATUS_TIMEOUT			0x00000102
-#define	STATUS_PENDING			0x00000103
-#define	STATUS_FAILURE			0xC0000001
-#define	STATUS_NOT_IMPLEMENTED		0xC0000002
-#define	STATUS_ACCESS_VIOLATION		0xC0000005
-#define	STATUS_INVALID_PARAMETER	0xC000000D
-#define	STATUS_INVALID_DEVICE_REQUEST	0xC0000010
-#define	STATUS_MORE_PROCESSING_REQUIRED	0xC0000016
-#define	STATUS_NO_MEMORY		0xC0000017
-#define	STATUS_BUFFER_TOO_SMALL		0xC0000023
-#define	STATUS_MUTANT_NOT_OWNED		0xC0000046
-#define	STATUS_NOT_SUPPORTED		0xC00000BB
-#define	STATUS_INVALID_PARAMETER_2	0xC00000F0
-#define	STATUS_INSUFFICIENT_RESOURCES	0xC000009A
-#define	STATUS_DEVICE_NOT_CONNECTED	0xC000009D
-#define	STATUS_CANCELLED		0xC0000120
-#define	STATUS_NOT_FOUND		0xC0000225
-#define	STATUS_DEVICE_REMOVED		0xC00002B6
-
-#define	STATUS_WAIT_0			0x00000000
-
-/* Memory pool types, for ExAllocatePoolWithTag() */
-
-#define	NonPagedPool			0x00000000
-#define	PagedPool			0x00000001
-#define	NonPagedPoolMustSucceed		0x00000002
-#define	DontUseThisType			0x00000003
-#define	NonPagedPoolCacheAligned	0x00000004
-#define	PagedPoolCacheAligned		0x00000005
-#define	NonPagedPoolCacheAlignedMustS	0x00000006
-#define	MaxPoolType			0x00000007
-
-/*
- * IO_WORKITEM is an opaque structures that must be allocated
- * via IoAllocateWorkItem() and released via IoFreeWorkItem().
- * Consequently, we can define it any way we want.
- */
-typedef void (*io_workitem_func)(device_object *, void *);
-
-struct io_workitem {
-	io_workitem_func	iw_func;
-	void			*iw_ctx;
-	list_entry		iw_listentry;
-	device_object		*iw_dobj;
-	int			iw_idx;
-};
-
-typedef struct io_workitem io_workitem;
-
-#define	WORKQUEUE_CRITICAL	0
-#define	WORKQUEUE_DELAYED	1
-#define	WORKQUEUE_HYPERCRITICAL	2
-
-#define	WORKITEM_THREADS	4
-#define	WORKITEM_LEGACY_THREAD	3
-#define	WORKIDX_INC(x)		(x) = (x + 1) % WORKITEM_LEGACY_THREAD
-
-/*
- * Older, deprecated work item API, needed to support NdisQueueWorkItem().
- */
-
-struct work_queue_item;
-
-typedef void (*work_item_func)(struct work_queue_item *, void *);
-
-struct work_queue_item {
-	list_entry		wqi_entry;
-	work_item_func		wqi_func;
-	void			*wqi_ctx;
-};
-
-typedef struct work_queue_item work_queue_item;
-
-#define	ExInitializeWorkItem(w, func, ctx)		\
-	do {						\
-		(w)->wqi_func = (func);			\
-		(w)->wqi_ctx = (ctx);			\
-		InitializeListHead(&((w)->wqi_entry));	\
-	} while (0)
-
-/*
- * FreeBSD's kernel stack is 2 pages in size by default. The
- * Windows stack is larger, so we need to give our threads more
- * stack pages. 4 should be enough, we use 8 just to extra safe.
- */
-#define	NDIS_KSTACK_PAGES	8
-
-/*
- * Different kinds of function wrapping we can do.
- */
-
-#define	WINDRV_WRAP_STDCALL	1
-#define	WINDRV_WRAP_FASTCALL	2
-#define	WINDRV_WRAP_REGPARM	3
-#define	WINDRV_WRAP_CDECL	4
-#define	WINDRV_WRAP_AMD64	5
-
-struct drvdb_ent {
-	driver_object		*windrv_object;
-	void			*windrv_devlist;
-	ndis_cfg		*windrv_regvals;
-	interface_type		windrv_bustype;
-	STAILQ_ENTRY(drvdb_ent) link;
-};
-
-extern image_patch_table ntoskrnl_functbl[];
-#ifdef __amd64__
-extern struct kuser_shared_data kuser_shared_data;
-#endif
-typedef void (*funcptr)(void);
-typedef int (*matchfuncptr)(interface_type, void *, void *);
-
-__BEGIN_DECLS
-extern int windrv_libinit(void);
-extern int windrv_libfini(void);
-extern driver_object *windrv_lookup(vm_offset_t, char *);
-extern struct drvdb_ent *windrv_match(matchfuncptr, void *);
-extern int windrv_load(module_t, vm_offset_t, int, interface_type,
-	void *, ndis_cfg *);
-extern int windrv_unload(module_t, vm_offset_t, int);
-extern int windrv_create_pdo(driver_object *, device_t);
-extern void windrv_destroy_pdo(driver_object *, device_t);
-extern device_object *windrv_find_pdo(driver_object *, device_t);
-extern int windrv_bus_attach(driver_object *, char *);
-extern int windrv_wrap(funcptr, funcptr *, int, int);
-extern int windrv_unwrap(funcptr);
-extern void ctxsw_utow(void);
-extern void ctxsw_wtou(void);
-
-extern int ntoskrnl_libinit(void);
-extern int ntoskrnl_libfini(void);
-
-extern void ntoskrnl_intr(void *);
-extern void ntoskrnl_time(uint64_t *);
-
-extern uint16_t ExQueryDepthSList(slist_header *);
-extern slist_entry
-	*InterlockedPushEntrySList(slist_header *, slist_entry *);
-extern slist_entry *InterlockedPopEntrySList(slist_header *);
-extern uint32_t RtlUnicodeStringToAnsiString(ansi_string *,
-	unicode_string *, uint8_t);
-extern uint32_t RtlAnsiStringToUnicodeString(unicode_string *,
-	ansi_string *, uint8_t);
-extern void RtlInitAnsiString(ansi_string *, char *);
-extern void RtlInitUnicodeString(unicode_string *,
-	uint16_t *);
-extern void RtlFreeUnicodeString(unicode_string *);
-extern void RtlFreeAnsiString(ansi_string *);
-extern void KeInitializeDpc(kdpc *, void *, void *);
-extern uint8_t KeInsertQueueDpc(kdpc *, void *, void *);
-extern uint8_t KeRemoveQueueDpc(kdpc *);
-extern void KeSetImportanceDpc(kdpc *, uint32_t);
-extern void KeSetTargetProcessorDpc(kdpc *, uint8_t);
-extern void KeFlushQueuedDpcs(void);
-extern uint32_t KeGetCurrentProcessorNumber(void);
-extern void KeInitializeTimer(ktimer *);
-extern void KeInitializeTimerEx(ktimer *, uint32_t);
-extern uint8_t KeSetTimer(ktimer *, int64_t, kdpc *);
-extern uint8_t KeSetTimerEx(ktimer *, int64_t, uint32_t, kdpc *);
-extern uint8_t KeCancelTimer(ktimer *);
-extern uint8_t KeReadStateTimer(ktimer *);
-extern uint32_t KeWaitForSingleObject(void *, uint32_t,
-	uint32_t, uint8_t, int64_t *);
-extern void KeInitializeEvent(nt_kevent *, uint32_t, uint8_t);
-extern void KeClearEvent(nt_kevent *);
-extern uint32_t KeReadStateEvent(nt_kevent *);
-extern uint32_t KeSetEvent(nt_kevent *, uint32_t, uint8_t);
-extern uint32_t KeResetEvent(nt_kevent *);
-#ifdef __i386__
-extern void KefAcquireSpinLockAtDpcLevel(kspin_lock *);
-extern void KefReleaseSpinLockFromDpcLevel(kspin_lock *);
-extern uint8_t KeAcquireSpinLockRaiseToDpc(kspin_lock *);
-#else
-extern void KeAcquireSpinLockAtDpcLevel(kspin_lock *);
-extern void KeReleaseSpinLockFromDpcLevel(kspin_lock *);
-#endif
-extern void KeInitializeSpinLock(kspin_lock *);
-extern uint8_t KeAcquireInterruptSpinLock(kinterrupt *);
-extern void KeReleaseInterruptSpinLock(kinterrupt *, uint8_t);
-extern uint8_t KeSynchronizeExecution(kinterrupt *, void *, void *);
-extern uintptr_t InterlockedExchange(volatile uint32_t *,
-	uintptr_t);
-extern void *ExAllocatePoolWithTag(uint32_t, size_t, uint32_t);
-extern void ExFreePool(void *);
-extern uint32_t IoConnectInterrupt(kinterrupt **, void *, void *,
-	kspin_lock *, uint32_t, uint8_t, uint8_t, uint8_t, uint8_t,
-	uint32_t, uint8_t);
-extern uint8_t MmIsAddressValid(void *);
-extern void *MmGetSystemRoutineAddress(unicode_string *);
-extern void *MmMapIoSpace(uint64_t, uint32_t, uint32_t);
-extern void MmUnmapIoSpace(void *, size_t);
-extern void MmBuildMdlForNonPagedPool(mdl *);
-extern void IoDisconnectInterrupt(kinterrupt *);
-extern uint32_t IoAllocateDriverObjectExtension(driver_object *,
-	void *, uint32_t, void **);
-extern void *IoGetDriverObjectExtension(driver_object *, void *);
-extern uint32_t IoCreateDevice(driver_object *, uint32_t,
-	unicode_string *, uint32_t, uint32_t, uint8_t, device_object **);
-extern void IoDeleteDevice(device_object *);
-extern device_object *IoGetAttachedDevice(device_object *);
-extern uint32_t IofCallDriver(device_object *, irp *);
-extern void IofCompleteRequest(irp *, uint8_t);
-extern void IoAcquireCancelSpinLock(uint8_t *);
-extern void IoReleaseCancelSpinLock(uint8_t);
-extern uint8_t IoCancelIrp(irp *);
-extern void IoDetachDevice(device_object *);
-extern device_object *IoAttachDeviceToDeviceStack(device_object *,
-	device_object *);
-extern mdl *IoAllocateMdl(void *, uint32_t, uint8_t, uint8_t, irp *);
-extern void IoFreeMdl(mdl *);
-extern io_workitem *IoAllocateWorkItem(device_object *);
-extern void ExQueueWorkItem(work_queue_item *, u_int32_t);
-extern void IoFreeWorkItem(io_workitem *);
-extern void IoQueueWorkItem(io_workitem *, io_workitem_func,
-	uint32_t, void *);
-
-#define	IoCallDriver(a, b)		IofCallDriver(a, b)
-#define	IoCompleteRequest(a, b)		IofCompleteRequest(a, b)
-
-/*
- * On the Windows x86 arch, KeAcquireSpinLock() and KeReleaseSpinLock()
- * routines live in the HAL. We try to imitate this behavior.
- */
-#ifdef __i386__
-#define	KI_USER_SHARED_DATA 0xffdf0000
-#define	KeAcquireSpinLock(a, b)	*(b) = KfAcquireSpinLock(a)
-#define	KeReleaseSpinLock(a, b)	KfReleaseSpinLock(a, b)
-#define	KeRaiseIrql(a, b)	*(b) = KfRaiseIrql(a)
-#define	KeLowerIrql(a)		KfLowerIrql(a)
-#define	KeAcquireSpinLockAtDpcLevel(a)	KefAcquireSpinLockAtDpcLevel(a)
-#define	KeReleaseSpinLockFromDpcLevel(a)  KefReleaseSpinLockFromDpcLevel(a)
-#endif /* __i386__ */
-
-#ifdef __amd64__
-#define	KI_USER_SHARED_DATA 0xfffff78000000000UL
-#define	KeAcquireSpinLock(a, b)	*(b) = KfAcquireSpinLock(a)
-#define	KeReleaseSpinLock(a, b)	KfReleaseSpinLock(a, b)
-
-/*
- * These may need to be redefined later;
- * not sure where they live on amd64 yet.
- */
-#define	KeRaiseIrql(a, b)	*(b) = KfRaiseIrql(a)
-#define	KeLowerIrql(a)		KfLowerIrql(a)
-#endif /* __amd64__ */
-
-__END_DECLS
-
-#endif /* _NTOSKRNL_VAR_H_ */
diff --git a/sys/compat/ndis/pe_var.h b/sys/compat/ndis/pe_var.h
deleted file mode 100644
index a7fdcacb2844..000000000000
--- a/sys/compat/ndis/pe_var.h
+++ /dev/null
@@ -1,555 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
- * Copyright (c) 2003
- *	Bill Paul <wpaul@windriver.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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.
- *
- * $FreeBSD$
- */
-
-#ifndef _PE_VAR_H_
-#define	_PE_VAR_H_
-
-/*
- *  Image Format
- */
-
-#define	IMAGE_DOS_SIGNATURE			0x5A4D      /* MZ */
-#define	IMAGE_OS2_SIGNATURE			0x454E      /* NE */
-#define	IMAGE_OS2_SIGNATURE_LE			0x454C      /* LE */
-#define	IMAGE_VXD_SIGNATURE			0x454C      /* LE */
-#define	IMAGE_NT_SIGNATURE			0x00004550  /* PE00 */
-
-/*
- * All PE files have one of these, just so if you attempt to
- * run them, they'll print out a message telling you they can
- * only be run in Windows.
- */
-
-struct image_dos_header {
-	uint16_t	idh_magic;	/* Magic number */
-	uint16_t	idh_cblp;	/* Bytes on last page of file */
-	uint16_t	idh_cp;		/* Pages in file */
-	uint16_t	idh_crlc;	/* Relocations */
-	uint16_t	idh_cparhdr;	/* Size of header in paragraphs */
-	uint16_t	idh_minalloc;	/* Minimum extra paragraphs needed */
-	uint16_t	idh_maxalloc;	/* Maximum extra paragraphs needed */
-	uint16_t	idh_ss;		/* Initial (relative) SS value */
-	uint16_t	idh_sp;		/* Initial SP value */
-	uint16_t	idh_csum;	/* Checksum */
-	uint16_t	idh_ip;		/* Initial IP value */
-	uint16_t	idh_cs;		/* Initial (relative) CS value */
-	uint16_t	idh_lfarlc;	/* File address of relocation table */
-	uint16_t	idh_ovno;	/* Overlay number */
-	uint16_t	idh_rsvd1[4];	/* Reserved words */
-	uint16_t	idh_oemid;	/* OEM identifier (for idh_oeminfo) */
-	uint16_t	idh_oeminfo;	/* OEM information; oemid specific */
-	uint16_t	idh_rsvd2[10];	/* Reserved words */
-	uint32_t	idh_lfanew;	/* File address of new exe header */
-};
-
-typedef struct image_dos_header image_dos_header;
-
-/*
- * File header format.
- */
-
-struct image_file_header {
-	uint16_t	ifh_machine;		/* Machine type */
-	uint16_t	ifh_numsections;	/* # of sections */
-	uint32_t	ifh_timestamp;		/* Date/time stamp */
-	uint32_t	ifh_symtblptr;		/* Offset to symbol table */
-	uint32_t	ifh_numsyms;		/* # of symbols */
-	uint16_t	ifh_optionalhdrlen;	/* Size of optional header */
-	uint16_t	ifh_characteristics;	/* Characteristics */
-};
-
-typedef struct image_file_header image_file_header;
-
-/* Machine types */
-
-#define	IMAGE_FILE_MACHINE_UNKNOWN      0
-#define	IMAGE_FILE_MACHINE_I860         0x014d
-#define	IMAGE_FILE_MACHINE_I386         0x014c
-#define	IMAGE_FILE_MACHINE_R3000        0x0162
-#define	IMAGE_FILE_MACHINE_R4000        0x0166
-#define	IMAGE_FILE_MACHINE_R10000       0x0168
-#define	IMAGE_FILE_MACHINE_WCEMIPSV2    0x0169
-#define	IMAGE_FILE_MACHINE_ALPHA        0x0184
-#define	IMAGE_FILE_MACHINE_SH3          0x01a2
-#define	IMAGE_FILE_MACHINE_SH3DSP       0x01a3
-#define	IMAGE_FILE_MACHINE_SH3E         0x01a4
-#define	IMAGE_FILE_MACHINE_SH4          0x01a6
-#define	IMAGE_FILE_MACHINE_SH5          0x01a8
-#define	IMAGE_FILE_MACHINE_ARM          0x01c0
-#define	IMAGE_FILE_MACHINE_THUMB        0x01c2
-#define	IMAGE_FILE_MACHINE_AM33         0x01d3
-#define	IMAGE_FILE_MACHINE_POWERPC      0x01f0
-#define	IMAGE_FILE_MACHINE_POWERPCFP    0x01f1
-#define	IMAGE_FILE_MACHINE_MIPS16       0x0266
-#define	IMAGE_FILE_MACHINE_ALPHA64      0x0284
-#define	IMAGE_FILE_MACHINE_MIPSFPU      0x0366
-#define	IMAGE_FILE_MACHINE_MIPSFPU16    0x0466
-#define	IMAGE_FILE_MACHINE_AXP64        IMAGE_FILE_MACHINE_ALPHA64
-#define	IMAGE_FILE_MACHINE_TRICORE      0x0520
-#define	IMAGE_FILE_MACHINE_CEF          0x0cef
-#define	IMAGE_FILE_MACHINE_EBC          0x0ebc
-#define	IMAGE_FILE_MACHINE_AMD64        0x8664
-#define	IMAGE_FILE_MACHINE_M32R         0x9041
-#define	IMAGE_FILE_MACHINE_CEE          0xc0ee
-
-/* Characteristics */
-
-#define	IMAGE_FILE_RELOCS_STRIPPED      0x0001 /* No relocation info */
-#define	IMAGE_FILE_EXECUTABLE_IMAGE     0x0002
-#define	IMAGE_FILE_LINE_NUMS_STRIPPED   0x0004
-#define	IMAGE_FILE_LOCAL_SYMS_STRIPPED  0x0008
-#define	IMAGE_FILE_AGGRESIVE_WS_TRIM    0x0010
-#define	IMAGE_FILE_LARGE_ADDRESS_AWARE  0x0020
-#define	IMAGE_FILE_16BIT_MACHINE        0x0040
-#define	IMAGE_FILE_BYTES_REVERSED_LO    0x0080
-#define	IMAGE_FILE_32BIT_MACHINE        0x0100
-#define	IMAGE_FILE_DEBUG_STRIPPED       0x0200
-#define	IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP      0x0400
-#define	IMAGE_FILE_NET_RUN_FROM_SWAP    0x0800
-#define	IMAGE_FILE_SYSTEM               0x1000
-#define	IMAGE_FILE_DLL                  0x2000
-#define	IMAGE_FILE_UP_SYSTEM_ONLY       0x4000
-#define	IMAGE_FILE_BYTES_REVERSED_HI    0x8000
-
-#define	IMAGE_SIZEOF_FILE_HEADER             20
-
-/*
- * Directory format.
- */
-
-struct image_data_directory {
-	uint32_t		idd_vaddr;	/* virtual address */
-	uint32_t		idd_size;	/* size */
-};
-
-typedef struct image_data_directory image_data_directory;
-
-#define	IMAGE_DIRECTORY_ENTRIES_MAX    16
-
-/*
- * Optional header format.
- */
-
-struct image_optional_header {
-	/* Standard fields */
-
-	uint16_t	ioh_magic;
-	uint8_t		ioh_linkerver_major;
-	uint8_t		ioh_linkerver_minor;
-	uint32_t	ioh_codesize;
-	uint32_t	ioh_datasize;
-	uint32_t	ioh_bsssize;
-	uint32_t	ioh_entryaddr;
-	uint32_t	ioh_codebaseaddr;
-#ifndef __amd64__
-	uint32_t	ioh_databaseaddr;
-#endif
-
-	/* NT-specific fields */
-
-	uintptr_t	ioh_imagebase;
-	uint32_t	ioh_sectalign;
-	uint32_t	ioh_filealign;
-	uint16_t	ioh_osver_major;
-	uint16_t	ioh_osver_minor;
-	uint16_t	ioh_imagever_major;
-	uint16_t	ioh_imagever_minor;
-	uint16_t	ioh_subsys_major;
-	uint16_t	ioh_subsys_minor;
-	uint32_t	ioh_win32ver;
-	uint32_t	ioh_imagesize;
-	uint32_t	ioh_headersize;
-	uint32_t	ioh_csum;
-	uint16_t	ioh_subsys;
-	uint16_t	ioh_dll_characteristics;
-	uintptr_t	ioh_stackreservesize;
-	uintptr_t	ioh_stackcommitsize;
-	uintptr_t	ioh_heapreservesize;
-	uintptr_t	ioh_heapcommitsize;
-	uint16_t	ioh_loaderflags;
-	uint32_t	ioh_rva_size_cnt;
-	image_data_directory	ioh_datadir[IMAGE_DIRECTORY_ENTRIES_MAX];
-};
-
-typedef struct image_optional_header image_optional_header;
-
-struct image_nt_header {
-	uint32_t		inh_signature;
-	image_file_header	inh_filehdr;
-	image_optional_header	inh_optionalhdr;
-};
-
-typedef struct image_nt_header image_nt_header;
-
-#define	IMAGE_SIZEOF_NT_HEADER(nthdr)					\
-	(offsetof(image_nt_header, inh_optionalhdr) +			\
-	  ((image_nt_header *)(nthdr))->inh_filehdr.ifh_optionalhdrlen)
-
-/* Directory Entries */
-
-#define	IMAGE_DIRECTORY_ENTRY_EXPORT         0   /* Export Directory */
-#define	IMAGE_DIRECTORY_ENTRY_IMPORT         1   /* Import Directory */
-#define	IMAGE_DIRECTORY_ENTRY_RESOURCE       2   /* Resource Directory */
-#define	IMAGE_DIRECTORY_ENTRY_EXCEPTION      3   /* Exception Directory */
-#define	IMAGE_DIRECTORY_ENTRY_SECURITY       4   /* Security Directory */
-#define	IMAGE_DIRECTORY_ENTRY_BASERELOC      5   /* Base Relocation Table */
-#define	IMAGE_DIRECTORY_ENTRY_DEBUG          6   /* Debug Directory */
-#define	IMAGE_DIRECTORY_ENTRY_COPYRIGHT      7   /* Description String */
-#define	IMAGE_DIRECTORY_ENTRY_GLOBALPTR      8   /* Machine Value (MIPS GP) */
-#define	IMAGE_DIRECTORY_ENTRY_TLS            9   /* TLS Directory */
-#define	IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG   10   /* Load Configuration Directory */
-#define	IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT  11   /* Bound Import Directory in headers */
-#define	IMAGE_DIRECTORY_ENTRY_IAT           12   /* Import Address Table */
-#define	IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT      13
-#define	IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR    14
-
-/* Resource types */
-
-#define	RT_CURSOR	1
-#define	RT_BITMAP	2
-#define	RT_ICON		3
-#define	RT_MENU		4
-#define	RT_DIALOG	5
-#define	RT_STRING	6
-#define	RT_FONTDIR	7
-#define	RT_FONT		8
-#define	RT_ACCELERATOR	9
-#define	RT_RCDATA	10
-#define	RT_MESSAGETABLE	11
-#define	RT_GROUP_CURSOR	12
-#define	RT_GROUP_ICON	14
-#define	RT_VERSION	16
-#define	RT_DLGINCLUDE	17
-#define	RT_PLUGPLAY	19
-#define	RT_VXD		20
-#define	RT_ANICURSOR	21
-#define	RT_ANIICON	22
-#define	RT_HTML		23
-
-/*
- * Section header format.
- */
-
-#define	IMAGE_SHORT_NAME_LEN			8
-
-struct image_section_header {
-	uint8_t		ish_name[IMAGE_SHORT_NAME_LEN];
-	union {
-		uint32_t	ish_paddr;
-		uint32_t	ish_vsize;
-	} ish_misc;
-	uint32_t	ish_vaddr;
-	uint32_t	ish_rawdatasize;
-	uint32_t	ish_rawdataaddr;
-	uint32_t	ish_relocaddr;
-	uint32_t	ish_linenumaddr;
-	uint16_t	ish_numrelocs;
-	uint16_t	ish_numlinenums;
-	uint32_t	ish_characteristics;
-};
-
-typedef struct image_section_header image_section_header;
-
-#define	IMAGE_SIZEOF_SECTION_HEADER          40
-
-#define	IMAGE_FIRST_SECTION(nthdr)					\
-	((image_section_header *)((vm_offset_t)(nthdr) +		\
-	  offsetof(image_nt_header, inh_optionalhdr) +			\
-	  ((image_nt_header *)(nthdr))->inh_filehdr.ifh_optionalhdrlen))
-
-/*
- * Import format
- */
-
-struct image_import_by_name {
-	uint16_t	iibn_hint;
-	uint8_t		iibn_name[1];
-};
-
-#define	IMAGE_ORDINAL_FLAG 0x80000000
-#define	IMAGE_ORDINAL(Ordinal) (Ordinal & 0xffff)
-
-struct image_import_descriptor {
-	uint32_t	iid_import_name_table_addr;
-	uint32_t	iid_timestamp;
-	uint32_t	iid_forwardchain;
-	uint32_t	iid_nameaddr;
-	uint32_t	iid_import_address_table_addr;
-};
-
-typedef struct image_import_descriptor image_import_descriptor;
-
-struct image_base_reloc {
-	uint32_t	ibr_vaddr;
-	uint32_t	ibr_blocksize;
-	uint16_t	ibr_rel[1];
-};
-
-typedef struct image_base_reloc image_base_reloc;
-
-#define	IMR_RELTYPE(x)		((x >> 12) & 0xF)
-#define	IMR_RELOFFSET(x)	(x & 0xFFF)
-
-/* generic relocation types */
-#define	IMAGE_REL_BASED_ABSOLUTE		0
-#define	IMAGE_REL_BASED_HIGH			1
-#define	IMAGE_REL_BASED_LOW			2
-#define	IMAGE_REL_BASED_HIGHLOW			3
-#define	IMAGE_REL_BASED_HIGHADJ			4
-#define	IMAGE_REL_BASED_MIPS_JMPADDR		5
-#define	IMAGE_REL_BASED_SECTION			6
-#define	IMAGE_REL_BASED_REL			7
-#define	IMAGE_REL_BASED_MIPS_JMPADDR16		9
-#define	IMAGE_REL_BASED_DIR64			10
-#define	IMAGE_REL_BASED_HIGH3ADJ		11
-
-struct image_resource_directory_entry {
-	uint32_t		irde_name;
-	uint32_t		irde_dataoff;
-};
-
-typedef struct image_resource_directory_entry image_resource_directory_entry;
-
-#define	RESOURCE_NAME_STR	0x80000000
-#define	RESOURCE_DIR_FLAG	0x80000000
-
-struct image_resource_directory {
-	uint32_t		ird_characteristics;
-	uint32_t		ird_timestamp;
-	uint16_t		ird_majorver;
-	uint16_t		ird_minorver;
-	uint16_t		ird_named_entries;
-	uint16_t		ird_id_entries;
-#ifdef notdef
-	image_resource_directory_entry	ird_entries[1];
-#endif
-};
-
-typedef struct image_resource_directory image_resource_directory;
-
-struct image_resource_directory_string {
-	uint16_t		irds_len;
-	char			irds_name[1];
-};
-
-typedef struct image_resource_directory_string image_resource_directory_string;
-
-struct image_resource_directory_string_u {
-	uint16_t		irds_len;
-	char			irds_name[1];
-};
-
-typedef struct image_resource_directory_string_u
-	image_resource_directory_string_u;
-
-struct image_resource_data_entry {
-	uint32_t		irde_offset;
-	uint32_t		irde_size;
-	uint32_t		irde_codepage;
-	uint32_t		irde_rsvd;
-};
-
-typedef struct image_resource_data_entry image_resource_data_entry;
-
-struct message_resource_data {
-	uint32_t		mrd_numblocks;
-#ifdef notdef
-	message_resource_block	mrd_blocks[1];
-#endif
-};
-
-typedef struct message_resource_data message_resource_data;
-
-struct message_resource_block {
-	uint32_t		mrb_lowid;
-	uint32_t		mrb_highid;
-	uint32_t		mrb_entryoff;
-};
-
-typedef struct message_resource_block message_resource_block;
-
-struct message_resource_entry {
-	uint16_t		mre_len;
-	uint16_t		mre_flags;
-	char			mre_text[];
-};
-
-typedef struct message_resource_entry message_resource_entry;
-
-#define	MESSAGE_RESOURCE_UNICODE	0x0001
-
-struct image_patch_table {
-	char		*ipt_name;
-	void		(*ipt_func)(void);
-	void		(*ipt_wrap)(void);
-	int		ipt_argcnt;
-	int		ipt_ftype;
-};
-
-typedef struct image_patch_table image_patch_table;
-
-/*
- * AMD64 support. Microsoft uses a different calling convention
- * than everyone else on the amd64 platform. Sadly, gcc has no
- * built-in support for it (yet).
- *
- * The three major differences we're concerned with are:
- *
- * - The first 4 register-sized arguments are passed in the
- *   %rcx, %rdx, %r8 and %r9 registers, and the rest are pushed
- *   onto the stack. (The ELF ABI uses 6 registers, not 4).
- *
- * - The caller must reserve space on the stack for the 4
- *   register arguments in case the callee has to spill them.
- *
- * - The stack myst be 16-byte aligned by the time the callee
- *   executes. A call instruction implicitly pushes an 8 byte
- *   return address onto the stack. We have to make sure that
- *   the amount of space we consume, plus the return address,
- *   is a multiple of 16 bytes in size. This means that in
- *   some cases, we may need to chew up an extra 8 bytes on
- *   the stack that will be unused.
- *
- * On the bright side, Microsoft seems to be using just the one
- * calling convention for all functions on amd64, unlike x86 where
- * they use a mix of _stdcall, _fastcall and _cdecl.
- */
-
-#ifdef __amd64__
-
-extern uint64_t x86_64_call1(void *, uint64_t);
-extern uint64_t x86_64_call2(void *, uint64_t, uint64_t);
-extern uint64_t x86_64_call3(void *, uint64_t, uint64_t, uint64_t);
-extern uint64_t x86_64_call4(void *, uint64_t, uint64_t, uint64_t, uint64_t);
-extern uint64_t x86_64_call5(void *, uint64_t, uint64_t, uint64_t, uint64_t,
-	uint64_t);
-extern uint64_t x86_64_call6(void *, uint64_t, uint64_t, uint64_t, uint64_t,
-	uint64_t, uint64_t);
-
-uint64_t _x86_64_call1(void *, uint64_t);
-uint64_t _x86_64_call2(void *, uint64_t, uint64_t);
-uint64_t _x86_64_call3(void *, uint64_t, uint64_t, uint64_t);
-uint64_t _x86_64_call4(void *, uint64_t, uint64_t, uint64_t, uint64_t);
-uint64_t _x86_64_call5(void *, uint64_t, uint64_t, uint64_t, uint64_t,
-    uint64_t);
-uint64_t _x86_64_call6(void *, uint64_t, uint64_t, uint64_t, uint64_t,
-    uint64_t, uint64_t);
-
-#define	MSCALL1(fn, a)						\
-	_x86_64_call1((fn), (uint64_t)(a))
-#define	MSCALL2(fn, a, b)					\
-	_x86_64_call2((fn), (uint64_t)(a), (uint64_t)(b))
-#define	MSCALL3(fn, a, b, c)					\
-	_x86_64_call3((fn), (uint64_t)(a), (uint64_t)(b),		\
-	(uint64_t)(c))
-#define	MSCALL4(fn, a, b, c, d)					\
-	_x86_64_call4((fn), (uint64_t)(a), (uint64_t)(b),		\
-	(uint64_t)(c), (uint64_t)(d))
-#define	MSCALL5(fn, a, b, c, d, e)				\
-	_x86_64_call5((fn), (uint64_t)(a), (uint64_t)(b),		\
-	(uint64_t)(c), (uint64_t)(d), (uint64_t)(e))
-#define	MSCALL6(fn, a, b, c, d, e, f)				\
-	_x86_64_call6((fn), (uint64_t)(a), (uint64_t)(b),		\
-	(uint64_t)(c), (uint64_t)(d), (uint64_t)(e), (uint64_t)(f))
-
-#endif /* __amd64__ */
-
-#ifdef __i386__
-
-extern uint32_t x86_stdcall_call(void *, int, ...);
-
-#define	MSCALL1(fn, a)		x86_stdcall_call(fn, 1, (a))
-#define	MSCALL2(fn, a, b)	x86_stdcall_call(fn, 2, (a), (b))
-#define	MSCALL3(fn, a, b, c)	x86_stdcall_call(fn, 3, (a), (b), (c))
-#define	MSCALL4(fn, a, b, c, d)	x86_stdcall_call(fn, 4, (a), (b), (c), (d))
-#define	MSCALL5(fn, a, b, c, d, e)	\
-		x86_stdcall_call(fn, 5, (a), (b), (c), (d), (e))
-#define	MSCALL6(fn, a, b, c, d, e, f)	\
-		x86_stdcall_call(fn, 6, (a), (b), (c), (d), (e), (f))
-
-#endif /* __i386__ */
-
-#define	FUNC void(*)(void)
-
-#ifdef __i386__
-#define	IMPORT_SFUNC(x, y)	{ #x, (FUNC)x, NULL, y, WINDRV_WRAP_STDCALL }
-#define	IMPORT_SFUNC_MAP(x, y, z)	\
-				{ #x, (FUNC)y, NULL, z, WINDRV_WRAP_STDCALL }
-#define	IMPORT_FFUNC(x, y)	{ #x, (FUNC)x, NULL, y, WINDRV_WRAP_FASTCALL }
-#define	IMPORT_FFUNC_MAP(x, y, z)	\
-				{ #x, (FUNC)y, NULL, z, WINDRV_WRAP_FASTCALL }
-#define	IMPORT_RFUNC(x, y)	{ #x, (FUNC)x, NULL, y, WINDRV_WRAP_REGPARM }
-#define	IMPORT_RFUNC_MAP(x, y, z)	\
-				{ #x, (FUNC)y, NULL, z, WINDRV_WRAP_REGPARM }
-#define	IMPORT_CFUNC(x, y)	{ #x, (FUNC)x, NULL, y, WINDRV_WRAP_CDECL }
-#define	IMPORT_CFUNC_MAP(x, y, z)	\
-				{ #x, (FUNC)y, NULL, z, WINDRV_WRAP_CDECL }
-#endif /* __i386__ */
-
-#ifdef __amd64__
-#define	IMPORT_SFUNC(x, y)	{ #x, (FUNC)x, NULL, y, WINDRV_WRAP_AMD64 }
-#define	IMPORT_SFUNC_MAP(x, y, z)	\
-				{ #x, (FUNC)y, NULL, z, WINDRV_WRAP_AMD64 }
-#define	IMPORT_FFUNC(x, y)	{ #x, (FUNC)x, NULL, y, WINDRV_WRAP_AMD64 }
-#define	IMPORT_FFUNC_MAP(x, y, z)	\
-				{ #x, (FUNC)y, NULL, z, WINDRV_WRAP_AMD64 }
-#define	IMPORT_RFUNC(x, y)	{ #x, (FUNC)x, NULL, y, WINDRV_WRAP_AMD64 }
-#define	IMPORT_RFUNC_MAP(x, y, z)	\
-				{ #x, (FUNC)y, NULL, z, WINDRV_WRAP_AMD64 }
-#define	IMPORT_CFUNC(x, y)	{ #x, (FUNC)x, NULL, y, WINDRV_WRAP_AMD64 }
-#define	IMPORT_CFUNC_MAP(x, y, z)	\
-				{ #x, (FUNC)y, NULL, z, WINDRV_WRAP_AMD64 }
-#endif /* __amd64__ */
-
-__BEGIN_DECLS
-extern int pe_get_dos_header(vm_offset_t, image_dos_header *);
-extern int pe_is_nt_image(vm_offset_t);
-extern int pe_get_optional_header(vm_offset_t, image_optional_header *);
-extern int pe_get_file_header(vm_offset_t, image_file_header *);
-extern int pe_get_section_header(vm_offset_t, image_section_header *);
-extern int pe_numsections(vm_offset_t);
-extern vm_offset_t pe_imagebase(vm_offset_t);
-extern vm_offset_t pe_directory_offset(vm_offset_t, uint32_t);
-extern vm_offset_t pe_translate_addr (vm_offset_t, vm_offset_t);
-extern int pe_get_section(vm_offset_t, image_section_header *, const char *);
-extern int pe_relocate(vm_offset_t);
-extern int pe_get_import_descriptor(vm_offset_t, image_import_descriptor *, char *);
-extern int pe_patch_imports(vm_offset_t, char *, image_patch_table *);
-extern int pe_get_messagetable(vm_offset_t, message_resource_data **);
-extern int pe_get_message(vm_offset_t, uint32_t, char **, int *, uint16_t *);
-__END_DECLS
-
-#endif /* _PE_VAR_H_ */
diff --git a/sys/compat/ndis/resource_var.h b/sys/compat/ndis/resource_var.h
deleted file mode 100644
index b06a2e09f910..000000000000
--- a/sys/compat/ndis/resource_var.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
- * Copyright (c) 2005
- *      Bill Paul <wpaul@windriver.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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.
- *
- * $FreeBSD$
- */
-
-#ifndef _RESOURCE_VAR_H_
-#define	_RESOURCE_VAR_H_
-
-typedef int cm_resource_type;
-
-struct physaddr {
-	uint64_t		np_quad;
-#ifdef notdef
-	uint32_t		np_low;
-	uint32_t		np_high;
-#endif
-};
-
-typedef struct physaddr physaddr;
-
-enum interface_type {
-	InterfaceTypeUndefined = -1,
-	Internal,
-	Isa,
-	Eisa,
-	MicroChannel,
-	TurboChannel,
-	PCIBus,
-	VMEBus,
-	NuBus,
-	PCMCIABus,
-	CBus,
-	MPIBus,
-	MPSABus,
-	ProcessorInternal,
-	InternalPowerBus,
-	PNPISABus,
-	PNPBus,
-	MaximumInterfaceType
-};
-
-typedef enum interface_type interface_type;
-
-#define	CmResourceTypeNull                0   /* ResType_All or ResType_None (0x0000) */
-#define	CmResourceTypePort                1   /* ResType_IO (0x0002) */
-#define	CmResourceTypeInterrupt           2   /* ResType_IRQ (0x0004) */
-#define	CmResourceTypeMemory              3   /* ResType_Mem (0x0001) */
-#define	CmResourceTypeDma                 4   /* ResType_DMA (0x0003) */
-#define	CmResourceTypeDeviceSpecific      5   /* ResType_ClassSpecific (0xFFFF) */
-#define	CmResourceTypeBusNumber           6   /* ResType_BusNumber (0x0006) */
-#define	CmResourceTypeMaximum             7
-#define	CmResourceTypeNonArbitrated     128   /* Not arbitrated if 0x80 bit set */
-#define	CmResourceTypeConfigData        128   /* ResType_Reserved (0x8000) */
-#define	CmResourceTypeDevicePrivate     129   /* ResType_DevicePrivate (0x8001) */
-#define	CmResourceTypePcCardConfig      130   /* ResType_PcCardConfig (0x8002) */
-
-enum cm_share_disposition {
-    CmResourceShareUndetermined = 0,    /* Reserved */
-    CmResourceShareDeviceExclusive,
-    CmResourceShareDriverExclusive,
-    CmResourceShareShared
-};
-
-typedef enum cm_share_disposition cm_share_disposition;
-
-/* Define the bit masks for Flags when type is CmResourceTypeInterrupt */
-
-#define	CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE	0
-#define	CM_RESOURCE_INTERRUPT_LATCHED		1
-
-/* Define the bit masks for Flags when type is CmResourceTypeMemory */
-
-#define	CM_RESOURCE_MEMORY_READ_WRITE		0x0000
-#define	CM_RESOURCE_MEMORY_READ_ONLY		0x0001
-#define	CM_RESOURCE_MEMORY_WRITE_ONLY		0x0002
-#define	CM_RESOURCE_MEMORY_PREFETCHABLE		0x0004
-
-#define	CM_RESOURCE_MEMORY_COMBINEDWRITE	0x0008
-#define	CM_RESOURCE_MEMORY_24			0x0010
-#define	CM_RESOURCE_MEMORY_CACHEABLE		0x0020
-
-/* Define the bit masks for Flags when type is CmResourceTypePort */
-
-#define	CM_RESOURCE_PORT_MEMORY			0x0000
-#define	CM_RESOURCE_PORT_IO			0x0001
-#define	CM_RESOURCE_PORT_10_BIT_DECODE		0x0004
-#define	CM_RESOURCE_PORT_12_BIT_DECODE		0x0008
-#define	CM_RESOURCE_PORT_16_BIT_DECODE		0x0010
-#define	CM_RESOURCE_PORT_POSITIVE_DECODE	0x0020
-#define	CM_RESOURCE_PORT_PASSIVE_DECODE		0x0040
-#define	CM_RESOURCE_PORT_WINDOW_DECODE		0x0080
-
-/* Define the bit masks for Flags when type is CmResourceTypeDma */
-
-#define	CM_RESOURCE_DMA_8			0x0000
-#define	CM_RESOURCE_DMA_16			0x0001
-#define	CM_RESOURCE_DMA_32			0x0002
-#define	CM_RESOURCE_DMA_8_AND_16		0x0004
-#define	CM_RESOURCE_DMA_BUS_MASTER		0x0008
-#define	CM_RESOURCE_DMA_TYPE_A			0x0010
-#define	CM_RESOURCE_DMA_TYPE_B			0x0020
-#define	CM_RESOURCE_DMA_TYPE_F			0x0040
-
-struct cm_partial_resource_desc {
-	uint8_t			cprd_type;
-	uint8_t			cprd_sharedisp;
-	uint16_t		cprd_flags;
-	union {
-		struct {
-			physaddr		cprd_start;
-			uint32_t		cprd_len;
-		} cprd_generic;
-		struct {
-			physaddr		cprd_start;
-			uint32_t		cprd_len;
-		} cprd_port;
-		struct {
-			uint32_t		cprd_level;
-			uint32_t		cprd_vector;
-			uint32_t		cprd_affinity;
-		} cprd_intr;
-		struct {
-			physaddr		cprd_start;
-			uint32_t		cprd_len;
-		} cprd_mem;
-		struct {
-			uint32_t		cprd_chan;
-			uint32_t		cprd_port;
-			uint32_t		cprd_rsvd;
-		} cprd_dmachan;
-		struct {
-			uint32_t		cprd_data[3];
-		} cprd_devpriv;
-		struct {
-			uint32_t		cprd_datasize;
-			uint32_t		cprd_rsvd1;
-			uint32_t		cprd_rsvd2;
-		} cprd_devspec;
-	} u __attribute__((packed));
-};
-
-typedef struct cm_partial_resource_desc cm_partial_resource_desc;
-
-struct cm_partial_resource_list {
-	uint16_t		cprl_version;
-	uint16_t		cprl_revision;
-	uint32_t		cprl_count;
-	cm_partial_resource_desc	cprl_partial_descs[1];
-};
-
-typedef struct cm_partial_resource_list cm_partial_resource_list;
-
-struct cm_full_resource_list {
-	interface_type		cfrl_type;
-	uint32_t		cfrl_busnum;
-	cm_partial_resource_desc	cfrl_partiallist;
-};
-
-typedef struct cm_full_resource_list cm_full_resource_list;
-
-struct cm_resource_list {
-	uint32_t		crl_count;
-	cm_full_resource_list	crl_rlist;
-};
-
-typedef struct cm_resource_list cm_resource_list;
-
-typedef cm_partial_resource_list ndis_resource_list;
-
-#endif /* _RESOURCE_VAR_H_ */
diff --git a/sys/compat/ndis/subr_hal.c b/sys/compat/ndis/subr_hal.c
deleted file mode 100644
index c609db52ed2d..000000000000
--- a/sys/compat/ndis/subr_hal.c
+++ /dev/null
@@ -1,482 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
- * Copyright (c) 2003
- *	Bill Paul <wpaul@windriver.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/errno.h>
-
-#include <sys/callout.h>
-#include <sys/kernel.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/proc.h>
-#include <sys/sched.h>
-#include <sys/module.h>
-
-#include <sys/systm.h>
-#include <machine/bus.h>
-
-#include <sys/bus.h>
-#include <sys/rman.h>
-
-#include <compat/ndis/pe_var.h>
-#include <compat/ndis/resource_var.h>
-#include <compat/ndis/cfg_var.h>
-#include <compat/ndis/ntoskrnl_var.h>
-#include <compat/ndis/hal_var.h>
-
-static void KeStallExecutionProcessor(uint32_t);
-static void WRITE_PORT_BUFFER_ULONG(uint32_t *,
-	uint32_t *, uint32_t);
-static void WRITE_PORT_BUFFER_USHORT(uint16_t *,
-	uint16_t *, uint32_t);
-static void WRITE_PORT_BUFFER_UCHAR(uint8_t *,
-	uint8_t *, uint32_t);
-static void WRITE_PORT_ULONG(uint32_t *, uint32_t);
-static void WRITE_PORT_USHORT(uint16_t *, uint16_t);
-static void WRITE_PORT_UCHAR(uint8_t *, uint8_t);
-static uint32_t READ_PORT_ULONG(uint32_t *);
-static uint16_t READ_PORT_USHORT(uint16_t *);
-static uint8_t READ_PORT_UCHAR(uint8_t *);
-static void READ_PORT_BUFFER_ULONG(uint32_t *,
-	uint32_t *, uint32_t);
-static void READ_PORT_BUFFER_USHORT(uint16_t *,
-	uint16_t *, uint32_t);
-static void READ_PORT_BUFFER_UCHAR(uint8_t *,
-	uint8_t *, uint32_t);
-static uint64_t KeQueryPerformanceCounter(uint64_t *);
-static void _KeLowerIrql(uint8_t);
-static uint8_t KeRaiseIrqlToDpcLevel(void);
-static void dummy (void);
-
-#define NDIS_MAXCPUS 64
-static struct mtx disp_lock[NDIS_MAXCPUS];
-
-int
-hal_libinit()
-{
-	image_patch_table	*patch;
-	int			i;
-
-	for (i = 0; i < NDIS_MAXCPUS; i++)
-		mtx_init(&disp_lock[i], "HAL preemption lock",
-		    "HAL lock", MTX_RECURSE|MTX_DEF);
-
-	patch = hal_functbl;
-	while (patch->ipt_func != NULL) {
-		windrv_wrap((funcptr)patch->ipt_func,
-		    (funcptr *)&patch->ipt_wrap,
-		    patch->ipt_argcnt, patch->ipt_ftype);
-		patch++;
-	}
-
-	return (0);
-}
-
-int
-hal_libfini()
-{
-	image_patch_table	*patch;
-	int			i;
-
-	for (i = 0; i < NDIS_MAXCPUS; i++)
-		mtx_destroy(&disp_lock[i]);
-
-	patch = hal_functbl;
-	while (patch->ipt_func != NULL) {
-		windrv_unwrap(patch->ipt_wrap);
-		patch++;
-	}
-
-	return (0);
-}
-
-static void
-KeStallExecutionProcessor(usecs)
-	uint32_t		usecs;
-{
-	DELAY(usecs);
-}
-
-static void
-WRITE_PORT_ULONG(port, val)
-	uint32_t		*port;
-	uint32_t		val;
-{
-	bus_space_write_4(NDIS_BUS_SPACE_IO, 0x0, (bus_size_t)port, val);
-}
-
-static void
-WRITE_PORT_USHORT(uint16_t *port, uint16_t val)
-{
-	bus_space_write_2(NDIS_BUS_SPACE_IO, 0x0, (bus_size_t)port, val);
-}
-
-static void
-WRITE_PORT_UCHAR(uint8_t *port, uint8_t val)
-{
-	bus_space_write_1(NDIS_BUS_SPACE_IO, 0x0, (bus_size_t)port, val);
-}
-
-static void
-WRITE_PORT_BUFFER_ULONG(port, val, cnt)
-	uint32_t		*port;
-	uint32_t		*val;
-	uint32_t		cnt;
-{
-	bus_space_write_multi_4(NDIS_BUS_SPACE_IO, 0x0,
-	    (bus_size_t)port, val, cnt);
-}
-
-static void
-WRITE_PORT_BUFFER_USHORT(port, val, cnt)
-	uint16_t		*port;
-	uint16_t		*val;
-	uint32_t		cnt;
-{
-	bus_space_write_multi_2(NDIS_BUS_SPACE_IO, 0x0,
-	    (bus_size_t)port, val, cnt);
-}
-
-static void
-WRITE_PORT_BUFFER_UCHAR(port, val, cnt)
-	uint8_t			*port;
-	uint8_t			*val;
-	uint32_t		cnt;
-{
-	bus_space_write_multi_1(NDIS_BUS_SPACE_IO, 0x0,
-	    (bus_size_t)port, val, cnt);
-}
-
-static uint16_t
-READ_PORT_USHORT(port)
-	uint16_t		*port;
-{
-	return (bus_space_read_2(NDIS_BUS_SPACE_IO, 0x0, (bus_size_t)port));
-}
-
-static uint32_t
-READ_PORT_ULONG(port)
-	uint32_t		*port;
-{
-	return (bus_space_read_4(NDIS_BUS_SPACE_IO, 0x0, (bus_size_t)port));
-}
-
-static uint8_t
-READ_PORT_UCHAR(port)
-	uint8_t			*port;
-{
-	return (bus_space_read_1(NDIS_BUS_SPACE_IO, 0x0, (bus_size_t)port));
-}
-
-static void
-READ_PORT_BUFFER_ULONG(port, val, cnt)
-	uint32_t		*port;
-	uint32_t		*val;
-	uint32_t		cnt;
-{
-	bus_space_read_multi_4(NDIS_BUS_SPACE_IO, 0x0,
-	    (bus_size_t)port, val, cnt);
-}
-
-static void
-READ_PORT_BUFFER_USHORT(port, val, cnt)
-	uint16_t		*port;
-	uint16_t		*val;
-	uint32_t		cnt;
-{
-	bus_space_read_multi_2(NDIS_BUS_SPACE_IO, 0x0,
-	    (bus_size_t)port, val, cnt);
-}
-
-static void
-READ_PORT_BUFFER_UCHAR(port, val, cnt)
-	uint8_t			*port;
-	uint8_t			*val;
-	uint32_t		cnt;
-{
-	bus_space_read_multi_1(NDIS_BUS_SPACE_IO, 0x0,
-	    (bus_size_t)port, val, cnt);
-}
-
-/*
- * The spinlock implementation in Windows differs from that of FreeBSD.
- * The basic operation of spinlocks involves two steps: 1) spin in a
- * tight loop while trying to acquire a lock, 2) after obtaining the
- * lock, disable preemption. (Note that on uniprocessor systems, you're
- * allowed to skip the first step and just lock out pre-emption, since
- * it's not possible for you to be in contention with another running
- * thread.) Later, you release the lock then re-enable preemption.
- * The difference between Windows and FreeBSD lies in how preemption
- * is disabled. In FreeBSD, it's done using critical_enter(), which on
- * the x86 arch translates to a cli instruction. This masks off all
- * interrupts, and effectively stops the scheduler from ever running
- * so _nothing_ can execute except the current thread. In Windows,
- * preemption is disabled by raising the processor IRQL to DISPATCH_LEVEL.
- * This stops other threads from running, but does _not_ block device
- * interrupts. This means ISRs can still run, and they can make other
- * threads runable, but those other threads won't be able to execute
- * until the current thread lowers the IRQL to something less than
- * DISPATCH_LEVEL.
- *
- * There's another commonly used IRQL in Windows, which is APC_LEVEL.
- * An APC is an Asynchronous Procedure Call, which differs from a DPC
- * (Defered Procedure Call) in that a DPC is queued up to run in
- * another thread, while an APC runs in the thread that scheduled
- * it (similar to a signal handler in a UNIX process). We don't
- * actually support the notion of APCs in FreeBSD, so for now, the
- * only IRQLs we're interested in are DISPATCH_LEVEL and PASSIVE_LEVEL.
- *
- * To simulate DISPATCH_LEVEL, we raise the current thread's priority
- * to PI_REALTIME, which is the highest we can give it. This should,
- * if I understand things correctly, prevent anything except for an
- * interrupt thread from preempting us. PASSIVE_LEVEL is basically
- * everything else.
- *
- * Be aware that, at least on the x86 arch, the Windows spinlock
- * functions are divided up in peculiar ways. The actual spinlock
- * functions are KfAcquireSpinLock() and KfReleaseSpinLock(), and
- * they live in HAL.dll. Meanwhile, KeInitializeSpinLock(),
- * KefAcquireSpinLockAtDpcLevel() and KefReleaseSpinLockFromDpcLevel()
- * live in ntoskrnl.exe. Most Windows source code will call
- * KeAcquireSpinLock() and KeReleaseSpinLock(), but these are just
- * macros that call KfAcquireSpinLock() and KfReleaseSpinLock().
- * KefAcquireSpinLockAtDpcLevel() and KefReleaseSpinLockFromDpcLevel()
- * perform the lock acquisition/release functions without doing the
- * IRQL manipulation, and are used when one is already running at
- * DISPATCH_LEVEL. Make sense? Good.
- *
- * According to the Microsoft documentation, any thread that calls
- * KeAcquireSpinLock() must be running at IRQL <= DISPATCH_LEVEL. If
- * we detect someone trying to acquire a spinlock from DEVICE_LEVEL
- * or HIGH_LEVEL, we panic.
- *
- * Alternate sleep-lock-based spinlock implementation
- * --------------------------------------------------
- *
- * The earlier spinlock implementation was arguably a bit of a hack
- * and presented several problems. It was basically designed to provide
- * the functionality of spinlocks without incurring the wrath of
- * WITNESS. We could get away with using both our spinlock implementation
- * and FreeBSD sleep locks at the same time, but if WITNESS knew what
- * we were really up to, it would have spanked us rather severely.
- *
- * There's another method we can use based entirely on sleep locks.
- * First, it's important to realize that everything we're locking
- * resides inside Project Evil itself: any critical data being locked
- * by drivers belongs to the drivers, and should not be referenced
- * by any other OS code outside of the NDISulator. The priority-based
- * locking scheme has system-wide effects, just like real spinlocks
- * (blocking preemption affects the whole CPU), but since we keep all
- * our critical data private, we can use a simpler mechanism that
- * affects only code/threads directly related to Project Evil.
- *
- * The idea is to create a sleep lock mutex for each CPU in the system.
- * When a CPU running in the NDISulator wants to acquire a spinlock, it
- * does the following:
- * - Pin ourselves to the current CPU
- * - Acquire the mutex for the current CPU
- * - Spin on the spinlock variable using atomic test and set, just like
- *   a real spinlock.
- * - Once we have the lock, we execute our critical code
- *
- * To give up the lock, we do:
- * - Clear the spinlock variable with an atomic op
- * - Release the per-CPU mutex
- * - Unpin ourselves from the current CPU.
- *
- * On a uniprocessor system, this means all threads that access protected
- * data are serialized through the per-CPU mutex. After one thread
- * acquires the 'spinlock,' any other thread that uses a spinlock on the
- * current CPU will block on the per-CPU mutex, which has the same general
- * effect of blocking pre-emption, but _only_ for those threads that are
- * running NDISulator code.
- *
- * On a multiprocessor system, threads on different CPUs all block on
- * their respective per-CPU mutex, and the atomic test/set operation
- * on the spinlock variable provides inter-CPU synchronization, though
- * only for threads running NDISulator code.
- *
- * This method solves an important problem. In Windows, you're allowed
- * to do an ExAllocatePoolWithTag() with a spinlock held, provided you
- * allocate from NonPagedPool. This implies an atomic heap allocation
- * that will not cause the current thread to sleep. (You can't sleep
- * while holding real spinlock: clowns will eat you.) But in FreeBSD,
- * malloc(9) _always_ triggers the acquisition of a sleep lock, even
- * when you use M_NOWAIT. This is not a problem for FreeBSD native
- * code: you're allowed to sleep in things like interrupt threads. But
- * it is a problem with the old priority-based spinlock implementation:
- * even though we get away with it most of the time, we really can't
- * do a malloc(9) after doing a KeAcquireSpinLock() or KeRaiseIrql().
- * With the new implementation, it's not a problem: you're allowed to
- * acquire more than one sleep lock (as long as you avoid lock order
- * reversals).
- *
- * The one drawback to this approach is that now we have a lot of
- * contention on one per-CPU mutex within the NDISulator code. Whether
- * or not this is preferable to the expected Windows spinlock behavior
- * of blocking pre-emption is debatable.
- */
-
-uint8_t
-KfAcquireSpinLock(lock)
-	kspin_lock		*lock;
-{
-	uint8_t			oldirql;
-
-	KeRaiseIrql(DISPATCH_LEVEL, &oldirql);
-	KeAcquireSpinLockAtDpcLevel(lock);
-
-	return (oldirql);
-}
-
-void
-KfReleaseSpinLock(kspin_lock *lock, uint8_t newirql)
-{
-	KeReleaseSpinLockFromDpcLevel(lock);
-	KeLowerIrql(newirql);
-}
-
-uint8_t
-KeGetCurrentIrql()
-{
-	if (mtx_owned(&disp_lock[curthread->td_oncpu]))
-		return (DISPATCH_LEVEL);
-	return (PASSIVE_LEVEL);
-}
-
-static uint64_t
-KeQueryPerformanceCounter(freq)
-	uint64_t		*freq;
-{
-	if (freq != NULL)
-		*freq = hz;
-
-	return ((uint64_t)ticks);
-}
-
-uint8_t
-KfRaiseIrql(uint8_t irql)
-{
-	uint8_t			oldirql;
-
-	sched_pin();
-	oldirql = KeGetCurrentIrql();
-
-	/* I am so going to hell for this. */
-	if (oldirql > irql)
-		panic("IRQL_NOT_LESS_THAN_OR_EQUAL");
-
-	if (oldirql != DISPATCH_LEVEL) 
-		mtx_lock(&disp_lock[curthread->td_oncpu]);
-	else
-		sched_unpin();	
-
-/*printf("RAISE IRQL: %d %d\n", irql, oldirql);*/
-
-	return (oldirql);
-}
-
-void
-KfLowerIrql(uint8_t oldirql)
-{
-	if (oldirql == DISPATCH_LEVEL)
-		return;
-
-	if (KeGetCurrentIrql() != DISPATCH_LEVEL)
-		panic("IRQL_NOT_GREATER_THAN");
-
-	mtx_unlock(&disp_lock[curthread->td_oncpu]);
-	sched_unpin();
-}
-
-static uint8_t
-KeRaiseIrqlToDpcLevel(void)
-{
-	uint8_t			irql;
-
-	KeRaiseIrql(DISPATCH_LEVEL, &irql);
-	return (irql);
-}
-
-static void
-_KeLowerIrql(uint8_t oldirql)
-{
-	KeLowerIrql(oldirql);
-}
-
-static void dummy()
-{
-	printf("hal dummy called...\n");
-}
-
-image_patch_table hal_functbl[] = {
-	IMPORT_SFUNC(KeStallExecutionProcessor, 1),
-	IMPORT_SFUNC(WRITE_PORT_ULONG, 2),
-	IMPORT_SFUNC(WRITE_PORT_USHORT, 2),
-	IMPORT_SFUNC(WRITE_PORT_UCHAR, 2),
-	IMPORT_SFUNC(WRITE_PORT_BUFFER_ULONG, 3),
-	IMPORT_SFUNC(WRITE_PORT_BUFFER_USHORT, 3),
-	IMPORT_SFUNC(WRITE_PORT_BUFFER_UCHAR, 3),
-	IMPORT_SFUNC(READ_PORT_ULONG, 1),
-	IMPORT_SFUNC(READ_PORT_USHORT, 1),
-	IMPORT_SFUNC(READ_PORT_UCHAR, 1),
-	IMPORT_SFUNC(READ_PORT_BUFFER_ULONG, 3),
-	IMPORT_SFUNC(READ_PORT_BUFFER_USHORT, 3),
-	IMPORT_SFUNC(READ_PORT_BUFFER_UCHAR, 3),
-	IMPORT_FFUNC(KfAcquireSpinLock, 1),
-	IMPORT_FFUNC(KfReleaseSpinLock, 1),
-	IMPORT_SFUNC(KeGetCurrentIrql, 0),
-	IMPORT_SFUNC(KeQueryPerformanceCounter, 1),
-	IMPORT_FFUNC(KfLowerIrql, 1),
-	IMPORT_FFUNC(KfRaiseIrql, 1),
-	IMPORT_SFUNC(KeRaiseIrqlToDpcLevel, 0),
-#undef KeLowerIrql
-	IMPORT_SFUNC_MAP(KeLowerIrql, _KeLowerIrql, 1),
-
-	/*
-	 * This last entry is a catch-all for any function we haven't
-	 * implemented yet. The PE import list patching routine will
-	 * use it for any function that doesn't have an explicit match
-	 * in this table.
-	 */
-
-	{ NULL, (FUNC)dummy, NULL, 0, WINDRV_WRAP_STDCALL },
-
-	/* End of list. */
-	{ NULL, NULL, NULL }
-};
diff --git a/sys/compat/ndis/subr_ndis.c b/sys/compat/ndis/subr_ndis.c
deleted file mode 100644
index fb037d52b1d4..000000000000
--- a/sys/compat/ndis/subr_ndis.c
+++ /dev/null
@@ -1,3372 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
- * Copyright (c) 2003
- *	Bill Paul <wpaul@windriver.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-/*
- * This file implements a translation layer between the BSD networking
- * infrasturcture and Windows(R) NDIS network driver modules. A Windows
- * NDIS driver calls into several functions in the NDIS.SYS Windows
- * kernel module and exports a table of functions designed to be called
- * by the NDIS subsystem. Using the PE loader, we can patch our own
- * versions of the NDIS routines into a given Windows driver module and
- * convince the driver that it is in fact running on Windows.
- *
- * We provide a table of all our implemented NDIS routines which is patched
- * into the driver object code. All our exported routines must use the
- * _stdcall calling convention, since that's what the Windows object code
- * expects.
- */
-
-#include <sys/ctype.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/errno.h>
-
-#include <sys/callout.h>
-#include <sys/kernel.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/socket.h>
-#include <sys/sysctl.h>
-#include <sys/timespec.h>
-#include <sys/smp.h>
-#include <sys/queue.h>
-#include <sys/proc.h>
-#include <sys/filedesc.h>
-#include <sys/namei.h>
-#include <sys/fcntl.h>
-#include <sys/vnode.h>
-#include <sys/kthread.h>
-#include <sys/linker.h>
-#include <sys/mount.h>
-#include <sys/sysproto.h>
-
-#include <net/if.h>
-#include <net/if_var.h>
-#include <net/if_arp.h>
-#include <net/ethernet.h>
-#include <net/if_dl.h>
-#include <net/if_media.h>
-
-#include <machine/atomic.h>
-#include <machine/bus.h>
-#include <machine/resource.h>
-
-#include <sys/bus.h>
-#include <sys/rman.h>
-
-#include <machine/stdarg.h>
-
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_ioctl.h>
-
-#include <dev/pci/pcireg.h>
-#include <dev/pci/pcivar.h>
-#include <dev/usb/usb.h>
-#include <dev/usb/usbdi.h>
-
-#include <compat/ndis/pe_var.h>
-#include <compat/ndis/cfg_var.h>
-#include <compat/ndis/resource_var.h>
-#include <compat/ndis/ntoskrnl_var.h>
-#include <compat/ndis/hal_var.h>
-#include <compat/ndis/ndis_var.h>
-#include <dev/if_ndis/if_ndisvar.h>
-
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/pmap.h>
-#include <vm/uma.h>
-#include <vm/vm_kern.h>
-#include <vm/vm_map.h>
-
-static char ndis_filepath[MAXPATHLEN];
-
-SYSCTL_STRING(_hw, OID_AUTO, ndis_filepath, CTLFLAG_RW, ndis_filepath,
-    MAXPATHLEN, "Path used by NdisOpenFile() to search for files");
-
-static void NdisInitializeWrapper(ndis_handle *,
-	driver_object *, void *, void *);
-static ndis_status NdisMRegisterMiniport(ndis_handle,
-	ndis_miniport_characteristics *, int);
-static ndis_status NdisAllocateMemoryWithTag(void **,
-	uint32_t, uint32_t);
-static ndis_status NdisAllocateMemory(void **,
-	uint32_t, uint32_t, ndis_physaddr);
-static void NdisFreeMemory(void *, uint32_t, uint32_t);
-static ndis_status NdisMSetAttributesEx(ndis_handle, ndis_handle,
-	uint32_t, uint32_t, ndis_interface_type);
-static void NdisOpenConfiguration(ndis_status *,
-	ndis_handle *, ndis_handle);
-static void NdisOpenConfigurationKeyByIndex(ndis_status *,
-	ndis_handle, uint32_t, unicode_string *, ndis_handle *);
-static void NdisOpenConfigurationKeyByName(ndis_status *,
-	ndis_handle, unicode_string *, ndis_handle *);
-static ndis_status ndis_encode_parm(ndis_miniport_block *,
-	struct sysctl_oid *, ndis_parm_type, ndis_config_parm **);
-static ndis_status ndis_decode_parm(ndis_miniport_block *,
-	ndis_config_parm *, char *);
-static void NdisReadConfiguration(ndis_status *, ndis_config_parm **,
-	ndis_handle, unicode_string *, ndis_parm_type);
-static void NdisWriteConfiguration(ndis_status *, ndis_handle,
-	unicode_string *, ndis_config_parm *);
-static void NdisCloseConfiguration(ndis_handle);
-static void NdisAllocateSpinLock(ndis_spin_lock *);
-static void NdisFreeSpinLock(ndis_spin_lock *);
-static void NdisAcquireSpinLock(ndis_spin_lock *);
-static void NdisReleaseSpinLock(ndis_spin_lock *);
-static void NdisDprAcquireSpinLock(ndis_spin_lock *);
-static void NdisDprReleaseSpinLock(ndis_spin_lock *);
-static void NdisInitializeReadWriteLock(ndis_rw_lock *);
-static void NdisAcquireReadWriteLock(ndis_rw_lock *,
-	uint8_t, ndis_lock_state *);
-static void NdisReleaseReadWriteLock(ndis_rw_lock *, ndis_lock_state *);
-static uint32_t NdisReadPciSlotInformation(ndis_handle, uint32_t,
-	uint32_t, void *, uint32_t);
-static uint32_t NdisWritePciSlotInformation(ndis_handle, uint32_t,
-	uint32_t, void *, uint32_t);
-static void NdisWriteErrorLogEntry(ndis_handle, ndis_error_code, uint32_t, ...);
-static void ndis_map_cb(void *, bus_dma_segment_t *, int, int);
-static void NdisMStartBufferPhysicalMapping(ndis_handle,
-	ndis_buffer *, uint32_t, uint8_t, ndis_paddr_unit *, uint32_t *);
-static void NdisMCompleteBufferPhysicalMapping(ndis_handle,
-	ndis_buffer *, uint32_t);
-static void NdisMInitializeTimer(ndis_miniport_timer *, ndis_handle,
-	ndis_timer_function, void *);
-static void NdisInitializeTimer(ndis_timer *,
-	ndis_timer_function, void *);
-static void NdisSetTimer(ndis_timer *, uint32_t);
-static void NdisMSetPeriodicTimer(ndis_miniport_timer *, uint32_t);
-static void NdisMCancelTimer(ndis_timer *, uint8_t *);
-static void ndis_timercall(kdpc *, ndis_miniport_timer *,
-	void *, void *);
-static void NdisMQueryAdapterResources(ndis_status *, ndis_handle,
-	ndis_resource_list *, uint32_t *);
-static ndis_status NdisMRegisterIoPortRange(void **,
-	ndis_handle, uint32_t, uint32_t);
-static void NdisMDeregisterIoPortRange(ndis_handle,
-	uint32_t, uint32_t, void *);
-static void NdisReadNetworkAddress(ndis_status *, void **,
-	uint32_t *, ndis_handle);
-static ndis_status NdisQueryMapRegisterCount(uint32_t, uint32_t *);
-static ndis_status NdisMAllocateMapRegisters(ndis_handle,
-	uint32_t, uint8_t, uint32_t, uint32_t);
-static void NdisMFreeMapRegisters(ndis_handle);
-static void ndis_mapshared_cb(void *, bus_dma_segment_t *, int, int);
-static void NdisMAllocateSharedMemory(ndis_handle, uint32_t,
-	uint8_t, void **, ndis_physaddr *);
-static void ndis_asyncmem_complete(device_object *, void *);
-static ndis_status NdisMAllocateSharedMemoryAsync(ndis_handle,
-	uint32_t, uint8_t, void *);
-static void NdisMFreeSharedMemory(ndis_handle, uint32_t,
-	uint8_t, void *, ndis_physaddr);
-static ndis_status NdisMMapIoSpace(void **, ndis_handle,
-	ndis_physaddr, uint32_t);
-static void NdisMUnmapIoSpace(ndis_handle, void *, uint32_t);
-static uint32_t NdisGetCacheFillSize(void);
-static void *NdisGetRoutineAddress(unicode_string *);
-static uint32_t NdisMGetDmaAlignment(ndis_handle);
-static ndis_status NdisMInitializeScatterGatherDma(ndis_handle,
-	uint8_t, uint32_t);
-static void NdisUnchainBufferAtFront(ndis_packet *, ndis_buffer **);
-static void NdisUnchainBufferAtBack(ndis_packet *, ndis_buffer **);
-static void NdisAllocateBufferPool(ndis_status *,
-	ndis_handle *, uint32_t);
-static void NdisFreeBufferPool(ndis_handle);
-static void NdisAllocateBuffer(ndis_status *, ndis_buffer **,
-	ndis_handle, void *, uint32_t);
-static void NdisFreeBuffer(ndis_buffer *);
-static uint32_t NdisBufferLength(ndis_buffer *);
-static void NdisQueryBuffer(ndis_buffer *, void **, uint32_t *);
-static void NdisQueryBufferSafe(ndis_buffer *, void **,
-	uint32_t *, uint32_t);
-static void *NdisBufferVirtualAddress(ndis_buffer *);
-static void *NdisBufferVirtualAddressSafe(ndis_buffer *, uint32_t);
-static void NdisAdjustBufferLength(ndis_buffer *, int);
-static uint32_t NdisInterlockedIncrement(uint32_t *);
-static uint32_t NdisInterlockedDecrement(uint32_t *);
-static void NdisInitializeEvent(ndis_event *);
-static void NdisSetEvent(ndis_event *);
-static void NdisResetEvent(ndis_event *);
-static uint8_t NdisWaitEvent(ndis_event *, uint32_t);
-static ndis_status NdisUnicodeStringToAnsiString(ansi_string *,
-	unicode_string *);
-static ndis_status
-	NdisAnsiStringToUnicodeString(unicode_string *, ansi_string *);
-static ndis_status NdisMPciAssignResources(ndis_handle,
-	uint32_t, ndis_resource_list **);
-static ndis_status NdisMRegisterInterrupt(ndis_miniport_interrupt *,
-	ndis_handle, uint32_t, uint32_t, uint8_t,
-	uint8_t, ndis_interrupt_mode);
-static void NdisMDeregisterInterrupt(ndis_miniport_interrupt *);
-static void NdisMRegisterAdapterShutdownHandler(ndis_handle, void *,
-	ndis_shutdown_handler);
-static void NdisMDeregisterAdapterShutdownHandler(ndis_handle);
-static uint32_t NDIS_BUFFER_TO_SPAN_PAGES(ndis_buffer *);
-static void NdisGetBufferPhysicalArraySize(ndis_buffer *,
-	uint32_t *);
-static void NdisQueryBufferOffset(ndis_buffer *,
-	uint32_t *, uint32_t *);
-static uint32_t NdisReadPcmciaAttributeMemory(ndis_handle,
-	uint32_t, void *, uint32_t);
-static uint32_t NdisWritePcmciaAttributeMemory(ndis_handle,
-	uint32_t, void *, uint32_t);
-static list_entry *NdisInterlockedInsertHeadList(list_entry *,
-	list_entry *, ndis_spin_lock *);
-static list_entry *NdisInterlockedRemoveHeadList(list_entry *,
-	ndis_spin_lock *);
-static list_entry *NdisInterlockedInsertTailList(list_entry *,
-	list_entry *, ndis_spin_lock *);
-static uint8_t
-	NdisMSynchronizeWithInterrupt(ndis_miniport_interrupt *,
-	void *, void *);
-static void NdisGetCurrentSystemTime(uint64_t *);
-static void NdisGetSystemUpTime(uint32_t *);
-static uint32_t NdisGetVersion(void);
-static void NdisInitializeString(unicode_string *, char *);
-static void NdisInitAnsiString(ansi_string *, char *);
-static void NdisInitUnicodeString(unicode_string *, uint16_t *);
-static void NdisFreeString(unicode_string *);
-static ndis_status NdisMRemoveMiniport(ndis_handle *);
-static void NdisTerminateWrapper(ndis_handle, void *);
-static void NdisMGetDeviceProperty(ndis_handle, device_object **,
-	device_object **, device_object **, cm_resource_list *,
-	cm_resource_list *);
-static void NdisGetFirstBufferFromPacket(ndis_packet *,
-	ndis_buffer **, void **, uint32_t *, uint32_t *);
-static void NdisGetFirstBufferFromPacketSafe(ndis_packet *,
-	ndis_buffer **, void **, uint32_t *, uint32_t *, uint32_t);
-static int ndis_find_sym(linker_file_t, char *, char *, caddr_t *);
-static void NdisOpenFile(ndis_status *, ndis_handle *, uint32_t *,
-	unicode_string *, ndis_physaddr);
-static void NdisMapFile(ndis_status *, void **, ndis_handle);
-static void NdisUnmapFile(ndis_handle);
-static void NdisCloseFile(ndis_handle);
-static uint8_t NdisSystemProcessorCount(void);
-static void NdisGetCurrentProcessorCounts(uint32_t *, uint32_t *, uint32_t *);
-static void NdisMIndicateStatusComplete(ndis_handle);
-static void NdisMIndicateStatus(ndis_handle, ndis_status,
-    void *, uint32_t);
-static uint8_t ndis_intr(kinterrupt *, void *);
-static void ndis_intrhand(kdpc *, ndis_miniport_interrupt *, void *, void *);
-static funcptr ndis_findwrap(funcptr);
-static void NdisCopyFromPacketToPacket(ndis_packet *,
-	uint32_t, uint32_t, ndis_packet *, uint32_t, uint32_t *);
-static void NdisCopyFromPacketToPacketSafe(ndis_packet *,
-	uint32_t, uint32_t, ndis_packet *, uint32_t, uint32_t *, uint32_t);
-static void NdisIMCopySendPerPacketInfo(ndis_packet *, ndis_packet *);
-static ndis_status NdisMRegisterDevice(ndis_handle,
-	unicode_string *, unicode_string *, driver_dispatch **,
-	void **, ndis_handle *);
-static ndis_status NdisMDeregisterDevice(ndis_handle);
-static ndis_status
-	NdisMQueryAdapterInstanceName(unicode_string *, ndis_handle);
-static void NdisMRegisterUnloadHandler(ndis_handle, void *);
-static void dummy(void);
-
-/*
- * Some really old drivers do not properly check the return value
- * from NdisAllocatePacket() and NdisAllocateBuffer() and will
- * sometimes allocate few more buffers/packets that they originally
- * requested when they created the pool. To prevent this from being
- * a problem, we allocate a few extra buffers/packets beyond what
- * the driver asks for. This #define controls how many.
- */
-#define NDIS_POOL_EXTRA		16
-
-int
-ndis_libinit()
-{
-	image_patch_table	*patch;
-
-	strcpy(ndis_filepath, "/compat/ndis");
-
-	patch = ndis_functbl;
-	while (patch->ipt_func != NULL) {
-		windrv_wrap((funcptr)patch->ipt_func,
-		    (funcptr *)&patch->ipt_wrap,
-		    patch->ipt_argcnt, patch->ipt_ftype);
-		patch++;
-	}
-
-	return (0);
-}
-
-int
-ndis_libfini()
-{
-	image_patch_table	*patch;
-
-	patch = ndis_functbl;
-	while (patch->ipt_func != NULL) {
-		windrv_unwrap(patch->ipt_wrap);
-		patch++;
-	}
-
-	return (0);
-}
-
-static funcptr
-ndis_findwrap(func)
-	funcptr			func;
-{
-	image_patch_table	*patch;
-
-	patch = ndis_functbl;
-	while (patch->ipt_func != NULL) {
-		if ((funcptr)patch->ipt_func == func)
-			return ((funcptr)patch->ipt_wrap);
-		patch++;
-	}
-
-	return (NULL);
-}
-
-/*
- * This routine does the messy Windows Driver Model device attachment
- * stuff on behalf of NDIS drivers. We register our own AddDevice
- * routine here
- */
-static void
-NdisInitializeWrapper(wrapper, drv, path, unused)
-	ndis_handle		*wrapper;
-	driver_object		*drv;
-	void			*path;
-	void			*unused;
-{
-	/*
-	 * As of yet, I haven't come up with a compelling
-	 * reason to define a private NDIS wrapper structure,
-	 * so we use a pointer to the driver object as the
-	 * wrapper handle. The driver object has the miniport
-	 * characteristics struct for this driver hung off it
-	 * via IoAllocateDriverObjectExtension(), and that's
-	 * really all the private data we need.
-	 */
-
-	*wrapper = drv;
-
-	/*
-	 * If this was really Windows, we'd be registering dispatch
-	 * routines for the NDIS miniport module here, but we're
-	 * not Windows so all we really need to do is set up an
-	 * AddDevice function that'll be invoked when a new device
-	 * instance appears.
-	 */
-
-	drv->dro_driverext->dre_adddevicefunc = NdisAddDevice;
-}
-
-static void
-NdisTerminateWrapper(handle, syspec)
-	ndis_handle		handle;
-	void			*syspec;
-{
-	/* Nothing to see here, move along. */
-}
-
-static ndis_status
-NdisMRegisterMiniport(handle, characteristics, len)
-	ndis_handle		handle;
-	ndis_miniport_characteristics *characteristics;
-	int			len;
-{
-	ndis_miniport_characteristics	*ch = NULL;
-	driver_object		*drv;
-
-	drv = (driver_object *)handle;
-
-	/*
-	 * We need to save the NDIS miniport characteristics
-	 * somewhere. This data is per-driver, not per-device
-	 * (all devices handled by the same driver have the
-	 * same characteristics) so we hook it onto the driver
-	 * object using IoAllocateDriverObjectExtension().
-	 * The extra extension info is automagically deleted when
-	 * the driver is unloaded (see windrv_unload()).
-	 */
-
-	if (IoAllocateDriverObjectExtension(drv, (void *)1,
-	    sizeof(ndis_miniport_characteristics), (void **)&ch) !=
-	    STATUS_SUCCESS) {
-		return (NDIS_STATUS_RESOURCES);
-	}
-
-	bzero((char *)ch, sizeof(ndis_miniport_characteristics));
-
-	bcopy((char *)characteristics, (char *)ch, len);
-
-	if (ch->nmc_version_major < 5 || ch->nmc_version_minor < 1) {
-		ch->nmc_shutdown_handler = NULL;
-		ch->nmc_canceltxpkts_handler = NULL;
-		ch->nmc_pnpevent_handler = NULL;
-	}
-
-	return (NDIS_STATUS_SUCCESS);
-}
-
-static ndis_status
-NdisAllocateMemoryWithTag(vaddr, len, tag)
-	void			**vaddr;
-	uint32_t		len;
-	uint32_t		tag;
-{
-	void			*mem;
-
-	mem = ExAllocatePoolWithTag(NonPagedPool, len, tag);
-	if (mem == NULL) {
-		return (NDIS_STATUS_RESOURCES);
-	}
-	*vaddr = mem;
-
-	return (NDIS_STATUS_SUCCESS);
-}
-
-static ndis_status
-NdisAllocateMemory(vaddr, len, flags, highaddr)
-	void			**vaddr;
-	uint32_t		len;
-	uint32_t		flags;
-	ndis_physaddr		highaddr;
-{
-	void			*mem;
-
-	mem = ExAllocatePoolWithTag(NonPagedPool, len, 0);
-	if (mem == NULL)
-		return (NDIS_STATUS_RESOURCES);
-	*vaddr = mem;
-
-	return (NDIS_STATUS_SUCCESS);
-}
-
-static void
-NdisFreeMemory(vaddr, len, flags)
-	void			*vaddr;
-	uint32_t		len;
-	uint32_t		flags;
-{
-	if (len == 0)
-		return;
-
-	ExFreePool(vaddr);
-}
-
-static ndis_status
-NdisMSetAttributesEx(adapter_handle, adapter_ctx, hangsecs,
-			flags, iftype)
-	ndis_handle			adapter_handle;
-	ndis_handle			adapter_ctx;
-	uint32_t			hangsecs;
-	uint32_t			flags;
-	ndis_interface_type		iftype;
-{
-	ndis_miniport_block		*block;
-
-	/*
-	 * Save the adapter context, we need it for calling
-	 * the driver's internal functions.
-	 */
-	block = (ndis_miniport_block *)adapter_handle;
-	block->nmb_miniportadapterctx = adapter_ctx;
-	block->nmb_checkforhangsecs = hangsecs;
-	block->nmb_flags = flags;
-
-	return (NDIS_STATUS_SUCCESS);
-}
-
-static void
-NdisOpenConfiguration(status, cfg, wrapctx)
-	ndis_status		*status;
-	ndis_handle		*cfg;
-	ndis_handle		wrapctx;
-{
-	*cfg = wrapctx;
-	*status = NDIS_STATUS_SUCCESS;
-}
-
-static void
-NdisOpenConfigurationKeyByName(status, cfg, subkey, subhandle)
-	ndis_status		*status;
-	ndis_handle		cfg;
-	unicode_string		*subkey;
-	ndis_handle		*subhandle;
-{
-	*subhandle = cfg;
-	*status = NDIS_STATUS_SUCCESS;
-}
-
-static void
-NdisOpenConfigurationKeyByIndex(status, cfg, idx, subkey, subhandle)
-	ndis_status		*status;
-	ndis_handle		cfg;
-	uint32_t		idx;
-	unicode_string		*subkey;
-	ndis_handle		*subhandle;
-{
-	*status = NDIS_STATUS_FAILURE;
-}
-
-static ndis_status
-ndis_encode_parm(block, oid, type, parm)
-	ndis_miniport_block	*block;
-	struct sysctl_oid	*oid;
-	ndis_parm_type		type;
-	ndis_config_parm	**parm;
-{
-	ndis_config_parm	*p;
-	ndis_parmlist_entry	*np;
-	unicode_string		*us;
-	ansi_string		as;
-	int			base = 0;
-	uint32_t		val;
-	char			tmp[32];
-
-	np = ExAllocatePoolWithTag(NonPagedPool,
-	    sizeof(ndis_parmlist_entry), 0);
-	if (np == NULL)
-		return (NDIS_STATUS_RESOURCES);
-	InsertHeadList((&block->nmb_parmlist), (&np->np_list));
-	*parm = p = &np->np_parm;
-
-	switch(type) {
-	case ndis_parm_string:
-		/* See if this might be a number. */
-		val = strtoul((char *)oid->oid_arg1, NULL, 10);
-		us = &p->ncp_parmdata.ncp_stringdata;
-		p->ncp_type = ndis_parm_string;
-		if (val) {
-			snprintf(tmp, 32, "%x", val);
-			RtlInitAnsiString(&as, tmp);
-		} else {
-			RtlInitAnsiString(&as, (char *)oid->oid_arg1);
-		}
-
-		if (RtlAnsiStringToUnicodeString(us, &as, TRUE)) {
-			ExFreePool(np);
-			return (NDIS_STATUS_RESOURCES);
-		}
-		break;
-	case ndis_parm_int:
-		if (strncmp((char *)oid->oid_arg1, "0x", 2) == 0)
-			base = 16;
-		else
-			base = 10;
-		p->ncp_type = ndis_parm_int;
-		p->ncp_parmdata.ncp_intdata =
-		    strtol((char *)oid->oid_arg1, NULL, base);
-		break;
-	case ndis_parm_hexint:
-#ifdef notdef
-		if (strncmp((char *)oid->oid_arg1, "0x", 2) == 0)
-			base = 16;
-		else
-			base = 10;
-#endif
-		base = 16;
-		p->ncp_type = ndis_parm_hexint;
-		p->ncp_parmdata.ncp_intdata =
-		    strtoul((char *)oid->oid_arg1, NULL, base);
-		break;
-	default:
-		return (NDIS_STATUS_FAILURE);
-		break;
-	}
-
-	return (NDIS_STATUS_SUCCESS);
-}
-
-static void
-NdisReadConfiguration(status, parm, cfg, key, type)
-	ndis_status		*status;
-	ndis_config_parm	**parm;
-	ndis_handle		cfg;
-	unicode_string		*key;
-	ndis_parm_type		type;
-{
-	char			*keystr = NULL;
-	ndis_miniport_block	*block;
-	struct ndis_softc	*sc;
-	struct sysctl_oid	*oidp;
-	struct sysctl_ctx_entry	*e;
-	ansi_string		as;
-
-	block = (ndis_miniport_block *)cfg;
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-	/*
-	device_printf(sc->ndis_dev, "NdisReadConfiguration sc=%p\n", sc);
-	*/
-
-	if (key->us_len == 0 || key->us_buf == NULL) {
-		*status = NDIS_STATUS_FAILURE;
-		return;
-	}
-
-	if (RtlUnicodeStringToAnsiString(&as, key, TRUE)) {
-		*status = NDIS_STATUS_RESOURCES;
-		return;
-	}
-
-	keystr = as.as_buf;
-
-	/*
-	 * See if registry key is already in a list of known keys
-	 * included with the driver.
-	 */
-	TAILQ_FOREACH(e, device_get_sysctl_ctx(sc->ndis_dev), link) {
-		oidp = e->entry;
-		if (strcasecmp(oidp->oid_name, keystr) == 0) {
-			if (strcmp((char *)oidp->oid_arg1, "UNSET") == 0) {
-				RtlFreeAnsiString(&as);
-				*status = NDIS_STATUS_FAILURE;
-				return;
-			}
-
-			*status = ndis_encode_parm(block, oidp, type, parm);
-			RtlFreeAnsiString(&as);
-			return;
-		}
-	}
-
-	/*
-	 * If the key didn't match, add it to the list of dynamically
-	 * created ones. Sometimes, drivers refer to registry keys
-	 * that aren't documented in their .INF files. These keys
-	 * are supposed to be created by some sort of utility or
-	 * control panel snap-in that comes with the driver software.
-	 * Sometimes it's useful to be able to manipulate these.
-	 * If the driver requests the key in the form of a string,
-	 * make its default value an empty string, otherwise default
-	 * it to "0".
-	 */
-
-	if (type == ndis_parm_int || type == ndis_parm_hexint)
-		ndis_add_sysctl(sc, keystr, "(dynamic integer key)",
-		    "UNSET", CTLFLAG_RW);
-	else
-		ndis_add_sysctl(sc, keystr, "(dynamic string key)",
-		    "UNSET", CTLFLAG_RW);
-
-	RtlFreeAnsiString(&as);
-	*status = NDIS_STATUS_FAILURE;
-}
-
-static ndis_status
-ndis_decode_parm(block, parm, val)
-	ndis_miniport_block	*block;
-	ndis_config_parm	*parm;
-	char			*val;
-{
-	unicode_string		*ustr;
-	ansi_string		as;
-
-	switch(parm->ncp_type) {
-	case ndis_parm_string:
-		ustr = &parm->ncp_parmdata.ncp_stringdata;
-		if (RtlUnicodeStringToAnsiString(&as, ustr, TRUE))
-			return (NDIS_STATUS_RESOURCES);
-		bcopy(as.as_buf, val, as.as_len);
-		RtlFreeAnsiString(&as);
-		break;
-	case ndis_parm_int:
-		sprintf(val, "%d", parm->ncp_parmdata.ncp_intdata);
-		break;
-	case ndis_parm_hexint:
-		sprintf(val, "%xu", parm->ncp_parmdata.ncp_intdata);
-		break;
-	default:
-		return (NDIS_STATUS_FAILURE);
-		break;
-	}
-	return (NDIS_STATUS_SUCCESS);
-}
-
-static void
-NdisWriteConfiguration(status, cfg, key, parm)
-	ndis_status		*status;
-	ndis_handle		cfg;
-	unicode_string		*key;
-	ndis_config_parm	*parm;
-{
-	ansi_string		as;
-	char			*keystr = NULL;
-	ndis_miniport_block	*block;
-	struct ndis_softc	*sc;
-	struct sysctl_oid	*oidp;
-	struct sysctl_ctx_entry	*e;
-	char			val[256];
-
-	block = (ndis_miniport_block *)cfg;
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-
-	if (RtlUnicodeStringToAnsiString(&as, key, TRUE)) {
-		*status = NDIS_STATUS_RESOURCES;
-		return;
-	}
-
-	keystr = as.as_buf;
-
-	/* Decode the parameter into a string. */
-	bzero(val, sizeof(val));
-	*status = ndis_decode_parm(block, parm, val);
-	if (*status != NDIS_STATUS_SUCCESS) {
-		RtlFreeAnsiString(&as);
-		return;
-	}
-
-	/* See if the key already exists. */
-
-	TAILQ_FOREACH(e, device_get_sysctl_ctx(sc->ndis_dev), link) {
-		oidp = e->entry;
-		if (strcasecmp(oidp->oid_name, keystr) == 0) {
-			/* Found it, set the value. */
-			strcpy((char *)oidp->oid_arg1, val);
-			RtlFreeAnsiString(&as);
-			return;
-		}
-	}
-
-	/* Not found, add a new key with the specified value. */
-	ndis_add_sysctl(sc, keystr, "(dynamically set key)",
-		    val, CTLFLAG_RW);
-
-	RtlFreeAnsiString(&as);
-	*status = NDIS_STATUS_SUCCESS;
-}
-
-static void
-NdisCloseConfiguration(cfg)
-	ndis_handle		cfg;
-{
-	list_entry		*e;
-	ndis_parmlist_entry	*pe;
-	ndis_miniport_block	*block;
-	ndis_config_parm	*p;
-
-	block = (ndis_miniport_block *)cfg;
-
-	while (!IsListEmpty(&block->nmb_parmlist)) {
-		e = RemoveHeadList(&block->nmb_parmlist);
-		pe = CONTAINING_RECORD(e, ndis_parmlist_entry, np_list);
-		p = &pe->np_parm;
-		if (p->ncp_type == ndis_parm_string)
-			RtlFreeUnicodeString(&p->ncp_parmdata.ncp_stringdata);
-		ExFreePool(e);
-	}
-}
-
-/*
- * Initialize a Windows spinlock.
- */
-static void
-NdisAllocateSpinLock(lock)
-	ndis_spin_lock		*lock;
-{
-	KeInitializeSpinLock(&lock->nsl_spinlock);
-	lock->nsl_kirql = 0;
-}
-
-/*
- * Destroy a Windows spinlock. This is a no-op for now. There are two reasons
- * for this. One is that it's sort of superfluous: we don't have to do anything
- * special to deallocate the spinlock. The other is that there are some buggy
- * drivers which call NdisFreeSpinLock() _after_ calling NdisFreeMemory() on
- * the block of memory in which the spinlock resides. (Yes, ADMtek, I'm
- * talking to you.)
- */
-static void
-NdisFreeSpinLock(lock)
-	ndis_spin_lock		*lock;
-{
-#ifdef notdef
-	KeInitializeSpinLock(&lock->nsl_spinlock);
-	lock->nsl_kirql = 0;
-#endif
-}
-
-/*
- * Acquire a spinlock from IRQL <= DISPATCH_LEVEL.
- */
-
-static void
-NdisAcquireSpinLock(lock)
-	ndis_spin_lock		*lock;
-{
-	KeAcquireSpinLock(&lock->nsl_spinlock, &lock->nsl_kirql);
-}
-
-/*
- * Release a spinlock from IRQL == DISPATCH_LEVEL.
- */
-
-static void
-NdisReleaseSpinLock(lock)
-	ndis_spin_lock		*lock;
-{
-	KeReleaseSpinLock(&lock->nsl_spinlock, lock->nsl_kirql);
-}
-
-/*
- * Acquire a spinlock when already running at IRQL == DISPATCH_LEVEL.
- */
-static void
-NdisDprAcquireSpinLock(lock)
-	ndis_spin_lock		*lock;
-{
-	KeAcquireSpinLockAtDpcLevel(&lock->nsl_spinlock);
-}
-
-/*
- * Release a spinlock without leaving IRQL == DISPATCH_LEVEL.
- */
-static void
-NdisDprReleaseSpinLock(lock)
-	ndis_spin_lock		*lock;
-{
-	KeReleaseSpinLockFromDpcLevel(&lock->nsl_spinlock);
-}
-
-static void
-NdisInitializeReadWriteLock(lock)
-	ndis_rw_lock		*lock;
-{
-	KeInitializeSpinLock(&lock->nrl_spinlock);
-	bzero((char *)&lock->nrl_rsvd, sizeof(lock->nrl_rsvd));
-}
-
-static void
-NdisAcquireReadWriteLock(ndis_rw_lock *lock, uint8_t writeacc,
-    ndis_lock_state *state)
-{
-	if (writeacc == TRUE) {
-		KeAcquireSpinLock(&lock->nrl_spinlock, &state->nls_oldirql);
-		lock->nrl_rsvd[0]++;
-	} else
-		lock->nrl_rsvd[1]++;
-}
-
-static void
-NdisReleaseReadWriteLock(lock, state)
-	ndis_rw_lock		*lock;
-	ndis_lock_state		*state;
-{
-	if (lock->nrl_rsvd[0]) {
-		lock->nrl_rsvd[0]--;
-		KeReleaseSpinLock(&lock->nrl_spinlock, state->nls_oldirql);
-	} else
-		lock->nrl_rsvd[1]--;
-}
-
-static uint32_t
-NdisReadPciSlotInformation(adapter, slot, offset, buf, len)
-	ndis_handle		adapter;
-	uint32_t		slot;
-	uint32_t		offset;
-	void			*buf;
-	uint32_t		len;
-{
-	ndis_miniport_block	*block;
-	uint32_t		i;
-	char			*dest;
-	device_t		dev;
-
-	block = (ndis_miniport_block *)adapter;
-	dest = buf;
-	if (block == NULL)
-		return (0);
-
-	dev = block->nmb_physdeviceobj->do_devext;
-
-	/*
-	 * I have a test system consisting of a Sun w2100z
-	 * dual 2.4Ghz Opteron machine and an Atheros 802.11a/b/g
-	 * "Aries" miniPCI NIC. (The NIC is installed in the
-	 * machine using a miniPCI to PCI bus adapter card.)
-	 * When running in SMP mode, I found that
-	 * performing a large number of consecutive calls to
-	 * NdisReadPciSlotInformation() would result in a
-	 * sudden system reset (or in some cases a freeze).
-	 * My suspicion is that the multiple reads are somehow
-	 * triggering a fatal PCI bus error that leads to a
-	 * machine check. The 1us delay in the loop below
-	 * seems to prevent this problem.
-	 */
-
-	for (i = 0; i < len; i++) {
-		DELAY(1);
-		dest[i] = pci_read_config(dev, i + offset, 1);
-	}
-
-	return (len);
-}
-
-static uint32_t
-NdisWritePciSlotInformation(adapter, slot, offset, buf, len)
-	ndis_handle		adapter;
-	uint32_t		slot;
-	uint32_t		offset;
-	void			*buf;
-	uint32_t		len;
-{
-	ndis_miniport_block	*block;
-	uint32_t		i;
-	char			*dest;
-	device_t		dev;
-
-	block = (ndis_miniport_block *)adapter;
-	dest = buf;
-
-	if (block == NULL)
-		return (0);
-
-	dev = block->nmb_physdeviceobj->do_devext;
-	for (i = 0; i < len; i++) {
-		DELAY(1);
-		pci_write_config(dev, i + offset, dest[i], 1);
-	}
-
-	return (len);
-}
-
-/*
- * The errorlog routine uses a variable argument list, so we
- * have to declare it this way.
- */
-
-#define ERRMSGLEN 512
-static void
-NdisWriteErrorLogEntry(ndis_handle adapter, ndis_error_code code,
-	uint32_t numerrors, ...)
-{
-	ndis_miniport_block	*block;
-	va_list			ap;
-	int			i, error;
-	char			*str = NULL;
-	uint16_t		flags;
-	device_t		dev;
-	driver_object		*drv;
-	struct ndis_softc	*sc;
-	struct ifnet		*ifp;
-	unicode_string		us;
-	ansi_string		as = { 0, 0, NULL };
-
-	block = (ndis_miniport_block *)adapter;
-	dev = block->nmb_physdeviceobj->do_devext;
-	drv = block->nmb_deviceobj->do_drvobj;
-	sc = device_get_softc(dev);
-	ifp = NDISUSB_GET_IFNET(sc);
-
-	if (ifp != NULL && ifp->if_flags & IFF_DEBUG) {
-		error = pe_get_message((vm_offset_t)drv->dro_driverstart,
-		    code, &str, &i, &flags);
-		if (error == 0) {
-			if (flags & MESSAGE_RESOURCE_UNICODE) {
-				RtlInitUnicodeString(&us, (uint16_t *)str);
-				if (RtlUnicodeStringToAnsiString(&as,
-				    &us, TRUE) == STATUS_SUCCESS)
-					str = as.as_buf;
-				else
-					str = NULL;
-			}
-		}
-	}
-
-	device_printf(dev, "NDIS ERROR: %x (%s)\n", code,
-	    str == NULL ? "unknown error" : str);
-
-	if (ifp != NULL && ifp->if_flags & IFF_DEBUG) {
-		device_printf(dev, "NDIS NUMERRORS: %x\n", numerrors);
-		va_start(ap, numerrors);
-		for (i = 0; i < numerrors; i++)
-			device_printf(dev, "argptr: %p\n",
-			    va_arg(ap, void *));
-		va_end(ap);
-	}
-
-	if (as.as_len)
-		RtlFreeAnsiString(&as);
-}
-
-static void
-ndis_map_cb(arg, segs, nseg, error)
-	void			*arg;
-	bus_dma_segment_t	*segs;
-	int			nseg;
-	int			error;
-{
-	struct ndis_map_arg	*ctx;
-	int			i;
-
-	if (error)
-		return;
-
-	ctx = arg;
-
-	for (i = 0; i < nseg; i++) {
-		ctx->nma_fraglist[i].npu_physaddr.np_quad = segs[i].ds_addr;
-		ctx->nma_fraglist[i].npu_len = segs[i].ds_len;
-	}
-
-	ctx->nma_cnt = nseg;
-}
-
-static void
-NdisMStartBufferPhysicalMapping(ndis_handle adapter, ndis_buffer *buf,
-    uint32_t mapreg, uint8_t writedev, ndis_paddr_unit *addrarray,
-    uint32_t *arraysize)
-{
-	ndis_miniport_block	*block;
-	struct ndis_softc	*sc;
-	struct ndis_map_arg	nma;
-	bus_dmamap_t		map;
-	int			error;
-
-	if (adapter == NULL)
-		return;
-
-	block = (ndis_miniport_block *)adapter;
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-
-	if (mapreg > sc->ndis_mmapcnt)
-		return;
-
-	map = sc->ndis_mmaps[mapreg];
-	nma.nma_fraglist = addrarray;
-
-	error = bus_dmamap_load(sc->ndis_mtag, map,
-	    MmGetMdlVirtualAddress(buf), MmGetMdlByteCount(buf), ndis_map_cb,
-	    (void *)&nma, BUS_DMA_NOWAIT);
-
-	if (error)
-		return;
-
-	bus_dmamap_sync(sc->ndis_mtag, map,
-	    writedev ? BUS_DMASYNC_PREWRITE : BUS_DMASYNC_PREREAD);
-
-	*arraysize = nma.nma_cnt;
-}
-
-static void
-NdisMCompleteBufferPhysicalMapping(adapter, buf, mapreg)
-	ndis_handle		adapter;
-	ndis_buffer		*buf;
-	uint32_t		mapreg;
-{
-	ndis_miniport_block	*block;
-	struct ndis_softc	*sc;
-	bus_dmamap_t		map;
-
-	if (adapter == NULL)
-		return;
-
-	block = (ndis_miniport_block *)adapter;
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-
-	if (mapreg > sc->ndis_mmapcnt)
-		return;
-
-	map = sc->ndis_mmaps[mapreg];
-
-	bus_dmamap_sync(sc->ndis_mtag, map,
-	    BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE);
-
-	bus_dmamap_unload(sc->ndis_mtag, map);
-}
-
-/*
- * This is an older (?) timer init routine which doesn't
- * accept a miniport context handle. Serialized miniports should
- * never call this function.
- */
-
-static void
-NdisInitializeTimer(timer, func, ctx)
-	ndis_timer		*timer;
-	ndis_timer_function	func;
-	void			*ctx;
-{
-	KeInitializeTimer(&timer->nt_ktimer);
-	KeInitializeDpc(&timer->nt_kdpc, func, ctx);
-	KeSetImportanceDpc(&timer->nt_kdpc, KDPC_IMPORTANCE_LOW);
-}
-
-static void
-ndis_timercall(dpc, timer, sysarg1, sysarg2)
-	kdpc			*dpc;
-	ndis_miniport_timer	*timer;
-	void			*sysarg1;
-	void			*sysarg2;
-{
-	/*
-	 * Since we're called as a DPC, we should be running
-	 * at DISPATCH_LEVEL here. This means to acquire the
-	 * spinlock, we can use KeAcquireSpinLockAtDpcLevel()
-	 * rather than KeAcquireSpinLock().
-	 */
-	if (NDIS_SERIALIZED(timer->nmt_block))
-		KeAcquireSpinLockAtDpcLevel(&timer->nmt_block->nmb_lock);
-
-	MSCALL4(timer->nmt_timerfunc, dpc, timer->nmt_timerctx,
-	    sysarg1, sysarg2);
-
-	if (NDIS_SERIALIZED(timer->nmt_block))
-		KeReleaseSpinLockFromDpcLevel(&timer->nmt_block->nmb_lock);
-}
-
-/*
- * For a long time I wondered why there were two NDIS timer initialization
- * routines, and why this one needed an NDIS_MINIPORT_TIMER and the
- * MiniportAdapterHandle. The NDIS_MINIPORT_TIMER has its own callout
- * function and context pointers separate from those in the DPC, which
- * allows for another level of indirection: when the timer fires, we
- * can have our own timer function invoked, and from there we can call
- * the driver's function. But why go to all that trouble? Then it hit
- * me: for serialized miniports, the timer callouts are not re-entrant.
- * By trapping the callouts and having access to the MiniportAdapterHandle,
- * we can protect the driver callouts by acquiring the NDIS serialization
- * lock. This is essential for allowing serialized miniports to work
- * correctly on SMP systems. On UP hosts, setting IRQL to DISPATCH_LEVEL
- * is enough to prevent other threads from pre-empting you, but with
- * SMP, you must acquire a lock as well, otherwise the other CPU is
- * free to clobber you.
- */
-static void
-NdisMInitializeTimer(timer, handle, func, ctx)
-	ndis_miniport_timer	*timer;
-	ndis_handle		handle;
-	ndis_timer_function	func;
-	void			*ctx;
-{
-	ndis_miniport_block	*block;
-	struct ndis_softc	*sc;
-
-	block = (ndis_miniport_block *)handle;
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-
-	/* Save the driver's funcptr and context */
-
-	timer->nmt_timerfunc = func;
-	timer->nmt_timerctx = ctx;
-	timer->nmt_block = handle;
-
-	/*
-	 * Set up the timer so it will call our intermediate DPC.
-	 * Be sure to use the wrapped entry point, since
-	 * ntoskrnl_run_dpc() expects to invoke a function with
-	 * Microsoft calling conventions.
-	 */
-	KeInitializeTimer(&timer->nmt_ktimer);
-	KeInitializeDpc(&timer->nmt_kdpc,
-	    ndis_findwrap((funcptr)ndis_timercall), timer);
-	timer->nmt_ktimer.k_dpc = &timer->nmt_kdpc;
-}
-
-/*
- * In Windows, there's both an NdisMSetTimer() and an NdisSetTimer(),
- * but the former is just a macro wrapper around the latter.
- */
-static void
-NdisSetTimer(timer, msecs)
-	ndis_timer		*timer;
-	uint32_t		msecs;
-{
-	/*
-	 * KeSetTimer() wants the period in
-	 * hundred nanosecond intervals.
-	 */
-	KeSetTimer(&timer->nt_ktimer,
-	    ((int64_t)msecs * -10000), &timer->nt_kdpc);
-}
-
-static void
-NdisMSetPeriodicTimer(timer, msecs)
-	ndis_miniport_timer	*timer;
-	uint32_t		msecs;
-{
-	KeSetTimerEx(&timer->nmt_ktimer,
-	    ((int64_t)msecs * -10000), msecs, &timer->nmt_kdpc);
-}
-
-/*
- * Technically, this is really NdisCancelTimer(), but we also
- * (ab)use it for NdisMCancelTimer(), since in our implementation
- * we don't need the extra info in the ndis_miniport_timer
- * structure just to cancel a timer.
- */
-
-static void
-NdisMCancelTimer(timer, cancelled)
-	ndis_timer		*timer;
-	uint8_t			*cancelled;
-{
-
-	*cancelled = KeCancelTimer(&timer->nt_ktimer);
-}
-
-static void
-NdisMQueryAdapterResources(status, adapter, list, buflen)
-	ndis_status		*status;
-	ndis_handle		adapter;
-	ndis_resource_list	*list;
-	uint32_t		*buflen;
-{
-	ndis_miniport_block	*block;
-	struct ndis_softc	*sc;
-	int			rsclen;
-
-	block = (ndis_miniport_block *)adapter;
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-
-	rsclen = sizeof(ndis_resource_list) +
-	    (sizeof(cm_partial_resource_desc) * (sc->ndis_rescnt - 1));
-	if (*buflen < rsclen) {
-		*buflen = rsclen;
-		*status = NDIS_STATUS_INVALID_LENGTH;
-		return;
-	}
-
-	bcopy((char *)block->nmb_rlist, (char *)list, rsclen);
-	*status = NDIS_STATUS_SUCCESS;
-}
-
-static ndis_status
-NdisMRegisterIoPortRange(offset, adapter, port, numports)
-	void			**offset;
-	ndis_handle		adapter;
-	uint32_t		port;
-	uint32_t		numports;
-{
-	struct ndis_miniport_block	*block;
-	struct ndis_softc	*sc;
-
-	if (adapter == NULL)
-		return (NDIS_STATUS_FAILURE);
-
-	block = (ndis_miniport_block *)adapter;
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-
-	if (sc->ndis_res_io == NULL)
-		return (NDIS_STATUS_FAILURE);
-
-	/* Don't let the device map more ports than we have. */
-	if (rman_get_size(sc->ndis_res_io) < numports)
-		return (NDIS_STATUS_INVALID_LENGTH);
-
-	*offset = (void *)(uintptr_t)rman_get_start(sc->ndis_res_io);
-
-	return (NDIS_STATUS_SUCCESS);
-}
-
-static void
-NdisMDeregisterIoPortRange(adapter, port, numports, offset)
-	ndis_handle		adapter;
-	uint32_t		port;
-	uint32_t		numports;
-	void			*offset;
-{
-}
-
-static void
-NdisReadNetworkAddress(status, addr, addrlen, adapter)
-	ndis_status		*status;
-	void			**addr;
-	uint32_t		*addrlen;
-	ndis_handle		adapter;
-{
-	struct ndis_softc	*sc;
-	struct ifnet		*ifp;
-	ndis_miniport_block	*block;
-	uint8_t			empty[] = { 0, 0, 0, 0, 0, 0 };
-
-	block = (ndis_miniport_block *)adapter;
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-	ifp = NDISUSB_GET_IFNET(sc);
-	if (ifp == NULL) {
-		*status = NDIS_STATUS_FAILURE;
-		return;
-	}
-
-	if (ifp->if_addr == NULL ||
-	    bcmp(IF_LLADDR(sc->ifp), empty, ETHER_ADDR_LEN) == 0)
-		*status = NDIS_STATUS_FAILURE;
-	else {
-		*addr = IF_LLADDR(sc->ifp);
-		*addrlen = ETHER_ADDR_LEN;
-		*status = NDIS_STATUS_SUCCESS;
-	}
-}
-
-static ndis_status
-NdisQueryMapRegisterCount(bustype, cnt)
-	uint32_t		bustype;
-	uint32_t		*cnt;
-{
-	*cnt = 8192;
-	return (NDIS_STATUS_SUCCESS);
-}
-
-static ndis_status
-NdisMAllocateMapRegisters(ndis_handle adapter, uint32_t dmachannel,
-    uint8_t dmasize, uint32_t physmapneeded, uint32_t maxmap)
-{
-	struct ndis_softc	*sc;
-	ndis_miniport_block	*block;
-	int			error, i, nseg = NDIS_MAXSEG;
-
-	block = (ndis_miniport_block *)adapter;
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-
-	sc->ndis_mmaps = malloc(sizeof(bus_dmamap_t) * physmapneeded,
-	    M_DEVBUF, M_NOWAIT|M_ZERO);
-
-	if (sc->ndis_mmaps == NULL)
-		return (NDIS_STATUS_RESOURCES);
-
-	error = bus_dma_tag_create(sc->ndis_parent_tag, ETHER_ALIGN, 0,
-	    BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL,
-	    NULL, maxmap * nseg, nseg, maxmap, BUS_DMA_ALLOCNOW,
-	    NULL, NULL, &sc->ndis_mtag);
-
-	if (error) {
-		free(sc->ndis_mmaps, M_DEVBUF);
-		return (NDIS_STATUS_RESOURCES);
-	}
-
-	for (i = 0; i < physmapneeded; i++)
-		bus_dmamap_create(sc->ndis_mtag, 0, &sc->ndis_mmaps[i]);
-
-	sc->ndis_mmapcnt = physmapneeded;
-
-	return (NDIS_STATUS_SUCCESS);
-}
-
-static void
-NdisMFreeMapRegisters(adapter)
-	ndis_handle		adapter;
-{
-	struct ndis_softc	*sc;
-	ndis_miniport_block	*block;
-	int			i;
-
-	block = (ndis_miniport_block *)adapter;
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-
-	for (i = 0; i < sc->ndis_mmapcnt; i++)
-		bus_dmamap_destroy(sc->ndis_mtag, sc->ndis_mmaps[i]);
-
-	free(sc->ndis_mmaps, M_DEVBUF);
-
-	bus_dma_tag_destroy(sc->ndis_mtag);
-}
-
-static void
-ndis_mapshared_cb(arg, segs, nseg, error)
-	void			*arg;
-	bus_dma_segment_t	*segs;
-	int			nseg;
-	int			error;
-{
-	ndis_physaddr		*p;
-
-	if (error || nseg > 1)
-		return;
-
-	p = arg;
-
-	p->np_quad = segs[0].ds_addr;
-}
-
-/*
- * This maps to bus_dmamem_alloc().
- */
-
-static void
-NdisMAllocateSharedMemory(ndis_handle adapter, uint32_t len, uint8_t cached,
-    void **vaddr, ndis_physaddr *paddr)
-{
-	ndis_miniport_block	*block;
-	struct ndis_softc	*sc;
-	struct ndis_shmem	*sh;
-	int			error;
-
-	if (adapter == NULL)
-		return;
-
-	block = (ndis_miniport_block *)adapter;
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-
-	sh = malloc(sizeof(struct ndis_shmem), M_DEVBUF, M_NOWAIT|M_ZERO);
-	if (sh == NULL)
-		return;
-
-	InitializeListHead(&sh->ndis_list);
-
-	/*
-	 * When performing shared memory allocations, create a tag
-	 * with a lowaddr limit that restricts physical memory mappings
-	 * so that they all fall within the first 1GB of memory.
-	 * At least one device/driver combination (Linksys Instant
-	 * Wireless PCI Card V2.7, Broadcom 802.11b) seems to have
-	 * problems with performing DMA operations with physical
-	 * addresses that lie above the 1GB mark. I don't know if this
-	 * is a hardware limitation or if the addresses are being
-	 * truncated within the driver, but this seems to be the only
-	 * way to make these cards work reliably in systems with more
-	 * than 1GB of physical memory.
-	 */
-
-	error = bus_dma_tag_create(sc->ndis_parent_tag, 64,
-	    0, NDIS_BUS_SPACE_SHARED_MAXADDR, BUS_SPACE_MAXADDR, NULL,
-	    NULL, len, 1, len, BUS_DMA_ALLOCNOW, NULL, NULL,
-	    &sh->ndis_stag);
-
-	if (error) {
-		free(sh, M_DEVBUF);
-		return;
-	}
-
-	error = bus_dmamem_alloc(sh->ndis_stag, vaddr,
-	    BUS_DMA_NOWAIT | BUS_DMA_ZERO, &sh->ndis_smap);
-
-	if (error) {
-		bus_dma_tag_destroy(sh->ndis_stag);
-		free(sh, M_DEVBUF);
-		return;
-	}
-
-	error = bus_dmamap_load(sh->ndis_stag, sh->ndis_smap, *vaddr,
-	    len, ndis_mapshared_cb, (void *)paddr, BUS_DMA_NOWAIT);
-
-	if (error) {
-		bus_dmamem_free(sh->ndis_stag, *vaddr, sh->ndis_smap);
-		bus_dma_tag_destroy(sh->ndis_stag);
-		free(sh, M_DEVBUF);
-		return;
-	}
-
-	/*
-	 * Save the physical address along with the source address.
-	 * The AirGo MIMO driver will call NdisMFreeSharedMemory()
-	 * with a bogus virtual address sometimes, but with a valid
-	 * physical address. To keep this from causing trouble, we
-	 * use the physical address to as a sanity check in case
-	 * searching based on the virtual address fails.
-	 */
-
-	NDIS_LOCK(sc);
-	sh->ndis_paddr.np_quad = paddr->np_quad;
-	sh->ndis_saddr = *vaddr;
-	InsertHeadList((&sc->ndis_shlist), (&sh->ndis_list));
-	NDIS_UNLOCK(sc);
-}
-
-struct ndis_allocwork {
-	uint32_t		na_len;
-	uint8_t			na_cached;
-	void			*na_ctx;
-	io_workitem		*na_iw;
-};
-
-static void
-ndis_asyncmem_complete(dobj, arg)
-	device_object		*dobj;
-	void			*arg;
-{
-	ndis_miniport_block	*block;
-	struct ndis_softc	*sc;
-	struct ndis_allocwork	*w;
-	void			*vaddr;
-	ndis_physaddr		paddr;
-	ndis_allocdone_handler	donefunc;
-
-	w = arg;
-	block = (ndis_miniport_block *)dobj->do_devext;
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-
-	vaddr = NULL;
-	paddr.np_quad = 0;
-
-	donefunc = sc->ndis_chars->nmc_allocate_complete_func;
-	NdisMAllocateSharedMemory(block, w->na_len,
-	    w->na_cached, &vaddr, &paddr);
-	MSCALL5(donefunc, block, vaddr, &paddr, w->na_len, w->na_ctx);
-
-	IoFreeWorkItem(w->na_iw);
-	free(w, M_DEVBUF);
-}
-
-static ndis_status
-NdisMAllocateSharedMemoryAsync(ndis_handle adapter, uint32_t len,
-    uint8_t cached, void *ctx)
-{
-	ndis_miniport_block	*block;
-	struct ndis_allocwork	*w;
-	io_workitem		*iw;
-	io_workitem_func	ifw;
-
-	if (adapter == NULL)
-		return (NDIS_STATUS_FAILURE);
-
-	block = adapter;
-
-	iw = IoAllocateWorkItem(block->nmb_deviceobj);
-	if (iw == NULL)
-		return (NDIS_STATUS_FAILURE);
-
-	w = malloc(sizeof(struct ndis_allocwork), M_TEMP, M_NOWAIT);
-
-	if (w == NULL)
-		return (NDIS_STATUS_FAILURE);
-
-	w->na_cached = cached;
-	w->na_len = len;
-	w->na_ctx = ctx;
-	w->na_iw = iw;
-
-	ifw = (io_workitem_func)ndis_findwrap((funcptr)ndis_asyncmem_complete);
-	IoQueueWorkItem(iw, ifw, WORKQUEUE_DELAYED, w);
-
-	return (NDIS_STATUS_PENDING);
-}
-
-static void
-NdisMFreeSharedMemory(ndis_handle adapter, uint32_t len, uint8_t cached,
-    void *vaddr, ndis_physaddr paddr)
-{
-	ndis_miniport_block	*block;
-	struct ndis_softc	*sc;
-	struct ndis_shmem	*sh = NULL;
-	list_entry		*l;
-
-	if (vaddr == NULL || adapter == NULL)
-		return;
-
-	block = (ndis_miniport_block *)adapter;
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-
-	/* Sanity check: is list empty? */
-
-	if (IsListEmpty(&sc->ndis_shlist))
-		return;
-
-	NDIS_LOCK(sc);
-	l = sc->ndis_shlist.nle_flink;
-	while (l != &sc->ndis_shlist) {
-		sh = CONTAINING_RECORD(l, struct ndis_shmem, ndis_list);
-		if (sh->ndis_saddr == vaddr)
-			break;
-		/*
-		 * Check the physaddr too, just in case the driver lied
-		 * about the virtual address.
-		 */
-		if (sh->ndis_paddr.np_quad == paddr.np_quad)
-			break;
-		l = l->nle_flink;
-	}
-
-	if (sh == NULL) {
-		NDIS_UNLOCK(sc);
-		printf("NDIS: buggy driver tried to free "
-		    "invalid shared memory: vaddr: %p paddr: 0x%jx\n",
-		    vaddr, (uintmax_t)paddr.np_quad);
-		return;
-	}
-
-	RemoveEntryList(&sh->ndis_list);
-
-	NDIS_UNLOCK(sc);
-
-	bus_dmamap_unload(sh->ndis_stag, sh->ndis_smap);
-	bus_dmamem_free(sh->ndis_stag, sh->ndis_saddr, sh->ndis_smap);
-	bus_dma_tag_destroy(sh->ndis_stag);
-
-	free(sh, M_DEVBUF);
-}
-
-static ndis_status
-NdisMMapIoSpace(vaddr, adapter, paddr, len)
-	void			**vaddr;
-	ndis_handle		adapter;
-	ndis_physaddr		paddr;
-	uint32_t		len;
-{
-	if (adapter == NULL)
-		return (NDIS_STATUS_FAILURE);
-
-	*vaddr = MmMapIoSpace(paddr.np_quad, len, 0);
-
-	if (*vaddr == NULL)
-		return (NDIS_STATUS_FAILURE);
-
-	return (NDIS_STATUS_SUCCESS);
-}
-
-static void
-NdisMUnmapIoSpace(adapter, vaddr, len)
-	ndis_handle		adapter;
-	void			*vaddr;
-	uint32_t		len;
-{
-	MmUnmapIoSpace(vaddr, len);
-}
-
-static uint32_t
-NdisGetCacheFillSize(void)
-{
-	return (128);
-}
-
-static void *
-NdisGetRoutineAddress(ustr)
-	unicode_string		*ustr;
-{
-	ansi_string		astr;
-
-	if (RtlUnicodeStringToAnsiString(&astr, ustr, TRUE))
-		return (NULL);
-	return (ndis_get_routine_address(ndis_functbl, astr.as_buf));
-}
-
-static uint32_t
-NdisMGetDmaAlignment(handle)
-	ndis_handle		handle;
-{
-	return (16);
-}
-
-/*
- * NDIS has two methods for dealing with NICs that support DMA.
- * One is to just pass packets to the driver and let it call
- * NdisMStartBufferPhysicalMapping() to map each buffer in the packet
- * all by itself, and the other is to let the NDIS library handle the
- * buffer mapping internally, and hand the driver an already populated
- * scatter/gather fragment list. If the driver calls
- * NdisMInitializeScatterGatherDma(), it wants to use the latter
- * method.
- */
-
-static ndis_status
-NdisMInitializeScatterGatherDma(ndis_handle adapter, uint8_t is64,
-    uint32_t maxphysmap)
-{
-	struct ndis_softc	*sc;
-	ndis_miniport_block	*block;
-	int			error;
-
-	if (adapter == NULL)
-		return (NDIS_STATUS_FAILURE);
-	block = (ndis_miniport_block *)adapter;
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-
-	/* Don't do this twice. */
-	if (sc->ndis_sc == 1)
-		return (NDIS_STATUS_SUCCESS);
-
-	error = bus_dma_tag_create(sc->ndis_parent_tag, ETHER_ALIGN, 0,
-	    BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL,
-	    MCLBYTES * NDIS_MAXSEG, NDIS_MAXSEG, MCLBYTES, BUS_DMA_ALLOCNOW,
-	    NULL, NULL, &sc->ndis_ttag);
-
-	sc->ndis_sc = 1;
-
-	return (NDIS_STATUS_SUCCESS);
-}
-
-void
-NdisAllocatePacketPool(status, pool, descnum, protrsvdlen)
-	ndis_status		*status;
-	ndis_handle		*pool;
-	uint32_t		descnum;
-	uint32_t		protrsvdlen;
-{
-	ndis_packet_pool	*p;
-	ndis_packet		*packets;
-	int			i;
-
-	p = ExAllocatePoolWithTag(NonPagedPool, sizeof(ndis_packet_pool), 0);
-	if (p == NULL) {
-		*status = NDIS_STATUS_RESOURCES;
-		return;
-	}
-
-	p->np_cnt = descnum + NDIS_POOL_EXTRA;
-	p->np_protrsvd = protrsvdlen;
-	p->np_len = sizeof(ndis_packet) + protrsvdlen;
-
-	packets = ExAllocatePoolWithTag(NonPagedPool, p->np_cnt *
-	    p->np_len, 0);
-
-	if (packets == NULL) {
-		ExFreePool(p);
-		*status = NDIS_STATUS_RESOURCES;
-		return;
-	}
-
-	p->np_pktmem = packets;
-
-	for (i = 0; i < p->np_cnt; i++)
-		InterlockedPushEntrySList(&p->np_head,
-		    (struct slist_entry *)&packets[i]);
-
-#ifdef NDIS_DEBUG_PACKETS 
-	p->np_dead = 0; 
-	KeInitializeSpinLock(&p->np_lock);
-	KeInitializeEvent(&p->np_event, EVENT_TYPE_NOTIFY, TRUE);
-#endif
-
-	*pool = p; 
-	*status = NDIS_STATUS_SUCCESS;
-}
-
-void
-NdisAllocatePacketPoolEx(status, pool, descnum, oflowdescnum, protrsvdlen)
-	ndis_status		*status;
-	ndis_handle		*pool;
-	uint32_t		descnum;
-	uint32_t		oflowdescnum;
-	uint32_t		protrsvdlen;
-{
-	return (NdisAllocatePacketPool(status, pool,
-	    descnum + oflowdescnum, protrsvdlen));
-}
-
-uint32_t
-NdisPacketPoolUsage(pool)
-	ndis_handle		pool;
-{
-	ndis_packet_pool	*p;
-
-	p = (ndis_packet_pool *)pool;
-	return (p->np_cnt - ExQueryDepthSList(&p->np_head));
-}
-
-void
-NdisFreePacketPool(pool)
-	ndis_handle		pool;
-{
-	ndis_packet_pool	*p;
-	int			usage;
-#ifdef NDIS_DEBUG_PACKETS
-	uint8_t			irql;
-#endif
-
-	p = (ndis_packet_pool *)pool;
-
-#ifdef NDIS_DEBUG_PACKETS
-	KeAcquireSpinLock(&p->np_lock, &irql);
-#endif
-
-	usage = NdisPacketPoolUsage(pool);
-
-#ifdef NDIS_DEBUG_PACKETS
-	if (usage) {
-		p->np_dead = 1;
-		KeResetEvent(&p->np_event);
-		KeReleaseSpinLock(&p->np_lock, irql);
-		KeWaitForSingleObject(&p->np_event, 0, 0, FALSE, NULL);
-	} else
-		KeReleaseSpinLock(&p->np_lock, irql);
-#endif
-
-	ExFreePool(p->np_pktmem);
-	ExFreePool(p);
-}
-
-void
-NdisAllocatePacket(status, packet, pool)
-	ndis_status		*status;
-	ndis_packet		**packet;
-	ndis_handle		pool;
-{
-	ndis_packet_pool	*p;
-	ndis_packet		*pkt;
-#ifdef NDIS_DEBUG_PACKETS
-	uint8_t			irql;
-#endif
-
-	p = (ndis_packet_pool *)pool;
-
-#ifdef NDIS_DEBUG_PACKETS
-	KeAcquireSpinLock(&p->np_lock, &irql);
-	if (p->np_dead) {
-		KeReleaseSpinLock(&p->np_lock, irql);
-		printf("NDIS: tried to allocate packet from dead pool %p\n",
-		    pool);
-		*status = NDIS_STATUS_RESOURCES;
-		return;
-	}
-#endif
-
-	pkt = (ndis_packet *)InterlockedPopEntrySList(&p->np_head);
-
-#ifdef NDIS_DEBUG_PACKETS
-	KeReleaseSpinLock(&p->np_lock, irql);
-#endif
-
-	if (pkt == NULL) {
-		*status = NDIS_STATUS_RESOURCES;
-		return;
-	}
-
-	bzero((char *)pkt, sizeof(ndis_packet));
-
-	/* Save pointer to the pool. */
-	pkt->np_private.npp_pool = pool;
-
-	/* Set the oob offset pointer. Lots of things expect this. */
-	pkt->np_private.npp_packetooboffset = offsetof(ndis_packet, np_oob);
-
-	/*
-	 * We must initialize the packet flags correctly in order
-	 * for the NDIS_SET_PACKET_MEDIA_SPECIFIC_INFO() and
-	 * NDIS_GET_PACKET_MEDIA_SPECIFIC_INFO() macros to work
-	 * correctly.
-	 */
-	pkt->np_private.npp_ndispktflags = NDIS_PACKET_ALLOCATED_BY_NDIS;
-	pkt->np_private.npp_validcounts = FALSE;
-
-	*packet = pkt;
-
-	*status = NDIS_STATUS_SUCCESS;
-}
-
-void
-NdisFreePacket(packet)
-	ndis_packet		*packet;
-{
-	ndis_packet_pool	*p;
-#ifdef NDIS_DEBUG_PACKETS
-	uint8_t			irql;
-#endif
-
-	p = (ndis_packet_pool *)packet->np_private.npp_pool;
-
-#ifdef NDIS_DEBUG_PACKETS
-	KeAcquireSpinLock(&p->np_lock, &irql);
-#endif
-
-	InterlockedPushEntrySList(&p->np_head, (slist_entry *)packet);
-
-#ifdef NDIS_DEBUG_PACKETS
-	if (p->np_dead) {
-		if (ExQueryDepthSList(&p->np_head) == p->np_cnt)
-			KeSetEvent(&p->np_event, IO_NO_INCREMENT, FALSE);
-	}
-	KeReleaseSpinLock(&p->np_lock, irql);
-#endif
-}
-
-static void
-NdisUnchainBufferAtFront(packet, buf)
-	ndis_packet		*packet;
-	ndis_buffer		**buf;
-{
-	ndis_packet_private	*priv;
-
-	if (packet == NULL || buf == NULL)
-		return;
-
-	priv = &packet->np_private;
-
-	priv->npp_validcounts = FALSE;
-
-	if (priv->npp_head == priv->npp_tail) {
-		*buf = priv->npp_head;
-		priv->npp_head = priv->npp_tail = NULL;
-	} else {
-		*buf = priv->npp_head;
-		priv->npp_head = (*buf)->mdl_next;
-	}
-}
-
-static void
-NdisUnchainBufferAtBack(packet, buf)
-	ndis_packet		*packet;
-	ndis_buffer		**buf;
-{
-	ndis_packet_private	*priv;
-	ndis_buffer		*tmp;
-
-	if (packet == NULL || buf == NULL)
-		return;
-
-	priv = &packet->np_private;
-
-	priv->npp_validcounts = FALSE;
-
-	if (priv->npp_head == priv->npp_tail) {
-		*buf = priv->npp_head;
-		priv->npp_head = priv->npp_tail = NULL;
-	} else {
-		*buf = priv->npp_tail;
-		tmp = priv->npp_head;
-		while (tmp->mdl_next != priv->npp_tail)
-			tmp = tmp->mdl_next;
-		priv->npp_tail = tmp;
-		tmp->mdl_next = NULL;
-	}
-}
-
-/*
- * The NDIS "buffer" is really an MDL (memory descriptor list)
- * which is used to describe a buffer in a way that allows it
- * to mapped into different contexts. We have to be careful how
- * we handle them: in some versions of Windows, the NdisFreeBuffer()
- * routine is an actual function in the NDIS API, but in others
- * it's just a macro wrapper around IoFreeMdl(). There's really
- * no way to use the 'descnum' parameter to count how many
- * "buffers" are allocated since in order to use IoFreeMdl() to
- * dispose of a buffer, we have to use IoAllocateMdl() to allocate
- * them, and IoAllocateMdl() just grabs them out of the heap.
- */
-
-static void
-NdisAllocateBufferPool(status, pool, descnum)
-	ndis_status		*status;
-	ndis_handle		*pool;
-	uint32_t		descnum;
-{
-
-	/*
-	 * The only thing we can really do here is verify that descnum
-	 * is a reasonable value, but I really don't know what to check
-	 * it against.
-	 */
-
-	*pool = NonPagedPool;
-	*status = NDIS_STATUS_SUCCESS;
-}
-
-static void
-NdisFreeBufferPool(pool)
-	ndis_handle		pool;
-{
-}
-
-static void
-NdisAllocateBuffer(status, buffer, pool, vaddr, len)
-	ndis_status		*status;
-	ndis_buffer		**buffer;
-	ndis_handle		pool;
-	void			*vaddr;
-	uint32_t		len;
-{
-	ndis_buffer		*buf;
-
-	buf = IoAllocateMdl(vaddr, len, FALSE, FALSE, NULL);
-	if (buf == NULL) {
-		*status = NDIS_STATUS_RESOURCES;
-		return;
-	}
-
-	MmBuildMdlForNonPagedPool(buf);
-
-	*buffer = buf;
-	*status = NDIS_STATUS_SUCCESS;
-}
-
-static void
-NdisFreeBuffer(buf)
-	ndis_buffer		*buf;
-{
-	IoFreeMdl(buf);
-}
-
-/* Aw c'mon. */
-
-static uint32_t
-NdisBufferLength(buf)
-	ndis_buffer		*buf;
-{
-	return (MmGetMdlByteCount(buf));
-}
-
-/*
- * Get the virtual address and length of a buffer.
- * Note: the vaddr argument is optional.
- */
-
-static void
-NdisQueryBuffer(buf, vaddr, len)
-	ndis_buffer		*buf;
-	void			**vaddr;
-	uint32_t		*len;
-{
-	if (vaddr != NULL)
-		*vaddr = MmGetMdlVirtualAddress(buf);
-	*len = MmGetMdlByteCount(buf);
-}
-
-/* Same as above -- we don't care about the priority. */
-
-static void
-NdisQueryBufferSafe(buf, vaddr, len, prio)
-	ndis_buffer		*buf;
-	void			**vaddr;
-	uint32_t		*len;
-	uint32_t		prio;
-{
-	if (vaddr != NULL)
-		*vaddr = MmGetMdlVirtualAddress(buf);
-	*len = MmGetMdlByteCount(buf);
-}
-
-/* Damnit Microsoft!! How many ways can you do the same thing?! */
-
-static void *
-NdisBufferVirtualAddress(buf)
-	ndis_buffer		*buf;
-{
-	return (MmGetMdlVirtualAddress(buf));
-}
-
-static void *
-NdisBufferVirtualAddressSafe(buf, prio)
-	ndis_buffer		*buf;
-	uint32_t		prio;
-{
-	return (MmGetMdlVirtualAddress(buf));
-}
-
-static void
-NdisAdjustBufferLength(buf, len)
-	ndis_buffer		*buf;
-	int			len;
-{
-	MmGetMdlByteCount(buf) = len;
-}
-
-static uint32_t
-NdisInterlockedIncrement(addend)
-	uint32_t		*addend;
-{
-	atomic_add_long((u_long *)addend, 1);
-	return (*addend);
-}
-
-static uint32_t
-NdisInterlockedDecrement(addend)
-	uint32_t		*addend;
-{
-	atomic_subtract_long((u_long *)addend, 1);
-	return (*addend);
-}
-
-static uint32_t
-NdisGetVersion(void)
-{
-	return (0x00050001);
-}
-
-static void
-NdisInitializeEvent(event)
-	ndis_event		*event;
-{
-	/*
-	 * NDIS events are always notification
-	 * events, and should be initialized to the
-	 * not signaled state.
-	 */
-	KeInitializeEvent(&event->ne_event, EVENT_TYPE_NOTIFY, FALSE);
-}
-
-static void
-NdisSetEvent(event)
-	ndis_event		*event;
-{
-	KeSetEvent(&event->ne_event, IO_NO_INCREMENT, FALSE);
-}
-
-static void
-NdisResetEvent(event)
-	ndis_event		*event;
-{
-	KeResetEvent(&event->ne_event);
-}
-
-static uint8_t
-NdisWaitEvent(event, msecs)
-	ndis_event		*event;
-	uint32_t		msecs;
-{
-	int64_t			duetime;
-	uint32_t		rval;
-
-	duetime = ((int64_t)msecs * -10000);
-	rval = KeWaitForSingleObject(event,
-	    0, 0, TRUE, msecs ? & duetime : NULL);
-
-	if (rval == STATUS_TIMEOUT)
-		return (FALSE);
-
-	return (TRUE);
-}
-
-static ndis_status
-NdisUnicodeStringToAnsiString(dstr, sstr)
-	ansi_string		*dstr;
-	unicode_string		*sstr;
-{
-	uint32_t		rval;
-
-	rval = RtlUnicodeStringToAnsiString(dstr, sstr, FALSE);
-
-	if (rval == STATUS_INSUFFICIENT_RESOURCES)
-		return (NDIS_STATUS_RESOURCES);
-	if (rval)
-		return (NDIS_STATUS_FAILURE);
-
-	return (NDIS_STATUS_SUCCESS);
-}
-
-static ndis_status
-NdisAnsiStringToUnicodeString(dstr, sstr)
-	unicode_string		*dstr;
-	ansi_string		*sstr;
-{
-	uint32_t		rval;
-
-	rval = RtlAnsiStringToUnicodeString(dstr, sstr, FALSE);
-
-	if (rval == STATUS_INSUFFICIENT_RESOURCES)
-		return (NDIS_STATUS_RESOURCES);
-	if (rval)
-		return (NDIS_STATUS_FAILURE);
-
-	return (NDIS_STATUS_SUCCESS);
-}
-
-static ndis_status
-NdisMPciAssignResources(adapter, slot, list)
-	ndis_handle		adapter;
-	uint32_t		slot;
-	ndis_resource_list	**list;
-{
-	ndis_miniport_block	*block;
-
-	if (adapter == NULL || list == NULL)
-		return (NDIS_STATUS_FAILURE);
-
-	block = (ndis_miniport_block *)adapter;
-	*list = block->nmb_rlist;
-
-	return (NDIS_STATUS_SUCCESS);
-}
-
-static uint8_t
-ndis_intr(iobj, arg)
-	kinterrupt		*iobj;
-	void			*arg;
-{
-	struct ndis_softc	*sc;
-	uint8_t			is_our_intr = FALSE;
-	int			call_isr = 0;
-	ndis_miniport_interrupt	*intr;
-
-	sc = arg;
-	intr = sc->ndis_block->nmb_interrupt;
-
-	if (intr == NULL || sc->ndis_block->nmb_miniportadapterctx == NULL)
-		return (FALSE);
-
-	if (sc->ndis_block->nmb_interrupt->ni_isrreq == TRUE)
-		MSCALL3(intr->ni_isrfunc, &is_our_intr, &call_isr,
-		    sc->ndis_block->nmb_miniportadapterctx);
-	else {
-		MSCALL1(sc->ndis_chars->nmc_disable_interrupts_func,
-		    sc->ndis_block->nmb_miniportadapterctx);
-		call_isr = 1;
-	}
-
-	if (call_isr)
-		IoRequestDpc(sc->ndis_block->nmb_deviceobj, NULL, sc);
-
-	return (is_our_intr);
-}
-
-static void
-ndis_intrhand(dpc, intr, sysarg1, sysarg2)
-	kdpc			*dpc;
-	ndis_miniport_interrupt	*intr;
-	void			*sysarg1;
-	void			*sysarg2;
-{
-	struct ndis_softc	*sc;
-	ndis_miniport_block	*block;
-	ndis_handle             adapter;
-
-	block = intr->ni_block;
-	adapter = block->nmb_miniportadapterctx;
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-
-	if (NDIS_SERIALIZED(sc->ndis_block))
-		KeAcquireSpinLockAtDpcLevel(&block->nmb_lock);
-
-	MSCALL1(intr->ni_dpcfunc, adapter);
-
-	/* If there's a MiniportEnableInterrupt() routine, call it. */
-
-	if (sc->ndis_chars->nmc_enable_interrupts_func != NULL)
-		MSCALL1(sc->ndis_chars->nmc_enable_interrupts_func, adapter);
-
-	if (NDIS_SERIALIZED(sc->ndis_block))
-		KeReleaseSpinLockFromDpcLevel(&block->nmb_lock);
-
-	/*
-	 * Set the completion event if we've drained all
-	 * pending interrupts.
-	 */
-
-	KeAcquireSpinLockAtDpcLevel(&intr->ni_dpccountlock);
-	intr->ni_dpccnt--;
-	if (intr->ni_dpccnt == 0)
-		KeSetEvent(&intr->ni_dpcevt, IO_NO_INCREMENT, FALSE);
-	KeReleaseSpinLockFromDpcLevel(&intr->ni_dpccountlock);
-}
-
-static ndis_status
-NdisMRegisterInterrupt(ndis_miniport_interrupt *intr, ndis_handle adapter,
-    uint32_t ivec, uint32_t ilevel, uint8_t reqisr, uint8_t shared,
-    ndis_interrupt_mode imode)
-{
-	ndis_miniport_block	*block;
-	ndis_miniport_characteristics *ch;
-	struct ndis_softc	*sc;
-	int			error;
-
-	block = adapter;
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-	ch = IoGetDriverObjectExtension(block->nmb_deviceobj->do_drvobj,
-	    (void *)1);
-
-	intr->ni_rsvd = ExAllocatePoolWithTag(NonPagedPool,
-	    sizeof(struct mtx), 0);
-	if (intr->ni_rsvd == NULL)
-		return (NDIS_STATUS_RESOURCES);
-
-	intr->ni_block = adapter;
-	intr->ni_isrreq = reqisr;
-	intr->ni_shared = shared;
-	intr->ni_dpccnt = 0;
-	intr->ni_isrfunc = ch->nmc_isr_func;
-	intr->ni_dpcfunc = ch->nmc_interrupt_func;
-
-	KeInitializeEvent(&intr->ni_dpcevt, EVENT_TYPE_NOTIFY, TRUE);
-	KeInitializeDpc(&intr->ni_dpc,
-	    ndis_findwrap((funcptr)ndis_intrhand), intr);
-	KeSetImportanceDpc(&intr->ni_dpc, KDPC_IMPORTANCE_LOW);
-
-	error = IoConnectInterrupt(&intr->ni_introbj,
-	    ndis_findwrap((funcptr)ndis_intr), sc, NULL,
-	    ivec, ilevel, 0, imode, shared, 0, FALSE);
-
-	if (error != STATUS_SUCCESS)
-		return (NDIS_STATUS_FAILURE);
-
-	block->nmb_interrupt = intr;
-
-	return (NDIS_STATUS_SUCCESS);
-}
-
-static void
-NdisMDeregisterInterrupt(intr)
-	ndis_miniport_interrupt	*intr;
-{
-	ndis_miniport_block	*block;
-	uint8_t			irql;
-
-	block = intr->ni_block;
-
-	/* Should really be KeSynchronizeExecution() */
-
-	KeAcquireSpinLock(intr->ni_introbj->ki_lock, &irql);
-	block->nmb_interrupt = NULL;
-	KeReleaseSpinLock(intr->ni_introbj->ki_lock, irql);
-/*
-	KeFlushQueuedDpcs();
-*/
-	/* Disconnect our ISR */
-
-	IoDisconnectInterrupt(intr->ni_introbj);
-
-	KeWaitForSingleObject(&intr->ni_dpcevt, 0, 0, FALSE, NULL);
-	KeResetEvent(&intr->ni_dpcevt);
-}
-
-static void
-NdisMRegisterAdapterShutdownHandler(adapter, shutdownctx, shutdownfunc)
-	ndis_handle		adapter;
-	void			*shutdownctx;
-	ndis_shutdown_handler	shutdownfunc;
-{
-	ndis_miniport_block	*block;
-	ndis_miniport_characteristics *chars;
-	struct ndis_softc	*sc;
-
-	if (adapter == NULL)
-		return;
-
-	block = (ndis_miniport_block *)adapter;
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-	chars = sc->ndis_chars;
-
-	chars->nmc_shutdown_handler = shutdownfunc;
-	chars->nmc_rsvd0 = shutdownctx;
-}
-
-static void
-NdisMDeregisterAdapterShutdownHandler(adapter)
-	ndis_handle		adapter;
-{
-	ndis_miniport_block	*block;
-	ndis_miniport_characteristics *chars;
-	struct ndis_softc	*sc;
-
-	if (adapter == NULL)
-		return;
-
-	block = (ndis_miniport_block *)adapter;
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-	chars = sc->ndis_chars;
-
-	chars->nmc_shutdown_handler = NULL;
-	chars->nmc_rsvd0 = NULL;
-}
-
-static uint32_t
-NDIS_BUFFER_TO_SPAN_PAGES(buf)
-	ndis_buffer		*buf;
-{
-	if (buf == NULL)
-		return (0);
-	if (MmGetMdlByteCount(buf) == 0)
-		return (1);
-	return (SPAN_PAGES(MmGetMdlVirtualAddress(buf),
-	    MmGetMdlByteCount(buf)));
-}
-
-static void
-NdisGetBufferPhysicalArraySize(buf, pages)
-	ndis_buffer		*buf;
-	uint32_t		*pages;
-{
-	if (buf == NULL)
-		return;
-
-	*pages = NDIS_BUFFER_TO_SPAN_PAGES(buf);
-}
-
-static void
-NdisQueryBufferOffset(buf, off, len)
-	ndis_buffer		*buf;
-	uint32_t		*off;
-	uint32_t		*len;
-{
-	if (buf == NULL)
-		return;
-
-	*off = MmGetMdlByteOffset(buf);
-	*len = MmGetMdlByteCount(buf);
-}
-
-void
-NdisMSleep(usecs)
-	uint32_t		usecs;
-{
-	ktimer			timer;
-
-	/*
-	 * During system bootstrap, (i.e. cold == 1), we aren't
-	 * allowed to sleep, so we have to do a hard DELAY()
-	 * instead.
-	 */
-
-	if (cold)
-		DELAY(usecs);
-	else {
-		KeInitializeTimer(&timer);
-		KeSetTimer(&timer, ((int64_t)usecs * -10), NULL);
-		KeWaitForSingleObject(&timer, 0, 0, FALSE, NULL);
-	}
-}
-
-static uint32_t
-NdisReadPcmciaAttributeMemory(handle, offset, buf, len)
-	ndis_handle		handle;
-	uint32_t		offset;
-	void			*buf;
-	uint32_t		len;
-{
-	struct ndis_softc	*sc;
-	ndis_miniport_block	*block;
-	bus_space_handle_t	bh;
-	bus_space_tag_t		bt;
-	char			*dest;
-	uint32_t		i;
-
-	if (handle == NULL)
-		return (0);
-
-	block = (ndis_miniport_block *)handle;
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-	dest = buf;
-
-	bh = rman_get_bushandle(sc->ndis_res_am);
-	bt = rman_get_bustag(sc->ndis_res_am);
-
-	for (i = 0; i < len; i++)
-		dest[i] = bus_space_read_1(bt, bh, (offset + i) * 2);
-
-	return (i);
-}
-
-static uint32_t
-NdisWritePcmciaAttributeMemory(handle, offset, buf, len)
-	ndis_handle		handle;
-	uint32_t		offset;
-	void			*buf;
-	uint32_t		len;
-{
-	struct ndis_softc	*sc;
-	ndis_miniport_block	*block;
-	bus_space_handle_t	bh;
-	bus_space_tag_t		bt;
-	char			*src;
-	uint32_t		i;
-
-	if (handle == NULL)
-		return (0);
-
-	block = (ndis_miniport_block *)handle;
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-	src = buf;
-
-	bh = rman_get_bushandle(sc->ndis_res_am);
-	bt = rman_get_bustag(sc->ndis_res_am);
-
-	for (i = 0; i < len; i++)
-		bus_space_write_1(bt, bh, (offset + i) * 2, src[i]);
-
-	return (i);
-}
-
-static list_entry *
-NdisInterlockedInsertHeadList(head, entry, lock)
-	list_entry		*head;
-	list_entry		*entry;
-	ndis_spin_lock		*lock;
-{
-	list_entry		*flink;
-
-	KeAcquireSpinLock(&lock->nsl_spinlock, &lock->nsl_kirql);
-	flink = head->nle_flink;
-	entry->nle_flink = flink;
-	entry->nle_blink = head;
-	flink->nle_blink = entry;
-	head->nle_flink = entry;
-	KeReleaseSpinLock(&lock->nsl_spinlock, lock->nsl_kirql);
-
-	return (flink);
-}
-
-static list_entry *
-NdisInterlockedRemoveHeadList(head, lock)
-	list_entry		*head;
-	ndis_spin_lock		*lock;
-{
-	list_entry		*flink;
-	list_entry		*entry;
-
-	KeAcquireSpinLock(&lock->nsl_spinlock, &lock->nsl_kirql);
-	entry = head->nle_flink;
-	flink = entry->nle_flink;
-	head->nle_flink = flink;
-	flink->nle_blink = head;
-	KeReleaseSpinLock(&lock->nsl_spinlock, lock->nsl_kirql);
-
-	return (entry);
-}
-
-static list_entry *
-NdisInterlockedInsertTailList(head, entry, lock)
-	list_entry		*head;
-	list_entry		*entry;
-	ndis_spin_lock		*lock;
-{
-	list_entry		*blink;
-
-	KeAcquireSpinLock(&lock->nsl_spinlock, &lock->nsl_kirql);
-	blink = head->nle_blink;
-	entry->nle_flink = head;
-	entry->nle_blink = blink;
-	blink->nle_flink = entry;
-	head->nle_blink = entry;
-	KeReleaseSpinLock(&lock->nsl_spinlock, lock->nsl_kirql);
-
-	return (blink);
-}
-
-static uint8_t
-NdisMSynchronizeWithInterrupt(intr, syncfunc, syncctx)
-	ndis_miniport_interrupt	*intr;
-	void			*syncfunc;
-	void			*syncctx;
-{
-	return (KeSynchronizeExecution(intr->ni_introbj, syncfunc, syncctx));
-}
-
-static void
-NdisGetCurrentSystemTime(tval)
-	uint64_t		*tval;
-{
-	ntoskrnl_time(tval);
-}
-
-/*
- * Return the number of milliseconds since the system booted.
- */
-static void
-NdisGetSystemUpTime(tval)
-	uint32_t		*tval;
-{
-	struct timespec		ts;
-
-	nanouptime(&ts);
-	*tval = ts.tv_nsec / 1000000 + ts.tv_sec * 1000;
-}
-
-static void
-NdisInitializeString(dst, src)
-	unicode_string		*dst;
-	char			*src;
-{
-	ansi_string		as;
-	RtlInitAnsiString(&as, src);
-	RtlAnsiStringToUnicodeString(dst, &as, TRUE);
-}
-
-static void
-NdisFreeString(str)
-	unicode_string		*str;
-{
-	RtlFreeUnicodeString(str);
-}
-
-static ndis_status
-NdisMRemoveMiniport(adapter)
-	ndis_handle		*adapter;
-{
-	return (NDIS_STATUS_SUCCESS);
-}
-
-static void
-NdisInitAnsiString(dst, src)
-	ansi_string		*dst;
-	char			*src;
-{
-	RtlInitAnsiString(dst, src);
-}
-
-static void
-NdisInitUnicodeString(dst, src)
-	unicode_string		*dst;
-	uint16_t		*src;
-{
-	RtlInitUnicodeString(dst, src);
-}
-
-static void NdisMGetDeviceProperty(adapter, phydevobj,
-	funcdevobj, nextdevobj, resources, transresources)
-	ndis_handle		adapter;
-	device_object		**phydevobj;
-	device_object		**funcdevobj;
-	device_object		**nextdevobj;
-	cm_resource_list	*resources;
-	cm_resource_list	*transresources;
-{
-	ndis_miniport_block	*block;
-
-	block = (ndis_miniport_block *)adapter;
-
-	if (phydevobj != NULL)
-		*phydevobj = block->nmb_physdeviceobj;
-	if (funcdevobj != NULL)
-		*funcdevobj = block->nmb_deviceobj;
-	if (nextdevobj != NULL)
-		*nextdevobj = block->nmb_nextdeviceobj;
-}
-
-static void
-NdisGetFirstBufferFromPacket(packet, buf, firstva, firstlen, totlen)
-	ndis_packet		*packet;
-	ndis_buffer		**buf;
-	void			**firstva;
-	uint32_t		*firstlen;
-	uint32_t		*totlen;
-{
-	ndis_buffer		*tmp;
-
-	tmp = packet->np_private.npp_head;
-	*buf = tmp;
-	if (tmp == NULL) {
-		*firstva = NULL;
-		*firstlen = *totlen = 0;
-	} else {
-		*firstva = MmGetMdlVirtualAddress(tmp);
-		*firstlen = *totlen = MmGetMdlByteCount(tmp);
-		for (tmp = tmp->mdl_next; tmp != NULL; tmp = tmp->mdl_next)
-			*totlen += MmGetMdlByteCount(tmp);
-	}
-}
-
-static void
-NdisGetFirstBufferFromPacketSafe(packet, buf, firstva, firstlen, totlen, prio)
-	ndis_packet		*packet;
-	ndis_buffer		**buf;
-	void			**firstva;
-	uint32_t		*firstlen;
-	uint32_t		*totlen;
-	uint32_t		prio;
-{
-	NdisGetFirstBufferFromPacket(packet, buf, firstva, firstlen, totlen);
-}
-
-static int
-ndis_find_sym(lf, filename, suffix, sym)
-	linker_file_t		lf;
-	char			*filename;
-	char			*suffix;
-	caddr_t			*sym;
-{
-	char			*fullsym;
-	char			*suf;
-	u_int			i;
-
-	fullsym = ExAllocatePoolWithTag(NonPagedPool, MAXPATHLEN, 0);
-	if (fullsym == NULL)
-		return (ENOMEM);
-
-	bzero(fullsym, MAXPATHLEN);
-	strncpy(fullsym, filename, MAXPATHLEN);
-	if (strlen(filename) < 4) {
-		ExFreePool(fullsym);
-		return (EINVAL);
-	}
-
-	/* If the filename has a .ko suffix, strip if off. */
-	suf = fullsym + (strlen(filename) - 3);
-	if (strcmp(suf, ".ko") == 0)
-		*suf = '\0';
-
-	for (i = 0; i < strlen(fullsym); i++) {
-		if (fullsym[i] == '.')
-			fullsym[i] = '_';
-		else
-			fullsym[i] = tolower(fullsym[i]);
-	}
-	strcat(fullsym, suffix);
-	*sym = linker_file_lookup_symbol(lf, fullsym, 0);
-	ExFreePool(fullsym);
-	if (*sym == 0)
-		return (ENOENT);
-
-	return (0);
-}
-
-struct ndis_checkmodule {
-	char	*afilename;
-	ndis_fh	*fh;
-};
-
-/*
- * See if a single module contains the symbols for a specified file.
- */
-static int
-NdisCheckModule(linker_file_t lf, void *context)
-{
-	struct ndis_checkmodule *nc;
-	caddr_t			kldstart, kldend;
-
-	nc = (struct ndis_checkmodule *)context;
-	if (ndis_find_sym(lf, nc->afilename, "_start", &kldstart))
-		return (0);
-	if (ndis_find_sym(lf, nc->afilename, "_end", &kldend))
-		return (0);
-	nc->fh->nf_vp = lf;
-	nc->fh->nf_map = NULL;
-	nc->fh->nf_type = NDIS_FH_TYPE_MODULE;
-	nc->fh->nf_maplen = (kldend - kldstart) & 0xFFFFFFFF;
-	return (1);
-}
-
-/* can also return NDIS_STATUS_RESOURCES/NDIS_STATUS_ERROR_READING_FILE */
-static void
-NdisOpenFile(status, filehandle, filelength, filename, highestaddr)
-	ndis_status		*status;
-	ndis_handle		*filehandle;
-	uint32_t		*filelength;
-	unicode_string		*filename;
-	ndis_physaddr		highestaddr;
-{
-	ansi_string		as;
-	char			*afilename = NULL;
-	struct thread		*td = curthread;
-	struct nameidata	nd;
-	int			flags, error;
-	struct vattr		vat;
-	struct vattr		*vap = &vat;
-	ndis_fh			*fh;
-	char			*path;
-	struct ndis_checkmodule	nc;
-
-	if (RtlUnicodeStringToAnsiString(&as, filename, TRUE)) {
-		*status = NDIS_STATUS_RESOURCES;
-		return;
-	}
-
-	afilename = strdup(as.as_buf, M_DEVBUF);
-	RtlFreeAnsiString(&as);
-
-	fh = ExAllocatePoolWithTag(NonPagedPool, sizeof(ndis_fh), 0);
-	if (fh == NULL) {
-		free(afilename, M_DEVBUF);
-		*status = NDIS_STATUS_RESOURCES;
-		return;
-	}
-
-	fh->nf_name = afilename;
-
-	/*
-	 * During system bootstrap, it's impossible to load files
-	 * from the rootfs since it's not mounted yet. We therefore
-	 * offer the possibility of opening files that have been
-	 * preloaded as modules instead. Both choices will work
-	 * when kldloading a module from multiuser, but only the
-	 * module option will work during bootstrap. The module
-	 * loading option works by using the ndiscvt(8) utility
-	 * to convert the arbitrary file into a .ko using objcopy(1).
-	 * This file will contain two special symbols: filename_start
-	 * and filename_end. All we have to do is traverse the KLD
-	 * list in search of those symbols and we've found the file
-	 * data. As an added bonus, ndiscvt(8) will also generate
-	 * a normal .o file which can be linked statically with
-	 * the kernel. This means that the symbols will actual reside
-	 * in the kernel's symbol table, but that doesn't matter to
-	 * us since the kernel appears to us as just another module.
-	 */
-
-	nc.afilename = afilename;
-	nc.fh = fh;
-	if (linker_file_foreach(NdisCheckModule, &nc)) {
-		*filelength = fh->nf_maplen;
-		*filehandle = fh;
-		*status = NDIS_STATUS_SUCCESS;
-		return;
-	}
-
-	if (TAILQ_EMPTY(&mountlist)) {
-		ExFreePool(fh);
-		*status = NDIS_STATUS_FILE_NOT_FOUND;
-		printf("NDIS: could not find file %s in linker list\n",
-		    afilename);
-		printf("NDIS: and no filesystems mounted yet, "
-		    "aborting NdisOpenFile()\n");
-		free(afilename, M_DEVBUF);
-		return;
-	}
-
-	path = ExAllocatePoolWithTag(NonPagedPool, MAXPATHLEN, 0);
-	if (path == NULL) {
-		ExFreePool(fh);
-		free(afilename, M_DEVBUF);
-		*status = NDIS_STATUS_RESOURCES;
-		return;
-	}
-
-	snprintf(path, MAXPATHLEN, "%s/%s", ndis_filepath, afilename);
-
-	/* Some threads don't have a current working directory. */
-
-	pwd_ensure_dirs();
-
-	NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, path, td);
-
-	flags = FREAD;
-	error = vn_open(&nd, &flags, 0, NULL);
-	if (error) {
-		*status = NDIS_STATUS_FILE_NOT_FOUND;
-		ExFreePool(fh);
-		printf("NDIS: open file %s failed: %d\n", path, error);
-		ExFreePool(path);
-		free(afilename, M_DEVBUF);
-		return;
-	}
-
-	ExFreePool(path);
-
-	NDFREE(&nd, NDF_ONLY_PNBUF);
-
-	/* Get the file size. */
-	VOP_GETATTR(nd.ni_vp, vap, td->td_ucred);
-	VOP_UNLOCK(nd.ni_vp);
-
-	fh->nf_vp = nd.ni_vp;
-	fh->nf_map = NULL;
-	fh->nf_type = NDIS_FH_TYPE_VFS;
-	*filehandle = fh;
-	*filelength = fh->nf_maplen = vap->va_size & 0xFFFFFFFF;
-	*status = NDIS_STATUS_SUCCESS;
-}
-
-static void
-NdisMapFile(status, mappedbuffer, filehandle)
-	ndis_status		*status;
-	void			**mappedbuffer;
-	ndis_handle		filehandle;
-{
-	ndis_fh			*fh;
-	struct thread		*td = curthread;
-	linker_file_t		lf;
-	caddr_t			kldstart;
-	int			error;
-	ssize_t			resid;
-	struct vnode		*vp;
-
-	if (filehandle == NULL) {
-		*status = NDIS_STATUS_FAILURE;
-		return;
-	}
-
-	fh = (ndis_fh *)filehandle;
-
-	if (fh->nf_vp == NULL) {
-		*status = NDIS_STATUS_FAILURE;
-		return;
-	}
-
-	if (fh->nf_map != NULL) {
-		*status = NDIS_STATUS_ALREADY_MAPPED;
-		return;
-	}
-
-	if (fh->nf_type == NDIS_FH_TYPE_MODULE) {
-		lf = fh->nf_vp;
-		if (ndis_find_sym(lf, fh->nf_name, "_start", &kldstart)) {
-			*status = NDIS_STATUS_FAILURE;
-			return;
-		}
-		fh->nf_map = kldstart;
-		*status = NDIS_STATUS_SUCCESS;
-		*mappedbuffer = fh->nf_map;
-		return;
-	}
-
-	fh->nf_map = ExAllocatePoolWithTag(NonPagedPool, fh->nf_maplen, 0);
-
-	if (fh->nf_map == NULL) {
-		*status = NDIS_STATUS_RESOURCES;
-		return;
-	}
-
-	vp = fh->nf_vp;
-	error = vn_rdwr(UIO_READ, vp, fh->nf_map, fh->nf_maplen, 0,
-	    UIO_SYSSPACE, 0, td->td_ucred, NOCRED, &resid, td);
-
-	if (error)
-		*status = NDIS_STATUS_FAILURE;
-	else {
-		*status = NDIS_STATUS_SUCCESS;
-		*mappedbuffer = fh->nf_map;
-	}
-}
-
-static void
-NdisUnmapFile(filehandle)
-	ndis_handle		filehandle;
-{
-	ndis_fh			*fh;
-	fh = (ndis_fh *)filehandle;
-
-	if (fh->nf_map == NULL)
-		return;
-
-	if (fh->nf_type == NDIS_FH_TYPE_VFS)
-		ExFreePool(fh->nf_map);
-	fh->nf_map = NULL;
-}
-
-static void
-NdisCloseFile(filehandle)
-	ndis_handle		filehandle;
-{
-	struct thread		*td = curthread;
-	ndis_fh			*fh;
-	struct vnode		*vp;
-
-	if (filehandle == NULL)
-		return;
-
-	fh = (ndis_fh *)filehandle;
-	if (fh->nf_map != NULL) {
-		if (fh->nf_type == NDIS_FH_TYPE_VFS)
-			ExFreePool(fh->nf_map);
-		fh->nf_map = NULL;
-	}
-
-	if (fh->nf_vp == NULL)
-		return;
-
-	if (fh->nf_type == NDIS_FH_TYPE_VFS) {
-		vp = fh->nf_vp;
-		vn_close(vp, FREAD, td->td_ucred, td);
-	}
-
-	fh->nf_vp = NULL;
-	free(fh->nf_name, M_DEVBUF);
-	ExFreePool(fh);
-}
-
-static uint8_t
-NdisSystemProcessorCount()
-{
-	return (mp_ncpus);
-}
-
-static void
-NdisGetCurrentProcessorCounts(idle_count, kernel_and_user, index)
-	uint32_t		*idle_count;
-	uint32_t		*kernel_and_user;
-	uint32_t		*index;
-{
-	struct pcpu		*pcpu;
-
-	pcpu = pcpu_find(curthread->td_oncpu);
-	*index = pcpu->pc_cpuid;
-	*idle_count = pcpu->pc_cp_time[CP_IDLE];
-	*kernel_and_user = pcpu->pc_cp_time[CP_INTR];
-}
-
-typedef void (*ndis_statusdone_handler)(ndis_handle);
-typedef void (*ndis_status_handler)(ndis_handle, ndis_status,
-    void *, uint32_t);
-
-static void
-NdisMIndicateStatusComplete(adapter)
-	ndis_handle		adapter;
-{
-	ndis_miniport_block	*block;
-	ndis_statusdone_handler	statusdonefunc;
-
-	block = (ndis_miniport_block *)adapter;
-	statusdonefunc = block->nmb_statusdone_func;
-
-	MSCALL1(statusdonefunc, adapter);
-}
-
-static void
-NdisMIndicateStatus(adapter, status, sbuf, slen)
-	ndis_handle		adapter;
-	ndis_status		status;
-	void			*sbuf;
-	uint32_t		slen;
-{
-	ndis_miniport_block	*block;
-	ndis_status_handler	statusfunc;
-
-	block = (ndis_miniport_block *)adapter;
-	statusfunc = block->nmb_status_func;
-
-	MSCALL4(statusfunc, adapter, status, sbuf, slen);
-}
-
-/*
- * The DDK documentation says that you should use IoQueueWorkItem()
- * instead of ExQueueWorkItem(). The problem is, IoQueueWorkItem()
- * is fundamentally incompatible with NdisScheduleWorkItem(), which
- * depends on the API semantics of ExQueueWorkItem(). In our world,
- * ExQueueWorkItem() is implemented on top of IoAllocateQueueItem()
- * anyway.
- *
- * There are actually three distinct APIs here. NdisScheduleWorkItem()
- * takes a pointer to an NDIS_WORK_ITEM. ExQueueWorkItem() takes a pointer
- * to a WORK_QUEUE_ITEM. And finally, IoQueueWorkItem() takes a pointer
- * to an opaque work item thingie which you get from IoAllocateWorkItem().
- * An NDIS_WORK_ITEM is not the same as a WORK_QUEUE_ITEM. However,
- * the NDIS_WORK_ITEM has some opaque storage at the end of it, and we
- * (ab)use this storage as a WORK_QUEUE_ITEM, which is what we submit
- * to ExQueueWorkItem().
- *
- * Got all that? (Sheesh.)
- */
-
-ndis_status
-NdisScheduleWorkItem(work)
-	ndis_work_item		*work;
-{
-	work_queue_item		*wqi;
-
-	wqi = (work_queue_item *)work->nwi_wraprsvd;
-	ExInitializeWorkItem(wqi,
-	    (work_item_func)work->nwi_func, work->nwi_ctx);
-	ExQueueWorkItem(wqi, WORKQUEUE_DELAYED);
-
-	return (NDIS_STATUS_SUCCESS);
-}
-
-static void
-NdisCopyFromPacketToPacket(dpkt, doff, reqlen, spkt, soff, cpylen)
-	ndis_packet		*dpkt;
-	uint32_t		doff;
-	uint32_t		reqlen;
-	ndis_packet		*spkt;
-	uint32_t		soff;
-	uint32_t		*cpylen;
-{
-	ndis_buffer		*src, *dst;
-	char			*sptr, *dptr;
-	int			resid, copied, len, scnt, dcnt;
-
-	*cpylen = 0;
-
-	src = spkt->np_private.npp_head;
-	dst = dpkt->np_private.npp_head;
-
-	sptr = MmGetMdlVirtualAddress(src);
-	dptr = MmGetMdlVirtualAddress(dst);
-	scnt = MmGetMdlByteCount(src);
-	dcnt = MmGetMdlByteCount(dst);
-
-	while (soff) {
-		if (MmGetMdlByteCount(src) > soff) {
-			sptr += soff;
-			scnt = MmGetMdlByteCount(src)- soff;
-			break;
-		}
-		soff -= MmGetMdlByteCount(src);
-		src = src->mdl_next;
-		if (src == NULL)
-			return;
-		sptr = MmGetMdlVirtualAddress(src);
-	}
-
-	while (doff) {
-		if (MmGetMdlByteCount(dst) > doff) {
-			dptr += doff;
-			dcnt = MmGetMdlByteCount(dst) - doff;
-			break;
-		}
-		doff -= MmGetMdlByteCount(dst);
-		dst = dst->mdl_next;
-		if (dst == NULL)
-			return;
-		dptr = MmGetMdlVirtualAddress(dst);
-	}
-
-	resid = reqlen;
-	copied = 0;
-
-	while(1) {
-		if (resid < scnt)
-			len = resid;
-		else
-			len = scnt;
-		if (dcnt < len)
-			len = dcnt;
-
-		bcopy(sptr, dptr, len);
-
-		copied += len;
-		resid -= len;
-		if (resid == 0)
-			break;
-
-		dcnt -= len;
-		if (dcnt == 0) {
-			dst = dst->mdl_next;
-			if (dst == NULL)
-				break;
-			dptr = MmGetMdlVirtualAddress(dst);
-			dcnt = MmGetMdlByteCount(dst);
-		}
-
-		scnt -= len;
-		if (scnt == 0) {
-			src = src->mdl_next;
-			if (src == NULL)
-				break;
-			sptr = MmGetMdlVirtualAddress(src);
-			scnt = MmGetMdlByteCount(src);
-		}
-	}
-
-	*cpylen = copied;
-}
-
-static void
-NdisCopyFromPacketToPacketSafe(dpkt, doff, reqlen, spkt, soff, cpylen, prio)
-	ndis_packet		*dpkt;
-	uint32_t		doff;
-	uint32_t		reqlen;
-	ndis_packet		*spkt;
-	uint32_t		soff;
-	uint32_t		*cpylen;
-	uint32_t		prio;
-{
-	NdisCopyFromPacketToPacket(dpkt, doff, reqlen, spkt, soff, cpylen);
-}
-
-static void
-NdisIMCopySendPerPacketInfo(dpkt, spkt)
-	ndis_packet		*dpkt;
-	ndis_packet		*spkt;
-{
-	memcpy(&dpkt->np_ext, &spkt->np_ext, sizeof(ndis_packet_extension));
-}
-
-static ndis_status
-NdisMRegisterDevice(handle, devname, symname, majorfuncs, devobj, devhandle)
-	ndis_handle		handle;
-	unicode_string		*devname;
-	unicode_string		*symname;
-	driver_dispatch		*majorfuncs[];
-	void			**devobj;
-	ndis_handle		*devhandle;
-{
-	uint32_t		status;
-	device_object		*dobj;
-
-	status = IoCreateDevice(handle, 0, devname,
-	    FILE_DEVICE_UNKNOWN, 0, FALSE, &dobj);
-
-	if (status == STATUS_SUCCESS) {
-		*devobj = dobj;
-		*devhandle = dobj;
-	}
-
-	return (status);
-}
-
-static ndis_status
-NdisMDeregisterDevice(handle)
-	ndis_handle		handle;
-{
-	IoDeleteDevice(handle);
-	return (NDIS_STATUS_SUCCESS);
-}
-
-static ndis_status
-NdisMQueryAdapterInstanceName(name, handle)
-	unicode_string		*name;
-	ndis_handle		handle;
-{
-	ndis_miniport_block	*block;
-	device_t		dev;
-	ansi_string		as;
-
-	block = (ndis_miniport_block *)handle;
-	dev = block->nmb_physdeviceobj->do_devext;
-
-	RtlInitAnsiString(&as, __DECONST(char *, device_get_nameunit(dev)));
-	if (RtlAnsiStringToUnicodeString(name, &as, TRUE))
-		return (NDIS_STATUS_RESOURCES);
-
-	return (NDIS_STATUS_SUCCESS);
-}
-
-static void
-NdisMRegisterUnloadHandler(handle, func)
-	ndis_handle		handle;
-	void			*func;
-{
-}
-
-static void
-dummy()
-{
-	printf("NDIS dummy called...\n");
-}
-
-/*
- * Note: a couple of entries in this table specify the
- * number of arguments as "foo + 1". These are routines
- * that accept a 64-bit argument, passed by value. On
- * x86, these arguments consume two longwords on the stack,
- * so we lie and say there's one additional argument so
- * that the wrapping routines will do the right thing.
- */
-
-image_patch_table ndis_functbl[] = {
-	IMPORT_SFUNC(NdisCopyFromPacketToPacket, 6),
-	IMPORT_SFUNC(NdisCopyFromPacketToPacketSafe, 7),
-	IMPORT_SFUNC(NdisIMCopySendPerPacketInfo, 2),
-	IMPORT_SFUNC(NdisScheduleWorkItem, 1),
-	IMPORT_SFUNC(NdisMIndicateStatusComplete, 1),
-	IMPORT_SFUNC(NdisMIndicateStatus, 4),
-	IMPORT_SFUNC(NdisSystemProcessorCount, 0),
-	IMPORT_SFUNC(NdisGetCurrentProcessorCounts, 3),
-	IMPORT_SFUNC(NdisUnchainBufferAtBack, 2),
-	IMPORT_SFUNC(NdisGetFirstBufferFromPacket, 5),
-	IMPORT_SFUNC(NdisGetFirstBufferFromPacketSafe, 6),
-	IMPORT_SFUNC(NdisGetBufferPhysicalArraySize, 2),
-	IMPORT_SFUNC(NdisMGetDeviceProperty, 6),
-	IMPORT_SFUNC(NdisInitAnsiString, 2),
-	IMPORT_SFUNC(NdisInitUnicodeString, 2),
-	IMPORT_SFUNC(NdisWriteConfiguration, 4),
-	IMPORT_SFUNC(NdisAnsiStringToUnicodeString, 2),
-	IMPORT_SFUNC(NdisTerminateWrapper, 2),
-	IMPORT_SFUNC(NdisOpenConfigurationKeyByName, 4),
-	IMPORT_SFUNC(NdisOpenConfigurationKeyByIndex, 5),
-	IMPORT_SFUNC(NdisMRemoveMiniport, 1),
-	IMPORT_SFUNC(NdisInitializeString, 2),
-	IMPORT_SFUNC(NdisFreeString, 1),
-	IMPORT_SFUNC(NdisGetCurrentSystemTime, 1),
-	IMPORT_SFUNC(NdisGetRoutineAddress, 1),
-	IMPORT_SFUNC(NdisGetSystemUpTime, 1),
-	IMPORT_SFUNC(NdisGetVersion, 0),
-	IMPORT_SFUNC(NdisMSynchronizeWithInterrupt, 3),
-	IMPORT_SFUNC(NdisMAllocateSharedMemoryAsync, 4),
-	IMPORT_SFUNC(NdisInterlockedInsertHeadList, 3),
-	IMPORT_SFUNC(NdisInterlockedInsertTailList, 3),
-	IMPORT_SFUNC(NdisInterlockedRemoveHeadList, 2),
-	IMPORT_SFUNC(NdisInitializeWrapper, 4),
-	IMPORT_SFUNC(NdisMRegisterMiniport, 3),
-	IMPORT_SFUNC(NdisAllocateMemoryWithTag, 3),
-	IMPORT_SFUNC(NdisAllocateMemory, 4 + 1),
-	IMPORT_SFUNC(NdisMSetAttributesEx, 5),
-	IMPORT_SFUNC(NdisCloseConfiguration, 1),
-	IMPORT_SFUNC(NdisReadConfiguration, 5),
-	IMPORT_SFUNC(NdisOpenConfiguration, 3),
-	IMPORT_SFUNC(NdisAcquireSpinLock, 1),
-	IMPORT_SFUNC(NdisReleaseSpinLock, 1),
-	IMPORT_SFUNC(NdisDprAcquireSpinLock, 1),
-	IMPORT_SFUNC(NdisDprReleaseSpinLock, 1),
-	IMPORT_SFUNC(NdisAllocateSpinLock, 1),
-	IMPORT_SFUNC(NdisInitializeReadWriteLock, 1),
-	IMPORT_SFUNC(NdisAcquireReadWriteLock, 3),
-	IMPORT_SFUNC(NdisReleaseReadWriteLock, 2),
-	IMPORT_SFUNC(NdisFreeSpinLock, 1),
-	IMPORT_SFUNC(NdisFreeMemory, 3),
-	IMPORT_SFUNC(NdisReadPciSlotInformation, 5),
-	IMPORT_SFUNC(NdisWritePciSlotInformation, 5),
-	IMPORT_SFUNC_MAP(NdisImmediateReadPciSlotInformation,
-	    NdisReadPciSlotInformation, 5),
-	IMPORT_SFUNC_MAP(NdisImmediateWritePciSlotInformation,
-	    NdisWritePciSlotInformation, 5),
-	IMPORT_CFUNC(NdisWriteErrorLogEntry, 0),
-	IMPORT_SFUNC(NdisMStartBufferPhysicalMapping, 6),
-	IMPORT_SFUNC(NdisMCompleteBufferPhysicalMapping, 3),
-	IMPORT_SFUNC(NdisMInitializeTimer, 4),
-	IMPORT_SFUNC(NdisInitializeTimer, 3),
-	IMPORT_SFUNC(NdisSetTimer, 2),
-	IMPORT_SFUNC(NdisMCancelTimer, 2),
-	IMPORT_SFUNC_MAP(NdisCancelTimer, NdisMCancelTimer, 2),
-	IMPORT_SFUNC(NdisMSetPeriodicTimer, 2),
-	IMPORT_SFUNC(NdisMQueryAdapterResources, 4),
-	IMPORT_SFUNC(NdisMRegisterIoPortRange, 4),
-	IMPORT_SFUNC(NdisMDeregisterIoPortRange, 4),
-	IMPORT_SFUNC(NdisReadNetworkAddress, 4),
-	IMPORT_SFUNC(NdisQueryMapRegisterCount, 2),
-	IMPORT_SFUNC(NdisMAllocateMapRegisters, 5),
-	IMPORT_SFUNC(NdisMFreeMapRegisters, 1),
-	IMPORT_SFUNC(NdisMAllocateSharedMemory, 5),
-	IMPORT_SFUNC(NdisMMapIoSpace, 4 + 1),
-	IMPORT_SFUNC(NdisMUnmapIoSpace, 3),
-	IMPORT_SFUNC(NdisGetCacheFillSize, 0),
-	IMPORT_SFUNC(NdisMGetDmaAlignment, 1),
-	IMPORT_SFUNC(NdisMInitializeScatterGatherDma, 3),
-	IMPORT_SFUNC(NdisAllocatePacketPool, 4),
-	IMPORT_SFUNC(NdisAllocatePacketPoolEx, 5),
-	IMPORT_SFUNC(NdisAllocatePacket, 3),
-	IMPORT_SFUNC(NdisFreePacket, 1),
-	IMPORT_SFUNC(NdisFreePacketPool, 1),
-	IMPORT_SFUNC_MAP(NdisDprAllocatePacket, NdisAllocatePacket, 3),
-	IMPORT_SFUNC_MAP(NdisDprFreePacket, NdisFreePacket, 1),
-	IMPORT_SFUNC(NdisAllocateBufferPool, 3),
-	IMPORT_SFUNC(NdisAllocateBuffer, 5),
-	IMPORT_SFUNC(NdisQueryBuffer, 3),
-	IMPORT_SFUNC(NdisQueryBufferSafe, 4),
-	IMPORT_SFUNC(NdisBufferVirtualAddress, 1),
-	IMPORT_SFUNC(NdisBufferVirtualAddressSafe, 2),
-	IMPORT_SFUNC(NdisBufferLength, 1),
-	IMPORT_SFUNC(NdisFreeBuffer, 1),
-	IMPORT_SFUNC(NdisFreeBufferPool, 1),
-	IMPORT_SFUNC(NdisInterlockedIncrement, 1),
-	IMPORT_SFUNC(NdisInterlockedDecrement, 1),
-	IMPORT_SFUNC(NdisInitializeEvent, 1),
-	IMPORT_SFUNC(NdisSetEvent, 1),
-	IMPORT_SFUNC(NdisResetEvent, 1),
-	IMPORT_SFUNC(NdisWaitEvent, 2),
-	IMPORT_SFUNC(NdisUnicodeStringToAnsiString, 2),
-	IMPORT_SFUNC(NdisMPciAssignResources, 3),
-	IMPORT_SFUNC(NdisMFreeSharedMemory, 5 + 1),
-	IMPORT_SFUNC(NdisMRegisterInterrupt, 7),
-	IMPORT_SFUNC(NdisMDeregisterInterrupt, 1),
-	IMPORT_SFUNC(NdisMRegisterAdapterShutdownHandler, 3),
-	IMPORT_SFUNC(NdisMDeregisterAdapterShutdownHandler, 1),
-	IMPORT_SFUNC(NDIS_BUFFER_TO_SPAN_PAGES, 1),
-	IMPORT_SFUNC(NdisQueryBufferOffset, 3),
-	IMPORT_SFUNC(NdisAdjustBufferLength, 2),
-	IMPORT_SFUNC(NdisPacketPoolUsage, 1),
-	IMPORT_SFUNC(NdisMSleep, 1),
-	IMPORT_SFUNC(NdisUnchainBufferAtFront, 2),
-	IMPORT_SFUNC(NdisReadPcmciaAttributeMemory, 4),
-	IMPORT_SFUNC(NdisWritePcmciaAttributeMemory, 4),
-	IMPORT_SFUNC(NdisOpenFile, 5 + 1),
-	IMPORT_SFUNC(NdisMapFile, 3),
-	IMPORT_SFUNC(NdisUnmapFile, 1),
-	IMPORT_SFUNC(NdisCloseFile, 1),
-	IMPORT_SFUNC(NdisMRegisterDevice, 6),
-	IMPORT_SFUNC(NdisMDeregisterDevice, 1),
-	IMPORT_SFUNC(NdisMQueryAdapterInstanceName, 2),
-	IMPORT_SFUNC(NdisMRegisterUnloadHandler, 2),
-	IMPORT_SFUNC(ndis_timercall, 4),
-	IMPORT_SFUNC(ndis_asyncmem_complete, 2),
-	IMPORT_SFUNC(ndis_intr, 2),
-	IMPORT_SFUNC(ndis_intrhand, 4),
-
-	/*
-	 * This last entry is a catch-all for any function we haven't
-	 * implemented yet. The PE import list patching routine will
-	 * use it for any function that doesn't have an explicit match
-	 * in this table.
-	 */
-
-	{ NULL, (FUNC)dummy, NULL, 0, WINDRV_WRAP_STDCALL },
-
-	/* End of list. */
-	{ NULL, NULL, NULL }
-};
diff --git a/sys/compat/ndis/subr_ntoskrnl.c b/sys/compat/ndis/subr_ntoskrnl.c
deleted file mode 100644
index f8b3d3a41732..000000000000
--- a/sys/compat/ndis/subr_ntoskrnl.c
+++ /dev/null
@@ -1,4446 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
- * Copyright (c) 2003
- *	Bill Paul <wpaul@windriver.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/ctype.h>
-#include <sys/unistd.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/errno.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-
-#include <sys/callout.h>
-#include <sys/kdb.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/condvar.h>
-#include <sys/kthread.h>
-#include <sys/module.h>
-#include <sys/smp.h>
-#include <sys/sched.h>
-#include <sys/sysctl.h>
-
-#include <machine/atomic.h>
-#include <machine/bus.h>
-#include <machine/stdarg.h>
-#include <machine/resource.h>
-
-#include <sys/bus.h>
-#include <sys/rman.h>
-
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/pmap.h>
-#include <vm/uma.h>
-#include <vm/vm_kern.h>
-#include <vm/vm_map.h>
-#include <vm/vm_extern.h>
-
-#include <compat/ndis/pe_var.h>
-#include <compat/ndis/cfg_var.h>
-#include <compat/ndis/resource_var.h>
-#include <compat/ndis/ntoskrnl_var.h>
-#include <compat/ndis/hal_var.h>
-#include <compat/ndis/ndis_var.h>
-
-#ifdef NTOSKRNL_DEBUG_TIMERS
-static int sysctl_show_timers(SYSCTL_HANDLER_ARGS);
-
-SYSCTL_PROC(_debug, OID_AUTO, ntoskrnl_timers,
-    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, NULL, 0,
-    sysctl_show_timers, "I",
-    "Show ntoskrnl timer stats");
-#endif
-
-struct kdpc_queue {
-	list_entry		kq_disp;
-	struct thread		*kq_td;
-	int			kq_cpu;
-	int			kq_exit;
-	int			kq_running;
-	kspin_lock		kq_lock;
-	nt_kevent		kq_proc;
-	nt_kevent		kq_done;
-};
-
-typedef struct kdpc_queue kdpc_queue;
-
-struct wb_ext {
-	struct cv		we_cv;
-	struct thread		*we_td;
-};
-
-typedef struct wb_ext wb_ext;
-
-#define NTOSKRNL_TIMEOUTS	256
-#ifdef NTOSKRNL_DEBUG_TIMERS
-static uint64_t ntoskrnl_timer_fires;
-static uint64_t ntoskrnl_timer_sets;
-static uint64_t ntoskrnl_timer_reloads;
-static uint64_t ntoskrnl_timer_cancels;
-#endif
-
-struct callout_entry {
-	struct callout		ce_callout;
-	list_entry		ce_list;
-};
-
-typedef struct callout_entry callout_entry;
-
-static struct list_entry ntoskrnl_calllist;
-static struct mtx ntoskrnl_calllock;
-struct kuser_shared_data kuser_shared_data;
-
-static struct list_entry ntoskrnl_intlist;
-static kspin_lock ntoskrnl_intlock;
-
-static uint8_t RtlEqualUnicodeString(unicode_string *,
-	unicode_string *, uint8_t);
-static void RtlCopyString(ansi_string *, const ansi_string *);
-static void RtlCopyUnicodeString(unicode_string *,
-	unicode_string *);
-static irp *IoBuildSynchronousFsdRequest(uint32_t, device_object *,
-	 void *, uint32_t, uint64_t *, nt_kevent *, io_status_block *);
-static irp *IoBuildAsynchronousFsdRequest(uint32_t,
-	device_object *, void *, uint32_t, uint64_t *, io_status_block *);
-static irp *IoBuildDeviceIoControlRequest(uint32_t,
-	device_object *, void *, uint32_t, void *, uint32_t,
-	uint8_t, nt_kevent *, io_status_block *);
-static irp *IoAllocateIrp(uint8_t, uint8_t);
-static void IoReuseIrp(irp *, uint32_t);
-static void IoFreeIrp(irp *);
-static void IoInitializeIrp(irp *, uint16_t, uint8_t);
-static irp *IoMakeAssociatedIrp(irp *, uint8_t);
-static uint32_t KeWaitForMultipleObjects(uint32_t,
-	nt_dispatch_header **, uint32_t, uint32_t, uint32_t, uint8_t,
-	int64_t *, wait_block *);
-static void ntoskrnl_waittest(nt_dispatch_header *, uint32_t);
-static void ntoskrnl_satisfy_wait(nt_dispatch_header *, struct thread *);
-static void ntoskrnl_satisfy_multiple_waits(wait_block *);
-static int ntoskrnl_is_signalled(nt_dispatch_header *, struct thread *);
-static void ntoskrnl_insert_timer(ktimer *, int);
-static void ntoskrnl_remove_timer(ktimer *);
-#ifdef NTOSKRNL_DEBUG_TIMERS
-static void ntoskrnl_show_timers(void);
-#endif
-static void ntoskrnl_timercall(void *);
-static void ntoskrnl_dpc_thread(void *);
-static void ntoskrnl_destroy_dpc_threads(void);
-static void ntoskrnl_destroy_workitem_threads(void);
-static void ntoskrnl_workitem_thread(void *);
-static void ntoskrnl_workitem(device_object *, void *);
-static void ntoskrnl_unicode_to_ascii(uint16_t *, char *, int);
-static void ntoskrnl_ascii_to_unicode(char *, uint16_t *, int);
-static uint8_t ntoskrnl_insert_dpc(list_entry *, kdpc *);
-static void WRITE_REGISTER_USHORT(uint16_t *, uint16_t);
-static uint16_t READ_REGISTER_USHORT(uint16_t *);
-static void WRITE_REGISTER_ULONG(uint32_t *, uint32_t);
-static uint32_t READ_REGISTER_ULONG(uint32_t *);
-static void WRITE_REGISTER_UCHAR(uint8_t *, uint8_t);
-static uint8_t READ_REGISTER_UCHAR(uint8_t *);
-static int64_t _allmul(int64_t, int64_t);
-static int64_t _alldiv(int64_t, int64_t);
-static int64_t _allrem(int64_t, int64_t);
-static int64_t _allshr(int64_t, uint8_t);
-static int64_t _allshl(int64_t, uint8_t);
-static uint64_t _aullmul(uint64_t, uint64_t);
-static uint64_t _aulldiv(uint64_t, uint64_t);
-static uint64_t _aullrem(uint64_t, uint64_t);
-static uint64_t _aullshr(uint64_t, uint8_t);
-static uint64_t _aullshl(uint64_t, uint8_t);
-static slist_entry *ntoskrnl_pushsl(slist_header *, slist_entry *);
-static void InitializeSListHead(slist_header *);
-static slist_entry *ntoskrnl_popsl(slist_header *);
-static void ExFreePoolWithTag(void *, uint32_t);
-static void ExInitializePagedLookasideList(paged_lookaside_list *,
-	lookaside_alloc_func *, lookaside_free_func *,
-	uint32_t, size_t, uint32_t, uint16_t);
-static void ExDeletePagedLookasideList(paged_lookaside_list *);
-static void ExInitializeNPagedLookasideList(npaged_lookaside_list *,
-	lookaside_alloc_func *, lookaside_free_func *,
-	uint32_t, size_t, uint32_t, uint16_t);
-static void ExDeleteNPagedLookasideList(npaged_lookaside_list *);
-static slist_entry
-	*ExInterlockedPushEntrySList(slist_header *,
-	slist_entry *, kspin_lock *);
-static slist_entry
-	*ExInterlockedPopEntrySList(slist_header *, kspin_lock *);
-static uint32_t InterlockedIncrement(volatile uint32_t *);
-static uint32_t InterlockedDecrement(volatile uint32_t *);
-static void ExInterlockedAddLargeStatistic(uint64_t *, uint32_t);
-static void *MmAllocateContiguousMemory(uint32_t, uint64_t);
-static void *MmAllocateContiguousMemorySpecifyCache(uint32_t,
-	uint64_t, uint64_t, uint64_t, enum nt_caching_type);
-static void MmFreeContiguousMemory(void *);
-static void MmFreeContiguousMemorySpecifyCache(void *, uint32_t,
-	enum nt_caching_type);
-static uint32_t MmSizeOfMdl(void *, size_t);
-static void *MmMapLockedPages(mdl *, uint8_t);
-static void *MmMapLockedPagesSpecifyCache(mdl *,
-	uint8_t, uint32_t, void *, uint32_t, uint32_t);
-static void MmUnmapLockedPages(void *, mdl *);
-static device_t ntoskrnl_finddev(device_t, uint64_t, struct resource **);
-static void RtlZeroMemory(void *, size_t);
-static void RtlSecureZeroMemory(void *, size_t);
-static void RtlFillMemory(void *, size_t, uint8_t);
-static void RtlMoveMemory(void *, const void *, size_t);
-static ndis_status RtlCharToInteger(const char *, uint32_t, uint32_t *);
-static void RtlCopyMemory(void *, const void *, size_t);
-static size_t RtlCompareMemory(const void *, const void *, size_t);
-static ndis_status RtlUnicodeStringToInteger(unicode_string *,
-	uint32_t, uint32_t *);
-static int atoi (const char *);
-static long atol (const char *);
-static int rand(void);
-static void srand(unsigned int);
-static void KeQuerySystemTime(uint64_t *);
-static uint32_t KeTickCount(void);
-static uint8_t IoIsWdmVersionAvailable(uint8_t, uint8_t);
-static int32_t IoOpenDeviceRegistryKey(struct device_object *, uint32_t,
-    uint32_t, void **);
-static void ntoskrnl_thrfunc(void *);
-static ndis_status PsCreateSystemThread(ndis_handle *,
-	uint32_t, void *, ndis_handle, void *, void *, void *);
-static ndis_status PsTerminateSystemThread(ndis_status);
-static ndis_status IoGetDeviceObjectPointer(unicode_string *,
-	uint32_t, void *, device_object *);
-static ndis_status IoGetDeviceProperty(device_object *, uint32_t,
-	uint32_t, void *, uint32_t *);
-static void KeInitializeMutex(kmutant *, uint32_t);
-static uint32_t KeReleaseMutex(kmutant *, uint8_t);
-static uint32_t KeReadStateMutex(kmutant *);
-static ndis_status ObReferenceObjectByHandle(ndis_handle,
-	uint32_t, void *, uint8_t, void **, void **);
-static void ObfDereferenceObject(void *);
-static uint32_t ZwClose(ndis_handle);
-static uint32_t WmiQueryTraceInformation(uint32_t, void *, uint32_t,
-	uint32_t, void *);
-static uint32_t WmiTraceMessage(uint64_t, uint32_t, void *, uint16_t, ...);
-static uint32_t IoWMIRegistrationControl(device_object *, uint32_t);
-static void *ntoskrnl_memset(void *, int, size_t);
-static void *ntoskrnl_memmove(void *, void *, size_t);
-static void *ntoskrnl_memchr(void *, unsigned char, size_t);
-static char *ntoskrnl_strstr(char *, char *);
-static char *ntoskrnl_strncat(char *, char *, size_t);
-static int ntoskrnl_toupper(int);
-static int ntoskrnl_tolower(int);
-static funcptr ntoskrnl_findwrap(funcptr);
-static uint32_t DbgPrint(char *, ...);
-static void DbgBreakPoint(void);
-static void KeBugCheckEx(uint32_t, u_long, u_long, u_long, u_long);
-static int32_t KeDelayExecutionThread(uint8_t, uint8_t, int64_t *);
-static int32_t KeSetPriorityThread(struct thread *, int32_t);
-static void dummy(void);
-
-static struct mtx ntoskrnl_dispatchlock;
-static struct mtx ntoskrnl_interlock;
-static kspin_lock ntoskrnl_cancellock;
-static int ntoskrnl_kth = 0;
-static struct nt_objref_head ntoskrnl_reflist;
-static uma_zone_t mdl_zone;
-static uma_zone_t iw_zone;
-static struct kdpc_queue *kq_queues;
-static struct kdpc_queue *wq_queues;
-static int wq_idx = 0;
-
-int
-ntoskrnl_libinit()
-{
-	image_patch_table	*patch;
-	int			error;
-	struct proc		*p;
-	kdpc_queue		*kq;
-	callout_entry		*e;
-	int			i;
-
-	mtx_init(&ntoskrnl_dispatchlock,
-	    "ntoskrnl dispatch lock", MTX_NDIS_LOCK, MTX_DEF|MTX_RECURSE);
-	mtx_init(&ntoskrnl_interlock, MTX_NTOSKRNL_SPIN_LOCK, NULL, MTX_SPIN);
-	KeInitializeSpinLock(&ntoskrnl_cancellock);
-	KeInitializeSpinLock(&ntoskrnl_intlock);
-	TAILQ_INIT(&ntoskrnl_reflist);
-
-	InitializeListHead(&ntoskrnl_calllist);
-	InitializeListHead(&ntoskrnl_intlist);
-	mtx_init(&ntoskrnl_calllock, MTX_NTOSKRNL_SPIN_LOCK, NULL, MTX_SPIN);
-
-	kq_queues = ExAllocatePoolWithTag(NonPagedPool,
-#ifdef NTOSKRNL_MULTIPLE_DPCS
-	    sizeof(kdpc_queue) * mp_ncpus, 0);
-#else
-	    sizeof(kdpc_queue), 0);
-#endif
-
-	if (kq_queues == NULL)
-		return (ENOMEM);
-
-	wq_queues = ExAllocatePoolWithTag(NonPagedPool,
-	    sizeof(kdpc_queue) * WORKITEM_THREADS, 0);
-
-	if (wq_queues == NULL)
-		return (ENOMEM);
-
-#ifdef NTOSKRNL_MULTIPLE_DPCS
-	bzero((char *)kq_queues, sizeof(kdpc_queue) * mp_ncpus);
-#else
-	bzero((char *)kq_queues, sizeof(kdpc_queue));
-#endif
-	bzero((char *)wq_queues, sizeof(kdpc_queue) * WORKITEM_THREADS);
-
-	/*
-	 * Launch the DPC threads.
-	 */
-
-#ifdef NTOSKRNL_MULTIPLE_DPCS
-	for (i = 0; i < mp_ncpus; i++) {
-#else
-	for (i = 0; i < 1; i++) {
-#endif
-		kq = kq_queues + i;
-		kq->kq_cpu = i;
-		error = kproc_create(ntoskrnl_dpc_thread, kq, &p,
-		    RFHIGHPID, NDIS_KSTACK_PAGES, "Windows DPC %d", i);
-		if (error)
-			panic("failed to launch DPC thread");
-	}
-
-	/*
-	 * Launch the workitem threads.
-	 */
-
-	for (i = 0; i < WORKITEM_THREADS; i++) {
-		kq = wq_queues + i;
-		error = kproc_create(ntoskrnl_workitem_thread, kq, &p,
-		    RFHIGHPID, NDIS_KSTACK_PAGES, "Windows Workitem %d", i);
-		if (error)
-			panic("failed to launch workitem thread");
-	}
-
-	patch = ntoskrnl_functbl;
-	while (patch->ipt_func != NULL) {
-		windrv_wrap((funcptr)patch->ipt_func,
-		    (funcptr *)&patch->ipt_wrap,
-		    patch->ipt_argcnt, patch->ipt_ftype);
-		patch++;
-	}
-
-	for (i = 0; i < NTOSKRNL_TIMEOUTS; i++) {
-		e = ExAllocatePoolWithTag(NonPagedPool,
-		    sizeof(callout_entry), 0);
-		if (e == NULL)
-			panic("failed to allocate timeouts");
-		mtx_lock_spin(&ntoskrnl_calllock);
-		InsertHeadList((&ntoskrnl_calllist), (&e->ce_list));
-		mtx_unlock_spin(&ntoskrnl_calllock);
-	}
-
-	/*
-	 * MDLs are supposed to be variable size (they describe
-	 * buffers containing some number of pages, but we don't
-	 * know ahead of time how many pages that will be). But
-	 * always allocating them off the heap is very slow. As
-	 * a compromise, we create an MDL UMA zone big enough to
-	 * handle any buffer requiring up to 16 pages, and we
-	 * use those for any MDLs for buffers of 16 pages or less
-	 * in size. For buffers larger than that (which we assume
-	 * will be few and far between, we allocate the MDLs off
-	 * the heap.
-	 */
-
-	mdl_zone = uma_zcreate("Windows MDL", MDL_ZONE_SIZE,
-	    NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0);
-
-	iw_zone = uma_zcreate("Windows WorkItem", sizeof(io_workitem),
-	    NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0);
-
-	return (0);
-}
-
-int
-ntoskrnl_libfini()
-{
-	image_patch_table	*patch;
-	callout_entry		*e;
-	list_entry		*l;
-
-	patch = ntoskrnl_functbl;
-	while (patch->ipt_func != NULL) {
-		windrv_unwrap(patch->ipt_wrap);
-		patch++;
-	}
-
-	/* Stop the workitem queues. */
-	ntoskrnl_destroy_workitem_threads();
-	/* Stop the DPC queues. */
-	ntoskrnl_destroy_dpc_threads();
-
-	ExFreePool(kq_queues);
-	ExFreePool(wq_queues);
-
-	uma_zdestroy(mdl_zone);
-	uma_zdestroy(iw_zone);
-
-	mtx_lock_spin(&ntoskrnl_calllock);
-	while(!IsListEmpty(&ntoskrnl_calllist)) {
-		l = RemoveHeadList(&ntoskrnl_calllist);
-		e = CONTAINING_RECORD(l, callout_entry, ce_list);
-		mtx_unlock_spin(&ntoskrnl_calllock);
-		ExFreePool(e);
-		mtx_lock_spin(&ntoskrnl_calllock);
-	}
-	mtx_unlock_spin(&ntoskrnl_calllock);
-
-	mtx_destroy(&ntoskrnl_dispatchlock);
-	mtx_destroy(&ntoskrnl_interlock);
-	mtx_destroy(&ntoskrnl_calllock);
-
-	return (0);
-}
-
-/*
- * We need to be able to reference this externally from the wrapper;
- * GCC only generates a local implementation of memset.
- */
-static void *
-ntoskrnl_memset(buf, ch, size)
-	void			*buf;
-	int			ch;
-	size_t			size;
-{
-	return (memset(buf, ch, size));
-}
-
-static void *
-ntoskrnl_memmove(dst, src, size)
-	void			*src;
-	void			*dst;
-	size_t			size;
-{
-	bcopy(src, dst, size);
-	return (dst);
-}
-
-static void *
-ntoskrnl_memchr(void *buf, unsigned char ch, size_t len)
-{
-	if (len != 0) {
-		unsigned char *p = buf;
-
-		do {
-			if (*p++ == ch)
-				return (p - 1);
-		} while (--len != 0);
-	}
-	return (NULL);
-}
-
-static char *
-ntoskrnl_strstr(s, find)
-	char *s, *find;
-{
-	char c, sc;
-	size_t len;
-
-	if ((c = *find++) != 0) {
-		len = strlen(find);
-		do {
-			do {
-				if ((sc = *s++) == 0)
-					return (NULL);
-			} while (sc != c);
-		} while (strncmp(s, find, len) != 0);
-		s--;
-	}
-	return ((char *)s);
-}
-
-/* Taken from libc */
-static char *
-ntoskrnl_strncat(dst, src, n)
-	char		*dst;
-	char		*src;
-	size_t		n;
-{
-	if (n != 0) {
-		char *d = dst;
-		const char *s = src;
-
-		while (*d != 0)
-			d++;
-		do {
-			if ((*d = *s++) == 0)
-				break;
-			d++;
-		} while (--n != 0);
-		*d = 0;
-	}
-	return (dst);
-}
-
-static int
-ntoskrnl_toupper(c)
-	int			c;
-{
-	return (toupper(c));
-}
-
-static int
-ntoskrnl_tolower(c)
-	int			c;
-{
-	return (tolower(c));
-}
-
-static uint8_t
-RtlEqualUnicodeString(unicode_string *str1, unicode_string *str2,
-	uint8_t caseinsensitive)
-{
-	int			i;
-
-	if (str1->us_len != str2->us_len)
-		return (FALSE);
-
-	for (i = 0; i < str1->us_len; i++) {
-		if (caseinsensitive == TRUE) {
-			if (toupper((char)(str1->us_buf[i] & 0xFF)) !=
-			    toupper((char)(str2->us_buf[i] & 0xFF)))
-				return (FALSE);
-		} else {
-			if (str1->us_buf[i] != str2->us_buf[i])
-				return (FALSE);
-		}
-	}
-
-	return (TRUE);
-}
-
-static void
-RtlCopyString(dst, src)
-	ansi_string		*dst;
-	const ansi_string	*src;
-{
-	if (src != NULL && src->as_buf != NULL && dst->as_buf != NULL) {
-		dst->as_len = min(src->as_len, dst->as_maxlen);
-		memcpy(dst->as_buf, src->as_buf, dst->as_len);
-		if (dst->as_len < dst->as_maxlen)
-			dst->as_buf[dst->as_len] = 0;
-	} else
-		dst->as_len = 0;
-}
-
-static void
-RtlCopyUnicodeString(dest, src)
-	unicode_string		*dest;
-	unicode_string		*src;
-{
-
-	if (dest->us_maxlen >= src->us_len)
-		dest->us_len = src->us_len;
-	else
-		dest->us_len = dest->us_maxlen;
-	memcpy(dest->us_buf, src->us_buf, dest->us_len);
-}
-
-static void
-ntoskrnl_ascii_to_unicode(ascii, unicode, len)
-	char			*ascii;
-	uint16_t		*unicode;
-	int			len;
-{
-	int			i;
-	uint16_t		*ustr;
-
-	ustr = unicode;
-	for (i = 0; i < len; i++) {
-		*ustr = (uint16_t)ascii[i];
-		ustr++;
-	}
-}
-
-static void
-ntoskrnl_unicode_to_ascii(unicode, ascii, len)
-	uint16_t		*unicode;
-	char			*ascii;
-	int			len;
-{
-	int			i;
-	uint8_t			*astr;
-
-	astr = ascii;
-	for (i = 0; i < len / 2; i++) {
-		*astr = (uint8_t)unicode[i];
-		astr++;
-	}
-}
-
-uint32_t
-RtlUnicodeStringToAnsiString(ansi_string *dest, unicode_string *src, uint8_t allocate)
-{
-	if (dest == NULL || src == NULL)
-		return (STATUS_INVALID_PARAMETER);
-
-	dest->as_len = src->us_len / 2;
-	if (dest->as_maxlen < dest->as_len)
-		dest->as_len = dest->as_maxlen;
-
-	if (allocate == TRUE) {
-		dest->as_buf = ExAllocatePoolWithTag(NonPagedPool,
-		    (src->us_len / 2) + 1, 0);
-		if (dest->as_buf == NULL)
-			return (STATUS_INSUFFICIENT_RESOURCES);
-		dest->as_len = dest->as_maxlen = src->us_len / 2;
-	} else {
-		dest->as_len = src->us_len / 2; /* XXX */
-		if (dest->as_maxlen < dest->as_len)
-			dest->as_len = dest->as_maxlen;
-	}
-
-	ntoskrnl_unicode_to_ascii(src->us_buf, dest->as_buf,
-	    dest->as_len * 2);
-
-	return (STATUS_SUCCESS);
-}
-
-uint32_t
-RtlAnsiStringToUnicodeString(unicode_string *dest, ansi_string *src,
-	uint8_t allocate)
-{
-	if (dest == NULL || src == NULL)
-		return (STATUS_INVALID_PARAMETER);
-
-	if (allocate == TRUE) {
-		dest->us_buf = ExAllocatePoolWithTag(NonPagedPool,
-		    src->as_len * 2, 0);
-		if (dest->us_buf == NULL)
-			return (STATUS_INSUFFICIENT_RESOURCES);
-		dest->us_len = dest->us_maxlen = strlen(src->as_buf) * 2;
-	} else {
-		dest->us_len = src->as_len * 2; /* XXX */
-		if (dest->us_maxlen < dest->us_len)
-			dest->us_len = dest->us_maxlen;
-	}
-
-	ntoskrnl_ascii_to_unicode(src->as_buf, dest->us_buf,
-	    dest->us_len / 2);
-
-	return (STATUS_SUCCESS);
-}
-
-void *
-ExAllocatePoolWithTag(pooltype, len, tag)
-	uint32_t		pooltype;
-	size_t			len;
-	uint32_t		tag;
-{
-	void			*buf;
-
-	buf = malloc(len, M_DEVBUF, M_NOWAIT|M_ZERO);
-	if (buf == NULL)
-		return (NULL);
-
-	return (buf);
-}
-
-static void
-ExFreePoolWithTag(buf, tag)
-	void		*buf;
-	uint32_t	tag;
-{
-	ExFreePool(buf);
-}
-
-void
-ExFreePool(buf)
-	void			*buf;
-{
-	free(buf, M_DEVBUF);
-}
-
-uint32_t
-IoAllocateDriverObjectExtension(drv, clid, extlen, ext)
-	driver_object		*drv;
-	void			*clid;
-	uint32_t		extlen;
-	void			**ext;
-{
-	custom_extension	*ce;
-
-	ce = ExAllocatePoolWithTag(NonPagedPool, sizeof(custom_extension)
-	    + extlen, 0);
-
-	if (ce == NULL)
-		return (STATUS_INSUFFICIENT_RESOURCES);
-
-	ce->ce_clid = clid;
-	InsertTailList((&drv->dro_driverext->dre_usrext), (&ce->ce_list));
-
-	*ext = (void *)(ce + 1);
-
-	return (STATUS_SUCCESS);
-}
-
-void *
-IoGetDriverObjectExtension(drv, clid)
-	driver_object		*drv;
-	void			*clid;
-{
-	list_entry		*e;
-	custom_extension	*ce;
-
-	/*
-	 * Sanity check. Our dummy bus drivers don't have
-	 * any driver extensions.
-	 */
-
-	if (drv->dro_driverext == NULL)
-		return (NULL);
-
-	e = drv->dro_driverext->dre_usrext.nle_flink;
-	while (e != &drv->dro_driverext->dre_usrext) {
-		ce = (custom_extension *)e;
-		if (ce->ce_clid == clid)
-			return ((void *)(ce + 1));
-		e = e->nle_flink;
-	}
-
-	return (NULL);
-}
-
-uint32_t
-IoCreateDevice(driver_object *drv, uint32_t devextlen, unicode_string *devname,
-	uint32_t devtype, uint32_t devchars, uint8_t exclusive,
-	device_object **newdev)
-{
-	device_object		*dev;
-
-	dev = ExAllocatePoolWithTag(NonPagedPool, sizeof(device_object), 0);
-	if (dev == NULL)
-		return (STATUS_INSUFFICIENT_RESOURCES);
-
-	dev->do_type = devtype;
-	dev->do_drvobj = drv;
-	dev->do_currirp = NULL;
-	dev->do_flags = 0;
-
-	if (devextlen) {
-		dev->do_devext = ExAllocatePoolWithTag(NonPagedPool,
-		    devextlen, 0);
-
-		if (dev->do_devext == NULL) {
-			ExFreePool(dev);
-			return (STATUS_INSUFFICIENT_RESOURCES);
-		}
-
-		bzero(dev->do_devext, devextlen);
-	} else
-		dev->do_devext = NULL;
-
-	dev->do_size = sizeof(device_object) + devextlen;
-	dev->do_refcnt = 1;
-	dev->do_attacheddev = NULL;
-	dev->do_nextdev = NULL;
-	dev->do_devtype = devtype;
-	dev->do_stacksize = 1;
-	dev->do_alignreq = 1;
-	dev->do_characteristics = devchars;
-	dev->do_iotimer = NULL;
-	KeInitializeEvent(&dev->do_devlock, EVENT_TYPE_SYNC, TRUE);
-
-	/*
-	 * Vpd is used for disk/tape devices,
-	 * but we don't support those. (Yet.)
-	 */
-	dev->do_vpb = NULL;
-
-	dev->do_devobj_ext = ExAllocatePoolWithTag(NonPagedPool,
-	    sizeof(devobj_extension), 0);
-
-	if (dev->do_devobj_ext == NULL) {
-		if (dev->do_devext != NULL)
-			ExFreePool(dev->do_devext);
-		ExFreePool(dev);
-		return (STATUS_INSUFFICIENT_RESOURCES);
-	}
-
-	dev->do_devobj_ext->dve_type = 0;
-	dev->do_devobj_ext->dve_size = sizeof(devobj_extension);
-	dev->do_devobj_ext->dve_devobj = dev;
-
-	/*
-	 * Attach this device to the driver object's list
-	 * of devices. Note: this is not the same as attaching
-	 * the device to the device stack. The driver's AddDevice
-	 * routine must explicitly call IoAddDeviceToDeviceStack()
-	 * to do that.
-	 */
-
-	if (drv->dro_devobj == NULL) {
-		drv->dro_devobj = dev;
-		dev->do_nextdev = NULL;
-	} else {
-		dev->do_nextdev = drv->dro_devobj;
-		drv->dro_devobj = dev;
-	}
-
-	*newdev = dev;
-
-	return (STATUS_SUCCESS);
-}
-
-void
-IoDeleteDevice(dev)
-	device_object		*dev;
-{
-	device_object		*prev;
-
-	if (dev == NULL)
-		return;
-
-	if (dev->do_devobj_ext != NULL)
-		ExFreePool(dev->do_devobj_ext);
-
-	if (dev->do_devext != NULL)
-		ExFreePool(dev->do_devext);
-
-	/* Unlink the device from the driver's device list. */
-
-	prev = dev->do_drvobj->dro_devobj;
-	if (prev == dev)
-		dev->do_drvobj->dro_devobj = dev->do_nextdev;
-	else {
-		while (prev->do_nextdev != dev)
-			prev = prev->do_nextdev;
-		prev->do_nextdev = dev->do_nextdev;
-	}
-
-	ExFreePool(dev);
-}
-
-device_object *
-IoGetAttachedDevice(dev)
-	device_object		*dev;
-{
-	device_object		*d;
-
-	if (dev == NULL)
-		return (NULL);
-
-	d = dev;
-
-	while (d->do_attacheddev != NULL)
-		d = d->do_attacheddev;
-
-	return (d);
-}
-
-static irp *
-IoBuildSynchronousFsdRequest(func, dobj, buf, len, off, event, status)
-	uint32_t		func;
-	device_object		*dobj;
-	void			*buf;
-	uint32_t		len;
-	uint64_t		*off;
-	nt_kevent		*event;
-	io_status_block		*status;
-{
-	irp			*ip;
-
-	ip = IoBuildAsynchronousFsdRequest(func, dobj, buf, len, off, status);
-	if (ip == NULL)
-		return (NULL);
-	ip->irp_usrevent = event;
-
-	return (ip);
-}
-
-static irp *
-IoBuildAsynchronousFsdRequest(func, dobj, buf, len, off, status)
-	uint32_t		func;
-	device_object		*dobj;
-	void			*buf;
-	uint32_t		len;
-	uint64_t		*off;
-	io_status_block		*status;
-{
-	irp			*ip;
-	io_stack_location	*sl;
-
-	ip = IoAllocateIrp(dobj->do_stacksize, TRUE);
-	if (ip == NULL)
-		return (NULL);
-
-	ip->irp_usriostat = status;
-	ip->irp_tail.irp_overlay.irp_thread = NULL;
-
-	sl = IoGetNextIrpStackLocation(ip);
-	sl->isl_major = func;
-	sl->isl_minor = 0;
-	sl->isl_flags = 0;
-	sl->isl_ctl = 0;
-	sl->isl_devobj = dobj;
-	sl->isl_fileobj = NULL;
-	sl->isl_completionfunc = NULL;
-
-	ip->irp_userbuf = buf;
-
-	if (dobj->do_flags & DO_BUFFERED_IO) {
-		ip->irp_assoc.irp_sysbuf =
-		    ExAllocatePoolWithTag(NonPagedPool, len, 0);
-		if (ip->irp_assoc.irp_sysbuf == NULL) {
-			IoFreeIrp(ip);
-			return (NULL);
-		}
-		bcopy(buf, ip->irp_assoc.irp_sysbuf, len);
-	}
-
-	if (dobj->do_flags & DO_DIRECT_IO) {
-		ip->irp_mdl = IoAllocateMdl(buf, len, FALSE, FALSE, ip);
-		if (ip->irp_mdl == NULL) {
-			if (ip->irp_assoc.irp_sysbuf != NULL)
-				ExFreePool(ip->irp_assoc.irp_sysbuf);
-			IoFreeIrp(ip);
-			return (NULL);
-		}
-		ip->irp_userbuf = NULL;
-		ip->irp_assoc.irp_sysbuf = NULL;
-	}
-
-	if (func == IRP_MJ_READ) {
-		sl->isl_parameters.isl_read.isl_len = len;
-		if (off != NULL)
-			sl->isl_parameters.isl_read.isl_byteoff = *off;
-		else
-			sl->isl_parameters.isl_read.isl_byteoff = 0;
-	}
-
-	if (func == IRP_MJ_WRITE) {
-		sl->isl_parameters.isl_write.isl_len = len;
-		if (off != NULL)
-			sl->isl_parameters.isl_write.isl_byteoff = *off;
-		else
-			sl->isl_parameters.isl_write.isl_byteoff = 0;
-	}
-
-	return (ip);
-}
-
-static irp *
-IoBuildDeviceIoControlRequest(uint32_t iocode, device_object *dobj, void *ibuf,
-	uint32_t ilen, void *obuf, uint32_t olen, uint8_t isinternal,
-	nt_kevent *event, io_status_block *status)
-{
-	irp			*ip;
-	io_stack_location	*sl;
-	uint32_t		buflen;
-
-	ip = IoAllocateIrp(dobj->do_stacksize, TRUE);
-	if (ip == NULL)
-		return (NULL);
-	ip->irp_usrevent = event;
-	ip->irp_usriostat = status;
-	ip->irp_tail.irp_overlay.irp_thread = NULL;
-
-	sl = IoGetNextIrpStackLocation(ip);
-	sl->isl_major = isinternal == TRUE ?
-	    IRP_MJ_INTERNAL_DEVICE_CONTROL : IRP_MJ_DEVICE_CONTROL;
-	sl->isl_minor = 0;
-	sl->isl_flags = 0;
-	sl->isl_ctl = 0;
-	sl->isl_devobj = dobj;
-	sl->isl_fileobj = NULL;
-	sl->isl_completionfunc = NULL;
-	sl->isl_parameters.isl_ioctl.isl_iocode = iocode;
-	sl->isl_parameters.isl_ioctl.isl_ibuflen = ilen;
-	sl->isl_parameters.isl_ioctl.isl_obuflen = olen;
-
-	switch(IO_METHOD(iocode)) {
-	case METHOD_BUFFERED:
-		if (ilen > olen)
-			buflen = ilen;
-		else
-			buflen = olen;
-		if (buflen) {
-			ip->irp_assoc.irp_sysbuf =
-			    ExAllocatePoolWithTag(NonPagedPool, buflen, 0);
-			if (ip->irp_assoc.irp_sysbuf == NULL) {
-				IoFreeIrp(ip);
-				return (NULL);
-			}
-		}
-		if (ilen && ibuf != NULL) {
-			bcopy(ibuf, ip->irp_assoc.irp_sysbuf, ilen);
-			bzero((char *)ip->irp_assoc.irp_sysbuf + ilen,
-			    buflen - ilen);
-		} else
-			bzero(ip->irp_assoc.irp_sysbuf, ilen);
-		ip->irp_userbuf = obuf;
-		break;
-	case METHOD_IN_DIRECT:
-	case METHOD_OUT_DIRECT:
-		if (ilen && ibuf != NULL) {
-			ip->irp_assoc.irp_sysbuf =
-			    ExAllocatePoolWithTag(NonPagedPool, ilen, 0);
-			if (ip->irp_assoc.irp_sysbuf == NULL) {
-				IoFreeIrp(ip);
-				return (NULL);
-			}
-			bcopy(ibuf, ip->irp_assoc.irp_sysbuf, ilen);
-		}
-		if (olen && obuf != NULL) {
-			ip->irp_mdl = IoAllocateMdl(obuf, olen,
-			    FALSE, FALSE, ip);
-			/*
-			 * Normally we would MmProbeAndLockPages()
-			 * here, but we don't have to in our
-			 * imlementation.
-			 */
-		}
-		break;
-	case METHOD_NEITHER:
-		ip->irp_userbuf = obuf;
-		sl->isl_parameters.isl_ioctl.isl_type3ibuf = ibuf;
-		break;
-	default:
-		break;
-	}
-
-	/*
-	 * Ideally, we should associate this IRP with the calling
-	 * thread here.
-	 */
-
-	return (ip);
-}
-
-static irp *
-IoAllocateIrp(uint8_t stsize, uint8_t chargequota)
-{
-	irp			*i;
-
-	i = ExAllocatePoolWithTag(NonPagedPool, IoSizeOfIrp(stsize), 0);
-	if (i == NULL)
-		return (NULL);
-
-	IoInitializeIrp(i, IoSizeOfIrp(stsize), stsize);
-
-	return (i);
-}
-
-static irp *
-IoMakeAssociatedIrp(irp *ip, uint8_t stsize)
-{
-	irp			*associrp;
-
-	associrp = IoAllocateIrp(stsize, FALSE);
-	if (associrp == NULL)
-		return (NULL);
-
-	mtx_lock(&ntoskrnl_dispatchlock);
-	associrp->irp_flags |= IRP_ASSOCIATED_IRP;
-	associrp->irp_tail.irp_overlay.irp_thread =
-	    ip->irp_tail.irp_overlay.irp_thread;
-	associrp->irp_assoc.irp_master = ip;
-	mtx_unlock(&ntoskrnl_dispatchlock);
-
-	return (associrp);
-}
-
-static void
-IoFreeIrp(ip)
-	irp			*ip;
-{
-	ExFreePool(ip);
-}
-
-static void
-IoInitializeIrp(irp *io, uint16_t psize, uint8_t ssize)
-{
-	bzero((char *)io, IoSizeOfIrp(ssize));
-	io->irp_size = psize;
-	io->irp_stackcnt = ssize;
-	io->irp_currentstackloc = ssize;
-	InitializeListHead(&io->irp_thlist);
-	io->irp_tail.irp_overlay.irp_csl =
-	    (io_stack_location *)(io + 1) + ssize;
-}
-
-static void
-IoReuseIrp(ip, status)
-	irp			*ip;
-	uint32_t		status;
-{
-	uint8_t			allocflags;
-
-	allocflags = ip->irp_allocflags;
-	IoInitializeIrp(ip, ip->irp_size, ip->irp_stackcnt);
-	ip->irp_iostat.isb_status = status;
-	ip->irp_allocflags = allocflags;
-}
-
-void
-IoAcquireCancelSpinLock(uint8_t *irql)
-{
-	KeAcquireSpinLock(&ntoskrnl_cancellock, irql);
-}
-
-void
-IoReleaseCancelSpinLock(uint8_t irql)
-{
-	KeReleaseSpinLock(&ntoskrnl_cancellock, irql);
-}
-
-uint8_t
-IoCancelIrp(irp *ip)
-{
-	cancel_func		cfunc;
-	uint8_t			cancelirql;
-
-	IoAcquireCancelSpinLock(&cancelirql);
-	cfunc = IoSetCancelRoutine(ip, NULL);
-	ip->irp_cancel = TRUE;
-	if (cfunc == NULL) {
-		IoReleaseCancelSpinLock(cancelirql);
-		return (FALSE);
-	}
-	ip->irp_cancelirql = cancelirql;
-	MSCALL2(cfunc, IoGetCurrentIrpStackLocation(ip)->isl_devobj, ip);
-	return (uint8_t)IoSetCancelValue(ip, TRUE);
-}
-
-uint32_t
-IofCallDriver(dobj, ip)
-	device_object		*dobj;
-	irp			*ip;
-{
-	driver_object		*drvobj;
-	io_stack_location	*sl;
-	uint32_t		status;
-	driver_dispatch		disp;
-
-	drvobj = dobj->do_drvobj;
-
-	if (ip->irp_currentstackloc <= 0)
-		panic("IoCallDriver(): out of stack locations");
-
-	IoSetNextIrpStackLocation(ip);
-	sl = IoGetCurrentIrpStackLocation(ip);
-
-	sl->isl_devobj = dobj;
-
-	disp = drvobj->dro_dispatch[sl->isl_major];
-	status = MSCALL2(disp, dobj, ip);
-
-	return (status);
-}
-
-void
-IofCompleteRequest(irp *ip, uint8_t prioboost)
-{
-	uint32_t		status;
-	device_object		*dobj;
-	io_stack_location	*sl;
-	completion_func		cf;
-
-	KASSERT(ip->irp_iostat.isb_status != STATUS_PENDING,
-	    ("incorrect IRP(%p) status (STATUS_PENDING)", ip));
-
-	sl = IoGetCurrentIrpStackLocation(ip);
-	IoSkipCurrentIrpStackLocation(ip);
-
-	do {
-		if (sl->isl_ctl & SL_PENDING_RETURNED)
-			ip->irp_pendingreturned = TRUE;
-
-		if (ip->irp_currentstackloc != (ip->irp_stackcnt + 1))
-			dobj = IoGetCurrentIrpStackLocation(ip)->isl_devobj;
-		else
-			dobj = NULL;
-
-		if (sl->isl_completionfunc != NULL &&
-		    ((ip->irp_iostat.isb_status == STATUS_SUCCESS &&
-		    sl->isl_ctl & SL_INVOKE_ON_SUCCESS) ||
-		    (ip->irp_iostat.isb_status != STATUS_SUCCESS &&
-		    sl->isl_ctl & SL_INVOKE_ON_ERROR) ||
-		    (ip->irp_cancel == TRUE &&
-		    sl->isl_ctl & SL_INVOKE_ON_CANCEL))) {
-			cf = sl->isl_completionfunc;
-			status = MSCALL3(cf, dobj, ip, sl->isl_completionctx);
-			if (status == STATUS_MORE_PROCESSING_REQUIRED)
-				return;
-		} else {
-			if ((ip->irp_currentstackloc <= ip->irp_stackcnt) &&
-			    (ip->irp_pendingreturned == TRUE))
-				IoMarkIrpPending(ip);
-		}
-
-		/* move to the next.  */
-		IoSkipCurrentIrpStackLocation(ip);
-		sl++;
-	} while (ip->irp_currentstackloc <= (ip->irp_stackcnt + 1));
-
-	if (ip->irp_usriostat != NULL)
-		*ip->irp_usriostat = ip->irp_iostat;
-	if (ip->irp_usrevent != NULL)
-		KeSetEvent(ip->irp_usrevent, prioboost, FALSE);
-
-	/* Handle any associated IRPs. */
-
-	if (ip->irp_flags & IRP_ASSOCIATED_IRP) {
-		uint32_t		masterirpcnt;
-		irp			*masterirp;
-		mdl			*m;
-
-		masterirp = ip->irp_assoc.irp_master;
-		masterirpcnt =
-		    InterlockedDecrement(&masterirp->irp_assoc.irp_irpcnt);
-
-		while ((m = ip->irp_mdl) != NULL) {
-			ip->irp_mdl = m->mdl_next;
-			IoFreeMdl(m);
-		}
-		IoFreeIrp(ip);
-		if (masterirpcnt == 0)
-			IoCompleteRequest(masterirp, IO_NO_INCREMENT);
-		return;
-	}
-
-	/* With any luck, these conditions will never arise. */
-
-	if (ip->irp_flags & IRP_PAGING_IO) {
-		if (ip->irp_mdl != NULL)
-			IoFreeMdl(ip->irp_mdl);
-		IoFreeIrp(ip);
-	}
-}
-
-void
-ntoskrnl_intr(arg)
-	void			*arg;
-{
-	kinterrupt		*iobj;
-	uint8_t			irql;
-	uint8_t			claimed;
-	list_entry		*l;
-
-	KeAcquireSpinLock(&ntoskrnl_intlock, &irql);
-	l = ntoskrnl_intlist.nle_flink;
-	while (l != &ntoskrnl_intlist) {
-		iobj = CONTAINING_RECORD(l, kinterrupt, ki_list);
-		claimed = MSCALL2(iobj->ki_svcfunc, iobj, iobj->ki_svcctx);
-		if (claimed == TRUE)
-			break;
-		l = l->nle_flink;
-	}
-	KeReleaseSpinLock(&ntoskrnl_intlock, irql);
-}
-
-uint8_t
-KeAcquireInterruptSpinLock(iobj)
-	kinterrupt		*iobj;
-{
-	uint8_t			irql;
-	KeAcquireSpinLock(&ntoskrnl_intlock, &irql);
-	return (irql);
-}
-
-void
-KeReleaseInterruptSpinLock(kinterrupt *iobj, uint8_t irql)
-{
-	KeReleaseSpinLock(&ntoskrnl_intlock, irql);
-}
-
-uint8_t
-KeSynchronizeExecution(iobj, syncfunc, syncctx)
-	kinterrupt		*iobj;
-	void			*syncfunc;
-	void			*syncctx;
-{
-	uint8_t			irql;
-
-	KeAcquireSpinLock(&ntoskrnl_intlock, &irql);
-	MSCALL1(syncfunc, syncctx);
-	KeReleaseSpinLock(&ntoskrnl_intlock, irql);
-
-	return (TRUE);
-}
-
-/*
- * IoConnectInterrupt() is passed only the interrupt vector and
- * irql that a device wants to use, but no device-specific tag
- * of any kind. This conflicts rather badly with FreeBSD's
- * bus_setup_intr(), which needs the device_t for the device
- * requesting interrupt delivery. In order to bypass this
- * inconsistency, we implement a second level of interrupt
- * dispatching on top of bus_setup_intr(). All devices use
- * ntoskrnl_intr() as their ISR, and any device requesting
- * interrupts will be registered with ntoskrnl_intr()'s interrupt
- * dispatch list. When an interrupt arrives, we walk the list
- * and invoke all the registered ISRs. This effectively makes all
- * interrupts shared, but it's the only way to duplicate the
- * semantics of IoConnectInterrupt() and IoDisconnectInterrupt() properly.
- */
-
-uint32_t
-IoConnectInterrupt(kinterrupt **iobj, void *svcfunc, void *svcctx,
-	kspin_lock *lock, uint32_t vector, uint8_t irql, uint8_t syncirql,
-	uint8_t imode, uint8_t shared, uint32_t affinity, uint8_t savefloat)
-{
-	uint8_t			curirql;
-
-	*iobj = ExAllocatePoolWithTag(NonPagedPool, sizeof(kinterrupt), 0);
-	if (*iobj == NULL)
-		return (STATUS_INSUFFICIENT_RESOURCES);
-
-	(*iobj)->ki_svcfunc = svcfunc;
-	(*iobj)->ki_svcctx = svcctx;
-
-	if (lock == NULL) {
-		KeInitializeSpinLock(&(*iobj)->ki_lock_priv);
-		(*iobj)->ki_lock = &(*iobj)->ki_lock_priv;
-	} else
-		(*iobj)->ki_lock = lock;
-
-	KeAcquireSpinLock(&ntoskrnl_intlock, &curirql);
-	InsertHeadList((&ntoskrnl_intlist), (&(*iobj)->ki_list));
-	KeReleaseSpinLock(&ntoskrnl_intlock, curirql);
-
-	return (STATUS_SUCCESS);
-}
-
-void
-IoDisconnectInterrupt(iobj)
-	kinterrupt		*iobj;
-{
-	uint8_t			irql;
-
-	if (iobj == NULL)
-		return;
-
-	KeAcquireSpinLock(&ntoskrnl_intlock, &irql);
-	RemoveEntryList((&iobj->ki_list));
-	KeReleaseSpinLock(&ntoskrnl_intlock, irql);
-
-	ExFreePool(iobj);
-}
-
-device_object *
-IoAttachDeviceToDeviceStack(src, dst)
-	device_object		*src;
-	device_object		*dst;
-{
-	device_object		*attached;
-
-	mtx_lock(&ntoskrnl_dispatchlock);
-	attached = IoGetAttachedDevice(dst);
-	attached->do_attacheddev = src;
-	src->do_attacheddev = NULL;
-	src->do_stacksize = attached->do_stacksize + 1;
-	mtx_unlock(&ntoskrnl_dispatchlock);
-
-	return (attached);
-}
-
-void
-IoDetachDevice(topdev)
-	device_object		*topdev;
-{
-	device_object		*tail;
-
-	mtx_lock(&ntoskrnl_dispatchlock);
-
-	/* First, break the chain. */
-	tail = topdev->do_attacheddev;
-	if (tail == NULL) {
-		mtx_unlock(&ntoskrnl_dispatchlock);
-		return;
-	}
-	topdev->do_attacheddev = tail->do_attacheddev;
-	topdev->do_refcnt--;
-
-	/* Now reduce the stacksize count for the takm_il objects. */
-
-	tail = topdev->do_attacheddev;
-	while (tail != NULL) {
-		tail->do_stacksize--;
-		tail = tail->do_attacheddev;
-	}
-
-	mtx_unlock(&ntoskrnl_dispatchlock);
-}
-
-/*
- * For the most part, an object is considered signalled if
- * dh_sigstate == TRUE. The exception is for mutant objects
- * (mutexes), where the logic works like this:
- *
- * - If the thread already owns the object and sigstate is
- *   less than or equal to 0, then the object is considered
- *   signalled (recursive acquisition).
- * - If dh_sigstate == 1, the object is also considered
- *   signalled.
- */
-
-static int
-ntoskrnl_is_signalled(obj, td)
-	nt_dispatch_header	*obj;
-	struct thread		*td;
-{
-	kmutant			*km;
-
-	if (obj->dh_type == DISP_TYPE_MUTANT) {
-		km = (kmutant *)obj;
-		if ((obj->dh_sigstate <= 0 && km->km_ownerthread == td) ||
-		    obj->dh_sigstate == 1)
-			return (TRUE);
-		return (FALSE);
-	}
-
-	if (obj->dh_sigstate > 0)
-		return (TRUE);
-	return (FALSE);
-}
-
-static void
-ntoskrnl_satisfy_wait(obj, td)
-	nt_dispatch_header	*obj;
-	struct thread		*td;
-{
-	kmutant			*km;
-
-	switch (obj->dh_type) {
-	case DISP_TYPE_MUTANT:
-		km = (struct kmutant *)obj;
-		obj->dh_sigstate--;
-		/*
-		 * If sigstate reaches 0, the mutex is now
-		 * non-signalled (the new thread owns it).
-		 */
-		if (obj->dh_sigstate == 0) {
-			km->km_ownerthread = td;
-			if (km->km_abandoned == TRUE)
-				km->km_abandoned = FALSE;
-		}
-		break;
-	/* Synchronization objects get reset to unsignalled. */
-	case DISP_TYPE_SYNCHRONIZATION_EVENT:
-	case DISP_TYPE_SYNCHRONIZATION_TIMER:
-		obj->dh_sigstate = 0;
-		break;
-	case DISP_TYPE_SEMAPHORE:
-		obj->dh_sigstate--;
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-ntoskrnl_satisfy_multiple_waits(wb)
-	wait_block		*wb;
-{
-	wait_block		*cur;
-	struct thread		*td;
-
-	cur = wb;
-	td = wb->wb_kthread;
-
-	do {
-		ntoskrnl_satisfy_wait(wb->wb_object, td);
-		cur->wb_awakened = TRUE;
-		cur = cur->wb_next;
-	} while (cur != wb);
-}
-
-/* Always called with dispatcher lock held. */
-static void
-ntoskrnl_waittest(obj, increment)
-	nt_dispatch_header	*obj;
-	uint32_t		increment;
-{
-	wait_block		*w, *next;
-	list_entry		*e;
-	struct thread		*td;
-	wb_ext			*we;
-	int			satisfied;
-
-	/*
-	 * Once an object has been signalled, we walk its list of
-	 * wait blocks. If a wait block can be awakened, then satisfy
-	 * waits as necessary and wake the thread.
-	 *
-	 * The rules work like this:
-	 *
-	 * If a wait block is marked as WAITTYPE_ANY, then
-	 * we can satisfy the wait conditions on the current
-	 * object and wake the thread right away. Satisfying
-	 * the wait also has the effect of breaking us out
-	 * of the search loop.
-	 *
-	 * If the object is marked as WAITTYLE_ALL, then the
-	 * wait block will be part of a circularly linked
-	 * list of wait blocks belonging to a waiting thread
-	 * that's sleeping in KeWaitForMultipleObjects(). In
-	 * order to wake the thread, all the objects in the
-	 * wait list must be in the signalled state. If they
-	 * are, we then satisfy all of them and wake the
-	 * thread.
-	 *
-	 */
-
-	e = obj->dh_waitlisthead.nle_flink;
-
-	while (e != &obj->dh_waitlisthead && obj->dh_sigstate > 0) {
-		w = CONTAINING_RECORD(e, wait_block, wb_waitlist);
-		we = w->wb_ext;
-		td = we->we_td;
-		satisfied = FALSE;
-		if (w->wb_waittype == WAITTYPE_ANY) {
-			/*
-			 * Thread can be awakened if
-			 * any wait is satisfied.
-			 */
-			ntoskrnl_satisfy_wait(obj, td);
-			satisfied = TRUE;
-			w->wb_awakened = TRUE;
-		} else {
-			/*
-			 * Thread can only be woken up
-			 * if all waits are satisfied.
-			 * If the thread is waiting on multiple
-			 * objects, they should all be linked
-			 * through the wb_next pointers in the
-			 * wait blocks.
-			 */
-			satisfied = TRUE;
-			next = w->wb_next;
-			while (next != w) {
-				if (ntoskrnl_is_signalled(obj, td) == FALSE) {
-					satisfied = FALSE;
-					break;
-				}
-				next = next->wb_next;
-			}
-			ntoskrnl_satisfy_multiple_waits(w);
-		}
-
-		if (satisfied == TRUE)
-			cv_broadcastpri(&we->we_cv,
-			    (w->wb_oldpri - (increment * 4)) > PRI_MIN_KERN ?
-			    w->wb_oldpri - (increment * 4) : PRI_MIN_KERN);
-
-		e = e->nle_flink;
-	}
-}
-
-/*
- * Return the number of 100 nanosecond intervals since
- * January 1, 1601. (?!?!)
- */
-void
-ntoskrnl_time(tval)
-	uint64_t                *tval;
-{
-	struct timespec		ts;
-
-	nanotime(&ts);
-	*tval = (uint64_t)ts.tv_nsec / 100 + (uint64_t)ts.tv_sec * 10000000 +
-	    11644473600 * 10000000; /* 100ns ticks from 1601 to 1970 */
-}
-
-static void
-KeQuerySystemTime(current_time)
-	uint64_t		*current_time;
-{
-	ntoskrnl_time(current_time);
-}
-
-static uint32_t
-KeTickCount(void)
-{
-	struct timeval tv;
-	getmicrouptime(&tv);
-	return tvtohz(&tv);
-}
-
-/*
- * KeWaitForSingleObject() is a tricky beast, because it can be used
- * with several different object types: semaphores, timers, events,
- * mutexes and threads. Semaphores don't appear very often, but the
- * other object types are quite common. KeWaitForSingleObject() is
- * what's normally used to acquire a mutex, and it can be used to
- * wait for a thread termination.
- *
- * The Windows NDIS API is implemented in terms of Windows kernel
- * primitives, and some of the object manipulation is duplicated in
- * NDIS. For example, NDIS has timers and events, which are actually
- * Windows kevents and ktimers. Now, you're supposed to only use the
- * NDIS variants of these objects within the confines of the NDIS API,
- * but there are some naughty developers out there who will use
- * KeWaitForSingleObject() on NDIS timer and event objects, so we
- * have to support that as well. Conseqently, our NDIS timer and event
- * code has to be closely tied into our ntoskrnl timer and event code,
- * just as it is in Windows.
- *
- * KeWaitForSingleObject() may do different things for different kinds
- * of objects:
- *
- * - For events, we check if the event has been signalled. If the
- *   event is already in the signalled state, we just return immediately,
- *   otherwise we wait for it to be set to the signalled state by someone
- *   else calling KeSetEvent(). Events can be either synchronization or
- *   notification events.
- *
- * - For timers, if the timer has already fired and the timer is in
- *   the signalled state, we just return, otherwise we wait on the
- *   timer. Unlike an event, timers get signalled automatically when
- *   they expire rather than someone having to trip them manually.
- *   Timers initialized with KeInitializeTimer() are always notification
- *   events: KeInitializeTimerEx() lets you initialize a timer as
- *   either a notification or synchronization event.
- *
- * - For mutexes, we try to acquire the mutex and if we can't, we wait
- *   on the mutex until it's available and then grab it. When a mutex is
- *   released, it enters the signalled state, which wakes up one of the
- *   threads waiting to acquire it. Mutexes are always synchronization
- *   events.
- *
- * - For threads, the only thing we do is wait until the thread object
- *   enters a signalled state, which occurs when the thread terminates.
- *   Threads are always notification events.
- *
- * A notification event wakes up all threads waiting on an object. A
- * synchronization event wakes up just one. Also, a synchronization event
- * is auto-clearing, which means we automatically set the event back to
- * the non-signalled state once the wakeup is done.
- */
-
-uint32_t
-KeWaitForSingleObject(void *arg, uint32_t reason, uint32_t mode,
-    uint8_t alertable, int64_t *duetime)
-{
-	wait_block		w;
-	struct thread		*td = curthread;
-	struct timeval		tv;
-	int			error = 0;
-	uint64_t		curtime;
-	wb_ext			we;
-	nt_dispatch_header	*obj;
-
-	obj = arg;
-
-	if (obj == NULL)
-		return (STATUS_INVALID_PARAMETER);
-
-	mtx_lock(&ntoskrnl_dispatchlock);
-
-	cv_init(&we.we_cv, "KeWFS");
-	we.we_td = td;
-
-	/*
-	 * Check to see if this object is already signalled,
-	 * and just return without waiting if it is.
-	 */
-	if (ntoskrnl_is_signalled(obj, td) == TRUE) {
-		/* Sanity check the signal state value. */
-		if (obj->dh_sigstate != INT32_MIN) {
-			ntoskrnl_satisfy_wait(obj, curthread);
-			mtx_unlock(&ntoskrnl_dispatchlock);
-			return (STATUS_SUCCESS);
-		} else {
-			/*
-			 * There's a limit to how many times we can
-			 * recursively acquire a mutant. If we hit
-			 * the limit, something is very wrong.
-			 */
-			if (obj->dh_type == DISP_TYPE_MUTANT) {
-				mtx_unlock(&ntoskrnl_dispatchlock);
-				panic("mutant limit exceeded");
-			}
-		}
-	}
-
-	bzero((char *)&w, sizeof(wait_block));
-	w.wb_object = obj;
-	w.wb_ext = &we;
-	w.wb_waittype = WAITTYPE_ANY;
-	w.wb_next = &w;
-	w.wb_waitkey = 0;
-	w.wb_awakened = FALSE;
-	w.wb_oldpri = td->td_priority;
-
-	InsertTailList((&obj->dh_waitlisthead), (&w.wb_waitlist));
-
-	/*
-	 * The timeout value is specified in 100 nanosecond units
-	 * and can be a positive or negative number. If it's positive,
-	 * then the duetime is absolute, and we need to convert it
-	 * to an absolute offset relative to now in order to use it.
-	 * If it's negative, then the duetime is relative and we
-	 * just have to convert the units.
-	 */
-
-	if (duetime != NULL) {
-		if (*duetime < 0) {
-			tv.tv_sec = - (*duetime) / 10000000;
-			tv.tv_usec = (- (*duetime) / 10) -
-			    (tv.tv_sec * 1000000);
-		} else {
-			ntoskrnl_time(&curtime);
-			if (*duetime < curtime)
-				tv.tv_sec = tv.tv_usec = 0;
-			else {
-				tv.tv_sec = ((*duetime) - curtime) / 10000000;
-				tv.tv_usec = ((*duetime) - curtime) / 10 -
-				    (tv.tv_sec * 1000000);
-			}
-		}
-	}
-
-	if (duetime == NULL)
-		cv_wait(&we.we_cv, &ntoskrnl_dispatchlock);
-	else
-		error = cv_timedwait(&we.we_cv,
-		    &ntoskrnl_dispatchlock, tvtohz(&tv));
-
-	RemoveEntryList(&w.wb_waitlist);
-
-	cv_destroy(&we.we_cv);
-
-	/* We timed out. Leave the object alone and return status. */
-
-	if (error == EWOULDBLOCK) {
-		mtx_unlock(&ntoskrnl_dispatchlock);
-		return (STATUS_TIMEOUT);
-	}
-
-	mtx_unlock(&ntoskrnl_dispatchlock);
-
-	return (STATUS_SUCCESS);
-/*
-	return (KeWaitForMultipleObjects(1, &obj, WAITTYPE_ALL, reason,
-	    mode, alertable, duetime, &w));
-*/
-}
-
-static uint32_t
-KeWaitForMultipleObjects(uint32_t cnt, nt_dispatch_header *obj[], uint32_t wtype,
-	uint32_t reason, uint32_t mode, uint8_t alertable, int64_t *duetime,
-	wait_block *wb_array)
-{
-	struct thread		*td = curthread;
-	wait_block		*whead, *w;
-	wait_block		_wb_array[MAX_WAIT_OBJECTS];
-	nt_dispatch_header	*cur;
-	struct timeval		tv;
-	int			i, wcnt = 0, error = 0;
-	uint64_t		curtime;
-	struct timespec		t1, t2;
-	uint32_t		status = STATUS_SUCCESS;
-	wb_ext			we;
-
-	if (cnt > MAX_WAIT_OBJECTS)
-		return (STATUS_INVALID_PARAMETER);
-	if (cnt > THREAD_WAIT_OBJECTS && wb_array == NULL)
-		return (STATUS_INVALID_PARAMETER);
-
-	mtx_lock(&ntoskrnl_dispatchlock);
-
-	cv_init(&we.we_cv, "KeWFM");
-	we.we_td = td;
-
-	if (wb_array == NULL)
-		whead = _wb_array;
-	else
-		whead = wb_array;
-
-	bzero((char *)whead, sizeof(wait_block) * cnt);
-
-	/* First pass: see if we can satisfy any waits immediately. */
-
-	wcnt = 0;
-	w = whead;
-
-	for (i = 0; i < cnt; i++) {
-		InsertTailList((&obj[i]->dh_waitlisthead),
-		    (&w->wb_waitlist));
-		w->wb_ext = &we;
-		w->wb_object = obj[i];
-		w->wb_waittype = wtype;
-		w->wb_waitkey = i;
-		w->wb_awakened = FALSE;
-		w->wb_oldpri = td->td_priority;
-		w->wb_next = w + 1;
-		w++;
-		wcnt++;
-		if (ntoskrnl_is_signalled(obj[i], td)) {
-			/*
-			 * There's a limit to how many times
-			 * we can recursively acquire a mutant.
-			 * If we hit the limit, something
-			 * is very wrong.
-			 */
-			if (obj[i]->dh_sigstate == INT32_MIN &&
-			    obj[i]->dh_type == DISP_TYPE_MUTANT) {
-				mtx_unlock(&ntoskrnl_dispatchlock);
-				panic("mutant limit exceeded");
-			}
-
-			/*
-			 * If this is a WAITTYPE_ANY wait, then
-			 * satisfy the waited object and exit
-			 * right now.
-			 */
-
-			if (wtype == WAITTYPE_ANY) {
-				ntoskrnl_satisfy_wait(obj[i], td);
-				status = STATUS_WAIT_0 + i;
-				goto wait_done;
-			} else {
-				w--;
-				wcnt--;
-				w->wb_object = NULL;
-				RemoveEntryList(&w->wb_waitlist);
-			}
-		}
-	}
-
-	/*
-	 * If this is a WAITTYPE_ALL wait and all objects are
-	 * already signalled, satisfy the waits and exit now.
-	 */
-
-	if (wtype == WAITTYPE_ALL && wcnt == 0) {
-		for (i = 0; i < cnt; i++)
-			ntoskrnl_satisfy_wait(obj[i], td);
-		status = STATUS_SUCCESS;
-		goto wait_done;
-	}
-
-	/*
-	 * Create a circular waitblock list. The waitcount
-	 * must always be non-zero when we get here.
-	 */
-
-	(w - 1)->wb_next = whead;
-
-	/* Wait on any objects that aren't yet signalled. */
-
-	/* Calculate timeout, if any. */
-
-	if (duetime != NULL) {
-		if (*duetime < 0) {
-			tv.tv_sec = - (*duetime) / 10000000;
-			tv.tv_usec = (- (*duetime) / 10) -
-			    (tv.tv_sec * 1000000);
-		} else {
-			ntoskrnl_time(&curtime);
-			if (*duetime < curtime)
-				tv.tv_sec = tv.tv_usec = 0;
-			else {
-				tv.tv_sec = ((*duetime) - curtime) / 10000000;
-				tv.tv_usec = ((*duetime) - curtime) / 10 -
-				    (tv.tv_sec * 1000000);
-			}
-		}
-	}
-
-	while (wcnt) {
-		nanotime(&t1);
-
-		if (duetime == NULL)
-			cv_wait(&we.we_cv, &ntoskrnl_dispatchlock);
-		else
-			error = cv_timedwait(&we.we_cv,
-			    &ntoskrnl_dispatchlock, tvtohz(&tv));
-
-		/* Wait with timeout expired. */
-
-		if (error) {
-			status = STATUS_TIMEOUT;
-			goto wait_done;
-		}
-
-		nanotime(&t2);
-
-		/* See what's been signalled. */
-
-		w = whead;
-		do {
-			cur = w->wb_object;
-			if (ntoskrnl_is_signalled(cur, td) == TRUE ||
-			    w->wb_awakened == TRUE) {
-				/* Sanity check the signal state value. */
-				if (cur->dh_sigstate == INT32_MIN &&
-				    cur->dh_type == DISP_TYPE_MUTANT) {
-					mtx_unlock(&ntoskrnl_dispatchlock);
-					panic("mutant limit exceeded");
-				}
-				wcnt--;
-				if (wtype == WAITTYPE_ANY) {
-					status = w->wb_waitkey &
-					    STATUS_WAIT_0;
-					goto wait_done;
-				}
-			}
-			w = w->wb_next;
-		} while (w != whead);
-
-		/*
-		 * If all objects have been signalled, or if this
-		 * is a WAITTYPE_ANY wait and we were woke up by
-		 * someone, we can bail.
-		 */
-
-		if (wcnt == 0) {
-			status = STATUS_SUCCESS;
-			goto wait_done;
-		}
-
-		/*
-		 * If this is WAITTYPE_ALL wait, and there's still
-		 * objects that haven't been signalled, deduct the
-		 * time that's elapsed so far from the timeout and
-		 * wait again (or continue waiting indefinitely if
-		 * there's no timeout).
-		 */
-
-		if (duetime != NULL) {
-			tv.tv_sec -= (t2.tv_sec - t1.tv_sec);
-			tv.tv_usec -= (t2.tv_nsec - t1.tv_nsec) / 1000;
-		}
-	}
-
-wait_done:
-
-	cv_destroy(&we.we_cv);
-
-	for (i = 0; i < cnt; i++) {
-		if (whead[i].wb_object != NULL)
-			RemoveEntryList(&whead[i].wb_waitlist);
-	}
-	mtx_unlock(&ntoskrnl_dispatchlock);
-
-	return (status);
-}
-
-static void
-WRITE_REGISTER_USHORT(uint16_t *reg, uint16_t val)
-{
-	bus_space_write_2(NDIS_BUS_SPACE_MEM, 0x0, (bus_size_t)reg, val);
-}
-
-static uint16_t
-READ_REGISTER_USHORT(reg)
-	uint16_t		*reg;
-{
-	return (bus_space_read_2(NDIS_BUS_SPACE_MEM, 0x0, (bus_size_t)reg));
-}
-
-static void
-WRITE_REGISTER_ULONG(reg, val)
-	uint32_t		*reg;
-	uint32_t		val;
-{
-	bus_space_write_4(NDIS_BUS_SPACE_MEM, 0x0, (bus_size_t)reg, val);
-}
-
-static uint32_t
-READ_REGISTER_ULONG(reg)
-	uint32_t		*reg;
-{
-	return (bus_space_read_4(NDIS_BUS_SPACE_MEM, 0x0, (bus_size_t)reg));
-}
-
-static uint8_t
-READ_REGISTER_UCHAR(uint8_t *reg)
-{
-	return (bus_space_read_1(NDIS_BUS_SPACE_MEM, 0x0, (bus_size_t)reg));
-}
-
-static void
-WRITE_REGISTER_UCHAR(uint8_t *reg, uint8_t val)
-{
-	bus_space_write_1(NDIS_BUS_SPACE_MEM, 0x0, (bus_size_t)reg, val);
-}
-
-static int64_t
-_allmul(a, b)
-	int64_t			a;
-	int64_t			b;
-{
-	return (a * b);
-}
-
-static int64_t
-_alldiv(a, b)
-	int64_t			a;
-	int64_t			b;
-{
-	return (a / b);
-}
-
-static int64_t
-_allrem(a, b)
-	int64_t			a;
-	int64_t			b;
-{
-	return (a % b);
-}
-
-static uint64_t
-_aullmul(a, b)
-	uint64_t		a;
-	uint64_t		b;
-{
-	return (a * b);
-}
-
-static uint64_t
-_aulldiv(a, b)
-	uint64_t		a;
-	uint64_t		b;
-{
-	return (a / b);
-}
-
-static uint64_t
-_aullrem(a, b)
-	uint64_t		a;
-	uint64_t		b;
-{
-	return (a % b);
-}
-
-static int64_t
-_allshl(int64_t a, uint8_t b)
-{
-	return (a << b);
-}
-
-static uint64_t
-_aullshl(uint64_t a, uint8_t b)
-{
-	return (a << b);
-}
-
-static int64_t
-_allshr(int64_t a, uint8_t b)
-{
-	return (a >> b);
-}
-
-static uint64_t
-_aullshr(uint64_t a, uint8_t b)
-{
-	return (a >> b);
-}
-
-static slist_entry *
-ntoskrnl_pushsl(head, entry)
-	slist_header		*head;
-	slist_entry		*entry;
-{
-	slist_entry		*oldhead;
-
-	oldhead = head->slh_list.slh_next;
-	entry->sl_next = head->slh_list.slh_next;
-	head->slh_list.slh_next = entry;
-	head->slh_list.slh_depth++;
-	head->slh_list.slh_seq++;
-
-	return (oldhead);
-}
-
-static void
-InitializeSListHead(head)
-	slist_header		*head;
-{
-	memset(head, 0, sizeof(*head));
-}
-
-static slist_entry *
-ntoskrnl_popsl(head)
-	slist_header		*head;
-{
-	slist_entry		*first;
-
-	first = head->slh_list.slh_next;
-	if (first != NULL) {
-		head->slh_list.slh_next = first->sl_next;
-		head->slh_list.slh_depth--;
-		head->slh_list.slh_seq++;
-	}
-
-	return (first);
-}
-
-/*
- * We need this to make lookaside lists work for amd64.
- * We pass a pointer to ExAllocatePoolWithTag() the lookaside
- * list structure. For amd64 to work right, this has to be a
- * pointer to the wrapped version of the routine, not the
- * original. Letting the Windows driver invoke the original
- * function directly will result in a convention calling
- * mismatch and a pretty crash. On x86, this effectively
- * becomes a no-op since ipt_func and ipt_wrap are the same.
- */
-
-static funcptr
-ntoskrnl_findwrap(func)
-	funcptr			func;
-{
-	image_patch_table	*patch;
-
-	patch = ntoskrnl_functbl;
-	while (patch->ipt_func != NULL) {
-		if ((funcptr)patch->ipt_func == func)
-			return ((funcptr)patch->ipt_wrap);
-		patch++;
-	}
-
-	return (NULL);
-}
-
-static void
-ExInitializePagedLookasideList(paged_lookaside_list *lookaside,
-	lookaside_alloc_func *allocfunc, lookaside_free_func *freefunc,
-	uint32_t flags, size_t size, uint32_t tag, uint16_t depth)
-{
-	bzero((char *)lookaside, sizeof(paged_lookaside_list));
-
-	if (size < sizeof(slist_entry))
-		lookaside->nll_l.gl_size = sizeof(slist_entry);
-	else
-		lookaside->nll_l.gl_size = size;
-	lookaside->nll_l.gl_tag = tag;
-	if (allocfunc == NULL)
-		lookaside->nll_l.gl_allocfunc =
-		    ntoskrnl_findwrap((funcptr)ExAllocatePoolWithTag);
-	else
-		lookaside->nll_l.gl_allocfunc = allocfunc;
-
-	if (freefunc == NULL)
-		lookaside->nll_l.gl_freefunc =
-		    ntoskrnl_findwrap((funcptr)ExFreePool);
-	else
-		lookaside->nll_l.gl_freefunc = freefunc;
-
-#ifdef __i386__
-	KeInitializeSpinLock(&lookaside->nll_obsoletelock);
-#endif
-
-	lookaside->nll_l.gl_type = NonPagedPool;
-	lookaside->nll_l.gl_depth = depth;
-	lookaside->nll_l.gl_maxdepth = LOOKASIDE_DEPTH;
-}
-
-static void
-ExDeletePagedLookasideList(lookaside)
-	paged_lookaside_list   *lookaside;
-{
-	void			*buf;
-	void		(*freefunc)(void *);
-
-	freefunc = lookaside->nll_l.gl_freefunc;
-	while((buf = ntoskrnl_popsl(&lookaside->nll_l.gl_listhead)) != NULL)
-		MSCALL1(freefunc, buf);
-}
-
-static void
-ExInitializeNPagedLookasideList(npaged_lookaside_list *lookaside,
-	lookaside_alloc_func *allocfunc, lookaside_free_func *freefunc,
-	uint32_t flags, size_t size, uint32_t tag, uint16_t depth)
-{
-	bzero((char *)lookaside, sizeof(npaged_lookaside_list));
-
-	if (size < sizeof(slist_entry))
-		lookaside->nll_l.gl_size = sizeof(slist_entry);
-	else
-		lookaside->nll_l.gl_size = size;
-	lookaside->nll_l.gl_tag = tag;
-	if (allocfunc == NULL)
-		lookaside->nll_l.gl_allocfunc =
-		    ntoskrnl_findwrap((funcptr)ExAllocatePoolWithTag);
-	else
-		lookaside->nll_l.gl_allocfunc = allocfunc;
-
-	if (freefunc == NULL)
-		lookaside->nll_l.gl_freefunc =
-		    ntoskrnl_findwrap((funcptr)ExFreePool);
-	else
-		lookaside->nll_l.gl_freefunc = freefunc;
-
-#ifdef __i386__
-	KeInitializeSpinLock(&lookaside->nll_obsoletelock);
-#endif
-
-	lookaside->nll_l.gl_type = NonPagedPool;
-	lookaside->nll_l.gl_depth = depth;
-	lookaside->nll_l.gl_maxdepth = LOOKASIDE_DEPTH;
-}
-
-static void
-ExDeleteNPagedLookasideList(lookaside)
-	npaged_lookaside_list   *lookaside;
-{
-	void			*buf;
-	void		(*freefunc)(void *);
-
-	freefunc = lookaside->nll_l.gl_freefunc;
-	while((buf = ntoskrnl_popsl(&lookaside->nll_l.gl_listhead)) != NULL)
-		MSCALL1(freefunc, buf);
-}
-
-slist_entry *
-InterlockedPushEntrySList(head, entry)
-	slist_header		*head;
-	slist_entry		*entry;
-{
-	slist_entry		*oldhead;
-
-	mtx_lock_spin(&ntoskrnl_interlock);
-	oldhead = ntoskrnl_pushsl(head, entry);
-	mtx_unlock_spin(&ntoskrnl_interlock);
-
-	return (oldhead);
-}
-
-slist_entry *
-InterlockedPopEntrySList(head)
-	slist_header		*head;
-{
-	slist_entry		*first;
-
-	mtx_lock_spin(&ntoskrnl_interlock);
-	first = ntoskrnl_popsl(head);
-	mtx_unlock_spin(&ntoskrnl_interlock);
-
-	return (first);
-}
-
-static slist_entry *
-ExInterlockedPushEntrySList(head, entry, lock)
-	slist_header		*head;
-	slist_entry		*entry;
-	kspin_lock		*lock;
-{
-	return (InterlockedPushEntrySList(head, entry));
-}
-
-static slist_entry *
-ExInterlockedPopEntrySList(head, lock)
-	slist_header		*head;
-	kspin_lock		*lock;
-{
-	return (InterlockedPopEntrySList(head));
-}
-
-uint16_t
-ExQueryDepthSList(head)
-	slist_header		*head;
-{
-	uint16_t		depth;
-
-	mtx_lock_spin(&ntoskrnl_interlock);
-	depth = head->slh_list.slh_depth;
-	mtx_unlock_spin(&ntoskrnl_interlock);
-
-	return (depth);
-}
-
-void
-KeInitializeSpinLock(lock)
-	kspin_lock		*lock;
-{
-	*lock = 0;
-}
-
-#ifdef __i386__
-void
-KefAcquireSpinLockAtDpcLevel(lock)
-	kspin_lock		*lock;
-{
-#ifdef NTOSKRNL_DEBUG_SPINLOCKS
-	int			i = 0;
-#endif
-
-	while (atomic_cmpset_acq_int((volatile u_int *)lock, 0, 1) == 0) {
-		/* sit and spin */;
-#ifdef NTOSKRNL_DEBUG_SPINLOCKS
-		i++;
-		if (i > 200000000)
-			panic("DEADLOCK!");
-#endif
-	}
-}
-
-void
-KefReleaseSpinLockFromDpcLevel(lock)
-	kspin_lock		*lock;
-{
-	atomic_store_rel_int((volatile u_int *)lock, 0);
-}
-
-uint8_t
-KeAcquireSpinLockRaiseToDpc(kspin_lock *lock)
-{
-	uint8_t			oldirql;
-
-	if (KeGetCurrentIrql() > DISPATCH_LEVEL)
-		panic("IRQL_NOT_LESS_THAN_OR_EQUAL");
-
-	KeRaiseIrql(DISPATCH_LEVEL, &oldirql);
-	KeAcquireSpinLockAtDpcLevel(lock);
-
-	return (oldirql);
-}
-#else
-void
-KeAcquireSpinLockAtDpcLevel(kspin_lock *lock)
-{
-	while (atomic_cmpset_acq_int((volatile u_int *)lock, 0, 1) == 0)
-		/* sit and spin */;
-}
-
-void
-KeReleaseSpinLockFromDpcLevel(kspin_lock *lock)
-{
-	atomic_store_rel_int((volatile u_int *)lock, 0);
-}
-#endif /* __i386__ */
-
-uintptr_t
-InterlockedExchange(dst, val)
-	volatile uint32_t	*dst;
-	uintptr_t		val;
-{
-	uintptr_t		r;
-
-	mtx_lock_spin(&ntoskrnl_interlock);
-	r = *dst;
-	*dst = val;
-	mtx_unlock_spin(&ntoskrnl_interlock);
-
-	return (r);
-}
-
-static uint32_t
-InterlockedIncrement(addend)
-	volatile uint32_t	*addend;
-{
-	atomic_add_long((volatile u_long *)addend, 1);
-	return (*addend);
-}
-
-static uint32_t
-InterlockedDecrement(addend)
-	volatile uint32_t	*addend;
-{
-	atomic_subtract_long((volatile u_long *)addend, 1);
-	return (*addend);
-}
-
-static void
-ExInterlockedAddLargeStatistic(addend, inc)
-	uint64_t		*addend;
-	uint32_t		inc;
-{
-	mtx_lock_spin(&ntoskrnl_interlock);
-	*addend += inc;
-	mtx_unlock_spin(&ntoskrnl_interlock);
-};
-
-mdl *
-IoAllocateMdl(void *vaddr, uint32_t len, uint8_t secondarybuf,
-	uint8_t chargequota, irp *iopkt)
-{
-	mdl			*m;
-	int			zone = 0;
-
-	if (MmSizeOfMdl(vaddr, len) > MDL_ZONE_SIZE)
-		m = ExAllocatePoolWithTag(NonPagedPool,
-		    MmSizeOfMdl(vaddr, len), 0);
-	else {
-		m = uma_zalloc(mdl_zone, M_NOWAIT | M_ZERO);
-		zone++;
-	}
-
-	if (m == NULL)
-		return (NULL);
-
-	MmInitializeMdl(m, vaddr, len);
-
-	/*
-	 * MmInitializMdl() clears the flags field, so we
-	 * have to set this here. If the MDL came from the
-	 * MDL UMA zone, tag it so we can release it to
-	 * the right place later.
-	 */
-	if (zone)
-		m->mdl_flags = MDL_ZONE_ALLOCED;
-
-	if (iopkt != NULL) {
-		if (secondarybuf == TRUE) {
-			mdl			*last;
-			last = iopkt->irp_mdl;
-			while (last->mdl_next != NULL)
-				last = last->mdl_next;
-			last->mdl_next = m;
-		} else {
-			if (iopkt->irp_mdl != NULL)
-				panic("leaking an MDL in IoAllocateMdl()");
-			iopkt->irp_mdl = m;
-		}
-	}
-
-	return (m);
-}
-
-void
-IoFreeMdl(m)
-	mdl			*m;
-{
-	if (m == NULL)
-		return;
-
-	if (m->mdl_flags & MDL_ZONE_ALLOCED)
-		uma_zfree(mdl_zone, m);
-	else
-		ExFreePool(m);
-}
-
-static void *
-MmAllocateContiguousMemory(size, highest)
-	uint32_t		size;
-	uint64_t		highest;
-{
-	void *addr;
-	size_t pagelength = roundup(size, PAGE_SIZE);
-
-	addr = ExAllocatePoolWithTag(NonPagedPool, pagelength, 0);
-
-	return (addr);
-}
-
-static void *
-MmAllocateContiguousMemorySpecifyCache(size, lowest, highest,
-    boundary, cachetype)
-	uint32_t		size;
-	uint64_t		lowest;
-	uint64_t		highest;
-	uint64_t		boundary;
-	enum nt_caching_type	cachetype;
-{
-	vm_memattr_t		memattr;
-	void			*ret;
-
-	switch (cachetype) {
-	case MmNonCached:
-		memattr = VM_MEMATTR_UNCACHEABLE;
-		break;
-	case MmWriteCombined:
-		memattr = VM_MEMATTR_WRITE_COMBINING;
-		break;
-	case MmNonCachedUnordered:
-		memattr = VM_MEMATTR_UNCACHEABLE;
-		break;
-	case MmCached:
-	case MmHardwareCoherentCached:
-	case MmUSWCCached:
-	default:
-		memattr = VM_MEMATTR_DEFAULT;
-		break;
-	}
-
-	ret = (void *)kmem_alloc_contig(size, M_ZERO | M_NOWAIT, lowest,
-	    highest, PAGE_SIZE, boundary, memattr);
-	if (ret != NULL)
-		malloc_type_allocated(M_DEVBUF, round_page(size));
-	return (ret);
-}
-
-static void
-MmFreeContiguousMemory(base)
-	void			*base;
-{
-	ExFreePool(base);
-}
-
-static void
-MmFreeContiguousMemorySpecifyCache(base, size, cachetype)
-	void			*base;
-	uint32_t		size;
-	enum nt_caching_type	cachetype;
-{
-	contigfree(base, size, M_DEVBUF);
-}
-
-static uint32_t
-MmSizeOfMdl(vaddr, len)
-	void			*vaddr;
-	size_t			len;
-{
-	uint32_t		l;
-
-	l = sizeof(struct mdl) +
-	    (sizeof(vm_offset_t *) * SPAN_PAGES(vaddr, len));
-
-	return (l);
-}
-
-/*
- * The Microsoft documentation says this routine fills in the
- * page array of an MDL with the _physical_ page addresses that
- * comprise the buffer, but we don't really want to do that here.
- * Instead, we just fill in the page array with the kernel virtual
- * addresses of the buffers.
- */
-void
-MmBuildMdlForNonPagedPool(m)
-	mdl			*m;
-{
-	vm_offset_t		*mdl_pages;
-	int			pagecnt, i;
-
-	pagecnt = SPAN_PAGES(m->mdl_byteoffset, m->mdl_bytecount);
-
-	if (pagecnt > (m->mdl_size - sizeof(mdl)) / sizeof(vm_offset_t *))
-		panic("not enough pages in MDL to describe buffer");
-
-	mdl_pages = MmGetMdlPfnArray(m);
-
-	for (i = 0; i < pagecnt; i++)
-		*mdl_pages = (vm_offset_t)m->mdl_startva + (i * PAGE_SIZE);
-
-	m->mdl_flags |= MDL_SOURCE_IS_NONPAGED_POOL;
-	m->mdl_mappedsystemva = MmGetMdlVirtualAddress(m);
-}
-
-static void *
-MmMapLockedPages(mdl *buf, uint8_t accessmode)
-{
-	buf->mdl_flags |= MDL_MAPPED_TO_SYSTEM_VA;
-	return (MmGetMdlVirtualAddress(buf));
-}
-
-static void *
-MmMapLockedPagesSpecifyCache(mdl *buf, uint8_t accessmode, uint32_t cachetype,
-	void *vaddr, uint32_t bugcheck, uint32_t prio)
-{
-	return (MmMapLockedPages(buf, accessmode));
-}
-
-static void
-MmUnmapLockedPages(vaddr, buf)
-	void			*vaddr;
-	mdl			*buf;
-{
-	buf->mdl_flags &= ~MDL_MAPPED_TO_SYSTEM_VA;
-}
-
-/*
- * This function has a problem in that it will break if you
- * compile this module without PAE and try to use it on a PAE
- * kernel. Unfortunately, there's no way around this at the
- * moment. It's slightly less broken that using pmap_kextract().
- * You'd think the virtual memory subsystem would help us out
- * here, but it doesn't.
- */
-
-static uint64_t
-MmGetPhysicalAddress(void *base)
-{
-	return (pmap_extract(kernel_map->pmap, (vm_offset_t)base));
-}
-
-void *
-MmGetSystemRoutineAddress(ustr)
-	unicode_string		*ustr;
-{
-	ansi_string		astr;
-
-	if (RtlUnicodeStringToAnsiString(&astr, ustr, TRUE))
-		return (NULL);
-	return (ndis_get_routine_address(ntoskrnl_functbl, astr.as_buf));
-}
-
-uint8_t
-MmIsAddressValid(vaddr)
-	void			*vaddr;
-{
-	if (pmap_extract(kernel_map->pmap, (vm_offset_t)vaddr))
-		return (TRUE);
-
-	return (FALSE);
-}
-
-void *
-MmMapIoSpace(paddr, len, cachetype)
-	uint64_t		paddr;
-	uint32_t		len;
-	uint32_t		cachetype;
-{
-	devclass_t		nexus_class;
-	device_t		*nexus_devs, devp;
-	int			nexus_count = 0;
-	device_t		matching_dev = NULL;
-	struct resource		*res;
-	int			i;
-	vm_offset_t		v;
-
-	/* There will always be at least one nexus. */
-
-	nexus_class = devclass_find("nexus");
-	devclass_get_devices(nexus_class, &nexus_devs, &nexus_count);
-
-	for (i = 0; i < nexus_count; i++) {
-		devp = nexus_devs[i];
-		matching_dev = ntoskrnl_finddev(devp, paddr, &res);
-		if (matching_dev)
-			break;
-	}
-
-	free(nexus_devs, M_TEMP);
-
-	if (matching_dev == NULL)
-		return (NULL);
-
-	v = (vm_offset_t)rman_get_virtual(res);
-	if (paddr > rman_get_start(res))
-		v += paddr - rman_get_start(res);
-
-	return ((void *)v);
-}
-
-void
-MmUnmapIoSpace(vaddr, len)
-	void			*vaddr;
-	size_t			len;
-{
-}
-
-static device_t
-ntoskrnl_finddev(dev, paddr, res)
-	device_t		dev;
-	uint64_t		paddr;
-	struct resource		**res;
-{
-	device_t		*children = NULL;
-	device_t		matching_dev;
-	int			childcnt;
-	struct resource		*r;
-	struct resource_list	*rl;
-	struct resource_list_entry	*rle;
-	uint32_t		flags;
-	int			i;
-
-	/* We only want devices that have been successfully probed. */
-
-	if (device_is_alive(dev) == FALSE)
-		return (NULL);
-
-	rl = BUS_GET_RESOURCE_LIST(device_get_parent(dev), dev);
-	if (rl != NULL) {
-		STAILQ_FOREACH(rle, rl, link) {
-			r = rle->res;
-
-			if (r == NULL)
-				continue;
-
-			flags = rman_get_flags(r);
-
-			if (rle->type == SYS_RES_MEMORY &&
-			    paddr >= rman_get_start(r) &&
-			    paddr <= rman_get_end(r)) {
-				if (!(flags & RF_ACTIVE))
-					bus_activate_resource(dev,
-					    SYS_RES_MEMORY, 0, r);
-				*res = r;
-				return (dev);
-			}
-		}
-	}
-
-	/*
-	 * If this device has children, do another
-	 * level of recursion to inspect them.
-	 */
-
-	device_get_children(dev, &children, &childcnt);
-
-	for (i = 0; i < childcnt; i++) {
-		matching_dev = ntoskrnl_finddev(children[i], paddr, res);
-		if (matching_dev != NULL) {
-			free(children, M_TEMP);
-			return (matching_dev);
-		}
-	}
-
-	/* Won't somebody please think of the children! */
-
-	if (children != NULL)
-		free(children, M_TEMP);
-
-	return (NULL);
-}
-
-/*
- * Workitems are unlike DPCs, in that they run in a user-mode thread
- * context rather than at DISPATCH_LEVEL in kernel context. In our
- * case we run them in kernel context anyway.
- */
-static void
-ntoskrnl_workitem_thread(arg)
-	void			*arg;
-{
-	kdpc_queue		*kq;
-	list_entry		*l;
-	io_workitem		*iw;
-	uint8_t			irql;
-
-	kq = arg;
-
-	InitializeListHead(&kq->kq_disp);
-	kq->kq_td = curthread;
-	kq->kq_exit = 0;
-	KeInitializeSpinLock(&kq->kq_lock);
-	KeInitializeEvent(&kq->kq_proc, EVENT_TYPE_SYNC, FALSE);
-
-	while (1) {
-		KeWaitForSingleObject(&kq->kq_proc, 0, 0, TRUE, NULL);
-
-		KeAcquireSpinLock(&kq->kq_lock, &irql);
-
-		if (kq->kq_exit) {
-			kq->kq_exit = 0;
-			KeReleaseSpinLock(&kq->kq_lock, irql);
-			break;
-		}
-
-		while (!IsListEmpty(&kq->kq_disp)) {
-			l = RemoveHeadList(&kq->kq_disp);
-			iw = CONTAINING_RECORD(l,
-			    io_workitem, iw_listentry);
-			InitializeListHead((&iw->iw_listentry));
-			if (iw->iw_func == NULL)
-				continue;
-			KeReleaseSpinLock(&kq->kq_lock, irql);
-			MSCALL2(iw->iw_func, iw->iw_dobj, iw->iw_ctx);
-			KeAcquireSpinLock(&kq->kq_lock, &irql);
-		}
-
-		KeReleaseSpinLock(&kq->kq_lock, irql);
-	}
-
-	kproc_exit(0);
-	return; /* notreached */
-}
-
-static ndis_status
-RtlCharToInteger(src, base, val)
-	const char		*src;
-	uint32_t		base;
-	uint32_t		*val;
-{
-	int negative = 0;
-	uint32_t res;
-
-	if (!src || !val)
-		return (STATUS_ACCESS_VIOLATION);
-	while (*src != '\0' && *src <= ' ')
-		src++;
-	if (*src == '+')
-		src++;
-	else if (*src == '-') {
-		src++;
-		negative = 1;
-	}
-	if (base == 0) {
-		base = 10;
-		if (*src == '0') {
-			src++;
-			if (*src == 'b') {
-				base = 2;
-				src++;
-			} else if (*src == 'o') {
-				base = 8;
-				src++;
-			} else if (*src == 'x') {
-				base = 16;
-				src++;
-			}
-		}
-	} else if (!(base == 2 || base == 8 || base == 10 || base == 16))
-		return (STATUS_INVALID_PARAMETER);
-
-	for (res = 0; *src; src++) {
-		int v;
-		if (isdigit(*src))
-			v = *src - '0';
-		else if (isxdigit(*src))
-			v = tolower(*src) - 'a' + 10;
-		else
-			v = base;
-		if (v >= base)
-			return (STATUS_INVALID_PARAMETER);
-		res = res * base + v;
-	}
-	*val = negative ? -res : res;
-	return (STATUS_SUCCESS);
-}
-
-static void
-ntoskrnl_destroy_workitem_threads(void)
-{
-	kdpc_queue		*kq;
-	int			i;
-
-	for (i = 0; i < WORKITEM_THREADS; i++) {
-		kq = wq_queues + i;
-		kq->kq_exit = 1;
-		KeSetEvent(&kq->kq_proc, IO_NO_INCREMENT, FALSE);
-		while (kq->kq_exit)
-			tsleep(kq->kq_td->td_proc, PWAIT, "waitiw", hz/10);
-	}
-}
-
-io_workitem *
-IoAllocateWorkItem(dobj)
-	device_object		*dobj;
-{
-	io_workitem		*iw;
-
-	iw = uma_zalloc(iw_zone, M_NOWAIT);
-	if (iw == NULL)
-		return (NULL);
-
-	InitializeListHead(&iw->iw_listentry);
-	iw->iw_dobj = dobj;
-
-	mtx_lock(&ntoskrnl_dispatchlock);
-	iw->iw_idx = wq_idx;
-	WORKIDX_INC(wq_idx);
-	mtx_unlock(&ntoskrnl_dispatchlock);
-
-	return (iw);
-}
-
-void
-IoFreeWorkItem(iw)
-	io_workitem		*iw;
-{
-	uma_zfree(iw_zone, iw);
-}
-
-void
-IoQueueWorkItem(iw, iw_func, qtype, ctx)
-	io_workitem		*iw;
-	io_workitem_func	iw_func;
-	uint32_t		qtype;
-	void			*ctx;
-{
-	kdpc_queue		*kq;
-	list_entry		*l;
-	io_workitem		*cur;
-	uint8_t			irql;
-
-	kq = wq_queues + iw->iw_idx;
-
-	KeAcquireSpinLock(&kq->kq_lock, &irql);
-
-	/*
-	 * Traverse the list and make sure this workitem hasn't
-	 * already been inserted. Queuing the same workitem
-	 * twice will hose the list but good.
-	 */
-
-	l = kq->kq_disp.nle_flink;
-	while (l != &kq->kq_disp) {
-		cur = CONTAINING_RECORD(l, io_workitem, iw_listentry);
-		if (cur == iw) {
-			/* Already queued -- do nothing. */
-			KeReleaseSpinLock(&kq->kq_lock, irql);
-			return;
-		}
-		l = l->nle_flink;
-	}
-
-	iw->iw_func = iw_func;
-	iw->iw_ctx = ctx;
-
-	InsertTailList((&kq->kq_disp), (&iw->iw_listentry));
-	KeReleaseSpinLock(&kq->kq_lock, irql);
-
-	KeSetEvent(&kq->kq_proc, IO_NO_INCREMENT, FALSE);
-}
-
-static void
-ntoskrnl_workitem(dobj, arg)
-	device_object		*dobj;
-	void			*arg;
-{
-	io_workitem		*iw;
-	work_queue_item		*w;
-	work_item_func		f;
-
-	iw = arg;
-	w = (work_queue_item *)dobj;
-	f = (work_item_func)w->wqi_func;
-	uma_zfree(iw_zone, iw);
-	MSCALL2(f, w, w->wqi_ctx);
-}
-
-/*
- * The ExQueueWorkItem() API is deprecated in Windows XP. Microsoft
- * warns that it's unsafe and to use IoQueueWorkItem() instead. The
- * problem with ExQueueWorkItem() is that it can't guard against
- * the condition where a driver submits a job to the work queue and
- * is then unloaded before the job is able to run. IoQueueWorkItem()
- * acquires a reference to the device's device_object via the
- * object manager and retains it until after the job has completed,
- * which prevents the driver from being unloaded before the job
- * runs. (We don't currently support this behavior, though hopefully
- * that will change once the object manager API is fleshed out a bit.)
- *
- * Having said all that, the ExQueueWorkItem() API remains, because
- * there are still other parts of Windows that use it, including
- * NDIS itself: NdisScheduleWorkItem() calls ExQueueWorkItem().
- * We fake up the ExQueueWorkItem() API on top of our implementation
- * of IoQueueWorkItem(). Workitem thread #3 is reserved exclusively
- * for ExQueueWorkItem() jobs, and we pass a pointer to the work
- * queue item (provided by the caller) in to IoAllocateWorkItem()
- * instead of the device_object. We need to save this pointer so
- * we can apply a sanity check: as with the DPC queue and other
- * workitem queues, we can't allow the same work queue item to
- * be queued twice. If it's already pending, we silently return
- */
-
-void
-ExQueueWorkItem(w, qtype)
-	work_queue_item		*w;
-	uint32_t		qtype;
-{
-	io_workitem		*iw;
-	io_workitem_func	iwf;
-	kdpc_queue		*kq;
-	list_entry		*l;
-	io_workitem		*cur;
-	uint8_t			irql;
-
-	/*
-	 * We need to do a special sanity test to make sure
-	 * the ExQueueWorkItem() API isn't used to queue
-	 * the same workitem twice. Rather than checking the
-	 * io_workitem pointer itself, we test the attached
-	 * device object, which is really a pointer to the
-	 * legacy work queue item structure.
-	 */
-
-	kq = wq_queues + WORKITEM_LEGACY_THREAD;
-	KeAcquireSpinLock(&kq->kq_lock, &irql);
-	l = kq->kq_disp.nle_flink;
-	while (l != &kq->kq_disp) {
-		cur = CONTAINING_RECORD(l, io_workitem, iw_listentry);
-		if (cur->iw_dobj == (device_object *)w) {
-			/* Already queued -- do nothing. */
-			KeReleaseSpinLock(&kq->kq_lock, irql);
-			return;
-		}
-		l = l->nle_flink;
-	}
-	KeReleaseSpinLock(&kq->kq_lock, irql);
-
-	iw = IoAllocateWorkItem((device_object *)w);
-	if (iw == NULL)
-		return;
-
-	iw->iw_idx = WORKITEM_LEGACY_THREAD;
-	iwf = (io_workitem_func)ntoskrnl_findwrap((funcptr)ntoskrnl_workitem);
-	IoQueueWorkItem(iw, iwf, qtype, iw);
-}
-
-static void
-RtlZeroMemory(dst, len)
-	void			*dst;
-	size_t			len;
-{
-	bzero(dst, len);
-}
-
-static void
-RtlSecureZeroMemory(dst, len)
-	void			*dst;
-	size_t			len;
-{
-	memset(dst, 0, len);
-}
-
-static void
-RtlFillMemory(void *dst, size_t len, uint8_t c)
-{
-	memset(dst, c, len);
-}
-
-static void
-RtlMoveMemory(dst, src, len)
-	void			*dst;
-	const void		*src;
-	size_t			len;
-{
-	memmove(dst, src, len);
-}
-
-static void
-RtlCopyMemory(dst, src, len)
-	void			*dst;
-	const void		*src;
-	size_t			len;
-{
-	bcopy(src, dst, len);
-}
-
-static size_t
-RtlCompareMemory(s1, s2, len)
-	const void		*s1;
-	const void		*s2;
-	size_t			len;
-{
-	size_t			i;
-	uint8_t			*m1, *m2;
-
-	m1 = __DECONST(char *, s1);
-	m2 = __DECONST(char *, s2);
-
-	for (i = 0; i < len && m1[i] == m2[i]; i++);
-	return (i);
-}
-
-void
-RtlInitAnsiString(dst, src)
-	ansi_string		*dst;
-	char			*src;
-{
-	ansi_string		*a;
-
-	a = dst;
-	if (a == NULL)
-		return;
-	if (src == NULL) {
-		a->as_len = a->as_maxlen = 0;
-		a->as_buf = NULL;
-	} else {
-		a->as_buf = src;
-		a->as_len = a->as_maxlen = strlen(src);
-	}
-}
-
-void
-RtlInitUnicodeString(dst, src)
-	unicode_string		*dst;
-	uint16_t		*src;
-{
-	unicode_string		*u;
-	int			i;
-
-	u = dst;
-	if (u == NULL)
-		return;
-	if (src == NULL) {
-		u->us_len = u->us_maxlen = 0;
-		u->us_buf = NULL;
-	} else {
-		i = 0;
-		while(src[i] != 0)
-			i++;
-		u->us_buf = src;
-		u->us_len = u->us_maxlen = i * 2;
-	}
-}
-
-ndis_status
-RtlUnicodeStringToInteger(ustr, base, val)
-	unicode_string		*ustr;
-	uint32_t		base;
-	uint32_t		*val;
-{
-	uint16_t		*uchr;
-	int			len, neg = 0;
-	char			abuf[64];
-	char			*astr;
-
-	uchr = ustr->us_buf;
-	len = ustr->us_len;
-	bzero(abuf, sizeof(abuf));
-
-	if ((char)((*uchr) & 0xFF) == '-') {
-		neg = 1;
-		uchr++;
-		len -= 2;
-	} else if ((char)((*uchr) & 0xFF) == '+') {
-		neg = 0;
-		uchr++;
-		len -= 2;
-	}
-
-	if (base == 0) {
-		if ((char)((*uchr) & 0xFF) == 'b') {
-			base = 2;
-			uchr++;
-			len -= 2;
-		} else if ((char)((*uchr) & 0xFF) == 'o') {
-			base = 8;
-			uchr++;
-			len -= 2;
-		} else if ((char)((*uchr) & 0xFF) == 'x') {
-			base = 16;
-			uchr++;
-			len -= 2;
-		} else
-			base = 10;
-	}
-
-	astr = abuf;
-	if (neg) {
-		strcpy(astr, "-");
-		astr++;
-	}
-
-	ntoskrnl_unicode_to_ascii(uchr, astr, len);
-	*val = strtoul(abuf, NULL, base);
-
-	return (STATUS_SUCCESS);
-}
-
-void
-RtlFreeUnicodeString(ustr)
-	unicode_string		*ustr;
-{
-	if (ustr->us_buf == NULL)
-		return;
-	ExFreePool(ustr->us_buf);
-	ustr->us_buf = NULL;
-}
-
-void
-RtlFreeAnsiString(astr)
-	ansi_string		*astr;
-{
-	if (astr->as_buf == NULL)
-		return;
-	ExFreePool(astr->as_buf);
-	astr->as_buf = NULL;
-}
-
-static int
-atoi(str)
-	const char		*str;
-{
-	return (int)strtol(str, (char **)NULL, 10);
-}
-
-static long
-atol(str)
-	const char		*str;
-{
-	return strtol(str, (char **)NULL, 10);
-}
-
-static int
-rand(void)
-{
-
-	return (random());
-}
-
-static void
-srand(unsigned int seed __unused)
-{
-}
-
-static uint8_t
-IoIsWdmVersionAvailable(uint8_t major, uint8_t minor)
-{
-	if (major == WDM_MAJOR && minor == WDM_MINOR_WINXP)
-		return (TRUE);
-	return (FALSE);
-}
-
-static int32_t
-IoOpenDeviceRegistryKey(struct device_object *devobj, uint32_t type,
-    uint32_t mask, void **key)
-{
-	return (NDIS_STATUS_INVALID_DEVICE_REQUEST);
-}
-
-static ndis_status
-IoGetDeviceObjectPointer(name, reqaccess, fileobj, devobj)
-	unicode_string		*name;
-	uint32_t		reqaccess;
-	void			*fileobj;
-	device_object		*devobj;
-{
-	return (STATUS_SUCCESS);
-}
-
-static ndis_status
-IoGetDeviceProperty(devobj, regprop, buflen, prop, reslen)
-	device_object		*devobj;
-	uint32_t		regprop;
-	uint32_t		buflen;
-	void			*prop;
-	uint32_t		*reslen;
-{
-	driver_object		*drv;
-	uint16_t		**name;
-
-	drv = devobj->do_drvobj;
-
-	switch (regprop) {
-	case DEVPROP_DRIVER_KEYNAME:
-		name = prop;
-		*name = drv->dro_drivername.us_buf;
-		*reslen = drv->dro_drivername.us_len;
-		break;
-	default:
-		return (STATUS_INVALID_PARAMETER_2);
-		break;
-	}
-
-	return (STATUS_SUCCESS);
-}
-
-static void
-KeInitializeMutex(kmutex, level)
-	kmutant			*kmutex;
-	uint32_t		level;
-{
-	InitializeListHead((&kmutex->km_header.dh_waitlisthead));
-	kmutex->km_abandoned = FALSE;
-	kmutex->km_apcdisable = 1;
-	kmutex->km_header.dh_sigstate = 1;
-	kmutex->km_header.dh_type = DISP_TYPE_MUTANT;
-	kmutex->km_header.dh_size = sizeof(kmutant) / sizeof(uint32_t);
-	kmutex->km_ownerthread = NULL;
-}
-
-static uint32_t
-KeReleaseMutex(kmutant *kmutex, uint8_t kwait)
-{
-	uint32_t		prevstate;
-
-	mtx_lock(&ntoskrnl_dispatchlock);
-	prevstate = kmutex->km_header.dh_sigstate;
-	if (kmutex->km_ownerthread != curthread) {
-		mtx_unlock(&ntoskrnl_dispatchlock);
-		return (STATUS_MUTANT_NOT_OWNED);
-	}
-
-	kmutex->km_header.dh_sigstate++;
-	kmutex->km_abandoned = FALSE;
-
-	if (kmutex->km_header.dh_sigstate == 1) {
-		kmutex->km_ownerthread = NULL;
-		ntoskrnl_waittest(&kmutex->km_header, IO_NO_INCREMENT);
-	}
-
-	mtx_unlock(&ntoskrnl_dispatchlock);
-
-	return (prevstate);
-}
-
-static uint32_t
-KeReadStateMutex(kmutex)
-	kmutant			*kmutex;
-{
-	return (kmutex->km_header.dh_sigstate);
-}
-
-void
-KeInitializeEvent(nt_kevent *kevent, uint32_t type, uint8_t state)
-{
-	InitializeListHead((&kevent->k_header.dh_waitlisthead));
-	kevent->k_header.dh_sigstate = state;
-	if (type == EVENT_TYPE_NOTIFY)
-		kevent->k_header.dh_type = DISP_TYPE_NOTIFICATION_EVENT;
-	else
-		kevent->k_header.dh_type = DISP_TYPE_SYNCHRONIZATION_EVENT;
-	kevent->k_header.dh_size = sizeof(nt_kevent) / sizeof(uint32_t);
-}
-
-uint32_t
-KeResetEvent(kevent)
-	nt_kevent		*kevent;
-{
-	uint32_t		prevstate;
-
-	mtx_lock(&ntoskrnl_dispatchlock);
-	prevstate = kevent->k_header.dh_sigstate;
-	kevent->k_header.dh_sigstate = FALSE;
-	mtx_unlock(&ntoskrnl_dispatchlock);
-
-	return (prevstate);
-}
-
-uint32_t
-KeSetEvent(nt_kevent *kevent, uint32_t increment, uint8_t kwait)
-{
-	uint32_t		prevstate;
-	wait_block		*w;
-	nt_dispatch_header	*dh;
-	struct thread		*td;
-	wb_ext			*we;
-
-	mtx_lock(&ntoskrnl_dispatchlock);
-	prevstate = kevent->k_header.dh_sigstate;
-	dh = &kevent->k_header;
-
-	if (IsListEmpty(&dh->dh_waitlisthead))
-		/*
-		 * If there's nobody in the waitlist, just set
-		 * the state to signalled.
-		 */
-		dh->dh_sigstate = 1;
-	else {
-		/*
-		 * Get the first waiter. If this is a synchronization
-		 * event, just wake up that one thread (don't bother
-		 * setting the state to signalled since we're supposed
-		 * to automatically clear synchronization events anyway).
-		 *
-		 * If it's a notification event, or the first
-		 * waiter is doing a WAITTYPE_ALL wait, go through
-		 * the full wait satisfaction process.
-		 */
-		w = CONTAINING_RECORD(dh->dh_waitlisthead.nle_flink,
-		    wait_block, wb_waitlist);
-		we = w->wb_ext;
-		td = we->we_td;
-		if (kevent->k_header.dh_type == DISP_TYPE_NOTIFICATION_EVENT ||
-		    w->wb_waittype == WAITTYPE_ALL) {
-			if (prevstate == 0) {
-				dh->dh_sigstate = 1;
-				ntoskrnl_waittest(dh, increment);
-			}
-		} else {
-			w->wb_awakened |= TRUE;
-			cv_broadcastpri(&we->we_cv,
-			    (w->wb_oldpri - (increment * 4)) > PRI_MIN_KERN ?
-			    w->wb_oldpri - (increment * 4) : PRI_MIN_KERN);
-		}
-	}
-
-	mtx_unlock(&ntoskrnl_dispatchlock);
-
-	return (prevstate);
-}
-
-void
-KeClearEvent(kevent)
-	nt_kevent		*kevent;
-{
-	kevent->k_header.dh_sigstate = FALSE;
-}
-
-uint32_t
-KeReadStateEvent(kevent)
-	nt_kevent		*kevent;
-{
-	return (kevent->k_header.dh_sigstate);
-}
-
-/*
- * The object manager in Windows is responsible for managing
- * references and access to various types of objects, including
- * device_objects, events, threads, timers and so on. However,
- * there's a difference in the way objects are handled in user
- * mode versus kernel mode.
- *
- * In user mode (i.e. Win32 applications), all objects are
- * managed by the object manager. For example, when you create
- * a timer or event object, you actually end up with an 
- * object_header (for the object manager's bookkeeping
- * purposes) and an object body (which contains the actual object
- * structure, e.g. ktimer, kevent, etc...). This allows Windows
- * to manage resource quotas and to enforce access restrictions
- * on basically every kind of system object handled by the kernel.
- *
- * However, in kernel mode, you only end up using the object
- * manager some of the time. For example, in a driver, you create
- * a timer object by simply allocating the memory for a ktimer
- * structure and initializing it with KeInitializeTimer(). Hence,
- * the timer has no object_header and no reference counting or
- * security/resource checks are done on it. The assumption in
- * this case is that if you're running in kernel mode, you know
- * what you're doing, and you're already at an elevated privilege
- * anyway.
- *
- * There are some exceptions to this. The two most important ones
- * for our purposes are device_objects and threads. We need to use
- * the object manager to do reference counting on device_objects,
- * and for threads, you can only get a pointer to a thread's
- * dispatch header by using ObReferenceObjectByHandle() on the
- * handle returned by PsCreateSystemThread().
- */
-
-static ndis_status
-ObReferenceObjectByHandle(ndis_handle handle, uint32_t reqaccess, void *otype,
-	uint8_t accessmode, void **object, void **handleinfo)
-{
-	nt_objref		*nr;
-
-	nr = malloc(sizeof(nt_objref), M_DEVBUF, M_NOWAIT|M_ZERO);
-	if (nr == NULL)
-		return (STATUS_INSUFFICIENT_RESOURCES);
-
-	InitializeListHead((&nr->no_dh.dh_waitlisthead));
-	nr->no_obj = handle;
-	nr->no_dh.dh_type = DISP_TYPE_THREAD;
-	nr->no_dh.dh_sigstate = 0;
-	nr->no_dh.dh_size = (uint8_t)(sizeof(struct thread) /
-	    sizeof(uint32_t));
-	TAILQ_INSERT_TAIL(&ntoskrnl_reflist, nr, link);
-	*object = nr;
-
-	return (STATUS_SUCCESS);
-}
-
-static void
-ObfDereferenceObject(object)
-	void			*object;
-{
-	nt_objref		*nr;
-
-	nr = object;
-	TAILQ_REMOVE(&ntoskrnl_reflist, nr, link);
-	free(nr, M_DEVBUF);
-}
-
-static uint32_t
-ZwClose(handle)
-	ndis_handle		handle;
-{
-	return (STATUS_SUCCESS);
-}
-
-static uint32_t
-WmiQueryTraceInformation(traceclass, traceinfo, infolen, reqlen, buf)
-	uint32_t		traceclass;
-	void			*traceinfo;
-	uint32_t		infolen;
-	uint32_t		reqlen;
-	void			*buf;
-{
-	return (STATUS_NOT_FOUND);
-}
-
-static uint32_t
-WmiTraceMessage(uint64_t loghandle, uint32_t messageflags,
-	void *guid, uint16_t messagenum, ...)
-{
-	return (STATUS_SUCCESS);
-}
-
-static uint32_t
-IoWMIRegistrationControl(dobj, action)
-	device_object		*dobj;
-	uint32_t		action;
-{
-	return (STATUS_SUCCESS);
-}
-
-/*
- * This is here just in case the thread returns without calling
- * PsTerminateSystemThread().
- */
-static void
-ntoskrnl_thrfunc(arg)
-	void			*arg;
-{
-	thread_context		*thrctx;
-	uint32_t (*tfunc)(void *);
-	void			*tctx;
-	uint32_t		rval;
-
-	thrctx = arg;
-	tfunc = thrctx->tc_thrfunc;
-	tctx = thrctx->tc_thrctx;
-	free(thrctx, M_TEMP);
-
-	rval = MSCALL1(tfunc, tctx);
-
-	PsTerminateSystemThread(rval);
-	return; /* notreached */
-}
-
-static ndis_status
-PsCreateSystemThread(handle, reqaccess, objattrs, phandle,
-	clientid, thrfunc, thrctx)
-	ndis_handle		*handle;
-	uint32_t		reqaccess;
-	void			*objattrs;
-	ndis_handle		phandle;
-	void			*clientid;
-	void			*thrfunc;
-	void			*thrctx;
-{
-	int			error;
-	thread_context		*tc;
-	struct proc		*p;
-
-	tc = malloc(sizeof(thread_context), M_TEMP, M_NOWAIT);
-	if (tc == NULL)
-		return (STATUS_INSUFFICIENT_RESOURCES);
-
-	tc->tc_thrctx = thrctx;
-	tc->tc_thrfunc = thrfunc;
-
-	error = kproc_create(ntoskrnl_thrfunc, tc, &p,
-	    RFHIGHPID, NDIS_KSTACK_PAGES, "Windows Kthread %d", ntoskrnl_kth);
-
-	if (error) {
-		free(tc, M_TEMP);
-		return (STATUS_INSUFFICIENT_RESOURCES);
-	}
-
-	*handle = p;
-	ntoskrnl_kth++;
-
-	return (STATUS_SUCCESS);
-}
-
-/*
- * In Windows, the exit of a thread is an event that you're allowed
- * to wait on, assuming you've obtained a reference to the thread using
- * ObReferenceObjectByHandle(). Unfortunately, the only way we can
- * simulate this behavior is to register each thread we create in a
- * reference list, and if someone holds a reference to us, we poke
- * them.
- */
-static ndis_status
-PsTerminateSystemThread(status)
-	ndis_status		status;
-{
-	struct nt_objref	*nr;
-
-	mtx_lock(&ntoskrnl_dispatchlock);
-	TAILQ_FOREACH(nr, &ntoskrnl_reflist, link) {
-		if (nr->no_obj != curthread->td_proc)
-			continue;
-		nr->no_dh.dh_sigstate = 1;
-		ntoskrnl_waittest(&nr->no_dh, IO_NO_INCREMENT);
-		break;
-	}
-	mtx_unlock(&ntoskrnl_dispatchlock);
-
-	ntoskrnl_kth--;
-
-	kproc_exit(0);
-	return (0);	/* notreached */
-}
-
-static uint32_t
-DbgPrint(char *fmt, ...)
-{
-	va_list			ap;
-
-	if (bootverbose) {
-		va_start(ap, fmt);
-		vprintf(fmt, ap);
-		va_end(ap);
-	}
-
-	return (STATUS_SUCCESS);
-}
-
-static void
-DbgBreakPoint(void)
-{
-
-	kdb_enter(KDB_WHY_NDIS, "DbgBreakPoint(): breakpoint");
-}
-
-static void
-KeBugCheckEx(code, param1, param2, param3, param4)
-    uint32_t			code;
-    u_long			param1;
-    u_long			param2;
-    u_long			param3;
-    u_long			param4;
-{
-	panic("KeBugCheckEx: STOP 0x%X", code);
-}
-
-static void
-ntoskrnl_timercall(arg)
-	void			*arg;
-{
-	ktimer			*timer;
-	struct timeval		tv;
-	kdpc			*dpc;
-
-	mtx_lock(&ntoskrnl_dispatchlock);
-
-	timer = arg;
-
-#ifdef NTOSKRNL_DEBUG_TIMERS
-	ntoskrnl_timer_fires++;
-#endif
-	ntoskrnl_remove_timer(timer);
-
-	/*
-	 * This should never happen, but complain
-	 * if it does.
-	 */
-
-	if (timer->k_header.dh_inserted == FALSE) {
-		mtx_unlock(&ntoskrnl_dispatchlock);
-		printf("NTOS: timer %p fired even though "
-		    "it was canceled\n", timer);
-		return;
-	}
-
-	/* Mark the timer as no longer being on the timer queue. */
-
-	timer->k_header.dh_inserted = FALSE;
-
-	/* Now signal the object and satisfy any waits on it. */
-
-	timer->k_header.dh_sigstate = 1;
-	ntoskrnl_waittest(&timer->k_header, IO_NO_INCREMENT);
-
-	/*
-	 * If this is a periodic timer, re-arm it
-	 * so it will fire again. We do this before
-	 * calling any deferred procedure calls because
-	 * it's possible the DPC might cancel the timer,
-	 * in which case it would be wrong for us to
-	 * re-arm it again afterwards.
-	 */
-
-	if (timer->k_period) {
-		tv.tv_sec = 0;
-		tv.tv_usec = timer->k_period * 1000;
-		timer->k_header.dh_inserted = TRUE;
-		ntoskrnl_insert_timer(timer, tvtohz(&tv));
-#ifdef NTOSKRNL_DEBUG_TIMERS
-		ntoskrnl_timer_reloads++;
-#endif
-	}
-
-	dpc = timer->k_dpc;
-
-	mtx_unlock(&ntoskrnl_dispatchlock);
-
-	/* If there's a DPC associated with the timer, queue it up. */
-
-	if (dpc != NULL)
-		KeInsertQueueDpc(dpc, NULL, NULL);
-}
-
-#ifdef NTOSKRNL_DEBUG_TIMERS
-static int
-sysctl_show_timers(SYSCTL_HANDLER_ARGS)
-{
-	int			ret;
-
-	ret = 0;
-	ntoskrnl_show_timers();
-	return (sysctl_handle_int(oidp, &ret, 0, req));
-}
-
-static void
-ntoskrnl_show_timers()
-{
-	int			i = 0;
-	list_entry		*l;
-
-	mtx_lock_spin(&ntoskrnl_calllock);
-	l = ntoskrnl_calllist.nle_flink;
-	while(l != &ntoskrnl_calllist) {
-		i++;
-		l = l->nle_flink;
-	}
-	mtx_unlock_spin(&ntoskrnl_calllock);
-
-	printf("\n");
-	printf("%d timers available (out of %d)\n", i, NTOSKRNL_TIMEOUTS);
-	printf("timer sets: %qu\n", ntoskrnl_timer_sets);
-	printf("timer reloads: %qu\n", ntoskrnl_timer_reloads);
-	printf("timer cancels: %qu\n", ntoskrnl_timer_cancels);
-	printf("timer fires: %qu\n", ntoskrnl_timer_fires);
-	printf("\n");
-}
-#endif
-
-/*
- * Must be called with dispatcher lock held.
- */
-
-static void
-ntoskrnl_insert_timer(timer, ticks)
-	ktimer			*timer;
-	int			ticks;
-{
-	callout_entry		*e;
-	list_entry		*l;
-	struct callout		*c;
-
-	/*
-	 * Try and allocate a timer.
-	 */
-	mtx_lock_spin(&ntoskrnl_calllock);
-	if (IsListEmpty(&ntoskrnl_calllist)) {
-		mtx_unlock_spin(&ntoskrnl_calllock);
-#ifdef NTOSKRNL_DEBUG_TIMERS
-		ntoskrnl_show_timers();
-#endif
-		panic("out of timers!");
-	}
-	l = RemoveHeadList(&ntoskrnl_calllist);
-	mtx_unlock_spin(&ntoskrnl_calllock);
-
-	e = CONTAINING_RECORD(l, callout_entry, ce_list);
-	c = &e->ce_callout;
-
-	timer->k_callout = c;
-
-	callout_init(c, 1);
-	callout_reset(c, ticks, ntoskrnl_timercall, timer);
-}
-
-static void
-ntoskrnl_remove_timer(timer)
-	ktimer			*timer;
-{
-	callout_entry		*e;
-
-	e = (callout_entry *)timer->k_callout;
-	callout_stop(timer->k_callout);
-
-	mtx_lock_spin(&ntoskrnl_calllock);
-	InsertHeadList((&ntoskrnl_calllist), (&e->ce_list));
-	mtx_unlock_spin(&ntoskrnl_calllock);
-}
-
-void
-KeInitializeTimer(timer)
-	ktimer			*timer;
-{
-	if (timer == NULL)
-		return;
-
-	KeInitializeTimerEx(timer,  EVENT_TYPE_NOTIFY);
-}
-
-void
-KeInitializeTimerEx(timer, type)
-	ktimer			*timer;
-	uint32_t		type;
-{
-	if (timer == NULL)
-		return;
-
-	bzero((char *)timer, sizeof(ktimer));
-	InitializeListHead((&timer->k_header.dh_waitlisthead));
-	timer->k_header.dh_sigstate = FALSE;
-	timer->k_header.dh_inserted = FALSE;
-	if (type == EVENT_TYPE_NOTIFY)
-		timer->k_header.dh_type = DISP_TYPE_NOTIFICATION_TIMER;
-	else
-		timer->k_header.dh_type = DISP_TYPE_SYNCHRONIZATION_TIMER;
-	timer->k_header.dh_size = sizeof(ktimer) / sizeof(uint32_t);
-}
-
-/*
- * DPC subsystem. A Windows Defered Procedure Call has the following
- * properties:
- * - It runs at DISPATCH_LEVEL.
- * - It can have one of 3 importance values that control when it
- *   runs relative to other DPCs in the queue.
- * - On SMP systems, it can be set to run on a specific processor.
- * In order to satisfy the last property, we create a DPC thread for
- * each CPU in the system and bind it to that CPU. Each thread
- * maintains three queues with different importance levels, which
- * will be processed in order from lowest to highest.
- *
- * In Windows, interrupt handlers run as DPCs. (Not to be confused
- * with ISRs, which run in interrupt context and can preempt DPCs.)
- * ISRs are given the highest importance so that they'll take
- * precedence over timers and other things.
- */
-
-static void
-ntoskrnl_dpc_thread(arg)
-	void			*arg;
-{
-	kdpc_queue		*kq;
-	kdpc			*d;
-	list_entry		*l;
-	uint8_t			irql;
-
-	kq = arg;
-
-	InitializeListHead(&kq->kq_disp);
-	kq->kq_td = curthread;
-	kq->kq_exit = 0;
-	kq->kq_running = FALSE;
-	KeInitializeSpinLock(&kq->kq_lock);
-	KeInitializeEvent(&kq->kq_proc, EVENT_TYPE_SYNC, FALSE);
-	KeInitializeEvent(&kq->kq_done, EVENT_TYPE_SYNC, FALSE);
-
-	/*
-	 * Elevate our priority. DPCs are used to run interrupt
-	 * handlers, and they should trigger as soon as possible
-	 * once scheduled by an ISR.
-	 */
-
-	thread_lock(curthread);
-#ifdef NTOSKRNL_MULTIPLE_DPCS
-	sched_bind(curthread, kq->kq_cpu);
-#endif
-	sched_prio(curthread, PRI_MIN_KERN);
-	thread_unlock(curthread);
-
-	while (1) {
-		KeWaitForSingleObject(&kq->kq_proc, 0, 0, TRUE, NULL);
-
-		KeAcquireSpinLock(&kq->kq_lock, &irql);
-
-		if (kq->kq_exit) {
-			kq->kq_exit = 0;
-			KeReleaseSpinLock(&kq->kq_lock, irql);
-			break;
-		}
-
-		kq->kq_running = TRUE;
-
-		while (!IsListEmpty(&kq->kq_disp)) {
-			l = RemoveHeadList((&kq->kq_disp));
-			d = CONTAINING_RECORD(l, kdpc, k_dpclistentry);
-			InitializeListHead((&d->k_dpclistentry));
-			KeReleaseSpinLockFromDpcLevel(&kq->kq_lock);
-			MSCALL4(d->k_deferedfunc, d, d->k_deferredctx,
-			    d->k_sysarg1, d->k_sysarg2);
-			KeAcquireSpinLockAtDpcLevel(&kq->kq_lock);
-		}
-
-		kq->kq_running = FALSE;
-
-		KeReleaseSpinLock(&kq->kq_lock, irql);
-
-		KeSetEvent(&kq->kq_done, IO_NO_INCREMENT, FALSE);
-	}
-
-	kproc_exit(0);
-	return; /* notreached */
-}
-
-static void
-ntoskrnl_destroy_dpc_threads(void)
-{
-	kdpc_queue		*kq;
-	kdpc			dpc;
-	int			i;
-
-	kq = kq_queues;
-#ifdef NTOSKRNL_MULTIPLE_DPCS
-	for (i = 0; i < mp_ncpus; i++) {
-#else
-	for (i = 0; i < 1; i++) {
-#endif
-		kq += i;
-
-		kq->kq_exit = 1;
-		KeInitializeDpc(&dpc, NULL, NULL);
-		KeSetTargetProcessorDpc(&dpc, i);
-		KeInsertQueueDpc(&dpc, NULL, NULL);
-		while (kq->kq_exit)
-			tsleep(kq->kq_td->td_proc, PWAIT, "dpcw", hz/10);
-	}
-}
-
-static uint8_t
-ntoskrnl_insert_dpc(head, dpc)
-	list_entry		*head;
-	kdpc			*dpc;
-{
-	list_entry		*l;
-	kdpc			*d;
-
-	l = head->nle_flink;
-	while (l != head) {
-		d = CONTAINING_RECORD(l, kdpc, k_dpclistentry);
-		if (d == dpc)
-			return (FALSE);
-		l = l->nle_flink;
-	}
-
-	if (dpc->k_importance == KDPC_IMPORTANCE_LOW)
-		InsertTailList((head), (&dpc->k_dpclistentry));
-	else
-		InsertHeadList((head), (&dpc->k_dpclistentry));
-
-	return (TRUE);
-}
-
-void
-KeInitializeDpc(dpc, dpcfunc, dpcctx)
-	kdpc			*dpc;
-	void			*dpcfunc;
-	void			*dpcctx;
-{
-
-	if (dpc == NULL)
-		return;
-
-	dpc->k_deferedfunc = dpcfunc;
-	dpc->k_deferredctx = dpcctx;
-	dpc->k_num = KDPC_CPU_DEFAULT;
-	dpc->k_importance = KDPC_IMPORTANCE_MEDIUM;
-	InitializeListHead((&dpc->k_dpclistentry));
-}
-
-uint8_t
-KeInsertQueueDpc(dpc, sysarg1, sysarg2)
-	kdpc			*dpc;
-	void			*sysarg1;
-	void			*sysarg2;
-{
-	kdpc_queue		*kq;
-	uint8_t			r;
-	uint8_t			irql;
-
-	if (dpc == NULL)
-		return (FALSE);
-
-	kq = kq_queues;
-
-#ifdef NTOSKRNL_MULTIPLE_DPCS
-	KeRaiseIrql(DISPATCH_LEVEL, &irql);
-
-	/*
-	 * By default, the DPC is queued to run on the same CPU
-	 * that scheduled it.
-	 */
-
-	if (dpc->k_num == KDPC_CPU_DEFAULT)
-		kq += curthread->td_oncpu;
-	else
-		kq += dpc->k_num;
-	KeAcquireSpinLockAtDpcLevel(&kq->kq_lock);
-#else
-	KeAcquireSpinLock(&kq->kq_lock, &irql);
-#endif
-
-	r = ntoskrnl_insert_dpc(&kq->kq_disp, dpc);
-	if (r == TRUE) {
-		dpc->k_sysarg1 = sysarg1;
-		dpc->k_sysarg2 = sysarg2;
-	}
-	KeReleaseSpinLock(&kq->kq_lock, irql);
-
-	if (r == FALSE)
-		return (r);
-
-	KeSetEvent(&kq->kq_proc, IO_NO_INCREMENT, FALSE);
-
-	return (r);
-}
-
-uint8_t
-KeRemoveQueueDpc(dpc)
-	kdpc			*dpc;
-{
-	kdpc_queue		*kq;
-	uint8_t			irql;
-
-	if (dpc == NULL)
-		return (FALSE);
-
-#ifdef NTOSKRNL_MULTIPLE_DPCS
-	KeRaiseIrql(DISPATCH_LEVEL, &irql);
-
-	kq = kq_queues + dpc->k_num;
-
-	KeAcquireSpinLockAtDpcLevel(&kq->kq_lock);
-#else
-	kq = kq_queues;
-	KeAcquireSpinLock(&kq->kq_lock, &irql);
-#endif
-
-	if (dpc->k_dpclistentry.nle_flink == &dpc->k_dpclistentry) {
-		KeReleaseSpinLockFromDpcLevel(&kq->kq_lock);
-		KeLowerIrql(irql);
-		return (FALSE);
-	}
-
-	RemoveEntryList((&dpc->k_dpclistentry));
-	InitializeListHead((&dpc->k_dpclistentry));
-
-	KeReleaseSpinLock(&kq->kq_lock, irql);
-
-	return (TRUE);
-}
-
-void
-KeSetImportanceDpc(dpc, imp)
-	kdpc			*dpc;
-	uint32_t		imp;
-{
-	if (imp != KDPC_IMPORTANCE_LOW &&
-	    imp != KDPC_IMPORTANCE_MEDIUM &&
-	    imp != KDPC_IMPORTANCE_HIGH)
-		return;
-
-	dpc->k_importance = (uint8_t)imp;
-}
-
-void
-KeSetTargetProcessorDpc(kdpc *dpc, uint8_t cpu)
-{
-	if (cpu > mp_ncpus)
-		return;
-
-	dpc->k_num = cpu;
-}
-
-void
-KeFlushQueuedDpcs(void)
-{
-	kdpc_queue		*kq;
-	int			i;
-
-	/*
-	 * Poke each DPC queue and wait
-	 * for them to drain.
-	 */
-
-#ifdef NTOSKRNL_MULTIPLE_DPCS
-	for (i = 0; i < mp_ncpus; i++) {
-#else
-	for (i = 0; i < 1; i++) {
-#endif
-		kq = kq_queues + i;
-		KeSetEvent(&kq->kq_proc, IO_NO_INCREMENT, FALSE);
-		KeWaitForSingleObject(&kq->kq_done, 0, 0, TRUE, NULL);
-	}
-}
-
-uint32_t
-KeGetCurrentProcessorNumber(void)
-{
-	return ((uint32_t)curthread->td_oncpu);
-}
-
-uint8_t
-KeSetTimerEx(timer, duetime, period, dpc)
-	ktimer			*timer;
-	int64_t			duetime;
-	uint32_t		period;
-	kdpc			*dpc;
-{
-	struct timeval		tv;
-	uint64_t		curtime;
-	uint8_t			pending;
-
-	if (timer == NULL)
-		return (FALSE);
-
-	mtx_lock(&ntoskrnl_dispatchlock);
-
-	if (timer->k_header.dh_inserted == TRUE) {
-		ntoskrnl_remove_timer(timer);
-#ifdef NTOSKRNL_DEBUG_TIMERS
-		ntoskrnl_timer_cancels++;
-#endif
-		timer->k_header.dh_inserted = FALSE;
-		pending = TRUE;
-	} else
-		pending = FALSE;
-
-	timer->k_duetime = duetime;
-	timer->k_period = period;
-	timer->k_header.dh_sigstate = FALSE;
-	timer->k_dpc = dpc;
-
-	if (duetime < 0) {
-		tv.tv_sec = - (duetime) / 10000000;
-		tv.tv_usec = (- (duetime) / 10) -
-		    (tv.tv_sec * 1000000);
-	} else {
-		ntoskrnl_time(&curtime);
-		if (duetime < curtime)
-			tv.tv_sec = tv.tv_usec = 0;
-		else {
-			tv.tv_sec = ((duetime) - curtime) / 10000000;
-			tv.tv_usec = ((duetime) - curtime) / 10 -
-			    (tv.tv_sec * 1000000);
-		}
-	}
-
-	timer->k_header.dh_inserted = TRUE;
-	ntoskrnl_insert_timer(timer, tvtohz(&tv));
-#ifdef NTOSKRNL_DEBUG_TIMERS
-	ntoskrnl_timer_sets++;
-#endif
-
-	mtx_unlock(&ntoskrnl_dispatchlock);
-
-	return (pending);
-}
-
-uint8_t
-KeSetTimer(timer, duetime, dpc)
-	ktimer			*timer;
-	int64_t			duetime;
-	kdpc			*dpc;
-{
-	return (KeSetTimerEx(timer, duetime, 0, dpc));
-}
-
-/*
- * The Windows DDK documentation seems to say that cancelling
- * a timer that has a DPC will result in the DPC also being
- * cancelled, but this isn't really the case.
- */
-
-uint8_t
-KeCancelTimer(timer)
-	ktimer			*timer;
-{
-	uint8_t			pending;
-
-	if (timer == NULL)
-		return (FALSE);
-
-	mtx_lock(&ntoskrnl_dispatchlock);
-
-	pending = timer->k_header.dh_inserted;
-
-	if (timer->k_header.dh_inserted == TRUE) {
-		timer->k_header.dh_inserted = FALSE;
-		ntoskrnl_remove_timer(timer);
-#ifdef NTOSKRNL_DEBUG_TIMERS
-		ntoskrnl_timer_cancels++;
-#endif
-	}
-
-	mtx_unlock(&ntoskrnl_dispatchlock);
-
-	return (pending);
-}
-
-uint8_t
-KeReadStateTimer(timer)
-	ktimer			*timer;
-{
-	return (timer->k_header.dh_sigstate);
-}
-
-static int32_t
-KeDelayExecutionThread(uint8_t wait_mode, uint8_t alertable, int64_t *interval)
-{
-	ktimer                  timer;
-
-	if (wait_mode != 0)
-		panic("invalid wait_mode %d", wait_mode);
-
-	KeInitializeTimer(&timer);
-	KeSetTimer(&timer, *interval, NULL);
-	KeWaitForSingleObject(&timer, 0, 0, alertable, NULL);
-
-	return STATUS_SUCCESS;
-}
-
-static uint64_t
-KeQueryInterruptTime(void)
-{
-	int ticks;
-	struct timeval tv;
-
-	getmicrouptime(&tv);
-
-	ticks = tvtohz(&tv);
-
-	return ticks * howmany(10000000, hz);
-}
-
-static struct thread *
-KeGetCurrentThread(void)
-{
-
-	return curthread;
-}
-
-static int32_t
-KeSetPriorityThread(td, pri)
-	struct thread	*td;
-	int32_t		pri;
-{
-	int32_t old;
-
-	if (td == NULL)
-		return LOW_REALTIME_PRIORITY;
-
-	if (td->td_priority <= PRI_MIN_KERN)
-		old = HIGH_PRIORITY;
-	else if (td->td_priority >= PRI_MAX_KERN)
-		old = LOW_PRIORITY;
-	else
-		old = LOW_REALTIME_PRIORITY;
-
-	thread_lock(td);
-	if (pri == HIGH_PRIORITY)
-		sched_prio(td, PRI_MIN_KERN);
-	if (pri == LOW_REALTIME_PRIORITY)
-		sched_prio(td, PRI_MIN_KERN + (PRI_MAX_KERN - PRI_MIN_KERN) / 2);
-	if (pri == LOW_PRIORITY)
-		sched_prio(td, PRI_MAX_KERN);
-	thread_unlock(td);
-
-	return old;
-}
-
-static void
-dummy()
-{
-	printf("ntoskrnl dummy called...\n");
-}
-
-image_patch_table ntoskrnl_functbl[] = {
-	IMPORT_SFUNC(RtlZeroMemory, 2),
-	IMPORT_SFUNC(RtlSecureZeroMemory, 2),
-	IMPORT_SFUNC(RtlFillMemory, 3),
-	IMPORT_SFUNC(RtlMoveMemory, 3),
-	IMPORT_SFUNC(RtlCharToInteger, 3),
-	IMPORT_SFUNC(RtlCopyMemory, 3),
-	IMPORT_SFUNC(RtlCopyString, 2),
-	IMPORT_SFUNC(RtlCompareMemory, 3),
-	IMPORT_SFUNC(RtlEqualUnicodeString, 3),
-	IMPORT_SFUNC(RtlCopyUnicodeString, 2),
-	IMPORT_SFUNC(RtlUnicodeStringToAnsiString, 3),
-	IMPORT_SFUNC(RtlAnsiStringToUnicodeString, 3),
-	IMPORT_SFUNC(RtlInitAnsiString, 2),
-	IMPORT_SFUNC_MAP(RtlInitString, RtlInitAnsiString, 2),
-	IMPORT_SFUNC(RtlInitUnicodeString, 2),
-	IMPORT_SFUNC(RtlFreeAnsiString, 1),
-	IMPORT_SFUNC(RtlFreeUnicodeString, 1),
-	IMPORT_SFUNC(RtlUnicodeStringToInteger, 3),
-	IMPORT_CFUNC(sprintf, 0),
-	IMPORT_CFUNC(vsprintf, 0),
-	IMPORT_CFUNC_MAP(_snprintf, snprintf, 0),
-	IMPORT_CFUNC_MAP(_vsnprintf, vsnprintf, 0),
-	IMPORT_CFUNC(DbgPrint, 0),
-	IMPORT_SFUNC(DbgBreakPoint, 0),
-	IMPORT_SFUNC(KeBugCheckEx, 5),
-	IMPORT_CFUNC(strncmp, 0),
-	IMPORT_CFUNC(strcmp, 0),
-	IMPORT_CFUNC_MAP(stricmp, strcasecmp, 0),
-	IMPORT_CFUNC(strncpy, 0),
-	IMPORT_CFUNC(strcpy, 0),
-	IMPORT_CFUNC(strlen, 0),
-	IMPORT_CFUNC_MAP(toupper, ntoskrnl_toupper, 0),
-	IMPORT_CFUNC_MAP(tolower, ntoskrnl_tolower, 0),
-	IMPORT_CFUNC_MAP(strstr, ntoskrnl_strstr, 0),
-	IMPORT_CFUNC_MAP(strncat, ntoskrnl_strncat, 0),
-	IMPORT_CFUNC_MAP(strchr, index, 0),
-	IMPORT_CFUNC_MAP(strrchr, rindex, 0),
-	IMPORT_CFUNC(memcpy, 0),
-	IMPORT_CFUNC_MAP(memmove, ntoskrnl_memmove, 0),
-	IMPORT_CFUNC_MAP(memset, ntoskrnl_memset, 0),
-	IMPORT_CFUNC_MAP(memchr, ntoskrnl_memchr, 0),
-	IMPORT_SFUNC(IoAllocateDriverObjectExtension, 4),
-	IMPORT_SFUNC(IoGetDriverObjectExtension, 2),
-	IMPORT_FFUNC(IofCallDriver, 2),
-	IMPORT_FFUNC(IofCompleteRequest, 2),
-	IMPORT_SFUNC(IoAcquireCancelSpinLock, 1),
-	IMPORT_SFUNC(IoReleaseCancelSpinLock, 1),
-	IMPORT_SFUNC(IoCancelIrp, 1),
-	IMPORT_SFUNC(IoConnectInterrupt, 11),
-	IMPORT_SFUNC(IoDisconnectInterrupt, 1),
-	IMPORT_SFUNC(IoCreateDevice, 7),
-	IMPORT_SFUNC(IoDeleteDevice, 1),
-	IMPORT_SFUNC(IoGetAttachedDevice, 1),
-	IMPORT_SFUNC(IoAttachDeviceToDeviceStack, 2),
-	IMPORT_SFUNC(IoDetachDevice, 1),
-	IMPORT_SFUNC(IoBuildSynchronousFsdRequest, 7),
-	IMPORT_SFUNC(IoBuildAsynchronousFsdRequest, 6),
-	IMPORT_SFUNC(IoBuildDeviceIoControlRequest, 9),
-	IMPORT_SFUNC(IoAllocateIrp, 2),
-	IMPORT_SFUNC(IoReuseIrp, 2),
-	IMPORT_SFUNC(IoMakeAssociatedIrp, 2),
-	IMPORT_SFUNC(IoFreeIrp, 1),
-	IMPORT_SFUNC(IoInitializeIrp, 3),
-	IMPORT_SFUNC(KeAcquireInterruptSpinLock, 1),
-	IMPORT_SFUNC(KeReleaseInterruptSpinLock, 2),
-	IMPORT_SFUNC(KeSynchronizeExecution, 3),
-	IMPORT_SFUNC(KeWaitForSingleObject, 5),
-	IMPORT_SFUNC(KeWaitForMultipleObjects, 8),
-	IMPORT_SFUNC(_allmul, 4),
-	IMPORT_SFUNC(_alldiv, 4),
-	IMPORT_SFUNC(_allrem, 4),
-	IMPORT_RFUNC(_allshr, 0),
-	IMPORT_RFUNC(_allshl, 0),
-	IMPORT_SFUNC(_aullmul, 4),
-	IMPORT_SFUNC(_aulldiv, 4),
-	IMPORT_SFUNC(_aullrem, 4),
-	IMPORT_RFUNC(_aullshr, 0),
-	IMPORT_RFUNC(_aullshl, 0),
-	IMPORT_CFUNC(atoi, 0),
-	IMPORT_CFUNC(atol, 0),
-	IMPORT_CFUNC(rand, 0),
-	IMPORT_CFUNC(srand, 0),
-	IMPORT_SFUNC(WRITE_REGISTER_USHORT, 2),
-	IMPORT_SFUNC(READ_REGISTER_USHORT, 1),
-	IMPORT_SFUNC(WRITE_REGISTER_ULONG, 2),
-	IMPORT_SFUNC(READ_REGISTER_ULONG, 1),
-	IMPORT_SFUNC(READ_REGISTER_UCHAR, 1),
-	IMPORT_SFUNC(WRITE_REGISTER_UCHAR, 2),
-	IMPORT_SFUNC(ExInitializePagedLookasideList, 7),
-	IMPORT_SFUNC(ExDeletePagedLookasideList, 1),
-	IMPORT_SFUNC(ExInitializeNPagedLookasideList, 7),
-	IMPORT_SFUNC(ExDeleteNPagedLookasideList, 1),
-	IMPORT_FFUNC(InterlockedPopEntrySList, 1),
-	IMPORT_FFUNC(InitializeSListHead, 1),
-	IMPORT_FFUNC(InterlockedPushEntrySList, 2),
-	IMPORT_SFUNC(ExQueryDepthSList, 1),
-	IMPORT_FFUNC_MAP(ExpInterlockedPopEntrySList,
-		InterlockedPopEntrySList, 1),
-	IMPORT_FFUNC_MAP(ExpInterlockedPushEntrySList,
-		InterlockedPushEntrySList, 2),
-	IMPORT_FFUNC(ExInterlockedPopEntrySList, 2),
-	IMPORT_FFUNC(ExInterlockedPushEntrySList, 3),
-	IMPORT_SFUNC(ExAllocatePoolWithTag, 3),
-	IMPORT_SFUNC(ExFreePoolWithTag, 2),
-	IMPORT_SFUNC(ExFreePool, 1),
-#ifdef __i386__
-	IMPORT_FFUNC(KefAcquireSpinLockAtDpcLevel, 1),
-	IMPORT_FFUNC(KefReleaseSpinLockFromDpcLevel,1),
-	IMPORT_FFUNC(KeAcquireSpinLockRaiseToDpc, 1),
-#else
-	/*
-	 * For AMD64, we can get away with just mapping
-	 * KeAcquireSpinLockRaiseToDpc() directly to KfAcquireSpinLock()
-	 * because the calling conventions end up being the same.
-	 * On i386, we have to be careful because KfAcquireSpinLock()
-	 * is _fastcall but KeAcquireSpinLockRaiseToDpc() isn't.
-	 */
-	IMPORT_SFUNC(KeAcquireSpinLockAtDpcLevel, 1),
-	IMPORT_SFUNC(KeReleaseSpinLockFromDpcLevel, 1),
-	IMPORT_SFUNC_MAP(KeAcquireSpinLockRaiseToDpc, KfAcquireSpinLock, 1),
-#endif
-	IMPORT_SFUNC_MAP(KeReleaseSpinLock, KfReleaseSpinLock, 1),
-	IMPORT_FFUNC(InterlockedIncrement, 1),
-	IMPORT_FFUNC(InterlockedDecrement, 1),
-	IMPORT_FFUNC(InterlockedExchange, 2),
-	IMPORT_FFUNC(ExInterlockedAddLargeStatistic, 2),
-	IMPORT_SFUNC(IoAllocateMdl, 5),
-	IMPORT_SFUNC(IoFreeMdl, 1),
-	IMPORT_SFUNC(MmAllocateContiguousMemory, 2 + 1),
-	IMPORT_SFUNC(MmAllocateContiguousMemorySpecifyCache, 5 + 3),
-	IMPORT_SFUNC(MmFreeContiguousMemory, 1),
-	IMPORT_SFUNC(MmFreeContiguousMemorySpecifyCache, 3),
-	IMPORT_SFUNC(MmSizeOfMdl, 1),
-	IMPORT_SFUNC(MmMapLockedPages, 2),
-	IMPORT_SFUNC(MmMapLockedPagesSpecifyCache, 6),
-	IMPORT_SFUNC(MmUnmapLockedPages, 2),
-	IMPORT_SFUNC(MmBuildMdlForNonPagedPool, 1),
-	IMPORT_SFUNC(MmGetPhysicalAddress, 1),
-	IMPORT_SFUNC(MmGetSystemRoutineAddress, 1),
-	IMPORT_SFUNC(MmIsAddressValid, 1),
-	IMPORT_SFUNC(MmMapIoSpace, 3 + 1),
-	IMPORT_SFUNC(MmUnmapIoSpace, 2),
-	IMPORT_SFUNC(KeInitializeSpinLock, 1),
-	IMPORT_SFUNC(IoIsWdmVersionAvailable, 2),
-	IMPORT_SFUNC(IoOpenDeviceRegistryKey, 4),
-	IMPORT_SFUNC(IoGetDeviceObjectPointer, 4),
-	IMPORT_SFUNC(IoGetDeviceProperty, 5),
-	IMPORT_SFUNC(IoAllocateWorkItem, 1),
-	IMPORT_SFUNC(IoFreeWorkItem, 1),
-	IMPORT_SFUNC(IoQueueWorkItem, 4),
-	IMPORT_SFUNC(ExQueueWorkItem, 2),
-	IMPORT_SFUNC(ntoskrnl_workitem, 2),
-	IMPORT_SFUNC(KeInitializeMutex, 2),
-	IMPORT_SFUNC(KeReleaseMutex, 2),
-	IMPORT_SFUNC(KeReadStateMutex, 1),
-	IMPORT_SFUNC(KeInitializeEvent, 3),
-	IMPORT_SFUNC(KeSetEvent, 3),
-	IMPORT_SFUNC(KeResetEvent, 1),
-	IMPORT_SFUNC(KeClearEvent, 1),
-	IMPORT_SFUNC(KeReadStateEvent, 1),
-	IMPORT_SFUNC(KeInitializeTimer, 1),
-	IMPORT_SFUNC(KeInitializeTimerEx, 2),
-	IMPORT_SFUNC(KeSetTimer, 3),
-	IMPORT_SFUNC(KeSetTimerEx, 4),
-	IMPORT_SFUNC(KeCancelTimer, 1),
-	IMPORT_SFUNC(KeReadStateTimer, 1),
-	IMPORT_SFUNC(KeInitializeDpc, 3),
-	IMPORT_SFUNC(KeInsertQueueDpc, 3),
-	IMPORT_SFUNC(KeRemoveQueueDpc, 1),
-	IMPORT_SFUNC(KeSetImportanceDpc, 2),
-	IMPORT_SFUNC(KeSetTargetProcessorDpc, 2),
-	IMPORT_SFUNC(KeFlushQueuedDpcs, 0),
-	IMPORT_SFUNC(KeGetCurrentProcessorNumber, 1),
-	IMPORT_SFUNC(ObReferenceObjectByHandle, 6),
-	IMPORT_FFUNC(ObfDereferenceObject, 1),
-	IMPORT_SFUNC(ZwClose, 1),
-	IMPORT_SFUNC(PsCreateSystemThread, 7),
-	IMPORT_SFUNC(PsTerminateSystemThread, 1),
-	IMPORT_SFUNC(IoWMIRegistrationControl, 2),
-	IMPORT_SFUNC(WmiQueryTraceInformation, 5),
-	IMPORT_CFUNC(WmiTraceMessage, 0),
-	IMPORT_SFUNC(KeQuerySystemTime, 1),
-	IMPORT_CFUNC(KeTickCount, 0),
-	IMPORT_SFUNC(KeDelayExecutionThread, 3),
-	IMPORT_SFUNC(KeQueryInterruptTime, 0),
-	IMPORT_SFUNC(KeGetCurrentThread, 0),
-	IMPORT_SFUNC(KeSetPriorityThread, 2),
-
-	/*
-	 * This last entry is a catch-all for any function we haven't
-	 * implemented yet. The PE import list patching routine will
-	 * use it for any function that doesn't have an explicit match
-	 * in this table.
-	 */
-
-	{ NULL, (FUNC)dummy, NULL, 0, WINDRV_WRAP_STDCALL },
-
-	/* End of list. */
-	{ NULL, NULL, NULL }
-};
diff --git a/sys/compat/ndis/subr_pe.c b/sys/compat/ndis/subr_pe.c
deleted file mode 100644
index 1cd698fdd51c..000000000000
--- a/sys/compat/ndis/subr_pe.c
+++ /dev/null
@@ -1,644 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
- * Copyright (c) 2003
- *	Bill Paul <wpaul@windriver.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-/*
- * This file contains routines for relocating and dynamically linking
- * executable object code files in the Windows(r) PE (Portable Executable)
- * format. In Windows, anything with a .EXE, .DLL or .SYS extension is
- * considered an executable, and all such files have some structures in
- * common. The PE format was apparently based largely on COFF but has
- * mutated significantly over time. We are mainly concerned with .SYS files,
- * so this module implements only enough routines to be able to parse the
- * headers and sections of a .SYS object file and perform the necessary
- * relocations and jump table patching to allow us to call into it
- * (and to have it call back to us). Note that while this module
- * can handle fixups for imported symbols, it knows nothing about
- * exporting them.
- */
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/errno.h>
-#ifdef _KERNEL
-#include <sys/systm.h>
-#else
-#include <stdio.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#endif
-
-#include <compat/ndis/pe_var.h>
-
-static vm_offset_t pe_functbl_match(image_patch_table *, char *);
-
-/*
- * Check for an MS-DOS executable header. All Windows binaries
- * have a small MS-DOS executable prepended to them to print out
- * the "This program requires Windows" message. Even .SYS files
- * have this header, in spite of the fact that you're can't actually
- * run them directly.
- */
-
-int
-pe_get_dos_header(imgbase, hdr)
-	vm_offset_t		imgbase;
-	image_dos_header	*hdr;
-{
-	uint16_t		signature;
-
-	if (imgbase == 0 || hdr == NULL)
-		return (EINVAL);
-
-	signature = *(uint16_t *)imgbase;
-	if (signature != IMAGE_DOS_SIGNATURE)
-		return (ENOEXEC);
-
-	bcopy ((char *)imgbase, (char *)hdr, sizeof(image_dos_header));
-
-	return (0);
-}
-
-/*
- * Verify that this image has a Windows NT PE signature.
- */
-
-int
-pe_is_nt_image(imgbase)
-	vm_offset_t		imgbase;
-{
-	uint32_t		signature;
-	image_dos_header	*dos_hdr;
-
-	if (imgbase == 0)
-		return (EINVAL);
-
-	signature = *(uint16_t *)imgbase;
-	if (signature == IMAGE_DOS_SIGNATURE) {
-		dos_hdr = (image_dos_header *)imgbase;
-		signature = *(uint32_t *)(imgbase + dos_hdr->idh_lfanew);
-		if (signature == IMAGE_NT_SIGNATURE)
-			return (0);
-	}
-
-	return (ENOEXEC);
-}
-
-/*
- * Return a copy of the optional header. This contains the
- * executable entry point and the directory listing which we
- * need to find the relocations and imports later.
- */
-
-int
-pe_get_optional_header(imgbase, hdr)
-	vm_offset_t		imgbase;
-	image_optional_header	*hdr;
-{
-	image_dos_header	*dos_hdr;
-	image_nt_header		*nt_hdr;
-
-	if (imgbase == 0 || hdr == NULL)
-		return (EINVAL);
-
-	if (pe_is_nt_image(imgbase))
-		return (EINVAL);
-
-	dos_hdr = (image_dos_header *)(imgbase);
-	nt_hdr = (image_nt_header *)(imgbase + dos_hdr->idh_lfanew);
-
-	bcopy ((char *)&nt_hdr->inh_optionalhdr, (char *)hdr,
-	    nt_hdr->inh_filehdr.ifh_optionalhdrlen);
-
-	return (0);
-}
-
-/*
- * Return a copy of the file header. Contains the number of
- * sections in this image.
- */
-
-int
-pe_get_file_header(imgbase, hdr)
-	vm_offset_t		imgbase;
-	image_file_header	*hdr;
-{
-	image_dos_header	*dos_hdr;
-	image_nt_header		*nt_hdr;
-
-	if (imgbase == 0 || hdr == NULL)
-		return (EINVAL);
-
-	if (pe_is_nt_image(imgbase))
-		return (EINVAL);
-
-	dos_hdr = (image_dos_header *)imgbase;
-	nt_hdr = (image_nt_header *)(imgbase + dos_hdr->idh_lfanew);
-
-	/*
-	 * Note: the size of the nt_header is variable since it
-	 * can contain optional fields, as indicated by ifh_optionalhdrlen.
-	 * However it happens we're only interested in fields in the
-	 * non-variant portion of the nt_header structure, so we don't
-	 * bother copying the optional parts here.
-	 */
-
-	bcopy ((char *)&nt_hdr->inh_filehdr, (char *)hdr,
-	    sizeof(image_file_header));
-
-	return (0);
-}
-
-/*
- * Return the header of the first section in this image (usually
- * .text).
- */
-
-int
-pe_get_section_header(imgbase, hdr)
-	vm_offset_t		imgbase;
-	image_section_header	*hdr;
-{
-	image_dos_header	*dos_hdr;
-	image_nt_header		*nt_hdr;
-	image_section_header	*sect_hdr;
-
-	if (imgbase == 0 || hdr == NULL)
-		return (EINVAL);
-
-	if (pe_is_nt_image(imgbase))
-		return (EINVAL);
-
-	dos_hdr = (image_dos_header *)imgbase;
-	nt_hdr = (image_nt_header *)(imgbase + dos_hdr->idh_lfanew);
-	sect_hdr = IMAGE_FIRST_SECTION(nt_hdr);
-
-	bcopy ((char *)sect_hdr, (char *)hdr, sizeof(image_section_header));
-
-	return (0);
-}
-
-/*
- * Return the number of sections in this executable, or 0 on error.
- */
-
-int
-pe_numsections(imgbase)
-	vm_offset_t		imgbase;
-{
-	image_file_header	file_hdr;
-
-	if (pe_get_file_header(imgbase, &file_hdr))
-		return (0);
-
-	return (file_hdr.ifh_numsections);
-}
-
-/*
- * Return the base address that this image was linked for.
- * This helps us calculate relocation addresses later.
- */
-
-vm_offset_t
-pe_imagebase(imgbase)
-	vm_offset_t		imgbase;
-{
-	image_optional_header	optional_hdr;
-
-	if (pe_get_optional_header(imgbase, &optional_hdr))
-		return (0);
-
-	return (optional_hdr.ioh_imagebase);
-}
-
-/*
- * Return the offset of a given directory structure within the
- * image. Directories reside within sections.
- */
-
-vm_offset_t
-pe_directory_offset(imgbase, diridx)
-	vm_offset_t		imgbase;
-	uint32_t		diridx;
-{
-	image_optional_header	opt_hdr;
-	vm_offset_t		dir;
-
-	if (pe_get_optional_header(imgbase, &opt_hdr))
-		return (0);
-
-	if (diridx >= opt_hdr.ioh_rva_size_cnt)
-		return (0);
-
-	dir = opt_hdr.ioh_datadir[diridx].idd_vaddr;
-
-	return (pe_translate_addr(imgbase, dir));
-}
-
-vm_offset_t
-pe_translate_addr(imgbase, rva)
-	vm_offset_t		imgbase;
-	vm_offset_t		rva;
-{
-	image_optional_header	opt_hdr;
-	image_section_header	*sect_hdr;
-	image_dos_header	*dos_hdr;
-	image_nt_header		*nt_hdr;
-	int			i = 0, sections, fixedlen;
-
-	if (pe_get_optional_header(imgbase, &opt_hdr))
-		return (0);
-
-	sections = pe_numsections(imgbase);
-
-	dos_hdr = (image_dos_header *)imgbase;
-	nt_hdr = (image_nt_header *)(imgbase + dos_hdr->idh_lfanew);
-	sect_hdr = IMAGE_FIRST_SECTION(nt_hdr);
-
-	/*
-	 * The test here is to see if the RVA falls somewhere
-	 * inside the section, based on the section's start RVA
-	 * and its length. However it seems sometimes the
-	 * virtual length isn't enough to cover the entire
-	 * area of the section. We fudge by taking into account
-	 * the section alignment and rounding the section length
-	 * up to a page boundary.
-	 */
-	while (i++ < sections) {
-		fixedlen = sect_hdr->ish_misc.ish_vsize;
-		fixedlen += ((opt_hdr.ioh_sectalign - 1) -
-		    sect_hdr->ish_misc.ish_vsize) &
-		    (opt_hdr.ioh_sectalign - 1);
-		if (sect_hdr->ish_vaddr <= (uint32_t)rva &&
-		    (sect_hdr->ish_vaddr + fixedlen) >
-		    (uint32_t)rva)
-			break;
-		sect_hdr++;
-	}
-
-	if (i > sections)
-		return (0);
-
-	return ((vm_offset_t)(imgbase + rva - sect_hdr->ish_vaddr +
-	    sect_hdr->ish_rawdataaddr));
-}
-
-/*
- * Get the section header for a particular section. Note that
- * section names can be anything, but there are some standard
- * ones (.text, .data, .rdata, .reloc).
- */
-
-int
-pe_get_section(imgbase, hdr, name)
-	vm_offset_t		imgbase;
-	image_section_header	*hdr;
-	const char		*name;
-{
-	image_dos_header	*dos_hdr;
-	image_nt_header		*nt_hdr;
-	image_section_header	*sect_hdr;
-
-	int			i, sections;
-
-	if (imgbase == 0 || hdr == NULL)
-		return (EINVAL);
-
-	if (pe_is_nt_image(imgbase))
-		return (EINVAL);
-
-	sections = pe_numsections(imgbase);
-
-	dos_hdr = (image_dos_header *)imgbase;
-	nt_hdr = (image_nt_header *)(imgbase + dos_hdr->idh_lfanew);
-	sect_hdr = IMAGE_FIRST_SECTION(nt_hdr);
-
-	for (i = 0; i < sections; i++) {
-		if (!strcmp ((char *)&sect_hdr->ish_name, name)) {
-			bcopy((char *)sect_hdr, (char *)hdr,
-			    sizeof(image_section_header));
-			return (0);
-		} else
-			sect_hdr++;
-	}
-
-	return (ENOEXEC);
-}
-
-/*
- * Apply the base relocations to this image. The relocation table
- * resides within the .reloc section. Relocations are specified in
- * blocks which refer to a particular page. We apply the relocations
- * one page block at a time.
- */
-
-int
-pe_relocate(imgbase)
-	vm_offset_t		imgbase;
-{
-	image_section_header	sect;
-	image_base_reloc	*relhdr;
-	uint16_t		rel, *sloc;
-	vm_offset_t		base;
-	vm_size_t		delta;
-	uint32_t		*lloc;
-	uint64_t		*qloc;
-	int			i, count;
-	vm_offset_t		txt;
-
-	base = pe_imagebase(imgbase);
-	pe_get_section(imgbase, &sect, ".text");
-	txt = pe_translate_addr(imgbase, sect.ish_vaddr);
-	delta = (uint32_t)(txt) - base - sect.ish_vaddr;
-
-	pe_get_section(imgbase, &sect, ".reloc");
-
-	relhdr = (image_base_reloc *)(imgbase + sect.ish_rawdataaddr);
-
-	do {
-		count = (relhdr->ibr_blocksize -
-		    (sizeof(uint32_t) * 2)) / sizeof(uint16_t);
-		for (i = 0; i < count; i++) {
-			rel = relhdr->ibr_rel[i];
-			switch (IMR_RELTYPE(rel)) {
-			case IMAGE_REL_BASED_ABSOLUTE:
-				break;
-			case IMAGE_REL_BASED_HIGHLOW:
-				lloc = (uint32_t *)pe_translate_addr(imgbase,
-				    relhdr->ibr_vaddr + IMR_RELOFFSET(rel));
-				*lloc = pe_translate_addr(imgbase,
-				    (*lloc - base));
-				break;
-			case IMAGE_REL_BASED_HIGH:
-				sloc = (uint16_t *)pe_translate_addr(imgbase,
-				    relhdr->ibr_vaddr + IMR_RELOFFSET(rel));
-				*sloc += (delta & 0xFFFF0000) >> 16;
-				break;
-			case IMAGE_REL_BASED_LOW:
-				sloc = (uint16_t *)pe_translate_addr(imgbase,
-				    relhdr->ibr_vaddr + IMR_RELOFFSET(rel));
-				*sloc += (delta & 0xFFFF);
-				break;
-			case IMAGE_REL_BASED_DIR64:
-				qloc = (uint64_t *)pe_translate_addr(imgbase,
-				    relhdr->ibr_vaddr + IMR_RELOFFSET(rel));
-				*qloc = pe_translate_addr(imgbase,
-				    (*qloc - base));
-				break;
-
-			default:
-				printf("[%d]reloc type: %d\n",i,
-				    IMR_RELTYPE(rel));
-				break;
-			}
-		}
-		relhdr = (image_base_reloc *)((vm_offset_t)relhdr +
-		    relhdr->ibr_blocksize);
-	} while (relhdr->ibr_blocksize);
-
-	return (0);
-}
-
-/*
- * Return the import descriptor for a particular module. An image
- * may be linked against several modules, typically HAL.dll, ntoskrnl.exe
- * and NDIS.SYS. For each module, there is a list of imported function
- * names and their addresses.
- *
- * Note: module names are case insensitive!
- */
-
-int
-pe_get_import_descriptor(imgbase, desc, module)
-	vm_offset_t		imgbase;
-	image_import_descriptor	*desc;
-	char			*module;
-{
-	vm_offset_t		offset;
-	image_import_descriptor	*imp_desc;
-	char			*modname;
-
-	if (imgbase == 0 || module == NULL || desc == NULL)
-		return (EINVAL);
-
-	offset = pe_directory_offset(imgbase, IMAGE_DIRECTORY_ENTRY_IMPORT);
-	if (offset == 0)
-		return (ENOENT);
-
-	imp_desc = (void *)offset;
-
-	while (imp_desc->iid_nameaddr) {
-		modname = (char *)pe_translate_addr(imgbase,
-		    imp_desc->iid_nameaddr);
-		if (!strncasecmp(module, modname, strlen(module))) {
-			bcopy((char *)imp_desc, (char *)desc,
-			    sizeof(image_import_descriptor));
-			return (0);
-		}
-		imp_desc++;
-	}
-
-	return (ENOENT);
-}
-
-int
-pe_get_messagetable(imgbase, md)
-	vm_offset_t		imgbase;
-	message_resource_data	**md;
-{
-	image_resource_directory	*rdir, *rtype;
-	image_resource_directory_entry	*dent, *dent2;
-	image_resource_data_entry	*rent;
-	vm_offset_t		offset;
-	int			i;
-
-	if (imgbase == 0)
-		return (EINVAL);
-
-	offset = pe_directory_offset(imgbase, IMAGE_DIRECTORY_ENTRY_RESOURCE);
-	if (offset == 0)
-		return (ENOENT);
-
-	rdir = (image_resource_directory *)offset;
-
-	dent = (image_resource_directory_entry *)(offset +
-	    sizeof(image_resource_directory));
-
-	for (i = 0; i < rdir->ird_id_entries; i++){
-		if (dent->irde_name != RT_MESSAGETABLE)	{
-			dent++;
-			continue;
-		}
-		dent2 = dent;
-		while (dent2->irde_dataoff & RESOURCE_DIR_FLAG) {
-			rtype = (image_resource_directory *)(offset +
-			    (dent2->irde_dataoff & ~RESOURCE_DIR_FLAG));
-			dent2 = (image_resource_directory_entry *)
-			    ((uintptr_t)rtype +
-			     sizeof(image_resource_directory));
-		}
-		rent = (image_resource_data_entry *)(offset +
-		    dent2->irde_dataoff);
-		*md = (message_resource_data *)pe_translate_addr(imgbase,
-		    rent->irde_offset);
-		return (0);
-	}
-
-	return (ENOENT);
-}
-
-int
-pe_get_message(imgbase, id, str, len, flags)
-	vm_offset_t		imgbase;
-	uint32_t		id;
-	char			**str;
-	int			*len;
-	uint16_t		*flags;
-{
-	message_resource_data	*md = NULL;
-	message_resource_block	*mb;
-	message_resource_entry	*me;
-	uint32_t		i;
-
-	pe_get_messagetable(imgbase, &md);
-
-	if (md == NULL)
-		return (ENOENT);
-
-	mb = (message_resource_block *)((uintptr_t)md +
-	    sizeof(message_resource_data));
-
-	for (i = 0; i < md->mrd_numblocks; i++) {
-		if (id >= mb->mrb_lowid && id <= mb->mrb_highid) {
-			me = (message_resource_entry *)((uintptr_t)md +
-			    mb->mrb_entryoff);
-			for (i = id - mb->mrb_lowid; i > 0; i--)
-				me = (message_resource_entry *)((uintptr_t)me +
-				    me->mre_len);
-			*str = me->mre_text;
-			*len = me->mre_len;
-			*flags = me->mre_flags;
-			return (0);
-		}
-		mb++;
-	}
-
-	return (ENOENT);
-}
-
-/*
- * Find the function that matches a particular name. This doesn't
- * need to be particularly speedy since it's only run when loading
- * a module for the first time.
- */
-
-static vm_offset_t
-pe_functbl_match(functbl, name)
-	image_patch_table	*functbl;
-	char			*name;
-{
-	image_patch_table	*p;
-
-	if (functbl == NULL || name == NULL)
-		return (0);
-
-	p = functbl;
-
-	while (p->ipt_name != NULL) {
-		if (!strcmp(p->ipt_name, name))
-			return ((vm_offset_t)p->ipt_wrap);
-		p++;
-	}
-	printf("no match for %s\n", name);
-
-	/*
-	 * Return the wrapper pointer for this routine.
-	 * For x86, this is the same as the funcptr.
-	 * For amd64, this points to a wrapper routine
-	 * that does calling convention translation and
-	 * then invokes the underlying routine.
-	 */
-	return ((vm_offset_t)p->ipt_wrap);
-}
-
-/*
- * Patch the imported function addresses for a given module.
- * The caller must specify the module name and provide a table
- * of function pointers that will be patched into the jump table.
- * Note that there are actually two copies of the jump table: one
- * copy is left alone. In a .SYS file, the jump tables are usually
- * merged into the INIT segment.
- */
-
-int
-pe_patch_imports(imgbase, module, functbl)
-	vm_offset_t		imgbase;
-	char			*module;
-	image_patch_table	*functbl;
-{
-	image_import_descriptor	imp_desc;
-	char			*fname;
-	vm_offset_t		*nptr, *fptr;
-	vm_offset_t		func;
-
-	if (imgbase == 0 || module == NULL || functbl == NULL)
-		return (EINVAL);
-
-	if (pe_get_import_descriptor(imgbase, &imp_desc, module))
-		return (ENOEXEC);
-
-	nptr = (vm_offset_t *)pe_translate_addr(imgbase,
-	    imp_desc.iid_import_name_table_addr);
-	fptr = (vm_offset_t *)pe_translate_addr(imgbase,
-	    imp_desc.iid_import_address_table_addr);
-
-	while (nptr != NULL && pe_translate_addr(imgbase, *nptr)) {
-		fname = (char *)pe_translate_addr(imgbase, (*nptr) + 2);
-		func = pe_functbl_match(functbl, fname);
-		if (func)
-			*fptr = func;
-#ifdef notdef
-		if (*fptr == 0)
-			return (ENOENT);
-#endif
-		nptr++;
-		fptr++;
-	}
-
-	return (0);
-}
diff --git a/sys/compat/ndis/subr_usbd.c b/sys/compat/ndis/subr_usbd.c
deleted file mode 100644
index 114a2640ea7e..000000000000
--- a/sys/compat/ndis/subr_usbd.c
+++ /dev/null
@@ -1,1461 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
- * Copyright (c) 2005
- *      Bill Paul <wpaul@windriver.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/unistd.h>
-#include <sys/types.h>
-
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/sx.h>
-#include <sys/condvar.h>
-#include <sys/module.h>
-#include <sys/conf.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <machine/bus.h>
-#include <sys/bus.h>
-
-#include <sys/queue.h>
-
-#include <net/if.h>
-#include <net/if_var.h>
-#include <net/if_media.h>
-#include <net/ethernet.h>
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_ioctl.h>
-
-#include <dev/usb/usb.h>
-#include <dev/usb/usbdi.h>
-#include <dev/usb/usbdi_util.h>
-#include <dev/usb/usb_busdma.h>
-#include <dev/usb/usb_device.h>
-#include <dev/usb/usb_request.h>
-
-#include <compat/ndis/pe_var.h>
-#include <compat/ndis/cfg_var.h>
-#include <compat/ndis/resource_var.h>
-#include <compat/ndis/ntoskrnl_var.h>
-#include <compat/ndis/ndis_var.h>
-#include <compat/ndis/hal_var.h>
-#include <compat/ndis/usbd_var.h>
-#include <dev/if_ndis/if_ndisvar.h>
-
-static driver_object usbd_driver;
-static usb_callback_t usbd_non_isoc_callback;
-static usb_callback_t usbd_ctrl_callback;
-
-#define	USBD_CTRL_READ_PIPE		0
-#define	USBD_CTRL_WRITE_PIPE		1
-#define	USBD_CTRL_MAX_PIPE		2
-#define	USBD_CTRL_READ_BUFFER_SP	256
-#define	USBD_CTRL_WRITE_BUFFER_SP	256
-#define	USBD_CTRL_READ_BUFFER_SIZE	\
-	(sizeof(struct usb_device_request) + USBD_CTRL_READ_BUFFER_SP)
-#define	USBD_CTRL_WRITE_BUFFER_SIZE	\
-	(sizeof(struct usb_device_request) + USBD_CTRL_WRITE_BUFFER_SP)
-static struct usb_config usbd_default_epconfig[USBD_CTRL_MAX_PIPE] = {
-	[USBD_CTRL_READ_PIPE] = {
-		.type =		UE_CONTROL,
-		.endpoint =	0x00,	/* control pipe */
-		.direction =	UE_DIR_ANY,
-		.if_index =	0,
-		.bufsize =	USBD_CTRL_READ_BUFFER_SIZE,
-		.flags =	{ .short_xfer_ok = 1, },
-		.callback =	&usbd_ctrl_callback,
-		.timeout =	5000,	/* 5 seconds */
-	},
-	[USBD_CTRL_WRITE_PIPE] = {
-		.type =		UE_CONTROL,
-		.endpoint =	0x00,	/* control pipe */
-		.direction =	UE_DIR_ANY,
-		.if_index =	0,
-		.bufsize =	USBD_CTRL_WRITE_BUFFER_SIZE,
-		.flags =	{ .proxy_buffer = 1, },
-		.callback =	&usbd_ctrl_callback,
-		.timeout =	5000,	/* 5 seconds */
-	}
-};
-
-static int32_t		 usbd_func_bulkintr(irp *);
-static int32_t		 usbd_func_vendorclass(irp *);
-static int32_t		 usbd_func_selconf(irp *);
-static int32_t		 usbd_func_abort_pipe(irp *);
-static usb_error_t	 usbd_setup_endpoint(irp *, uint8_t,
-			    struct usb_endpoint_descriptor	*);
-static usb_error_t	 usbd_setup_endpoint_default(irp *, uint8_t);
-static usb_error_t	 usbd_setup_endpoint_one(irp *, uint8_t,
-			    struct ndisusb_ep *, struct usb_config *);
-static int32_t		 usbd_func_getdesc(irp *);
-static union usbd_urb	*usbd_geturb(irp *);
-static struct ndisusb_ep*usbd_get_ndisep(irp *, usb_endpoint_descriptor_t *);
-static int32_t		 usbd_iodispatch(device_object *, irp *);
-static int32_t		 usbd_ioinvalid(device_object *, irp *);
-static int32_t		 usbd_pnp(device_object *, irp *);
-static int32_t		 usbd_power(device_object *, irp *);
-static void		 usbd_irpcancel(device_object *, irp *);
-static int32_t		 usbd_submit_urb(irp *);
-static int32_t		 usbd_urb2nt(int32_t);
-static void		 usbd_task(device_object *, void *);
-static int32_t		 usbd_taskadd(irp *, unsigned);
-static void		 usbd_xfertask(device_object *, void *);
-static void		 dummy(void);
-
-static union usbd_urb	*USBD_CreateConfigurationRequestEx(
-			    usb_config_descriptor_t *,
-			    struct usbd_interface_list_entry *);
-static union usbd_urb	*USBD_CreateConfigurationRequest(
-			    usb_config_descriptor_t *,
-			    uint16_t *);
-static void		 USBD_GetUSBDIVersion(usbd_version_info *);
-static usb_interface_descriptor_t *USBD_ParseConfigurationDescriptorEx(
-			    usb_config_descriptor_t *, void *, int32_t, int32_t,
-			    int32_t, int32_t, int32_t);
-static usb_interface_descriptor_t *USBD_ParseConfigurationDescriptor(
-		    usb_config_descriptor_t *, uint8_t, uint8_t);
-
-/*
- * We need to wrap these functions because these need `context switch' from
- * Windows to UNIX before it's called.
- */
-static funcptr usbd_iodispatch_wrap;
-static funcptr usbd_ioinvalid_wrap;
-static funcptr usbd_pnp_wrap;
-static funcptr usbd_power_wrap;
-static funcptr usbd_irpcancel_wrap;
-static funcptr usbd_task_wrap;
-static funcptr usbd_xfertask_wrap;
-
-int
-usbd_libinit(void)
-{
-	image_patch_table	*patch;
-	int i;
-
-	patch = usbd_functbl;
-	while (patch->ipt_func != NULL) {
-		windrv_wrap((funcptr)patch->ipt_func,
-		    (funcptr *)&patch->ipt_wrap,
-		    patch->ipt_argcnt, patch->ipt_ftype);
-		patch++;
-	}
-
-	windrv_wrap((funcptr)usbd_ioinvalid,
-	    (funcptr *)&usbd_ioinvalid_wrap, 2, WINDRV_WRAP_STDCALL);
-	windrv_wrap((funcptr)usbd_iodispatch,
-	    (funcptr *)&usbd_iodispatch_wrap, 2, WINDRV_WRAP_STDCALL);
-	windrv_wrap((funcptr)usbd_pnp,
-	    (funcptr *)&usbd_pnp_wrap, 2, WINDRV_WRAP_STDCALL);
-	windrv_wrap((funcptr)usbd_power,
-	    (funcptr *)&usbd_power_wrap, 2, WINDRV_WRAP_STDCALL);
-	windrv_wrap((funcptr)usbd_irpcancel,
-	    (funcptr *)&usbd_irpcancel_wrap, 2, WINDRV_WRAP_STDCALL);
-	windrv_wrap((funcptr)usbd_task,
-	    (funcptr *)&usbd_task_wrap, 2, WINDRV_WRAP_STDCALL);
-	windrv_wrap((funcptr)usbd_xfertask,
-	    (funcptr *)&usbd_xfertask_wrap, 2, WINDRV_WRAP_STDCALL);
-
-	/* Create a fake USB driver instance. */
-
-	windrv_bus_attach(&usbd_driver, "USB Bus");
-
-	/* Set up our dipatch routine. */
-	for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++)
-		usbd_driver.dro_dispatch[i] =
-			(driver_dispatch)usbd_ioinvalid_wrap;
-
-	usbd_driver.dro_dispatch[IRP_MJ_INTERNAL_DEVICE_CONTROL] =
-	    (driver_dispatch)usbd_iodispatch_wrap;
-	usbd_driver.dro_dispatch[IRP_MJ_DEVICE_CONTROL] =
-	    (driver_dispatch)usbd_iodispatch_wrap;
-	usbd_driver.dro_dispatch[IRP_MJ_POWER] =
-	    (driver_dispatch)usbd_power_wrap;
-	usbd_driver.dro_dispatch[IRP_MJ_PNP] =
-	    (driver_dispatch)usbd_pnp_wrap;
-
-	return (0);
-}
-
-int
-usbd_libfini(void)
-{
-	image_patch_table	*patch;
-
-	patch = usbd_functbl;
-	while (patch->ipt_func != NULL) {
-		windrv_unwrap(patch->ipt_wrap);
-		patch++;
-	}
-
-	windrv_unwrap(usbd_ioinvalid_wrap);
-	windrv_unwrap(usbd_iodispatch_wrap);
-	windrv_unwrap(usbd_pnp_wrap);
-	windrv_unwrap(usbd_power_wrap);
-	windrv_unwrap(usbd_irpcancel_wrap);
-	windrv_unwrap(usbd_task_wrap);
-	windrv_unwrap(usbd_xfertask_wrap);
-
-	free(usbd_driver.dro_drivername.us_buf, M_DEVBUF);
-
-	return (0);
-}
-
-static int32_t
-usbd_iodispatch(device_object *dobj, irp *ip)
-{
-	device_t dev = dobj->do_devext;
-	int32_t status;
-	struct io_stack_location *irp_sl;
-
-	irp_sl = IoGetCurrentIrpStackLocation(ip);
-	switch (irp_sl->isl_parameters.isl_ioctl.isl_iocode) {
-	case IOCTL_INTERNAL_USB_SUBMIT_URB:
-		IRP_NDIS_DEV(ip) = dev;
-
-		status = usbd_submit_urb(ip);
-		break;
-	default:
-		device_printf(dev, "ioctl 0x%x isn't supported\n",
-		    irp_sl->isl_parameters.isl_ioctl.isl_iocode);
-		status = USBD_STATUS_NOT_SUPPORTED;
-		break;
-	}
-
-	if (status == USBD_STATUS_PENDING)
-		return (STATUS_PENDING);
-
-	ip->irp_iostat.isb_status = usbd_urb2nt(status);
-	if (status != USBD_STATUS_SUCCESS)
-		ip->irp_iostat.isb_info = 0;
-	return (ip->irp_iostat.isb_status);
-}
-
-static int32_t
-usbd_ioinvalid(device_object *dobj, irp *ip)
-{
-	device_t dev = dobj->do_devext;
-	struct io_stack_location *irp_sl;
-
-	irp_sl = IoGetCurrentIrpStackLocation(ip);
-	device_printf(dev, "invalid I/O dispatch %d:%d\n", irp_sl->isl_major,
-	    irp_sl->isl_minor);
-
-	ip->irp_iostat.isb_status = STATUS_FAILURE;
-	ip->irp_iostat.isb_info = 0;
-
-	IoCompleteRequest(ip, IO_NO_INCREMENT);
-
-	return (STATUS_FAILURE);
-}
-
-static int32_t
-usbd_pnp(device_object *dobj, irp *ip)
-{
-	device_t dev = dobj->do_devext;
-	struct io_stack_location *irp_sl;
-
-	irp_sl = IoGetCurrentIrpStackLocation(ip);
-	device_printf(dev, "%s: unsupported I/O dispatch %d:%d\n",
-	    __func__, irp_sl->isl_major, irp_sl->isl_minor);
-
-	ip->irp_iostat.isb_status = STATUS_FAILURE;
-	ip->irp_iostat.isb_info = 0;
-
-	IoCompleteRequest(ip, IO_NO_INCREMENT);
-
-	return (STATUS_FAILURE);
-}
-
-static int32_t
-usbd_power(device_object *dobj, irp *ip)
-{
-	device_t dev = dobj->do_devext;
-	struct io_stack_location *irp_sl;
-
-	irp_sl = IoGetCurrentIrpStackLocation(ip);
-	device_printf(dev, "%s: unsupported I/O dispatch %d:%d\n",
-	    __func__, irp_sl->isl_major, irp_sl->isl_minor);
-
-	ip->irp_iostat.isb_status = STATUS_FAILURE;
-	ip->irp_iostat.isb_info = 0;
-
-	IoCompleteRequest(ip, IO_NO_INCREMENT);
-
-	return (STATUS_FAILURE);
-}
-
-/* Convert USBD_STATUS to NTSTATUS  */
-static int32_t
-usbd_urb2nt(int32_t status)
-{
-
-	switch (status) {
-	case USBD_STATUS_SUCCESS:
-		return (STATUS_SUCCESS);
-	case USBD_STATUS_DEVICE_GONE:
-		return (STATUS_DEVICE_NOT_CONNECTED);
-	case USBD_STATUS_PENDING:
-		return (STATUS_PENDING);
-	case USBD_STATUS_NOT_SUPPORTED:
-		return (STATUS_NOT_IMPLEMENTED);
-	case USBD_STATUS_NO_MEMORY:
-		return (STATUS_NO_MEMORY);
-	case USBD_STATUS_REQUEST_FAILED:
-		return (STATUS_NOT_SUPPORTED);
-	case USBD_STATUS_CANCELED:
-		return (STATUS_CANCELLED);
-	default:
-		break;
-	}
-
-	return (STATUS_FAILURE);
-}
-
-/* Convert FreeBSD's usb_error_t to USBD_STATUS  */
-static int32_t
-usbd_usb2urb(int status)
-{
-
-	switch (status) {
-	case USB_ERR_NORMAL_COMPLETION:
-		return (USBD_STATUS_SUCCESS);
-	case USB_ERR_PENDING_REQUESTS:
-		return (USBD_STATUS_PENDING);
-	case USB_ERR_TIMEOUT:
-		return (USBD_STATUS_TIMEOUT);
-	case USB_ERR_SHORT_XFER:
-		return (USBD_STATUS_ERROR_SHORT_TRANSFER);
-	case USB_ERR_IOERROR:
-		return (USBD_STATUS_XACT_ERROR);
-	case USB_ERR_NOMEM:
-		return (USBD_STATUS_NO_MEMORY);
-	case USB_ERR_INVAL:
-		return (USBD_STATUS_REQUEST_FAILED);
-	case USB_ERR_NOT_STARTED:
-	case USB_ERR_TOO_DEEP:
-	case USB_ERR_NO_POWER:
-		return (USBD_STATUS_DEVICE_GONE);
-	case USB_ERR_CANCELLED:
-		return (USBD_STATUS_CANCELED);
-	default:
-		break;
-	}
-
-	return (USBD_STATUS_NOT_SUPPORTED);
-}
-
-static union usbd_urb *
-usbd_geturb(irp *ip)
-{
-	struct io_stack_location *irp_sl;
-
-	irp_sl = IoGetCurrentIrpStackLocation(ip);
-
-	return (irp_sl->isl_parameters.isl_others.isl_arg1);
-}
-
-static int32_t
-usbd_submit_urb(irp *ip)
-{
-	device_t dev = IRP_NDIS_DEV(ip);
-	int32_t status;
-	union usbd_urb *urb;
-
-	urb = usbd_geturb(ip);
-	/*
-	 * In a case of URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER,
-	 * USBD_URB_STATUS(urb) would be set at callback functions like
-	 * usbd_intr() or usbd_xfereof().
-	 */
-	switch (urb->uu_hdr.uuh_func) {
-	case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER:
-		status = usbd_func_bulkintr(ip);
-		if (status != USBD_STATUS_SUCCESS &&
-		    status != USBD_STATUS_PENDING)
-			USBD_URB_STATUS(urb) = status;
-		break;
-	case URB_FUNCTION_VENDOR_DEVICE:
-	case URB_FUNCTION_VENDOR_INTERFACE:
-	case URB_FUNCTION_VENDOR_ENDPOINT:
-	case URB_FUNCTION_VENDOR_OTHER:
-	case URB_FUNCTION_CLASS_DEVICE:
-	case URB_FUNCTION_CLASS_INTERFACE:
-	case URB_FUNCTION_CLASS_ENDPOINT:
-	case URB_FUNCTION_CLASS_OTHER:
-		status = usbd_func_vendorclass(ip);
-		USBD_URB_STATUS(urb) = status;
-		break;
-	case URB_FUNCTION_SELECT_CONFIGURATION:
-		status = usbd_func_selconf(ip);
-		USBD_URB_STATUS(urb) = status;
-		break;
-	case URB_FUNCTION_ABORT_PIPE:
-		status = usbd_func_abort_pipe(ip);
-		USBD_URB_STATUS(urb) = status;
-		break;
-	case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE:
-		status = usbd_func_getdesc(ip);
-		USBD_URB_STATUS(urb) = status;
-		break;
-	default:
-		device_printf(dev, "func 0x%x isn't supported\n",
-		    urb->uu_hdr.uuh_func);
-		USBD_URB_STATUS(urb) = status = USBD_STATUS_NOT_SUPPORTED;
-		break;
-	}
-
-	return (status);
-}
-
-static int32_t
-usbd_func_getdesc(irp *ip)
-{
-#define	NDISUSB_GETDESC_MAXRETRIES		3
-	device_t dev = IRP_NDIS_DEV(ip);
-	struct ndis_softc *sc = device_get_softc(dev);
-	struct usbd_urb_control_descriptor_request *ctldesc;
-	uint16_t actlen;
-	uint32_t len;
-	union usbd_urb *urb;
-	usb_config_descriptor_t *cdp;
-	usb_error_t status;
-
-	urb = usbd_geturb(ip);
-	ctldesc = &urb->uu_ctldesc;
-	if (ctldesc->ucd_desctype == UDESC_CONFIG) {
-		/*
-		 * The NDIS driver is not allowed to change the
-		 * config! There is only one choice!
-		 */
-		cdp = usbd_get_config_descriptor(sc->ndisusb_dev);
-		if (cdp == NULL) {
-			status = USB_ERR_INVAL;
-			goto exit;
-		}
-		if (cdp->bDescriptorType != UDESC_CONFIG) {
-			device_printf(dev, "bad desc %d\n",
-			    cdp->bDescriptorType);
-			status = USB_ERR_INVAL;
-			goto exit;
-		}
-		/* get minimum length */
-		len = MIN(UGETW(cdp->wTotalLength), ctldesc->ucd_trans_buflen);
-		/* copy out config descriptor */
-		memcpy(ctldesc->ucd_trans_buf, cdp, len);
-		/* set actual length */
-		actlen = len;
-		status = USB_ERR_NORMAL_COMPLETION;
-	} else {
-		NDISUSB_LOCK(sc);
-		status = usbd_req_get_desc(sc->ndisusb_dev, &sc->ndisusb_mtx,
-		    &actlen, ctldesc->ucd_trans_buf, 2,
-		    ctldesc->ucd_trans_buflen, ctldesc->ucd_langid,
-		    ctldesc->ucd_desctype, ctldesc->ucd_idx,
-		    NDISUSB_GETDESC_MAXRETRIES);
-		NDISUSB_UNLOCK(sc);
-	}
-exit:
-	if (status != USB_ERR_NORMAL_COMPLETION) {
-		ctldesc->ucd_trans_buflen = 0;
-		return usbd_usb2urb(status);
-	}
-
-	ctldesc->ucd_trans_buflen = actlen;
-	ip->irp_iostat.isb_info = actlen;
-
-	return (USBD_STATUS_SUCCESS);
-#undef NDISUSB_GETDESC_MAXRETRIES
-}
-
-static int32_t
-usbd_func_selconf(irp *ip)
-{
-	device_t dev = IRP_NDIS_DEV(ip);
-	int i, j;
-	struct ndis_softc *sc = device_get_softc(dev);
-	struct usb_device *udev = sc->ndisusb_dev;
-	struct usb_endpoint *ep = NULL;
-	struct usbd_interface_information *intf;
-	struct usbd_pipe_information *pipe;
-	struct usbd_urb_select_configuration *selconf;
-	union usbd_urb *urb;
-	usb_config_descriptor_t *conf;
-	usb_endpoint_descriptor_t *edesc;
-	usb_error_t ret;
-
-	urb = usbd_geturb(ip);
-
-	selconf = &urb->uu_selconf;
-	conf = selconf->usc_conf;
-	if (conf == NULL) {
-		device_printf(dev, "select configuration is NULL\n");
-		return usbd_usb2urb(USB_ERR_NORMAL_COMPLETION);
-	}
-
-	intf = &selconf->usc_intf;
-	for (i = 0; i < conf->bNumInterface && intf->uii_len > 0; i++) {
-		ret = usbd_set_alt_interface_index(udev,
-		    intf->uii_intfnum, intf->uii_altset);
-		if (ret != USB_ERR_NORMAL_COMPLETION && ret != USB_ERR_IN_USE) {
-			device_printf(dev,
-			    "setting alternate interface failed: %s\n",
-			    usbd_errstr(ret));
-			return usbd_usb2urb(ret);
-		}
-
-		for (j = 0; (ep = usb_endpoint_foreach(udev, ep)); j++) {
-			if (j >= intf->uii_numeps) {
-				device_printf(dev,
-				    "endpoint %d and above are ignored",
-				    intf->uii_numeps);
-				break;
-			}
-			edesc = ep->edesc;
-			pipe = &intf->uii_pipes[j];
-			pipe->upi_handle = edesc;
-			pipe->upi_epaddr = edesc->bEndpointAddress;
-			pipe->upi_maxpktsize = UGETW(edesc->wMaxPacketSize);
-			pipe->upi_type = UE_GET_XFERTYPE(edesc->bmAttributes);
-
-			ret = usbd_setup_endpoint(ip, intf->uii_intfnum, edesc);
-			if (ret != USB_ERR_NORMAL_COMPLETION)
-				return usbd_usb2urb(ret);
-
-			if (pipe->upi_type != UE_INTERRUPT)
-				continue;
-
-			/* XXX we're following linux USB's interval policy.  */
-			if (udev->speed == USB_SPEED_LOW)
-				pipe->upi_interval = edesc->bInterval + 5;
-			else if (udev->speed == USB_SPEED_FULL)
-				pipe->upi_interval = edesc->bInterval;
-			else {
-				int k0 = 0, k1 = 1;
-				do {
-					k1 = k1 * 2;
-					k0 = k0 + 1;
-				} while (k1 < edesc->bInterval);
-				pipe->upi_interval = k0;
-			}
-		}
-
-		intf = (struct usbd_interface_information *)(((char *)intf) +
-		    intf->uii_len);
-	}
-
-	return (USBD_STATUS_SUCCESS);
-}
-
-static usb_error_t
-usbd_setup_endpoint_one(irp *ip, uint8_t ifidx, struct ndisusb_ep *ne,
-    struct usb_config *epconf)
-{
-	device_t dev = IRP_NDIS_DEV(ip);
-	struct ndis_softc *sc = device_get_softc(dev);
-	struct usb_xfer *xfer;
-	usb_error_t status;
-
-	InitializeListHead(&ne->ne_active);
-	InitializeListHead(&ne->ne_pending);
-	KeInitializeSpinLock(&ne->ne_lock);
-
-	status = usbd_transfer_setup(sc->ndisusb_dev, &ifidx, ne->ne_xfer,
-	    epconf, 1, sc, &sc->ndisusb_mtx);
-	if (status != USB_ERR_NORMAL_COMPLETION) {
-		device_printf(dev, "couldn't setup xfer: %s\n",
-		    usbd_errstr(status));
-		return (status);
-	}
-	xfer = ne->ne_xfer[0];
-	usbd_xfer_set_priv(xfer, ne);
-
-	return (status);
-}
-
-static usb_error_t
-usbd_setup_endpoint_default(irp *ip, uint8_t ifidx)
-{
-	device_t dev = IRP_NDIS_DEV(ip);
-	struct ndis_softc *sc = device_get_softc(dev);
-	usb_error_t status;
-
-	if (ifidx > 0)
-		device_printf(dev, "warning: ifidx > 0 isn't supported.\n");
-
-	status = usbd_setup_endpoint_one(ip, ifidx, &sc->ndisusb_dread_ep,
-	    &usbd_default_epconfig[USBD_CTRL_READ_PIPE]);
-	if (status != USB_ERR_NORMAL_COMPLETION)
-		return (status);
-
-	status = usbd_setup_endpoint_one(ip, ifidx, &sc->ndisusb_dwrite_ep,
-	    &usbd_default_epconfig[USBD_CTRL_WRITE_PIPE]);
-	return (status);
-}
-
-static usb_error_t
-usbd_setup_endpoint(irp *ip, uint8_t ifidx,
-    struct usb_endpoint_descriptor *ep)
-{
-	device_t dev = IRP_NDIS_DEV(ip);
-	struct ndis_softc *sc = device_get_softc(dev);
-	struct ndisusb_ep *ne;
-	struct usb_config cfg;
-	struct usb_xfer *xfer;
-	usb_error_t status;
-
-	/* check for non-supported transfer types */
-	if (UE_GET_XFERTYPE(ep->bmAttributes) == UE_CONTROL ||
-	    UE_GET_XFERTYPE(ep->bmAttributes) == UE_ISOCHRONOUS) {
-		device_printf(dev, "%s: unsuppotted transfer types %#x\n",
-		    __func__, UE_GET_XFERTYPE(ep->bmAttributes));
-		return (USB_ERR_INVAL);
-	}
-
-	ne = &sc->ndisusb_ep[NDISUSB_GET_ENDPT(ep->bEndpointAddress)];
-	InitializeListHead(&ne->ne_active);
-	InitializeListHead(&ne->ne_pending);
-	KeInitializeSpinLock(&ne->ne_lock);
-	ne->ne_dirin = UE_GET_DIR(ep->bEndpointAddress) >> 7;
-
-	memset(&cfg, 0, sizeof(struct usb_config));
-	cfg.type	= UE_GET_XFERTYPE(ep->bmAttributes);
-	cfg.endpoint	= UE_GET_ADDR(ep->bEndpointAddress);
-	cfg.direction	= UE_GET_DIR(ep->bEndpointAddress);
-	cfg.callback	= &usbd_non_isoc_callback;
-	cfg.bufsize	= UGETW(ep->wMaxPacketSize);
-	cfg.flags.proxy_buffer = 1;
-	if (UE_GET_DIR(ep->bEndpointAddress) == UE_DIR_IN)
-		cfg.flags.short_xfer_ok = 1;
-
-	status = usbd_transfer_setup(sc->ndisusb_dev, &ifidx, ne->ne_xfer,
-	    &cfg, 1, sc, &sc->ndisusb_mtx);
-	if (status != USB_ERR_NORMAL_COMPLETION) {
-		device_printf(dev, "couldn't setup xfer: %s\n",
-		    usbd_errstr(status));
-		return (status);
-	}
-	xfer = ne->ne_xfer[0];
-	usbd_xfer_set_priv(xfer, ne);
-	if (UE_GET_DIR(ep->bEndpointAddress) == UE_DIR_IN)
-		usbd_xfer_set_timeout(xfer, NDISUSB_NO_TIMEOUT);
-	else {
-		if (UE_GET_XFERTYPE(ep->bmAttributes) == UE_BULK)
-			usbd_xfer_set_timeout(xfer, NDISUSB_TX_TIMEOUT);
-		else
-			usbd_xfer_set_timeout(xfer, NDISUSB_INTR_TIMEOUT);
-	}
-
-	return (status);
-}
-
-static int32_t
-usbd_func_abort_pipe(irp *ip)
-{
-	device_t dev = IRP_NDIS_DEV(ip);
-	struct ndis_softc *sc = device_get_softc(dev);
-	struct ndisusb_ep *ne;
-	union usbd_urb *urb;
-
-	urb = usbd_geturb(ip);
-	ne = usbd_get_ndisep(ip, urb->uu_pipe.upr_handle);
-	if (ne == NULL) {
-		device_printf(IRP_NDIS_DEV(ip), "get NULL endpoint info.\n");
-		return (USBD_STATUS_INVALID_PIPE_HANDLE);
-	}
-
-	NDISUSB_LOCK(sc);
-	usbd_transfer_stop(ne->ne_xfer[0]);
-	usbd_transfer_start(ne->ne_xfer[0]);
-	NDISUSB_UNLOCK(sc);
-
-	return (USBD_STATUS_SUCCESS);
-}
-
-static int32_t
-usbd_func_vendorclass(irp *ip)
-{
-	device_t dev = IRP_NDIS_DEV(ip);
-	int32_t error;
-	struct ndis_softc *sc = device_get_softc(dev);
-	struct ndisusb_ep *ne;
-	struct ndisusb_xfer *nx;
-	struct usbd_urb_vendor_or_class_request *vcreq;
-	union usbd_urb *urb;
-
-	if (!(sc->ndisusb_status & NDISUSB_STATUS_SETUP_EP)) {
-		/*
-		 * XXX In some cases the interface number isn't 0.  However
-		 * some driver (eg. RTL8187L NDIS driver) calls this function
-		 * before calling URB_FUNCTION_SELECT_CONFIGURATION.
-		 */
-		error = usbd_setup_endpoint_default(ip, 0);
-		if (error != USB_ERR_NORMAL_COMPLETION)
-			return usbd_usb2urb(error);
-		sc->ndisusb_status |= NDISUSB_STATUS_SETUP_EP;
-	}
-
-	urb = usbd_geturb(ip);
-	vcreq = &urb->uu_vcreq;
-	ne = (vcreq->uvc_trans_flags & USBD_TRANSFER_DIRECTION_IN) ?
-	    &sc->ndisusb_dread_ep : &sc->ndisusb_dwrite_ep;
-	IRP_NDISUSB_EP(ip) = ne;
-	ip->irp_cancelfunc = (cancel_func)usbd_irpcancel_wrap;
-
-	nx = malloc(sizeof(struct ndisusb_xfer), M_USBDEV, M_NOWAIT | M_ZERO);
-	if (nx == NULL) {
-		device_printf(IRP_NDIS_DEV(ip), "out of memory\n");
-		return (USBD_STATUS_NO_MEMORY);
-	}
-	nx->nx_ep = ne;
-	nx->nx_priv = ip;
-	KeAcquireSpinLockAtDpcLevel(&ne->ne_lock);
-	InsertTailList((&ne->ne_pending), (&nx->nx_next));
-	KeReleaseSpinLockFromDpcLevel(&ne->ne_lock);
-
-	/* we've done to setup xfer.  Let's transfer it.  */
-	ip->irp_iostat.isb_status = STATUS_PENDING;
-	ip->irp_iostat.isb_info = 0;
-	USBD_URB_STATUS(urb) = USBD_STATUS_PENDING;
-	IoMarkIrpPending(ip);
-
-	error = usbd_taskadd(ip, NDISUSB_TASK_VENDOR);
-	if (error != USBD_STATUS_SUCCESS)
-		return (error);
-
-	return (USBD_STATUS_PENDING);
-}
-
-static void
-usbd_irpcancel(device_object *dobj, irp *ip)
-{
-	device_t dev = IRP_NDIS_DEV(ip);
-	struct ndis_softc *sc = device_get_softc(dev);
-	struct ndisusb_ep *ne = IRP_NDISUSB_EP(ip);
-
-	if (ne == NULL) {
-		ip->irp_cancel = TRUE;
-		IoReleaseCancelSpinLock(ip->irp_cancelirql);
-		return;
-	}
-
-	/*
-	 * Make sure that the current USB transfer proxy is
-	 * cancelled and then restarted.
-	 */
-	NDISUSB_LOCK(sc);
-	usbd_transfer_stop(ne->ne_xfer[0]);
-	usbd_transfer_start(ne->ne_xfer[0]);
-	NDISUSB_UNLOCK(sc);
-
-	ip->irp_cancel = TRUE;
-	IoReleaseCancelSpinLock(ip->irp_cancelirql);
-}
-
-static void
-usbd_xfer_complete(struct ndis_softc *sc, struct ndisusb_ep *ne,
-    struct ndisusb_xfer *nx, usb_error_t status)
-{
-	struct ndisusb_xferdone *nd;
-	uint8_t irql;
-
-	nd = malloc(sizeof(struct ndisusb_xferdone), M_USBDEV,
-	    M_NOWAIT | M_ZERO);
-	if (nd == NULL) {
-		device_printf(sc->ndis_dev, "out of memory");
-		return;
-	}
-	nd->nd_xfer = nx;
-	nd->nd_status = status;
-
-	KeAcquireSpinLock(&sc->ndisusb_xferdonelock, &irql);
-	InsertTailList((&sc->ndisusb_xferdonelist), (&nd->nd_donelist));
-	KeReleaseSpinLock(&sc->ndisusb_xferdonelock, irql);
-
-	IoQueueWorkItem(sc->ndisusb_xferdoneitem,
-	    (io_workitem_func)usbd_xfertask_wrap, WORKQUEUE_CRITICAL, sc);
-}
-
-static struct ndisusb_xfer *
-usbd_aq_getfirst(struct ndis_softc *sc, struct ndisusb_ep *ne)
-{
-	struct ndisusb_xfer *nx;
-
-	KeAcquireSpinLockAtDpcLevel(&ne->ne_lock);
-	if (IsListEmpty(&ne->ne_active)) {
-		device_printf(sc->ndis_dev,
-		    "%s: the active queue can't be empty.\n", __func__);
-		KeReleaseSpinLockFromDpcLevel(&ne->ne_lock);
-		return (NULL);
-	}
-	nx = CONTAINING_RECORD(ne->ne_active.nle_flink, struct ndisusb_xfer,
-	    nx_next);
-	RemoveEntryList(&nx->nx_next);
-	KeReleaseSpinLockFromDpcLevel(&ne->ne_lock);
-
-	return (nx);
-}
-
-static void
-usbd_non_isoc_callback(struct usb_xfer *xfer, usb_error_t error)
-{
-	irp *ip;
-	struct ndis_softc *sc = usbd_xfer_softc(xfer);
-	struct ndisusb_ep *ne = usbd_xfer_get_priv(xfer);
-	struct ndisusb_xfer *nx;
-	struct usbd_urb_bulk_or_intr_transfer *ubi;
-	struct usb_page_cache *pc;
-	uint8_t irql;
-	uint32_t len;
-	union usbd_urb *urb;
-	usb_endpoint_descriptor_t *ep;
-	int actlen, sumlen;
-
-	usbd_xfer_status(xfer, &actlen, &sumlen, NULL, NULL);
-
-	switch (USB_GET_STATE(xfer)) {
-	case USB_ST_TRANSFERRED:
-		nx = usbd_aq_getfirst(sc, ne);
-		pc = usbd_xfer_get_frame(xfer, 0);
-		if (nx == NULL)
-			return;
-
-		/* copy in data with regard to the URB */
-		if (ne->ne_dirin != 0)
-			usbd_copy_out(pc, 0, nx->nx_urbbuf, actlen);
-		nx->nx_urbbuf += actlen;
-		nx->nx_urbactlen += actlen;
-		nx->nx_urblen -= actlen;
-
-		/* check for short transfer */
-		if (actlen < sumlen)
-			nx->nx_urblen = 0;
-		else {
-			/* check remainder */
-			if (nx->nx_urblen > 0) {
-				KeAcquireSpinLock(&ne->ne_lock, &irql);
-				InsertHeadList((&ne->ne_active), (&nx->nx_next));
-				KeReleaseSpinLock(&ne->ne_lock, irql);
-
-				ip = nx->nx_priv;
-				urb = usbd_geturb(ip);
-				ubi = &urb->uu_bulkintr;
-				ep = ubi->ubi_epdesc;
-				goto extra;
-			}
-		}
-		usbd_xfer_complete(sc, ne, nx,
-		    ((actlen < sumlen) && (nx->nx_shortxfer == 0)) ?
-		    USB_ERR_SHORT_XFER : USB_ERR_NORMAL_COMPLETION);
-
-		/* fall through */
-	case USB_ST_SETUP:
-next:
-		/* get next transfer */
-		KeAcquireSpinLock(&ne->ne_lock, &irql);
-		if (IsListEmpty(&ne->ne_pending)) {
-			KeReleaseSpinLock(&ne->ne_lock, irql);
-			return;
-		}
-		nx = CONTAINING_RECORD(ne->ne_pending.nle_flink,
-		    struct ndisusb_xfer, nx_next);
-		RemoveEntryList(&nx->nx_next);
-		/* add a entry to the active queue's tail.  */
-		InsertTailList((&ne->ne_active), (&nx->nx_next));
-		KeReleaseSpinLock(&ne->ne_lock, irql);
-
-		ip = nx->nx_priv;
-		urb = usbd_geturb(ip);
-		ubi = &urb->uu_bulkintr;
-		ep = ubi->ubi_epdesc;
-
-		nx->nx_urbbuf		= ubi->ubi_trans_buf;
-		nx->nx_urbactlen	= 0;
-		nx->nx_urblen		= ubi->ubi_trans_buflen;
-		nx->nx_shortxfer	= (ubi->ubi_trans_flags &
-		    USBD_SHORT_TRANSFER_OK) ? 1 : 0;
-extra:
-		len = MIN(usbd_xfer_max_len(xfer), nx->nx_urblen);
-		pc = usbd_xfer_get_frame(xfer, 0);
-		if (UE_GET_DIR(ep->bEndpointAddress) == UE_DIR_OUT)
-			usbd_copy_in(pc, 0, nx->nx_urbbuf, len);
-		usbd_xfer_set_frame_len(xfer, 0, len);
-		usbd_xfer_set_frames(xfer, 1);
-		usbd_transfer_submit(xfer);
-		break;
-	default:
-		nx = usbd_aq_getfirst(sc, ne);
-		if (nx == NULL)
-			return;
-		if (error != USB_ERR_CANCELLED) {
-			usbd_xfer_set_stall(xfer);
-			device_printf(sc->ndis_dev, "usb xfer warning (%s)\n",
-			    usbd_errstr(error));
-		}
-		usbd_xfer_complete(sc, ne, nx, error);
-		if (error != USB_ERR_CANCELLED)
-			goto next;
-		break;
-	}
-}
-
-static void
-usbd_ctrl_callback(struct usb_xfer *xfer, usb_error_t error)
-{
-	irp *ip;
-	struct ndis_softc *sc = usbd_xfer_softc(xfer);
-	struct ndisusb_ep *ne = usbd_xfer_get_priv(xfer);
-	struct ndisusb_xfer *nx;
-	uint8_t irql;
-	union usbd_urb *urb;
-	struct usbd_urb_vendor_or_class_request *vcreq;
-	struct usb_page_cache *pc;
-	uint8_t type = 0;
-	struct usb_device_request req;
-	int len;
-
-	switch (USB_GET_STATE(xfer)) {
-	case USB_ST_TRANSFERRED:
-		nx = usbd_aq_getfirst(sc, ne);
-		if (nx == NULL)
-			return;
-
-		ip = nx->nx_priv;
-		urb = usbd_geturb(ip);
-		vcreq = &urb->uu_vcreq;
-
-		if (vcreq->uvc_trans_flags & USBD_TRANSFER_DIRECTION_IN) {
-			pc = usbd_xfer_get_frame(xfer, 1);
-			len = usbd_xfer_frame_len(xfer, 1);
-			usbd_copy_out(pc, 0, vcreq->uvc_trans_buf, len);
-			nx->nx_urbactlen += len;
-		}
-
-		usbd_xfer_complete(sc, ne, nx, USB_ERR_NORMAL_COMPLETION);
-		/* fall through */
-	case USB_ST_SETUP:
-next:
-		/* get next transfer */
-		KeAcquireSpinLock(&ne->ne_lock, &irql);
-		if (IsListEmpty(&ne->ne_pending)) {
-			KeReleaseSpinLock(&ne->ne_lock, irql);
-			return;
-		}
-		nx = CONTAINING_RECORD(ne->ne_pending.nle_flink,
-		    struct ndisusb_xfer, nx_next);
-		RemoveEntryList(&nx->nx_next);
-		/* add a entry to the active queue's tail.  */
-		InsertTailList((&ne->ne_active), (&nx->nx_next));
-		KeReleaseSpinLock(&ne->ne_lock, irql);
-
-		ip = nx->nx_priv;
-		urb = usbd_geturb(ip);
-		vcreq = &urb->uu_vcreq;
-
-		switch (urb->uu_hdr.uuh_func) {
-		case URB_FUNCTION_CLASS_DEVICE:
-			type = UT_CLASS | UT_DEVICE;
-			break;
-		case URB_FUNCTION_CLASS_INTERFACE:
-			type = UT_CLASS | UT_INTERFACE;
-			break;
-		case URB_FUNCTION_CLASS_OTHER:
-			type = UT_CLASS | UT_OTHER;
-			break;
-		case URB_FUNCTION_CLASS_ENDPOINT:
-			type = UT_CLASS | UT_ENDPOINT;
-			break;
-		case URB_FUNCTION_VENDOR_DEVICE:
-			type = UT_VENDOR | UT_DEVICE;
-			break;
-		case URB_FUNCTION_VENDOR_INTERFACE:
-			type = UT_VENDOR | UT_INTERFACE;
-			break;
-		case URB_FUNCTION_VENDOR_OTHER:
-			type = UT_VENDOR | UT_OTHER;
-			break;
-		case URB_FUNCTION_VENDOR_ENDPOINT:
-			type = UT_VENDOR | UT_ENDPOINT;
-			break;
-		default:
-			/* never reached.  */
-			break;
-		}
-
-		type |= (vcreq->uvc_trans_flags & USBD_TRANSFER_DIRECTION_IN) ?
-		    UT_READ : UT_WRITE;
-		type |= vcreq->uvc_reserved1;
-
-		req.bmRequestType = type;
-		req.bRequest = vcreq->uvc_req;
-		USETW(req.wIndex, vcreq->uvc_idx);
-		USETW(req.wValue, vcreq->uvc_value);
-		USETW(req.wLength, vcreq->uvc_trans_buflen);
-
-		nx->nx_urbbuf		= vcreq->uvc_trans_buf;
-		nx->nx_urblen		= vcreq->uvc_trans_buflen;
-		nx->nx_urbactlen	= 0;
-
-		pc = usbd_xfer_get_frame(xfer, 0);
-		usbd_copy_in(pc, 0, &req, sizeof(req));
-		usbd_xfer_set_frame_len(xfer, 0, sizeof(req));
-		usbd_xfer_set_frames(xfer, 1);
-		if (vcreq->uvc_trans_flags & USBD_TRANSFER_DIRECTION_IN) {
-			if (vcreq->uvc_trans_buflen >= USBD_CTRL_READ_BUFFER_SP)
-				device_printf(sc->ndis_dev,
-				    "warning: not enough buffer space (%d).\n",
-				    vcreq->uvc_trans_buflen);
-			usbd_xfer_set_frame_len(xfer, 1,
-			    MIN(usbd_xfer_max_len(xfer),
-				    vcreq->uvc_trans_buflen));
-			usbd_xfer_set_frames(xfer, 2);
-		} else {
-			if (nx->nx_urblen > USBD_CTRL_WRITE_BUFFER_SP)
-				device_printf(sc->ndis_dev,
-				    "warning: not enough write buffer space"
-				    " (%d).\n", nx->nx_urblen);
-			/*
-			 * XXX with my local tests there was no cases to require
-			 * a extra buffer until now but it'd need to update in
-			 * the future if it needs to be.
-			 */
-			if (nx->nx_urblen > 0) {
-				pc = usbd_xfer_get_frame(xfer, 1);
-				usbd_copy_in(pc, 0, nx->nx_urbbuf,
-				    nx->nx_urblen);
-				usbd_xfer_set_frame_len(xfer, 1, nx->nx_urblen);
-				usbd_xfer_set_frames(xfer, 2);
-			}
-		}
-		usbd_transfer_submit(xfer);
-		break;
-	default:
-		nx = usbd_aq_getfirst(sc, ne);
-		if (nx == NULL)
-			return;
-		if (error != USB_ERR_CANCELLED) {
-			usbd_xfer_set_stall(xfer);
-			device_printf(sc->ndis_dev, "usb xfer warning (%s)\n",
-			    usbd_errstr(error));
-		}
-		usbd_xfer_complete(sc, ne, nx, error);
-		if (error != USB_ERR_CANCELLED)
-			goto next;
-		break;
-	}
-}
-
-static struct ndisusb_ep *
-usbd_get_ndisep(irp *ip, usb_endpoint_descriptor_t *ep)
-{
-	device_t dev = IRP_NDIS_DEV(ip);
-	struct ndis_softc *sc = device_get_softc(dev);
-	struct ndisusb_ep *ne;
-
-	ne = &sc->ndisusb_ep[NDISUSB_GET_ENDPT(ep->bEndpointAddress)];
-
-	IRP_NDISUSB_EP(ip) = ne;
-	ip->irp_cancelfunc = (cancel_func)usbd_irpcancel_wrap;
-
-	return (ne);
-}
-
-static void
-usbd_xfertask(device_object *dobj, void *arg)
-{
-	int error;
-	irp *ip;
-	device_t dev;
-	list_entry *l;
-	struct ndis_softc *sc = arg;
-	struct ndisusb_xferdone *nd;
-	struct ndisusb_xfer *nq;
-	struct usbd_urb_bulk_or_intr_transfer *ubi;
-	struct usbd_urb_vendor_or_class_request *vcreq;
-	union usbd_urb *urb;
-	usb_error_t status;
-	void *priv;
-
-	dev = sc->ndis_dev;
-
-	if (IsListEmpty(&sc->ndisusb_xferdonelist))
-		return;
-
-	KeAcquireSpinLockAtDpcLevel(&sc->ndisusb_xferdonelock);
-	l = sc->ndisusb_xferdonelist.nle_flink;
-	while (l != &sc->ndisusb_xferdonelist) {
-		nd = CONTAINING_RECORD(l, struct ndisusb_xferdone, nd_donelist);
-		nq = nd->nd_xfer;
-		priv = nq->nx_priv;
-		status = nd->nd_status;
-		error = 0;
-		ip = priv;
-		urb = usbd_geturb(ip);
-
-		ip->irp_cancelfunc = NULL;
-		IRP_NDISUSB_EP(ip) = NULL;
-
-		switch (status) {
-		case USB_ERR_NORMAL_COMPLETION:
-			if (urb->uu_hdr.uuh_func ==
-			    URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER) {
-				ubi = &urb->uu_bulkintr;
-				ubi->ubi_trans_buflen = nq->nx_urbactlen;
-			} else {
-				vcreq = &urb->uu_vcreq;
-				vcreq->uvc_trans_buflen = nq->nx_urbactlen;
-			}
-			ip->irp_iostat.isb_info = nq->nx_urbactlen;
-			ip->irp_iostat.isb_status = STATUS_SUCCESS;
-			USBD_URB_STATUS(urb) = USBD_STATUS_SUCCESS;
-			break;
-		case USB_ERR_CANCELLED:
-			ip->irp_iostat.isb_info = 0;
-			ip->irp_iostat.isb_status = STATUS_CANCELLED;
-			USBD_URB_STATUS(urb) = USBD_STATUS_CANCELED;
-			break;
-		default:
-			ip->irp_iostat.isb_info = 0;
-			USBD_URB_STATUS(urb) = usbd_usb2urb(status);
-			ip->irp_iostat.isb_status =
-			    usbd_urb2nt(USBD_URB_STATUS(urb));
-			break;
-		}
-
-		l = l->nle_flink;
-		RemoveEntryList(&nd->nd_donelist);
-		free(nq, M_USBDEV);
-		free(nd, M_USBDEV);
-		if (error)
-			continue;
-		KeReleaseSpinLockFromDpcLevel(&sc->ndisusb_xferdonelock);
-		/* NB: call after cleaning  */
-		IoCompleteRequest(ip, IO_NO_INCREMENT);
-		KeAcquireSpinLockAtDpcLevel(&sc->ndisusb_xferdonelock);
-	}
-	KeReleaseSpinLockFromDpcLevel(&sc->ndisusb_xferdonelock);
-}
-
-/*
- * this function is for mainly deferring a task to the another thread because
- * we don't want to be in the scope of HAL lock.
- */
-static int32_t
-usbd_taskadd(irp *ip, unsigned type)
-{
-	device_t dev = IRP_NDIS_DEV(ip);
-	struct ndis_softc *sc = device_get_softc(dev);
-	struct ndisusb_task *nt;
-
-	nt = malloc(sizeof(struct ndisusb_task), M_USBDEV, M_NOWAIT | M_ZERO);
-	if (nt == NULL)
-		return (USBD_STATUS_NO_MEMORY);
-	nt->nt_type = type;
-	nt->nt_ctx = ip;
-
-	KeAcquireSpinLockAtDpcLevel(&sc->ndisusb_tasklock);
-	InsertTailList((&sc->ndisusb_tasklist), (&nt->nt_tasklist));
-	KeReleaseSpinLockFromDpcLevel(&sc->ndisusb_tasklock);
-
-	IoQueueWorkItem(sc->ndisusb_taskitem,
-	    (io_workitem_func)usbd_task_wrap, WORKQUEUE_CRITICAL, sc);
-
-	return (USBD_STATUS_SUCCESS);
-}
-
-static void
-usbd_task(device_object *dobj, void *arg)
-{
-	irp *ip;
-	list_entry *l;
-	struct ndis_softc *sc = arg;
-	struct ndisusb_ep *ne;
-	struct ndisusb_task *nt;
-	union usbd_urb *urb;
-
-	if (IsListEmpty(&sc->ndisusb_tasklist))
-		return;
-
-	KeAcquireSpinLockAtDpcLevel(&sc->ndisusb_tasklock);
-	l = sc->ndisusb_tasklist.nle_flink;
-	while (l != &sc->ndisusb_tasklist) {
-		nt = CONTAINING_RECORD(l, struct ndisusb_task, nt_tasklist);
-
-		ip = nt->nt_ctx;
-		urb = usbd_geturb(ip);
-
-		KeReleaseSpinLockFromDpcLevel(&sc->ndisusb_tasklock);
-		NDISUSB_LOCK(sc);
-		switch (nt->nt_type) {
-		case NDISUSB_TASK_TSTART:
-			ne = usbd_get_ndisep(ip, urb->uu_bulkintr.ubi_epdesc);
-			if (ne == NULL)
-				goto exit;
-			usbd_transfer_start(ne->ne_xfer[0]);
-			break;
-		case NDISUSB_TASK_IRPCANCEL:
-			ne = usbd_get_ndisep(ip,
-			    (nt->nt_type == NDISUSB_TASK_IRPCANCEL) ?
-			    urb->uu_bulkintr.ubi_epdesc :
-			    urb->uu_pipe.upr_handle);
-			if (ne == NULL)
-				goto exit;
-			
-			usbd_transfer_stop(ne->ne_xfer[0]);
-			usbd_transfer_start(ne->ne_xfer[0]);
-			break;
-		case NDISUSB_TASK_VENDOR:
-			ne = (urb->uu_vcreq.uvc_trans_flags &
-			    USBD_TRANSFER_DIRECTION_IN) ?
-			    &sc->ndisusb_dread_ep : &sc->ndisusb_dwrite_ep;
-			usbd_transfer_start(ne->ne_xfer[0]);
-			break;
-		default:
-			break;
-		}
-exit:
-		NDISUSB_UNLOCK(sc);
-		KeAcquireSpinLockAtDpcLevel(&sc->ndisusb_tasklock);
-
-		l = l->nle_flink;
-		RemoveEntryList(&nt->nt_tasklist);
-		free(nt, M_USBDEV);
-	}
-	KeReleaseSpinLockFromDpcLevel(&sc->ndisusb_tasklock);
-}
-
-static int32_t
-usbd_func_bulkintr(irp *ip)
-{
-	int32_t error;
-	struct ndisusb_ep *ne;
-	struct ndisusb_xfer *nx;
-	struct usbd_urb_bulk_or_intr_transfer *ubi;
-	union usbd_urb *urb;
-	usb_endpoint_descriptor_t *ep;
-
-	urb = usbd_geturb(ip);
-	ubi = &urb->uu_bulkintr;
-	ep = ubi->ubi_epdesc;
-	if (ep == NULL)
-		return (USBD_STATUS_INVALID_PIPE_HANDLE);
-
-	ne = usbd_get_ndisep(ip, ep);
-	if (ne == NULL) {
-		device_printf(IRP_NDIS_DEV(ip), "get NULL endpoint info.\n");
-		return (USBD_STATUS_INVALID_PIPE_HANDLE);
-	}
-
-	nx = malloc(sizeof(struct ndisusb_xfer), M_USBDEV, M_NOWAIT | M_ZERO);
-	if (nx == NULL) {
-		device_printf(IRP_NDIS_DEV(ip), "out of memory\n");
-		return (USBD_STATUS_NO_MEMORY);
-	}
-	nx->nx_ep = ne;
-	nx->nx_priv = ip;
-	KeAcquireSpinLockAtDpcLevel(&ne->ne_lock);
-	InsertTailList((&ne->ne_pending), (&nx->nx_next));
-	KeReleaseSpinLockFromDpcLevel(&ne->ne_lock);
-
-	/* we've done to setup xfer.  Let's transfer it.  */
-	ip->irp_iostat.isb_status = STATUS_PENDING;
-	ip->irp_iostat.isb_info = 0;
-	USBD_URB_STATUS(urb) = USBD_STATUS_PENDING;
-	IoMarkIrpPending(ip);
-
-	error = usbd_taskadd(ip, NDISUSB_TASK_TSTART);
-	if (error != USBD_STATUS_SUCCESS)
-		return (error);
-
-	return (USBD_STATUS_PENDING);
-}
-
-static union usbd_urb *
-USBD_CreateConfigurationRequest(usb_config_descriptor_t *conf, uint16_t *len)
-{
-	struct usbd_interface_list_entry list[2];
-	union usbd_urb *urb;
-
-	bzero(list, sizeof(struct usbd_interface_list_entry) * 2);
-	list[0].uil_intfdesc = USBD_ParseConfigurationDescriptorEx(conf, conf,
-	    -1, -1, -1, -1, -1);
-	urb = USBD_CreateConfigurationRequestEx(conf, list);
-	if (urb == NULL)
-		return (NULL);
-
-	*len = urb->uu_selconf.usc_hdr.uuh_len;
-	return (urb);
-}
-
-static union usbd_urb *
-USBD_CreateConfigurationRequestEx(usb_config_descriptor_t *conf,
-    struct usbd_interface_list_entry *list)
-{
-	int i, j, size;
-	struct usbd_interface_information *intf;
-	struct usbd_pipe_information *pipe;
-	struct usbd_urb_select_configuration *selconf;
-	usb_interface_descriptor_t *desc;
-
-	for (i = 0, size = 0; i < conf->bNumInterface; i++) {
-		j = list[i].uil_intfdesc->bNumEndpoints;
-		size = size + sizeof(struct usbd_interface_information) +
-		    sizeof(struct usbd_pipe_information) * (j - 1);
-	}
-	size += sizeof(struct usbd_urb_select_configuration) -
-	    sizeof(struct usbd_interface_information);
-
-	selconf = ExAllocatePoolWithTag(NonPagedPool, size, 0);
-	if (selconf == NULL)
-		return (NULL);
-	selconf->usc_hdr.uuh_func = URB_FUNCTION_SELECT_CONFIGURATION;
-	selconf->usc_hdr.uuh_len = size;
-	selconf->usc_handle = conf;
-	selconf->usc_conf = conf;
-
-	intf = &selconf->usc_intf;
-	for (i = 0; i < conf->bNumInterface; i++) {
-		if (list[i].uil_intfdesc == NULL)
-			break;
-
-		list[i].uil_intf = intf;
-		desc = list[i].uil_intfdesc;
-
-		intf->uii_len = sizeof(struct usbd_interface_information) +
-		    (desc->bNumEndpoints - 1) *
-		    sizeof(struct usbd_pipe_information);
-		intf->uii_intfnum = desc->bInterfaceNumber;
-		intf->uii_altset = desc->bAlternateSetting;
-		intf->uii_intfclass = desc->bInterfaceClass;
-		intf->uii_intfsubclass = desc->bInterfaceSubClass;
-		intf->uii_intfproto = desc->bInterfaceProtocol;
-		intf->uii_handle = desc;
-		intf->uii_numeps = desc->bNumEndpoints;
-
-		pipe = &intf->uii_pipes[0];
-		for (j = 0; j < intf->uii_numeps; j++)
-			pipe[j].upi_maxtxsize =
-			    USBD_DEFAULT_MAXIMUM_TRANSFER_SIZE;
-
-		intf = (struct usbd_interface_information *)((char *)intf +
-		    intf->uii_len);
-	}
-
-	return ((union usbd_urb *)selconf);
-}
-
-static void
-USBD_GetUSBDIVersion(usbd_version_info *ui)
-{
-
-	/* Pretend to be Windows XP. */
-
-	ui->uvi_usbdi_vers = USBDI_VERSION;
-	ui->uvi_supported_vers = USB_VER_2_0;
-}
-
-static usb_interface_descriptor_t *
-USBD_ParseConfigurationDescriptor(usb_config_descriptor_t *conf,
-	uint8_t intfnum, uint8_t altset)
-{
-
-	return USBD_ParseConfigurationDescriptorEx(conf, conf, intfnum, altset,
-	    -1, -1, -1);
-}
-
-static usb_interface_descriptor_t *
-USBD_ParseConfigurationDescriptorEx(usb_config_descriptor_t *conf,
-    void *start, int32_t intfnum, int32_t altset, int32_t intfclass,
-    int32_t intfsubclass, int32_t intfproto)
-{
-	struct usb_descriptor *next = NULL;
-	usb_interface_descriptor_t *desc;
-
-	while ((next = usb_desc_foreach(conf, next)) != NULL) {
-		desc = (usb_interface_descriptor_t *)next;
-		if (desc->bDescriptorType != UDESC_INTERFACE)
-			continue;
-		if (!(intfnum == -1 || desc->bInterfaceNumber == intfnum))
-			continue;
-		if (!(altset == -1 || desc->bAlternateSetting == altset))
-			continue;
-		if (!(intfclass == -1 || desc->bInterfaceClass == intfclass))
-			continue;
-		if (!(intfsubclass == -1 ||
-		    desc->bInterfaceSubClass == intfsubclass))
-			continue;
-		if (!(intfproto == -1 || desc->bInterfaceProtocol == intfproto))
-			continue;
-		return (desc);
-	}
-
-	return (NULL);
-}
-
-static void
-dummy(void)
-{
-	printf("USBD dummy called\n");
-}
-
-image_patch_table usbd_functbl[] = {
-	IMPORT_SFUNC(USBD_CreateConfigurationRequest, 2),
-	IMPORT_SFUNC(USBD_CreateConfigurationRequestEx, 2),
-	IMPORT_SFUNC_MAP(_USBD_CreateConfigurationRequestEx@8,
-	    USBD_CreateConfigurationRequestEx, 2),
-	IMPORT_SFUNC(USBD_GetUSBDIVersion, 1),
-	IMPORT_SFUNC(USBD_ParseConfigurationDescriptor, 3),
-	IMPORT_SFUNC(USBD_ParseConfigurationDescriptorEx, 7),
-	IMPORT_SFUNC_MAP(_USBD_ParseConfigurationDescriptorEx@28,
-	    USBD_ParseConfigurationDescriptorEx, 7),
-
-	/*
-	 * This last entry is a catch-all for any function we haven't
-	 * implemented yet. The PE import list patching routine will
-	 * use it for any function that doesn't have an explicit match
-	 * in this table.
-	 */
-
-	{ NULL, (FUNC)dummy, NULL, 0, WINDRV_WRAP_STDCALL },
-
-	/* End of list. */
-	{ NULL, NULL, NULL }
-};
-
-MODULE_DEPEND(ndis, usb, 1, 1, 1);
diff --git a/sys/compat/ndis/usbd_var.h b/sys/compat/ndis/usbd_var.h
deleted file mode 100644
index 6566a29d52d6..000000000000
--- a/sys/compat/ndis/usbd_var.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
- * Copyright (c) 2003
- *      Bill Paul <wpaul@windriver.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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.
- *
- * $FreeBSD$
- */
-
-#ifndef _USBD_VAR_H_
-#define _USBD_VAR_H_
-
-#define	IOCTL_INTERNAL_USB_SUBMIT_URB			0x00220003
-
-#define	URB_FUNCTION_SELECT_CONFIGURATION		0x0000
-#define	URB_FUNCTION_ABORT_PIPE				0x0002
-#define	URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER		0x0009
-#define	URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE		0x000B
-#define	URB_FUNCTION_VENDOR_DEVICE			0x0017
-#define	URB_FUNCTION_VENDOR_INTERFACE			0x0018
-#define	URB_FUNCTION_VENDOR_ENDPOINT			0x0019
-#define	URB_FUNCTION_CLASS_DEVICE			0x001A
-#define	URB_FUNCTION_CLASS_INTERFACE			0x001B
-#define	URB_FUNCTION_CLASS_ENDPOINT			0x001C
-#define	URB_FUNCTION_CLASS_OTHER			0x001F
-#define	URB_FUNCTION_VENDOR_OTHER			0x0020
-
-#define	USBD_STATUS_SUCCESS				0x00000000
-#define	USBD_STATUS_CANCELED				0x00010000
-#define	USBD_STATUS_PENDING				0x40000000
-#define	USBD_STATUS_NO_MEMORY				0x80000100
-#define	USBD_STATUS_REQUEST_FAILED			0x80000500
-#define	USBD_STATUS_INVALID_PIPE_HANDLE			0x80000600
-#define	USBD_STATUS_ERROR_SHORT_TRANSFER		0x80000900
-#define	USBD_STATUS_CRC					0xC0000001
-#define	USBD_STATUS_BTSTUFF				0xC0000002
-#define	USBD_STATUS_DATA_TOGGLE_MISMATCH		0xC0000003
-#define	USBD_STATUS_STALL_PID				0xC0000004
-#define	USBD_STATUS_DEV_NOT_RESPONDING			0xC0000005
-#define	USBD_STATUS_PID_CHECK_FAILURE			0xC0000006
-#define	USBD_STATUS_UNEXPECTED_PID			0xC0000007
-#define	USBD_STATUS_DATA_OVERRUN			0xC0000008
-#define	USBD_STATUS_DATA_UNDERRUN			0xC0000009
-#define	USBD_STATUS_RESERVED1				0xC000000A
-#define	USBD_STATUS_RESERVED2				0xC000000B
-#define	USBD_STATUS_BUFFER_OVERRUN			0xC000000C
-#define	USBD_STATUS_BUFFER_UNDERRUN			0xC000000D
-#define	USBD_STATUS_NOT_ACCESSED			0xC000000F
-#define	USBD_STATUS_FIFO				0xC0000010
-#define	USBD_STATUS_XACT_ERROR				0xC0000011
-#define	USBD_STATUS_BABBLE_DETECTED			0xC0000012
-#define	USBD_STATUS_DATA_BUFFER_ERROR			0xC0000013
-#define	USBD_STATUS_NOT_SUPPORTED			0xC0000E00
-#define	USBD_STATUS_TIMEOUT				0xC0006000
-#define	USBD_STATUS_DEVICE_GONE				0xC0007000
-
-struct usbd_urb_header {
-	uint16_t		uuh_len;
-	uint16_t		uuh_func;
-	int32_t			uuh_status;
-	void			*uuh_handle;
-	uint32_t		uuh_flags;
-};
-
-enum usbd_pipe_type {
-	UsbdPipeTypeControl	= UE_CONTROL,
-	UsbdPipeTypeIsochronous	= UE_ISOCHRONOUS,
-	UsbdPipeTypeBulk	= UE_BULK,
-	UsbdPipeTypeInterrupt	= UE_INTERRUPT
-};
-
-struct usbd_pipe_information {
-	uint16_t		upi_maxpktsize;
-	uint8_t			upi_epaddr;
-	uint8_t			upi_interval;
-	enum usbd_pipe_type	upi_type;
-	usb_endpoint_descriptor_t *upi_handle;
-	uint32_t		upi_maxtxsize;
-#define	USBD_DEFAULT_MAXIMUM_TRANSFER_SIZE		PAGE_SIZE
-	uint32_t		upi_flags;
-};
-
-struct usbd_interface_information {
-	uint16_t		uii_len;
-	uint8_t			uii_intfnum;
-	uint8_t			uii_altset;
-	uint8_t			uii_intfclass;
-	uint8_t			uii_intfsubclass;
-	uint8_t			uii_intfproto;
-	uint8_t			uii_reserved;
-	void			*uii_handle;
-	uint32_t		uii_numeps;
-	struct usbd_pipe_information uii_pipes[1];
-};
-
-struct usbd_urb_select_interface {
-	struct usbd_urb_header	usi_hdr;
-	void			*usi_handle;
-	struct usbd_interface_information uusi_intf;
-};
-
-struct usbd_urb_select_configuration {
-	struct usbd_urb_header	usc_hdr;
-	usb_config_descriptor_t *usc_conf;
-	void			*usc_handle;
-	struct usbd_interface_information usc_intf;
-};
-
-struct usbd_urb_pipe_request {
-	struct usbd_urb_header		upr_hdr;
-	usb_endpoint_descriptor_t	*upr_handle;
-};
-
-struct usbd_hcd_area {
-	void			*reserved8[8];
-};
-
-struct usbd_urb_bulk_or_intr_transfer {
-	struct usbd_urb_header	ubi_hdr;
-	usb_endpoint_descriptor_t *ubi_epdesc;
-	uint32_t		ubi_trans_flags;
-#define	USBD_SHORT_TRANSFER_OK		0x00000002
-	uint32_t		ubi_trans_buflen;
-	void			*ubi_trans_buf;
-	struct mdl		*ubi_mdl;
-	union usbd_urb		*ubi_urblink;
-	struct usbd_hcd_area	ubi_hca;
-};
-
-struct usbd_urb_control_descriptor_request {
-	struct usbd_urb_header	ucd_hdr;
-	void			*ucd_reserved0;
-	uint32_t		ucd_reserved1;
-	uint32_t		ucd_trans_buflen;
-	void			*ucd_trans_buf;
-	struct mdl		*ucd_mdl;
-	union nt_urb		*ucd_urblink;
-	struct usbd_hcd_area	ucd_hca;
-	uint16_t		ucd_reserved2;
-	uint8_t			ucd_idx;
-	uint8_t			ucd_desctype;
-	uint16_t		ucd_langid;
-	uint16_t		ucd_reserved3;
-};
-
-struct usbd_urb_vendor_or_class_request {
-	struct usbd_urb_header	uvc_hdr;
-	void			*uvc_reserved0;
-	uint32_t		uvc_trans_flags;
-#define	USBD_TRANSFER_DIRECTION_IN	1
-	uint32_t		uvc_trans_buflen;
-	void			*uvc_trans_buf;
-	struct mdl		*uvc_mdl;
-	union nt_urb		*uvc_urblink;
-	struct usbd_hcd_area	uvc_hca;
-	uint8_t			uvc_reserved1;
-	uint8_t			uvc_req;
-	uint16_t		uvc_value;
-	uint16_t		uvc_idx;
-	uint16_t		uvc_reserved2;
-};
-
-struct usbd_interface_list_entry {
-	usb_interface_descriptor_t		*uil_intfdesc;
-	struct usbd_interface_information	*uil_intf;
-};
-
-union usbd_urb {
-	struct usbd_urb_header			uu_hdr;
-	struct usbd_urb_select_configuration	uu_selconf;
-	struct usbd_urb_bulk_or_intr_transfer	uu_bulkintr;
-	struct usbd_urb_control_descriptor_request	uu_ctldesc;
-	struct usbd_urb_vendor_or_class_request	uu_vcreq;
-	struct usbd_urb_pipe_request		uu_pipe;
-};
-
-#define	USBD_URB_STATUS(urb)	((urb)->uu_hdr.uuh_status)
-
-#define	USBDI_VERSION		0x00000500
-#define	USB_VER_1_1		0x00000110
-#define	USB_VER_2_0		0x00000200
-
-struct usbd_version_info {
-	uint32_t		uvi_usbdi_vers;
-	uint32_t		uvi_supported_vers;
-};
-
-typedef struct usbd_version_info usbd_version_info;
-
-extern image_patch_table usbd_functbl[];
-
-__BEGIN_DECLS
-extern int usbd_libinit(void);
-extern int usbd_libfini(void);
-__END_DECLS
-
-#endif /* _USBD_VAR_H_ */
diff --git a/sys/compat/ndis/winx32_wrap.S b/sys/compat/ndis/winx32_wrap.S
deleted file mode 100644
index c051504afb29..000000000000
--- a/sys/compat/ndis/winx32_wrap.S
+++ /dev/null
@@ -1,385 +0,0 @@
-/*-
- * Copyright (c) 2005
- *      Bill Paul <wpaul@windriver.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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.
- *
- * $FreeBSD$
- */
-
-/* The 'ret' macro doesn't work in this file if GPROF is enabled. */
-#ifdef GPROF
-#undef GPROF
-#endif
-
-#include <machine/asmacros.h>
-
-/*
- * This file contains assembly language wrappers for the different
- * calling conventions supported by Windows on the i386 architecture.
- * In FreeBSD, the whole OS typically use same C calling convention
- * everywhere, namely _cdecl. Windows, on the other hand, uses several
- * different C calling conventions depending on the circumstances:
- *
- * _stdcall: Used for most ordinary Windows APIs. With _stdcall,
- * arguments are passed on the stack, and the callee unwinds the stack
- * before returning control to the caller. Not suitable for variadic
- * functions.
- *
- * _fastcall: Used for some APIs that may be invoked frequently and
- * where speed is a critical factor (e.g. KeAcquireSpinLock() and
- * KeReleaseSpinLock()) Similar to _stdcall, except the first 2 32-bit
- * or smaller arguments are passed in the %ecx and %edx registers
- * instead of on the stack. Not suitable for variadic functions.
- *
- * _cdecl: Used for standard C library routines and for variadic
- * functions.
- *
- * _regparm(3): Used for certain assembly routines. All arguments
- * passed in %eax, %ecx and %edx.
- *
- * Furthermore, there is an additional wrinkle that's not obvious
- * with all code: Microsoft supports the use of exceptions in C
- * (__try/__except) both in user _and_ kernel mode. Sadly, Windows
- * structured exception handling uses machine-specific features
- * that conflict rather badly with FreeBSD. (See utility routines
- * at the end of this module for more details.)
- *
- * We want to support these calling conventions in as portable a manner
- * as possible. The trick is doing it not only with different versions
- * of GNU C, but with compilers other than GNU C (e.g. the Solaris
- * SunOne C compiler). The only sure fire method is with assembly
- * language trampoline code which both fixes up the argument passing,
- * stack unwinding and exception/thread context all at once.
- *
- * You'll notice that we call the thunk/unthunk routines in the
- * *_wrap() functions in an awkward way. Rather than branching
- * directly to the address, we load the address into a register
- * first as a literal value, then we branch to it. This is done
- * to insure that the assembler doesn't translate the branch into
- * a relative branch. We use the *_wrap() routines here as templates
- * and create the actual trampolines at run time, at which point
- * we only know the absolute addresses of the thunk and unthunk
- * routines. So we need to make sure the templates have enough
- * room in them for the full address.
- *
- * Also note that when we call the a thunk/unthunk routine after
- * invoking a wrapped function, we have to make sure to preserve
- * the value returned from that function. Most functions return
- * a 32-bit value in %eax, however some routines return 64-bit
- * values, which span both %eax and %edx. Consequently, we have
- * to preserve both registers.
- */
-
-/*
- * Handle _stdcall going from Windows to UNIX.
- * This is frustrating, because to do it right you have to
- * know how many arguments the called function takes, and there's
- * no way to figure this out on the fly: you just have to be told
- * ahead of time. We assume there will be 16 arguments. I don't
- * think there are any Windows APIs that require this many.
- */
- 
-	.globl x86_stdcall_wrap_call
-	.globl x86_stdcall_wrap_arg
-	.globl x86_stdcall_wrap_end
-
-ENTRY(x86_stdcall_wrap)
-	push	%esi
-	push	%edi
-	sub	$64,%esp
-	mov	%esp,%esi
-	add	$64+8+4,%esi
-	mov	%esp,%edi
-	mov	$16,%ecx	# handle up to 16 args
-	rep
-	movsl
-
-	movl	$ctxsw_wtou, %eax
-	call	*%eax           # unthunk
-
-x86_stdcall_wrap_call:
-        movl    $0,%eax
-	call	*%eax		# jump to routine
-	push	%eax		# preserve return val
-	push	%edx
-
-	movl	$ctxsw_utow, %eax
-	call	*%eax		# thunk
-
-	pop	%edx
-	pop	%eax		# restore return val
-
-	add	$64,%esp	# clean the stack
-	pop	%edi
-	pop	%esi
-x86_stdcall_wrap_arg:
-	ret	$0xFF
-x86_stdcall_wrap_end:
-
-
-/*
- * Handle _stdcall going from UNIX to Windows. This routine
- * expects to be passed the function to be called, number of
- * args and the arguments for the Windows function on the stack.
- */
-
-ENTRY(x86_stdcall_call)
-	push	%esi		# must preserve %esi
-	push	%edi		# and %edi
-
-	mov	16(%esp),%eax	# get arg cnt
-	mov	%eax,%ecx	# save as copy count
-	mov	%esp,%esi	# Set source address register to point to
-	add	$20,%esi	# first agument to be forwarded.
-	shl	$2,%eax		# turn arg cnt into offset
-	sub	%eax,%esp	# shift stack to new location 
-	mov	%esp,%edi	# store dest copy addr
-	rep			# do the copy
-	movsl
-
-	call	ctxsw_utow	# thunk
-
-	call	*12(%edi)	# branch to stdcall routine
-	push	%eax		# preserve return val
-	push	%edx
-
-	call	ctxsw_wtou	# unthunk
-
-	pop	%edx
-	pop	%eax		# restore return val
-	mov	%edi,%esp	# restore stack
-	pop	%edi		# restore %edi
-	pop	%esi		# and %esi
-	ret
-
-/*
- * Fastcall support. Similar to _stdcall, except the first
- * two arguments are passed in %ecx and %edx. It happens we
- * only support a small number of _fastcall APIs, none of them
- * take more than three arguments. So to keep the code size
- * and complexity down, we only handle 3 arguments here.
- */
-
-/* Call _fastcall function going from Windows to UNIX. */
-
-	.globl x86_fastcall_wrap_call
-	.globl x86_fastcall_wrap_arg
-	.globl x86_fastcall_wrap_end
-
-ENTRY(x86_fastcall_wrap)
-	mov	4(%esp),%eax
-	push	%eax
-	push	%edx
-	push	%ecx
-
-	movl	$ctxsw_wtou, %eax
-	call	*%eax		# unthunk
-
-x86_fastcall_wrap_call:
-	mov	$0,%eax
-	call	*%eax		# branch to fastcall routine
-	push	%eax		# preserve return val
-	push	%edx
-
-	movl	$ctxsw_utow, %eax
-	call	*%eax		# thunk
-
-	pop	%edx
-	pop	%eax		# restore return val
-	add	$12,%esp	# clean the stack
-x86_fastcall_wrap_arg:
-	ret	$0xFF
-x86_fastcall_wrap_end:
-
-/*
- * Call _fastcall function going from UNIX to Windows.
- * This routine isn't normally used since NDIS miniport drivers
- * only have _stdcall entry points, but it's provided anyway
- * to round out the API, and for testing purposes.
- */
-
-ENTRY(x86_fastcall_call)
-	mov	4(%esp),%eax
-	push	16(%esp)
-
-	call	ctxsw_utow	# thunk
-
-	mov	12(%esp),%ecx
-	mov	16(%esp),%edx
-	call	*8(%esp)	# branch to fastcall routine
-	push	%eax		# preserve return val
-	push	%edx
-
-	call	ctxsw_wtou	# unthunk
-
-	pop	%edx
-	pop	%eax		# restore return val
-	add	$4,%esp		# clean the stack
-	ret
-
-/*
- * Call regparm(3) function going from Windows to UNIX. Arguments
- * are passed in %eax, %edx and %ecx. Note that while additional
- * arguments are passed on the stack, we never bother when them,
- * since the only regparm(3) routines we need to wrap never take
- * more than 3 arguments.
- */
-
-	.globl x86_regparm_wrap_call
-	.globl x86_regparm_wrap_end
-
-ENTRY(x86_regparm_wrap)
-	push	%ecx
-	push	%edx
-	push	%eax
-
-	movl	$ctxsw_wtou, %eax
-	call	*%eax		# unthunk
-
-x86_regparm_wrap_call:
-	movl	$0,%eax
-	call	*%eax		# jump to routine
-	push	%eax		# preserve return val
-	push	%edx		# preserve return val
-
-	movl	$ctxsw_utow, %eax
-	call	*%eax		# thunk
-
-	pop	%edx		# restore return val
-	pop	%eax		# restore return val
-	add	$12,%esp	# restore stack
-	ret
-x86_regparm_wrap_end:
-
-/*
- * Call regparm(3) function going from UNIX to Windows.
- * This routine isn't normally used since NDIS miniport drivers
- * only have _stdcall entry points, but it's provided anyway
- * to round out the API, and for testing purposes.
- */
-
-ENTRY(x86_regparm_call)
-	call	ctxsw_utow	# thunk
-
-	mov	8(%esp),%eax
-	mov	12(%esp),%edx
-	mov	16(%esp),%ecx
-	call	*4(%esp)	# branch to fastcall routine
-	push	%eax		# preserve return val
-	push	%edx		# preserve return val
-
-	call	ctxsw_wtou	# unthunk
-
-	pop	%edx		# restore return val
-	pop	%eax		# restore return val
-	ret
-
-/*
- * Ugly hack alert:
- *
- * On Win32/i386, using __try/__except results in code that tries to
- * manipulate what's supposed to be the Windows Threada Environment 
- * Block (TEB), which one accesses via the %fs register. In particular,
- * %fs:0 (the first DWORD in the TEB) points to the exception
- * registration list. Unfortunately, FreeBSD uses %fs for the
- * per-cpu data structure (pcpu), and we can't allow Windows code
- * to muck with that. I don't even know what Solaris uses %fs for
- * (or if it even uses it at all).
- *
- * Even worse, in 32-bit protected mode, %fs is a selector that
- * refers to an entry in either the GDT or the LDT. Ideally, we would
- * like to be able to temporarily point it at another descriptor
- * while Windows code executes, but to do that we need a separate
- * descriptor entry of our own to play with.
- *
- * Therefore, we go to some trouble to learn the existing layout of
- * the GDT and update it to include an extra entry that we can use.
- * We need the following utility routines to help us do that. On
- * FreeBSD, index #7 in the GDT happens to be unused, so we turn
- * this into our own data segment descriptor. It would be better
- * if we could use a private LDT entry, but there's no easy way to
- * do that in SMP mode because of the way FreeBSD handles user LDTs.
- *
- * Once we have a custom descriptor, we have to thunk/unthunk whenever
- * we cross between FreeBSD code and Windows code. The thunking is
- * based on the premise that when executing instructions in the
- * Windows binary itself, we won't go to sleep. This is because in
- * order to yield the CPU, the code has to call back out to a FreeBSD
- * routine first, and when that happens we can unthunk in order to
- * restore FreeBSD context. What we're desperately trying to avoid is
- * being involuntarily pre-empted with the %fs register still pointing
- * to our fake TIB: if FreeBSD code runs with %fs pointing at our
- * Windows TIB instead of pcpu, we'll panic the kernel. Fortunately,
- * the only way involuntary preemption can occur is if an interrupt
- * fires, and the trap handler saves/restores %fs for us.
- *
- * The thunking routines themselves, ctxsw_utow() (Context SWitch UNIX
- * to Windows) and ctxsw_wtou() (Context SWitch Windows to UNIX), are
- * external to this module. This is done simply because it's easier 
- * to manipulate data structures in C rather than assembly.
- */
-
-ENTRY(x86_getldt)
-	movl	4(%esp),%eax
-	sgdtl	(%eax)
-	movl	8(%esp),%eax
-	sldt	(%eax)
-	xor	%eax,%eax
-	ret
-
-ENTRY(x86_setldt)
-	movl    4(%esp),%eax
-	lgdt	(%eax)
-	jmp	1f
-	nop
-1:
-	movl    8(%esp),%eax
-	lldt	%ax
-	xor	%eax,%eax
-	ret
-
-ENTRY(x86_getfs)
-	mov	%fs,%ax
-	ret
-
-ENTRY(x86_setfs)
-	mov	4(%esp),%fs
-	ret
-
-ENTRY(x86_gettid)
-	mov	%fs:12,%eax
-	ret
-
-ENTRY(x86_critical_enter)
-	cli
-	ret
-
-ENTRY(x86_critical_exit)
-	sti
-	ret
diff --git a/sys/compat/ndis/winx64_wrap.S b/sys/compat/ndis/winx64_wrap.S
deleted file mode 100644
index 3e5d994ab70b..000000000000
--- a/sys/compat/ndis/winx64_wrap.S
+++ /dev/null
@@ -1,179 +0,0 @@
-/*-
- * Copyright (c) 2005
- *      Bill Paul <wpaul@windriver.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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.
- *
- * The x86_64 callback routines were written and graciously submitted
- * by Ville-Pertti Keinonen <will@exomi.com>.
- *
- * $FreeBSD$
- */
-
-#include <machine/asmacros.h>
-
-/*
- * Wrapper for handling up to 16 arguments. We can't really
- * know how many arguments the caller will pass us. I'm taking an
- * educated guess that we'll never get over 16. Handling too
- * few arguments is bad. Handling too many is inefficient, but
- * not fatal. If someone can think of a way to handle an arbitrary
- * number of arguments with more elegant code, freel free to let
- * me know.
- *
- * Standard amd64 calling conventions specify the following registers
- * to be used for passing the first 6 arguments:
- *
- *   %rdi, %rsi, %rdx, %rcx, %r8, %r9
- *
- * Further arguments are passed on the stack (the 7th argument is
- * located immediately after the return address).
- *
- * Windows x86_64 calling conventions only pass the first 4
- * arguments in registers:
- *
- *   %rcx, %rdx, %r8, %r9
- *
- * Even when arguments are passed in registers, the stack must have
- * space reserved for those arguments.  Thus the 5th argument (the
- * first non-register argument) is placed 32 bytes after the return
- * address.  Additionally, %rdi and %rsi must be preserved. (These
- * two registers are not scratch registers in the standard convention.)
- *
- * Note that in this template, we load a contrived 64 bit address into
- * %r11 to represent our jump address. This is to guarantee that the
- * assembler leaves enough room to patch in an absolute 64-bit address
- * later. The idea behind this code is that we want to avoid having to
- * manually create all the wrapper functions at compile time with
- * a bunch of macros. This is doable, but a) messy and b) requires
- * us to maintain two separate tables (one for the UNIX function
- * pointers and another with the wrappers). This means I'd have to
- * update two different tables each time I added a function.
- *
- * To avoid this, we create the wrappers at runtime instead. The
- * image patch tables now contain two pointers: one two the normal
- * routine, and a blank one for the wrapper. To construct a wrapper,
- * we allocate some memory and copy the template function into it,
- * then patch the function pointer for the routine we want to wrap
- * into the newly created wrapper. The subr_pe module can then
- * simply patch the wrapper routine into the jump table into the
- * windows image. As a bonus, the wrapper pointer not only serves
- * as the wrapper entry point address, it's also a data pointer
- * that we can pass to free() later when we unload the module.
- */
-
-	.globl x86_64_wrap_call
-	.globl x86_64_wrap_end
-
-ENTRY(x86_64_wrap)
-	push	%rbp		# insure that the stack
-	mov	%rsp,%rbp	# is 16-byte aligned
-	and	$-16,%rsp	#
-	subq	$96,%rsp	# allocate space on stack
-	mov     %rsi,96-8(%rsp)	# save %rsi
-	mov     %rdi,96-16(%rsp)# save %rdi
-	mov	%rcx,%r10	# temporarily save %rcx in scratch
-	lea	56+8(%rbp),%rsi	# source == old stack top (stack+56)
-	mov	%rsp,%rdi	# destination == new stack top
-	mov	$10,%rcx	# count == 10 quadwords
-	rep
-	movsq			# copy old stack contents to new location
-	mov	%r10,%rdi	# set up arg0 (%rcx -> %rdi)
-	mov     %rdx,%rsi	# set up arg1 (%rdx -> %rsi)
-	mov     %r8,%rdx	# set up arg2 (%r8 -> %rdx)
-	mov     %r9,%rcx	# set up arg3 (%r9 -> %rcx)
-	mov	40+8(%rbp),%r8	# set up arg4 (stack+40 -> %r8)
-	mov	48+8(%rbp),%r9	# set up arg5 (stack+48 -> %r9)
-	xor	%rax,%rax	# clear return value
-x86_64_wrap_call:
-	mov	$0xFF00FF00FF00FF00,%r11
-	callq	*%r11		# call routine
-	mov	96-16(%rsp),%rdi# restore %rdi
-	mov	96-8(%rsp),%rsi	# restore %rsi
-	leave			# delete space on stack
-	ret
-x86_64_wrap_end:
-
-/*
- * Functions for invoking x86_64 callbacks.  In each case, the first
- * argument is a pointer to the function.
- */
-
-ENTRY(x86_64_call1)
-	subq	$40,%rsp
-	mov	%rsi,%rcx
-	call	*%rdi
-	addq	$40,%rsp
-	ret
-
-ENTRY(x86_64_call2)
-	subq	$40,%rsp
-	mov	%rsi,%rcx
-	/* %rdx is already correct */
-	call	*%rdi
-	addq	$40,%rsp
-	ret
-
-ENTRY(x86_64_call3)
-	subq	$40,%rsp
-	mov	%rcx,%r8
-	mov	%rsi,%rcx
-	call	*%rdi
-	addq	$40,%rsp
-	ret
-
-ENTRY(x86_64_call4)
-	subq	$40,%rsp
-	mov	%r8,%r9
-	mov	%rcx,%r8
-	mov	%rsi,%rcx
-	call	*%rdi
-	addq	$40,%rsp
-	ret
-
-ENTRY(x86_64_call5)
-	subq	$48,%rsp
-	mov	%r9,32(%rsp)
-	mov	%r8,%r9
-	mov	%rcx,%r8
-	mov	%rsi,%rcx
-	call	*%rdi
-	addq	$48,%rsp
-	ret
-
-ENTRY(x86_64_call6)
-	subq	$56,%rsp
-	mov	56+8(%rsp),%rax
-	mov	%r9,32(%rsp)
-	mov	%rax,40(%rsp)
-	mov	%r8,%r9
-	mov	%rcx,%r8
-	mov	%rsi,%rcx
-	call	*%rdi
-	addq	$56,%rsp
-	ret
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index ddd4e07b365c..395f501198f8 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -1,476 +1,475 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
 # $FreeBSD$
 #
 
 # common files stuff between i386 and amd64
 include 	"conf/files.x86"
 
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
 # dependency lines other than the first are silently ignored.
 #
 #
 cloudabi32_vdso.o		optional	compat_cloudabi32	\
 	dependency	"$S/contrib/cloudabi/cloudabi_vdso_i686_on_64bit.S" \
 	compile-with	"${CC} -x assembler-with-cpp -m32 -shared -nostdinc -nostdlib -Wl,-T$S/compat/cloudabi/cloudabi_vdso.lds $S/contrib/cloudabi/cloudabi_vdso_i686_on_64bit.S -o ${.TARGET}" \
 	no-obj no-implicit-rule						\
 	clean		"cloudabi32_vdso.o"
 #
 cloudabi32_vdso_blob.o		optional	compat_cloudabi32	\
 	dependency 	"cloudabi32_vdso.o"				\
 	compile-with	"${OBJCOPY} --input-target binary --output-target elf64-x86-64-freebsd --binary-architecture i386 cloudabi32_vdso.o ${.TARGET}" \
 	no-implicit-rule						\
 	clean		"cloudabi32_vdso_blob.o"
 #
 cloudabi64_vdso.o		optional	compat_cloudabi64	\
 	dependency	"$S/contrib/cloudabi/cloudabi_vdso_x86_64.S"	\
 	compile-with	"${CC} -x assembler-with-cpp -shared -nostdinc -nostdlib -Wl,-T$S/compat/cloudabi/cloudabi_vdso.lds $S/contrib/cloudabi/cloudabi_vdso_x86_64.S -o ${.TARGET}" \
 	no-obj no-implicit-rule						\
 	clean		"cloudabi64_vdso.o"
 #
 cloudabi64_vdso_blob.o		optional	compat_cloudabi64	\
 	dependency 	"cloudabi64_vdso.o"				\
 	compile-with	"${OBJCOPY} --input-target binary --output-target elf64-x86-64-freebsd --binary-architecture i386 cloudabi64_vdso.o ${.TARGET}" \
 	no-implicit-rule						\
 	clean		"cloudabi64_vdso_blob.o"
 #
 linux32_genassym.o		optional	compat_linux32		\
 	dependency 	"$S/amd64/linux32/linux32_genassym.c offset.inc"		\
 	compile-with	"${CC} ${CFLAGS:N-flto:N-fno-common} -fcommon -c ${.IMPSRC}" \
 	no-obj no-implicit-rule						\
 	clean		"linux32_genassym.o"
 #
 linux32_assym.h			optional	compat_linux32		\
 	dependency 	"$S/kern/genassym.sh linux32_genassym.o"	\
 	compile-with	"sh $S/kern/genassym.sh linux32_genassym.o > ${.TARGET}" \
 	no-obj no-implicit-rule before-depend				\
 	clean		"linux32_assym.h"
 #
 linux32_locore.o	optional	compat_linux32		\
 	dependency 	"linux32_assym.h $S/amd64/linux32/linux32_locore.asm"	\
 	compile-with	"${CC} -x assembler-with-cpp -DLOCORE -m32 -shared -s -pipe -I. -I$S ${WERROR} -Wall -fPIC -fno-common -nostdinc -nostdlib -Wl,-T$S/amd64/linux32/linux32_vdso.lds.s -Wl,-soname=linux32_vdso.so,--eh-frame-hdr,-warn-common ${.IMPSRC} -o ${.TARGET}" \
 	no-obj no-implicit-rule						\
 	clean		"linux32_locore.o"
 #
 linux32_vdso.so		optional	compat_linux32			\
 	dependency 	"linux32_locore.o"				\
 	compile-with	"${OBJCOPY} --input-target binary --output-target elf64-x86-64-freebsd --binary-architecture i386 linux32_locore.o ${.TARGET}" \
 	no-implicit-rule						\
 	clean		"linux32_vdso.so"
 #
 ia32_genassym.o			standard				\
 	dependency 	"$S/compat/ia32/ia32_genassym.c offset.inc"		\
 	compile-with	"${CC} ${CFLAGS:N-flto:N-fno-common} -fcommon -c ${.IMPSRC}" \
 	no-obj no-implicit-rule						\
 	clean		"ia32_genassym.o"
 #
 ia32_assym.h			standard				\
 	dependency 	"$S/kern/genassym.sh ia32_genassym.o"		\
 	compile-with	"env NM='${NM}' NMFLAGS='${NMFLAGS}' sh $S/kern/genassym.sh ia32_genassym.o > ${.TARGET}" \
 	no-obj no-implicit-rule before-depend				\
 	clean		"ia32_assym.h"
 #
 amd64/acpica/acpi_machdep.c	optional	acpi
 acpi_wakecode.o			optional	acpi			\
 	dependency	"$S/amd64/acpica/acpi_wakecode.S assym.inc"	\
 	compile-with	"${NORMAL_S}"					\
 	no-obj no-implicit-rule before-depend				\
 	clean		"acpi_wakecode.o"
 acpi_wakecode.bin		optional	acpi			\
 	dependency	"acpi_wakecode.o"				\
 	compile-with	"${OBJCOPY} -S -O binary acpi_wakecode.o ${.TARGET}" \
 	no-obj no-implicit-rule	before-depend				\
 	clean		"acpi_wakecode.bin"
 acpi_wakecode.h			optional	acpi			\
 	dependency	"acpi_wakecode.bin"				\
 	compile-with	"file2c -sx 'static char wakecode[] = {' '};' < acpi_wakecode.bin > ${.TARGET}" \
 	no-obj no-implicit-rule	before-depend				\
 	clean		"acpi_wakecode.h"
 acpi_wakedata.h			optional	acpi			\
 	dependency	"acpi_wakecode.o"				\
 	compile-with	'${NM} -n --defined-only acpi_wakecode.o | while read offset dummy what; do echo "#define	$${what}	0x$${offset}"; done > ${.TARGET}' \
 	no-obj no-implicit-rule	before-depend				\
 	clean		"acpi_wakedata.h"
 #
 #amd64/amd64/apic_vector.S	standard
 amd64/amd64/bios.c		standard
 amd64/amd64/bpf_jit_machdep.c	optional	bpf_jitter
 amd64/amd64/copyout.c		standard
 amd64/amd64/cpu_switch.S	standard
 amd64/amd64/db_disasm.c		optional	ddb
 amd64/amd64/db_interface.c	optional	ddb
 amd64/amd64/db_trace.c		optional	ddb
 amd64/amd64/efirt_machdep.c	optional	efirt
 amd64/amd64/efirt_support.S	optional	efirt
 amd64/amd64/elf_machdep.c	standard
 amd64/amd64/exception.S		standard
 amd64/amd64/fpu.c		standard
 amd64/amd64/gdb_machdep.c	optional	gdb
 amd64/amd64/in_cksum.c		optional	inet | inet6
 amd64/amd64/initcpu.c		standard
 amd64/amd64/io.c		optional	io
 amd64/amd64/locore.S		standard	no-obj
 amd64/amd64/xen-locore.S	optional	xenhvm \
 	compile-with "${NORMAL_S} -g0" \
 	no-ctfconvert
 amd64/amd64/machdep.c		standard
 amd64/amd64/mem.c		optional	mem
 amd64/amd64/minidump_machdep.c	standard
 amd64/amd64/mp_machdep.c	optional	smp
 amd64/amd64/mpboot.S		optional	smp
 amd64/amd64/pmap.c		standard
 amd64/amd64/prof_machdep.c	optional	profiling-routine
 amd64/amd64/ptrace_machdep.c	standard
 amd64/amd64/sigtramp.S		standard
 amd64/amd64/support.S		standard
 amd64/amd64/sys_machdep.c	standard
 amd64/amd64/trap.c		standard
 amd64/amd64/uio_machdep.c	standard
 amd64/amd64/uma_machdep.c	standard
 amd64/amd64/vm_machdep.c	standard
 amd64/cloudabi32/cloudabi32_sysvec.c		optional compat_cloudabi32
 amd64/cloudabi64/cloudabi64_sysvec.c		optional compat_cloudabi64
 amd64/pci/pci_cfgreg.c		optional	pci
 cddl/dev/dtrace/amd64/dtrace_asm.S			optional dtrace compile-with "${DTRACE_S}"
 cddl/dev/dtrace/amd64/dtrace_subr.c			optional dtrace compile-with "${DTRACE_C}"
 crypto/aesni/aeskeys_amd64.S	optional aesni
 crypto/des/des_enc.c		optional	netsmb
 crypto/openssl/amd64/sha1-x86_64.S	optional ossl
 crypto/openssl/amd64/sha256-x86_64.S	optional ossl
 crypto/openssl/amd64/sha512-x86_64.S	optional ossl
 dev/acpi_support/acpi_wmi_if.m	standard
 dev/agp/agp_amd64.c		optional	agp
 dev/agp/agp_i810.c		optional	agp
 dev/agp/agp_via.c		optional	agp
 dev/amdgpio/amdgpio.c		optional	amdgpio
 dev/axgbe/if_axgbe_pci.c	optional	axp
 dev/axgbe/xgbe-desc.c		optional	axp
 dev/axgbe/xgbe-dev.c		optional	axp
 dev/axgbe/xgbe-drv.c		optional	axp
 dev/axgbe/xgbe-mdio.c		optional	axp
 dev/axgbe/xgbe-sysctl.c		optional	axp
 dev/axgbe/xgbe-txrx.c		optional	axp
 dev/axgbe/xgbe_osdep.c		optional	axp
 dev/axgbe/xgbe-i2c.c		optional	axp
 dev/axgbe/xgbe-phy-v2.c		optional	axp
 dev/hyperv/vmbus/amd64/hyperv_machdep.c			optional	hyperv
 dev/hyperv/vmbus/amd64/vmbus_vector.S			optional	hyperv
 dev/ice/if_ice_iflib.c		optional	ice pci \
 	compile-with "${NORMAL_C} -I$S/dev/ice"
 dev/ice/ice_lib.c		optional	ice pci \
 	compile-with "${NORMAL_C} -I$S/dev/ice"
 dev/ice/ice_osdep.c		optional	ice pci \
 	compile-with "${NORMAL_C} -I$S/dev/ice"
 dev/ice/ice_resmgr.c		optional	ice pci \
 	compile-with "${NORMAL_C} -I$S/dev/ice"
 dev/ice/ice_strings.c		optional	ice pci \
 	compile-with "${NORMAL_C} -I$S/dev/ice"
 dev/ice/ice_iflib_recovery_txrx.c	optional	ice pci \
 	compile-with "${NORMAL_C} -I$S/dev/ice"
 dev/ice/ice_iflib_txrx.c	optional	ice pci \
 	compile-with "${NORMAL_C} -I$S/dev/ice"
 dev/ice/ice_common.c		optional	ice pci \
 	compile-with "${NORMAL_C} -I$S/dev/ice"
 dev/ice/ice_controlq.c		optional	ice pci \
 	compile-with "${NORMAL_C} -I$S/dev/ice"
 dev/ice/ice_dcb.c		optional	ice pci \
 	compile-with "${NORMAL_C} -I$S/dev/ice"
 dev/ice/ice_flex_pipe.c		optional	ice pci \
 	compile-with "${NORMAL_C} -I$S/dev/ice"
 dev/ice/ice_flow.c		optional	ice pci \
 	compile-with "${NORMAL_C} -I$S/dev/ice"
 dev/ice/ice_nvm.c		optional	ice pci \
 	compile-with "${NORMAL_C} -I$S/dev/ice"
 dev/ice/ice_sched.c		optional	ice pci \
 	compile-with "${NORMAL_C} -I$S/dev/ice"
 dev/ice/ice_sriov.c		optional	ice pci \
 	compile-with "${NORMAL_C} -I$S/dev/ice"
 dev/ice/ice_switch.c		optional	ice pci \
 	compile-with "${NORMAL_C} -I$S/dev/ice"
 ice_ddp.c			optional ice_ddp	\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01031000 -mice_ddp -c${.TARGET}"	\
 	no-ctfconvert no-implicit-rule before-depend local	\
 	clean		"ice_ddp.c"
 ice_ddp.fwo			optional ice_ddp	\
 	dependency	"ice_ddp.fw"			\
 	compile-with	"${NORMAL_FWO}"			\
 	no-implicit-rule				\
 	clean		"ice_ddp.fwo"
 ice_ddp.fw			optional ice_ddp	\
 	dependency	"$S/contrib/dev/ice/ice-1.3.16.0.pkg" \
 	compile-with	"${CP} $S/contrib/dev/ice/ice-1.3.16.0.pkg ice_ddp.fw" \
 	no-obj no-implicit-rule				\
 	clean		"ice_ddp.fw"
 dev/ioat/ioat.c			optional	ioat pci
 dev/ioat/ioat_test.c		optional	ioat pci
 dev/ixl/if_ixl.c		optional	ixl pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/ixl/ixl_pf_main.c		optional	ixl pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/ixl/ixl_pf_iflib.c		optional	ixl pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/ixl/ixl_pf_qmgr.c		optional	ixl pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/ixl/ixl_pf_iov.c		optional	ixl pci  pci_iov \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/ixl/ixl_pf_i2c.c		optional	ixl pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/ixl/if_iavf.c		optional	iavf pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/ixl/iavf_vc.c			optional	iavf pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/ixl/ixl_txrx.c		optional	ixl pci | iavf pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/ixl/i40e_osdep.c		optional	ixl pci | iavf pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/ixl/i40e_lan_hmc.c		optional	ixl pci | iavf pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/ixl/i40e_hmc.c		optional	ixl pci | iavf pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/ixl/i40e_common.c		optional	ixl pci | iavf pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/ixl/i40e_nvm.c		optional	ixl pci | iavf pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/ixl/i40e_adminq.c		optional	ixl pci | iavf pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/ixl/i40e_dcb.c		optional	ixl pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/nctgpio/nctgpio.c		optional	nctgpio
 dev/nfe/if_nfe.c		optional	nfe pci
 dev/ntb/if_ntb/if_ntb.c		optional	if_ntb
 dev/ntb/ntb_transport.c		optional	ntb_transport | if_ntb
 dev/ntb/ntb.c			optional	ntb | ntb_transport | if_ntb | ntb_hw_amd | ntb_hw_intel | ntb_hw_plx | ntb_hw
 dev/ntb/ntb_if.m		optional	ntb | ntb_transport | if_ntb | ntb_hw_amd | ntb_hw_intel | ntb_hw_plx | ntb_hw
 dev/ntb/ntb_hw/ntb_hw_amd.c	optional	ntb_hw_amd | ntb_hw
 dev/ntb/ntb_hw/ntb_hw_intel.c	optional	ntb_hw_intel | ntb_hw
 dev/ntb/ntb_hw/ntb_hw_plx.c	optional	ntb_hw_plx | ntb_hw
 dev/ntb/test/ntb_tool.c		optional	ntb_tool
 dev/nvram/nvram.c		optional	nvram isa
 dev/random/ivy.c		optional	rdrand_rng !random_loadable
 dev/random/nehemiah.c		optional	padlock_rng !random_loadable
 dev/qlxge/qls_dbg.c		optional	qlxge pci
 dev/qlxge/qls_dump.c		optional	qlxge pci
 dev/qlxge/qls_hw.c		optional	qlxge pci
 dev/qlxge/qls_ioctl.c		optional	qlxge pci
 dev/qlxge/qls_isr.c		optional	qlxge pci
 dev/qlxge/qls_os.c		optional	qlxge pci
 dev/qlxgb/qla_dbg.c		optional	qlxgb pci
 dev/qlxgb/qla_hw.c		optional	qlxgb pci
 dev/qlxgb/qla_ioctl.c		optional	qlxgb pci
 dev/qlxgb/qla_isr.c		optional	qlxgb pci
 dev/qlxgb/qla_misc.c		optional	qlxgb pci
 dev/qlxgb/qla_os.c		optional	qlxgb pci
 dev/qlxgbe/ql_dbg.c		optional	qlxgbe pci
 dev/qlxgbe/ql_hw.c		optional	qlxgbe pci
 dev/qlxgbe/ql_ioctl.c		optional	qlxgbe pci
 dev/qlxgbe/ql_isr.c		optional	qlxgbe pci
 dev/qlxgbe/ql_misc.c		optional	qlxgbe pci
 dev/qlxgbe/ql_os.c		optional	qlxgbe pci
 dev/qlxgbe/ql_reset.c		optional	qlxgbe pci
 dev/qlxgbe/ql_fw.c		optional	qlxgbe pci
 dev/qlxgbe/ql_boot.c		optional	qlxgbe pci
 dev/qlxgbe/ql_minidump.c	optional	qlxgbe pci
 dev/qlnx/qlnxe/ecore_cxt.c	optional	qlnxe pci \
 	compile-with "${LINUXKPI_C}"
 dev/qlnx/qlnxe/ecore_dbg_fw_funcs.c optional	qlnxe pci \
 	compile-with "${LINUXKPI_C}"
 dev/qlnx/qlnxe/ecore_dcbx.c	optional	qlnxe pci \
 	compile-with "${LINUXKPI_C}"
 dev/qlnx/qlnxe/ecore_dev.c	optional	qlnxe pci \
 	compile-with "${LINUXKPI_C}"
 dev/qlnx/qlnxe/ecore_hw.c	optional	qlnxe pci \
 	compile-with "${LINUXKPI_C}"
 dev/qlnx/qlnxe/ecore_init_fw_funcs.c optional	qlnxe pci \
 	compile-with "${LINUXKPI_C}"
 dev/qlnx/qlnxe/ecore_init_ops.c	optional	qlnxe pci \
 	compile-with "${LINUXKPI_C}"
 dev/qlnx/qlnxe/ecore_int.c	optional	qlnxe pci \
 	compile-with "${LINUXKPI_C}"
 dev/qlnx/qlnxe/ecore_l2.c	optional	qlnxe pci \
 	compile-with "${LINUXKPI_C}"
 dev/qlnx/qlnxe/ecore_mcp.c	optional	qlnxe pci \
 	compile-with "${LINUXKPI_C}"
 dev/qlnx/qlnxe/ecore_sp_commands.c optional	qlnxe pci \
 	compile-with "${LINUXKPI_C}"
 dev/qlnx/qlnxe/ecore_spq.c	optional	qlnxe pci \
 	compile-with "${LINUXKPI_C}"
 dev/qlnx/qlnxe/qlnx_ioctl.c	optional	qlnxe pci \
 	compile-with "${LINUXKPI_C}"
 dev/qlnx/qlnxe/qlnx_os.c	optional	qlnxe pci \
 	compile-with "${LINUXKPI_C}"
 dev/sfxge/common/ef10_ev.c	optional	sfxge pci
 dev/sfxge/common/ef10_filter.c	optional	sfxge pci
 dev/sfxge/common/ef10_image.c	optional	sfxge pci
 dev/sfxge/common/ef10_intr.c	optional	sfxge pci
 dev/sfxge/common/ef10_mac.c	optional	sfxge pci
 dev/sfxge/common/ef10_mcdi.c	optional	sfxge pci
 dev/sfxge/common/ef10_nic.c	optional	sfxge pci
 dev/sfxge/common/ef10_nvram.c	optional	sfxge pci
 dev/sfxge/common/ef10_phy.c	optional	sfxge pci
 dev/sfxge/common/ef10_rx.c	optional	sfxge pci
 dev/sfxge/common/ef10_tx.c	optional	sfxge pci
 dev/sfxge/common/ef10_vpd.c	optional	sfxge pci
 dev/sfxge/common/efx_bootcfg.c	optional	sfxge pci
 dev/sfxge/common/efx_crc32.c	optional	sfxge pci
 dev/sfxge/common/efx_ev.c	optional	sfxge pci
 dev/sfxge/common/efx_filter.c	optional	sfxge pci
 dev/sfxge/common/efx_hash.c	optional	sfxge pci
 dev/sfxge/common/efx_intr.c	optional	sfxge pci
 dev/sfxge/common/efx_lic.c	optional	sfxge pci
 dev/sfxge/common/efx_mac.c	optional	sfxge pci
 dev/sfxge/common/efx_mcdi.c	optional	sfxge pci
 dev/sfxge/common/efx_mon.c	optional	sfxge pci
 dev/sfxge/common/efx_nic.c	optional	sfxge pci
 dev/sfxge/common/efx_nvram.c	optional	sfxge pci
 dev/sfxge/common/efx_phy.c	optional	sfxge pci
 dev/sfxge/common/efx_port.c	optional	sfxge pci
 dev/sfxge/common/efx_rx.c	optional	sfxge pci
 dev/sfxge/common/efx_sram.c	optional	sfxge pci
 dev/sfxge/common/efx_tunnel.c	optional	sfxge pci
 dev/sfxge/common/efx_tx.c	optional	sfxge pci
 dev/sfxge/common/efx_vpd.c	optional	sfxge pci
 dev/sfxge/common/hunt_nic.c	optional	sfxge pci
 dev/sfxge/common/mcdi_mon.c	optional	sfxge pci
 dev/sfxge/common/medford_nic.c	optional	sfxge pci
 dev/sfxge/common/medford2_nic.c	optional	sfxge pci
 dev/sfxge/common/siena_mac.c	optional	sfxge pci
 dev/sfxge/common/siena_mcdi.c	optional	sfxge pci
 dev/sfxge/common/siena_nic.c	optional	sfxge pci
 dev/sfxge/common/siena_nvram.c	optional	sfxge pci
 dev/sfxge/common/siena_phy.c	optional	sfxge pci
 dev/sfxge/common/siena_sram.c	optional	sfxge pci
 dev/sfxge/common/siena_vpd.c	optional	sfxge pci
 dev/sfxge/sfxge.c		optional	sfxge pci
 dev/sfxge/sfxge_dma.c		optional	sfxge pci
 dev/sfxge/sfxge_ev.c		optional	sfxge pci
 dev/sfxge/sfxge_intr.c		optional	sfxge pci
 dev/sfxge/sfxge_mcdi.c		optional	sfxge pci
 dev/sfxge/sfxge_nvram.c		optional	sfxge pci
 dev/sfxge/sfxge_port.c		optional	sfxge pci
 dev/sfxge/sfxge_rx.c		optional	sfxge pci
 dev/sfxge/sfxge_tx.c		optional	sfxge pci
 dev/smartpqi/smartpqi_cam.c     optional 	smartpqi
 dev/smartpqi/smartpqi_cmd.c     optional 	smartpqi
 dev/smartpqi/smartpqi_discovery.c	optional	smartpqi
 dev/smartpqi/smartpqi_event.c   optional 	smartpqi
 dev/smartpqi/smartpqi_helper.c  optional 	smartpqi
 dev/smartpqi/smartpqi_init.c    optional 	smartpqi
 dev/smartpqi/smartpqi_intr.c    optional 	smartpqi
 dev/smartpqi/smartpqi_ioctl.c   optional 	smartpqi
 dev/smartpqi/smartpqi_main.c    optional 	smartpqi
 dev/smartpqi/smartpqi_mem.c     optional 	smartpqi
 dev/smartpqi/smartpqi_misc.c    optional 	smartpqi
 dev/smartpqi/smartpqi_queue.c   optional 	smartpqi
 dev/smartpqi/smartpqi_request.c optional 	smartpqi
 dev/smartpqi/smartpqi_response.c	optional 	smartpqi
 dev/smartpqi/smartpqi_sis.c     optional 	smartpqi
 dev/smartpqi/smartpqi_tag.c     optional 	smartpqi
 dev/speaker/spkr.c		optional	speaker
 dev/sume/if_sume.c		optional	sume
 dev/superio/superio.c		optional	superio isa
 dev/syscons/apm/apm_saver.c	optional	apm_saver apm
 dev/syscons/scvesactl.c		optional	sc vga vesa
 dev/syscons/scvgarndr.c		optional	sc vga
 dev/tpm/tpm.c			optional	tpm
 dev/tpm/tpm20.c		optional	tpm
 dev/tpm/tpm_crb.c		optional	tpm acpi
 dev/tpm/tpm_tis.c		optional	tpm acpi
 dev/tpm/tpm_acpi.c		optional	tpm acpi
 dev/tpm/tpm_isa.c		optional	tpm isa
 dev/uart/uart_cpu_x86.c		optional	uart
 dev/viawd/viawd.c		optional	viawd
 dev/vmd/vmd.c			optional	vmd
 dev/vmd/vmd_bus.c		optional	vmd_bus
 dev/wbwd/wbwd.c			optional	wbwd
 dev/xen/pci/xen_acpi_pci.c	optional	xenhvm
 dev/xen/pci/xen_pci.c		optional	xenhvm
 isa/syscons_isa.c		optional	sc
 isa/vga_isa.c			optional	vga
 kern/imgact_aout.c		optional compat_aout
 kern/link_elf_obj.c		standard
 #
 # IA32 binary support
 #
 #amd64/ia32/ia32_exception.S	optional	compat_freebsd32
 amd64/ia32/ia32_reg.c		optional	compat_freebsd32
 amd64/ia32/ia32_signal.c	optional	compat_freebsd32
 amd64/ia32/ia32_sigtramp.S	optional	compat_freebsd32
 amd64/ia32/ia32_syscall.c	optional	compat_freebsd32
 amd64/ia32/ia32_misc.c		optional	compat_freebsd32
 compat/ia32/ia32_sysvec.c	optional	compat_freebsd32
 compat/linprocfs/linprocfs.c	optional	linprocfs
 compat/linsysfs/linsysfs.c	optional	linsysfs
 #
 # Linux/i386 binary support
 #
 amd64/linux32/linux32_dummy_machdep.c	optional	compat_linux32
 amd64/linux32/linux32_machdep.c	optional	compat_linux32
 amd64/linux32/linux32_support.s	optional	compat_linux32		\
 	dependency 	"linux32_assym.h"
 amd64/linux32/linux32_sysent.c	optional	compat_linux32
 amd64/linux32/linux32_sysvec.c	optional	compat_linux32
 compat/linux/linux_dummy.c	optional	compat_linux32
 compat/linux/linux_emul.c	optional	compat_linux32
 compat/linux/linux_errno.c	optional	compat_linux32
 compat/linux/linux_file.c	optional	compat_linux32
 compat/linux/linux_fork.c	optional	compat_linux32
 compat/linux/linux_futex.c	optional	compat_linux32
 compat/linux/linux_getcwd.c	optional	compat_linux32
 compat/linux/linux_ioctl.c	optional	compat_linux32
 compat/linux/linux_ipc.c	optional	compat_linux32
 compat/linux/linux_mib.c	optional	compat_linux32
 compat/linux/linux_misc.c	optional	compat_linux32
 compat/linux/linux_mmap.c	optional	compat_linux32
 compat/linux/linux_signal.c	optional	compat_linux32
 compat/linux/linux_socket.c	optional	compat_linux32
 compat/linux/linux_stats.c	optional	compat_linux32
 compat/linux/linux_sysctl.c	optional	compat_linux32
 compat/linux/linux_time.c	optional	compat_linux32
 compat/linux/linux_timer.c	optional	compat_linux32
 compat/linux/linux_uid16.c	optional	compat_linux32
 compat/linux/linux_util.c	optional	compat_linux32
 compat/linux/linux_vdso.c	optional	compat_linux32
 compat/linux/linux_common.c	optional	compat_linux32
 compat/linux/linux_event.c	optional	compat_linux32
 compat/linux/linux.c		optional	compat_linux32
 x86/linux/linux_dummy_x86.c	optional	compat_linux32
 dev/amr/amr_linux.c		optional	compat_linux32 amr
 dev/mfi/mfi_linux.c		optional	compat_linux32 mfi
-compat/ndis/winx64_wrap.S	optional	ndisapi pci
 #
 # x86 real mode BIOS emulator, required by dpms/pci/vesa
 #
 compat/x86bios/x86bios.c	optional x86bios | dpms | pci | vesa
 contrib/x86emu/x86emu.c		optional x86bios | dpms | pci | vesa
 # Common files where we currently configure the system differently, but perhaps shouldn't
 # config(8) doesn't have a way to force standard options, so we've been inconsistent
 # about marking non-optional things 'standard'.
 x86/acpica/madt.c		optional	acpi
 x86/isa/atpic.c			optional	atpic isa
 x86/isa/elcr.c			optional	atpic isa | mptable
 x86/isa/isa.c			standard
 x86/isa/isa_dma.c		standard
 x86/pci/pci_early_quirks.c	optional	pci
 x86/x86/io_apic.c		standard
 x86/x86/local_apic.c		standard
 x86/x86/mptable.c		optional	mptable
 x86/x86/mptable_pci.c		optional	mptable pci
 x86/x86/msi.c			optional	pci
 x86/xen/pv.c			optional	xenhvm
 x86/xen/pvcpu_enum.c		optional	xenhvm
 x86/xen/xen_pci_bus.c		optional	xenhvm
 
 compat/linuxkpi/common/src/linux_fpu.c		optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 
 contrib/openzfs/module/zcommon/zfs_fletcher_avx512.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zcommon/zfs_fletcher_intel.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zcommon/zfs_fletcher_sse.c		optional zfs compile-with "${ZFS_C}"
 
 contrib/openzfs/module/zfs/vdev_raidz_math_avx2.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/vdev_raidz_math_avx512bw.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/vdev_raidz_math_avx512f.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/vdev_raidz_math_sse2.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/vdev_raidz_math_ssse3.c		optional zfs compile-with "${ZFS_C}"
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index b5192e47a738..6560ab217d96 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -1,246 +1,245 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
 # $FreeBSD$
 #
 
 # common files stuff between i386 and amd64
 include 	"conf/files.x86"
 
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
 # dependency lines other than the first are silently ignored.
 #
 cloudabi32_vdso.o		optional	compat_cloudabi32	\
 	dependency	"$S/contrib/cloudabi/cloudabi_vdso_i686.S" \
 	compile-with	"${CC} -x assembler-with-cpp -shared -nostdinc -nostdlib -Wl,-T$S/compat/cloudabi/cloudabi_vdso.lds $S/contrib/cloudabi/cloudabi_vdso_i686.S -o ${.TARGET}" \
 	no-obj no-implicit-rule						\
 	clean		"cloudabi32_vdso.o"
 #
 cloudabi32_vdso_blob.o		optional	compat_cloudabi32	\
 	dependency 	"cloudabi32_vdso.o"				\
 	compile-with	"${OBJCOPY} --input-target binary --output-target elf32-i386-freebsd --binary-architecture i386 cloudabi32_vdso.o ${.TARGET}" \
 	no-implicit-rule						\
 	clean		"cloudabi32_vdso_blob.o"
 #
 linux_genassym.o		optional	compat_linux		\
 	dependency 	"$S/i386/linux/linux_genassym.c offset.inc"		\
 	compile-with	"${CC} ${CFLAGS:N-flto:N-fno-common} -fcommon -c ${.IMPSRC}" \
 	no-obj no-implicit-rule						\
 	clean		"linux_genassym.o"
 #
 linux_assym.h			optional	compat_linux		\
 	dependency 	"$S/kern/genassym.sh linux_genassym.o"		\
 	compile-with	"sh $S/kern/genassym.sh linux_genassym.o > ${.TARGET}" \
 	no-obj no-implicit-rule before-depend				\
 	clean		"linux_assym.h"
 #
 linux_locore.o			optional	compat_linux		\
 	dependency 	"linux_assym.h $S/i386/linux/linux_locore.asm"	\
 	compile-with	"${CC} -x assembler-with-cpp -DLOCORE -shared -s -pipe -I. -I$S ${WERROR} -Wall -fPIC -fno-common -nostdinc -nostdlib -Wl,-T$S/i386/linux/linux_vdso.lds.s -Wl,-soname=linux_vdso.so,--eh-frame-hdr,-warn-common ${.IMPSRC} -o ${.TARGET}" \
 	no-obj no-implicit-rule						\
 	clean		"linux_locore.o"
 #
 linux_vdso.so			optional	compat_linux		\
 	dependency 	"linux_locore.o"				\
 	compile-with	"${OBJCOPY} --input-target binary --output-target elf32-i386-freebsd --binary-architecture i386 linux_locore.o ${.TARGET}" \
 	no-implicit-rule						\
 	clean		"linux_vdso.so"
 #
 cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S	optional zfs | dtrace compile-with "${ZFS_S}"
 cddl/dev/dtrace/i386/dtrace_asm.S			optional dtrace compile-with "${DTRACE_S}"
 cddl/dev/dtrace/i386/dtrace_subr.c			optional dtrace compile-with "${DTRACE_C}"
 compat/linprocfs/linprocfs.c	optional linprocfs
 compat/linsysfs/linsysfs.c	optional linsysfs
 compat/linux/linux_dummy.c	optional compat_linux
 compat/linux/linux_event.c	optional compat_linux
 compat/linux/linux_emul.c	optional compat_linux
 compat/linux/linux_errno.c	optional compat_linux
 compat/linux/linux_file.c	optional compat_linux
 compat/linux/linux_fork.c	optional compat_linux
 compat/linux/linux_futex.c	optional compat_linux
 compat/linux/linux_getcwd.c	optional compat_linux
 compat/linux/linux_ioctl.c	optional compat_linux
 compat/linux/linux_ipc.c	optional compat_linux
 compat/linux/linux_mib.c	optional compat_linux
 compat/linux/linux_misc.c	optional compat_linux
 compat/linux/linux_mmap.c	optional compat_linux
 compat/linux/linux_signal.c	optional compat_linux
 compat/linux/linux_socket.c	optional compat_linux
 compat/linux/linux_stats.c	optional compat_linux
 compat/linux/linux_sysctl.c	optional compat_linux
 compat/linux/linux_time.c	optional compat_linux
 compat/linux/linux_timer.c	optional compat_linux
 compat/linux/linux_uid16.c	optional compat_linux
 compat/linux/linux_util.c	optional compat_linux
 compat/linux/linux_vdso.c	optional compat_linux
 compat/linux/linux.c		optional compat_linux
-compat/ndis/winx32_wrap.S	optional ndisapi pci
 crypto/aesni/aeskeys_i386.S	optional aesni
 crypto/des/arch/i386/des_enc.S	optional netsmb
 crypto/openssl/i386/sha1-586.S	optional ossl
 crypto/openssl/i386/sha256-586.S	optional ossl
 crypto/openssl/i386/sha512-586.S	optional ossl
 dev/agp/agp_ali.c		optional agp
 dev/agp/agp_amd.c		optional agp
 dev/agp/agp_amd64.c		optional agp
 dev/agp/agp_ati.c		optional agp
 dev/agp/agp_i810.c		optional agp
 dev/agp/agp_intel.c		optional agp
 dev/agp/agp_nvidia.c		optional agp
 dev/agp/agp_sis.c		optional agp
 dev/agp/agp_via.c		optional agp
 dev/ce/ceddk.c			optional ce
 dev/ce/if_ce.c			optional ce
 dev/ce/tau32-ddk.c		optional ce \
 	compile-with "${NORMAL_C} ${NO_WCONSTANT_CONVERSION} ${NO_WMISLEADING_INDENTATION}"
 dev/cp/cpddk.c			optional cp \
 	compile-with "${NORMAL_C} ${NO_WMISLEADING_INDENTATION}"
 dev/cp/if_cp.c			optional cp
 dev/glxiic/glxiic.c		optional glxiic
 dev/glxsb/glxsb.c		optional glxsb
 dev/glxsb/glxsb_hash.c		optional glxsb
 dev/hyperv/vmbus/i386/hyperv_machdep.c			optional	hyperv
 dev/hyperv/vmbus/i386/vmbus_vector.S			optional	hyperv
 dev/le/if_le_isa.c		optional le isa
 dev/nctgpio/nctgpio.c		optional nctgpio
 dev/nfe/if_nfe.c		optional nfe pci
 dev/ntb/if_ntb/if_ntb.c		optional if_ntb
 dev/ntb/ntb_transport.c		optional ntb_transport | if_ntb
 dev/ntb/ntb.c			optional ntb | ntb_transport | if_ntb | ntb_hw_amd | ntb_hw_intel | ntb_hw_plx | ntb_hw
 dev/ntb/ntb_if.m		optional ntb | ntb_transport | if_ntb | ntb_hw_amd | ntb_hw_intel | ntb_hw_plx | ntb_hw
 dev/ntb/ntb_hw/ntb_hw_amd.c	optional ntb_hw_amd | ntb_hw
 dev/ntb/ntb_hw/ntb_hw_intel.c	optional ntb_hw_intel | ntb_hw
 dev/ntb/ntb_hw/ntb_hw_plx.c	optional ntb_hw_plx | ntb_hw
 dev/ntb/test/ntb_tool.c		optional ntb_tool
 dev/nvram/nvram.c		optional	nvram isa
 dev/ofw/ofwpci.c		optional fdt pci
 dev/pcf/pcf_isa.c		optional pcf
 dev/random/ivy.c		optional rdrand_rng !random_loadable
 dev/random/nehemiah.c		optional padlock_rng !random_loadable
 dev/sbni/if_sbni.c		optional sbni
 dev/sbni/if_sbni_isa.c		optional sbni isa
 dev/sbni/if_sbni_pci.c		optional sbni pci
 dev/speaker/spkr.c		optional speaker
 dev/superio/superio.c		optional superio isa
 dev/syscons/scvesactl.c		optional sc vga vesa
 dev/syscons/scvgarndr.c		optional sc vga
 dev/tpm/tpm.c			optional tpm
 dev/tpm/tpm_acpi.c		optional tpm acpi
 dev/tpm/tpm_isa.c		optional tpm isa
 dev/uart/uart_cpu_x86.c		optional uart
 dev/viawd/viawd.c		optional viawd
 dev/acpi_support/acpi_wmi_if.m	standard
 dev/wbwd/wbwd.c			optional wbwd
 i386/acpica/acpi_machdep.c	optional acpi
 acpi_wakecode.o			optional acpi				\
 	dependency	"$S/i386/acpica/acpi_wakecode.S assym.inc"	\
 	compile-with	"${NORMAL_S}"					\
 	no-obj no-implicit-rule before-depend				\
 	clean		"acpi_wakecode.o"
 acpi_wakecode.bin		optional acpi				\
 	dependency	"acpi_wakecode.o"				\
 	compile-with	"${OBJCOPY} -S -O binary acpi_wakecode.o ${.TARGET}" \
 	no-obj no-implicit-rule	before-depend				\
 	clean		"acpi_wakecode.bin"
 acpi_wakecode.h			optional acpi				\
 	dependency	"acpi_wakecode.bin"				\
 	compile-with	"file2c -sx 'static char wakecode[] = {' '};' < acpi_wakecode.bin > ${.TARGET}" \
 	no-obj no-implicit-rule	before-depend				\
 	clean		"acpi_wakecode.h"
 acpi_wakedata.h			optional acpi				\
 	dependency	"acpi_wakecode.o"				\
 	compile-with	'${NM} -n --defined-only acpi_wakecode.o | while read offset dummy what; do echo "#define	$${what}	0x$${offset}"; done > ${.TARGET}' \
 	no-obj no-implicit-rule	before-depend				\
 	clean		"acpi_wakedata.h"
 #
 i386/bios/smapi.c		optional smapi
 i386/bios/smapi_bios.S		optional smapi
 i386/cloudabi32/cloudabi32_sysvec.c	optional compat_cloudabi32
 #i386/i386/apic_vector.s		optional apic
 i386/i386/bios.c		standard
 i386/i386/bioscall.s		standard
 i386/i386/bpf_jit_machdep.c	optional bpf_jitter
 i386/i386/copyout.c		standard
 i386/i386/db_disasm.c		optional ddb
 i386/i386/db_interface.c	optional ddb
 i386/i386/db_trace.c		optional ddb
 i386/i386/elan-mmcr.c		optional cpu_elan | cpu_soekris
 i386/i386/elf_machdep.c		standard
 i386/i386/exception.s		standard
 i386/i386/gdb_machdep.c		optional gdb
 i386/i386/geode.c		optional cpu_geode
 i386/i386/in_cksum.c		optional inet | inet6
 i386/i386/initcpu.c		standard
 i386/i386/io.c			optional io
 i386/i386/k6_mem.c		optional mem
 i386/i386/locore.s		standard	no-obj
 i386/i386/longrun.c		optional cpu_enable_longrun
 i386/i386/machdep.c		standard
 i386/i386/mem.c			optional mem
 i386/i386/minidump_machdep.c	standard
 i386/i386/minidump_machdep_pae.c	standard
 i386/i386/minidump_machdep_nopae.c	standard
 i386/i386/mp_clock.c		optional smp
 i386/i386/mp_machdep.c		optional smp
 i386/i386/mpboot.s		optional smp
 i386/i386/npx.c			standard
 i386/i386/perfmon.c		optional perfmon
 i386/i386/pmap_base.c		standard
 i386/i386/pmap_nopae.c		standard
 i386/i386/pmap_pae.c		standard
 i386/i386/prof_machdep.c	optional profiling-routine
 i386/i386/ptrace_machdep.c	standard
 i386/i386/sigtramp.s		standard
 i386/i386/support.s		standard
 i386/i386/swtch.s		standard
 i386/i386/sys_machdep.c		standard
 i386/i386/trap.c		standard
 i386/i386/uio_machdep.c		standard
 i386/i386/vm86.c		standard
 i386/i386/vm_machdep.c		standard
 i386/linux/imgact_linux.c	optional compat_linux
 i386/linux/linux_copyout.c	optional compat_linux
 i386/linux/linux_dummy_machdep.c	optional compat_linux
 i386/linux/linux_machdep.c	optional compat_linux
 i386/linux/linux_ptrace.c	optional compat_linux
 i386/linux/linux_sysent.c	optional compat_linux
 i386/linux/linux_sysvec.c	optional compat_linux
 i386/pci/pci_cfgreg.c		optional pci
 i386/pci/pci_pir.c		optional pci
 isa/syscons_isa.c		optional sc
 isa/vga_isa.c			optional vga
 kern/imgact_aout.c		optional compat_aout
 kern/subr_sfbuf.c		standard
 libkern/divdi3.c		standard
 libkern/ffsll.c			standard
 libkern/flsll.c			standard
 libkern/memcmp.c		standard
 libkern/memset.c		standard
 libkern/moddi3.c		standard
 libkern/qdivrem.c		standard
 libkern/ucmpdi2.c		standard
 libkern/udivdi3.c		standard
 libkern/umoddi3.c		standard
 #
 # x86 real mode BIOS support, required by dpms/pci/vesa
 #
 compat/x86bios/x86bios.c	optional x86bios | dpms | pci | vesa
 # Common files where we currently configure the system differently, but perhaps shouldn't
 # config(8) doesn't have a way to force standard options, so we've been inconsistent
 # about marking non-optional things 'standard'.
 x86/acpica/madt.c		optional acpi apic
 x86/cpufreq/smist.c		optional cpufreq
 x86/isa/atpic.c			optional atpic
 x86/isa/elcr.c			optional atpic | apic
 x86/isa/isa.c			optional isa
 x86/isa/isa_dma.c		optional isa
 x86/linux/linux_dummy_x86.c	optional compat_linux
 x86/x86/io_apic.c		optional apic
 x86/x86/local_apic.c		optional apic
 x86/x86/mptable.c		optional apic
 x86/x86/mptable_pci.c		optional apic pci
 x86/x86/msi.c			optional apic pci
 
 compat/linuxkpi/common/src/linux_fpu.c		optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
diff --git a/sys/conf/files.x86 b/sys/conf/files.x86
index f51392d0614c..cb7fabf44cfb 100644
--- a/sys/conf/files.x86
+++ b/sys/conf/files.x86
@@ -1,354 +1,344 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
 # $FreeBSD$
 #
 # This file contains all the x86 devices and such that are
 # common between i386 and amd64, but aren't applicable to
 # any other architecture we support.
 #
 
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
 # dependency lines other than the first are silently ignored.
 
 #
 atkbdmap.h			optional	atkbd_dflt_keymap	\
 	compile-with	"${KEYMAP} -L ${ATKBD_DFLT_KEYMAP} | ${KEYMAP_FIX} > ${.TARGET}" \
 	no-obj no-implicit-rule before-depend				\
 	clean		"atkbdmap.h"
 cddl/dev/fbt/x86/fbt_isa.c				optional dtrace_fbt | dtraceall compile-with "${FBT_C}"
 cddl/dev/dtrace/x86/dis_tables.c			optional dtrace_fbt | dtraceall compile-with "${DTRACE_C}"
 cddl/dev/dtrace/x86/instr_size.c			optional dtrace_fbt | dtraceall compile-with "${DTRACE_C}"
-compat/ndis/kern_ndis.c		optional ndisapi pci
-compat/ndis/kern_windrv.c	optional ndisapi pci
-compat/ndis/subr_hal.c		optional ndisapi pci
-compat/ndis/subr_ndis.c		optional ndisapi pci
-compat/ndis/subr_ntoskrnl.c	optional ndisapi pci
-compat/ndis/subr_pe.c		optional ndisapi pci
-compat/ndis/subr_usbd.c		optional ndisapi pci
 crypto/aesni/aesni.c		optional aesni
 aesni_ghash.o			optional aesni				\
 	dependency	"$S/crypto/aesni/aesni_ghash.c"			\
 	compile-with	"${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${NO_WCAST_QUAL} ${PROF} -mmmx -msse -msse4 -maes -mpclmul ${.IMPSRC}" \
 	no-implicit-rule						\
 	clean		"aesni_ghash.o"
 aesni_ccm.o			optional aesni				\
 	dependency	"$S/crypto/aesni/aesni_ccm.c"			\
 	compile-with	"${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${NO_WCAST_QUAL} ${PROF} -mmmx -msse -msse4 -maes -mpclmul ${.IMPSRC}" \
 	no-implicit-rule						\
 	clean		"aesni_ccm.o"
 aesni_wrap.o			optional aesni				\
 	dependency	"$S/crypto/aesni/aesni_wrap.c"			\
 	compile-with	"${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${NO_WCAST_QUAL} ${PROF} -mmmx -msse -msse4 -maes ${.IMPSRC}" \
 	no-implicit-rule						\
 	clean		"aesni_wrap.o"
 intel_sha1.o			optional	aesni			\
 	dependency	"$S/crypto/aesni/intel_sha1.c"			\
 	compile-with	"${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${PROF} -mmmx -msse -msse4 -msha ${.IMPSRC}" \
 	no-implicit-rule						\
 	clean		"intel_sha1.o"
 intel_sha256.o			optional	aesni			\
 	dependency	"$S/crypto/aesni/intel_sha256.c"		\
 	compile-with	"${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${PROF} -mmmx -msse -msse4 -msha ${.IMPSRC}" \
 	no-implicit-rule						\
 	clean		"intel_sha256.o"
 crypto/openssl/ossl_x86.c	optional ossl
 crypto/via/padlock.c		optional padlock
 crypto/via/padlock_cipher.c	optional padlock
 crypto/via/padlock_hash.c	optional padlock
 dev/acpica/acpi_hpet.c		optional	acpi
 dev/acpica/acpi_if.m		standard
 dev/acpica/acpi_pci.c		optional	acpi pci
 dev/acpica/acpi_pci_link.c	optional	acpi pci
 dev/acpica/acpi_pcib.c		optional	acpi pci
 dev/acpica/acpi_pcib_acpi.c	optional	acpi pci
 dev/acpica/acpi_pcib_pci.c	optional	acpi pci
 dev/acpica/acpi_pxm.c		optional	acpi
 dev/acpica/acpi_timer.c		optional	acpi
 dev/amdsbwd/amdsbwd.c		optional	amdsbwd
 dev/amdsmn/amdsmn.c		optional	amdsmn | amdtemp
 dev/amdtemp/amdtemp.c		optional	amdtemp
 dev/arcmsr/arcmsr.c		optional	arcmsr pci
 dev/asmc/asmc.c			optional	asmc isa
 dev/atkbdc/atkbd.c		optional	atkbd atkbdc
 dev/atkbdc/atkbd_atkbdc.c	optional	atkbd atkbdc
 dev/atkbdc/atkbdc.c		optional	atkbdc
 dev/atkbdc/atkbdc_isa.c		optional	atkbdc isa
 dev/atkbdc/atkbdc_subr.c	optional	atkbdc
 dev/atkbdc/psm.c		optional	psm atkbdc
 dev/bxe/bxe.c                   optional	bxe pci
 dev/bxe/bxe_stats.c             optional	bxe pci
 dev/bxe/bxe_debug.c             optional	bxe pci
 dev/bxe/ecore_sp.c              optional	bxe pci
 dev/bxe/bxe_elink.c             optional	bxe pci
 dev/bxe/57710_init_values.c     optional	bxe pci
 dev/bxe/57711_init_values.c     optional	bxe pci
 dev/bxe/57712_init_values.c     optional	bxe pci
 dev/coretemp/coretemp.c		optional	coretemp
 dev/cpuctl/cpuctl.c		optional	cpuctl
 dev/dpms/dpms.c			optional	dpms
 dev/fb/fb.c			optional	fb | vga
 dev/fb/s3_pci.c			optional	s3pci
 dev/fb/vesa.c			optional	vga vesa
 dev/fb/vga.c			optional	vga
 dev/fdc/fdc.c			optional	fdc
 dev/fdc/fdc_acpi.c		optional	fdc
 dev/fdc/fdc_isa.c		optional	fdc isa
 dev/gpio/bytgpio.c		optional	bytgpio
 dev/gpio/chvgpio.c		optional	chvgpio
 dev/hpt27xx/hpt27xx_os_bsd.c	optional	hpt27xx
 dev/hpt27xx/hpt27xx_osm_bsd.c	optional	hpt27xx
 dev/hpt27xx/hpt27xx_config.c	optional	hpt27xx
 hpt27xx_lib.o			optional	hpt27xx			\
 	dependency	"$S/dev/hpt27xx/$M-elf.hpt27xx_lib.o.uu"	\
 	compile-with	"uudecode < $S/dev/hpt27xx/$M-elf.hpt27xx_lib.o.uu" \
 	no-implicit-rule
 dev/hptmv/entry.c		optional	hptmv
 dev/hptmv/mv.c			optional	hptmv
 dev/hptmv/gui_lib.c		optional	hptmv
 dev/hptmv/hptproc.c		optional	hptmv
 dev/hptmv/ioctl.c		optional	hptmv
 hptmvraid.o			optional	hptmv			\
 	dependency	"$S/dev/hptmv/$M-elf.raid.o.uu"			\
 	compile-with	"uudecode < $S/dev/hptmv/$M-elf.raid.o.uu"	\
 	no-implicit-rule
 dev/hptnr/hptnr_os_bsd.c	optional	hptnr
 dev/hptnr/hptnr_osm_bsd.c	optional	hptnr
 dev/hptnr/hptnr_config.c	optional	hptnr
 hptnr_lib.o			optional	hptnr			\
 	dependency	"$S/dev/hptnr/$M-elf.hptnr_lib.o.uu"		\
 	compile-with	"uudecode < $S/dev/hptnr/$M-elf.hptnr_lib.o.uu" \
 	no-implicit-rule
 dev/hptrr/hptrr_os_bsd.c	optional	hptrr
 dev/hptrr/hptrr_osm_bsd.c	optional	hptrr
 dev/hptrr/hptrr_config.c	optional	hptrr
 hptrr_lib.o			optional	hptrr			\
 	dependency	"$S/dev/hptrr/$M-elf.hptrr_lib.o.uu"		\
 	compile-with	"uudecode < $S/dev/hptrr/$M-elf.hptrr_lib.o.uu" \
 	no-implicit-rule
 dev/hwpmc/hwpmc_amd.c		optional	hwpmc
 dev/hwpmc/hwpmc_intel.c		optional	hwpmc
 dev/hwpmc/hwpmc_core.c		optional	hwpmc
 dev/hwpmc/hwpmc_uncore.c	optional	hwpmc
 dev/hwpmc/hwpmc_tsc.c		optional	hwpmc
 dev/hwpmc/hwpmc_x86.c		optional	hwpmc
 dev/hyperv/hvsock/hv_sock.c				optional	hyperv
 dev/hyperv/input/hv_kbd.c				optional	hyperv
 dev/hyperv/input/hv_kbdc.c				optional	hyperv
 dev/hyperv/pcib/vmbus_pcib.c				optional	hyperv pci
 dev/hyperv/netvsc/hn_nvs.c				optional	hyperv
 dev/hyperv/netvsc/hn_rndis.c				optional	hyperv
 dev/hyperv/netvsc/if_hn.c				optional	hyperv
 dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c		optional	hyperv
 dev/hyperv/utilities/hv_kvp.c				optional	hyperv
 dev/hyperv/utilities/hv_snapshot.c			optional	hyperv
 dev/hyperv/utilities/vmbus_heartbeat.c			optional	hyperv
 dev/hyperv/utilities/vmbus_ic.c				optional	hyperv
 dev/hyperv/utilities/vmbus_shutdown.c			optional	hyperv
 dev/hyperv/utilities/vmbus_timesync.c			optional	hyperv
 dev/hyperv/vmbus/hyperv.c				optional	hyperv
 dev/hyperv/vmbus/hyperv_busdma.c			optional	hyperv
 dev/hyperv/vmbus/vmbus.c				optional	hyperv pci
 dev/hyperv/vmbus/vmbus_br.c				optional	hyperv
 dev/hyperv/vmbus/vmbus_chan.c				optional	hyperv
 dev/hyperv/vmbus/vmbus_et.c				optional	hyperv
 dev/hyperv/vmbus/vmbus_if.m				optional	hyperv
 dev/hyperv/vmbus/vmbus_res.c				optional	hyperv
 dev/hyperv/vmbus/vmbus_xact.c				optional	hyperv
 dev/ichwd/ichwd.c		optional	ichwd
-dev/if_ndis/if_ndis.c		optional	ndis
-dev/if_ndis/if_ndis_pci.c	optional	ndis cardbus | ndis pci
-dev/if_ndis/if_ndis_usb.c	optional	ndis usb
 dev/imcsmb/imcsmb.c		optional	imcsmb
 dev/imcsmb/imcsmb_pci.c		optional	imcsmb pci
 dev/intel/spi.c			optional	intelspi
 dev/io/iodev.c			optional	io
 dev/iommu/busdma_iommu.c	optional	acpi iommu pci
 dev/iommu/iommu_gas.c		optional	acpi iommu pci
 dev/ipmi/ipmi.c			optional	ipmi
 dev/ipmi/ipmi_acpi.c		optional	ipmi acpi
 dev/ipmi/ipmi_isa.c		optional	ipmi isa
 dev/ipmi/ipmi_kcs.c		optional	ipmi
 dev/ipmi/ipmi_smic.c		optional	ipmi
 dev/ipmi/ipmi_smbus.c		optional	ipmi smbus
 dev/ipmi/ipmi_smbios.c		optional	ipmi
 dev/ipmi/ipmi_ssif.c		optional	ipmi smbus
 dev/ipmi/ipmi_pci.c		optional	ipmi pci
 dev/ipmi/ipmi_linux.c		optional	ipmi compat_linux32
 dev/isci/isci.c							optional isci
 dev/isci/isci_controller.c					optional isci
 dev/isci/isci_domain.c						optional isci
 dev/isci/isci_interrupt.c					optional isci
 dev/isci/isci_io_request.c					optional isci
 dev/isci/isci_logger.c						optional isci
 dev/isci/isci_oem_parameters.c					optional isci
 dev/isci/isci_remote_device.c					optional isci
 dev/isci/isci_sysctl.c						optional isci
 dev/isci/isci_task_request.c					optional isci
 dev/isci/isci_timer.c						optional isci
 dev/isci/scil/sati.c						optional isci
 dev/isci/scil/sati_abort_task_set.c				optional isci
 dev/isci/scil/sati_atapi.c					optional isci
 dev/isci/scil/sati_device.c					optional isci
 dev/isci/scil/sati_inquiry.c					optional isci
 dev/isci/scil/sati_log_sense.c					optional isci
 dev/isci/scil/sati_lun_reset.c					optional isci
 dev/isci/scil/sati_mode_pages.c					optional isci
 dev/isci/scil/sati_mode_select.c				optional isci
 dev/isci/scil/sati_mode_sense.c					optional isci
 dev/isci/scil/sati_mode_sense_10.c				optional isci
 dev/isci/scil/sati_mode_sense_6.c				optional isci
 dev/isci/scil/sati_move.c					optional isci
 dev/isci/scil/sati_passthrough.c				optional isci
 dev/isci/scil/sati_read.c					optional isci
 dev/isci/scil/sati_read_buffer.c				optional isci
 dev/isci/scil/sati_read_capacity.c				optional isci
 dev/isci/scil/sati_reassign_blocks.c				optional isci
 dev/isci/scil/sati_report_luns.c				optional isci
 dev/isci/scil/sati_request_sense.c				optional isci
 dev/isci/scil/sati_start_stop_unit.c				optional isci
 dev/isci/scil/sati_synchronize_cache.c				optional isci
 dev/isci/scil/sati_test_unit_ready.c				optional isci
 dev/isci/scil/sati_unmap.c					optional isci
 dev/isci/scil/sati_util.c					optional isci
 dev/isci/scil/sati_verify.c					optional isci
 dev/isci/scil/sati_write.c					optional isci
 dev/isci/scil/sati_write_and_verify.c				optional isci
 dev/isci/scil/sati_write_buffer.c				optional isci
 dev/isci/scil/sati_write_long.c					optional isci
 dev/isci/scil/sci_abstract_list.c				optional isci
 dev/isci/scil/sci_base_controller.c				optional isci
 dev/isci/scil/sci_base_domain.c					optional isci
 dev/isci/scil/sci_base_iterator.c				optional isci
 dev/isci/scil/sci_base_library.c				optional isci
 dev/isci/scil/sci_base_logger.c					optional isci
 dev/isci/scil/sci_base_memory_descriptor_list.c			optional isci
 dev/isci/scil/sci_base_memory_descriptor_list_decorator.c	optional isci
 dev/isci/scil/sci_base_object.c					optional isci
 dev/isci/scil/sci_base_observer.c				optional isci
 dev/isci/scil/sci_base_phy.c					optional isci
 dev/isci/scil/sci_base_port.c					optional isci
 dev/isci/scil/sci_base_remote_device.c				optional isci
 dev/isci/scil/sci_base_request.c				optional isci
 dev/isci/scil/sci_base_state_machine.c				optional isci
 dev/isci/scil/sci_base_state_machine_logger.c			optional isci
 dev/isci/scil/sci_base_state_machine_observer.c			optional isci
 dev/isci/scil/sci_base_subject.c				optional isci
 dev/isci/scil/sci_util.c					optional isci
 dev/isci/scil/scic_sds_controller.c				optional isci
 dev/isci/scil/scic_sds_library.c				optional isci
 dev/isci/scil/scic_sds_pci.c					optional isci
 dev/isci/scil/scic_sds_phy.c					optional isci
 dev/isci/scil/scic_sds_port.c					optional isci
 dev/isci/scil/scic_sds_port_configuration_agent.c		optional isci
 dev/isci/scil/scic_sds_remote_device.c				optional isci
 dev/isci/scil/scic_sds_remote_node_context.c			optional isci
 dev/isci/scil/scic_sds_remote_node_table.c			optional isci
 dev/isci/scil/scic_sds_request.c				optional isci
 dev/isci/scil/scic_sds_sgpio.c					optional isci
 dev/isci/scil/scic_sds_smp_remote_device.c			optional isci
 dev/isci/scil/scic_sds_smp_request.c				optional isci
 dev/isci/scil/scic_sds_ssp_request.c				optional isci
 dev/isci/scil/scic_sds_stp_packet_request.c			optional isci
 dev/isci/scil/scic_sds_stp_remote_device.c			optional isci
 dev/isci/scil/scic_sds_stp_request.c				optional isci
 dev/isci/scil/scic_sds_unsolicited_frame_control.c		optional isci
 dev/isci/scil/scif_sas_controller.c				optional isci
 dev/isci/scil/scif_sas_controller_state_handlers.c		optional isci
 dev/isci/scil/scif_sas_controller_states.c			optional isci
 dev/isci/scil/scif_sas_domain.c					optional isci
 dev/isci/scil/scif_sas_domain_state_handlers.c			optional isci
 dev/isci/scil/scif_sas_domain_states.c				optional isci
 dev/isci/scil/scif_sas_high_priority_request_queue.c		optional isci
 dev/isci/scil/scif_sas_internal_io_request.c			optional isci
 dev/isci/scil/scif_sas_io_request.c				optional isci
 dev/isci/scil/scif_sas_io_request_state_handlers.c		optional isci
 dev/isci/scil/scif_sas_io_request_states.c			optional isci
 dev/isci/scil/scif_sas_library.c				optional isci
 dev/isci/scil/scif_sas_remote_device.c				optional isci
 dev/isci/scil/scif_sas_remote_device_ready_substate_handlers.c	optional isci
 dev/isci/scil/scif_sas_remote_device_ready_substates.c		optional isci
 dev/isci/scil/scif_sas_remote_device_starting_substate_handlers.c		optional isci
 dev/isci/scil/scif_sas_remote_device_starting_substates.c	optional isci
 dev/isci/scil/scif_sas_remote_device_state_handlers.c		optional isci
 dev/isci/scil/scif_sas_remote_device_states.c			optional isci
 dev/isci/scil/scif_sas_request.c				optional isci
 dev/isci/scil/scif_sas_smp_activity_clear_affiliation.c		optional isci
 dev/isci/scil/scif_sas_smp_io_request.c				optional isci
 dev/isci/scil/scif_sas_smp_phy.c				optional isci
 dev/isci/scil/scif_sas_smp_remote_device.c			optional isci
 dev/isci/scil/scif_sas_stp_io_request.c				optional isci
 dev/isci/scil/scif_sas_stp_remote_device.c			optional isci
 dev/isci/scil/scif_sas_stp_task_request.c			optional isci
 dev/isci/scil/scif_sas_task_request.c				optional isci
 dev/isci/scil/scif_sas_task_request_state_handlers.c		optional isci
 dev/isci/scil/scif_sas_task_request_states.c			optional isci
 dev/isci/scil/scif_sas_timer.c					optional isci
 dev/itwd/itwd.c							optional itwd
 dev/qat/qat.c			optional qat
 dev/qat/qat_ae.c		optional qat
 dev/qat/qat_c2xxx.c		optional qat
 dev/qat/qat_c3xxx.c		optional qat
 dev/qat/qat_c62x.c		optional qat
 dev/qat/qat_d15xx.c		optional qat
 dev/qat/qat_dh895xcc.c		optional qat
 dev/qat/qat_hw15.c		optional qat
 dev/qat/qat_hw17.c		optional qat
 libkern/x86/crc32_sse42.c	standard
 #
 # x86 shared code between IA32 and AMD64 architectures
 #
 x86/acpica/OsdEnvironment.c	optional	acpi
 x86/acpica/acpi_apm.c		optional	acpi
 x86/acpica/acpi_wakeup.c	optional	acpi
 x86/acpica/srat.c		optional	acpi
 x86/bios/smbios.c		optional	smbios
 x86/bios/vpd.c			optional	vpd
 x86/cpufreq/est.c		optional	cpufreq
 x86/cpufreq/hwpstate_amd.c	optional	cpufreq
 x86/cpufreq/hwpstate_intel.c	optional	cpufreq
 x86/cpufreq/p4tcc.c		optional	cpufreq
 x86/cpufreq/powernow.c		optional	cpufreq
 x86/iommu/intel_ctx.c		optional	acpi iommu pci
 x86/iommu/intel_drv.c		optional	acpi iommu pci
 x86/iommu/intel_fault.c		optional	acpi iommu pci
 x86/iommu/intel_idpgtbl.c	optional	acpi iommu pci
 x86/iommu/intel_intrmap.c	optional	acpi iommu pci
 x86/iommu/intel_qi.c		optional	acpi iommu pci
 x86/iommu/intel_quirks.c	optional	acpi iommu pci
 x86/iommu/intel_utils.c		optional	acpi iommu pci
 x86/isa/atrtc.c			standard
 x86/isa/clock.c			standard
 x86/isa/isa.c			optional	isa
 x86/isa/isa_dma.c		optional	isa
 x86/isa/nmi.c			standard
 x86/isa/orm.c			optional	isa
 x86/pci/pci_bus.c		optional	pci
 x86/pci/qpi.c			optional	pci
 x86/x86/autoconf.c		standard
 x86/x86/bus_machdep.c		standard
 x86/x86/busdma_bounce.c		standard
 x86/x86/busdma_machdep.c	standard
 x86/x86/cpu_machdep.c		standard
 x86/x86/dump_machdep.c		standard
 x86/x86/fdt_machdep.c		optional	fdt
 x86/x86/identcpu.c		standard
 x86/x86/intr_machdep.c		standard
 x86/x86/legacy.c		standard
 x86/x86/mca.c			standard
 x86/x86/x86_mem.c		optional	mem
 x86/x86/mp_x86.c		optional	smp
 x86/x86/mp_watchdog.c		optional	mp_watchdog smp
 x86/x86/nexus.c			standard
 x86/x86/pvclock.c		standard
 x86/x86/stack_machdep.c		optional	ddb | stack
 x86/x86/tsc.c			standard
 x86/x86/ucode.c			standard
 x86/x86/delay.c			standard
 x86/xen/hvm.c			optional	xenhvm
 x86/xen/xen_intr.c		optional	xenhvm
 x86/xen/xen_apic.c		optional	xenhvm
 x86/xen/xenpv.c			optional	xenhvm
 x86/xen/xen_msi.c		optional	xenhvm
 x86/xen/xen_nexus.c		optional	xenhvm
diff --git a/sys/dev/if_ndis/if_ndis.c b/sys/dev/if_ndis/if_ndis.c
deleted file mode 100644
index 1a5e8eeed4be..000000000000
--- a/sys/dev/if_ndis/if_ndis.c
+++ /dev/null
@@ -1,3423 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
- * Copyright (c) 2003
- *	Bill Paul <wpaul@windriver.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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.
- *
- * WPA support originally contributed by Arvind Srinivasan <arvind@celar.us>
- * then hacked upon mercilessly by my.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/sockio.h>
-#include <sys/mbuf.h>
-#include <sys/malloc.h>
-#include <sys/endian.h>
-#include <sys/priv.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
-#include <sys/queue.h>
-#include <sys/module.h>
-#include <sys/proc.h>
-#include <sys/sysctl.h>
-#include <sys/kthread.h>
-#include <sys/limits.h>
-
-#include <net/if.h>
-#include <net/if_var.h>
-#include <net/if_arp.h>
-#include <net/ethernet.h>
-#include <net/if_dl.h>
-#include <net/if_media.h>
-#include <net/if_types.h>
-#include <net/route.h>
-
-#include <net/bpf.h>
-
-#include <machine/bus.h>
-#include <machine/resource.h>
-#include <sys/bus.h>
-#include <sys/rman.h>
-
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_ioctl.h>
-#include <net80211/ieee80211_regdomain.h>
-
-#include <dev/pci/pcireg.h>
-#include <dev/pci/pcivar.h>
-#include <dev/usb/usb.h>
-#include <dev/usb/usbdi.h>
-
-#include <compat/ndis/pe_var.h>
-#include <compat/ndis/cfg_var.h>
-#include <compat/ndis/resource_var.h>
-#include <compat/ndis/ntoskrnl_var.h>
-#include <compat/ndis/hal_var.h>
-#include <compat/ndis/ndis_var.h>
-#include <compat/ndis/usbd_var.h>
-#include <dev/if_ndis/if_ndisvar.h>
-
-#define NDIS_DEBUG
-#ifdef NDIS_DEBUG
-#define DPRINTF(x)	do { if (ndis_debug > 0) printf x; } while (0)
-int ndis_debug = 0;
-SYSCTL_INT(_debug, OID_AUTO, ndis, CTLFLAG_RW, &ndis_debug, 0,
-    "if_ndis debug level");
-#else
-#define DPRINTF(x)
-#endif
-
-SYSCTL_DECL(_hw_ndisusb);
-int ndisusb_halt = 1;
-SYSCTL_INT(_hw_ndisusb, OID_AUTO, halt, CTLFLAG_RW, &ndisusb_halt, 0,
-    "Halt NDIS USB driver when it's attached");
-
-/* 0 - 30 dBm to mW conversion table */
-static const uint16_t dBm2mW[] = {
-	1, 1, 1, 1, 2, 2, 2, 2, 3, 3,
-	3, 4, 4, 4, 5, 6, 6, 7, 8, 9,
-	10, 11, 13, 14, 16, 18, 20, 22, 25, 28,
-	32, 35, 40, 45, 50, 56, 63, 71, 79, 89,
-	100, 112, 126, 141, 158, 178, 200, 224, 251, 282,
-	316, 355, 398, 447, 501, 562, 631, 708, 794, 891,
-	1000
-};
-
-MODULE_DEPEND(ndis, ether, 1, 1, 1);
-MODULE_DEPEND(ndis, wlan, 1, 1, 1);
-MODULE_DEPEND(ndis, ndisapi, 1, 1, 1);
-
-MODULE_VERSION(ndis, 1);
-
-int ndis_attach			(device_t);
-int ndis_detach			(device_t);
-int ndis_suspend		(device_t);
-int ndis_resume			(device_t);
-void ndis_shutdown		(device_t);
-
-int ndisdrv_modevent		(module_t, int, void *);
-
-static void ndis_txeof		(ndis_handle, ndis_packet *, ndis_status);
-static void ndis_rxeof		(ndis_handle, ndis_packet **, uint32_t);
-static void ndis_rxeof_eth	(ndis_handle, ndis_handle, char *, void *,
-				 uint32_t, void *, uint32_t, uint32_t);
-static void ndis_rxeof_done	(ndis_handle);
-static void ndis_rxeof_xfr	(kdpc *, ndis_handle, void *, void *);
-static void ndis_rxeof_xfr_done	(ndis_handle, ndis_packet *,
-				 uint32_t, uint32_t);
-static void ndis_linksts	(ndis_handle, ndis_status, void *, uint32_t);
-static void ndis_linksts_done	(ndis_handle);
-
-/* We need to wrap these functions for amd64. */
-static funcptr ndis_txeof_wrap;
-static funcptr ndis_rxeof_wrap;
-static funcptr ndis_rxeof_eth_wrap;
-static funcptr ndis_rxeof_done_wrap;
-static funcptr ndis_rxeof_xfr_wrap;
-static funcptr ndis_rxeof_xfr_done_wrap;
-static funcptr ndis_linksts_wrap;
-static funcptr ndis_linksts_done_wrap;
-static funcptr ndis_ticktask_wrap;
-static funcptr ndis_ifstarttask_wrap;
-static funcptr ndis_resettask_wrap;
-static funcptr ndis_inputtask_wrap;
-
-static struct	ieee80211vap *ndis_vap_create(struct ieee80211com *,
-		    const char [IFNAMSIZ], int, enum ieee80211_opmode, int,
-		    const uint8_t [IEEE80211_ADDR_LEN],
-		    const uint8_t [IEEE80211_ADDR_LEN]);
-static void ndis_vap_delete	(struct ieee80211vap *);
-static void ndis_tick		(void *);
-static void ndis_ticktask	(device_object *, void *);
-static int ndis_raw_xmit	(struct ieee80211_node *, struct mbuf *,
-	const struct ieee80211_bpf_params *);
-static void ndis_update_mcast	(struct ieee80211com *);
-static void ndis_update_promisc	(struct ieee80211com *);
-static void ndis_ifstart	(struct ifnet *);
-static void ndis_ifstarttask	(device_object *, void *);
-static void ndis_resettask	(device_object *, void *);
-static void ndis_inputtask	(device_object *, void *);
-static int ndis_ifioctl		(struct ifnet *, u_long, caddr_t);
-static int ndis_newstate	(struct ieee80211vap *, enum ieee80211_state,
-	int);
-static int ndis_nettype_chan	(uint32_t);
-static int ndis_nettype_mode	(uint32_t);
-static void ndis_scan		(void *);
-static void ndis_scan_results	(struct ndis_softc *);
-static void ndis_scan_start	(struct ieee80211com *);
-static void ndis_scan_end	(struct ieee80211com *);
-static void ndis_set_channel	(struct ieee80211com *);
-static void ndis_scan_curchan	(struct ieee80211_scan_state *, unsigned long);
-static void ndis_scan_mindwell	(struct ieee80211_scan_state *);
-static void ndis_init		(void *);
-static void ndis_stop		(struct ndis_softc *);
-static int ndis_ifmedia_upd	(struct ifnet *);
-static void ndis_ifmedia_sts	(struct ifnet *, struct ifmediareq *);
-static int ndis_get_bssid_list	(struct ndis_softc *,
-					ndis_80211_bssid_list_ex **);
-static int ndis_get_assoc	(struct ndis_softc *, ndis_wlan_bssid_ex **);
-static int ndis_probe_offload	(struct ndis_softc *);
-static int ndis_set_offload	(struct ndis_softc *);
-static void ndis_getstate_80211	(struct ndis_softc *);
-static void ndis_setstate_80211	(struct ndis_softc *);
-static void ndis_auth_and_assoc	(struct ndis_softc *, struct ieee80211vap *);
-static void ndis_media_status	(struct ifnet *, struct ifmediareq *);
-static int ndis_set_cipher	(struct ndis_softc *, int);
-static int ndis_set_wpa		(struct ndis_softc *, void *, int);
-static int ndis_add_key		(struct ieee80211vap *,
-	const struct ieee80211_key *);
-static int ndis_del_key		(struct ieee80211vap *,
-	const struct ieee80211_key *);
-static void ndis_setmulti	(struct ndis_softc *);
-static void ndis_map_sclist	(void *, bus_dma_segment_t *,
-	int, bus_size_t, int);
-static int ndis_ifattach(struct ndis_softc *);
-
-static int ndis_80211attach(struct ndis_softc *);
-static int ndis_80211ioctl(struct ieee80211com *, u_long , void *);
-static int ndis_80211transmit(struct ieee80211com *, struct mbuf *);
-static void ndis_80211parent(struct ieee80211com *);
-
-static int ndisdrv_loaded = 0;
-
-/*
- * This routine should call windrv_load() once for each driver
- * image. This will do the relocation and dynalinking for the
- * image, and create a Windows driver object which will be
- * saved in our driver database.
- */
-int
-ndisdrv_modevent(mod, cmd, arg)
-	module_t		mod;
-	int			cmd;
-	void			*arg;
-{
-	int			error = 0;
-
-	switch (cmd) {
-	case MOD_LOAD:
-		ndisdrv_loaded++;
-                if (ndisdrv_loaded > 1)
-			break;
-		windrv_wrap((funcptr)ndis_rxeof, &ndis_rxeof_wrap,
-		    3, WINDRV_WRAP_STDCALL);
-		windrv_wrap((funcptr)ndis_rxeof_eth, &ndis_rxeof_eth_wrap,
-		    8, WINDRV_WRAP_STDCALL);
-		windrv_wrap((funcptr)ndis_rxeof_done, &ndis_rxeof_done_wrap,
-		    1, WINDRV_WRAP_STDCALL);
-		windrv_wrap((funcptr)ndis_rxeof_xfr, &ndis_rxeof_xfr_wrap,
-		    4, WINDRV_WRAP_STDCALL);
-		windrv_wrap((funcptr)ndis_rxeof_xfr_done,
-		    &ndis_rxeof_xfr_done_wrap, 4, WINDRV_WRAP_STDCALL);
-		windrv_wrap((funcptr)ndis_txeof, &ndis_txeof_wrap,
-		    3, WINDRV_WRAP_STDCALL);
-		windrv_wrap((funcptr)ndis_linksts, &ndis_linksts_wrap,
-		    4, WINDRV_WRAP_STDCALL);
-		windrv_wrap((funcptr)ndis_linksts_done,
-		    &ndis_linksts_done_wrap, 1, WINDRV_WRAP_STDCALL);
-		windrv_wrap((funcptr)ndis_ticktask, &ndis_ticktask_wrap,
-		    2, WINDRV_WRAP_STDCALL);
-		windrv_wrap((funcptr)ndis_ifstarttask, &ndis_ifstarttask_wrap,
-		    2, WINDRV_WRAP_STDCALL);
-		windrv_wrap((funcptr)ndis_resettask, &ndis_resettask_wrap,
-		    2, WINDRV_WRAP_STDCALL);
-		windrv_wrap((funcptr)ndis_inputtask, &ndis_inputtask_wrap,
-		    2, WINDRV_WRAP_STDCALL);
-		break;
-	case MOD_UNLOAD:
-		ndisdrv_loaded--;
-		if (ndisdrv_loaded > 0)
-			break;
-		/* fallthrough */
-	case MOD_SHUTDOWN:
-		windrv_unwrap(ndis_rxeof_wrap);
-		windrv_unwrap(ndis_rxeof_eth_wrap);
-		windrv_unwrap(ndis_rxeof_done_wrap);
-		windrv_unwrap(ndis_rxeof_xfr_wrap);
-		windrv_unwrap(ndis_rxeof_xfr_done_wrap);
-		windrv_unwrap(ndis_txeof_wrap);
-		windrv_unwrap(ndis_linksts_wrap);
-		windrv_unwrap(ndis_linksts_done_wrap);
-		windrv_unwrap(ndis_ticktask_wrap);
-		windrv_unwrap(ndis_ifstarttask_wrap);
-		windrv_unwrap(ndis_resettask_wrap);
-		windrv_unwrap(ndis_inputtask_wrap);
-		break;
-	default:
-		error = EINVAL;
-		break;
-	}
-
-	return (error);
-}
-
-struct mclist_ctx {
-	uint8_t *mclist;
-	int mclistsz;
-};
-
-static u_int
-ndis_copy_maddr(void *arg, struct sockaddr_dl *sdl, u_int cnt)
-{
-	struct mclist_ctx *ctx = arg;
-
-	if (cnt < ctx->mclistsz)
-		bcopy(LLADDR(sdl), ctx->mclist + (ETHER_ADDR_LEN * cnt),
-		    ETHER_ADDR_LEN);
-	return (1);
-}
-
-/*
- * Program the 64-bit multicast hash filter.
- */
-static void
-ndis_setmulti(sc)
-	struct ndis_softc	*sc;
-{
-	struct ifnet		*ifp;
-	struct mclist_ctx	ctx;
-	int			len, error;
-
-
-	if (!NDIS_INITIALIZED(sc))
-		return;
-
-	if (sc->ndis_80211)
-		return;
-
-	ifp = sc->ifp;
-	if (ifp->if_flags & IFF_ALLMULTI || ifp->if_flags & IFF_PROMISC) {
-		sc->ndis_filter |= NDIS_PACKET_TYPE_ALL_MULTICAST;
-		len = sizeof(sc->ndis_filter);
-		error = ndis_set_info(sc, OID_GEN_CURRENT_PACKET_FILTER,
-		    &sc->ndis_filter, &len);
-		if (error)
-			device_printf(sc->ndis_dev,
-			    "set allmulti failed: %d\n", error);
-		return;
-	}
-
-	if (if_llmaddr_count(ifp) == 0)
-		return;
-
-	len = sizeof(ctx.mclistsz);
-	ndis_get_info(sc, OID_802_3_MAXIMUM_LIST_SIZE, &ctx.mclistsz, &len);
-
-	ctx.mclist = malloc(ETHER_ADDR_LEN * ctx.mclistsz, M_TEMP,
-	    M_NOWAIT | M_ZERO);
-
-	if (ctx.mclist == NULL) {
-		sc->ndis_filter |= NDIS_PACKET_TYPE_ALL_MULTICAST;
-		goto out;
-	}
-
-	sc->ndis_filter |= NDIS_PACKET_TYPE_MULTICAST;
-
-	len = if_foreach_llmaddr(ifp, ndis_copy_maddr, &ctx);
-	if (len > ctx.mclistsz) {
-		sc->ndis_filter |= NDIS_PACKET_TYPE_ALL_MULTICAST;
-		sc->ndis_filter &= ~NDIS_PACKET_TYPE_MULTICAST;
-			goto out;
-	}
-
-	len = len * ETHER_ADDR_LEN;
-	error = ndis_set_info(sc, OID_802_3_MULTICAST_LIST, ctx.mclist, &len);
-	if (error) {
-		device_printf(sc->ndis_dev, "set mclist failed: %d\n", error);
-		sc->ndis_filter |= NDIS_PACKET_TYPE_ALL_MULTICAST;
-		sc->ndis_filter &= ~NDIS_PACKET_TYPE_MULTICAST;
-	}
-
-out:
-	free(ctx.mclist, M_TEMP);
-
-	len = sizeof(sc->ndis_filter);
-	error = ndis_set_info(sc, OID_GEN_CURRENT_PACKET_FILTER,
-	    &sc->ndis_filter, &len);
-	if (error)
-		device_printf(sc->ndis_dev, "set multi failed: %d\n", error);
-}
-
-static int
-ndis_set_offload(sc)
-	struct ndis_softc	*sc;
-{
-	ndis_task_offload	*nto;
-	ndis_task_offload_hdr	*ntoh;
-	ndis_task_tcpip_csum	*nttc;
-	struct ifnet		*ifp;
-	int			len, error;
-
-	if (!NDIS_INITIALIZED(sc))
-		return (EINVAL);
-
-	if (sc->ndis_80211)
-		return (EINVAL);
-	/* See if there's anything to set. */
-
-	ifp = sc->ifp;
-	error = ndis_probe_offload(sc);
-	if (error)
-		return (error);
-		
-	if (sc->ndis_hwassist == 0 && ifp->if_capabilities == 0)
-		return (0);
-
-	len = sizeof(ndis_task_offload_hdr) + sizeof(ndis_task_offload) +
-	    sizeof(ndis_task_tcpip_csum);
-
-	ntoh = malloc(len, M_TEMP, M_NOWAIT|M_ZERO);
-
-	if (ntoh == NULL)
-		return (ENOMEM);
-
-	ntoh->ntoh_vers = NDIS_TASK_OFFLOAD_VERSION;
-	ntoh->ntoh_len = sizeof(ndis_task_offload_hdr);
-	ntoh->ntoh_offset_firsttask = sizeof(ndis_task_offload_hdr);
-	ntoh->ntoh_encapfmt.nef_encaphdrlen = sizeof(struct ether_header);
-	ntoh->ntoh_encapfmt.nef_encap = NDIS_ENCAP_IEEE802_3;
-	ntoh->ntoh_encapfmt.nef_flags = NDIS_ENCAPFLAG_FIXEDHDRLEN;
-
-	nto = (ndis_task_offload *)((char *)ntoh +
-	    ntoh->ntoh_offset_firsttask);
-
-	nto->nto_vers = NDIS_TASK_OFFLOAD_VERSION;
-	nto->nto_len = sizeof(ndis_task_offload);
-	nto->nto_task = NDIS_TASK_TCPIP_CSUM;
-	nto->nto_offset_nexttask = 0;
-	nto->nto_taskbuflen = sizeof(ndis_task_tcpip_csum);
-
-	nttc = (ndis_task_tcpip_csum *)nto->nto_taskbuf;
-
-	if (ifp->if_capenable & IFCAP_TXCSUM)
-		nttc->nttc_v4tx = sc->ndis_v4tx;
-
-	if (ifp->if_capenable & IFCAP_RXCSUM)
-		nttc->nttc_v4rx = sc->ndis_v4rx;
-
-	error = ndis_set_info(sc, OID_TCP_TASK_OFFLOAD, ntoh, &len);
-	free(ntoh, M_TEMP);
-
-	return (error);
-}
-
-static int
-ndis_probe_offload(sc)
-	struct ndis_softc	*sc;
-{
-	ndis_task_offload	*nto;
-	ndis_task_offload_hdr	*ntoh;
-	ndis_task_tcpip_csum	*nttc = NULL;
-	struct ifnet		*ifp;
-	int			len, error, dummy;
-
-	ifp = sc->ifp;
-
-	len = sizeof(dummy);
-	error = ndis_get_info(sc, OID_TCP_TASK_OFFLOAD, &dummy, &len);
-
-	if (error != ENOSPC)
-		return (error);
-
-	ntoh = malloc(len, M_TEMP, M_NOWAIT|M_ZERO);
-
-	if (ntoh == NULL)
-		return (ENOMEM);
-
-	ntoh->ntoh_vers = NDIS_TASK_OFFLOAD_VERSION;
-	ntoh->ntoh_len = sizeof(ndis_task_offload_hdr);
-	ntoh->ntoh_encapfmt.nef_encaphdrlen = sizeof(struct ether_header);
-	ntoh->ntoh_encapfmt.nef_encap = NDIS_ENCAP_IEEE802_3;
-	ntoh->ntoh_encapfmt.nef_flags = NDIS_ENCAPFLAG_FIXEDHDRLEN;
-
-	error = ndis_get_info(sc, OID_TCP_TASK_OFFLOAD, ntoh, &len);
-
-	if (error) {
-		free(ntoh, M_TEMP);
-		return (error);
-	}
-
-	if (ntoh->ntoh_vers != NDIS_TASK_OFFLOAD_VERSION) {
-		free(ntoh, M_TEMP);
-		return (EINVAL);
-	}
-
-	nto = (ndis_task_offload *)((char *)ntoh +
-	    ntoh->ntoh_offset_firsttask);
-
-	while (1) {
-		switch (nto->nto_task) {
-		case NDIS_TASK_TCPIP_CSUM:
-			nttc = (ndis_task_tcpip_csum *)nto->nto_taskbuf;
-			break;
-		/* Don't handle these yet. */
-		case NDIS_TASK_IPSEC:
-		case NDIS_TASK_TCP_LARGESEND:
-		default:
-			break;
-		}
-		if (nto->nto_offset_nexttask == 0)
-			break;
-		nto = (ndis_task_offload *)((char *)nto +
-		    nto->nto_offset_nexttask);
-	}
-
-	if (nttc == NULL) {
-		free(ntoh, M_TEMP);
-		return (ENOENT);
-	}
-
-	sc->ndis_v4tx = nttc->nttc_v4tx;
-	sc->ndis_v4rx = nttc->nttc_v4rx;
-
-	if (nttc->nttc_v4tx & NDIS_TCPSUM_FLAGS_IP_CSUM)
-		sc->ndis_hwassist |= CSUM_IP;
-	if (nttc->nttc_v4tx & NDIS_TCPSUM_FLAGS_TCP_CSUM)
-		sc->ndis_hwassist |= CSUM_TCP;
-	if (nttc->nttc_v4tx & NDIS_TCPSUM_FLAGS_UDP_CSUM)
-		sc->ndis_hwassist |= CSUM_UDP;
-
-	if (sc->ndis_hwassist)
-		ifp->if_capabilities |= IFCAP_TXCSUM;
-
-	if (nttc->nttc_v4rx & NDIS_TCPSUM_FLAGS_IP_CSUM)
-		ifp->if_capabilities |= IFCAP_RXCSUM;
-	if (nttc->nttc_v4rx & NDIS_TCPSUM_FLAGS_TCP_CSUM)
-		ifp->if_capabilities |= IFCAP_RXCSUM;
-	if (nttc->nttc_v4rx & NDIS_TCPSUM_FLAGS_UDP_CSUM)
-		ifp->if_capabilities |= IFCAP_RXCSUM;
-
-	free(ntoh, M_TEMP);
-	return (0);
-}
-
-static int
-ndis_nettype_chan(uint32_t type)
-{
-	switch (type) {
-	case NDIS_80211_NETTYPE_11FH:		return (IEEE80211_CHAN_FHSS);
-	case NDIS_80211_NETTYPE_11DS:		return (IEEE80211_CHAN_B);
-	case NDIS_80211_NETTYPE_11OFDM5:	return (IEEE80211_CHAN_A);
-	case NDIS_80211_NETTYPE_11OFDM24:	return (IEEE80211_CHAN_G);
-	}
-	DPRINTF(("unknown channel nettype %d\n", type));
-	return (IEEE80211_CHAN_B);	/* Default to 11B chan */
-}
-
-static int
-ndis_nettype_mode(uint32_t type)
-{
-	switch (type) {
-	case NDIS_80211_NETTYPE_11FH:		return (IEEE80211_MODE_FH);
-	case NDIS_80211_NETTYPE_11DS:		return (IEEE80211_MODE_11B);
-	case NDIS_80211_NETTYPE_11OFDM5:	return (IEEE80211_MODE_11A);
-	case NDIS_80211_NETTYPE_11OFDM24:	return (IEEE80211_MODE_11G);
-	}
-	DPRINTF(("unknown mode nettype %d\n", type));
-	return (IEEE80211_MODE_AUTO);
-}
-
-/*
- * Attach the interface. Allocate softc structures, do ifmedia
- * setup and ethernet/BPF attach.
- */
-int
-ndis_attach(device_t dev)
-{
-	struct ndis_softc	*sc;
-	driver_object		*pdrv;
-	device_object		*pdo;
-	int			error = 0, len;
-	int			i;
-
-	sc = device_get_softc(dev);
-
-	mtx_init(&sc->ndis_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
-	    MTX_DEF);
-	KeInitializeSpinLock(&sc->ndis_rxlock);
-	KeInitializeSpinLock(&sc->ndisusb_tasklock);
-	KeInitializeSpinLock(&sc->ndisusb_xferdonelock);
-	InitializeListHead(&sc->ndis_shlist);
-	InitializeListHead(&sc->ndisusb_tasklist);
-	InitializeListHead(&sc->ndisusb_xferdonelist);
-	callout_init(&sc->ndis_stat_callout, 1);
-	mbufq_init(&sc->ndis_rxqueue, INT_MAX);	/* XXXGL: sane maximum */
-
-	/* Create sysctl registry nodes */
-	ndis_create_sysctls(sc);
-
-	/* Find the PDO for this device instance. */
-
-	if (sc->ndis_iftype == PCIBus)
-		pdrv = windrv_lookup(0, "PCI Bus");
-	else if (sc->ndis_iftype == PCMCIABus)
-		pdrv = windrv_lookup(0, "PCCARD Bus");
-	else
-		pdrv = windrv_lookup(0, "USB Bus");
-	pdo = windrv_find_pdo(pdrv, dev);
-
-	/*
-	 * Create a new functional device object for this
-	 * device. This is what creates the miniport block
-	 * for this device instance.
-	 */
-
-	if (NdisAddDevice(sc->ndis_dobj, pdo) != STATUS_SUCCESS) {
-		device_printf(dev, "failed to create FDO!\n");
-		error = ENXIO;
-		goto fail;
-	}
-
-	/* Tell the user what version of the API the driver is using. */
-	device_printf(dev, "NDIS API version: %d.%d\n",
-	    sc->ndis_chars->nmc_version_major,
-	    sc->ndis_chars->nmc_version_minor);
-
-	/* Do resource conversion. */
-	if (sc->ndis_iftype == PCMCIABus || sc->ndis_iftype == PCIBus)
-		ndis_convert_res(sc);
-	else
-		sc->ndis_block->nmb_rlist = NULL;
-
-	/* Install our RX and TX interrupt handlers. */
-	sc->ndis_block->nmb_senddone_func = ndis_txeof_wrap;
-	sc->ndis_block->nmb_pktind_func = ndis_rxeof_wrap;
-	sc->ndis_block->nmb_ethrxindicate_func = ndis_rxeof_eth_wrap;
-	sc->ndis_block->nmb_ethrxdone_func = ndis_rxeof_done_wrap;
-	sc->ndis_block->nmb_tdcond_func = ndis_rxeof_xfr_done_wrap;
-
-	/* Override the status handler so we can detect link changes. */
-	sc->ndis_block->nmb_status_func = ndis_linksts_wrap;
-	sc->ndis_block->nmb_statusdone_func = ndis_linksts_done_wrap;
-
-	/* Set up work item handlers. */
-	sc->ndis_tickitem = IoAllocateWorkItem(sc->ndis_block->nmb_deviceobj);
-	sc->ndis_startitem = IoAllocateWorkItem(sc->ndis_block->nmb_deviceobj);
-	sc->ndis_resetitem = IoAllocateWorkItem(sc->ndis_block->nmb_deviceobj);
-	sc->ndis_inputitem = IoAllocateWorkItem(sc->ndis_block->nmb_deviceobj);
-	sc->ndisusb_xferdoneitem =
-	    IoAllocateWorkItem(sc->ndis_block->nmb_deviceobj);
-	sc->ndisusb_taskitem =
-	    IoAllocateWorkItem(sc->ndis_block->nmb_deviceobj);
-	KeInitializeDpc(&sc->ndis_rxdpc, ndis_rxeof_xfr_wrap, sc->ndis_block);
-
-	/* Call driver's init routine. */
-	if (ndis_init_nic(sc)) {
-		device_printf(dev, "init handler failed\n");
-		error = ENXIO;
-		goto fail;
-	}
-
-	/*
-	 * Figure out how big to make the TX buffer pool.
-	 */
-	len = sizeof(sc->ndis_maxpkts);
-	if (ndis_get_info(sc, OID_GEN_MAXIMUM_SEND_PACKETS,
-		    &sc->ndis_maxpkts, &len)) {
-		device_printf(dev, "failed to get max TX packets\n");
-		error = ENXIO;
-		goto fail;
-	}
-
-	/*
-	 * If this is a deserialized miniport, we don't have
-	 * to honor the OID_GEN_MAXIMUM_SEND_PACKETS result.
-	 */
-	if (!NDIS_SERIALIZED(sc->ndis_block))
-		sc->ndis_maxpkts = NDIS_TXPKTS;
-
-	/* Enforce some sanity, just in case. */
-
-	if (sc->ndis_maxpkts == 0)
-		sc->ndis_maxpkts = 10;
-
-	sc->ndis_txarray = malloc(sizeof(ndis_packet *) *
-	    sc->ndis_maxpkts, M_DEVBUF, M_NOWAIT|M_ZERO);
-
-	/* Allocate a pool of ndis_packets for TX encapsulation. */
-
-	NdisAllocatePacketPool(&i, &sc->ndis_txpool,
-	    sc->ndis_maxpkts, PROTOCOL_RESERVED_SIZE_IN_PACKET);
-
-	if (i != NDIS_STATUS_SUCCESS) {
-		sc->ndis_txpool = NULL;
-		device_printf(dev, "failed to allocate TX packet pool");
-		error = ENOMEM;
-		goto fail;
-	}
-
-	sc->ndis_txpending = sc->ndis_maxpkts;
-
-	sc->ndis_oidcnt = 0;
-	/* Get supported oid list. */
-	ndis_get_supported_oids(sc, &sc->ndis_oids, &sc->ndis_oidcnt);
-
-	/* If the NDIS module requested scatter/gather, init maps. */
-	if (sc->ndis_sc)
-		ndis_init_dma(sc);
-
-	/*
-	 * See if the OID_802_11_CONFIGURATION OID is
-	 * supported by this driver. If it is, then this an 802.11
-	 * wireless driver, and we should set up media for wireless.
-	 */
-	for (i = 0; i < sc->ndis_oidcnt; i++)
-		if (sc->ndis_oids[i] == OID_802_11_CONFIGURATION) {
-			sc->ndis_80211 = 1;
-			break;
-		}
-
-	if (sc->ndis_80211)
-		error = ndis_80211attach(sc);
-	else
-		error = ndis_ifattach(sc);
-
-fail:
-	if (error) {
-		ndis_detach(dev);
-		return (error);
-	}
-
-	if (sc->ndis_iftype == PNPBus && ndisusb_halt == 0)
-		return (error);
-
-	DPRINTF(("attach done.\n"));
-	/* We're done talking to the NIC for now; halt it. */
-	ndis_halt_nic(sc);
-	DPRINTF(("halting done.\n"));
-
-	return (error);
-}
-
-static int
-ndis_80211attach(struct ndis_softc *sc)
-{
-	struct ieee80211com	*ic = &sc->ndis_ic;
-	ndis_80211_rates_ex	rates;
-	struct ndis_80211_nettype_list *ntl;
-	uint32_t		arg;
-	int			mode, i, r, len, nonettypes = 1;
-	uint8_t			bands[IEEE80211_MODE_BYTES] = { 0 };
-
-	callout_init(&sc->ndis_scan_callout, 1);
-
-	ic->ic_softc = sc;
-	ic->ic_ioctl = ndis_80211ioctl;
-	ic->ic_name = device_get_nameunit(sc->ndis_dev);
-	ic->ic_opmode = IEEE80211_M_STA;
-        ic->ic_phytype = IEEE80211_T_DS;
-	ic->ic_caps = IEEE80211_C_8023ENCAP |
-		IEEE80211_C_STA | IEEE80211_C_IBSS;
-	setbit(ic->ic_modecaps, IEEE80211_MODE_AUTO);
-	len = 0;
-	r = ndis_get_info(sc, OID_802_11_NETWORK_TYPES_SUPPORTED, NULL, &len);
-	if (r != ENOSPC)
-		goto nonettypes;
-	ntl = malloc(len, M_DEVBUF, M_WAITOK | M_ZERO);
-	r = ndis_get_info(sc, OID_802_11_NETWORK_TYPES_SUPPORTED, ntl, &len);
-	if (r != 0) {
-		free(ntl, M_DEVBUF);
-		goto nonettypes;
-	}
-
-	for (i = 0; i < ntl->ntl_items; i++) {
-		mode = ndis_nettype_mode(ntl->ntl_type[i]);
-		if (mode) {
-			nonettypes = 0;
-			setbit(ic->ic_modecaps, mode);
-			setbit(bands, mode);
-		} else
-			device_printf(sc->ndis_dev, "Unknown nettype %d\n",
-			    ntl->ntl_type[i]);
-	}
-	free(ntl, M_DEVBUF);
-nonettypes:
-	/* Default to 11b channels if the card did not supply any */
-	if (nonettypes) {
-		setbit(ic->ic_modecaps, IEEE80211_MODE_11B);
-		setbit(bands, IEEE80211_MODE_11B);
-	}
-	len = sizeof(rates);
-	bzero((char *)&rates, len);
-	r = ndis_get_info(sc, OID_802_11_SUPPORTED_RATES, (void *)rates, &len);
-	if (r != 0)
-		device_printf(sc->ndis_dev, "get rates failed: 0x%x\n", r);
-	/*
-	 * Since the supported rates only up to 8 can be supported,
-	 * if this is not 802.11b we're just going to be faking it
-	 * all up to heck.
-	 */
-
-#define TESTSETRATE(x, y)						\
-	do {								\
-		int			i;				\
-		for (i = 0; i < ic->ic_sup_rates[x].rs_nrates; i++) {	\
-			if (ic->ic_sup_rates[x].rs_rates[i] == (y))	\
-				break;					\
-		}							\
-		if (i == ic->ic_sup_rates[x].rs_nrates) {		\
-			ic->ic_sup_rates[x].rs_rates[i] = (y);		\
-			ic->ic_sup_rates[x].rs_nrates++;		\
-		}							\
-	} while (0)
-
-#define SETRATE(x, y)	\
-	ic->ic_sup_rates[x].rs_rates[ic->ic_sup_rates[x].rs_nrates] = (y)
-#define INCRATE(x)	\
-	ic->ic_sup_rates[x].rs_nrates++
-
-	ic->ic_curmode = IEEE80211_MODE_AUTO;
-	if (isset(ic->ic_modecaps, IEEE80211_MODE_11A))
-		ic->ic_sup_rates[IEEE80211_MODE_11A].rs_nrates = 0;
-	if (isset(ic->ic_modecaps, IEEE80211_MODE_11B))
-		ic->ic_sup_rates[IEEE80211_MODE_11B].rs_nrates = 0;
-	if (isset(ic->ic_modecaps, IEEE80211_MODE_11G))
-		ic->ic_sup_rates[IEEE80211_MODE_11G].rs_nrates = 0;
-	for (i = 0; i < len; i++) {
-		switch (rates[i] & IEEE80211_RATE_VAL) {
-		case 2:
-		case 4:
-		case 11:
-		case 10:
-		case 22:
-			if (isclr(ic->ic_modecaps, IEEE80211_MODE_11B)) {
-				/* Lazy-init 802.11b. */
-				setbit(ic->ic_modecaps, IEEE80211_MODE_11B);
-				ic->ic_sup_rates[IEEE80211_MODE_11B].
-				    rs_nrates = 0;
-			}
-			SETRATE(IEEE80211_MODE_11B, rates[i]);
-			INCRATE(IEEE80211_MODE_11B);
-			break;
-		default:
-			if (isset(ic->ic_modecaps, IEEE80211_MODE_11A)) {
-				SETRATE(IEEE80211_MODE_11A, rates[i]);
-				INCRATE(IEEE80211_MODE_11A);
-			}
-			if (isset(ic->ic_modecaps, IEEE80211_MODE_11G)) {
-				SETRATE(IEEE80211_MODE_11G, rates[i]);
-				INCRATE(IEEE80211_MODE_11G);
-			}
-			break;
-		}
-	}
-
-	/*
-	 * If the hardware supports 802.11g, it most
-	 * likely supports 802.11b and all of the
-	 * 802.11b and 802.11g speeds, so maybe we can
-	 * just cheat here.  Just how in the heck do
-	 * we detect turbo modes, though?
-	 */
-	if (isset(ic->ic_modecaps, IEEE80211_MODE_11B)) {
-		TESTSETRATE(IEEE80211_MODE_11B, IEEE80211_RATE_BASIC|2);
-		TESTSETRATE(IEEE80211_MODE_11B, IEEE80211_RATE_BASIC|4);
-		TESTSETRATE(IEEE80211_MODE_11B, IEEE80211_RATE_BASIC|11);
-		TESTSETRATE(IEEE80211_MODE_11B, IEEE80211_RATE_BASIC|22);
-	}
-	if (isset(ic->ic_modecaps, IEEE80211_MODE_11G)) {
-		TESTSETRATE(IEEE80211_MODE_11G, 48);
-		TESTSETRATE(IEEE80211_MODE_11G, 72);
-		TESTSETRATE(IEEE80211_MODE_11G, 96);
-		TESTSETRATE(IEEE80211_MODE_11G, 108);
-	}
-	if (isset(ic->ic_modecaps, IEEE80211_MODE_11A)) {
-		TESTSETRATE(IEEE80211_MODE_11A, 48);
-		TESTSETRATE(IEEE80211_MODE_11A, 72);
-		TESTSETRATE(IEEE80211_MODE_11A, 96);
-		TESTSETRATE(IEEE80211_MODE_11A, 108);
-	}
-
-#undef SETRATE
-#undef INCRATE
-#undef TESTSETRATE
-
-	ieee80211_init_channels(ic, NULL, bands);
-
-	/*
-	 * To test for WPA support, we need to see if we can
-	 * set AUTHENTICATION_MODE to WPA and read it back
-	 * successfully.
-	 */
-	i = sizeof(arg);
-	arg = NDIS_80211_AUTHMODE_WPA;
-	r = ndis_set_info(sc, OID_802_11_AUTHENTICATION_MODE, &arg, &i);
-	if (r == 0) {
-		r = ndis_get_info(sc, OID_802_11_AUTHENTICATION_MODE, &arg, &i);
-		if (r == 0 && arg == NDIS_80211_AUTHMODE_WPA)
-			ic->ic_caps |= IEEE80211_C_WPA;
-	}
-
-	/*
-	 * To test for supported ciphers, we set each
-	 * available encryption type in descending order.
-	 * If ENC3 works, then we have WEP, TKIP and AES.
-	 * If only ENC2 works, then we have WEP and TKIP.
-	 * If only ENC1 works, then we have just WEP.
-	 */
-	i = sizeof(arg);
-	arg = NDIS_80211_WEPSTAT_ENC3ENABLED;
-	r = ndis_set_info(sc, OID_802_11_ENCRYPTION_STATUS, &arg, &i);
-	if (r == 0) {
-		ic->ic_cryptocaps |= IEEE80211_CRYPTO_WEP
-				  |  IEEE80211_CRYPTO_TKIP
-				  |  IEEE80211_CRYPTO_AES_CCM;
-		goto got_crypto;
-	}
-	arg = NDIS_80211_WEPSTAT_ENC2ENABLED;
-	r = ndis_set_info(sc, OID_802_11_ENCRYPTION_STATUS, &arg, &i);
-	if (r == 0) {
-		ic->ic_cryptocaps |= IEEE80211_CRYPTO_WEP
-				  |  IEEE80211_CRYPTO_TKIP;
-		goto got_crypto;
-	}
-	arg = NDIS_80211_WEPSTAT_ENC1ENABLED;
-	r = ndis_set_info(sc, OID_802_11_ENCRYPTION_STATUS, &arg, &i);
-	if (r == 0)
-		ic->ic_cryptocaps |= IEEE80211_CRYPTO_WEP;
-got_crypto:
-	i = sizeof(arg);
-	r = ndis_get_info(sc, OID_802_11_POWER_MODE, &arg, &i);
-	if (r == 0)
-		ic->ic_caps |= IEEE80211_C_PMGT;
-
-	r = ndis_get_info(sc, OID_802_11_TX_POWER_LEVEL, &arg, &i);
-	if (r == 0)
-		ic->ic_caps |= IEEE80211_C_TXPMGT;
-
-	/*
-	 * Get station address from the driver.
-	 */
-	len = sizeof(ic->ic_macaddr);
-	ndis_get_info(sc, OID_802_3_CURRENT_ADDRESS, &ic->ic_macaddr, &len);
-
-	ieee80211_ifattach(ic);
-	ic->ic_raw_xmit = ndis_raw_xmit;
-	ic->ic_scan_start = ndis_scan_start;
-	ic->ic_scan_end = ndis_scan_end;
-	ic->ic_set_channel = ndis_set_channel;
-	ic->ic_scan_curchan = ndis_scan_curchan;
-	ic->ic_scan_mindwell = ndis_scan_mindwell;
-	ic->ic_bsschan = IEEE80211_CHAN_ANYC;
-	ic->ic_vap_create = ndis_vap_create;
-	ic->ic_vap_delete = ndis_vap_delete;
-	ic->ic_update_mcast = ndis_update_mcast;
-	ic->ic_update_promisc = ndis_update_promisc;
-	ic->ic_transmit = ndis_80211transmit;
-	ic->ic_parent = ndis_80211parent;
-
-	if (bootverbose)
-		ieee80211_announce(ic);
-
-	return (0);
-}
-
-static int
-ndis_ifattach(struct ndis_softc *sc)
-{
-	struct ifnet *ifp;
-	u_char eaddr[ETHER_ADDR_LEN];
-	int len;
-
-	ifp = if_alloc(IFT_ETHER);
-	if (ifp == NULL)
-		return (ENOSPC);
-	sc->ifp = ifp;
-	ifp->if_softc = sc;
-
-	/* Check for task offload support. */
-	ndis_probe_offload(sc);
-
-	/*
-	 * Get station address from the driver.
-	 */
-	len = sizeof(eaddr);
-	ndis_get_info(sc, OID_802_3_CURRENT_ADDRESS, eaddr, &len);
-
-	if_initname(ifp, device_get_name(sc->ndis_dev),
-	    device_get_unit(sc->ndis_dev));
-	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
-	ifp->if_ioctl = ndis_ifioctl;
-	ifp->if_start = ndis_ifstart;
-	ifp->if_init = ndis_init;
-	ifp->if_baudrate = 10000000;
-	IFQ_SET_MAXLEN(&ifp->if_snd, 50);
-	ifp->if_snd.ifq_drv_maxlen = 25;
-	IFQ_SET_READY(&ifp->if_snd);
-	ifp->if_capenable = ifp->if_capabilities;
-	ifp->if_hwassist = sc->ndis_hwassist;
-
-	ifmedia_init(&sc->ifmedia, IFM_IMASK, ndis_ifmedia_upd,
-	    ndis_ifmedia_sts);
-	ifmedia_add(&sc->ifmedia, IFM_ETHER|IFM_10_T, 0, NULL);
-	ifmedia_add(&sc->ifmedia, IFM_ETHER|IFM_10_T|IFM_FDX, 0, NULL);
-	ifmedia_add(&sc->ifmedia, IFM_ETHER|IFM_100_TX, 0, NULL);
-	ifmedia_add(&sc->ifmedia, IFM_ETHER|IFM_100_TX|IFM_FDX, 0, NULL);
-	ifmedia_add(&sc->ifmedia, IFM_ETHER|IFM_AUTO, 0, NULL);
-	ifmedia_set(&sc->ifmedia, IFM_ETHER|IFM_AUTO);
-	ether_ifattach(ifp, eaddr);
-
-	return (0);
-}
-
-static struct ieee80211vap *
-ndis_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit,
-    enum ieee80211_opmode opmode, int flags,
-    const uint8_t bssid[IEEE80211_ADDR_LEN],
-    const uint8_t mac[IEEE80211_ADDR_LEN])
-{
-	struct ndis_vap *nvp;
-	struct ieee80211vap *vap;
-
-	if (!TAILQ_EMPTY(&ic->ic_vaps))		/* only one at a time */
-		return NULL;
-	nvp = malloc(sizeof(struct ndis_vap), M_80211_VAP, M_WAITOK | M_ZERO);
-	vap = &nvp->vap;
-	ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid);
-	/* override with driver methods */
-	nvp->newstate = vap->iv_newstate;
-	vap->iv_newstate = ndis_newstate;
-
-	/* complete setup */
-	ieee80211_vap_attach(vap, ieee80211_media_change, ndis_media_status,
-	    mac);
-	ic->ic_opmode = opmode;
-	/* install key handing routines */
-	vap->iv_key_set = ndis_add_key;
-	vap->iv_key_delete = ndis_del_key;
-	return vap;
-}
-
-static void
-ndis_vap_delete(struct ieee80211vap *vap)
-{
-	struct ndis_vap *nvp = NDIS_VAP(vap);
-	struct ieee80211com *ic = vap->iv_ic;
-	struct ndis_softc *sc = ic->ic_softc;
-
-	ndis_stop(sc);
-	callout_drain(&sc->ndis_scan_callout);
-	ieee80211_vap_detach(vap);
-	free(nvp, M_80211_VAP);
-}
-
-/*
- * Shutdown hardware and free up resources. This can be called any
- * time after the mutex has been initialized. It is called in both
- * the error case in attach and the normal detach case so it needs
- * to be careful about only freeing resources that have actually been
- * allocated.
- */
-int
-ndis_detach(device_t dev)
-{
-	struct ifnet		*ifp;
-	struct ndis_softc	*sc;
-	driver_object		*drv;
-
-	sc = device_get_softc(dev);
-	NDIS_LOCK(sc);
-	if (!sc->ndis_80211)
-		ifp = sc->ifp;
-	else
-		ifp = NULL;
-	if (ifp != NULL)
-		ifp->if_flags &= ~IFF_UP;
-	if (device_is_attached(dev)) {
-		NDIS_UNLOCK(sc);
-		ndis_stop(sc);
-		if (sc->ndis_80211)
-			ieee80211_ifdetach(&sc->ndis_ic);
-		else if (ifp != NULL)
-			ether_ifdetach(ifp);
-	} else
-		NDIS_UNLOCK(sc);
-
-	if (sc->ndis_tickitem != NULL)
-		IoFreeWorkItem(sc->ndis_tickitem);
-	if (sc->ndis_startitem != NULL)
-		IoFreeWorkItem(sc->ndis_startitem);
-	if (sc->ndis_resetitem != NULL)
-		IoFreeWorkItem(sc->ndis_resetitem);
-	if (sc->ndis_inputitem != NULL)
-		IoFreeWorkItem(sc->ndis_inputitem);
-	if (sc->ndisusb_xferdoneitem != NULL)
-		IoFreeWorkItem(sc->ndisusb_xferdoneitem);
-	if (sc->ndisusb_taskitem != NULL)
-		IoFreeWorkItem(sc->ndisusb_taskitem);
-
-	bus_generic_detach(dev);
-	ndis_unload_driver(sc);
-
-	if (sc->ndis_irq)
-		bus_release_resource(dev, SYS_RES_IRQ, 0, sc->ndis_irq);
-	if (sc->ndis_res_io)
-		bus_release_resource(dev, SYS_RES_IOPORT,
-		    sc->ndis_io_rid, sc->ndis_res_io);
-	if (sc->ndis_res_mem)
-		bus_release_resource(dev, SYS_RES_MEMORY,
-		    sc->ndis_mem_rid, sc->ndis_res_mem);
-	if (sc->ndis_res_altmem)
-		bus_release_resource(dev, SYS_RES_MEMORY,
-		    sc->ndis_altmem_rid, sc->ndis_res_altmem);
-
-	if (ifp != NULL)
-		if_free(ifp);
-
-	if (sc->ndis_sc)
-		ndis_destroy_dma(sc);
-
-	if (sc->ndis_txarray)
-		free(sc->ndis_txarray, M_DEVBUF);
-
-	if (!sc->ndis_80211)
-		ifmedia_removeall(&sc->ifmedia);
-
-	if (sc->ndis_txpool != NULL)
-		NdisFreePacketPool(sc->ndis_txpool);
-
-	/* Destroy the PDO for this device. */
-	
-	if (sc->ndis_iftype == PCIBus)
-		drv = windrv_lookup(0, "PCI Bus");
-	else if (sc->ndis_iftype == PCMCIABus)
-		drv = windrv_lookup(0, "PCCARD Bus");
-	else
-		drv = windrv_lookup(0, "USB Bus");
-	if (drv == NULL)
-		panic("couldn't find driver object");
-	windrv_destroy_pdo(drv, dev);
-
-	if (sc->ndis_iftype == PCIBus)
-		bus_dma_tag_destroy(sc->ndis_parent_tag);
-
-	return (0);
-}
-
-int
-ndis_suspend(dev)
-	device_t		dev;
-{
-	struct ndis_softc	*sc;
-	struct ifnet		*ifp;
-
-	sc = device_get_softc(dev);
-	ifp = sc->ifp;
-
-#ifdef notdef
-	if (NDIS_INITIALIZED(sc))
-        	ndis_stop(sc);
-#endif
-
-	return (0);
-}
-
-int
-ndis_resume(dev)
-	device_t		dev;
-{
-	struct ndis_softc	*sc;
-	struct ifnet		*ifp;
-
-	sc = device_get_softc(dev);
-	ifp = sc->ifp;
-
-	if (NDIS_INITIALIZED(sc))
-        	ndis_init(sc);
-
-	return (0);
-}
-
-/*
- * The following bunch of routines are here to support drivers that
- * use the NdisMEthIndicateReceive()/MiniportTransferData() mechanism.
- * The NdisMEthIndicateReceive() handler runs at DISPATCH_LEVEL for
- * serialized miniports, or IRQL <= DISPATCH_LEVEL for deserialized
- * miniports.
- */
-static void
-ndis_rxeof_eth(adapter, ctx, addr, hdr, hdrlen, lookahead, lookaheadlen, pktlen)
-	ndis_handle		adapter;
-	ndis_handle		ctx;
-	char			*addr;
-	void			*hdr;
-	uint32_t		hdrlen;
-	void			*lookahead;
-	uint32_t		lookaheadlen;
-	uint32_t		pktlen;
-{
-	ndis_miniport_block	*block;
-	uint8_t			irql = 0;
-	uint32_t		status;
-	ndis_buffer		*b;
-	ndis_packet		*p;
-	struct mbuf		*m;
-	ndis_ethpriv		*priv;
-
-	block = adapter;
-
-	m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
-	if (m == NULL)
-		return;
-
-	/* Save the data provided to us so far. */
-
-	m->m_len = lookaheadlen + hdrlen;
-	m->m_pkthdr.len = pktlen + hdrlen;
-	m->m_next = NULL;
-	m_copyback(m, 0, hdrlen, hdr);
-	m_copyback(m, hdrlen, lookaheadlen, lookahead);
-
-	/* Now create a fake NDIS_PACKET to hold the data */
-
-	NdisAllocatePacket(&status, &p, block->nmb_rxpool);
-
-	if (status != NDIS_STATUS_SUCCESS) {
-		m_freem(m);
-		return;
-	}
-
-	p->np_m0 = m;
-
-	b = IoAllocateMdl(m->m_data, m->m_pkthdr.len, FALSE, FALSE, NULL);
-
-	if (b == NULL) {
-		NdisFreePacket(p);
-		m_freem(m);
-		return;
-	}
-
-	p->np_private.npp_head = p->np_private.npp_tail = b;
-	p->np_private.npp_totlen = m->m_pkthdr.len;
-
-	/* Save the packet RX context somewhere. */
-	priv = (ndis_ethpriv *)&p->np_protocolreserved;
-	priv->nep_ctx = ctx;
-
-	if (!NDIS_SERIALIZED(block))
-		KeAcquireSpinLock(&block->nmb_lock, &irql);
-
-	InsertTailList((&block->nmb_packetlist), (&p->np_list));
-
-	if (!NDIS_SERIALIZED(block))
-		KeReleaseSpinLock(&block->nmb_lock, irql);
-}
-
-/*
- * NdisMEthIndicateReceiveComplete() handler, runs at DISPATCH_LEVEL
- * for serialized miniports, or IRQL <= DISPATCH_LEVEL for deserialized
- * miniports.
- */
-static void
-ndis_rxeof_done(adapter)
-	ndis_handle		adapter;
-{
-	struct ndis_softc	*sc;
-	ndis_miniport_block	*block;
-
-	block = adapter;
-
-	/* Schedule transfer/RX of queued packets. */
-
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-
-	KeInsertQueueDpc(&sc->ndis_rxdpc, NULL, NULL);
-}
-
-/*
- * MiniportTransferData() handler, runs at DISPATCH_LEVEL.
- */
-static void
-ndis_rxeof_xfr(dpc, adapter, sysarg1, sysarg2)
-	kdpc			*dpc;
-	ndis_handle		adapter;
-	void			*sysarg1;
-	void			*sysarg2;
-{
-	ndis_miniport_block	*block;
-	struct ndis_softc	*sc;
-	ndis_packet		*p;
-	list_entry		*l;
-	uint32_t		status;
-	ndis_ethpriv		*priv;
-	struct ifnet		*ifp;
-	struct mbuf		*m;
-
-	block = adapter;
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-	ifp = sc->ifp;
-
-	KeAcquireSpinLockAtDpcLevel(&block->nmb_lock);
-
-	l = block->nmb_packetlist.nle_flink;
-	while(!IsListEmpty(&block->nmb_packetlist)) {
-		l = RemoveHeadList((&block->nmb_packetlist));
-		p = CONTAINING_RECORD(l, ndis_packet, np_list);
-		InitializeListHead((&p->np_list));
-
-		priv = (ndis_ethpriv *)&p->np_protocolreserved;
-		m = p->np_m0;
-		p->np_softc = sc;
-		p->np_m0 = NULL;
-
-		KeReleaseSpinLockFromDpcLevel(&block->nmb_lock);
-
-		status = MSCALL6(sc->ndis_chars->nmc_transferdata_func,
-		    p, &p->np_private.npp_totlen, block, priv->nep_ctx,
-		    m->m_len, m->m_pkthdr.len - m->m_len);
-
-		KeAcquireSpinLockAtDpcLevel(&block->nmb_lock);
-
-		/*
-		 * If status is NDIS_STATUS_PENDING, do nothing and
-		 * wait for a callback to the ndis_rxeof_xfr_done()
-		 * handler.
-	 	 */
-
-		m->m_len = m->m_pkthdr.len;
-		m->m_pkthdr.rcvif = ifp;
-
-		if (status == NDIS_STATUS_SUCCESS) {
-			IoFreeMdl(p->np_private.npp_head);
-			NdisFreePacket(p);
-			KeAcquireSpinLockAtDpcLevel(&sc->ndis_rxlock);
-			mbufq_enqueue(&sc->ndis_rxqueue, m);
-			KeReleaseSpinLockFromDpcLevel(&sc->ndis_rxlock);
-			IoQueueWorkItem(sc->ndis_inputitem,
-			    (io_workitem_func)ndis_inputtask_wrap,
-			    WORKQUEUE_CRITICAL, sc);
-		}
-
-		if (status == NDIS_STATUS_FAILURE)
-			m_freem(m);
-
-		/* Advance to next packet */
-		l = block->nmb_packetlist.nle_flink;
-	}
-
-	KeReleaseSpinLockFromDpcLevel(&block->nmb_lock);
-}
-
-/*
- * NdisMTransferDataComplete() handler, runs at DISPATCH_LEVEL.
- */
-static void
-ndis_rxeof_xfr_done(adapter, packet, status, len)
-	ndis_handle		adapter;
-	ndis_packet		*packet;
-	uint32_t		status;
-	uint32_t		len;
-{
-	ndis_miniport_block	*block;
-	struct ndis_softc	*sc;
-	struct ifnet		*ifp;
-	struct mbuf		*m;
-
-	block = adapter;
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-	ifp = sc->ifp;
-
-	m = packet->np_m0;
-	IoFreeMdl(packet->np_private.npp_head);
-	NdisFreePacket(packet);
-
-	if (status != NDIS_STATUS_SUCCESS) {
-		m_freem(m);
-		return;
-	}
-
-	m->m_len = m->m_pkthdr.len;
-	m->m_pkthdr.rcvif = ifp;
-	KeAcquireSpinLockAtDpcLevel(&sc->ndis_rxlock);
-	mbufq_enqueue(&sc->ndis_rxqueue, m);
-	KeReleaseSpinLockFromDpcLevel(&sc->ndis_rxlock);
-	IoQueueWorkItem(sc->ndis_inputitem,
-	    (io_workitem_func)ndis_inputtask_wrap,
-	    WORKQUEUE_CRITICAL, sc);
-}
-/*
- * A frame has been uploaded: pass the resulting mbuf chain up to
- * the higher level protocols.
- *
- * When handling received NDIS packets, the 'status' field in the
- * out-of-band portion of the ndis_packet has special meaning. In the
- * most common case, the underlying NDIS driver will set this field
- * to NDIS_STATUS_SUCCESS, which indicates that it's ok for us to
- * take possession of it. We then change the status field to
- * NDIS_STATUS_PENDING to tell the driver that we now own the packet,
- * and that we will return it at some point in the future via the
- * return packet handler.
- *
- * If the driver hands us a packet with a status of NDIS_STATUS_RESOURCES,
- * this means the driver is running out of packet/buffer resources and
- * wants to maintain ownership of the packet. In this case, we have to
- * copy the packet data into local storage and let the driver keep the
- * packet.
- */
-static void
-ndis_rxeof(adapter, packets, pktcnt)
-	ndis_handle		adapter;
-	ndis_packet		**packets;
-	uint32_t		pktcnt;
-{
-	struct ndis_softc	*sc;
-	ndis_miniport_block	*block;
-	ndis_packet		*p;
-	uint32_t		s;
-	ndis_tcpip_csum		*csum;
-	struct ifnet		*ifp;
-	struct mbuf		*m0, *m;
-	int			i;
-
-	block = (ndis_miniport_block *)adapter;
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-	ifp = sc->ifp;
-
-	/*
-	 * There's a slim chance the driver may indicate some packets
-	 * before we're completely ready to handle them. If we detect this,
-	 * we need to return them to the miniport and ignore them.
-	 */
-        if (!sc->ndis_running) {
-		for (i = 0; i < pktcnt; i++) {
-			p = packets[i];
-			if (p->np_oob.npo_status == NDIS_STATUS_SUCCESS) {
-				p->np_refcnt++;
-				ndis_return_packet(p);
-			}
-		}
-		return;
-        }
-
-	for (i = 0; i < pktcnt; i++) {
-		p = packets[i];
-		/* Stash the softc here so ptom can use it. */
-		p->np_softc = sc;
-		if (ndis_ptom(&m0, p)) {
-			device_printf(sc->ndis_dev, "ptom failed\n");
-			if (p->np_oob.npo_status == NDIS_STATUS_SUCCESS)
-				ndis_return_packet(p);
-		} else {
-#ifdef notdef
-			if (p->np_oob.npo_status == NDIS_STATUS_RESOURCES) {
-				m = m_dup(m0, M_NOWAIT);
-				/*
-				 * NOTE: we want to destroy the mbuf here, but
-				 * we don't actually want to return it to the
-				 * driver via the return packet handler. By
-				 * bumping np_refcnt, we can prevent the
-				 * ndis_return_packet() routine from actually
-				 * doing anything.
-				 */
-				p->np_refcnt++;
-				m_freem(m0);
-				if (m == NULL)
-					if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
-				else
-					m0 = m;
-			} else
-				p->np_oob.npo_status = NDIS_STATUS_PENDING;
-#endif
-			m = m_dup(m0, M_NOWAIT);
-			if (p->np_oob.npo_status == NDIS_STATUS_RESOURCES)
-				p->np_refcnt++;
-			else
-				p->np_oob.npo_status = NDIS_STATUS_PENDING;
-			m_freem(m0);
-			if (m == NULL) {
-				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
-				continue;
-			}
-			m0 = m;
-			m0->m_pkthdr.rcvif = ifp;
-
-			/* Deal with checksum offload. */
-
-			if (ifp->if_capenable & IFCAP_RXCSUM &&
-			    p->np_ext.npe_info[ndis_tcpipcsum_info] != NULL) {
-				s = (uintptr_t)
-			 	    p->np_ext.npe_info[ndis_tcpipcsum_info];
-				csum = (ndis_tcpip_csum *)&s;
-				if (csum->u.ntc_rxflags &
-				    NDIS_RXCSUM_IP_PASSED)
-					m0->m_pkthdr.csum_flags |=
-					    CSUM_IP_CHECKED|CSUM_IP_VALID;
-				if (csum->u.ntc_rxflags &
-				    (NDIS_RXCSUM_TCP_PASSED |
-				    NDIS_RXCSUM_UDP_PASSED)) {
-					m0->m_pkthdr.csum_flags |=
-					    CSUM_DATA_VALID|CSUM_PSEUDO_HDR;
-					m0->m_pkthdr.csum_data = 0xFFFF;
-				}
-			}
-
-			KeAcquireSpinLockAtDpcLevel(&sc->ndis_rxlock);
-			mbufq_enqueue(&sc->ndis_rxqueue, m0);
-			KeReleaseSpinLockFromDpcLevel(&sc->ndis_rxlock);
-			IoQueueWorkItem(sc->ndis_inputitem,
-			    (io_workitem_func)ndis_inputtask_wrap,
-			    WORKQUEUE_CRITICAL, sc);
-		}
-	}
-}
-
-/*
- * This routine is run at PASSIVE_LEVEL. We use this routine to pass
- * packets into the stack in order to avoid calling (*ifp->if_input)()
- * with any locks held (at DISPATCH_LEVEL, we'll be holding the
- * 'dispatch level' per-cpu sleep lock).
- */
-static void
-ndis_inputtask(device_object *dobj, void *arg)
-{
-	ndis_miniport_block	*block;
-	struct ndis_softc	*sc = arg;
-	struct mbuf		*m;
-	uint8_t			irql;
-
-	block = dobj->do_devext;
-
-	KeAcquireSpinLock(&sc->ndis_rxlock, &irql);
-	while ((m = mbufq_dequeue(&sc->ndis_rxqueue)) != NULL) {
-		KeReleaseSpinLock(&sc->ndis_rxlock, irql);
-		if ((sc->ndis_80211 != 0)) {
-			struct ieee80211com *ic = &sc->ndis_ic;
-			struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
-
-			if (vap != NULL)
-				vap->iv_deliver_data(vap, vap->iv_bss, m);
-		} else {
-			struct ifnet *ifp = sc->ifp;
-
-			(*ifp->if_input)(ifp, m);
-		}
-		KeAcquireSpinLock(&sc->ndis_rxlock, &irql);
-	}
-	KeReleaseSpinLock(&sc->ndis_rxlock, irql);
-}
-
-/*
- * A frame was downloaded to the chip. It's safe for us to clean up
- * the list buffers.
- */
-static void
-ndis_txeof(adapter, packet, status)
-	ndis_handle		adapter;
-	ndis_packet		*packet;
-	ndis_status		status;
-
-{
-	struct ndis_softc	*sc;
-	ndis_miniport_block	*block;
-	struct ifnet		*ifp;
-	int			idx;
-	struct mbuf		*m;
-
-	block = (ndis_miniport_block *)adapter;
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-	ifp = sc->ifp;
-
-	m = packet->np_m0;
-	idx = packet->np_txidx;
-	if (sc->ndis_sc)
-		bus_dmamap_unload(sc->ndis_ttag, sc->ndis_tmaps[idx]);
-
-	ndis_free_packet(packet);
-	m_freem(m);
-
-	NDIS_LOCK(sc);
-	sc->ndis_txarray[idx] = NULL;
-	sc->ndis_txpending++;
-
-	if (!sc->ndis_80211) {
-		struct ifnet		*ifp = sc->ifp;
-		if (status == NDIS_STATUS_SUCCESS)
-			if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
-		else
-			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
-		ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
-	}
-	sc->ndis_tx_timer = 0;
-
-	NDIS_UNLOCK(sc);
-
-	if (!sc->ndis_80211)
-		IoQueueWorkItem(sc->ndis_startitem,
-		    (io_workitem_func)ndis_ifstarttask_wrap,
-		    WORKQUEUE_CRITICAL, sc);
-	DPRINTF(("%s: ndis_ifstarttask_wrap sc=%p\n", __func__, sc));
-}
-
-static void
-ndis_linksts(adapter, status, sbuf, slen)
-	ndis_handle		adapter;
-	ndis_status		status;
-	void			*sbuf;
-	uint32_t		slen;
-{
-	ndis_miniport_block	*block;
-	struct ndis_softc	*sc;
-
-	block = adapter;
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-	sc->ndis_sts = status;
-
-	/* Event list is all full up, drop this one. */
-
-	NDIS_LOCK(sc);
-	if (sc->ndis_evt[sc->ndis_evtpidx].ne_sts) {
-		NDIS_UNLOCK(sc);
-		return;
-	}
-
-	/* Cache the event. */
-
-	if (slen) {
-		sc->ndis_evt[sc->ndis_evtpidx].ne_buf = malloc(slen,
-		    M_TEMP, M_NOWAIT);
-		if (sc->ndis_evt[sc->ndis_evtpidx].ne_buf == NULL) {
-			NDIS_UNLOCK(sc);
-			return;
-		}
-		bcopy((char *)sbuf,
-		    sc->ndis_evt[sc->ndis_evtpidx].ne_buf, slen);
-	}
-	sc->ndis_evt[sc->ndis_evtpidx].ne_sts = status;
-	sc->ndis_evt[sc->ndis_evtpidx].ne_len = slen;
-	NDIS_EVTINC(sc->ndis_evtpidx);
-	NDIS_UNLOCK(sc);
-}
-
-static void
-ndis_linksts_done(adapter)
-	ndis_handle		adapter;
-{
-	ndis_miniport_block	*block;
-	struct ndis_softc	*sc;
-	struct ifnet		*ifp;
-
-	block = adapter;
-	sc = device_get_softc(block->nmb_physdeviceobj->do_devext);
-	ifp = sc->ifp;
-
-	if (!NDIS_INITIALIZED(sc))
-		return;
-
-	switch (sc->ndis_sts) {
-	case NDIS_STATUS_MEDIA_CONNECT:
-		IoQueueWorkItem(sc->ndis_tickitem, 
-		    (io_workitem_func)ndis_ticktask_wrap,
-		    WORKQUEUE_CRITICAL, sc);
-		if (!sc->ndis_80211)
-			IoQueueWorkItem(sc->ndis_startitem,
-			    (io_workitem_func)ndis_ifstarttask_wrap,
-			    WORKQUEUE_CRITICAL, sc);
-		break;
-	case NDIS_STATUS_MEDIA_DISCONNECT:
-		if (sc->ndis_link)
-			IoQueueWorkItem(sc->ndis_tickitem,
-		    	    (io_workitem_func)ndis_ticktask_wrap,
-			    WORKQUEUE_CRITICAL, sc);
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-ndis_tick(xsc)
-	void			*xsc;
-{
-	struct ndis_softc	*sc;
-
-	sc = xsc;
-
-	if (sc->ndis_hang_timer && --sc->ndis_hang_timer == 0) {
-		IoQueueWorkItem(sc->ndis_tickitem,
-		    (io_workitem_func)ndis_ticktask_wrap,
-		    WORKQUEUE_CRITICAL, sc);
-		sc->ndis_hang_timer = sc->ndis_block->nmb_checkforhangsecs;
-	}
-
-	if (sc->ndis_tx_timer && --sc->ndis_tx_timer == 0) {
-		if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, 1);
-		device_printf(sc->ndis_dev, "watchdog timeout\n");
-
-		IoQueueWorkItem(sc->ndis_resetitem,
-		    (io_workitem_func)ndis_resettask_wrap,
-		    WORKQUEUE_CRITICAL, sc);
-		if (!sc->ndis_80211)
-			IoQueueWorkItem(sc->ndis_startitem,
-			    (io_workitem_func)ndis_ifstarttask_wrap,
-			    WORKQUEUE_CRITICAL, sc);
-	}
-
-	callout_reset(&sc->ndis_stat_callout, hz, ndis_tick, sc);
-}
-
-static void
-ndis_ticktask(device_object *d, void *xsc)
-{
-	struct ndis_softc	*sc = xsc;
-	ndis_checkforhang_handler hangfunc;
-	uint8_t			rval;
-
-	NDIS_LOCK(sc);
-	if (!NDIS_INITIALIZED(sc)) {
-		NDIS_UNLOCK(sc);
-		return;
-	}
-	NDIS_UNLOCK(sc);
-
-	hangfunc = sc->ndis_chars->nmc_checkhang_func;
-
-	if (hangfunc != NULL) {
-		rval = MSCALL1(hangfunc,
-		    sc->ndis_block->nmb_miniportadapterctx);
-		if (rval == TRUE) {
-			ndis_reset_nic(sc);
-			return;
-		}
-	}
-
-	NDIS_LOCK(sc);
-	if (sc->ndis_link == 0 &&
-	    sc->ndis_sts == NDIS_STATUS_MEDIA_CONNECT) {
-		sc->ndis_link = 1;
-		if (sc->ndis_80211 != 0) {
-			struct ieee80211com *ic = &sc->ndis_ic;
-			struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
-
-			if (vap != NULL) {
-				NDIS_UNLOCK(sc);
-				ndis_getstate_80211(sc);
-				ieee80211_new_state(vap, IEEE80211_S_RUN, -1);
-				NDIS_LOCK(sc);
-				if_link_state_change(vap->iv_ifp,
-				    LINK_STATE_UP);
-			}
-		} else
-			if_link_state_change(sc->ifp, LINK_STATE_UP);
-	}
-
-	if (sc->ndis_link == 1 &&
-	    sc->ndis_sts == NDIS_STATUS_MEDIA_DISCONNECT) {
-		sc->ndis_link = 0;
-		if (sc->ndis_80211 != 0) {
-			struct ieee80211com *ic = &sc->ndis_ic;
-			struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
-
-			if (vap != NULL) {
-				NDIS_UNLOCK(sc);
-				ieee80211_new_state(vap, IEEE80211_S_SCAN, 0);
-				NDIS_LOCK(sc);
-				if_link_state_change(vap->iv_ifp,
-				    LINK_STATE_DOWN);
-			}
-		} else
-			if_link_state_change(sc->ifp, LINK_STATE_DOWN);
-	}
-
-	NDIS_UNLOCK(sc);
-}
-
-static void
-ndis_map_sclist(arg, segs, nseg, mapsize, error)
-	void			*arg;
-	bus_dma_segment_t	*segs;
-	int			nseg;
-	bus_size_t		mapsize;
-	int			error;
-
-{
-	struct ndis_sc_list	*sclist;
-	int			i;
-
-	if (error || arg == NULL)
-		return;
-
-	sclist = arg;
-
-	sclist->nsl_frags = nseg;
-
-	for (i = 0; i < nseg; i++) {
-		sclist->nsl_elements[i].nse_addr.np_quad = segs[i].ds_addr;
-		sclist->nsl_elements[i].nse_len = segs[i].ds_len;
-	}
-}
-
-static int
-ndis_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
-	const struct ieee80211_bpf_params *params)
-{
-	/* no support; just discard */
-	m_freem(m);
-	ieee80211_free_node(ni);
-	return (0);
-}
-
-static void
-ndis_update_mcast(struct ieee80211com *ic)
-{
-       struct ndis_softc *sc = ic->ic_softc;
-
-       ndis_setmulti(sc);
-}
-
-static void
-ndis_update_promisc(struct ieee80211com *ic)
-{
-       /* not supported */
-}
-
-static void
-ndis_ifstarttask(device_object *d, void *arg)
-{
-	struct ndis_softc	*sc = arg;
-	DPRINTF(("%s: sc=%p, ifp=%p\n", __func__, sc, sc->ifp));
-	if (sc->ndis_80211)
-		return;
-
-	struct ifnet		*ifp = sc->ifp;
-	if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
-		ndis_ifstart(ifp);
-}
-
-/*
- * Main transmit routine. To make NDIS drivers happy, we need to
- * transform mbuf chains into NDIS packets and feed them to the
- * send packet routines. Most drivers allow you to send several
- * packets at once (up to the maxpkts limit). Unfortunately, rather
- * that accepting them in the form of a linked list, they expect
- * a contiguous array of pointers to packets.
- *
- * For those drivers which use the NDIS scatter/gather DMA mechanism,
- * we need to perform busdma work here. Those that use map registers
- * will do the mapping themselves on a buffer by buffer basis.
- */
-static void
-ndis_ifstart(struct ifnet *ifp)
-{
-	struct ndis_softc	*sc;
-	struct mbuf		*m = NULL;
-	ndis_packet		**p0 = NULL, *p = NULL;
-	ndis_tcpip_csum		*csum;
-	int			pcnt = 0, status;
-
-	sc = ifp->if_softc;
-
-	NDIS_LOCK(sc);
-	if (!sc->ndis_link || ifp->if_drv_flags & IFF_DRV_OACTIVE) {
-		NDIS_UNLOCK(sc);
-		return;
-	}
-
-	p0 = &sc->ndis_txarray[sc->ndis_txidx];
-
-	while(sc->ndis_txpending) {
-		IFQ_DRV_DEQUEUE(&ifp->if_snd, m);
-		if (m == NULL)
-			break;
-
-		NdisAllocatePacket(&status,
-		    &sc->ndis_txarray[sc->ndis_txidx], sc->ndis_txpool);
-
-		if (status != NDIS_STATUS_SUCCESS)
-			break;
-
-		if (ndis_mtop(m, &sc->ndis_txarray[sc->ndis_txidx])) {
-			IFQ_DRV_PREPEND(&ifp->if_snd, m);
-			NDIS_UNLOCK(sc);
-			return;
-		}
-
-		/*
-		 * Save pointer to original mbuf
-		 * so we can free it later.
-		 */
-
-		p = sc->ndis_txarray[sc->ndis_txidx];
-		p->np_txidx = sc->ndis_txidx;
-		p->np_m0 = m;
-		p->np_oob.npo_status = NDIS_STATUS_PENDING;
-
-		/*
-		 * Do scatter/gather processing, if driver requested it.
-		 */
-		if (sc->ndis_sc) {
-			bus_dmamap_load_mbuf(sc->ndis_ttag,
-			    sc->ndis_tmaps[sc->ndis_txidx], m,
-			    ndis_map_sclist, &p->np_sclist, BUS_DMA_NOWAIT);
-			bus_dmamap_sync(sc->ndis_ttag,
-			    sc->ndis_tmaps[sc->ndis_txidx],
-			    BUS_DMASYNC_PREREAD);
-			p->np_ext.npe_info[ndis_sclist_info] = &p->np_sclist;
-		}
-
-		/* Handle checksum offload. */
-
-		if (ifp->if_capenable & IFCAP_TXCSUM &&
-		    m->m_pkthdr.csum_flags) {
-			csum = (ndis_tcpip_csum *)
-				&p->np_ext.npe_info[ndis_tcpipcsum_info];
-			csum->u.ntc_txflags = NDIS_TXCSUM_DO_IPV4;
-			if (m->m_pkthdr.csum_flags & CSUM_IP)
-				csum->u.ntc_txflags |= NDIS_TXCSUM_DO_IP;
-			if (m->m_pkthdr.csum_flags & CSUM_TCP)
-				csum->u.ntc_txflags |= NDIS_TXCSUM_DO_TCP;
-			if (m->m_pkthdr.csum_flags & CSUM_UDP)
-				csum->u.ntc_txflags |= NDIS_TXCSUM_DO_UDP;
-			p->np_private.npp_flags = NDIS_PROTOCOL_ID_TCP_IP;
-		}
-
-		NDIS_INC(sc);
-		sc->ndis_txpending--;
-
-		pcnt++;
-
-		/*
-		 * If there's a BPF listener, bounce a copy of this frame
-		 * to him.
-		 */
-		if (!sc->ndis_80211)	/* XXX handle 80211 */
-			BPF_MTAP(ifp, m);
-
-		/*
-		 * The array that p0 points to must appear contiguous,
-		 * so we must not wrap past the end of sc->ndis_txarray[].
-		 * If it looks like we're about to wrap, break out here
-		 * so the this batch of packets can be transmitted, then
-		 * wait for txeof to ask us to send the rest.
-		 */
-		if (sc->ndis_txidx == 0)
-			break;
-	}
-
-	if (pcnt == 0) {
-		NDIS_UNLOCK(sc);
-		return;
-	}
-
-	if (sc->ndis_txpending == 0)
-		ifp->if_drv_flags |= IFF_DRV_OACTIVE;
-
-	/*
-	 * Set a timeout in case the chip goes out to lunch.
-	 */
-	sc->ndis_tx_timer = 5;
-
-	NDIS_UNLOCK(sc);
-
-	/*
-	 * According to NDIS documentation, if a driver exports
-	 * a MiniportSendPackets() routine, we prefer that over
-	 * a MiniportSend() routine (which sends just a single
-	 * packet).
-	 */
-	if (sc->ndis_chars->nmc_sendmulti_func != NULL)
-		ndis_send_packets(sc, p0, pcnt);
-	else
-		ndis_send_packet(sc, p);
-
-	return;
-}
-
-static int
-ndis_80211transmit(struct ieee80211com *ic, struct mbuf *m)
-{
-	struct ndis_softc *sc = ic->ic_softc;
-	ndis_packet **p0 = NULL, *p = NULL;
-	int status;
-
-	NDIS_LOCK(sc);
-	if (!sc->ndis_link || !sc->ndis_running) {
-		NDIS_UNLOCK(sc);
-		return (ENXIO);
-	}
-
-	if (sc->ndis_txpending == 0) {
-		NDIS_UNLOCK(sc);
-		return (ENOBUFS);
-	}
-
-	p0 = &sc->ndis_txarray[sc->ndis_txidx];
-
-	NdisAllocatePacket(&status,
-	    &sc->ndis_txarray[sc->ndis_txidx], sc->ndis_txpool);
-
-	if (status != NDIS_STATUS_SUCCESS) {
-		NDIS_UNLOCK(sc);
-		return (ENOBUFS);
-	}
-
-	if (ndis_mtop(m, &sc->ndis_txarray[sc->ndis_txidx])) {
-		NDIS_UNLOCK(sc);
-		return (ENOBUFS);
-	}
-
-	/*
-	 * Save pointer to original mbuf
-	 * so we can free it later.
-	 */
-
-	p = sc->ndis_txarray[sc->ndis_txidx];
-	p->np_txidx = sc->ndis_txidx;
-	p->np_m0 = m;
-	p->np_oob.npo_status = NDIS_STATUS_PENDING;
-
-	/*
-	 * Do scatter/gather processing, if driver requested it.
-	 */
-	if (sc->ndis_sc) {
-		bus_dmamap_load_mbuf(sc->ndis_ttag,
-		    sc->ndis_tmaps[sc->ndis_txidx], m,
-		    ndis_map_sclist, &p->np_sclist, BUS_DMA_NOWAIT);
-		bus_dmamap_sync(sc->ndis_ttag,
-		    sc->ndis_tmaps[sc->ndis_txidx],
-		    BUS_DMASYNC_PREREAD);
-		p->np_ext.npe_info[ndis_sclist_info] = &p->np_sclist;
-	}
-
-	NDIS_INC(sc);
-	sc->ndis_txpending--;
-
-	/*
-	 * Set a timeout in case the chip goes out to lunch.
-	 */
-	sc->ndis_tx_timer = 5;
-	NDIS_UNLOCK(sc);
-
-	/*
-	 * According to NDIS documentation, if a driver exports
-	 * a MiniportSendPackets() routine, we prefer that over
-	 * a MiniportSend() routine (which sends just a single
-	 * packet).
-	 */
-	if (sc->ndis_chars->nmc_sendmulti_func != NULL)
-		ndis_send_packets(sc, p0, 1);
-	else
-		ndis_send_packet(sc, p);
-
-	return (0);
-}
-
-static void
-ndis_80211parent(struct ieee80211com *ic)
-{
-	struct ndis_softc *sc = ic->ic_softc;
-
-	/*NDIS_LOCK(sc);*/
-	if (ic->ic_nrunning > 0) {
-		if (!sc->ndis_running)
-			ndis_init(sc);
-	} else if (sc->ndis_running)
-		ndis_stop(sc);
-	/*NDIS_UNLOCK(sc);*/
-}
-
-static void
-ndis_init(void *xsc)
-{
-	struct ndis_softc	*sc = xsc;
-	int			i, len, error;
-
-	/*
-	 * Avoid reintializing the link unnecessarily.
-	 * This should be dealt with in a better way by
-	 * fixing the upper layer modules so they don't
-	 * call ifp->if_init() quite as often.
-	 */
-	if (sc->ndis_link)
-		return;
-
-	/*
-	 * Cancel pending I/O and free all RX/TX buffers.
-	 */
-	ndis_stop(sc);
-
-	if (!(sc->ndis_iftype == PNPBus && ndisusb_halt == 0)) {
-		error = ndis_init_nic(sc);
-		if (error != 0) {
-			device_printf(sc->ndis_dev,
-			    "failed to initialize the device: %d\n", error);
-			return;
-		}
-	}
-
-	/* Program the packet filter */
-	sc->ndis_filter = NDIS_PACKET_TYPE_DIRECTED |
-	    NDIS_PACKET_TYPE_BROADCAST;
-
-	if (sc->ndis_80211) {
-		struct ieee80211com *ic = &sc->ndis_ic;
-
-		if (ic->ic_promisc > 0)
-			sc->ndis_filter |= NDIS_PACKET_TYPE_PROMISCUOUS;
-	} else {
-		struct ifnet *ifp = sc->ifp;
-
-		if (ifp->if_flags & IFF_PROMISC)
-			sc->ndis_filter |= NDIS_PACKET_TYPE_PROMISCUOUS;
-	}
-
-	len = sizeof(sc->ndis_filter);
-
-	error = ndis_set_info(sc, OID_GEN_CURRENT_PACKET_FILTER,
-	    &sc->ndis_filter, &len);
-
-	if (error)
-		device_printf(sc->ndis_dev, "set filter failed: %d\n", error);
-
-	/*
-	 * Set lookahead.
- 	 */
-	if (sc->ndis_80211)
-		i = ETHERMTU;
-	else
-		i = sc->ifp->if_mtu;
-	len = sizeof(i);
-	ndis_set_info(sc, OID_GEN_CURRENT_LOOKAHEAD, &i, &len);
-
-	/*
-	 * Program the multicast filter, if necessary.
-	 */
-	ndis_setmulti(sc);
-
-	/* Setup task offload. */
-	ndis_set_offload(sc);
-
-	NDIS_LOCK(sc);
-
-	sc->ndis_txidx = 0;
-	sc->ndis_txpending = sc->ndis_maxpkts;
-	sc->ndis_link = 0;
-
-	if (!sc->ndis_80211) {
-		if_link_state_change(sc->ifp, LINK_STATE_UNKNOWN);
-		sc->ifp->if_drv_flags |= IFF_DRV_RUNNING;
-		sc->ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
-	}
-
-	sc->ndis_tx_timer = 0;
-
-	/*
-	 * Some drivers don't set this value. The NDIS spec says
-	 * the default checkforhang timeout is "approximately 2
-	 * seconds." We use 3 seconds, because it seems for some
-	 * drivers, exactly 2 seconds is too fast.
-	 */
-	if (sc->ndis_block->nmb_checkforhangsecs == 0)
-		sc->ndis_block->nmb_checkforhangsecs = 3;
-
-	sc->ndis_hang_timer = sc->ndis_block->nmb_checkforhangsecs;
-	callout_reset(&sc->ndis_stat_callout, hz, ndis_tick, sc);
-	sc->ndis_running = 1;
-	NDIS_UNLOCK(sc);
-
-	/* XXX force handling */
-	if (sc->ndis_80211)
-		ieee80211_start_all(&sc->ndis_ic);	/* start all vap's */
-}
-
-/*
- * Set media options.
- */
-static int
-ndis_ifmedia_upd(ifp)
-	struct ifnet		*ifp;
-{
-	struct ndis_softc		*sc;
-
-	sc = ifp->if_softc;
-
-	if (NDIS_INITIALIZED(sc))
-		ndis_init(sc);
-
-	return (0);
-}
-
-/*
- * Report current media status.
- */
-static void
-ndis_ifmedia_sts(ifp, ifmr)
-	struct ifnet		*ifp;
-	struct ifmediareq	*ifmr;
-{
-	struct ndis_softc	*sc;
-	uint32_t		media_info;
-	ndis_media_state	linkstate;
-	int			len;
-
-	ifmr->ifm_status = IFM_AVALID;
-	ifmr->ifm_active = IFM_ETHER;
-	sc = ifp->if_softc;
-
-	if (!NDIS_INITIALIZED(sc))
-		return;
-
-	len = sizeof(linkstate);
-	ndis_get_info(sc, OID_GEN_MEDIA_CONNECT_STATUS,
-	    (void *)&linkstate, &len);
-
-	len = sizeof(media_info);
-	ndis_get_info(sc, OID_GEN_LINK_SPEED,
-	    (void *)&media_info, &len);
-
-	if (linkstate == nmc_connected)
-		ifmr->ifm_status |= IFM_ACTIVE;
-
-	switch (media_info) {
-	case 100000:
-		ifmr->ifm_active |= IFM_10_T;
-		break;
-	case 1000000:
-		ifmr->ifm_active |= IFM_100_TX;
-		break;
-	case 10000000:
-		ifmr->ifm_active |= IFM_1000_T;
-		break;
-	default:
-		device_printf(sc->ndis_dev, "unknown speed: %d\n", media_info);
-		break;
-	}
-}
-
-static int
-ndis_set_cipher(struct ndis_softc *sc, int cipher)
-{
-	struct ieee80211com	*ic = &sc->ndis_ic;
-	int			rval = 0, len;
-	uint32_t		arg, save;
-
-	len = sizeof(arg);
-
-	if (cipher == WPA_CSE_WEP40 || cipher == WPA_CSE_WEP104) {
-		if (!(ic->ic_cryptocaps & IEEE80211_CRYPTO_WEP))
-			return (ENOTSUP);
-		arg = NDIS_80211_WEPSTAT_ENC1ENABLED;
-	}
-
-	if (cipher == WPA_CSE_TKIP) {
-		if (!(ic->ic_cryptocaps & IEEE80211_CRYPTO_TKIP))
-			return (ENOTSUP);
-		arg = NDIS_80211_WEPSTAT_ENC2ENABLED;
-	}
-
-	if (cipher == WPA_CSE_CCMP) {
-		if (!(ic->ic_cryptocaps & IEEE80211_CRYPTO_AES_CCM))
-			return (ENOTSUP);
-		arg = NDIS_80211_WEPSTAT_ENC3ENABLED;
-	}
-
-	DPRINTF(("Setting cipher to %d\n", arg));
-	save = arg;
-	rval = ndis_set_info(sc, OID_802_11_ENCRYPTION_STATUS, &arg, &len);
-
-	if (rval)
-		return (rval);
-
-	/* Check that the cipher was set correctly. */
-
-	len = sizeof(save);
-	rval = ndis_get_info(sc, OID_802_11_ENCRYPTION_STATUS, &arg, &len);
-
-	if (rval != 0 || arg != save)
-		return (ENODEV);
-
-	return (0);
-}
-
-/*
- * WPA is hairy to set up. Do the work in a separate routine
- * so we don't clutter the setstate function too much.
- * Important yet undocumented fact: first we have to set the
- * authentication mode, _then_ we enable the ciphers. If one
- * of the WPA authentication modes isn't enabled, the driver
- * might not permit the TKIP or AES ciphers to be selected.
- */
-static int
-ndis_set_wpa(sc, ie, ielen)
-	struct ndis_softc	*sc;
-	void			*ie;
-	int			ielen;
-{
-	struct ieee80211_ie_wpa	*w;
-	struct ndis_ie		*n;
-	char			*pos;
-	uint32_t		arg;
-	int			i;
-
-	/*
-	 * Apparently, the only way for us to know what ciphers
-	 * and key management/authentication mode to use is for
-	 * us to inspect the optional information element (IE)
-	 * stored in the 802.11 state machine. This IE should be
-	 * supplied by the WPA supplicant.
-	 */
-
-	w = (struct ieee80211_ie_wpa *)ie;
-
-	/* Check for the right kind of IE. */
-	if (w->wpa_id != IEEE80211_ELEMID_VENDOR) {
-		DPRINTF(("Incorrect IE type %d\n", w->wpa_id));
-		return (EINVAL);
-	}
-
-	/* Skip over the ucast cipher OIDs. */
-	pos = (char *)&w->wpa_uciphers[0];
-	pos += w->wpa_uciphercnt * sizeof(struct ndis_ie);
-
-	/* Skip over the authmode count. */
-	pos += sizeof(u_int16_t);
-
-	/*
-	 * Check for the authentication modes. I'm
-	 * pretty sure there's only supposed to be one.
-	 */
-
-	n = (struct ndis_ie *)pos;
-	if (n->ni_val == WPA_ASE_NONE)
-		arg = NDIS_80211_AUTHMODE_WPANONE;
-
-	if (n->ni_val == WPA_ASE_8021X_UNSPEC)
-		arg = NDIS_80211_AUTHMODE_WPA;
-
-	if (n->ni_val == WPA_ASE_8021X_PSK)
-		arg = NDIS_80211_AUTHMODE_WPAPSK;
-
-	DPRINTF(("Setting WPA auth mode to %d\n", arg));
-	i = sizeof(arg);
-	if (ndis_set_info(sc, OID_802_11_AUTHENTICATION_MODE, &arg, &i))
-		return (ENOTSUP);
-	i = sizeof(arg);
-	ndis_get_info(sc, OID_802_11_AUTHENTICATION_MODE, &arg, &i);
-
-	/* Now configure the desired ciphers. */
-
-	/* First, set up the multicast group cipher. */
-	n = (struct ndis_ie *)&w->wpa_mcipher[0];
-
-	if (ndis_set_cipher(sc, n->ni_val))
-		return (ENOTSUP);
-
-	/* Now start looking around for the unicast ciphers. */
-	pos = (char *)&w->wpa_uciphers[0];
-	n = (struct ndis_ie *)pos;
-
-	for (i = 0; i < w->wpa_uciphercnt; i++) {
-		if (ndis_set_cipher(sc, n->ni_val))
-			return (ENOTSUP);
-		n++;
-	}
-
-	return (0);
-}
-
-static void
-ndis_media_status(struct ifnet *ifp, struct ifmediareq *imr)
-{
-	struct ieee80211vap *vap = ifp->if_softc;
-	struct ndis_softc *sc = vap->iv_ic->ic_softc;
-	uint32_t txrate;
-	int len;
-
-	if (!NDIS_INITIALIZED(sc))
-		return;
-
-	len = sizeof(txrate);
-	if (ndis_get_info(sc, OID_GEN_LINK_SPEED, &txrate, &len) == 0)
-		vap->iv_bss->ni_txrate = txrate / 5000;
-	ieee80211_media_status(ifp, imr);
-}
-
-static void
-ndis_setstate_80211(struct ndis_softc *sc)
-{
-	struct ieee80211com	*ic = &sc->ndis_ic;
-	struct ieee80211vap	*vap = TAILQ_FIRST(&ic->ic_vaps);
-	ndis_80211_macaddr	bssid;
-	ndis_80211_config	config;
-	int			rval = 0, len;
-	uint32_t		arg;
-
-	if (!NDIS_INITIALIZED(sc)) {
-		DPRINTF(("%s: NDIS not initialized\n", __func__));
-		return;
-	}
-
-	/* Disassociate and turn off radio. */
-	len = sizeof(arg);
-	arg = 1;
-	ndis_set_info(sc, OID_802_11_DISASSOCIATE, &arg, &len);
-
-	/* Set network infrastructure mode. */
-
-	len = sizeof(arg);
-	if (ic->ic_opmode == IEEE80211_M_IBSS)
-		arg = NDIS_80211_NET_INFRA_IBSS;
-	else
-		arg = NDIS_80211_NET_INFRA_BSS;
-
-	rval = ndis_set_info(sc, OID_802_11_INFRASTRUCTURE_MODE, &arg, &len);
-
-	if (rval)
-		device_printf (sc->ndis_dev, "set infra failed: %d\n", rval);
-
-	/* Set power management */
-	len = sizeof(arg);
-	if (vap->iv_flags & IEEE80211_F_PMGTON)
-		arg = NDIS_80211_POWERMODE_FAST_PSP;
-	else
-		arg = NDIS_80211_POWERMODE_CAM;
-	ndis_set_info(sc, OID_802_11_POWER_MODE, &arg, &len);
-
-	/* Set TX power */
-	if ((ic->ic_caps & IEEE80211_C_TXPMGT) &&
-	    ic->ic_txpowlimit < nitems(dBm2mW)) {
-		arg = dBm2mW[ic->ic_txpowlimit];
-		len = sizeof(arg);
-		ndis_set_info(sc, OID_802_11_TX_POWER_LEVEL, &arg, &len);
-	}
-
-	/*
-	 * Default encryption mode to off, authentication
-	 * to open and privacy to 'accept everything.'
-	 */
-	len = sizeof(arg);
-	arg = NDIS_80211_WEPSTAT_DISABLED;
-	ndis_set_info(sc, OID_802_11_ENCRYPTION_STATUS, &arg, &len);
-
-	len = sizeof(arg);
-	arg = NDIS_80211_AUTHMODE_OPEN;
-	ndis_set_info(sc, OID_802_11_AUTHENTICATION_MODE, &arg, &len);
-
-	/*
-	 * Note that OID_802_11_PRIVACY_FILTER is optional:
-	 * not all drivers implement it.
-	 */
-	len = sizeof(arg);
-	arg = NDIS_80211_PRIVFILT_8021XWEP;
-	ndis_set_info(sc, OID_802_11_PRIVACY_FILTER, &arg, &len);
-
-	len = sizeof(config);
-	bzero((char *)&config, len);
-	config.nc_length = len;
-	config.nc_fhconfig.ncf_length = sizeof(ndis_80211_config_fh);
-	rval = ndis_get_info(sc, OID_802_11_CONFIGURATION, &config, &len); 
-
-	/*
-	 * Some drivers expect us to initialize these values, so
-	 * provide some defaults.
-	 */
-
-	if (config.nc_beaconperiod == 0)
-		config.nc_beaconperiod = 100;
-	if (config.nc_atimwin == 0)
-		config.nc_atimwin = 100;
-	if (config.nc_fhconfig.ncf_dwelltime == 0)
-		config.nc_fhconfig.ncf_dwelltime = 200;
-	if (rval == 0 && ic->ic_bsschan != IEEE80211_CHAN_ANYC) { 
-		int chan, chanflag;
-
-		chan = ieee80211_chan2ieee(ic, ic->ic_bsschan);
-		chanflag = config.nc_dsconfig > 2500000 ? IEEE80211_CHAN_2GHZ :
-		    IEEE80211_CHAN_5GHZ;
-		if (chan != ieee80211_mhz2ieee(config.nc_dsconfig / 1000, 0)) {
-			config.nc_dsconfig =
-				ic->ic_bsschan->ic_freq * 1000;
-			len = sizeof(config);
-			config.nc_length = len;
-			config.nc_fhconfig.ncf_length =
-			    sizeof(ndis_80211_config_fh);
-			DPRINTF(("Setting channel to %ukHz\n", config.nc_dsconfig));
-			rval = ndis_set_info(sc, OID_802_11_CONFIGURATION,
-			    &config, &len);
-			if (rval)
-				device_printf(sc->ndis_dev, "couldn't change "
-				    "DS config to %ukHz: %d\n",
-				    config.nc_dsconfig, rval);
-		}
-	} else if (rval)
-		device_printf(sc->ndis_dev, "couldn't retrieve "
-		    "channel info: %d\n", rval);
-
-	/* Set the BSSID to our value so the driver doesn't associate */
-	len = IEEE80211_ADDR_LEN;
-	bcopy(vap->iv_myaddr, bssid, len);
-	DPRINTF(("Setting BSSID to %6D\n", (uint8_t *)&bssid, ":"));
-	rval = ndis_set_info(sc, OID_802_11_BSSID, &bssid, &len);
-	if (rval)
-		device_printf(sc->ndis_dev,
-		    "setting BSSID failed: %d\n", rval);
-}
-
-static void
-ndis_auth_and_assoc(struct ndis_softc *sc, struct ieee80211vap *vap)
-{
-	struct ieee80211_node	*ni = vap->iv_bss;
-	ndis_80211_ssid		ssid;
-	ndis_80211_macaddr	bssid;
-	ndis_80211_wep		wep;
-	int			i, rval = 0, len, error;
-	uint32_t		arg;
-
-	if (!NDIS_INITIALIZED(sc)) {
-		DPRINTF(("%s: NDIS not initialized\n", __func__));
-		return;
-	}
-
-	/* Initial setup */
-	ndis_setstate_80211(sc);
-
-	/* Set network infrastructure mode. */
-
-	len = sizeof(arg);
-	if (vap->iv_opmode == IEEE80211_M_IBSS)
-		arg = NDIS_80211_NET_INFRA_IBSS;
-	else
-		arg = NDIS_80211_NET_INFRA_BSS;
-
-	rval = ndis_set_info(sc, OID_802_11_INFRASTRUCTURE_MODE, &arg, &len);
-
-	if (rval)
-		device_printf (sc->ndis_dev, "set infra failed: %d\n", rval);
-
-	/* Set RTS threshold */
-
-	len = sizeof(arg);
-	arg = vap->iv_rtsthreshold;
-	ndis_set_info(sc, OID_802_11_RTS_THRESHOLD, &arg, &len);
-
-	/* Set fragmentation threshold */
-
-	len = sizeof(arg);
-	arg = vap->iv_fragthreshold;
-	ndis_set_info(sc, OID_802_11_FRAGMENTATION_THRESHOLD, &arg, &len);
-
-	/* Set WEP */
-
-	if (vap->iv_flags & IEEE80211_F_PRIVACY &&
-	    !(vap->iv_flags & IEEE80211_F_WPA)) {
-		int keys_set = 0;
-
-		if (ni->ni_authmode == IEEE80211_AUTH_SHARED) {
-			len = sizeof(arg);
-			arg = NDIS_80211_AUTHMODE_SHARED;
-			DPRINTF(("Setting shared auth\n"));
-			ndis_set_info(sc, OID_802_11_AUTHENTICATION_MODE,
-			    &arg, &len);
-		}
-		for (i = 0; i < IEEE80211_WEP_NKID; i++) {
-			if (vap->iv_nw_keys[i].wk_keylen) {
-				if (vap->iv_nw_keys[i].wk_cipher->ic_cipher !=
-				    IEEE80211_CIPHER_WEP)
-					continue;
-				bzero((char *)&wep, sizeof(wep));
-				wep.nw_keylen = vap->iv_nw_keys[i].wk_keylen;
-
-				/*
-				 * 5, 13 and 16 are the only valid
-				 * key lengths. Anything in between
-				 * will be zero padded out to the
-				 * next highest boundary.
-				 */
-				if (vap->iv_nw_keys[i].wk_keylen < 5)
-					wep.nw_keylen = 5;
-				else if (vap->iv_nw_keys[i].wk_keylen > 5 &&
-				     vap->iv_nw_keys[i].wk_keylen < 13)
-					wep.nw_keylen = 13;
-				else if (vap->iv_nw_keys[i].wk_keylen > 13 &&
-				     vap->iv_nw_keys[i].wk_keylen < 16)
-					wep.nw_keylen = 16;
-
-				wep.nw_keyidx = i;
-				wep.nw_length = (sizeof(uint32_t) * 3)
-				    + wep.nw_keylen;
-				if (i == vap->iv_def_txkey)
-					wep.nw_keyidx |= NDIS_80211_WEPKEY_TX;
-				bcopy(vap->iv_nw_keys[i].wk_key,
-				    wep.nw_keydata, wep.nw_length);
-				len = sizeof(wep);
-				DPRINTF(("Setting WEP key %d\n", i));
-				rval = ndis_set_info(sc,
-				    OID_802_11_ADD_WEP, &wep, &len);
-				if (rval)
-					device_printf(sc->ndis_dev,
-					    "set wepkey failed: %d\n", rval);
-				keys_set++;
-			}
-		}
-		if (keys_set) {
-			DPRINTF(("Setting WEP on\n"));
-			arg = NDIS_80211_WEPSTAT_ENABLED;
-			len = sizeof(arg);
-			rval = ndis_set_info(sc,
-			    OID_802_11_WEP_STATUS, &arg, &len);
-			if (rval)
-				device_printf(sc->ndis_dev,
-				    "enable WEP failed: %d\n", rval);
-			if (vap->iv_flags & IEEE80211_F_DROPUNENC)
-				arg = NDIS_80211_PRIVFILT_8021XWEP;
-			else
-				arg = NDIS_80211_PRIVFILT_ACCEPTALL;
-
-			len = sizeof(arg);
-			ndis_set_info(sc,
-			    OID_802_11_PRIVACY_FILTER, &arg, &len);
-		}
-	}
-
-	/* Set up WPA. */
-	if ((vap->iv_flags & IEEE80211_F_WPA) &&
-	    vap->iv_appie_assocreq != NULL) {
-		struct ieee80211_appie *ie = vap->iv_appie_assocreq;
-		error = ndis_set_wpa(sc, ie->ie_data, ie->ie_len);
-		if (error != 0)
-			device_printf(sc->ndis_dev, "WPA setup failed\n");
-	}
-
-#ifdef notyet
-	/* Set network type. */
-
-	arg = 0;
-
-	switch (vap->iv_curmode) {
-	case IEEE80211_MODE_11A:
-		arg = NDIS_80211_NETTYPE_11OFDM5;
-		break;
-	case IEEE80211_MODE_11B:
-		arg = NDIS_80211_NETTYPE_11DS;
-		break;
-	case IEEE80211_MODE_11G:
-		arg = NDIS_80211_NETTYPE_11OFDM24;
-		break;
-	default:
-		device_printf(sc->ndis_dev, "unknown mode: %d\n",
-		    vap->iv_curmode);
-	}
-
-	if (arg) {
-		DPRINTF(("Setting network type to %d\n", arg));
-		len = sizeof(arg);
-		rval = ndis_set_info(sc, OID_802_11_NETWORK_TYPE_IN_USE,
-		    &arg, &len);
-		if (rval)
-			device_printf(sc->ndis_dev,
-			    "set nettype failed: %d\n", rval);
-	}
-#endif
-
-	/*
-	 * If the user selected a specific BSSID, try
-	 * to use that one. This is useful in the case where
-	 * there are several APs in range with the same network
-	 * name. To delete the BSSID, we use the broadcast
-	 * address as the BSSID.
-	 * Note that some drivers seem to allow setting a BSSID
-	 * in ad-hoc mode, which has the effect of forcing the
-	 * NIC to create an ad-hoc cell with a specific BSSID,
-	 * instead of a randomly chosen one. However, the net80211
-	 * code makes the assumtion that the BSSID setting is invalid
-	 * when you're in ad-hoc mode, so we don't allow that here.
-	 */
-
-	len = IEEE80211_ADDR_LEN;
-	if (vap->iv_flags & IEEE80211_F_DESBSSID &&
-	    vap->iv_opmode != IEEE80211_M_IBSS)
-		bcopy(ni->ni_bssid, bssid, len);
-	else
-		bcopy(ieee80211broadcastaddr, bssid, len);
-
-	DPRINTF(("Setting BSSID to %6D\n", (uint8_t *)&bssid, ":"));
-	rval = ndis_set_info(sc, OID_802_11_BSSID, &bssid, &len);
-	if (rval)
-		device_printf(sc->ndis_dev,
-		    "setting BSSID failed: %d\n", rval);
-
-	/* Set SSID -- always do this last. */
-
-#ifdef NDIS_DEBUG
-	if (ndis_debug > 0) {
-		printf("Setting ESSID to ");
-		ieee80211_print_essid(ni->ni_essid, ni->ni_esslen);
-		printf("\n");
-	}
-#endif
-
-	len = sizeof(ssid);
-	bzero((char *)&ssid, len);
-	ssid.ns_ssidlen = ni->ni_esslen;
-	if (ssid.ns_ssidlen == 0) {
-		ssid.ns_ssidlen = 1;
-	} else
-		bcopy(ni->ni_essid, ssid.ns_ssid, ssid.ns_ssidlen);
-
-	rval = ndis_set_info(sc, OID_802_11_SSID, &ssid, &len);
-
-	if (rval)
-		device_printf (sc->ndis_dev, "set ssid failed: %d\n", rval);
-
-	return;
-}
-
-static int
-ndis_get_bssid_list(sc, bl)
-	struct ndis_softc	*sc;
-	ndis_80211_bssid_list_ex	**bl;
-{
-	int	len, error;
-
-	len = sizeof(uint32_t) + (sizeof(ndis_wlan_bssid_ex) * 16);
-	*bl = malloc(len, M_DEVBUF, M_NOWAIT | M_ZERO);
-	if (*bl == NULL)
-		return (ENOMEM);
-
-	error = ndis_get_info(sc, OID_802_11_BSSID_LIST, *bl, &len);
-	if (error == ENOSPC) {
-		free(*bl, M_DEVBUF);
-		*bl = malloc(len, M_DEVBUF, M_NOWAIT | M_ZERO);
-		if (*bl == NULL)
-			return (ENOMEM);
-
-		error = ndis_get_info(sc, OID_802_11_BSSID_LIST, *bl, &len);
-	}
-	if (error) {
-		DPRINTF(("%s: failed to read\n", __func__));
-		free(*bl, M_DEVBUF);
-		return (error);
-	}
-
-	return (0);
-}
-
-static int
-ndis_get_assoc(struct ndis_softc *sc, ndis_wlan_bssid_ex **assoc)
-{
-	struct ieee80211com *ic = &sc->ndis_ic;
-	struct ieee80211vap     *vap;
-	struct ieee80211_node   *ni;
-	ndis_80211_bssid_list_ex	*bl;
-	ndis_wlan_bssid_ex	*bs;
-	ndis_80211_macaddr	bssid;
-	int			i, len, error;
-
-	if (!sc->ndis_link)
-		return (ENOENT);
-
-	len = sizeof(bssid);
-	error = ndis_get_info(sc, OID_802_11_BSSID, &bssid, &len);
-	if (error) {
-		device_printf(sc->ndis_dev, "failed to get bssid\n");
-		return (ENOENT);
-	}
-
-	vap = TAILQ_FIRST(&ic->ic_vaps);
-	ni = vap->iv_bss;
-
-	error = ndis_get_bssid_list(sc, &bl);
-	if (error)
-		return (error);
-
-	bs = (ndis_wlan_bssid_ex *)&bl->nblx_bssid[0];
-	for (i = 0; i < bl->nblx_items; i++) {
-		if (bcmp(bs->nwbx_macaddr, bssid, sizeof(bssid)) == 0) {
-			*assoc = malloc(bs->nwbx_len, M_TEMP, M_NOWAIT);
-			if (*assoc == NULL) {
-				free(bl, M_TEMP);
-				return (ENOMEM);
-			}
-			bcopy((char *)bs, (char *)*assoc, bs->nwbx_len);
-			free(bl, M_TEMP);
-			if (ic->ic_opmode == IEEE80211_M_STA)
-				ni->ni_associd = 1 | 0xc000; /* fake associd */
-			return (0);
-		}
-		bs = (ndis_wlan_bssid_ex *)((char *)bs + bs->nwbx_len);
-	}
-
-	free(bl, M_TEMP);
-	return (ENOENT);
-}
-
-static void
-ndis_getstate_80211(struct ndis_softc *sc)
-{
-	struct ieee80211com	*ic = &sc->ndis_ic;
-	struct ieee80211vap	*vap = TAILQ_FIRST(&ic->ic_vaps);
-	struct ieee80211_node	*ni = vap->iv_bss;
-	ndis_wlan_bssid_ex	*bs;
-	int			rval, len, i = 0;
-	int			chanflag;
-	uint32_t		arg;
-
-	if (!NDIS_INITIALIZED(sc))
-		return;
-
-	if ((rval = ndis_get_assoc(sc, &bs)) != 0)
-		return;
-
-	/* We're associated, retrieve info on the current bssid. */
-	ic->ic_curmode = ndis_nettype_mode(bs->nwbx_nettype);
-	chanflag = ndis_nettype_chan(bs->nwbx_nettype);
-	IEEE80211_ADDR_COPY(ni->ni_bssid, bs->nwbx_macaddr);
-
-	/* Get SSID from current association info. */
-	bcopy(bs->nwbx_ssid.ns_ssid, ni->ni_essid,
-	    bs->nwbx_ssid.ns_ssidlen);
-	ni->ni_esslen = bs->nwbx_ssid.ns_ssidlen;
-
-	if (ic->ic_caps & IEEE80211_C_PMGT) {
-		len = sizeof(arg);
-		rval = ndis_get_info(sc, OID_802_11_POWER_MODE, &arg, &len);
-
-		if (rval)
-			device_printf(sc->ndis_dev,
-			    "get power mode failed: %d\n", rval);
-		if (arg == NDIS_80211_POWERMODE_CAM)
-			vap->iv_flags &= ~IEEE80211_F_PMGTON;
-		else
-			vap->iv_flags |= IEEE80211_F_PMGTON;
-	}
-
-	/* Get TX power */
-	if (ic->ic_caps & IEEE80211_C_TXPMGT) {
-		len = sizeof(arg);
-		ndis_get_info(sc, OID_802_11_TX_POWER_LEVEL, &arg, &len);
-		for (i = 0; i < nitems(dBm2mW); i++)
-			if (dBm2mW[i] >= arg)
-				break;
-		ic->ic_txpowlimit = i;
-	}
-
-	/*
-	 * Use the current association information to reflect
-	 * what channel we're on.
-	 */
-	ic->ic_curchan = ieee80211_find_channel(ic,
-	    bs->nwbx_config.nc_dsconfig / 1000, chanflag);
-	if (ic->ic_curchan == NULL)
-		ic->ic_curchan = &ic->ic_channels[0];
-	ni->ni_chan = ic->ic_curchan;
-	ic->ic_bsschan = ic->ic_curchan;
-
-	free(bs, M_TEMP);
-
-	/*
-	 * Determine current authentication mode.
-	 */
-	len = sizeof(arg);
-	rval = ndis_get_info(sc, OID_802_11_AUTHENTICATION_MODE, &arg, &len);
-	if (rval)
-		device_printf(sc->ndis_dev,
-		    "get authmode status failed: %d\n", rval);
-	else {
-		vap->iv_flags &= ~IEEE80211_F_WPA;
-		switch (arg) {
-		case NDIS_80211_AUTHMODE_OPEN:
-			ni->ni_authmode = IEEE80211_AUTH_OPEN;
-			break;
-		case NDIS_80211_AUTHMODE_SHARED:
-			ni->ni_authmode = IEEE80211_AUTH_SHARED;
-			break;
-		case NDIS_80211_AUTHMODE_AUTO:
-			ni->ni_authmode = IEEE80211_AUTH_AUTO;
-			break;
-		case NDIS_80211_AUTHMODE_WPA:
-		case NDIS_80211_AUTHMODE_WPAPSK:
-		case NDIS_80211_AUTHMODE_WPANONE:
-			ni->ni_authmode = IEEE80211_AUTH_WPA;
-			vap->iv_flags |= IEEE80211_F_WPA1;
-			break;
-		case NDIS_80211_AUTHMODE_WPA2:
-		case NDIS_80211_AUTHMODE_WPA2PSK:
-			ni->ni_authmode = IEEE80211_AUTH_WPA;
-			vap->iv_flags |= IEEE80211_F_WPA2;
-			break;
-		default:
-			ni->ni_authmode = IEEE80211_AUTH_NONE;
-			break;
-		}
-	}
-
-	len = sizeof(arg);
-	rval = ndis_get_info(sc, OID_802_11_WEP_STATUS, &arg, &len);
-
-	if (rval)
-		device_printf(sc->ndis_dev,
-		    "get wep status failed: %d\n", rval);
-
-	if (arg == NDIS_80211_WEPSTAT_ENABLED)
-		vap->iv_flags |= IEEE80211_F_PRIVACY|IEEE80211_F_DROPUNENC;
-	else
-		vap->iv_flags &= ~(IEEE80211_F_PRIVACY|IEEE80211_F_DROPUNENC);
-}
-
-static int
-ndis_ifioctl(ifp, command, data)
-	struct ifnet		*ifp;
-	u_long			command;
-	caddr_t			data;
-{
-	struct ndis_softc	*sc = ifp->if_softc;
-	struct ifreq		*ifr = (struct ifreq *) data;
-	int			i, error = 0;
-
-	/*NDIS_LOCK(sc);*/
-
-	switch (command) {
-	case SIOCSIFFLAGS:
-		if (ifp->if_flags & IFF_UP) {
-			if (sc->ndis_running &&
-			    ifp->if_flags & IFF_PROMISC &&
-			    !(sc->ndis_if_flags & IFF_PROMISC)) {
-				sc->ndis_filter |=
-				    NDIS_PACKET_TYPE_PROMISCUOUS;
-				i = sizeof(sc->ndis_filter);
-				error = ndis_set_info(sc,
-				    OID_GEN_CURRENT_PACKET_FILTER,
-				    &sc->ndis_filter, &i);
-			} else if (sc->ndis_running &&
-			    !(ifp->if_flags & IFF_PROMISC) &&
-			    sc->ndis_if_flags & IFF_PROMISC) {
-				sc->ndis_filter &=
-				    ~NDIS_PACKET_TYPE_PROMISCUOUS;
-				i = sizeof(sc->ndis_filter);
-				error = ndis_set_info(sc,
-				    OID_GEN_CURRENT_PACKET_FILTER,
-				    &sc->ndis_filter, &i);
-			} else
-				ndis_init(sc);
-		} else {
-			if (sc->ndis_running)
-				ndis_stop(sc);
-		}
-		sc->ndis_if_flags = ifp->if_flags;
-		error = 0;
-		break;
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		ndis_setmulti(sc);
-		error = 0;
-		break;
-	case SIOCGIFMEDIA:
-	case SIOCSIFMEDIA:
-		error = ifmedia_ioctl(ifp, ifr, &sc->ifmedia, command);
-		break;
-	case SIOCSIFCAP:
-		ifp->if_capenable = ifr->ifr_reqcap;
-		if (ifp->if_capenable & IFCAP_TXCSUM)
-			ifp->if_hwassist = sc->ndis_hwassist;
-		else
-			ifp->if_hwassist = 0;
-		ndis_set_offload(sc);
-		break;
-	default:
-		error = ether_ioctl(ifp, command, data);
-		break;
-	}
-
-	/*NDIS_UNLOCK(sc);*/
-
-	return(error);
-}
-
-static int
-ndis_80211ioctl(struct ieee80211com *ic, u_long cmd, void *data)
-{
-	struct ndis_softc *sc = ic->ic_softc;
-	struct ifreq *ifr = data;
-	struct ndis_oid_data oid;
-	struct ndis_evt evt;
-	void *oidbuf = NULL;
-	int error = 0;
-
-	if ((error = priv_check(curthread, PRIV_DRIVER)) != 0)
-		return (error);
-
-	switch (cmd) {
-	case SIOCGDRVSPEC:
-	case SIOCSDRVSPEC:
-		error = copyin(ifr_data_get_ptr(ifr), &oid, sizeof(oid));
-		if (error)
-			break;
-		oidbuf = malloc(oid.len, M_TEMP, M_WAITOK | M_ZERO);
-		error = copyin((caddr_t)ifr_data_get_ptr(ifr) + sizeof(oid),
-		    oidbuf, oid.len);
-	}
-
-	if (error) {
-		free(oidbuf, M_TEMP);
-		return (error);
-	}
-
-	switch (cmd) {
-	case SIOCGDRVSPEC:
-		error = ndis_get_info(sc, oid.oid, oidbuf, &oid.len);
-		break;
-	case SIOCSDRVSPEC:
-		error = ndis_set_info(sc, oid.oid, oidbuf, &oid.len);
-		break;
-	case SIOCGPRIVATE_0:
-		NDIS_LOCK(sc);
-		if (sc->ndis_evt[sc->ndis_evtcidx].ne_sts == 0) {
-			error = ENOENT;
-			NDIS_UNLOCK(sc);
-			break;
-		}
-		error = copyin(ifr_data_get_ptr(ifr), &evt, sizeof(evt));
-		if (error) {
-			NDIS_UNLOCK(sc);
-			break;
-		}
-		if (evt.ne_len < sc->ndis_evt[sc->ndis_evtcidx].ne_len) {
-			error = ENOSPC;
-			NDIS_UNLOCK(sc);
-			break;
-		}
-		error = copyout(&sc->ndis_evt[sc->ndis_evtcidx],
-		    ifr_data_get_ptr(ifr), sizeof(uint32_t) * 2);
-		if (error) {
-			NDIS_UNLOCK(sc);
-			break;
-		}
-		if (sc->ndis_evt[sc->ndis_evtcidx].ne_len) {
-			error = copyout(sc->ndis_evt[sc->ndis_evtcidx].ne_buf,
-			    (caddr_t)ifr_data_get_ptr(ifr) +
-			    (sizeof(uint32_t) * 2),
-			    sc->ndis_evt[sc->ndis_evtcidx].ne_len);
-			if (error) {
-				NDIS_UNLOCK(sc);
-				break;
-			}
-			free(sc->ndis_evt[sc->ndis_evtcidx].ne_buf, M_TEMP);
-			sc->ndis_evt[sc->ndis_evtcidx].ne_buf = NULL;
-		}
-		sc->ndis_evt[sc->ndis_evtcidx].ne_len = 0;
-		sc->ndis_evt[sc->ndis_evtcidx].ne_sts = 0;
-		NDIS_EVTINC(sc->ndis_evtcidx);
-		NDIS_UNLOCK(sc);
-		break;
-	default:
-		error = ENOTTY;
-		break;
-	}
-
-	switch (cmd) {
-	case SIOCGDRVSPEC:
-	case SIOCSDRVSPEC:
-		error = copyout(&oid, ifr_data_get_ptr(ifr), sizeof(oid));
-		if (error)
-			break;
-		error = copyout(oidbuf,
-		    (caddr_t)ifr_data_get_ptr(ifr) + sizeof(oid), oid.len);
-	}
-
-	free(oidbuf, M_TEMP);
-
-	return (error);
-}
-
-int
-ndis_del_key(struct ieee80211vap *vap, const struct ieee80211_key *key)
-{
-	struct ndis_softc	*sc = vap->iv_ic->ic_softc;
-	ndis_80211_key		rkey;
-	int			len, error = 0;
-
-	bzero((char *)&rkey, sizeof(rkey));
-	len = sizeof(rkey);
-
-	rkey.nk_len = len;
-	rkey.nk_keyidx = key->wk_keyix;
-
-	bcopy(vap->iv_ifp->if_broadcastaddr,
-	    rkey.nk_bssid, IEEE80211_ADDR_LEN);
-
-	error = ndis_set_info(sc, OID_802_11_REMOVE_KEY, &rkey, &len);
-
-	if (error)
-		return (0);
-
-	return (1);
-}
-
-/*
- * In theory this could be called for any key, but we'll
- * only use it for WPA TKIP or AES keys. These need to be
- * set after initial authentication with the AP.
- */
-static int
-ndis_add_key(struct ieee80211vap *vap, const struct ieee80211_key *key)
-{
-	struct ndis_softc	*sc = vap->iv_ic->ic_softc;
-	ndis_80211_key		rkey;
-	int			len, error = 0;
-
-	switch (key->wk_cipher->ic_cipher) {
-	case IEEE80211_CIPHER_TKIP:
-
-		len = sizeof(ndis_80211_key);
-		bzero((char *)&rkey, sizeof(rkey));
-
-		rkey.nk_len = len;
-		rkey.nk_keylen = key->wk_keylen;
-
-		if (key->wk_flags & IEEE80211_KEY_SWMIC)
-			rkey.nk_keylen += 16;
-
-		/* key index - gets weird in NDIS */
-
-		if (key->wk_keyix != IEEE80211_KEYIX_NONE)
-			rkey.nk_keyidx = key->wk_keyix;
-		else
-			rkey.nk_keyidx = 0;
-
-		if (key->wk_flags & IEEE80211_KEY_XMIT)
-			rkey.nk_keyidx |= 1 << 31;
-
-		if (key->wk_flags & IEEE80211_KEY_GROUP) {
-			bcopy(ieee80211broadcastaddr,
-			    rkey.nk_bssid, IEEE80211_ADDR_LEN);
-		} else {
-			bcopy(vap->iv_bss->ni_bssid,
-			    rkey.nk_bssid, IEEE80211_ADDR_LEN);
-			/* pairwise key */
-			rkey.nk_keyidx |= 1 << 30;
-		}
-
-		/* need to set bit 29 based on keyrsc */
-		rkey.nk_keyrsc = key->wk_keyrsc[0];	/* XXX need tid */
-
-		if (rkey.nk_keyrsc)
-			rkey.nk_keyidx |= 1 << 29;
-
-		if (key->wk_flags & IEEE80211_KEY_SWMIC) {
-			bcopy(key->wk_key, rkey.nk_keydata, 16);
-			bcopy(key->wk_key + 24, rkey.nk_keydata + 16, 8);
-			bcopy(key->wk_key + 16, rkey.nk_keydata + 24, 8);
-		} else
-			bcopy(key->wk_key, rkey.nk_keydata, key->wk_keylen);
-
-		error = ndis_set_info(sc, OID_802_11_ADD_KEY, &rkey, &len);
-		break;
-	case IEEE80211_CIPHER_WEP:
-		error = 0;
-		break;
-	/*
-	 * I don't know how to set up keys for the AES
-	 * cipher yet. Is it the same as TKIP?
-	 */
-	case IEEE80211_CIPHER_AES_CCM:
-	default:
-		error = ENOTTY;
-		break;
-	}
-
-	/* We need to return 1 for success, 0 for failure. */
-
-	if (error)
-		return (0);
-
-	return (1);
-}
-
-static void
-ndis_resettask(d, arg)
-	device_object		*d;
-	void			*arg;
-{
-	struct ndis_softc		*sc;
-
-	sc = arg;
-	ndis_reset_nic(sc);
-}
-
-/*
- * Stop the adapter and free any mbufs allocated to the
- * RX and TX lists.
- */
-static void
-ndis_stop(struct ndis_softc *sc)
-{
-	int			i;
-
-	callout_drain(&sc->ndis_stat_callout);
-
-	NDIS_LOCK(sc);
-	sc->ndis_tx_timer = 0;
-	sc->ndis_link = 0;
-	if (!sc->ndis_80211)
-		sc->ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
-	sc->ndis_running = 0;
-	NDIS_UNLOCK(sc);
-
-	if (sc->ndis_iftype != PNPBus ||
-	    (sc->ndis_iftype == PNPBus &&
-	     !(sc->ndisusb_status & NDISUSB_STATUS_DETACH) &&
-	     ndisusb_halt != 0))
-		ndis_halt_nic(sc);
-
-	NDIS_LOCK(sc);
-	for (i = 0; i < NDIS_EVENTS; i++) {
-		if (sc->ndis_evt[i].ne_sts && sc->ndis_evt[i].ne_buf != NULL) {
-			free(sc->ndis_evt[i].ne_buf, M_TEMP);
-			sc->ndis_evt[i].ne_buf = NULL;
-		}
-		sc->ndis_evt[i].ne_sts = 0;
-		sc->ndis_evt[i].ne_len = 0;
-	}
-	sc->ndis_evtcidx = 0;
-	sc->ndis_evtpidx = 0;
-	NDIS_UNLOCK(sc);
-}
-
-/*
- * Stop all chip I/O so that the kernel's probe routines don't
- * get confused by errant DMAs when rebooting.
- */
-void
-ndis_shutdown(dev)
-	device_t		dev;
-{
-	struct ndis_softc		*sc;
-
-	sc = device_get_softc(dev);
-	ndis_stop(sc);
-}
-
-static int
-ndis_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
-{
-	struct ndis_vap *nvp = NDIS_VAP(vap);
-	struct ieee80211com *ic = vap->iv_ic;
-	struct ndis_softc *sc = ic->ic_softc;
-	enum ieee80211_state ostate;
-
-	DPRINTF(("%s: %s -> %s\n", __func__,
-		ieee80211_state_name[vap->iv_state],
-		ieee80211_state_name[nstate]));
-
-	ostate = vap->iv_state;
-	vap->iv_state = nstate;
-
-	switch (nstate) {
-	/* pass on to net80211 */
-	case IEEE80211_S_INIT:
-	case IEEE80211_S_SCAN:
-		return nvp->newstate(vap, nstate, arg);
-	case IEEE80211_S_ASSOC:
-		if (ostate != IEEE80211_S_AUTH) {
-			IEEE80211_UNLOCK(ic);
-			ndis_auth_and_assoc(sc, vap);
-			IEEE80211_LOCK(ic);
-		}
-		break;
-	case IEEE80211_S_AUTH:
-		IEEE80211_UNLOCK(ic);
-		ndis_auth_and_assoc(sc, vap);
-		if (vap->iv_state == IEEE80211_S_AUTH) /* XXX */
-			ieee80211_new_state(vap, IEEE80211_S_ASSOC, 0);
-		IEEE80211_LOCK(ic);
-		break;
-	default:
-		break;
-	}
-	return (0);
-}
-
-static void
-ndis_scan(void *arg)
-{
-	struct ieee80211vap *vap = arg;
-
-	ieee80211_scan_done(vap);
-}
-
-static void
-ndis_scan_results(struct ndis_softc *sc)
-{
-	struct ieee80211com *ic = &sc->ndis_ic;
-	struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
-	ndis_80211_bssid_list_ex *bl;
-	ndis_wlan_bssid_ex	*wb;
-	struct ieee80211_scanparams sp;
-	struct ieee80211_frame wh;
-	struct ieee80211_channel *saved_chan;
-	int i, j;
-	int rssi, noise, freq, chanflag;
-	uint8_t ssid[2+IEEE80211_NWID_LEN];
-	uint8_t rates[2+IEEE80211_RATE_MAXSIZE];
-	uint8_t *frm, *efrm;
-
-	saved_chan = ic->ic_curchan;
-	noise = -96;
-
-	if (ndis_get_bssid_list(sc, &bl))
-		return;
-
-	DPRINTF(("%s: %d results\n", __func__, bl->nblx_items));
-	wb = &bl->nblx_bssid[0];
-	for (i = 0; i < bl->nblx_items; i++) {
-		memset(&sp, 0, sizeof(sp));
-
-		memcpy(wh.i_addr2, wb->nwbx_macaddr, sizeof(wh.i_addr2));
-		memcpy(wh.i_addr3, wb->nwbx_macaddr, sizeof(wh.i_addr3));
-		rssi = 100 * (wb->nwbx_rssi - noise) / (-32 - noise);
-		rssi = max(0, min(rssi, 100));	/* limit 0 <= rssi <= 100 */
-		if (wb->nwbx_privacy)
-			sp.capinfo |= IEEE80211_CAPINFO_PRIVACY;
-		sp.bintval = wb->nwbx_config.nc_beaconperiod;
-		switch (wb->nwbx_netinfra) {
-			case NDIS_80211_NET_INFRA_IBSS:
-				sp.capinfo |= IEEE80211_CAPINFO_IBSS;
-				break;
-			case NDIS_80211_NET_INFRA_BSS:
-				sp.capinfo |= IEEE80211_CAPINFO_ESS;
-				break;
-		}
-		sp.rates = &rates[0];
-		for (j = 0; j < IEEE80211_RATE_MAXSIZE; j++) {
-			/* XXX - check units */
-			if (wb->nwbx_supportedrates[j] == 0)
-				break;
-			rates[2 + j] =
-			wb->nwbx_supportedrates[j] & 0x7f;
-		}
-		rates[1] = j;
-		sp.ssid = (uint8_t *)&ssid[0];
-		memcpy(sp.ssid + 2, &wb->nwbx_ssid.ns_ssid,
-		    wb->nwbx_ssid.ns_ssidlen);
-		sp.ssid[1] = wb->nwbx_ssid.ns_ssidlen;
-
-		chanflag = ndis_nettype_chan(wb->nwbx_nettype);
-		freq = wb->nwbx_config.nc_dsconfig / 1000;
-		sp.chan = sp.bchan = ieee80211_mhz2ieee(freq, chanflag);
-		/* Hack ic->ic_curchan to be in sync with the scan result */
-		ic->ic_curchan = ieee80211_find_channel(ic, freq, chanflag);
-		if (ic->ic_curchan == NULL)
-			ic->ic_curchan = &ic->ic_channels[0];
-
-		/* Process extended info from AP */
-		if (wb->nwbx_len > sizeof(ndis_wlan_bssid)) {
-			frm = (uint8_t *)&wb->nwbx_ies;
-			efrm = frm + wb->nwbx_ielen;
-			if (efrm - frm < 12)
-				goto done;
-			sp.tstamp = frm;			frm += 8;
-			sp.bintval = le16toh(*(uint16_t *)frm);	frm += 2;
-			sp.capinfo = le16toh(*(uint16_t *)frm);	frm += 2;
-			sp.ies = frm;
-			sp.ies_len = efrm - frm;
-		}
-done:
-		DPRINTF(("scan: bssid %s chan %dMHz (%d/%d) rssi %d\n",
-		    ether_sprintf(wb->nwbx_macaddr), freq, sp.bchan, chanflag,
-		    rssi));
-		ieee80211_add_scan(vap, ic->ic_curchan, &sp, &wh, 0, rssi, noise);
-		wb = (ndis_wlan_bssid_ex *)((char *)wb + wb->nwbx_len);
-	}
-	free(bl, M_DEVBUF);
-	/* Restore the channel after messing with it */
-	ic->ic_curchan = saved_chan;
-}
-
-static void
-ndis_scan_start(struct ieee80211com *ic)
-{
-	struct ndis_softc *sc = ic->ic_softc;
-	struct ieee80211vap *vap;
-	struct ieee80211_scan_state *ss;
-	ndis_80211_ssid ssid;
-	int error, len;
-
-	ss = ic->ic_scan;
-	vap = TAILQ_FIRST(&ic->ic_vaps);
-
-	if (!NDIS_INITIALIZED(sc)) {
-		DPRINTF(("%s: scan aborted\n", __func__));
-		ieee80211_cancel_scan(vap);
-		return;
-	}
-
-	len = sizeof(ssid);
-	bzero((char *)&ssid, len);
-	if (ss->ss_nssid == 0)
-		ssid.ns_ssidlen = 1;
-	else {
-		/* Perform a directed scan */
-		ssid.ns_ssidlen = ss->ss_ssid[0].len;
-		bcopy(ss->ss_ssid[0].ssid, ssid.ns_ssid, ssid.ns_ssidlen);
-	}
-
-	error = ndis_set_info(sc, OID_802_11_SSID, &ssid, &len);
-	if (error)
-		DPRINTF(("%s: set ESSID failed\n", __func__));
-
-	len = 0;
-	error = ndis_set_info(sc, OID_802_11_BSSID_LIST_SCAN, NULL, &len);
-	if (error) {
-		DPRINTF(("%s: scan command failed\n", __func__));
-		ieee80211_cancel_scan(vap);
-		return;
-	}
-	/* Set a timer to collect the results */
-	callout_reset(&sc->ndis_scan_callout, hz * 3, ndis_scan, vap);
-}
-
-static void
-ndis_set_channel(struct ieee80211com *ic)
-{
-	/* ignore */
-}
-
-static void
-ndis_scan_curchan(struct ieee80211_scan_state *ss, unsigned long maxdwell)
-{
-	/* ignore */
-}
-
-static void
-ndis_scan_mindwell(struct ieee80211_scan_state *ss)
-{
-	/* NB: don't try to abort scan; wait for firmware to finish */
-}
-
-static void
-ndis_scan_end(struct ieee80211com *ic)
-{
-	struct ndis_softc *sc = ic->ic_softc;
-
-	ndis_scan_results(sc);
-}
diff --git a/sys/dev/if_ndis/if_ndis_pci.c b/sys/dev/if_ndis/if_ndis_pci.c
deleted file mode 100644
index cf1685a920ea..000000000000
--- a/sys/dev/if_ndis/if_ndis_pci.c
+++ /dev/null
@@ -1,357 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
- * Copyright (c) 2003
- *	Bill Paul <wpaul@windriver.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/module.h>
-#include <sys/socket.h>
-#include <sys/queue.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/if_var.h>
-#include <net/if_arp.h>
-#include <net/if_media.h>
-#include <net/ethernet.h>
-
-#include <machine/bus.h>
-#include <machine/resource.h>
-#include <sys/bus.h>
-#include <sys/rman.h>
-
-#include <net80211/ieee80211_var.h>
-
-#include <dev/pci/pcireg.h>
-#include <dev/pci/pcivar.h>
-#include <dev/usb/usb.h>
-#include <dev/usb/usbdi.h>
-
-#include <compat/ndis/pe_var.h>
-#include <compat/ndis/cfg_var.h>
-#include <compat/ndis/resource_var.h>
-#include <compat/ndis/ntoskrnl_var.h>
-#include <compat/ndis/ndis_var.h>
-#include <dev/if_ndis/if_ndisvar.h>
-
-MODULE_DEPEND(ndis, pci, 1, 1, 1);
-
-static int ndis_probe_pci	(device_t);
-static int ndis_attach_pci	(device_t);
-static struct resource_list *ndis_get_resource_list
-				(device_t, device_t);
-static int ndis_devcompare	(interface_type,
-				 struct ndis_pci_type *, device_t);
-extern int ndisdrv_modevent	(module_t, int, void *);
-extern int ndis_attach		(device_t);
-extern int ndis_shutdown	(device_t);
-extern int ndis_detach		(device_t);
-extern int ndis_suspend		(device_t);
-extern int ndis_resume		(device_t);
-
-static device_method_t ndis_methods[] = {
-	/* Device interface */
-	DEVMETHOD(device_probe,		ndis_probe_pci),
-	DEVMETHOD(device_attach,	ndis_attach_pci),
-	DEVMETHOD(device_detach,	ndis_detach),
-	DEVMETHOD(device_shutdown,	ndis_shutdown),
-	DEVMETHOD(device_suspend,	ndis_suspend),
-	DEVMETHOD(device_resume,	ndis_resume),
-
-	/* Bus interface */
-	DEVMETHOD(bus_get_resource_list, ndis_get_resource_list),
-
-	{ 0, 0 }
-};
-
-static driver_t ndis_driver = {
-	"ndis",
-	ndis_methods,
-	sizeof(struct ndis_softc)
-};
-
-static devclass_t ndis_devclass;
-
-DRIVER_MODULE(ndis, pci, ndis_driver, ndis_devclass, ndisdrv_modevent, 0);
-
-static int
-ndis_devcompare(bustype, t, dev)
-	interface_type		bustype;
-	struct ndis_pci_type	*t;
-	device_t		dev;
-{
-	uint16_t		vid, did;
-	uint32_t		subsys;
-
-	if (bustype != PCIBus)
-		return(FALSE);
-
-	vid = pci_get_vendor(dev);
-	did = pci_get_device(dev);
-	subsys = pci_get_subdevice(dev);
-	subsys = (subsys << 16) | pci_get_subvendor(dev);
-
-	while(t->ndis_name != NULL) {
-		if ((t->ndis_vid == vid) && (t->ndis_did == did) &&
-		    (t->ndis_subsys == subsys || t->ndis_subsys == 0)) {
-			device_set_desc(dev, t->ndis_name);
-			return(TRUE);
-		}
-		t++;
-	}
-
-	return(FALSE);
-}
-
-/*
- * Probe for an NDIS device. Check the PCI vendor and device
- * IDs against our list and return a device name if we find a match.
- */
-static int
-ndis_probe_pci(dev)
-	device_t		dev;
-{
-	driver_object		*drv;
-	struct drvdb_ent	*db;
-
-	drv = windrv_lookup(0, "PCI Bus");
-
-	if (drv == NULL)
-		return(ENXIO);
-
-	db = windrv_match((matchfuncptr)ndis_devcompare, dev);
-
-	if (db != NULL) {
-		/* Create PDO for this device instance */
-		windrv_create_pdo(drv, dev);
-		return(0);
-	}
-
-	return(ENXIO);
-}
-
-/*
- * Attach the interface. Allocate softc structures, do ifmedia
- * setup and ethernet/BPF attach.
- */
-static int
-ndis_attach_pci(dev)
-	device_t		dev;
-{
-	struct ndis_softc	*sc;
-	int			unit, error = 0, rid;
-	struct ndis_pci_type	*t;
-	int			devidx = 0, defidx = 0;
-	struct resource_list	*rl;
-	struct resource_list_entry	*rle;
-	struct drvdb_ent	*db;
-	uint16_t		vid, did;
-	uint32_t		subsys;
-
-	sc = device_get_softc(dev);
-	unit = device_get_unit(dev);
-	sc->ndis_dev = dev;
-
-	db = windrv_match((matchfuncptr)ndis_devcompare, dev);
-	if (db == NULL)
-		return (ENXIO);
-	sc->ndis_dobj = db->windrv_object;
-	sc->ndis_regvals = db->windrv_regvals;
-
-	/*
-	 * Map control/status registers.
-	 */
-
-	pci_enable_busmaster(dev);
-
-	rl = BUS_GET_RESOURCE_LIST(device_get_parent(dev), dev);
-	if (rl != NULL) {
-		STAILQ_FOREACH(rle, rl, link) {
-			switch (rle->type) {
-			case SYS_RES_IOPORT:
-				sc->ndis_io_rid = rle->rid;
-				sc->ndis_res_io = bus_alloc_resource_any(dev,
-				    SYS_RES_IOPORT, &sc->ndis_io_rid,
-				    RF_ACTIVE);
-				if (sc->ndis_res_io == NULL) {
-					device_printf(dev,
-					    "couldn't map iospace\n");
-					error = ENXIO;
-					goto fail;
-				}
-				break;
-			case SYS_RES_MEMORY:
-				if (sc->ndis_res_altmem != NULL &&
-				    sc->ndis_res_mem != NULL) {
-					device_printf(dev,
-					    "too many memory resources\n");
-					error = ENXIO;
-					goto fail;
-				}
-				if (sc->ndis_res_mem) {
-					sc->ndis_altmem_rid = rle->rid;
-					sc->ndis_res_altmem =
-					    bus_alloc_resource_any(dev,
-					        SYS_RES_MEMORY,
-						&sc->ndis_altmem_rid,
-						RF_ACTIVE);
-					if (sc->ndis_res_altmem == NULL) {
-						device_printf(dev,
-						    "couldn't map alt "
-						    "memory\n");
-						error = ENXIO;
-						goto fail;
-					}
-				} else {
-					sc->ndis_mem_rid = rle->rid;
-					sc->ndis_res_mem =
-					    bus_alloc_resource_any(dev,
-					        SYS_RES_MEMORY,
-						&sc->ndis_mem_rid,
-						RF_ACTIVE);
-					if (sc->ndis_res_mem == NULL) {
-						device_printf(dev,
-						    "couldn't map memory\n");
-						error = ENXIO;
-						goto fail;
-					}
-				}
-				break;
-			case SYS_RES_IRQ:
-				rid = rle->rid;
-				sc->ndis_irq = bus_alloc_resource_any(dev,
-				    SYS_RES_IRQ, &rid,
-				    RF_SHAREABLE | RF_ACTIVE);
-				if (sc->ndis_irq == NULL) {
-					device_printf(dev,
-					    "couldn't map interrupt\n");
-					error = ENXIO;
-					goto fail;
-				}
-				break;
-			default:
-				break;
-			}
-			sc->ndis_rescnt++;
-		}
-	}
-
-	/*
-	 * If the BIOS did not set up an interrupt for this device,
-	 * the resource traversal code above will fail to set up
-	 * an IRQ resource. This is usually a bad thing, so try to
-	 * force the allocation of an interrupt here. If one was
-	 * not assigned to us by the BIOS, bus_alloc_resource()
-	 * should route one for us.
-	 */
-	if (sc->ndis_irq == NULL) {
-		rid = 0;
-		sc->ndis_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ,
-		    &rid, RF_SHAREABLE | RF_ACTIVE);
-		if (sc->ndis_irq == NULL) {
-			device_printf(dev, "couldn't route interrupt\n");
-			error = ENXIO;
-			goto fail;
-		}
-		sc->ndis_rescnt++;
-	}
-
-	/*
-	 * Allocate the parent bus DMA tag appropriate for PCI.
-	 */
-#define NDIS_NSEG_NEW 32
-	error = bus_dma_tag_create(bus_get_dma_tag(dev),/* PCI parent */
-			1, 0,			/* alignment, boundary */
-			BUS_SPACE_MAXADDR_32BIT,/* lowaddr */
-                        BUS_SPACE_MAXADDR,	/* highaddr */
-			NULL, NULL,		/* filter, filterarg */
-			DFLTPHYS, NDIS_NSEG_NEW,/* maxsize, nsegments */
-			BUS_SPACE_MAXSIZE_32BIT,/* maxsegsize */
-			BUS_DMA_ALLOCNOW,       /* flags */
-			NULL, NULL,		/* lockfunc, lockarg */
-			&sc->ndis_parent_tag);
-
-        if (error)
-                goto fail;
-
-	sc->ndis_iftype = PCIBus;
-
-	/* Figure out exactly which device we matched. */
-
-	vid = pci_get_vendor(dev);
-	did = pci_get_device(dev);
-	subsys = pci_get_subdevice(dev);
-	subsys = (subsys << 16) | pci_get_subvendor(dev);
-
-	t = db->windrv_devlist;
-
-	while(t->ndis_name != NULL) {
-		if (t->ndis_vid == vid && t->ndis_did == did) {
-			if (t->ndis_subsys == 0)
-				defidx = devidx;
-			else if (t->ndis_subsys == subsys)
-				break;
-		}
-		t++;
-		devidx++;
-	}
-
-	if (t->ndis_name == NULL)
-		sc->ndis_devidx = defidx;
-	else
-		sc->ndis_devidx = devidx;
-
-	error = ndis_attach(dev);
-	if (error == 0)
-		gone_in_dev(dev, 14, "ndis removed");
-
-
-fail:
-	return(error);
-}
-
-static struct resource_list *
-ndis_get_resource_list(dev, child)
-	device_t		dev;
-	device_t		child;
-{
-	struct ndis_softc	*sc;
-
-	sc = device_get_softc(dev);
-	return (BUS_GET_RESOURCE_LIST(device_get_parent(sc->ndis_dev), dev));
-}
diff --git a/sys/dev/if_ndis/if_ndis_usb.c b/sys/dev/if_ndis/if_ndis_usb.c
deleted file mode 100644
index 3364d3181532..000000000000
--- a/sys/dev/if_ndis/if_ndis_usb.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
- * Copyright (c) 2005
- *      Bill Paul <wpaul@windriver.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/sockio.h>
-#include <sys/module.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/if_var.h>
-#include <net/if_arp.h>
-#include <net/ethernet.h>
-#include <net/if_dl.h>
-#include <net/if_media.h>
-
-#include <net/bpf.h>
-
-#include <sys/bus.h>
-#include <machine/bus.h>
-#include <dev/usb/usb.h>
-#include <dev/usb/usbdi.h>
-
-#include <net80211/ieee80211_var.h>
-
-#include <compat/ndis/pe_var.h>
-#include <compat/ndis/cfg_var.h>
-#include <compat/ndis/resource_var.h>
-#include <compat/ndis/ntoskrnl_var.h>
-#include <compat/ndis/ndis_var.h>
-#include <compat/ndis/usbd_var.h>
-#include <dev/if_ndis/if_ndisvar.h>
-
-SYSCTL_NODE(_hw, OID_AUTO, ndisusb, CTLFLAG_RD | CTLFLAG_MPSAFE, 0,
-    "NDIS USB driver parameters");
-
-MODULE_DEPEND(ndis, usb, 1, 1, 1);
-
-static device_probe_t ndisusb_match;
-static device_attach_t ndisusb_attach;
-static device_detach_t ndisusb_detach;
-static bus_get_resource_list_t ndis_get_resource_list;
-
-extern int ndisdrv_modevent     (module_t, int, void *);
-extern int ndis_attach          (device_t);
-extern int ndis_shutdown        (device_t);
-extern int ndis_detach          (device_t);
-extern int ndis_suspend         (device_t);
-extern int ndis_resume          (device_t);
-
-extern unsigned char drv_data[];
-
-static device_method_t ndis_methods[] = {
-        /* Device interface */
-	DEVMETHOD(device_probe,		ndisusb_match),
-	DEVMETHOD(device_attach,	ndisusb_attach),
-	DEVMETHOD(device_detach,	ndisusb_detach),
-	DEVMETHOD(device_shutdown,	ndis_shutdown),
-
-        /* bus interface */
-	DEVMETHOD(bus_get_resource_list, ndis_get_resource_list),
-
-	DEVMETHOD_END
-};
-
-static driver_t ndis_driver = {
-	"ndis",
-	ndis_methods,
-	sizeof(struct ndis_softc)
-};
-
-static devclass_t ndis_devclass;
-
-DRIVER_MODULE(ndis, uhub, ndis_driver, ndis_devclass, ndisdrv_modevent, 0);
-
-static int
-ndisusb_devcompare(interface_type bustype, struct ndis_usb_type *t, device_t dev)
-{
-	struct usb_attach_arg *uaa;
-
-	if (bustype != PNPBus)
-		return (FALSE);
-
-	uaa = device_get_ivars(dev);
-
-	while (t->ndis_name != NULL) {
-		if ((uaa->info.idVendor == t->ndis_vid) &&
-		    (uaa->info.idProduct == t->ndis_did)) {
-			device_set_desc(dev, t->ndis_name);
-			return (TRUE);
-		}
-		t++;
-	}
-
-	return (FALSE);
-}
-
-static int
-ndisusb_match(device_t self)
-{
-	struct drvdb_ent *db;
-	struct usb_attach_arg *uaa = device_get_ivars(self);
-
-	if (uaa->usb_mode != USB_MODE_HOST)
-		return (ENXIO);
-	if (uaa->info.bConfigIndex != NDISUSB_CONFIG_NO)
-		return (ENXIO);
-	if (uaa->info.bIfaceIndex != NDISUSB_IFACE_INDEX)
-		return (ENXIO);
-
-	if (windrv_lookup(0, "USB Bus") == NULL)
-		return (ENXIO);
-
-	db = windrv_match((matchfuncptr)ndisusb_devcompare, self);
-	if (db == NULL)
-		return (ENXIO);
-	uaa->driver_ivar = db;
-
-	return (0);
-}
-
-static int
-ndisusb_attach(device_t self)
-{
-	const struct drvdb_ent	*db;
-	struct ndisusb_softc *dummy = device_get_softc(self);
-	struct usb_attach_arg *uaa = device_get_ivars(self);
-	struct ndis_softc	*sc;
-	struct ndis_usb_type	*t;
-	driver_object		*drv;
-	int			devidx = 0;
-
-	device_set_usb_desc(self);
-	db = uaa->driver_ivar;
-	sc = (struct ndis_softc *)dummy;
-	sc->ndis_dev = self;
-	mtx_init(&sc->ndisusb_mtx, "NDIS USB", MTX_NETWORK_LOCK, MTX_DEF);
-	sc->ndis_dobj = db->windrv_object;
-	sc->ndis_regvals = db->windrv_regvals;
-	sc->ndis_iftype = PNPBus;
-	sc->ndisusb_dev = uaa->device;
-
-	/* Create PDO for this device instance */
-
-	drv = windrv_lookup(0, "USB Bus");
-	windrv_create_pdo(drv, self);
-
-	/* Figure out exactly which device we matched. */
-
-	t = db->windrv_devlist;
-
-	while (t->ndis_name != NULL) {
-		if ((uaa->info.idVendor == t->ndis_vid) &&
-		    (uaa->info.idProduct == t->ndis_did)) {
-			sc->ndis_devidx = devidx;
-			break;
-		}
-		t++;
-		devidx++;
-	}
-
-	if (ndis_attach(self) != 0)
-		return (ENXIO);
-
-	gone_in_dev(self, 14, "ndis removed");
-
-	return (0);
-}
-
-static int
-ndisusb_detach(device_t self)
-{
-	int i;
-	struct ndis_softc       *sc = device_get_softc(self);
-	struct ndisusb_ep	*ne;
-
-	sc->ndisusb_status |= NDISUSB_STATUS_DETACH;
-
-	ndis_pnpevent_nic(self, NDIS_PNP_EVENT_SURPRISE_REMOVED);
-
-	if (sc->ndisusb_status & NDISUSB_STATUS_SETUP_EP) {
-		usbd_transfer_unsetup(sc->ndisusb_dread_ep.ne_xfer, 1);
-		usbd_transfer_unsetup(sc->ndisusb_dwrite_ep.ne_xfer, 1);
-	}
-	for (i = 0; i < NDISUSB_ENDPT_MAX; i++) {
-		ne = &sc->ndisusb_ep[i];
-		usbd_transfer_unsetup(ne->ne_xfer, 1);
-	}
-
-	(void)ndis_detach(self);
-
-	mtx_destroy(&sc->ndisusb_mtx);
-	return (0);
-}
-
-static struct resource_list *
-ndis_get_resource_list(device_t dev, device_t child)
-{
-	struct ndis_softc       *sc;
-
-	sc = device_get_softc(dev);
-	return (BUS_GET_RESOURCE_LIST(device_get_parent(sc->ndis_dev), dev));
-}
diff --git a/sys/dev/if_ndis/if_ndisvar.h b/sys/dev/if_ndis/if_ndisvar.h
deleted file mode 100644
index 0182e15f6e2a..000000000000
--- a/sys/dev/if_ndis/if_ndisvar.h
+++ /dev/null
@@ -1,263 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
- * Copyright (c) 2003
- *	Bill Paul <wpaul@windriver.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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.
- *
- * $FreeBSD$
- */
-
-#define NDIS_DEFAULT_NODENAME	"FreeBSD NDIS node"
-#define NDIS_NODENAME_LEN	32
-
-/* For setting/getting OIDs from userspace. */
-
-struct ndis_oid_data {
-	uint32_t		oid;
-	uint32_t		len;
-#ifdef notdef
-	uint8_t			data[1];
-#endif
-};
-
-struct ndis_pci_type {
-	uint16_t		ndis_vid;
-	uint16_t		ndis_did;
-	uint32_t		ndis_subsys;
-	char			*ndis_name;
-};
-
-struct ndis_pccard_type {
-	const char		*ndis_vid;
-	const char		*ndis_did;
-	char			*ndis_name;
-};
-
-struct ndis_usb_type {
-	uint16_t		ndis_vid;
-	uint16_t		ndis_did;
-	char			*ndis_name;
-};
-
-struct ndis_shmem {
-	list_entry		ndis_list;
-	bus_dma_tag_t		ndis_stag;
-	bus_dmamap_t		ndis_smap;
-	void			*ndis_saddr;
-	ndis_physaddr		ndis_paddr;
-};
-
-struct ndis_cfglist {
-	ndis_cfg		ndis_cfg;
-	struct sysctl_oid	*ndis_oid;
-        TAILQ_ENTRY(ndis_cfglist)	link;
-};
-
-/*
- * Helper struct to make parsing information
- * elements easier.
- */
-struct ndis_ie {
-	uint8_t		ni_oui[3];
-	uint8_t		ni_val;
-};
-
-TAILQ_HEAD(nch, ndis_cfglist);
-
-#define NDIS_INITIALIZED(sc)	(sc->ndis_block->nmb_devicectx != NULL)
-
-#define NDIS_TXPKTS 64
-#define NDIS_INC(x)		\
-	(x)->ndis_txidx = ((x)->ndis_txidx + 1) % (x)->ndis_maxpkts
-
-
-#define NDIS_EVENTS 4
-#define NDIS_EVTINC(x)	(x) = ((x) + 1) % NDIS_EVENTS
-
-struct ndis_evt {
-	uint32_t		ne_sts;
-	uint32_t		ne_len;
-	char			*ne_buf;
-};
-
-struct ndis_vap {
-	struct ieee80211vap	vap;
-
-	int			(*newstate)(struct ieee80211vap *,
-				    enum ieee80211_state, int);
-};
-#define	NDIS_VAP(vap)	((struct ndis_vap *)(vap))
-
-#define	NDISUSB_CONFIG_NO			0
-#define	NDISUSB_IFACE_INDEX			0
-/* XXX at USB2 there's no USBD_NO_TIMEOUT macro anymore  */
-#define	NDISUSB_NO_TIMEOUT			0
-#define	NDISUSB_INTR_TIMEOUT			1000
-#define	NDISUSB_TX_TIMEOUT			10000
-struct ndisusb_xfer;
-struct ndisusb_ep {
-	struct usb_xfer	*ne_xfer[1];
-	list_entry		ne_active;
-	list_entry		ne_pending;
-	kspin_lock		ne_lock;
-	uint8_t			ne_dirin;
-};
-struct ndisusb_xfer {
-	struct ndisusb_ep	*nx_ep;
-	void			*nx_priv;
-	uint8_t			*nx_urbbuf;
-	uint32_t		nx_urbactlen;
-	uint32_t		nx_urblen;
-	uint8_t			nx_shortxfer;
-	list_entry		nx_next;
-};
-struct ndisusb_xferdone {
-	struct ndisusb_xfer	*nd_xfer;
-	usb_error_t		nd_status;
-	list_entry		nd_donelist;
-};
-
-struct ndisusb_task {
-	unsigned		nt_type;
-#define	NDISUSB_TASK_TSTART	0
-#define	NDISUSB_TASK_IRPCANCEL	1
-#define	NDISUSB_TASK_VENDOR	2
-	void			*nt_ctx;
-	list_entry		nt_tasklist;
-};
-
-struct ndis_softc {
-#define        NDISUSB_GET_IFNET(ndis_softc) ( (ndis_softc)->ndis_80211 ? NULL : (ndis_softc)->ifp )
-	u_int			ndis_80211:1,
-				ndis_link:1,
-				ndis_running:1;
-	union {
-		struct {		/* Ethernet */
-			struct ifnet		*ifp;
-			struct ifmedia		ifmedia;
-			int			ndis_if_flags;
-		};
-		struct {		/* Wireless */
-			struct ieee80211com	ndis_ic;
-			struct callout		ndis_scan_callout;
-			int	(*ndis_newstate)(struct ieee80211com *,
-				    enum ieee80211_state, int);
-		};
-	};
-	u_long			ndis_hwassist;
-	uint32_t		ndis_v4tx;
-	uint32_t		ndis_v4rx;
-	bus_space_handle_t	ndis_bhandle;
-	bus_space_tag_t		ndis_btag;
-	void			*ndis_intrhand;
-	struct resource		*ndis_irq;
-	struct resource		*ndis_res;
-	struct resource		*ndis_res_io;
-	int			ndis_io_rid;
-	struct resource		*ndis_res_mem;
-	int			ndis_mem_rid;
-	struct resource		*ndis_res_altmem;
-	int			ndis_altmem_rid;
-	struct resource		*ndis_res_am;	/* attribute mem (pccard) */
-	int			ndis_am_rid;
-	struct resource		*ndis_res_cm;	/* common mem (pccard) */
-	struct resource_list	ndis_rl;
-	int			ndis_rescnt;
-	struct mtx		ndis_mtx;
-	uint8_t			ndis_irql;
-	device_t		ndis_dev;
-	int			ndis_unit;
-	ndis_miniport_block	*ndis_block;
-	ndis_miniport_characteristics	*ndis_chars;
-	interface_type		ndis_type;
-	struct callout		ndis_stat_callout;
-	int			ndis_maxpkts;
-	ndis_oid		*ndis_oids;
-	int			ndis_oidcnt;
-	int			ndis_txidx;
-	int			ndis_txpending;
-	ndis_packet		**ndis_txarray;
-	ndis_handle		ndis_txpool;
-	int			ndis_sc;
-	ndis_cfg		*ndis_regvals;
-	struct nch		ndis_cfglist_head;
-	uint32_t		ndis_sts;
-	uint32_t		ndis_filter;
-	int			ndis_skip;
-	int			ndis_devidx;
-	interface_type		ndis_iftype;
-	driver_object		*ndis_dobj;
-	io_workitem		*ndis_tickitem;
-	io_workitem		*ndis_startitem;
-	io_workitem		*ndis_resetitem;
-	io_workitem		*ndis_inputitem;
-	kdpc			ndis_rxdpc;
-	bus_dma_tag_t		ndis_parent_tag;
-	list_entry		ndis_shlist;
-	bus_dma_tag_t		ndis_mtag;
-	bus_dma_tag_t		ndis_ttag;
-	bus_dmamap_t		*ndis_mmaps;
-	bus_dmamap_t		*ndis_tmaps;
-	int			ndis_mmapcnt;
-	struct ndis_evt		ndis_evt[NDIS_EVENTS];
-	int			ndis_evtpidx;
-	int			ndis_evtcidx;
-	struct mbufq		ndis_rxqueue;
-	kspin_lock		ndis_rxlock;
-
-	int			ndis_tx_timer;
-	int			ndis_hang_timer;
-
-	struct usb_device	*ndisusb_dev;
-	struct mtx		ndisusb_mtx;
-	struct ndisusb_ep	ndisusb_dread_ep;
-	struct ndisusb_ep	ndisusb_dwrite_ep;
-#define	NDISUSB_GET_ENDPT(addr) \
-	((UE_GET_DIR(addr) >> 7) | (UE_GET_ADDR(addr) << 1))
-#define	NDISUSB_ENDPT_MAX	((UE_ADDR + 1) * 2)
-	struct ndisusb_ep	ndisusb_ep[NDISUSB_ENDPT_MAX];
-	io_workitem		*ndisusb_xferdoneitem;
-	list_entry		ndisusb_xferdonelist;
-	kspin_lock		ndisusb_xferdonelock;
-	io_workitem		*ndisusb_taskitem;
-	list_entry		ndisusb_tasklist;
-	kspin_lock		ndisusb_tasklock;
-	int			ndisusb_status;
-#define NDISUSB_STATUS_DETACH	0x1
-#define	NDISUSB_STATUS_SETUP_EP	0x2
-};
-
-#define	NDIS_LOCK(_sc)		mtx_lock(&(_sc)->ndis_mtx)
-#define	NDIS_UNLOCK(_sc)	mtx_unlock(&(_sc)->ndis_mtx)
-#define	NDIS_LOCK_ASSERT(_sc, t)	mtx_assert(&(_sc)->ndis_mtx, t)
-#define	NDISUSB_LOCK(_sc)	mtx_lock(&(_sc)->ndisusb_mtx)
-#define	NDISUSB_UNLOCK(_sc)	mtx_unlock(&(_sc)->ndisusb_mtx)
-#define	NDISUSB_LOCK_ASSERT(_sc, t)	mtx_assert(&(_sc)->ndisusb_mtx, t)
-
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index f5dd13527f08..781495110cb9 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -1,847 +1,843 @@
 # $FreeBSD$
 
 SYSDIR?=${SRCTOP}/sys
 .include "${SYSDIR}/conf/kern.opts.mk"
 
 SUBDIR_PARALLEL=
 
 # Modules that include binary-only blobs of microcode should be selectable by
 # MK_SOURCELESS_UCODE option (see below).
 
 .include "${SYSDIR}/conf/config.mk"
 
 .if defined(MODULES_OVERRIDE) && !defined(ALL_MODULES)
 SUBDIR=${MODULES_OVERRIDE}
 .else
 SUBDIR=	\
 	${_3dfx} \
 	${_3dfx_linux} \
 	${_aac} \
 	${_aacraid} \
 	accf_data \
 	accf_dns \
 	accf_http \
 	acl_nfs4 \
 	acl_posix1e \
 	${_acpi} \
 	ae \
 	${_aesni} \
 	age \
 	${_agp} \
 	ahci \
 	aic7xxx \
 	alc \
 	ale \
 	alq \
 	${_amd_ecc_inject} \
 	${_amdgpio} \
 	${_amdsbwd} \
 	${_amdsmn} \
 	${_amdtemp} \
 	amr \
 	${_an} \
 	${_aout} \
 	${_arcmsr} \
 	${_allwinner} \
 	${_armv8crypto} \
 	${_asmc} \
 	ata \
 	ath \
 	ath_dfs \
 	ath_hal \
 	ath_hal_ar5210 \
 	ath_hal_ar5211 \
 	ath_hal_ar5212 \
 	ath_hal_ar5416 \
 	ath_hal_ar9300 \
 	ath_main \
 	ath_rate \
 	ath_pci \
 	${_autofs} \
 	axgbe \
 	backlight \
 	${_bce} \
 	${_bcm283x_clkman} \
 	${_bcm283x_pwm} \
 	bfe \
 	bge \
 	bhnd \
 	${_bxe} \
 	${_bios} \
 	${_blake2} \
 	bnxt \
 	bridgestp \
 	bwi \
 	bwn \
 	${_bytgpio} \
 	${_chvgpio} \
 	cam \
 	${_cardbus} \
 	${_carp} \
 	cas \
 	${_cbb} \
 	cc \
 	${_ccp} \
 	cd9660 \
 	cd9660_iconv \
 	${_ce} \
 	${_cfi} \
 	${_chromebook_platform} \
 	${_ciss} \
 	cloudabi \
 	${_cloudabi32} \
 	${_cloudabi64} \
 	${_coretemp} \
 	${_cp} \
 	${_cpsw} \
 	${_cpuctl} \
 	${_cpufreq} \
 	${_crypto} \
 	${_cryptodev} \
 	ctl \
 	${_cxgb} \
 	${_cxgbe} \
 	dc \
 	dcons \
 	dcons_crom \
 	${_dpdk_lpm4} \
 	${_dpdk_lpm6} \
 	${_dpms} \
 	dummynet \
 	${_dwwdt} \
 	${_efirt} \
 	${_em} \
 	${_ena} \
 	esp \
 	${_et} \
 	evdev \
 	${_exca} \
 	ext2fs \
 	fdc \
 	fdescfs \
 	${_ffec} \
 	filemon \
 	firewire \
 	firmware \
 	${_ftwd} \
 	fusefs \
 	${_fxp} \
 	gem \
 	geom \
 	${_glxiic} \
 	${_glxsb} \
 	gpio \
 	hid \
 	hifn \
 	${_hpt27xx} \
 	${_hptiop} \
 	${_hptmv} \
 	${_hptnr} \
 	${_hptrr} \
 	hwpmc \
 	${_hwpmc_mips24k} \
 	${_hwpmc_mips74k} \
 	${_hyperv} \
 	i2c \
 	${_iavf} \
         ${_ibcore} \
 	${_ichwd} \
 	${_ice} \
 	${_ice_ddp} \
 	${_ida} \
 	if_bridge \
 	if_disc \
 	if_edsc \
 	${_if_enc} \
 	if_epair \
 	${_if_gif} \
 	${_if_gre} \
 	${_if_me} \
 	if_infiniband \
 	if_lagg \
-	${_if_ndis} \
 	${_if_stf} \
 	if_tuntap \
 	if_vlan \
 	if_vxlan \
 	if_wg \
 	iflib \
 	${_iir} \
 	imgact_binmisc \
 	${_intelspi} \
 	${_io} \
 	${_ioat} \
         ${_ipoib} \
 	${_ipdivert} \
 	${_ipfilter} \
 	${_ipfw} \
 	ipfw_nat \
 	${_ipfw_nat64} \
 	${_ipfw_nptv6} \
 	${_ipfw_pmod} \
 	${_ipmi} \
 	ip6_mroute_mod \
 	ip_mroute_mod \
 	${_ips} \
 	${_ipsec} \
 	${_ipw} \
 	${_ipwfw} \
 	${_isci} \
 	${_iser} \
 	isp \
 	${_ispfw} \
 	${_itwd} \
 	${_iwi} \
 	${_iwifw} \
 	${_iwm} \
 	${_iwmfw} \
 	${_iwn} \
 	${_iwnfw} \
 	${_ix} \
 	${_ixv} \
 	${_ixl} \
 	jme \
 	kbdmux \
 	kgssapi \
 	kgssapi_krb5 \
 	khelp \
 	krpc \
 	ksyms \
 	${_ktls_ocf} \
 	le \
 	lge \
 	libalias \
 	libiconv \
 	libmchain \
 	lindebugfs \
 	linuxkpi \
 	${_lio} \
 	lpt \
 	mac_biba \
 	mac_bsdextended \
 	mac_ifoff \
 	mac_lomac \
 	mac_mls \
 	mac_none \
 	mac_ntpd \
 	mac_partition \
 	mac_portacl \
 	mac_seeotheruids \
 	mac_stub \
 	mac_test \
 	${_malo} \
 	md \
 	mdio \
 	mem \
 	mfi \
 	mii \
 	mlx \
 	mlxfw \
 	${_mlx4} \
 	${_mlx4ib} \
 	${_mlx4en} \
 	${_mlx5} \
 	${_mlx5en} \
 	${_mlx5ib} \
 	${_mly} \
 	mmc \
 	mmcsd \
 	${_mpr} \
 	${_mps} \
 	mpt \
 	mqueue \
 	mrsas \
 	msdosfs \
 	msdosfs_iconv \
 	msk \
 	${_mthca} \
 	mvs \
 	mwl \
 	${_mwlfw} \
 	mxge \
 	my \
 	${_nctgpio} \
-	${_ndis} \
 	${_netgraph} \
 	${_nfe} \
 	nfscl \
 	nfscommon \
 	nfsd \
 	nfslockd \
 	nfssvc \
 	nge \
 	nmdm \
 	nullfs \
 	${_ntb} \
 	${_nvd} \
 	${_nvdimm} \
 	${_nvme} \
 	${_nvram} \
 	oce \
 	${_ocs_fc} \
 	${_ossl} \
 	otus \
 	${_otusfw} \
 	ow \
 	${_padlock} \
 	${_padlock_rng} \
 	${_pccard} \
 	${_pchtherm} \
 	${_pcfclock} \
 	${_pf} \
 	${_pflog} \
 	${_pfsync} \
 	plip \
 	${_pms} \
 	ppbus \
 	ppc \
 	ppi \
 	pps \
 	procfs \
 	proto \
 	pseudofs \
 	${_pst} \
 	pty  \
 	puc \
 	pwm \
 	${_qat} \
 	${_qatfw} \
 	${_qlxge} \
 	${_qlxgb} \
 	${_qlxgbe} \
 	${_qlnx} \
 	ral \
 	${_ralfw} \
 	${_random_fortuna} \
 	${_random_other} \
 	rc4 \
 	${_rdma} \
 	${_rdrand_rng} \
 	re \
 	rl \
 	${_rockchip} \
 	rtsx \
 	rtwn \
 	rtwn_pci \
 	rtwn_usb \
 	${_rtwnfw} \
 	${_s3} \
 	${_safe} \
 	safexcel \
 	${_sbni} \
 	scc \
 	${_sctp} \
 	sdhci \
 	${_sdhci_acpi} \
 	sdhci_pci \
 	sdio \
 	sem \
 	send \
 	${_sfxge} \
 	sge \
 	${_sgx} \
 	${_sgx_linux} \
 	siftr \
 	siis \
 	sis \
 	sk \
 	${_smartpqi} \
 	smbfs \
 	snp \
 	sound \
 	${_speaker} \
 	spi \
 	${_splash} \
 	${_sppp} \
 	ste \
 	stge \
 	${_sume} \
 	${_superio} \
 	${_sym} \
 	${_syscons} \
 	sysvipc \
 	tcp \
 	${_ti} \
 	tmpfs \
 	${_toecore} \
 	${_tpm} \
 	${_twa} \
 	twe \
 	tws \
 	uart \
 	udf \
 	udf_iconv \
 	ufs \
 	uinput \
 	unionfs \
 	usb \
 	${_vesa} \
 	virtio \
 	vge \
 	${_viawd} \
 	videomode \
 	vkbd \
 	${_vmd} \
 	${_vmm} \
 	${_vmware} \
 	vr \
 	vte \
 	${_wbwd} \
 	wlan \
 	wlan_acl \
 	wlan_amrr \
 	wlan_ccmp \
 	wlan_rssadapt \
 	wlan_tkip \
 	wlan_wep \
 	wlan_xauth \
 	${_wpi} \
 	${_wpifw} \
 	${_x86bios} \
 	xdr \
 	xl \
 	xz \
 	zlib
 
 .if ${MK_AUTOFS} != "no" || defined(ALL_MODULES)
 _autofs=	autofs
 .endif
 
 .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
 .if (${MACHINE_CPUARCH} != "arm" || ${MACHINE_ARCH:Marmv[67]*} != "") && \
 	${MACHINE_CPUARCH} != "mips"
 .if ${KERN_OPTS:MKDTRACE_HOOKS}
 SUBDIR+=	dtrace
 .endif
 .endif
 SUBDIR+=	opensolaris
 .endif
 
 .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
 .if exists(${SRCTOP}/sys/opencrypto)
 _crypto=	crypto
 _cryptodev=	cryptodev
 _random_fortuna=random_fortuna
 _random_other=	random_other
 _ktls_ocf=	ktls_ocf
 .endif
 .endif
 
 .if ${MK_CUSE} != "no" || defined(ALL_MODULES)
 SUBDIR+=	cuse
 .endif
 
 .if ${MK_EFI} != "no"
 .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64"
 _efirt=		efirt
 .endif
 .endif
 
 .if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \
 	defined(ALL_MODULES)
 _carp=		carp
 _toecore=	toecore
 _if_enc=	if_enc
 _if_gif=	if_gif
 _if_gre=	if_gre
 _ipfw_pmod=	ipfw_pmod
 .if ${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MIPSEC}
 _ipsec=		ipsec
 .endif
 .if ${KERN_OPTS:MSCTP_SUPPORT} || ${KERN_OPTS:MSCTP}
 _sctp=		sctp
 .endif
 .endif
 
 .if (${MK_INET_SUPPORT} != "no" && ${MK_INET6_SUPPORT} != "no") || \
 	defined(ALL_MODULES)
 _if_stf=	if_stf
 .endif
 
 .if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES)
 _if_me=		if_me
 _ipdivert=	ipdivert
 _ipfw=		ipfw
 .if ${MK_INET6_SUPPORT} != "no" || defined(ALL_MODULES)
 _ipfw_nat64=	ipfw_nat64
 .endif
 .endif
 
 .if ${MK_INET6_SUPPORT} != "no" || defined(ALL_MODULES)
 _ipfw_nptv6=	ipfw_nptv6
 .endif
 
 .if ${MK_IPFILTER} != "no" || defined(ALL_MODULES)
 _ipfilter=	ipfilter
 .endif
 
 .if ${MK_INET_SUPPORT} != "no" && ${KERN_OPTS:MFIB_ALGO}
 _dpdk_lpm4=	dpdk_lpm4
 .endif
 
 .if ${MK_INET6_SUPPORT} != "no" && ${KERN_OPTS:MFIB_ALGO}
 _dpdk_lpm6=	dpdk_lpm6
 .endif
 
 .if ${MK_ISCSI} != "no" || defined(ALL_MODULES)
 SUBDIR+=	cfiscsi
 SUBDIR+=	iscsi
 SUBDIR+=	iscsi_initiator
 .endif
 
 .if !empty(OPT_FDT)
 SUBDIR+=	fdt
 .endif
 
 # Linuxulator
 .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \
     ${MACHINE_CPUARCH} == "i386"
 SUBDIR+=	linprocfs
 SUBDIR+=	linsysfs
 .endif
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
 SUBDIR+=	linux
 .endif
 .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64"
 SUBDIR+=	linux64
 SUBDIR+=	linux_common
 .endif
 
 .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \
     ${MACHINE_CPUARCH} == "i386"
 _ena=		ena
 .if ${MK_OFED} != "no" || defined(ALL_MODULES)
 _ibcore=	ibcore
 _ipoib=		ipoib
 _iser=		iser
 .endif
 _ipmi=		ipmi
 _mlx4=		mlx4
 _mlx5=		mlx5
 .if (${MK_INET_SUPPORT} != "no" && ${MK_INET6_SUPPORT} != "no") || \
 	defined(ALL_MODULES)
 _mlx4en=	mlx4en
 _mlx5en=	mlx5en
 .endif
 .if ${MK_OFED} != "no" || defined(ALL_MODULES)
 _mthca=		mthca
 _mlx4ib=	mlx4ib
 _mlx5ib=	mlx5ib
 .endif
 _ossl=		ossl
 _vmware=	vmware
 .endif
 
 .if ${MK_NETGRAPH} != "no" || defined(ALL_MODULES)
 _netgraph=	netgraph
 .endif
 
 .if (${MK_PF} != "no" && (${MK_INET_SUPPORT} != "no" || \
 	${MK_INET6_SUPPORT} != "no")) || defined(ALL_MODULES)
 _pf=		pf
 _pflog=		pflog
 .if ${MK_INET_SUPPORT} != "no"
 _pfsync=	pfsync
 .endif
 .endif
 
 .if ${MK_SOURCELESS_UCODE} != "no"
 _bce=		bce
 _fxp=		fxp
 _ispfw=		ispfw
 _ti=		ti
 
 .if ${MACHINE_CPUARCH} != "mips"
 _mwlfw=		mwlfw
 _otusfw=	otusfw
 _ralfw=		ralfw
 _rtwnfw=	rtwnfw
 .endif
 .endif
 
 .if ${MK_SOURCELESS_UCODE} != "no" && ${MACHINE_CPUARCH} != "arm" && \
 	${MACHINE_CPUARCH} != "mips" && \
 	${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "powerpcspe" && \
 	${MACHINE_CPUARCH} != "riscv"
 _cxgbe=		cxgbe
 .endif
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "arm64"
 _ice=		ice
 .if ${MK_SOURCELESS_UCODE} != "no"
 _ice_ddp=	ice_ddp
 .endif
 .endif
 
 # These rely on 64bit atomics
 .if ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "powerpcspe" && \
 	${MACHINE_CPUARCH} != "mips"
 _mps=		mps
 _mpr=		mpr
 .endif
 
 .if ${MK_TESTS} != "no" || defined(ALL_MODULES)
 SUBDIR+=	tests
 .endif
 
 .if ${MK_ZFS} != "no" || (defined(ALL_MODULES)  && ${MACHINE_CPUARCH} != "powerpc")
 SUBDIR+=	zfs
 .endif
 
 .if (${MACHINE_CPUARCH} == "mips" && ${MACHINE_ARCH:Mmips64} == "")
 _hwpmc_mips24k=	hwpmc_mips24k
 _hwpmc_mips74k=	hwpmc_mips74k
 .endif
 
 .if ${MACHINE_CPUARCH} != "aarch64" && ${MACHINE_CPUARCH} != "arm" && \
 	${MACHINE_CPUARCH} != "mips" && ${MACHINE_CPUARCH} != "powerpc" && \
 	${MACHINE_CPUARCH} != "riscv"
 _syscons=	syscons
 .endif
 
 .if ${MACHINE_CPUARCH} != "mips"
 # no BUS_SPACE_UNSPECIFIED
 # No barrier instruction support (specific to this driver)
 _sym=		sym
 # intr_disable() is a macro, causes problems
 .if ${MK_SOURCELESS_UCODE} != "no"
 _cxgb=		cxgb
 .endif
 .endif
 
 .if ${MACHINE_CPUARCH} == "aarch64"
 _allwinner=	allwinner
 _armv8crypto=	armv8crypto
 _dwwdt=		dwwdt
 _em=		em
 _rockchip=	rockchip
 .endif
 
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 _agp=		agp
 _an=		an
 _aout=		aout
 _bios=		bios
 .if ${MK_SOURCELESS_UCODE} != "no"
 _bxe=		bxe
 .endif
 _cardbus=	cardbus
 _cbb=		cbb
 _cpuctl=	cpuctl
 _cpufreq=	cpufreq
 _dpms=		dpms
 _em=		em
 _et=		et
 _ftwd=		ftwd
 _exca=		exca
-_if_ndis=	if_ndis
 _io=		io
 _itwd=		itwd
 _ix=		ix
 _ixv=		ixv
 .if ${MK_SOURCELESS_UCODE} != "no"
 _lio=		lio
 .endif
 _nctgpio=	nctgpio
-_ndis=		ndis
 _ntb=		ntb
 _ocs_fc=	ocs_fc
 _pccard=	pccard
 _qat=		qat
 _qatfw=		qatfw
 .if ${MK_OFED} != "no" || defined(ALL_MODULES)
 _rdma=		rdma
 .endif
 _safe=		safe
 _speaker=	speaker
 _splash=	splash
 _sppp=		sppp
 _wbwd=		wbwd
 
 _aac=		aac
 _aacraid=	aacraid
 _acpi=		acpi
 .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
 _aesni=		aesni
 .endif
 _amd_ecc_inject=amd_ecc_inject
 _amdsbwd=	amdsbwd
 _amdsmn=	amdsmn
 _amdtemp=	amdtemp
 _arcmsr=	arcmsr
 _asmc=		asmc
 .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
 _blake2=	blake2
 .endif
 _bytgpio=	bytgpio
 _chvgpio=	chvgpio
 _ciss=		ciss
 _chromebook_platform=	chromebook_platform
 _coretemp=	coretemp
 .if ${MK_SOURCELESS_HOST} != "no" && empty(KCSAN_ENABLED)
 _hpt27xx=	hpt27xx
 .endif
 _hptiop=	hptiop
 .if ${MK_SOURCELESS_HOST} != "no" && empty(KCSAN_ENABLED)
 _hptmv=		hptmv
 _hptnr=		hptnr
 _hptrr=		hptrr
 .endif
 _hyperv=	hyperv
 _ichwd=		ichwd
 _ida=		ida
 _iir=		iir
 _intelspi=	intelspi
 _ips=		ips
 _isci=		isci
 _ipw=		ipw
 _iwi=		iwi
 _iwm=		iwm
 _iwn=		iwn
 .if ${MK_SOURCELESS_UCODE} != "no"
 _ipwfw=		ipwfw
 _iwifw=		iwifw
 _iwmfw=		iwmfw
 _iwnfw=		iwnfw
 .endif
 _mly=		mly
 _nfe=		nfe
 _nvd=		nvd
 _nvme=		nvme
 _nvram=		nvram
 .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
 _padlock=	padlock
 _padlock_rng=	padlock_rng
 _rdrand_rng=	rdrand_rng
 .endif
 _pchtherm = pchtherm
 _s3=		s3
 _sdhci_acpi=	sdhci_acpi
 _superio=	superio
 _tpm=		tpm
 _twa=		twa
 _vesa=		vesa
 _viawd=		viawd
 _wpi=		wpi
 .if ${MK_SOURCELESS_UCODE} != "no"
 _wpifw=		wpifw
 .endif
 _x86bios=	x86bios
 .endif
 
 .if ${MACHINE_CPUARCH} == "amd64"
 _amdgpio=	amdgpio
 _ccp=		ccp
 _iavf=		iavf
 _ioat=		ioat
 _ixl=		ixl
 _nvdimm=	nvdimm
 _pms=		pms
 _qlxge=		qlxge
 _qlxgb=		qlxgb
 _sume=		sume
 _vmd=		vmd
 .if ${MK_SOURCELESS_UCODE} != "no"
 _qlxgbe=	qlxgbe
 _qlnx=		qlnx
 .endif
 _sfxge=		sfxge
 _sgx=		sgx
 _sgx_linux=	sgx_linux
 _smartpqi=	smartpqi
 
 .if ${MK_BHYVE} != "no" || defined(ALL_MODULES)
 .if ${KERN_OPTS:MSMP}
 _vmm=		vmm
 .endif
 .endif
 .endif
 
 .if ${MACHINE_CPUARCH} == "i386"
 # XXX some of these can move to the general case when de-i386'ed
 # XXX some of these can move now, but are untested on other architectures.
 _3dfx=		3dfx
 _3dfx_linux=	3dfx_linux
 .if ${MK_SOURCELESS_HOST} != "no"
 _ce=		ce
 .endif
 .if ${MK_SOURCELESS_HOST} != "no"
 _cp=		cp
 .endif
 _glxiic=	glxiic
 _glxsb=		glxsb
 _pcfclock=	pcfclock
 _pst=		pst
 _sbni=		sbni
 .endif
 
 .if ${MACHINE_ARCH} == "armv7"
 _cfi=		cfi
 _cpsw=		cpsw
 .endif
 
 .if ${MACHINE_CPUARCH} == "powerpc"
 _aacraid=	aacraid
 _agp=		agp
 _an=		an
 _cardbus=	cardbus
 _cbb=		cbb
 _cfi=		cfi
 _cpufreq=	cpufreq
 _exca=		exca
 _ffec=		ffec
 _nvd=		nvd
 _nvme=		nvme
 _pccard=	pccard
 .endif
 
 .if ${MACHINE_ARCH:Mpowerpc64*} != ""
 _ipmi=		ipmi
 _ixl=		ixl
 _nvram=		opal_nvram
 .endif
 .if ${MACHINE_CPUARCH} == "powerpc" && ${MACHINE_ARCH} != "powerpcspe"
 # Don't build powermac_nvram for powerpcspe, it's never supported.
 _nvram+=	powermac_nvram
 .endif
 
 .if (${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \
      ${MACHINE_ARCH:Marmv[67]*} != "" || ${MACHINE_CPUARCH} == "i386")
 _cloudabi32=	cloudabi32
 .endif
 .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64"
 _cloudabi64=	cloudabi64
 .endif
 
 .endif
 
 .if ${MACHINE_ARCH:Marmv[67]*} != "" || ${MACHINE_CPUARCH} == "aarch64"
 _bcm283x_clkman=  bcm283x_clkman
 _bcm283x_pwm=  bcm283x_pwm
 .endif
 
 .if !(${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} < 110000)
 # LLVM 10 crashes when building if_malo_pci.c, fixed in LLVM11:
 # https://bugs.llvm.org/show_bug.cgi?id=44351
 _malo=	malo
 .endif
 
 SUBDIR+=${MODULES_EXTRA}
 
 .for reject in ${WITHOUT_MODULES}
 SUBDIR:= ${SUBDIR:N${reject}}
 .endfor
 
 # Calling kldxref(8) for each module is expensive.
 .if !defined(NO_XREF)
 .MAKEFLAGS+=	-DNO_XREF
 afterinstall: .PHONY
 	@if type kldxref >/dev/null 2>&1; then \
 		${ECHO} ${KLDXREF_CMD} ${DESTDIR}${KMODDIR}; \
 		${KLDXREF_CMD} ${DESTDIR}${KMODDIR}; \
 	fi
 .endif
 
 SUBDIR:= ${SUBDIR:u:O}
 
 .include <bsd.subdir.mk>
diff --git a/sys/modules/if_ndis/Makefile b/sys/modules/if_ndis/Makefile
deleted file mode 100644
index efdde6e0977e..000000000000
--- a/sys/modules/if_ndis/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${SRCTOP}/sys/dev/if_ndis
-
-KMOD=	if_ndis
-SRCS=	if_ndis.c if_ndis_pci.c if_ndis_usb.c
-SRCS+=	device_if.h bus_if.h pci_if.h
-SRCS+=	opt_bus.h opt_usb.h usb_if.h usbdevs.h
-
-.include <bsd.kmod.mk>
diff --git a/targets/pseudo/userland/Makefile.depend b/targets/pseudo/userland/Makefile.depend
index 78b5c1e3a046..cde4eadd6eee 100644
--- a/targets/pseudo/userland/Makefile.depend
+++ b/targets/pseudo/userland/Makefile.depend
@@ -1,861 +1,858 @@
 # $FreeBSD$
 
 # This file is not autogenerated - take care!
 
 .include <src.opts.mk>
 
 DIRDEPS=
 DIRDEPS+= \
 	bin/cat \
 	bin/chflags \
 	bin/chio \
 	bin/chmod \
 	bin/cp \
 	bin/csh \
 	bin/date \
 	bin/dd \
 	bin/df \
 	bin/domainname \
 	bin/echo \
 	bin/ed \
 	bin/expr \
 	bin/freebsd-version \
 	bin/getfacl \
 	bin/hostname \
 	bin/kenv \
 	bin/kill \
 	bin/ln \
 	bin/ls \
 	bin/mkdir \
 	bin/mv \
 	bin/pax \
 	bin/pkill \
 	bin/ps \
 	bin/pwait \
 	bin/pwd \
 	bin/rcp \
 	bin/realpath \
 	bin/rm \
 	bin/rmail \
 	bin/rmdir \
 	bin/setfacl \
 	bin/sh \
 	bin/sleep \
 	bin/stty \
 	bin/sync \
 	bin/test \
 	bin/uuidgen \
 	sbin/adjkerntz \
 	sbin/atacontrol \
 	sbin/atm/atmconfig \
 	sbin/camcontrol \
 	sbin/ccdconfig \
 	sbin/clri \
 	sbin/comcontrol \
 	sbin/conscontrol \
 	sbin/decryptcore \
 	sbin/ddb \
 	sbin/devd \
 	sbin/devfs \
 	sbin/dhclient \
 	sbin/dmesg \
 	sbin/dump \
 	sbin/dumpfs \
 	sbin/dumpon \
 	sbin/etherswitchcfg \
 	sbin/ffsinfo \
 	sbin/fsck \
 	sbin/fsck_ffs \
 	sbin/fsck_msdosfs \
 	sbin/fsdb \
 	sbin/fsirand \
 	sbin/gbde \
 	sbin/geom/core \
 	sbin/ggate/ggatec \
 	sbin/ggate/ggated \
 	sbin/ggate/ggatel \
 	sbin/growfs \
 	sbin/gvinum \
 	sbin/hastctl \
 	sbin/hastd \
 	sbin/ifconfig \
 	sbin/init \
 	sbin/ipf/ipf \
 	sbin/ipf/ipfs \
 	sbin/ipf/ipfstat \
 	sbin/ipf/ipmon \
 	sbin/ipf/ipnat \
 	sbin/ipf/ippool \
 	sbin/ipf/libipf \
 	sbin/ipfw \
 	sbin/iscontrol \
 	sbin/kldconfig \
 	sbin/kldload \
 	sbin/kldstat \
 	sbin/kldunload \
 	sbin/ldconfig \
 	sbin/md5 \
 	sbin/mdconfig \
 	sbin/mdmfs \
 	sbin/mknod \
 	sbin/mksnap_ffs \
 	sbin/mount \
 	sbin/mount_cd9660 \
 	sbin/mount_fusefs \
 	sbin/mount_msdosfs \
 	sbin/mount_nfs \
 	sbin/mount_nullfs \
 	sbin/mount_udf \
 	sbin/mount_unionfs \
 	sbin/natd \
 	sbin/newfs \
 	sbin/newfs_msdos \
 	sbin/nfsiod \
 	sbin/nos-tun \
 	sbin/pfctl \
 	sbin/pflogd \
 	sbin/ping \
 	sbin/ping6 \
 	sbin/quotacheck \
 	sbin/rcorder \
 	sbin/reboot \
 	sbin/recoverdisk \
 	sbin/resolvconf \
 	sbin/restore \
 	sbin/route \
 	sbin/routed \
 	sbin/routed/rtquery \
 	sbin/rtsol \
 	sbin/savecore \
 	sbin/setkey \
 	sbin/shutdown \
 	sbin/spppcontrol \
 	sbin/swapon \
 	sbin/sysctl \
 	sbin/tunefs \
 	sbin/umount \
 	usr.bin/alias \
 	usr.bin/apply \
 	usr.bin/ar \
 	usr.bin/asa \
 	usr.bin/at \
 	usr.bin/atf/atf-config \
 	usr.bin/atf/atf-report \
 	usr.bin/atf/atf-run \
 	usr.bin/atf/atf-version \
 	usr.bin/atm/sscop \
 	usr.bin/awk \
 	usr.bin/banner \
 	usr.bin/basename \
 	usr.bin/bc \
 	usr.bin/biff \
 	usr.bin/bluetooth/bthost \
 	usr.bin/bluetooth/btsockstat \
 	usr.bin/bluetooth/rfcomm_sppd \
 	usr.bin/bmake \
 	usr.bin/brandelf \
 	usr.bin/bsdiff/bsdiff \
 	usr.bin/bsdiff/bspatch \
 	usr.bin/bsdcat \
 	usr.bin/bzip2 \
 	usr.bin/bzip2recover \
 	usr.bin/c89 \
 	usr.bin/c99 \
 	usr.bin/calendar \
 	usr.bin/cap_mkdb \
 	usr.bin/chat \
 	usr.bin/checknr \
 	usr.bin/chkey \
 	usr.bin/chpass \
 	usr.bin/cksum \
 	usr.bin/cmp \
 	usr.bin/col \
 	usr.bin/colcrt \
 	usr.bin/colldef \
 	usr.bin/colrm \
 	usr.bin/column \
 	usr.bin/comm \
 	usr.bin/compile_et \
 	usr.bin/compress \
 	usr.bin/cpio \
 	usr.bin/cpuset \
 	usr.bin/csplit \
 	usr.bin/ctags \
 	usr.bin/ctlstat \
 	usr.bin/cut \
 	usr.bin/dc \
 	usr.bin/dig \
 	usr.bin/dirname \
 	usr.bin/dpv \
 	usr.bin/drill \
 	usr.bin/dtc \
 	usr.bin/du \
 	usr.bin/ee \
 	usr.bin/elf2aout \
 	usr.bin/elfdump \
 	usr.bin/enigma \
 	usr.bin/env \
 	usr.bin/expand \
 	usr.bin/false \
 	usr.bin/fetch \
 	usr.bin/file \
 	usr.bin/file2c \
 	usr.bin/find \
 	usr.bin/finger \
 	usr.bin/fmt \
 	usr.bin/fold \
 	usr.bin/from \
 	usr.bin/fstat \
 	usr.bin/fsync \
 	usr.bin/ftp \
 	usr.bin/gcore \
 	usr.bin/gencat \
 	usr.bin/getaddrinfo \
 	usr.bin/getconf \
 	usr.bin/getent \
 	usr.bin/getopt \
 	usr.bin/gprof \
 	usr.bin/grep \
 	usr.bin/gzip \
 	usr.bin/head \
 	usr.bin/hexdump \
 	usr.bin/host \
 	usr.bin/iconv \
 	usr.bin/id \
 	usr.bin/ident \
 	usr.bin/indent \
 	usr.bin/ipcrm \
 	usr.bin/ipcs \
 	usr.bin/iscsictl \
 	usr.bin/join \
 	usr.bin/jot \
 	usr.bin/kdump \
 	usr.bin/keylogin \
 	usr.bin/keylogout \
 	usr.bin/killall \
 	usr.bin/ktrace \
 	usr.bin/ktrdump \
 	usr.bin/lam \
 	usr.bin/last \
 	usr.bin/lastcomm \
 	usr.bin/lex \
 	usr.bin/ldd \
 	usr.bin/leave \
 	usr.bin/less \
 	usr.bin/lessecho \
 	usr.bin/lesskey \
 	usr.bin/lex/lib \
 	usr.bin/limits \
 	usr.bin/locale \
 	usr.bin/localedef \
 	usr.bin/locate/bigram \
 	usr.bin/locate/code \
 	usr.bin/locate/locate \
 	usr.bin/lock \
 	usr.bin/lockf \
 	usr.bin/logger \
 	usr.bin/login \
 	usr.bin/logins \
 	usr.bin/logname \
 	usr.bin/look \
 	usr.bin/lorder \
 	usr.bin/lsvfs \
 	usr.bin/lzmainfo \
 	usr.bin/m4 \
 	usr.bin/mail \
 	usr.bin/man \
 	usr.bin/mandoc \
 	usr.bin/mesg \
 	usr.bin/minigzip \
 	usr.bin/ministat \
 	usr.bin/mkcsmapper \
 	usr.bin/mkdep \
 	usr.bin/mkesdb \
 	usr.bin/mkfifo \
 	usr.bin/mkimg \
 	usr.bin/mklocale \
 	usr.bin/mkstr \
 	usr.bin/mktemp \
 	usr.bin/mkuzip \
 	usr.bin/msgs \
 	usr.bin/mt \
 	usr.bin/nc \
 	usr.bin/ncal \
 	usr.bin/netstat \
 	usr.bin/newgrp \
 	usr.bin/newkey \
 	usr.bin/nfsstat \
 	usr.bin/nice \
 	usr.bin/nl \
 	usr.bin/nohup \
 	usr.bin/opieinfo \
 	usr.bin/opiekey \
 	usr.bin/opiepasswd \
 	usr.bin/pagesize \
 	usr.bin/passwd \
 	usr.bin/paste \
 	usr.bin/patch \
 	usr.bin/pathchk \
 	usr.bin/perror \
 	usr.bin/pr \
 	usr.bin/printenv \
 	usr.bin/printf \
 	usr.bin/proccontrol \
 	usr.bin/procstat \
 	usr.bin/protect \
 	usr.bin/quota \
 	usr.bin/rctl \
 	usr.bin/renice \
 	usr.bin/resizewin \
 	usr.bin/rev \
 	usr.bin/revoke \
 	usr.bin/rlogin \
 	usr.bin/rpcgen \
 	usr.bin/rpcinfo \
 	usr.bin/rs \
 	usr.bin/rsh \
 	usr.bin/rup \
 	usr.bin/ruptime \
 	usr.bin/rusers \
 	usr.bin/rwall \
 	usr.bin/rwho \
 	usr.bin/script \
 	usr.bin/sdiff \
 	usr.bin/sed \
 	usr.bin/seq \
 	usr.bin/shar \
 	usr.bin/showmount \
 	usr.bin/smbutil \
 	usr.bin/sockstat \
 	usr.bin/soelim \
 	usr.bin/sort \
 	usr.bin/split \
 	usr.bin/ssh-copy-id \
 	usr.bin/stat \
 	usr.bin/stdbuf \
 	usr.bin/su \
 	usr.bin/svn/svn \
 	usr.bin/svn/svnadmin \
 	usr.bin/svn/svnbench \
 	usr.bin/svn/svndumpfilter \
 	usr.bin/svn/svnfsfs \
 	usr.bin/svn/svnlook \
 	usr.bin/svn/svnmucc \
 	usr.bin/svn/svnrdump \
 	usr.bin/svn/svnserve \
 	usr.bin/svn/svnsync \
 	usr.bin/svn/svnversion \
 	usr.bin/systat \
 	usr.bin/tabs \
 	usr.bin/tail \
 	usr.bin/talk \
 	usr.bin/tar \
 	usr.bin/tcopy \
 	usr.bin/tee \
 	usr.bin/telnet \
 	usr.bin/tftp \
 	usr.bin/time \
 	usr.bin/timeout \
 	usr.bin/tip/tip \
 	usr.bin/top \
 	usr.bin/touch \
 	usr.bin/tput \
 	usr.bin/tr \
 	usr.bin/true \
 	usr.bin/truncate \
 	usr.bin/truss \
 	usr.bin/tset \
 	usr.bin/tsort \
 	usr.bin/tty \
 	usr.bin/ul \
 	usr.bin/uname \
 	usr.bin/unexpand \
 	usr.bin/unifdef \
 	usr.bin/uniq \
 	usr.bin/units \
 	usr.bin/unvis \
 	usr.bin/unzip \
 	usr.bin/usbhidaction \
 	usr.bin/usbhidctl \
 	usr.bin/users \
 	usr.bin/uudecode \
 	usr.bin/uuencode \
 	usr.bin/vacation \
 	usr.bin/vgrind \
 	usr.bin/vi \
 	usr.bin/vi/catalog \
 	usr.bin/vis \
 	usr.bin/vmstat \
 	usr.bin/vtfontcvt \
 	usr.bin/w \
 	usr.bin/wall \
 	usr.bin/wc \
 	usr.bin/what \
 	usr.bin/whereis \
 	usr.bin/which \
 	usr.bin/who \
 	usr.bin/whois \
 	usr.bin/write \
 	usr.bin/xargs \
 	usr.bin/xinstall \
 	usr.bin/xo \
 	usr.bin/xstr \
 	usr.bin/xz \
 	usr.bin/xzdec \
 	usr.bin/yacc \
 	usr.bin/yes \
 	usr.bin/ypcat \
 	usr.bin/ypmatch \
 	usr.bin/ypwhich \
 	usr.bin/zstd \
 	usr.sbin/IPXrouted \
 	usr.sbin/ac \
 	usr.sbin/accton \
 	usr.sbin/adduser \
 	usr.sbin/amd/amd \
 	usr.sbin/amd/amq \
 	usr.sbin/amd/doc \
 	usr.sbin/amd/fixmount \
 	usr.sbin/amd/fsinfo \
 	usr.sbin/amd/hlfsd \
 	usr.sbin/amd/include \
 	usr.sbin/amd/libamu \
 	usr.sbin/amd/mk-amd-map \
 	usr.sbin/amd/pawd \
 	usr.sbin/amd/scripts \
 	usr.sbin/amd/wire-test \
 	usr.sbin/ancontrol \
 	usr.sbin/apm \
 	usr.sbin/arp \
 	usr.sbin/arpaname \
 	usr.sbin/audit \
 	usr.sbin/auditd \
 	usr.sbin/auditdistd \
 	usr.sbin/auditreduce \
 	usr.sbin/authpf \
 	usr.sbin/autofs \
 	usr.sbin/binmiscctl \
 	usr.sbin/bluetooth/ath3kfw \
 	usr.sbin/bluetooth/bcmfw \
 	usr.sbin/bluetooth/bthidcontrol \
 	usr.sbin/bluetooth/bthidd \
 	usr.sbin/bluetooth/btpand \
 	usr.sbin/bluetooth/hccontrol \
 	usr.sbin/bluetooth/hcsecd \
 	usr.sbin/bluetooth/hcseriald \
 	usr.sbin/bluetooth/iwmbtfw \
 	usr.sbin/bluetooth/l2control \
 	usr.sbin/bluetooth/l2ping \
 	usr.sbin/bluetooth/rfcomm_pppd \
 	usr.sbin/bluetooth/sdpcontrol \
 	usr.sbin/bluetooth/sdpd \
 	usr.sbin/bootparamd/bootparamd \
 	usr.sbin/bootparamd/callbootd \
 	usr.sbin/bsdconfig \
 	usr.sbin/bsdconfig/console \
 	usr.sbin/bsdconfig/console/include \
 	usr.sbin/bsdconfig/diskmgmt \
 	usr.sbin/bsdconfig/diskmgmt/include \
 	usr.sbin/bsdconfig/docsinstall \
 	usr.sbin/bsdconfig/docsinstall/include \
 	usr.sbin/bsdconfig/dot \
 	usr.sbin/bsdconfig/dot/include \
 	usr.sbin/bsdconfig/examples \
 	usr.sbin/bsdconfig/include \
 	usr.sbin/bsdconfig/includes \
 	usr.sbin/bsdconfig/includes/include \
 	usr.sbin/bsdconfig/mouse \
 	usr.sbin/bsdconfig/mouse/include \
 	usr.sbin/bsdconfig/networking \
 	usr.sbin/bsdconfig/networking/include \
 	usr.sbin/bsdconfig/networking/share \
 	usr.sbin/bsdconfig/packages \
 	usr.sbin/bsdconfig/packages/include \
 	usr.sbin/bsdconfig/password \
 	usr.sbin/bsdconfig/password/include \
 	usr.sbin/bsdconfig/password/share \
 	usr.sbin/bsdconfig/security \
 	usr.sbin/bsdconfig/security/include \
 	usr.sbin/bsdconfig/share \
 	usr.sbin/bsdconfig/share/media \
 	usr.sbin/bsdconfig/share/packages \
 	usr.sbin/bsdconfig/startup \
 	usr.sbin/bsdconfig/startup/include \
 	usr.sbin/bsdconfig/startup/share \
 	usr.sbin/bsdconfig/timezone \
 	usr.sbin/bsdconfig/timezone/include \
 	usr.sbin/bsdconfig/timezone/share \
 	usr.sbin/bsdconfig/ttys \
 	usr.sbin/bsdconfig/ttys/include \
 	usr.sbin/bsdconfig/usermgmt \
 	usr.sbin/bsdconfig/usermgmt/include \
 	usr.sbin/bsdconfig/usermgmt/share \
 	usr.sbin/bsdinstall/distextract \
 	usr.sbin/bsdinstall/distfetch \
 	usr.sbin/bsdinstall/partedit \
 	usr.sbin/bsdinstall/scripts \
 	usr.sbin/bsnmpd/bsnmpd \
 	usr.sbin/bsnmpd/gensnmptree \
 	usr.sbin/bsnmpd/modules/snmp_atm \
 	usr.sbin/bsnmpd/modules/snmp_bridge \
 	usr.sbin/bsnmpd/modules/snmp_hast \
 	usr.sbin/bsnmpd/modules/snmp_hostres \
 	usr.sbin/bsnmpd/modules/snmp_lm75 \
 	usr.sbin/bsnmpd/modules/snmp_mibII \
 	usr.sbin/bsnmpd/modules/snmp_netgraph \
 	usr.sbin/bsnmpd/modules/snmp_pf \
 	usr.sbin/bsnmpd/modules/snmp_target \
 	usr.sbin/bsnmpd/modules/snmp_usm \
 	usr.sbin/bsnmpd/modules/snmp_vacm \
 	usr.sbin/bsnmpd/modules/snmp_wlan \
 	usr.sbin/bsnmpd/tools/bsnmptools \
 	usr.sbin/bsnmpd/tools/libbsnmptools \
 	usr.sbin/cdcontrol \
 	usr.sbin/chkgrp \
 	usr.sbin/chown \
 	usr.sbin/chroot \
 	usr.sbin/ckdist \
 	usr.sbin/clear_locks \
 	usr.sbin/config \
 	usr.sbin/crashinfo \
 	usr.sbin/cron/cron \
 	usr.sbin/cron/crontab \
 	usr.sbin/cron/lib \
 	usr.sbin/crunch/crunchgen \
 	usr.sbin/crunch/crunchide \
 	usr.sbin/ctladm \
 	usr.sbin/ctld \
 	usr.sbin/ctm/ctm \
 	usr.sbin/ctm/ctm_dequeue \
 	usr.sbin/ctm/ctm_rmail \
 	usr.sbin/ctm/ctm_smail \
 	usr.sbin/daemon \
 	usr.sbin/dconschat \
 	usr.sbin/ddns-confgen \
 	usr.sbin/devctl \
 	usr.sbin/devinfo \
 	usr.sbin/digictl \
 	usr.sbin/diskinfo \
 	usr.sbin/dnssec-dsfromkey \
 	usr.sbin/dnssec-keyfromlabel \
 	usr.sbin/dnssec-keygen \
 	usr.sbin/dnssec-revoke \
 	usr.sbin/dnssec-settime \
 	usr.sbin/dnssec-signzone \
 	usr.sbin/dumpcis \
 	usr.sbin/editmap \
 	usr.sbin/edquota \
 	usr.sbin/etcupdate \
 	usr.sbin/extattr \
 	usr.sbin/extattrctl \
 	usr.sbin/fdcontrol \
 	usr.sbin/fdformat \
 	usr.sbin/fdread \
 	usr.sbin/fdwrite \
 	usr.sbin/fifolog/fifolog_create \
 	usr.sbin/fifolog/fifolog_reader \
 	usr.sbin/fifolog/fifolog_writer \
 	usr.sbin/fifolog/lib \
 	usr.sbin/flowctl \
 	usr.sbin/fmtree \
 	usr.sbin/freebsd-update \
 	usr.sbin/fstyp \
 	usr.sbin/ftp-proxy \
 	usr.sbin/fwcontrol \
 	usr.sbin/genrandom \
 	usr.sbin/getfmac \
 	usr.sbin/getpmac \
 	usr.sbin/gpioctl \
 	usr.sbin/gssd \
 	usr.sbin/gstat \
 	usr.sbin/i2c \
 	usr.sbin/ifmcstat \
 	usr.sbin/inetd \
 	usr.sbin/iostat \
 	usr.sbin/iovctl \
 	usr.sbin/ip6addrctl \
 	usr.sbin/ipfwpcap \
 	usr.sbin/isc-hmac-fixup \
 	usr.sbin/iscsid \
 	usr.sbin/isfctl \
 	usr.sbin/jail \
 	usr.sbin/jexec \
 	usr.sbin/jls \
 	usr.sbin/kbdcontrol \
 	usr.sbin/kbdmap \
 	usr.sbin/keyserv \
 	usr.sbin/kldxref \
 	usr.sbin/lastlogin \
 	usr.sbin/lmcconfig \
 	usr.sbin/lpr/chkprintcap \
 	usr.sbin/lpr/common_source \
 	usr.sbin/lpr/filters \
 	usr.sbin/lpr/filters.ru/koi2855 \
 	usr.sbin/lpr/filters.ru/koi2alt \
 	usr.sbin/lpr/lp \
 	usr.sbin/lpr/lpc \
 	usr.sbin/lpr/lpd \
 	usr.sbin/lpr/lpq \
 	usr.sbin/lpr/lpr \
 	usr.sbin/lpr/lprm \
 	usr.sbin/lpr/lptest \
 	usr.sbin/lpr/pac \
 	usr.sbin/mailstats \
 	usr.sbin/mailwrapper \
 	usr.sbin/makefs \
 	usr.sbin/makemap \
 	usr.sbin/manctl \
 	usr.sbin/memcontrol \
 	usr.sbin/mergemaster \
 	usr.sbin/mfiutil \
 	usr.sbin/mixer \
 	usr.sbin/mld6query \
 	usr.sbin/mlxcontrol \
 	usr.sbin/mount_smbfs \
 	usr.sbin/mountd \
 	usr.sbin/moused \
 	usr.sbin/mpsutil \
 	usr.sbin/mptutil \
 	usr.sbin/mtest \
 	usr.sbin/named \
 	usr.sbin/named-checkconf \
 	usr.sbin/named-checkzone \
 	usr.sbin/named-journalprint \
 	usr.sbin/ndp \
 	usr.sbin/newsyslog \
 	usr.sbin/nfscbd \
 	usr.sbin/nfsd \
 	usr.sbin/nfsdumpstate \
 	usr.sbin/nfsrevoke \
 	usr.sbin/nfsuserd \
 	usr.sbin/ngctl \
 	usr.sbin/nghook \
 	usr.sbin/nmtree \
 	usr.sbin/nologin \
 	usr.sbin/nscd \
 	usr.sbin/nsec3hash \
 	usr.sbin/ntp/doc \
 	usr.sbin/ntp/doc/drivers/icons \
 	usr.sbin/ntp/doc/drivers/scripts \
 	usr.sbin/ntp/doc/drivers \
 	usr.sbin/ntp/doc/hints \
 	usr.sbin/ntp/doc/icons \
 	usr.sbin/ntp/doc/pic \
 	usr.sbin/ntp/doc/scripts \
 	usr.sbin/ntp/libntp \
 	usr.sbin/ntp/libopts \
 	usr.sbin/ntp/libparse \
 	usr.sbin/ntp/ntp-keygen \
 	usr.sbin/ntp/ntpd \
 	usr.sbin/ntp/ntpdate \
 	usr.sbin/ntp/ntpdc \
 	usr.sbin/ntp/ntpq \
 	usr.sbin/ntp/ntptime \
 	usr.sbin/ntp/sntp \
 	usr.sbin/pciconf \
 	usr.sbin/periodic \
 	usr.sbin/pkg \
 	usr.sbin/pmcannotate \
 	usr.sbin/pmccontrol \
 	usr.sbin/pmcstat \
 	usr.sbin/pmcstudy \
 	usr.sbin/portsnap/make_index \
 	usr.sbin/portsnap/phttpget \
 	usr.sbin/portsnap/portsnap \
 	usr.sbin/powerd \
 	usr.sbin/ppp \
 	usr.sbin/pppctl \
 	usr.sbin/praliases \
 	usr.sbin/praudit \
 	usr.sbin/prometheus_sysctl_exporter \
 	usr.sbin/pstat \
 	usr.sbin/pw \
 	usr.sbin/pwd_mkdb \
 	usr.sbin/quot \
 	usr.sbin/quotaon \
 	usr.sbin/rarpd \
 	usr.sbin/repquota \
 	usr.sbin/rip6query \
 	usr.sbin/rmt \
 	usr.sbin/rndc \
 	usr.sbin/rndc-confgen \
 	usr.sbin/route6d \
 	usr.sbin/rpc.lockd \
 	usr.sbin/rpc.statd \
 	usr.sbin/rpc.umntall \
 	usr.sbin/rpc.yppasswdd \
 	usr.sbin/rpc.ypupdated \
 	usr.sbin/rpc.ypxfrd \
 	usr.sbin/rpcbind \
 	usr.sbin/rrenumd \
 	usr.sbin/rtadvctl \
 	usr.sbin/rtadvd \
 	usr.sbin/rtprio \
 	usr.sbin/rtsold \
 	usr.sbin/rwhod \
 	usr.sbin/sa \
 	usr.sbin/sendmail \
 	usr.sbin/service \
 	usr.sbin/services_mkdb \
 	usr.sbin/sesutil \
 	usr.sbin/setfib \
 	usr.sbin/setfmac \
 	usr.sbin/setpmac \
 	usr.sbin/smbmsg \
 	usr.sbin/snapinfo \
 	usr.sbin/spray \
 	usr.sbin/syslogd \
 	usr.sbin/sysrc \
 	usr.sbin/tcpdchk \
 	usr.sbin/tcpdmatch \
 	usr.sbin/tcpdrop \
 	usr.sbin/tcpdump/tcpdump \
 	usr.sbin/timed/timed \
 	usr.sbin/timed/timedc \
 	usr.sbin/traceroute \
 	usr.sbin/traceroute6 \
 	usr.sbin/trpt \
 	usr.sbin/tzsetup \
 	usr.sbin/uathload \
 	usr.sbin/uefisign \
 	usr.sbin/ugidfw \
 	usr.sbin/uhsoctl \
 	usr.sbin/unbound/anchor \
 	usr.sbin/unbound/checkconf \
 	usr.sbin/unbound/control \
 	usr.sbin/unbound/daemon \
 	usr.sbin/unbound/local-setup \
 	usr.sbin/usbconfig \
 	usr.sbin/usbdump \
 	usr.sbin/utx \
 	usr.sbin/vidcontrol \
 	usr.sbin/vigr \
 	usr.sbin/vipw \
 	usr.sbin/wake \
 	usr.sbin/watch \
 	usr.sbin/watchdogd \
 	usr.sbin/wlandebug \
 	usr.sbin/wpa/hostapd \
 	usr.sbin/wpa/hostapd_cli \
-	usr.sbin/wpa/ndis_events \
 	usr.sbin/wpa/wpa_cli \
 	usr.sbin/wpa/wpa_passphrase \
 	usr.sbin/wpa/wpa_supplicant \
 	usr.sbin/yp_mkdb \
 	usr.sbin/ypbind \
 	usr.sbin/ypldap \
 	usr.sbin/yppoll \
 	usr.sbin/yppush \
 	usr.sbin/ypserv \
 	usr.sbin/ypset \
 	usr.sbin/zic/zdump \
 	usr.sbin/zic/zic \
 	usr.sbin/zonectl \
 	${DEP_RELDIR}/cddl \
 	${DEP_RELDIR}/gnu \
 	${DEP_RELDIR}/include \
 	${DEP_RELDIR}/kerberos5 \
 	${DEP_RELDIR}/lib \
 	${DEP_RELDIR}/libexec \
 	${DEP_RELDIR}/misc \
 	${DEP_RELDIR}/secure \
 	${DEP_RELDIR}/share \
 
 
 .if ${MK_EFI} != "no"
 DIRDEPS+=	usr.sbin/efidp
 .endif
 
 DIRDEPS.amd64= \
 	sbin/bsdlabel \
 	sbin/fdisk \
 	sbin/nvmecontrol \
 	usr.sbin/acpi/acpiconf \
 	usr.sbin/acpi/acpidb \
 	usr.sbin/acpi/acpidump \
 	usr.sbin/acpi/iasl \
 	usr.sbin/apm \
 	usr.sbin/bhyve \
 	usr.sbin/bhyvectl \
 	usr.sbin/bhyveload \
 	usr.sbin/boot0cfg \
 	usr.sbin/btxld \
 	usr.sbin/camdd \
 	usr.sbin/cpucontrol \
 	usr.sbin/hyperv/tools \
 	usr.sbin/hyperv/tools/kvp \
 	usr.sbin/hyperv/tools/vss \
 	usr.sbin/kgmon \
 	usr.sbin/lptcontrol \
 	usr.sbin/mptable \
-	usr.sbin/ndiscvt \
 	usr.sbin/spkrtest \
 	usr.sbin/sade \
 	usr.sbin/zzz
 
 DIRDEPS.arm= \
 	sbin/bsdlabel \
 	sbin/fdisk \
 	usr.sbin/ofwdump \
 	usr.sbin/kgmon
 
 DIRDEPS.i386= \
 	sbin/bsdlabel \
 	sbin/fdisk \
 	sbin/nvmecontrol \
 	sbin/sconfig \
 	usr.sbin/apm \
 	usr.sbin/apmd \
 	usr.sbin/btxld \
 	usr.sbin/cpucontrol \
 	usr.sbin/hyperv/tools \
 	usr.sbin/hyperv/tools/kvp \
 	usr.sbin/hyperv/tools/vss \
 	usr.sbin/kgmon \
 	usr.sbin/lptcontrol \
 	usr.sbin/mptable \
-	usr.sbin/ndiscvt \
 	usr.sbin/pnpinfo \
 	usr.sbin/sade \
 	usr.sbin/spkrtest \
 	usr.sbin/zzz \
 	usr.sbin/acpi \
 	usr.sbin/boot0cfg
 
 DIRDEPS.arm64= \
 	usr.sbin/acpi \
 	usr.sbin/ofwdump
 
 DIRDEPS.mips= \
 	sbin/bsdlabel \
 	sbin/fdisk
 
 DIRDEPS.sparc64= \
 	sbin/bsdlabel \
 	sbin/sunlabel \
 	usr.sbin/eeprom \
 	usr.sbin/ofwdump \
 	usr.sbin/sade
 
 DIRDEPS.powerpc= \
 	usr.sbin/nvram \
 	usr.sbin/ofwdump
 
 .if ${MK_BLACKLIST_SUPPORT} != "no"
 DIRDEPS+= \
 	usr.sbin/blacklistctl \
 	usr.sbin/blacklistd
 .endif
 
 .if ${MK_CXGBETOOL} != "no"
 DIRDEPS+= usr.sbin/cxgbetool
 .endif
 
 .if ${MK_MLX5TOOL} != "no"
 DIRDEPS+= usr.sbin/mlx5tool
 .endif
 
 DIRDEPS+= ${DIRDEPS.${MACHINE}:U}
 
 
 .include <dirdeps.mk>
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index b517cff65338..4a075a78cf70 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1,10160 +1,10152 @@
 #
 # $FreeBSD$
 #
 # This file add 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
 OLD_FILES+=usr/share/man/man8/amd64/apm.8.gz
 OLD_FILES+=usr/share/man/man8/amd64/apmconf.8.gz
 .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_ATM} == no
 OLD_FILES+=usr/bin/sscop
 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_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
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libngatm.a
 OLD_FILES+=usr/lib32/libngatm.so
 OLD_LIBS+=usr/lib32/libngatm.so.4
 OLD_FILES+=usr/lib32/libngatm_p.a
 .endif
 OLD_FILES+=usr/share/man/man1/sscop.1.gz
 OLD_FILES+=usr/share/man/man3/libngatm.3.gz
 OLD_FILES+=usr/share/man/man3/uniaddr.3.gz
 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
 .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_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 !defined(WITH_PORT_BASE_BINUTILS)
 .if ${MK_LLD_IS_LD} == no
 OLD_FILES+=usr/bin/ld
 OLD_FILES+=usr/share/man/man1/ld.1.gz
 .endif
 .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
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libbluetooth.a
 OLD_FILES+=usr/lib32/libbluetooth.so
 OLD_LIBS+=usr/lib32/libbluetooth.so.4
 OLD_FILES+=usr/lib32/libbluetooth_p.a
 OLD_FILES+=usr/lib32/libsdp.a
 OLD_FILES+=usr/lib32/libsdp.so
 OLD_LIBS+=usr/lib32/libsdp.so.4
 OLD_FILES+=usr/lib32/libsdp_p.a
 .endif
 OLD_FILES+=usr/sbin/ath3kfw
 OLD_FILES+=usr/sbin/bcmfw
 OLD_FILES+=usr/sbin/bluetooth-config
 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/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/script
 OLD_FILES+=usr/libexec/bsdinstall/scriptedpart
 OLD_FILES+=usr/libexec/bsdinstall/services
 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/lib32/libbsnmp.a
 OLD_FILES+=usr/lib32/libbsnmp.so
 OLD_LIBS+=usr/lib32/libbsnmp.so.6
 OLD_FILES+=usr/lib32/libbsnmp_p.a
 OLD_FILES+=usr/sbin/bsnmpd
 OLD_FILES+=usr/sbin/gensnmptree
 OLD_FILES+=usr/share/examples/etc/snmpd.config
 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/casper/libcap_dns.so.2
 OLD_LIBS+=lib/casper/libcap_fileargs.so.1
 OLD_LIBS+=lib/casper/libcap_grp.so.1
 OLD_LIBS+=lib/casper/libcap_net.so.1
 OLD_LIBS+=lib/casper/libcap_pwd.so.1
 OLD_LIBS+=lib/casper/libcap_sysctl.so.1
 OLD_LIBS+=lib/casper/libcap_sysctl.so.2
 OLD_LIBS+=lib/casper/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_CDDL} == no
 OLD_LIBS+=lib/libavl.so.2
 OLD_LIBS+=lib/libctf.so.2
 OLD_LIBS+=lib/libdtrace.so.2
 OLD_LIBS+=lib/libnvpair.so.2
 OLD_LIBS+=lib/libumem.so.2
 OLD_LIBS+=lib/libuutil.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/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/libavl.a
 OLD_FILES+=usr/lib/libavl.so
 OLD_FILES+=usr/lib/libavl_p.a
 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_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
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/dtrace/drti.o
 OLD_FILES+=usr/lib32/libavl.a
 OLD_FILES+=usr/lib32/libavl.so
 OLD_LIBS+=usr/lib32/libavl.so.2
 OLD_FILES+=usr/lib32/libavl_p.a
 OLD_FILES+=usr/lib32/libctf.a
 OLD_FILES+=usr/lib32/libctf.so
 OLD_LIBS+=usr/lib32/libctf.so.2
 OLD_FILES+=usr/lib32/libctf_p.a
 OLD_FILES+=usr/lib32/libdtrace.a
 OLD_FILES+=usr/lib32/libdtrace.so
 OLD_LIBS+=usr/lib32/libdtrace.so.2
 OLD_FILES+=usr/lib32/libdtrace_p.a
 OLD_FILES+=usr/lib32/libnvpair.a
 OLD_FILES+=usr/lib32/libnvpair.so
 OLD_LIBS+=usr/lib32/libnvpair.so.2
 OLD_FILES+=usr/lib32/libnvpair_p.a
 OLD_FILES+=usr/lib32/libumem.a
 OLD_FILES+=usr/lib32/libumem.so
 OLD_LIBS+=usr/lib32/libumem.so.2
 OLD_FILES+=usr/lib32/libumem_p.a
 OLD_FILES+=usr/lib32/libuutil.a
 OLD_FILES+=usr/lib32/libuutil.so
 OLD_LIBS+=usr/lib32/libuutil.so.2
 OLD_FILES+=usr/lib32/libuutil_p.a
 .endif
 OLD_LIBS+=lib/libdtrace.so.2
 OLD_FILES+=usr/libexec/dwatch/chmod
 OLD_FILES+=usr/libexec/dwatch/errno
 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
 OLD_DIRS+=usr/lib32/dtrace
 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/zfsd
 OLD_FILES+=etc/rc.d/zfsbe
 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/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/libzfs.a
 OLD_LIBS+=usr/lib/libzfs.so
 OLD_FILES+=usr/lib/libzfs_core.a
 OLD_LIBS+=usr/lib/libzfs_core.so
 OLD_LIBS+=usr/lib/libzfs_core_p.a
 OLD_FILES+=usr/lib/libzfs_p.a
 OLD_FILES+=usr/lib/libzpool.a
 OLD_FILES+=usr/lib/libzpool.so
 OLD_LIBS+=usr/lib/libzpool.so.2
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libzfs.a
 OLD_FILES+=usr/lib32/libzfs.so
 OLD_LIBS+=usr/lib32/libzfs.so.2
 OLD_LIBS+=usr/lib32/libzfs.so.3
 OLD_FILES+=usr/lib32/libzfs_core.a
 OLD_FILES+=usr/lib32/libzfs_core.so
 OLD_LIBS+=usr/lib32/libzfs_core.so.2
 OLD_FILES+=usr/lib32/libzfs_core_p.a
 OLD_FILES+=usr/lib32/libzfs_p.a
 OLD_FILES+=usr/lib32/libzpool.a
 OLD_FILES+=usr/lib32/libzpool.so
 OLD_LIBS+=usr/lib32/libzpool.so.2
 .endif
 OLD_FILES+=usr/sbin/zfsd
 OLD_FILES+=usr/sbin/zhack
 OLD_FILES+=usr/sbin/zdb
 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
 OLD_FILES+=usr/bin/clang
 OLD_FILES+=usr/bin/clang++
 OLD_FILES+=usr/bin/clang-cpp
 OLD_FILES+=usr/bin/clang-tblgen
 OLD_FILES+=usr/bin/llvm-addr2line
 OLD_FILES+=usr/bin/llvm-ar
 OLD_FILES+=usr/bin/llvm-nm
 OLD_FILES+=usr/bin/llvm-objdump
 OLD_FILES+=usr/bin/llvm-ranlib
 OLD_FILES+=usr/bin/llvm-symbolizer
 OLD_FILES+=usr/bin/llvm-tblgen
 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
 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
 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-ranlib.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-symbolizer.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-tblgen.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-objcopy
 OLD_FILES+=usr/bin/llvm-pdbutil
 OLD_FILES+=usr/bin/llvm-rtdyld
 OLD_FILES+=usr/bin/llvm-size
 OLD_FILES+=usr/bin/llvm-strings
 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-objcopy.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-pdbutil.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/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
 
 # devd(8) not listed here on purpose
 .if ${MK_CXX} == no
 OLD_FILES+=usr/bin/CC
 OLD_FILES+=usr/bin/c++
 OLD_FILES+=usr/bin/g++
 OLD_FILES+=usr/libexec/cc1plus
 .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_FILES+=usr/lib/libdialog.so.8
 OLD_FILES+=usr/lib/libdialog_p.a
 OLD_FILES+=usr/lib/libdpv.a
 OLD_FILES+=usr/lib/libdpv.so
 OLD_FILES+=usr/lib/libdpv.so.1
 OLD_FILES+=usr/lib/libdpv_p.a
 OLD_FILES+=usr/sbin/bsdconfig
 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
 OLD_FILES+=usr/share/man/man8/bsdconfig.8.gz
 OLD_DIRS+=usr/share/bsdconfig
 OLD_DIRS+=usr/share/bsdconfig/media
 OLD_DIRS+=usr/share/bsdconfig/networking
 OLD_DIRS+=usr/share/bsdconfig/packages
 OLD_DIRS+=usr/share/bsdconfig/password
 OLD_DIRS+=usr/share/bsdconfig/startup
 OLD_DIRS+=usr/share/bsdconfig/timezone
 OLD_DIRS+=usr/share/bsdconfig/usermgmt
 .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_FMTREE} == no
 OLD_FILES+=usr/sbin/fmtree
 OLD_FILES+=usr/share/man/man8/fmtree.8.gz
 .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/mailer.conf
 .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/rc.sendmail
 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/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/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/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/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/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/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/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/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_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 && ${MK_PORTSNAP} == 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 && !defined(WITH_PORT_BASE_GCC)
 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_GOOGLETEST} == no
 OLD_FILES+=usr/include/gmock/gmock-actions.h
 OLD_FILES+=usr/include/gmock/gmock-cardinalities.h
 OLD_FILES+=usr/include/gmock/gmock-generated-actions.h
 OLD_FILES+=usr/include/gmock/gmock-generated-function-mockers.h
 OLD_FILES+=usr/include/gmock/gmock-generated-matchers.h
 OLD_FILES+=usr/include/gmock/gmock-generated-nice-strict.h
 OLD_FILES+=usr/include/gmock/gmock-matchers.h
 OLD_FILES+=usr/include/gmock/gmock-more-actions.h
 OLD_FILES+=usr/include/gmock/gmock-more-matchers.h
 OLD_FILES+=usr/include/gmock/gmock-spec-builders.h
 OLD_FILES+=usr/include/gmock/gmock.h
 OLD_FILES+=usr/include/gmock/internal/custom/gmock-generated-actions.h
 OLD_FILES+=usr/include/gmock/internal/custom/gmock-matchers.h
 OLD_FILES+=usr/include/gmock/internal/custom/gmock-port.h
 OLD_FILES+=usr/include/gmock/internal/gmock-generated-internal-utils.h
 OLD_FILES+=usr/include/gmock/internal/gmock-internal-utils.h
 OLD_FILES+=usr/include/gmock/internal/gmock-port.h
 OLD_DIRS+=usr/include/gmock
 OLD_FILES+=usr/include/gtest/gtest_pred_impl.h
 OLD_FILES+=usr/include/gtest/gtest_prod.h
 OLD_FILES+=usr/include/gtest/gtest-death-test.h
 OLD_FILES+=usr/include/gtest/gtest-message.h
 OLD_FILES+=usr/include/gtest/gtest-param-test.h
 OLD_FILES+=usr/include/gtest/gtest-printers.h
 OLD_FILES+=usr/include/gtest/gtest-spi.h
 OLD_FILES+=usr/include/gtest/gtest-test-part.h
 OLD_FILES+=usr/include/gtest/gtest-typed-test.h
 OLD_FILES+=usr/include/gtest/gtest.h
 OLD_FILES+=usr/include/gtest/internal/custom/gtest-port.h
 OLD_FILES+=usr/include/gtest/internal/custom/gtest-printers.h
 OLD_FILES+=usr/include/gtest/internal/custom/gtest.h
 OLD_FILES+=usr/include/gtest/internal/gtest-death-test-internal.h
 OLD_FILES+=usr/include/gtest/internal/gtest-filepath.h
 OLD_FILES+=usr/include/gtest/internal/gtest-internal.h
 OLD_FILES+=usr/include/gtest/internal/gtest-linked_ptr.h
 OLD_FILES+=usr/include/gtest/internal/gtest-param-util-generated.h
 OLD_FILES+=usr/include/gtest/internal/gtest-param-util.h
 OLD_FILES+=usr/include/gtest/internal/gtest-port-arch.h
 OLD_FILES+=usr/include/gtest/internal/gtest-port.h
 OLD_FILES+=usr/include/gtest/internal/gtest-string.h
 OLD_FILES+=usr/include/gtest/internal/gtest-tuple.h
 OLD_FILES+=usr/include/gtest/internal/gtest-type-util.h
 OLD_DIRS+=usr/include/gtest
 OLD_FILES+=usr/lib/libprivategmock_main.a
 OLD_FILES+=usr/lib/libprivategmock_main.so
 OLD_LIBS+=usr/lib/libprivategmock_main.so.0
 OLD_FILES+=usr/lib/libprivategmock_main_p.a
 OLD_FILES+=usr/lib/libprivategmock.a
 OLD_FILES+=usr/lib/libprivategmock.so
 OLD_LIBS+=usr/lib/libprivategmock.so.0
 OLD_FILES+=usr/lib/libprivategmock_p.a
 OLD_FILES+=usr/lib/libprivategtest_main.a
 OLD_FILES+=usr/lib/libprivategtest_main.so
 OLD_LIBS+=usr/lib/libprivategtest_main.so.0
 OLD_FILES+=usr/lib/libprivategtest_main_p.a
 OLD_FILES+=usr/lib/libprivategtest.a
 OLD_FILES+=usr/lib/libprivategtest.so
 OLD_LIBS+=usr/lib/libprivategtest.so.0
 OLD_FILES+=usr/lib/libprivategtest_p.a
 OLD_FILES+=usr/tests/lib/googletest/gmock/gmock_stress_test
 OLD_FILES+=usr/tests/lib/googletest/gmock/Kyuafile
 OLD_DIRS+=usr/tests/lib/googletest/gmock
 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/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-ex_test
 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-internal-utils_test
 OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-matchers_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/Kyuafile
 OLD_DIRS+=usr/tests/lib/googletest/gmock_main
 OLD_FILES+=usr/tests/lib/googletest/gtest/googletest-param-test-test
 OLD_FILES+=usr/tests/lib/googletest/gtest/gtest_all_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/gtest-death-test_ex_catch_test
 OLD_FILES+=usr/tests/lib/googletest/gtest/gtest-death-test_ex_nocatch_test
 OLD_FILES+=usr/tests/lib/googletest/gtest/gtest-unittest-api_test
 OLD_FILES+=usr/tests/lib/googletest/gtest/Kyuafile
 OLD_DIRS+=usr/tests/lib/googletest/gtest
 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-linked-ptr-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_help_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_sole_header_test
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_unittest
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_xml_outfile1_test_
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_xml_outfile2_test_
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest-typed-test_test
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/Kyuafile
 OLD_DIRS+=usr/tests/lib/googletest/gtest_main
 OLD_FILES+=usr/tests/lib/googletest/Kyuafile
 OLD_DIRS+=usr/tests/lib/googletest/
 OLD_FILES+=usr/tests/share/examples/tests/googletest/Kyuafile
 OLD_FILES+=usr/tests/share/examples/tests/googletest/sample1_unittest
 OLD_FILES+=usr/tests/share/examples/tests/googletest/sample10_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/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/lib32/libgpio.a
 OLD_FILES+=usr/lib32/libgpio.so
 OLD_LIBS+=usr/lib32/libgpio.so.0
 OLD_FILES+=usr/lib32/libgpio_p.a
 OLD_FILES+=usr/sbin/gpioctl
 OLD_FILES+=usr/share/man/man3/gpio.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_close.3.gz
 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
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libgssapi.a
 OLD_FILES+=usr/lib32/libgssapi.so
 OLD_LIBS+=usr/lib32/libgssapi.so.10
 OLD_FILES+=usr/lib32/libgssapi_p.a
 OLD_FILES+=usr/lib32/librpcsec_gss.a
 OLD_FILES+=usr/lib32/librpcsec_gss.so
 OLD_LIBS+=usr/lib32/librpcsec_gss.so.1
 .endif
 OLD_FILES+=usr/sbin/gssd
 OLD_FILES+=usr/share/man/man3/gss_accept_sec_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_acquire_cred.3.gz
 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_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/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_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+=sbin/iscontrol
 OLD_FILES+=usr/bin/iscsictl
 OLD_FILES+=usr/sbin/iscsid
 OLD_FILES+=usr/share/man/man4/iscsi.4.gz
 OLD_FILES+=usr/share/man/man4/iscsi_initiator.4.gz
 OLD_FILES+=usr/share/man/man5/iscsi.conf.5.gz
 OLD_FILES+=usr/share/man/man8/iscontrol.8.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/private/libheimipcc.a
 OLD_FILES+=usr/lib/private/libheimipcc.so
 OLD_LIBS+=usr/lib/private/libheimipcc.so.11
 OLD_FILES+=usr/lib/private/libheimipcc_p.a
 OLD_FILES+=usr/lib/private/libheimipcs.a
 OLD_FILES+=usr/lib/private/libheimipcs.so
 OLD_LIBS+=usr/lib/private/libheimipcs.so.11
 OLD_FILES+=usr/lib/private/libheimipcs_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libasn1.a
 OLD_FILES+=usr/lib32/libasn1.so
 OLD_LIBS+=usr/lib32/libasn1.so.11
 OLD_FILES+=usr/lib32/libasn1_p.a
 OLD_FILES+=usr/lib32/libgssapi_krb5.a
 OLD_FILES+=usr/lib32/libgssapi_krb5.so
 OLD_LIBS+=usr/lib32/libgssapi_krb5.so.10
 OLD_FILES+=usr/lib32/libgssapi_krb5_p.a
 OLD_FILES+=usr/lib32/libgssapi_ntlm.a
 OLD_FILES+=usr/lib32/libgssapi_ntlm.so
 OLD_LIBS+=usr/lib32/libgssapi_ntlm.so.10
 OLD_FILES+=usr/lib32/libgssapi_ntlm_p.a
 OLD_FILES+=usr/lib32/libgssapi_spnego.a
 OLD_FILES+=usr/lib32/libgssapi_spnego.so
 OLD_LIBS+=usr/lib32/libgssapi_spnego.so.10
 OLD_FILES+=usr/lib32/libgssapi_spnego_p.a
 OLD_FILES+=usr/lib32/libhdb.a
 OLD_FILES+=usr/lib32/libhdb.so
 OLD_LIBS+=usr/lib32/libhdb.so.11
 OLD_FILES+=usr/lib32/libhdb_p.a
 OLD_FILES+=usr/lib32/libheimbase.a
 OLD_FILES+=usr/lib32/libheimbase.so
 OLD_LIBS+=usr/lib32/libheimbase.so.11
 OLD_FILES+=usr/lib32/libheimbase_p.a
 OLD_FILES+=usr/lib32/libheimntlm.a
 OLD_FILES+=usr/lib32/libheimntlm.so
 OLD_LIBS+=usr/lib32/libheimntlm.so.11
 OLD_FILES+=usr/lib32/libheimntlm_p.a
 OLD_FILES+=usr/lib32/libheimsqlite.a
 OLD_FILES+=usr/lib32/libheimsqlite.so
 OLD_LIBS+=usr/lib32/libheimsqlite.so.11
 OLD_FILES+=usr/lib32/libheimsqlite_p.a
 OLD_FILES+=usr/lib32/libhx509.a
 OLD_FILES+=usr/lib32/libhx509.so
 OLD_LIBS+=usr/lib32/libhx509.so.11
 OLD_FILES+=usr/lib32/libhx509_p.a
 OLD_FILES+=usr/lib32/libkadm5clnt.a
 OLD_FILES+=usr/lib32/libkadm5clnt.so
 OLD_LIBS+=usr/lib32/libkadm5clnt.so.11
 OLD_FILES+=usr/lib32/libkadm5clnt_p.a
 OLD_FILES+=usr/lib32/libkadm5srv.a
 OLD_FILES+=usr/lib32/libkadm5srv.so
 OLD_LIBS+=usr/lib32/libkadm5srv.so.11
 OLD_FILES+=usr/lib32/libkadm5srv_p.a
 OLD_FILES+=usr/lib32/libkafs5.a
 OLD_FILES+=usr/lib32/libkafs5.so
 OLD_LIBS+=usr/lib32/libkafs5.so.11
 OLD_FILES+=usr/lib32/libkafs5_p.a
 OLD_FILES+=usr/lib32/libkdc.a
 OLD_FILES+=usr/lib32/libkdc.so
 OLD_LIBS+=usr/lib32/libkdc.so.11
 OLD_FILES+=usr/lib32/libkdc_p.a
 OLD_FILES+=usr/lib32/libkrb5.a
 OLD_FILES+=usr/lib32/libkrb5.so
 OLD_LIBS+=usr/lib32/libkrb5.so.11
 OLD_FILES+=usr/lib32/libkrb5_p.a
 OLD_FILES+=usr/lib32/libroken.a
 OLD_FILES+=usr/lib32/libroken.so
 OLD_LIBS+=usr/lib32/libroken.so.11
 OLD_FILES+=usr/lib32/libroken_p.a
 OLD_FILES+=usr/lib32/libwind.a
 OLD_FILES+=usr/lib32/libwind.so
 OLD_LIBS+=usr/lib32/libwind.so.11
 OLD_FILES+=usr/lib32/libwind_p.a
 OLD_FILES+=usr/lib32/pam_krb5.so
 OLD_LIBS+=usr/lib32/pam_krb5.so.6
 OLD_FILES+=usr/lib32/pam_ksu.so
 OLD_LIBS+=usr/lib32/pam_ksu.so.6
 OLD_FILES+=usr/lib32/private/libheimipcc.a
 OLD_FILES+=usr/lib32/private/libheimipcc.so
 OLD_LIBS+=usr/lib32/private/libheimipcc.so.11
 OLD_FILES+=usr/lib32/private/libheimipcc_p.a
 OLD_FILES+=usr/lib32/private/libheimipcs.a
 OLD_FILES+=usr/lib32/private/libheimipcs.so
 OLD_LIBS+=usr/lib32/private/libheimipcs.so.11
 OLD_FILES+=usr/lib32/private/libheimipcs_p.a
 .endif
 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/lib32/libcom_err.a
 OLD_FILES+=usr/lib32/libcom_err.so
 OLD_LIBS+=usr/lib32/libcom_err.so.5
 OLD_FILES+=usr/lib32/libcom_err_p.a
 OLD_FILES+=usr/share/man/man1/compile_et.1.gz
 OLD_FILES+=usr/share/man/man3/com_err.3.gz
 .endif
 
 .if ${MK_LDNS} == no
 OLD_FILES+=usr/lib/private/libldns.a
 OLD_FILES+=usr/lib/private/libldns.so
 OLD_LIBS+=usr/lib/private/libldns.so.5
 OLD_FILES+=usr/lib/private/libldns_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/private/libldns.a
 OLD_FILES+=usr/lib32/private/libldns.so
 OLD_LIBS+=usr/lib32/private/libldns.so.5
 OLD_FILES+=usr/lib32/private/libldns_p.a
 .endif
 .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
 
 .if ${MK_LIB32} == no
 OLD_FILES+=etc/mtree/BSD.lib32.dist
 OLD_FILES+=libexec/ld-elf32.so.1
 .  if exists(${DESTDIR}/usr/lib32)
 LIB32_DIRS!=find ${DESTDIR}/usr/lib32 -type d \
     | sed -e 's,^${DESTDIR}/,,'; echo
 LIB32_FILES!=find ${DESTDIR}/usr/lib32 \! -type d \
     \! -name "lib*.so*" | sed -e 's,^${DESTDIR}/,,'; echo
 LIB32_LIBS!=find ${DESTDIR}/usr/lib32 \! -type d \
     -name "lib*.so*" | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_DIRS+=${LIB32_DIRS}
 OLD_FILES+=${LIB32_FILES}
 OLD_LIBS+=${LIB32_LIBS}
 .  endif
 .  if ${MK_DEBUG_FILES} == no
 .    if exists(${DESTDIR}/usr/lib/debug/usr/lib32)
 DEBUG_LIB32_DIRS!=find ${DESTDIR}/usr/lib/debug/usr/lib32 -type d \
     | sed -e 's,^${DESTDIR}/,,'; echo
 DEBUG_LIB32_FILES!=find ${DESTDIR}/usr/lib/debug/usr/lib32 \! -type d \
     \! -name "lib*.so*" | sed -e 's,^${DESTDIR}/,,'; echo
 DEBUG_LIB32_LIBS!=find ${DESTDIR}/usr/lib/debug/usr/lib32 \! -type d \
     -name "lib*.so*" | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_DIRS+=${DEBUG_LIB32_DIRS}
 OLD_FILES+=${DEBUG_LIB32_FILES}
 OLD_LIBS+=${DEBUG_LIB32_LIBS}
 .    endif
 .  endif
 .endif
 
 .if ${MK_LIBCPLUSPLUS} == no
 OLD_LIBS+=lib/libcxxrt.so.1
 OLD_FILES+=usr/lib/libc++.a
 OLD_FILES+=usr/lib/libc++_p.a
 OLD_FILES+=usr/lib/libc++experimental.a
 OLD_FILES+=usr/lib/libc++fs.a
 OLD_FILES+=usr/lib/libc++.so
 OLD_LIBS+=usr/lib/libc++.so.1
 OLD_FILES+=usr/lib/libcxxrt.a
 OLD_FILES+=usr/lib/libcxxrt.so
 OLD_FILES+=usr/lib/libcxxrt_p.a
 OLD_FILES+=usr/include/c++/v1/__bit_reference
 OLD_FILES+=usr/include/c++/v1/__bsd_locale_defaults.h
 OLD_FILES+=usr/include/c++/v1/__bsd_locale_fallbacks.h
 OLD_FILES+=usr/include/c++/v1/__config
 OLD_FILES+=usr/include/c++/v1/__debug
 OLD_FILES+=usr/include/c++/v1/__errc
 OLD_FILES+=usr/include/c++/v1/__functional_03
 OLD_FILES+=usr/include/c++/v1/__functional_base
 OLD_FILES+=usr/include/c++/v1/__functional_base_03
 OLD_FILES+=usr/include/c++/v1/__hash_table
 OLD_FILES+=usr/include/c++/v1/__libcpp_version
 OLD_FILES+=usr/include/c++/v1/__locale
 OLD_FILES+=usr/include/c++/v1/__mutex_base
 OLD_FILES+=usr/include/c++/v1/__node_handle
 OLD_FILES+=usr/include/c++/v1/__nullptr
 OLD_FILES+=usr/include/c++/v1/__split_buffer
 OLD_FILES+=usr/include/c++/v1/__sso_allocator
 OLD_FILES+=usr/include/c++/v1/__std_stream
 OLD_FILES+=usr/include/c++/v1/__string
 OLD_FILES+=usr/include/c++/v1/__threading_support
 OLD_FILES+=usr/include/c++/v1/__tree
 OLD_FILES+=usr/include/c++/v1/__tuple
 OLD_FILES+=usr/include/c++/v1/__undef_macros
 OLD_FILES+=usr/include/c++/v1/algorithm
 OLD_FILES+=usr/include/c++/v1/any
 OLD_FILES+=usr/include/c++/v1/array
 OLD_FILES+=usr/include/c++/v1/atomic
 OLD_FILES+=usr/include/c++/v1/bit
 OLD_FILES+=usr/include/c++/v1/bitset
 OLD_FILES+=usr/include/c++/v1/cassert
 OLD_FILES+=usr/include/c++/v1/ccomplex
 OLD_FILES+=usr/include/c++/v1/cctype
 OLD_FILES+=usr/include/c++/v1/cerrno
 OLD_FILES+=usr/include/c++/v1/cfenv
 OLD_FILES+=usr/include/c++/v1/cfloat
 OLD_FILES+=usr/include/c++/v1/charconv
 OLD_FILES+=usr/include/c++/v1/chrono
 OLD_FILES+=usr/include/c++/v1/cinttypes
 OLD_FILES+=usr/include/c++/v1/ciso646
 OLD_FILES+=usr/include/c++/v1/climits
 OLD_FILES+=usr/include/c++/v1/clocale
 OLD_FILES+=usr/include/c++/v1/cmath
 OLD_FILES+=usr/include/c++/v1/codecvt
 OLD_FILES+=usr/include/c++/v1/compare
 OLD_FILES+=usr/include/c++/v1/complex
 OLD_FILES+=usr/include/c++/v1/complex.h
 OLD_FILES+=usr/include/c++/v1/condition_variable
 OLD_FILES+=usr/include/c++/v1/csetjmp
 OLD_FILES+=usr/include/c++/v1/csignal
 OLD_FILES+=usr/include/c++/v1/cstdarg
 OLD_FILES+=usr/include/c++/v1/cstdbool
 OLD_FILES+=usr/include/c++/v1/cstddef
 OLD_FILES+=usr/include/c++/v1/cstdint
 OLD_FILES+=usr/include/c++/v1/cstdio
 OLD_FILES+=usr/include/c++/v1/cstdlib
 OLD_FILES+=usr/include/c++/v1/cstring
 OLD_FILES+=usr/include/c++/v1/ctgmath
 OLD_FILES+=usr/include/c++/v1/ctime
 OLD_FILES+=usr/include/c++/v1/ctype.h
 OLD_FILES+=usr/include/c++/v1/cwchar
 OLD_FILES+=usr/include/c++/v1/cwctype
 OLD_FILES+=usr/include/c++/v1/cxxabi.h
 OLD_FILES+=usr/include/c++/v1/deque
 OLD_FILES+=usr/include/c++/v1/errno.h
 OLD_FILES+=usr/include/c++/v1/exception
 OLD_FILES+=usr/include/c++/v1/experimental/__config
 OLD_FILES+=usr/include/c++/v1/experimental/__memory
 OLD_FILES+=usr/include/c++/v1/experimental/algorithm
 OLD_FILES+=usr/include/c++/v1/experimental/any
 OLD_FILES+=usr/include/c++/v1/experimental/chrono
 OLD_FILES+=usr/include/c++/v1/experimental/coroutine
 OLD_FILES+=usr/include/c++/v1/experimental/deque
 OLD_FILES+=usr/include/c++/v1/experimental/dynarray
 OLD_FILES+=usr/include/c++/v1/experimental/filesystem
 OLD_FILES+=usr/include/c++/v1/experimental/forward_list
 OLD_FILES+=usr/include/c++/v1/experimental/functional
 OLD_FILES+=usr/include/c++/v1/experimental/iterator
 OLD_FILES+=usr/include/c++/v1/experimental/list
 OLD_FILES+=usr/include/c++/v1/experimental/map
 OLD_FILES+=usr/include/c++/v1/experimental/memory_resource
 OLD_FILES+=usr/include/c++/v1/experimental/numeric
 OLD_FILES+=usr/include/c++/v1/experimental/optional
 OLD_FILES+=usr/include/c++/v1/experimental/propagate_const
 OLD_FILES+=usr/include/c++/v1/experimental/ratio
 OLD_FILES+=usr/include/c++/v1/experimental/regex
 OLD_FILES+=usr/include/c++/v1/experimental/set
 OLD_FILES+=usr/include/c++/v1/experimental/simd
 OLD_FILES+=usr/include/c++/v1/experimental/string
 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/include/c++/v1/experimental/type_traits
 OLD_FILES+=usr/include/c++/v1/experimental/unordered_map
 OLD_FILES+=usr/include/c++/v1/experimental/unordered_set
 OLD_FILES+=usr/include/c++/v1/experimental/utility
 OLD_FILES+=usr/include/c++/v1/experimental/vector
 OLD_FILES+=usr/include/c++/v1/ext/__hash
 OLD_FILES+=usr/include/c++/v1/ext/hash_map
 OLD_FILES+=usr/include/c++/v1/ext/hash_set
 OLD_FILES+=usr/include/c++/v1/filesystem
 OLD_FILES+=usr/include/c++/v1/float.h
 OLD_FILES+=usr/include/c++/v1/forward_list
 OLD_FILES+=usr/include/c++/v1/fstream
 OLD_FILES+=usr/include/c++/v1/functional
 OLD_FILES+=usr/include/c++/v1/future
 OLD_FILES+=usr/include/c++/v1/initializer_list
 OLD_FILES+=usr/include/c++/v1/inttypes.h
 OLD_FILES+=usr/include/c++/v1/iomanip
 OLD_FILES+=usr/include/c++/v1/ios
 OLD_FILES+=usr/include/c++/v1/iosfwd
 OLD_FILES+=usr/include/c++/v1/iostream
 OLD_FILES+=usr/include/c++/v1/istream
 OLD_FILES+=usr/include/c++/v1/iterator
 OLD_FILES+=usr/include/c++/v1/limits
 OLD_FILES+=usr/include/c++/v1/limits.h
 OLD_FILES+=usr/include/c++/v1/list
 OLD_FILES+=usr/include/c++/v1/locale
 OLD_FILES+=usr/include/c++/v1/locale.h
 OLD_FILES+=usr/include/c++/v1/map
 OLD_FILES+=usr/include/c++/v1/math.h
 OLD_FILES+=usr/include/c++/v1/memory
 OLD_FILES+=usr/include/c++/v1/mutex
 OLD_FILES+=usr/include/c++/v1/new
 OLD_FILES+=usr/include/c++/v1/numeric
 OLD_FILES+=usr/include/c++/v1/numeric
 OLD_FILES+=usr/include/c++/v1/optional
 OLD_FILES+=usr/include/c++/v1/ostream
 OLD_FILES+=usr/include/c++/v1/queue
 OLD_FILES+=usr/include/c++/v1/random
 OLD_FILES+=usr/include/c++/v1/ratio
 OLD_FILES+=usr/include/c++/v1/regex
 OLD_FILES+=usr/include/c++/v1/scoped_allocator
 OLD_FILES+=usr/include/c++/v1/set
 OLD_FILES+=usr/include/c++/v1/setjmp.h
 OLD_FILES+=usr/include/c++/v1/shared_mutex
 OLD_FILES+=usr/include/c++/v1/span
 OLD_FILES+=usr/include/c++/v1/sstream
 OLD_FILES+=usr/include/c++/v1/stack
 OLD_FILES+=usr/include/c++/v1/stdbool.h
 OLD_FILES+=usr/include/c++/v1/stddef.h
 OLD_FILES+=usr/include/c++/v1/stdexcept
 OLD_FILES+=usr/include/c++/v1/stdint.h
 OLD_FILES+=usr/include/c++/v1/stdio.h
 OLD_FILES+=usr/include/c++/v1/stdlib.h
 OLD_FILES+=usr/include/c++/v1/streambuf
 OLD_FILES+=usr/include/c++/v1/string
 OLD_FILES+=usr/include/c++/v1/string.h
 OLD_FILES+=usr/include/c++/v1/string_view
 OLD_FILES+=usr/include/c++/v1/strstream
 OLD_FILES+=usr/include/c++/v1/system_error
 OLD_FILES+=usr/include/c++/v1/tgmath.h
 OLD_FILES+=usr/include/c++/v1/thread
 OLD_FILES+=usr/include/c++/v1/version
 OLD_FILES+=usr/include/c++/v1/tr1/__bit_reference
 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/__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/__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/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/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/complex
 OLD_FILES+=usr/include/c++/v1/tr1/complex.h
 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/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/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/numeric
 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/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/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/wchar.h
 OLD_FILES+=usr/include/c++/v1/tr1/wctype.h
 OLD_FILES+=usr/include/c++/v1/tuple
 OLD_FILES+=usr/include/c++/v1/type_traits
 OLD_FILES+=usr/include/c++/v1/typeindex
 OLD_FILES+=usr/include/c++/v1/typeinfo
 OLD_FILES+=usr/include/c++/v1/unordered_map
 OLD_FILES+=usr/include/c++/v1/unordered_set
 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
 OLD_FILES+=usr/include/c++/v1/utility
 OLD_FILES+=usr/include/c++/v1/valarray
 OLD_FILES+=usr/include/c++/v1/variant
 OLD_FILES+=usr/include/c++/v1/vector
 OLD_FILES+=usr/include/c++/v1/wchar.h
 OLD_FILES+=usr/include/c++/v1/wctype.h
 OLD_FILES+=usr/lib32/libc++.a
 OLD_FILES+=usr/lib32/libc++.so
 OLD_LIBS+=usr/lib32/libc++.so.1
 OLD_FILES+=usr/lib32/libc++_p.a
 OLD_FILES+=usr/lib32/libc++experimental.a
 OLD_FILES+=usr/lib32/libc++fs.a
 OLD_FILES+=usr/lib32/libcxxrt.a
 OLD_FILES+=usr/lib32/libcxxrt.so
 OLD_LIBS+=usr/lib32/libcxxrt.so.1
 OLD_FILES+=usr/lib32/libcxxrt_p.a
 OLD_DIRS+=usr/include/c++/v1/tr1
 OLD_DIRS+=usr/include/c++/v1/experimental
 OLD_DIRS+=usr/include/c++/v1/ext
 OLD_DIRS+=usr/include/c++/v1
 .endif
 
 .if ${MK_LLD} == no
 OLD_FILES+=usr/bin/ld.lld
 .endif
 
 .if ${MK_LLDB} == no
 OLD_FILES+=usr/bin/lldb
 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+=etc/rc.d/othermta
 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_NDIS} == no
-OLD_FILES+=usr/sbin/ndiscvt
-OLD_FILES+=usr/sbin/ndisgen
-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
-.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/lib32/libnetgraph.a
 OLD_FILES+=usr/lib32/libnetgraph.so
 OLD_LIBS+=usr/lib32/libnetgraph.so.4
 OLD_FILES+=usr/lib32/libnetgraph_p.a
 OLD_FILES+=usr/libexec/pppoed
 OLD_FILES+=usr/sbin/flowctl
 OLD_FILES+=usr/sbin/lmcconfig
 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
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libypclnt.a
 OLD_FILES+=usr/lib32/libypclnt.so
 OLD_LIBS+=usr/lib32/libypclnt.so.4
 OLD_FILES+=usr/lib32/libypclnt_p.a
 .endif
 OLD_FILES+=usr/libexec/mknetid
 OLD_FILES+=usr/libexec/yppwupdate
 OLD_FILES+=usr/libexec/ypxfr
 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_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/grep.cat
 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/grep.cat
 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/grep.cat
 OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/libc.cat
 OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/sort.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/grep.cat
 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/grep.cat
 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/grep.cat
 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/grep.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/grep.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/grep.cat
 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/grep.cat
 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
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libcxgb4.a
 OLD_FILES+=usr/lib32/libcxgb4.so
 OLD_LIBS+=usr/lib32/libcxgb4.so.1
 OLD_FILES+=usr/lib32/libibcm.a
 OLD_FILES+=usr/lib32/libibcm.so
 OLD_LIBS+=usr/lib32/libibcm.so.1
 OLD_FILES+=usr/lib32/libibmad.a
 OLD_FILES+=usr/lib32/libibmad.so
 OLD_LIBS+=usr/lib32/libibmad.so.5
 OLD_FILES+=usr/lib32/libibnetdisc.a
 OLD_FILES+=usr/lib32/libibnetdisc.so
 OLD_LIBS+=usr/lib32/libibnetdisc.so.5
 OLD_FILES+=usr/lib32/libibumad.a
 OLD_FILES+=usr/lib32/libibumad.so
 OLD_LIBS+=usr/lib32/libibumad.so.1
 OLD_FILES+=usr/lib32/libibverbs.a
 OLD_FILES+=usr/lib32/libibverbs.so
 OLD_LIBS+=usr/lib32/libibverbs.so.1
 OLD_FILES+=usr/lib32/libmlx4.a
 OLD_FILES+=usr/lib32/libmlx4.so
 OLD_LIBS+=usr/lib32/libmlx4.so.1
 OLD_FILES+=usr/lib32/libmlx5.a
 OLD_FILES+=usr/lib32/libmlx5.so
 OLD_LIBS+=usr/lib32/libmlx5.so.1
 OLD_FILES+=usr/lib32/libopensm.a
 OLD_FILES+=usr/lib32/libopensm.so
 OLD_LIBS+=usr/lib32/libopensm.so.5
 OLD_FILES+=usr/lib32/libosmcomp.a
 OLD_FILES+=usr/lib32/libosmcomp.so
 OLD_LIBS+=usr/lib32/libosmcomp.so.3
 OLD_FILES+=usr/lib32/libosmvendor.a
 OLD_FILES+=usr/lib32/libosmvendor.so
 OLD_LIBS+=usr/lib32/libosmvendor.so.4
 OLD_FILES+=usr/lib32/librdmacm.a
 OLD_FILES+=usr/lib32/librdmacm.so
 OLD_LIBS+=usr/lib32/librdmacm.so.1
 .endif
 OLD_FILES+=usr/share/man/man1/ibv_asyncwatch.1.gz
 OLD_FILES+=usr/share/man/man1/ibv_devices.1.gz
 OLD_FILES+=usr/share/man/man1/ibv_devinfo.1.gz
 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_LIBS+=usr/lib/libgomp.so
 OLD_LIBS+=usr/lib32/libgomp.so
 OLD_LIBS+=usr/lib/libomp.so
 OLD_LIBS+=usr/lib32/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/pam_ssh.so
 OLD_LIBS+=usr/lib/pam_ssh.so.6
 OLD_FILES+=usr/lib/private/libssh.a
 OLD_FILES+=usr/lib/private/libssh.so
 OLD_LIBS+=usr/lib/private/libssh.so.5
 OLD_FILES+=usr/lib/private/libssh_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/pam_ssh.so
 OLD_LIBS+=usr/lib32/pam_ssh.so.6
 OLD_FILES+=usr/lib32/private/libssh.a
 OLD_FILES+=usr/lib32/private/libssh.so
 OLD_LIBS+=usr/lib32/private/libssh.so.5
 OLD_FILES+=usr/lib32/private/libssh_p.a
 .endif
 OLD_FILES+=usr/libexec/sftp-server
 OLD_FILES+=usr/libexec/ssh-keysign
 OLD_FILES+=usr/libexec/ssh-pkcs11-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/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/lib32/libpmc.a
 OLD_FILES+=usr/lib32/libpmc.so
 OLD_LIBS+=usr/lib32/libpmc.so.5
 OLD_FILES+=usr/lib32/libpmc_p.a
 OLD_FILES+=usr/sbin/pmc
 OLD_FILES+=usr/sbin/pmcannotate
 OLD_FILES+=usr/sbin/pmccontrol
 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.mips24k.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.octeon.3.gz
 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
 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_PORTSNAP} == no
 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
 .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/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/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/libngatm_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/libprivatebsdstat_p.a
 OLD_FILES+=usr/lib/libprivatedevdctl_p.a
 OLD_FILES+=usr/lib/libprivateevent_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/libssl_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/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/private/libldns_p.a
 OLD_FILES+=usr/lib/private/libssh_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/lib32/libradius.a
 OLD_FILES+=usr/lib32/libradius.so
 OLD_LIBS+=usr/lib32/libradius.so.4
 OLD_FILES+=usr/lib32/libradius_p.a
 OLD_FILES+=usr/lib32/pam_radius.so
 OLD_LIBS+=usr/lib32/pam_radius.so.6
 OLD_FILES+=usr/include/radlib.h
 OLD_FILES+=usr/include/radlib_vs.h
 OLD_FILES+=usr/share/man/man3/libradius.3.gz
 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
 OLD_FILES+=bin/rmail
 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
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libmilter.a
 OLD_FILES+=usr/lib32/libmilter.so
 OLD_LIBS+=usr/lib32/libmilter.so.5
 OLD_FILES+=usr/lib32/libmilter_p.a
 .endif
 OLD_FILES+=usr/libexec/mail.local
 OLD_FILES+=usr/libexec/sendmail/sendmail
 OLD_FILES+=usr/libexec/smrsh
 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/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/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/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/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.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.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+=etc/pam.d/telnetd
 OLD_FILES+=usr/bin/telnet
 OLD_FILES+=usr/libexec/telnetd
 OLD_FILES+=usr/share/man/man1/telnet.1.gz
 OLD_FILES+=usr/share/man/man8/telnetd.8.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_LIBS+=usr/lib/libatf-c++.a
 OLD_LIBS+=usr/lib/libatf-c++.so
 OLD_LIBS+=usr/lib/libatf-c++.so.1
 OLD_LIBS+=usr/lib/libatf-c++.so.2
 OLD_LIBS+=usr/lib/libatf-c++_p.a
 OLD_LIBS+=usr/lib/libatf-c.a
 OLD_LIBS+=usr/lib/libatf-c.so
 OLD_LIBS+=usr/lib/libatf-c.so.1
 OLD_LIBS+=usr/lib/libatf-c_p.a
 OLD_LIBS+=usr/lib/private/libatf-c.so.0
 OLD_LIBS+=usr/lib/private/libatf-c++.so.1
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_LIBS+=usr/lib32/libatf-c++.a
 OLD_LIBS+=usr/lib32/libatf-c++.so
 OLD_LIBS+=usr/lib32/libatf-c++.so.1
 OLD_LIBS+=usr/lib32/libatf-c++.so.2
 OLD_LIBS+=usr/lib32/libatf-c++_p.a
 OLD_LIBS+=usr/lib32/libatf-c.a
 OLD_LIBS+=usr/lib32/libatf-c.so
 OLD_LIBS+=usr/lib32/libatf-c.so.1
 OLD_LIBS+=usr/lib32/libatf-c_p.a
 OLD_LIBS+=usr/lib32/private/libatf-c.so.0
 OLD_LIBS+=usr/lib32/private/libatf-c++.so.1
 .endif
 OLD_FILES+=usr/libdata/pkgconfig/atf-c++.pc
 OLD_FILES+=usr/libdata/pkgconfig/atf-c.pc
 OLD_FILES+=usr/libdata/pkgconfig/atf-sh.pc
 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_FILES+=usr/lib/debug/usr/bin/kyua.debug
 OLD_LIBS+=usr/lib/private/libatf-c++.so.2
 OLD_LIBS+=usr/lib/private/libatf-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/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
 .endif
 
 .if ${MK_UNBOUND} == no
 OLD_FILES+=etc/rc.d/local_unbound
 OLD_FILES+=etc/unbound
 OLD_FILES+=usr/lib/private/libunbound.a
 OLD_FILES+=usr/lib/private/libunbound.so
 OLD_LIBS+=usr/lib/private/libunbound.so.5
 OLD_FILES+=usr/lib/private/libunbound_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/private/libunbound.a
 OLD_FILES+=usr/lib32/private/libunbound.so
 OLD_LIBS+=usr/lib32/private/libunbound.so.5
 OLD_FILES+=usr/lib32/private/libunbound_p.a
 OLD_FILES+=usr/share/man/man5/local-unbound.conf.5.gz
 OLD_FILES+=usr/share/man/man8/local-unbound-anchor.8.gz
 OLD_FILES+=usr/share/man/man8/local-unbound-checkconf.8.gz
 OLD_FILES+=usr/share/man/man8/local-unbound-control.8.gz
 OLD_FILES+=usr/share/man/man8/local-unbound.8.gz
 .endif
 OLD_FILES+=usr/sbin/local-unbound-setup
 OLD_FILES+=usr/sbin/local-unbound
 OLD_FILES+=usr/sbin/local-unbound-anchor
 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/lib32/libusb.a
 OLD_FILES+=usr/lib32/libusb.so
 OLD_LIBS+=usr/lib32/libusb.so.3
 OLD_FILES+=usr/lib32/libusb_p.a
 OLD_FILES+=usr/lib32/libusbhid.a
 OLD_FILES+=usr/lib32/libusbhid.so
 OLD_LIBS+=usr/lib32/libusbhid.so.4
 OLD_FILES+=usr/lib32/libusbhid_p.a
 OLD_FILES+=usr/libdata/pkgconfig/libusb-0.1.pc
 OLD_FILES+=usr/libdata/pkgconfig/libusb-1.0.pc
 OLD_FILES+=usr/libdata/pkgconfig/libusb-2.0.pc
 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_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_SVNLITE} == no || ${MK_SVN} == yes
 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/share/man/man1/svnlite.1.gz
 .endif
 
 .if ${MK_SVN} == no
 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/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
 .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/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
diff --git a/tools/kerneldoc/subsys/Doxyfile-dev_if_ndis b/tools/kerneldoc/subsys/Doxyfile-dev_if_ndis
deleted file mode 100644
index d758d8de8971..000000000000
--- a/tools/kerneldoc/subsys/Doxyfile-dev_if_ndis
+++ /dev/null
@@ -1,21 +0,0 @@
-# Doxyfile 1.5.2
-
-# $FreeBSD$
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME           = "FreeBSD kernel IF_NDIS device code"
-OUTPUT_DIRECTORY       = $(DOXYGEN_DEST_PATH)/dev_if_ndis/
-EXTRACT_ALL            = YES    # for undocumented src, no warnings enabled
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT                  = $(DOXYGEN_SRC_PATH)/dev/if_ndis/ \
-                         $(NOTREVIEWED)
-
-GENERATE_TAGFILE       = dev_if_ndis/dev_if_ndis.tag
-
-@INCLUDE_PATH          = $(DOXYGEN_INCLUDE_PATH)
-@INCLUDE               = common-Doxyfile
-
diff --git a/usr.sbin/Makefile.amd64 b/usr.sbin/Makefile.amd64
index fca60eae07e1..64e5d8678c41 100644
--- a/usr.sbin/Makefile.amd64
+++ b/usr.sbin/Makefile.amd64
@@ -1,31 +1,28 @@
 # $FreeBSD$
 
 # mptable: broken (not 64 bit clean)
 # pnpinfo: crashes (not really useful anyway)
 .if ${MK_ACPI} != "no"
 SUBDIR+=	acpi
 .endif
 .if ${MK_APM} != "no"
 SUBDIR+=	apm
 .endif
 .if ${MK_BHYVE} != "no"
 SUBDIR+=	bhyve
 SUBDIR+=	bhyvectl
 SUBDIR+=	bhyveload
 .endif
 SUBDIR+=	boot0cfg
 .if ${MK_TOOLCHAIN} != "no"
 SUBDIR+=	btxld
 .endif
 SUBDIR+=	cpucontrol
 .if ${MK_HYPERV} != "no"
 SUBDIR+=	hyperv
 .endif
 SUBDIR+=	kgmon
 SUBDIR+=	lptcontrol
 SUBDIR+=	mptable
-.if ${MK_NDIS} != "no"
-SUBDIR+=	ndiscvt
-.endif
 SUBDIR+=	spkrtest
 SUBDIR+=	zzz
diff --git a/usr.sbin/Makefile.i386 b/usr.sbin/Makefile.i386
index 6724115b8217..90a74e05e061 100644
--- a/usr.sbin/Makefile.i386
+++ b/usr.sbin/Makefile.i386
@@ -1,26 +1,23 @@
 # $FreeBSD$
 
 .if ${MK_ACPI} != "no"
 SUBDIR+=	acpi
 .endif
 .if ${MK_APM} != "no"
 SUBDIR+=	apm
 SUBDIR+=	apmd
 .endif
 SUBDIR+=	boot0cfg
 .if ${MK_TOOLCHAIN} != "no"
 SUBDIR+=	btxld
 .endif
 SUBDIR+=	cpucontrol
 .if ${MK_HYPERV} != "no"
 SUBDIR+=	hyperv
 .endif
 SUBDIR+=	kgmon
 SUBDIR+=	lptcontrol
 SUBDIR+=	mptable
-.if ${MK_NDIS} != "no"
-SUBDIR+=	ndiscvt
-.endif
 SUBDIR+=	pnpinfo
 SUBDIR+=	spkrtest
 SUBDIR+=	zzz
diff --git a/usr.sbin/ndiscvt/Makefile b/usr.sbin/ndiscvt/Makefile
deleted file mode 100644
index a8be84fe7255..000000000000
--- a/usr.sbin/ndiscvt/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $FreeBSD$
-
-.PATH:	${SRCTOP}/sys/compat/ndis
-
-PROG=	ndiscvt
-SRCS=	ndiscvt.c
-SRCS+=	subr_pe.c
-SRCS+=	inf.c inf-token.l inf-parse.y y.tab.h
-
-MAN=	ndiscvt.8
-MAN+=	ndisgen.8
-
-WARNS?=	4
-NO_WCAST_ALIGN=
-
-YFLAGS+=-v
-
-CFLAGS+=-I. -I${.CURDIR} -I${SRCTOP}/sys
-
-CLEANFILES= y.output
-
-FILES= windrv_stub.c
-FILESDIR= ${SHAREDIR}/misc
-
-SCRIPTS= ndisgen.sh
-
-.include <bsd.prog.mk>
diff --git a/usr.sbin/ndiscvt/Makefile.depend b/usr.sbin/ndiscvt/Makefile.depend
deleted file mode 100644
index af1fb7abc88e..000000000000
--- a/usr.sbin/ndiscvt/Makefile.depend
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/libc \
-	lib/libcompiler_rt \
-	usr.bin/lex/lib \
-	usr.bin/yacc.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/usr.sbin/ndiscvt/inf-parse.y b/usr.sbin/ndiscvt/inf-parse.y
deleted file mode 100644
index 740aba5e87d1..000000000000
--- a/usr.sbin/ndiscvt/inf-parse.y
+++ /dev/null
@@ -1,112 +0,0 @@
-%{
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
- * Copyright (c) 2003
- *	Bill Paul <wpaul@windriver.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/queue.h>
-
-#include "inf.h"
-
-extern int yylex (void);
-extern void yyerror(const char *);
-%}
-
-%token	EQUALS COMMA EOL
-%token	<str> SECTION
-%token	<str> STRING
-%token	<str> WORD
-
-%union {
-	char *str;
-}
-
-%%
-
-inf_file
-	: inf_list
-	|
-	;
-
-inf_list
-	: inf
-	| inf_list inf
-	;
-
-inf
-	: SECTION EOL
-		{ section_add($1); }
-	| WORD EQUALS assign EOL
-		{ assign_add($1); }
-	| WORD COMMA regkey EOL
-		{ regkey_add($1); }
-	| WORD EOL
-		{ define_add($1); }
-	| EOL
-	;
-
-assign
-	: WORD
-		{ push_word($1); }
-	| STRING
-		{ push_word($1); }
-	| WORD COMMA assign
-		{ push_word($1); }
-	| STRING COMMA assign
-		{ push_word($1); }
-	| COMMA assign
-		{ push_word(NULL); }
-	| COMMA
-		{ push_word(NULL); }
-	|
-	;
-
-regkey
-	: WORD
-		{ push_word($1); }
-	| STRING
-		{ push_word($1); }
-	| WORD COMMA regkey
-		{ push_word($1); }
-	| STRING COMMA regkey
-		{ push_word($1); }
-	| COMMA regkey
-		{ push_word(NULL); }
-	| COMMA
-		{ push_word(NULL); }
-	;
-%%
diff --git a/usr.sbin/ndiscvt/inf-token.l b/usr.sbin/ndiscvt/inf-token.l
deleted file mode 100644
index 2aac5b477067..000000000000
--- a/usr.sbin/ndiscvt/inf-token.l
+++ /dev/null
@@ -1,134 +0,0 @@
-%{
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
- * Copyright (c) 2003
- *	Bill Paul <wpaul@windriver.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <regex.h>
-#include <ctype.h>
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "y.tab.h"
-
-int lineno = 1;
-
-int yylex(void);
-void yyerror(const char *);
-
-static void
-update_lineno(const char *cp)
-{
-	while (*cp)
-		if (*cp++ == '\n')
-			lineno++;
-}
-
-%}
-
-%option noyywrap
-%option nounput
-%option noinput
-
-%%
-
-[ \t]+			;
-\n			{ lineno++; return EOL; }
-\r			;
-;.*$			;
-\/\/.*$			;
-=			{ return EQUALS; }
-,			{ return COMMA; }
-\"(\\\"|[^"]|\"\")*\"	{
-			int len = strlen(yytext) - 2;
-			int blen = len + 1;
-			char *walker;
-			int i;
-			update_lineno(yytext);
-			yylval.str = (char *)malloc(blen);
-			if (yylval.str == NULL)
-				goto out;
-			walker = yylval.str;
-			for (i = 1; i <= len; i++) {
-				if (yytext[i] == '\"') {
-					switch (yytext[i + 1]) {
-					case '\"':
-						i++;
-						break;
-					default:
-						break;
-					}
-				}
-				if (yytext[i] == '\\') {
-					switch (yytext[i + 1]) {
-					case '\n':
-						i += 2;
-						while(isspace(yytext[i]))
-							i++;
-						break;
-					case '\"':
-						i++;
-						break;
-					case '(':
-						i++;
-						break;
-					default:
-						break;
-					}
-				}
-				*walker++ = yytext[i];
-			}
-			*walker++ = '\0';
-			out:;
-			return STRING;
-			}
-\[[a-zA-Z0-9%&\{\}\-\.\/_\\\*\ ]+\]	{
-				int len = strlen(yytext);
-				yytext[len-1] = '\0';
-				yylval.str = strdup(yytext+1);
-				return SECTION;
-			}
-[a-zA-Z0-9%&\{\}\-\.\/_\\\*]+		{
-				yylval.str = strdup(yytext);
-				return WORD;
-			}
-%%
-
-void
-yyerror(const char *s)
-{
-	errx(1, "line %d: %s%s %s.", lineno, yytext, yytext?":":"", s);
-}
diff --git a/usr.sbin/ndiscvt/inf.c b/usr.sbin/ndiscvt/inf.c
deleted file mode 100644
index 442e7f61b1fd..000000000000
--- a/usr.sbin/ndiscvt/inf.c
+++ /dev/null
@@ -1,920 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
- * Copyright (c) 2003
- *	Bill Paul <wpaul@windriver.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
-#include <sys/queue.h>
-
-#include "inf.h"
-
-extern FILE *yyin;
-int yyparse (void);
-
-const char *words[W_MAX];	/* More than we'll need. */
-int idx;
-
-static struct section_head sh;
-static struct reg_head rh;
-static struct assign_head ah;
-
-static char	*sstrdup	(const char *);
-static struct assign
-		*find_assign	(const char *, const char *);
-static struct assign
-		*find_next_assign
-				(struct assign *);
-static struct section
-		*find_section	(const char *);
-static int	dump_deviceids_pci	(void);
-static int	dump_deviceids_pcmcia	(void);
-static int	dump_deviceids_usb	(void);
-static void	dump_pci_id	(const char *);
-static void	dump_pcmcia_id	(const char *);
-static void	dump_usb_id	(const char *);
-static void	dump_regvals	(void);
-static void	dump_paramreg	(const struct section *,
-				const struct reg *, int);
-
-static FILE	*ofp;
-
-int
-inf_parse (FILE *fp, FILE *outfp)
-{
-	TAILQ_INIT(&sh);
-	TAILQ_INIT(&rh);
-	TAILQ_INIT(&ah);
-
-	ofp = outfp;
-	yyin = fp;
-	yyparse();
-
-	if (dump_deviceids_pci() == 0 &&
-	    dump_deviceids_pcmcia() == 0 &&
-	    dump_deviceids_usb() == 0)
-		return (-1);
-
-	fprintf(outfp, "#ifdef NDIS_REGVALS\n");
-	dump_regvals();
-	fprintf(outfp, "#endif /* NDIS_REGVALS */\n");
-
-	return (0);
-}
-
-void
-section_add (const char *s)
-{
-	struct section *sec;
-
-	sec = malloc(sizeof(struct section));
-	bzero(sec, sizeof(struct section));
-	sec->name = s;
-	TAILQ_INSERT_TAIL(&sh, sec, link);
-
-	return;
-}
-
-static struct assign *
-find_assign (const char *s, const char *k)
-{
-	struct assign *assign;
-	char newkey[256];
-
-	/* Deal with string section lookups. */
-
-	if (k != NULL && k[0] == '%') {
-		bzero(newkey, sizeof(newkey));
-		strncpy(newkey, k + 1, strlen(k) - 2);
-		k = newkey;
-	}
-
-	TAILQ_FOREACH(assign, &ah, link) {
-		if (strcasecmp(assign->section->name, s) == 0) {
-			if (k == NULL)
-				return(assign);
-			else
-				if (strcasecmp(assign->key, k) == 0)
-					return(assign);
-		}
-	}
-	return(NULL);
-}
-
-static struct assign *
-find_next_assign (struct assign *a)
-{
-	struct assign *assign;
-
-	TAILQ_FOREACH(assign, &ah, link) {
-		if (assign == a)
-			break;
-	}
-
-	assign = assign->link.tqe_next;
-
-	if (assign == NULL || assign->section != a->section)
-		return(NULL);
-
-	return (assign);
-}
-
-static const char *
-stringcvt(const char *s)
-{
-	struct assign *manf;
-
-	manf = find_assign("strings", s);
-	if (manf == NULL)
-		return(s);
-	return(manf->vals[0]);
-}
-
-struct section *
-find_section (const char *s)
-{
-	struct section *section;
-
-	TAILQ_FOREACH(section, &sh, link) {
-		if (strcasecmp(section->name, s) == 0)
-			return(section);
-	}
-	return(NULL);
-}
-
-static void
-dump_pcmcia_id(const char *s)
-{
-	char *manstr, *devstr;
-	char *p0, *p;
-
-	p0 = __DECONST(char *, s);
-
-	p = strchr(p0, '\\');
-	if (p == NULL)
-		return;
-	p0 = p + 1;
-
-	p = strchr(p0, '-');
-	if (p == NULL)
-		return;
-	*p = '\0';
-
-	manstr = p0;
-
-	/* Convert any underscores to spaces. */
-
-	while (*p0 != '\0') {
-		if (*p0 == '_')
-			*p0 = ' ';
-		p0++;
-	}
-
-	p0 = p + 1;
-	p = strchr(p0, '-');
-	if (p == NULL)
-		return;
-	*p = '\0';
-
-	devstr = p0;
-
-	/* Convert any underscores to spaces. */
-
-	while (*p0 != '\0') {
-		if (*p0 == '_')
-			*p0 = ' ';
-		p0++;
-	}
-
-	fprintf(ofp, "\t\\\n\t{ \"%s\", \"%s\", ", manstr, devstr);
-	return;
-}
-
-static void
-dump_pci_id(const char *s)
-{
-	char *p;
-	char vidstr[7], didstr[7], subsysstr[14];
-
-	p = strcasestr(s, "VEN_");
-	if (p == NULL)
-		return;
-	p += 4;
-	strcpy(vidstr, "0x");
-	strncat(vidstr, p, 4);
-	p = strcasestr(s, "DEV_");
-	if (p == NULL)
-		return;
-	p += 4;
-	strcpy(didstr, "0x");
-	strncat(didstr, p, 4);
-	if (p == NULL)
-		return;
-	p = strcasestr(s, "SUBSYS_");
-	if (p == NULL)
-		strcpy(subsysstr, "0x00000000");
-	else {
-		p += 7;
-		strcpy(subsysstr, "0x");
-		strncat(subsysstr, p, 8);
-	}
-
-	fprintf(ofp, "\t\\\n\t{ %s, %s, %s, ", vidstr, didstr, subsysstr);
-	return;
-}
-
-static void
-dump_usb_id(const char *s)
-{
-	char *p;
-	char vidstr[7], pidstr[7];
-
-	p = strcasestr(s, "VID_");
-	if (p == NULL)
-		return;
-	p += 4;
-	strcpy(vidstr, "0x");
-	strncat(vidstr, p, 4);
-	p = strcasestr(s, "PID_");
-	if (p == NULL)
-		return;
-	p += 4;
-	strcpy(pidstr, "0x");
-	strncat(pidstr, p, 4);
-	if (p == NULL)
-		return;
-
-	fprintf(ofp, "\t\\\n\t{ %s, %s, ", vidstr, pidstr);
-}
-
-static int
-dump_deviceids_pci()
-{
-	struct assign *manf, *dev;
-	struct section *sec;
-	struct assign *assign;
-	char xpsec[256];
-	int first = 1, found = 0;
-
-	/* Find manufacturer name */
-	manf = find_assign("Manufacturer", NULL);
-
-nextmanf:
-
-	/* Find manufacturer section */
-	if (manf->vals[1] != NULL &&
-	    (strcasecmp(manf->vals[1], "NT.5.1") == 0 ||
-	    strcasecmp(manf->vals[1], "NTx86") == 0 ||
-	    strcasecmp(manf->vals[1], "NTx86.5.1") == 0 ||
-	    strcasecmp(manf->vals[1], "NTamd64") == 0)) {
-		/* Handle Windows XP INF files. */
-		snprintf(xpsec, sizeof(xpsec), "%s.%s",
-		    manf->vals[0], manf->vals[1]);
-		sec = find_section(xpsec);
-	} else
-		sec = find_section(manf->vals[0]);
-
-	/* See if there are any PCI device definitions. */
-
-	TAILQ_FOREACH(assign, &ah, link) {
-		if (assign->section == sec) {
-			dev = find_assign("strings", assign->key);
-			if (strcasestr(assign->vals[1], "PCI") != NULL) {
-				found++;
-				break;
-			}
-		}
-	}
-
-	if (found == 0)
-		goto done;
-
-	found = 0;
-
-	if (first == 1) {
-		/* Emit start of PCI device table */
-		fprintf (ofp, "#define NDIS_PCI_DEV_TABLE");
-		first = 0;
-	}
-
-retry:
-
-	/*
-	 * Now run through all the device names listed
-	 * in the manufacturer section and dump out the
-	 * device descriptions and vendor/device IDs.
-	 */
-
-	TAILQ_FOREACH(assign, &ah, link) {
-		if (assign->section == sec) {
-			dev = find_assign("strings", assign->key);
-			/* Emit device IDs. */
-			if (strcasestr(assign->vals[1], "PCI") != NULL)
-				dump_pci_id(assign->vals[1]);
-			else
-				continue;
-			/* Emit device description */
-			fprintf (ofp, "\t\\\n\t\"%s\" },", dev->vals[0]);
-			found++;
-		}
-	}
-
-	/* Someone tried to fool us. Shame on them. */
-	if (!found) {
-		found++;
-		sec = find_section(manf->vals[0]);
-		goto retry;
-	}
-
-	/* Handle Manufacturer sections with multiple entries. */
-	manf = find_next_assign(manf);
-
-	if (manf != NULL)
-		goto nextmanf;
-
-done:
-	/* Emit end of table */
-
-	fprintf(ofp, "\n\n");
-
-	return (found);
-}
-
-static int
-dump_deviceids_pcmcia()
-{
-	struct assign *manf, *dev;
-	struct section *sec;
-	struct assign *assign;
-	char xpsec[256];
-	int first = 1, found = 0;
-
-	/* Find manufacturer name */
-	manf = find_assign("Manufacturer", NULL);
-
-nextmanf:
-
-	/* Find manufacturer section */
-	if (manf->vals[1] != NULL &&
-	    (strcasecmp(manf->vals[1], "NT.5.1") == 0 ||
-	    strcasecmp(manf->vals[1], "NTx86") == 0 ||
-	    strcasecmp(manf->vals[1], "NTx86.5.1") == 0 ||
-	    strcasecmp(manf->vals[1], "NTamd64") == 0)) {
-		/* Handle Windows XP INF files. */
-		snprintf(xpsec, sizeof(xpsec), "%s.%s",
-		    manf->vals[0], manf->vals[1]);
-		sec = find_section(xpsec);
-	} else
-		sec = find_section(manf->vals[0]);
-
-	/* See if there are any PCMCIA device definitions. */
-
-	TAILQ_FOREACH(assign, &ah, link) {
-		if (assign->section == sec) {
-			dev = find_assign("strings", assign->key);
-			if (strcasestr(assign->vals[1], "PCMCIA") != NULL) {
-				found++;
-				break;
-			}
-		}
-	}
-
-	if (found == 0)
-		goto done;
-
-	found = 0;
-
-	if (first == 1) {
-		/* Emit start of PCMCIA device table */
-		fprintf (ofp, "#define NDIS_PCMCIA_DEV_TABLE");
-		first = 0;
-	}
-
-retry:
-
-	/*
-	 * Now run through all the device names listed
-	 * in the manufacturer section and dump out the
-	 * device descriptions and vendor/device IDs.
-	 */
-
-	TAILQ_FOREACH(assign, &ah, link) {
-		if (assign->section == sec) {
-			dev = find_assign("strings", assign->key);
-			/* Emit device IDs. */
-			if (strcasestr(assign->vals[1], "PCMCIA") != NULL)
-				dump_pcmcia_id(assign->vals[1]);
-			else
-				continue;
-			/* Emit device description */
-			fprintf (ofp, "\t\\\n\t\"%s\" },", dev->vals[0]);
-			found++;
-		}
-	}
-
-	/* Someone tried to fool us. Shame on them. */
-	if (!found) {
-		found++;
-		sec = find_section(manf->vals[0]);
-		goto retry;
-	}
-
-	/* Handle Manufacturer sections with multiple entries. */
-	manf = find_next_assign(manf);
-
-	if (manf != NULL)
-		goto nextmanf;
-
-done:
-	/* Emit end of table */
-
-	fprintf(ofp, "\n\n");
-
-	return (found);
-}
-
-static int
-dump_deviceids_usb()
-{
-	struct assign *manf, *dev;
-	struct section *sec;
-	struct assign *assign;
-	char xpsec[256];
-	int first = 1, found = 0;
-
-	/* Find manufacturer name */
-	manf = find_assign("Manufacturer", NULL);
-
-nextmanf:
-
-	/* Find manufacturer section */
-	if (manf->vals[1] != NULL &&
-	    (strcasecmp(manf->vals[1], "NT.5.1") == 0 ||
-	    strcasecmp(manf->vals[1], "NTx86") == 0 ||
-	    strcasecmp(manf->vals[1], "NTx86.5.1") == 0 ||
-	    strcasecmp(manf->vals[1], "NTamd64") == 0)) {
-		/* Handle Windows XP INF files. */
-		snprintf(xpsec, sizeof(xpsec), "%s.%s",
-		    manf->vals[0], manf->vals[1]);
-		sec = find_section(xpsec);
-	} else
-		sec = find_section(manf->vals[0]);
-
-	/* See if there are any USB device definitions. */
-
-	TAILQ_FOREACH(assign, &ah, link) {
-		if (assign->section == sec) {
-			dev = find_assign("strings", assign->key);
-			if (strcasestr(assign->vals[1], "USB") != NULL) {
-				found++;
-				break;
-			}
-		}
-	}
-
-	if (found == 0)
-		goto done;
-
-	found = 0;
-
-	if (first == 1) {
-		/* Emit start of USB device table */
-		fprintf (ofp, "#define NDIS_USB_DEV_TABLE");
-		first = 0;
-	}
-
-retry:
-
-	/*
-	 * Now run through all the device names listed
-	 * in the manufacturer section and dump out the
-	 * device descriptions and vendor/device IDs.
-	 */
-
-	TAILQ_FOREACH(assign, &ah, link) {
-		if (assign->section == sec) {
-			dev = find_assign("strings", assign->key);
-			/* Emit device IDs. */
-			if (strcasestr(assign->vals[1], "USB") != NULL)
-				dump_usb_id(assign->vals[1]);
-			else
-				continue;
-			/* Emit device description */
-			fprintf (ofp, "\t\\\n\t\"%s\" },", dev->vals[0]);
-			found++;
-		}
-	}
-
-	/* Someone tried to fool us. Shame on them. */
-	if (!found) {
-		found++;
-		sec = find_section(manf->vals[0]);
-		goto retry;
-	}
-
-	/* Handle Manufacturer sections with multiple entries. */
-	manf = find_next_assign(manf);
-
-	if (manf != NULL)
-		goto nextmanf;
-
-done:
-	/* Emit end of table */
-
-	fprintf(ofp, "\n\n");
-
-	return (found);
-}
-
-static void
-dump_addreg(const char *s, int devidx)
-{
-	struct section *sec;
-	struct reg *reg;
-
-	/* Find the addreg section */
-	sec = find_section(s);
-
-	/* Dump all the keys defined in it. */
-	TAILQ_FOREACH(reg, &rh, link) {
-		/*
-		 * Keys with an empty subkey are very easy to parse,
-		 * so just deal with them here. If a parameter key
-		 * of the same name also exists, prefer that one and
-		 * skip this one.
-		 */
-		if (reg->section == sec) {
-			if (reg->subkey == NULL) {
-				fprintf(ofp, "\n\t{ \"%s\",", reg->key);
-				fprintf(ofp,"\n\t\"%s \",", reg->key);
-				fprintf(ofp, "\n\t{ \"%s\" }, %d },",
-				    reg->value == NULL ? "" :
-				    stringcvt(reg->value), devidx);
-			} else if (strncasecmp(reg->subkey,
-			    "Ndi\\params", strlen("Ndi\\params")-1) == 0 &&
-			    (reg->key != NULL && strcasecmp(reg->key,
-			    "ParamDesc") == 0))
-				dump_paramreg(sec, reg, devidx);
-		}
-	}
-
-	return;
-}
-
-static void
-dump_enumreg(const struct section *s, const struct reg *r)
-{
-	struct reg *reg;
-	char enumkey[256];
-
-	sprintf(enumkey, "%s\\enum", r->subkey);
-	TAILQ_FOREACH(reg, &rh, link) {
-		if (reg->section != s)
-			continue;
-		if (reg->subkey == NULL || strcasecmp(reg->subkey, enumkey))
-			continue;
-		fprintf(ofp, " [%s=%s]", reg->key,
-		    stringcvt(reg->value));
-	}
-	return;
-}
-
-static void
-dump_editreg(const struct section *s, const struct reg *r)
-{
-	struct reg *reg;
-
-	TAILQ_FOREACH(reg, &rh, link) {
-		if (reg->section != s)
-			continue;
-		if (reg->subkey == NULL || strcasecmp(reg->subkey, r->subkey))
-			continue;
-		if (reg->key == NULL)
-			continue;
-		if (strcasecmp(reg->key, "LimitText") == 0)
-			fprintf(ofp, " [maxchars=%s]", reg->value);
-		if (strcasecmp(reg->key, "Optional") == 0 &&
-		    strcmp(reg->value, "1") == 0)
-			fprintf(ofp, " [optional]");
-	}
-	return;
-}
-
-/* Use this for int too */
-static void
-dump_dwordreg(const struct section *s, const struct reg *r)
-{
-	struct reg *reg;
-
-	TAILQ_FOREACH(reg, &rh, link) {
-		if (reg->section != s)
-			continue;
-		if (reg->subkey == NULL || strcasecmp(reg->subkey, r->subkey))
-			continue;
-		if (reg->key == NULL)
-			continue;
-		if (strcasecmp(reg->key, "min") == 0)
-			fprintf(ofp, " [min=%s]", reg->value);
-		if (strcasecmp(reg->key, "max") == 0)
-			fprintf(ofp, " [max=%s]", reg->value);
-	}
-	return;
-}
-
-static void
-dump_defaultinfo(const struct section *s, const struct reg *r, int devidx)
-{
-	struct reg *reg;
-	TAILQ_FOREACH(reg, &rh, link) {
-		if (reg->section != s)
-			continue;
-		if (reg->subkey == NULL || strcasecmp(reg->subkey, r->subkey))
-			continue;
-		if (reg->key == NULL || strcasecmp(reg->key, "Default"))
-			continue;
-		fprintf(ofp, "\n\t{ \"%s\" }, %d },", reg->value == NULL ? "" :
-		    stringcvt(reg->value), devidx);
-		return;
-	}
-	/* Default registry entry missing */
-	fprintf(ofp, "\n\t{ \"\" }, %d },", devidx);
-	return;
-}
-
-static void
-dump_paramdesc(const struct section *s, const struct reg *r)
-{
-	struct reg *reg;
-	TAILQ_FOREACH(reg, &rh, link) {
-		if (reg->section != s)
-			continue;
-		if (reg->subkey == NULL || strcasecmp(reg->subkey, r->subkey))
-			continue;
-		if (reg->key == NULL || strcasecmp(reg->key, "ParamDesc"))
-			continue;
-		fprintf(ofp, "\n\t\"%s", stringcvt(r->value));
-			break;
-	}
-	return;
-}
-
-static void
-dump_typeinfo(const struct section *s, const struct reg *r)
-{
-	struct reg *reg;
-	TAILQ_FOREACH(reg, &rh, link) {
-		if (reg->section != s)
-			continue;
-		if (reg->subkey == NULL || strcasecmp(reg->subkey, r->subkey))
-			continue;
-		if (reg->key == NULL)
-			continue;
-		if (strcasecmp(reg->key, "type"))
-			continue;
-		if (strcasecmp(reg->value, "dword") == 0 ||
-		    strcasecmp(reg->value, "int") == 0)
-			dump_dwordreg(s, r);
-		if (strcasecmp(reg->value, "enum") == 0)
-			dump_enumreg(s, r);
-		if (strcasecmp(reg->value, "edit") == 0)
-			dump_editreg(s, r);
-	}
-	return;
-}
-
-static void
-dump_paramreg(const struct section *s, const struct reg *r, int devidx)
-{
-	const char *keyname;
-
-	keyname = r->subkey + strlen("Ndi\\params\\");
-	fprintf(ofp, "\n\t{ \"%s\",", keyname);
-	dump_paramdesc(s, r);
-	dump_typeinfo(s, r);
-	fprintf(ofp, "\",");
-	dump_defaultinfo(s, r, devidx);
-
-	return;
-}
-
-static void
-dump_regvals(void)
-{
-	struct assign *manf, *dev;
-	struct section *sec;
-	struct assign *assign;
-	char sname[256];
-	int found = 0, i, is_winxp = 0, is_winnt = 0, devidx = 0;
-
-	/* Find signature to check for special case of WinNT. */
-	assign = find_assign("version", "signature");
-	if (strcasecmp(assign->vals[0], "$windows nt$") == 0)
-		is_winnt++;
-
-	/* Emit start of block */
-	fprintf (ofp, "ndis_cfg ndis_regvals[] = {");
-
-	/* Find manufacturer name */
-	manf = find_assign("Manufacturer", NULL);
-
-nextmanf:
-
-	/* Find manufacturer section */
-	if (manf->vals[1] != NULL &&
-	    (strcasecmp(manf->vals[1], "NT.5.1") == 0 ||
-	    strcasecmp(manf->vals[1], "NTx86") == 0 ||
-	    strcasecmp(manf->vals[1], "NTx86.5.1") == 0 ||
-	    strcasecmp(manf->vals[1], "NTamd64") == 0)) {
-		is_winxp++;
-		/* Handle Windows XP INF files. */
-		snprintf(sname, sizeof(sname), "%s.%s",
-		    manf->vals[0], manf->vals[1]);
-		sec = find_section(sname);
-	} else
-		sec = find_section(manf->vals[0]);
-
-retry:
-
-	TAILQ_FOREACH(assign, &ah, link) {
-		if (assign->section == sec) {
-			found++;
-			/*
-			 * Find all the AddReg sections.
-			 * Look for section names with .NT, unless
-			 * this is a WinXP .INF file.
-			 */
-
-			if (is_winxp) {
-				sprintf(sname, "%s.NTx86", assign->vals[0]);
-				dev = find_assign(sname, "AddReg");
-				if (dev == NULL) {
-					sprintf(sname, "%s.NT",
-					    assign->vals[0]);
-					dev = find_assign(sname, "AddReg");
-				}
-				if (dev == NULL)
-					dev = find_assign(assign->vals[0],
-					    "AddReg");
-			} else {
-				sprintf(sname, "%s.NT", assign->vals[0]);
-				dev = find_assign(sname, "AddReg");
-				if (dev == NULL && is_winnt)
-					dev = find_assign(assign->vals[0],
-					    "AddReg");
-			}
-			/* Section not found. */
-			if (dev == NULL)
-				continue;
-			for (i = 0; i < W_MAX; i++) {
-				if (dev->vals[i] != NULL)
-					dump_addreg(dev->vals[i], devidx);
-			}
-			devidx++;
-		}
-	}
-
-	if (!found) {
-		sec = find_section(manf->vals[0]);
-		is_winxp = 0;
-		found++;
-		goto retry;
-	}
-
-	manf = find_next_assign(manf);
-
-	if (manf != NULL)
-		goto nextmanf;
-
-	fprintf(ofp, "\n\t{ NULL, NULL, { 0 }, 0 }\n};\n\n");
-
-	return;
-}
-
-void
-assign_add (const char *a)
-{
-	struct assign *assign;
-	int i;
-
-	assign = malloc(sizeof(struct assign));
-	bzero(assign, sizeof(struct assign));
-	assign->section = TAILQ_LAST(&sh, section_head);
-	assign->key = sstrdup(a);
-	for (i = 0; i < idx; i++)
-		assign->vals[(idx - 1) - i] = sstrdup(words[i]);
-	TAILQ_INSERT_TAIL(&ah, assign, link);
-
-	clear_words();
-	return;
-}
-
-void
-define_add (const char *d __unused)
-{
-#ifdef notdef
-	fprintf(stderr, "define \"%s\"\n", d);
-#endif
-	return;
-}
-
-static char *
-sstrdup(const char *str)
-{
-	if (str != NULL && strlen(str))
-		return (strdup(str));
-	return (NULL);
-}
-
-static int
-satoi (const char *nptr)
-{
-	if (nptr != NULL && strlen(nptr))
-		return (atoi(nptr));
-	return (0);
-}
-
-void
-regkey_add (const char *r)
-{
-	struct reg *reg;
-
-	reg = malloc(sizeof(struct reg));
-	bzero(reg, sizeof(struct reg));
-	reg->section = TAILQ_LAST(&sh, section_head);
-	reg->root = sstrdup(r);
-	reg->subkey = sstrdup(words[3]);
-	reg->key = sstrdup(words[2]);
-	reg->flags = satoi(words[1]);
-	reg->value = sstrdup(words[0]);
-	TAILQ_INSERT_TAIL(&rh, reg, link);
-
-	free(__DECONST(char *, r));
-	clear_words();
-	return;
-}
-
-void
-push_word (const char *w)
-{
-
-	if (idx == W_MAX) {
-		fprintf(stderr, "too many words; try bumping W_MAX in inf.h\n");
-		exit(1);
-	}
-
-	if (w && strlen(w))
-		words[idx++] = w;
-	else
-		words[idx++] = NULL;
-	return;
-}
-
-void
-clear_words (void)
-{
-	int i;
-
-	for (i = 0; i < idx; i++) {
-		if (words[i]) {
-			free(__DECONST(char *, words[i]));
-		}
-	}
-	idx = 0;
-	bzero(words, sizeof(words));
-	return;
-}
diff --git a/usr.sbin/ndiscvt/inf.h b/usr.sbin/ndiscvt/inf.h
deleted file mode 100644
index ba08d674eeac..000000000000
--- a/usr.sbin/ndiscvt/inf.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * $Id: inf.h,v 1.3 2003/11/30 21:58:16 winter Exp $
- *
- * $FreeBSD$
- */
-
-#define W_MAX	32
-
-struct section {
-	const char *	name;
-
-	TAILQ_ENTRY(section)	link;
-};
-TAILQ_HEAD(section_head, section);
-
-struct assign {
-	struct section	*section;
-
-	const char *	key;
-	const char *	vals[W_MAX];
-
-	TAILQ_ENTRY(assign)	link;
-};
-TAILQ_HEAD(assign_head, assign);
-
-struct reg {
-	struct section *section;
-
-	const char *	root;
-	const char *	subkey;
-	const char *	key;
-	u_int		flags;
-	const char *	value;
-
-	TAILQ_ENTRY(reg)	link;
-};
-TAILQ_HEAD(reg_head, reg);
-
-#define	FLG_ADDREG_TYPE_SZ		0x00000000
-#define	FLG_ADDREG_BINVALUETYPE		0x00000001
-#define	FLG_ADDREG_NOCLOBBER		0x00000002
-#define	FLG_ADDREG_DELVAL		0x00000004
-#define	FLG_ADDREG_APPEND		0x00000008
-#define	FLG_ADDREG_KEYONLY		0x00000010
-#define	FLG_ADDREG_OVERWRITEONLY	0x00000020
-#define	FLG_ADDREG_64BITKEY		0x00001000
-#define	FLG_ADDREG_KEYONLY_COMMON	0x00002000
-#define	FLG_ADDREG_32BITKEY		0x00004000
-#define	FLG_ADDREG_TYPE_MULTI_SZ	0x00010000
-#define	FLG_ADDREG_TYPE_EXPAND_SZ	0x00020000
-#define	FLG_ADDREG_TYPE_DWORD		0x00010001
-#define	FLG_ADDREG_TYPE_NONE		0x00020001
-
-extern void	section_add	(const char *);
-extern void	assign_add	(const char *);
-extern void	define_add	(const char *);
-extern void	regkey_add	(const char *);
-
-extern void	push_word	(const char *);
-extern void	clear_words	(void);
-extern int	inf_parse	(FILE *, FILE *);
diff --git a/usr.sbin/ndiscvt/ndiscvt.8 b/usr.sbin/ndiscvt/ndiscvt.8
deleted file mode 100644
index f4974958e005..000000000000
--- a/usr.sbin/ndiscvt/ndiscvt.8
+++ /dev/null
@@ -1,283 +0,0 @@
-.\" Copyright (c) 2003
-.\"	Bill Paul <wpaul@windriver.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.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by Bill Paul.
-.\" 4. Neither the name of the author nor the names of any co-contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"   without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
-.\" 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.
-.\"
-.\" $FreeBSD$
-.\"
-.Dd December 10, 2003
-.Dt NDISCVT 8
-.Os
-.Sh NAME
-.Nm ndiscvt
-.Nd convert
-.Tn Windows\[rg]
-NDIS drivers for use with FreeBSD
-.Sh SYNOPSIS
-.Nm
-.Op Fl O
-.Op Fl i Ar inffile
-.Fl s Ar sysfile
-.Op Fl n Ar devname
-.Op Fl o Ar outfile
-.Nm
-.Op Fl f Ar firmfile
-.Sh DESCRIPTION
-The
-.Nm
-utility transforms a
-.Tn Windows\[rg]
-NDIS driver into a data file which
-is used to build an
-.Xr ndis 4
-compatibility driver module.
-.Tn Windows\[rg]
-drivers consist of two main parts: a
-.Pa .SYS
-file, which contains the actual driver executable code,
-and an
-.Pa .INF
-file, which provides the
-.Tn Windows\[rg]
-installer with device
-identifier information and a list of driver-specific registry keys.
-The
-.Nm
-utility can convert these files into a header file that is compiled
-into
-.Pa if_ndis.c
-to create an object code module that can be linked into
-the
-.Fx
-kernel.
-.Pp
-The
-.Pa .INF
-file is typically required since only it contains device
-identification data such as PCI vendor and device IDs or PCMCIA
-identifier strings.
-The
-.Pa .INF
-file may be optionally omitted however,
-in which case the
-.Nm
-utility will only perform the conversion of the
-.Pa .SYS
-file.
-This is useful for debugging purposes only.
-.Sh OPTIONS
-The options are as follows:
-.Bl -tag -width indent
-.It Fl i Ar inffile
-Open and parse the specified
-.Pa .INF
-file when performing conversion.
-The
-.Nm
-utility will parse this file and emit a device identification
-structure and registry key configuration structures which will be
-used by the
-.Xr ndis 4
-driver and
-.Xr ndisapi 9
-kernel subsystem.
-If this is omitted,
-.Nm
-will emit a dummy configuration structure only.
-.It Fl s Ar sysfile
-Open and parse the specified
-.Pa .SYS
-file.
-This file must contain a
-.Tn Windows\[rg]
-driver image.
-The
-.Nm
-utility will perform some manipulation of the sections within the
-executable file to make runtime linking within the kernel a little
-easier and then convert the image into a data array.
-.It Fl n Ar devname
-Specify an alternate name for the network device/interface which will
-be created when the driver is instantiated.
-If you need to load more
-than one NDIS driver into your system (i.e., if you have two different
-network cards in your system which require NDIS driver support), each
-module you create must have a unique name.
-Device can not be larger than
-.Dv IFNAMSIZ .
-If no name is specified, the driver will use the
-default a default name
-.Pq Dq Li ndis .
-.It Fl o Ar outfile
-Specify the output file in which to place the resulting data.
-This can be any file pathname.
-If
-.Ar outfile
-is a single dash
-.Pq Sq Fl ,
-the data will be written to the standard output.
-The
-.Pa if_ndis.c
-module expects to find the driver data in a file called
-.Pa ndis_driver_data.h ,
-so it is recommended that this name be used.
-.It Fl O
-Generate both an
-.Pa ndis_driver_data.h
-file and
-an
-.Pa ndis_driver.data.o
-file.
-The latter file will contain a copy of the
-.Tn Windows\[rg]
-.Pa .SYS
-driver image encoded as a
-.Fx
-ELF object file
-(created with
-.Xr objcopy 1 ) .
-Turning the
-.Tn Windows\[rg]
-driver image directly into an object code file saves disk space
-and compilation time.
-.It Fl f Ar firmfile
-A few NDIS drivers come with additional files that the core
-driver module will load during initialization time.
-Typically,
-these files contain firmware which the driver will transfer to
-the device in order to make it fully operational.
-In
-.Tn Windows\[rg] ,
-these files are usually just copied into one of the system
-directories along with the driver itself.
-.Pp
-In
-.Fx
-there are two mechanism for loading these files.
-If the driver
-is built as a loadable kernel module which is loaded after the
-kernel has finished booting
-(and after the root file system has
-been mounted),
-the extra files can simply be copied to the
-.Pa /compat/ndis
-directory, and they will be loaded into the kernel on demand when the
-driver needs them.
-.Pp
-If however the driver is required to bootstrap the system
-(i.e., if
-the NDIS-based network interface is to be used for diskless/PXE
-booting),
-the files need to be pre-loaded by the bootstrap
-loader in order to be accessible, since the driver will need them
-before the root file system has been mounted.
-However, the bootstrap
-loader is only able to load files that are shared
-.Fx
-binary objects.
-.Pp
-The
-.Fl f
-flag can be used to convert an arbitrary file
-.Ar firmfile
-into shared object format
-(the actual conversion is done using
-the
-.Xr objcopy 1
-and
-.Xr ld 1
-commands).
-The resulting files can then be copied to the
-.Pa /boot/kernel
-directory, and can be pre-loaded directly from the boot loader
-prompt, or automatically by editing the
-.Xr loader.conf 5
-file.
-If desired, the files can also be loaded into memory
-at runtime using the
-.Xr kldload 8
-command.
-.Pp
-When an NDIS driver tries to open an external file, the
-.Xr ndisapi 9
-code will first search for a loaded kernel module that matches the
-name specified in the open request, and if that fails, it will then
-try to open the file from the
-.Pa /compat/ndis
-directory as well.
-Note that during kernel bootstrap, the ability
-to open files from
-.Pa /compat/ndis
-is disabled: only the module search will be performed.
-.Pp
-When using the
-.Fl f
-flag,
-.Nm
-will generate both a relocatable object file
-(with a
-.Pa .o
-extension)
-and a shared object file
-(with a
-.Pa .ko
-extension).
-The shared object is the one that should be placed in
-the
-.Pa /boot/kernel
-directory.
-The relocatable object file is useful if the user wishes
-to create a completely static kernel image: the object file can be
-linked into the kernel directly along with the driver itself.
-Some
-editing of the kernel configuration files will be necessary in order
-to have the extra object included in the build.
-.El
-.Sh SEE ALSO
-.Xr ld 1 ,
-.Xr objcopy 1 ,
-.Xr ndis 4 ,
-.Xr kldload 8
-.Sh HISTORY
-The
-.Nm
-utility first appeared in
-.Fx 5.3 .
-.Sh AUTHORS
-.An -nosplit
-The
-.Nm
-utility was written by
-.An Bill Paul Aq Mt wpaul@windriver.com .
-The
-.Xr lex 1
-and
-.Xr yacc 1
-.Pa INF
-file parser was written by
-.An Matthew Dodd Aq Mt mdodd@FreeBSD.org .
diff --git a/usr.sbin/ndiscvt/ndiscvt.c b/usr.sbin/ndiscvt/ndiscvt.c
deleted file mode 100644
index 1b7660700786..000000000000
--- a/usr.sbin/ndiscvt/ndiscvt.c
+++ /dev/null
@@ -1,436 +0,0 @@
-/*
- * SPDX-License-Identifier: BSD-4-Clause
- *
- * Copyright (c) 2003
- *	Bill Paul <wpaul@windriver.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <libgen.h>
-#include <err.h>
-#include <ctype.h>
-
-#include <compat/ndis/pe_var.h>
-
-#include "inf.h"
-
-static int insert_padding(void **, int *);
-extern const char *__progname;
-
-/*
- * Sections within Windows PE files are defined using virtual
- * and physical address offsets and virtual and physical sizes.
- * The physical values define how the section data is stored in
- * the executable file while the virtual values describe how the
- * sections will look once loaded into memory. It happens that
- * the linker in the Microsoft(r) DDK will tend to generate
- * binaries where the virtual and physical values are identical,
- * which means in most cases we can just transfer the file
- * directly to memory without any fixups. This is not always
- * the case though, so we have to be prepared to handle files
- * where the in-memory section layout differs from the disk file
- * section layout.
- *
- * There are two kinds of variations that can occur: the relative
- * virtual address of the section might be different from the
- * physical file offset, and the virtual section size might be
- * different from the physical size (for example, the physical
- * size of the .data section might be 1024 bytes, but the virtual
- * size might be 1384 bytes, indicating that the data section should
- * actually use up 1384 bytes in RAM and be padded with zeros). What we
- * do is read the original file into memory and then make an in-memory
- * copy with all of the sections relocated, re-sized and zero padded
- * according to the virtual values specified in the section headers.
- * We then emit the fixed up image file for use by the if_ndis driver.
- * This way, we don't have to do the fixups inside the kernel.
- */
-
-#define ROUND_DOWN(n, align)    (((uintptr_t)n) & ~((align) - 1l))
-#define ROUND_UP(n, align)      ROUND_DOWN(((uintptr_t)n) + (align) - 1l, \
-                                (align))
-
-#define SET_HDRS(x)	\
-	dos_hdr = (image_dos_header *)x;				\
-	nt_hdr = (image_nt_header *)(x + dos_hdr->idh_lfanew);		\
-	sect_hdr = IMAGE_FIRST_SECTION(nt_hdr);
-
-static int
-insert_padding(void **imgbase, int *imglen)
-{
-        image_section_header	*sect_hdr;
-        image_dos_header	*dos_hdr;
-        image_nt_header		*nt_hdr;
-	image_optional_header	opt_hdr;
-        int			i = 0, sections, curlen = 0;
-	int			offaccum = 0, oldraddr, oldrlen;
-	uint8_t			*newimg, *tmp;
-
-	newimg = malloc(*imglen);
-
-	if (newimg == NULL)
-		return(ENOMEM);
-
-	bcopy(*imgbase, newimg, *imglen);
-	curlen = *imglen;
-
-	if (pe_get_optional_header((vm_offset_t)newimg, &opt_hdr))
-		return(0);
-
-        sections = pe_numsections((vm_offset_t)newimg);
-
-	SET_HDRS(newimg);
-
-	for (i = 0; i < sections; i++) {
-		oldraddr = sect_hdr->ish_rawdataaddr;
-		oldrlen = sect_hdr->ish_rawdatasize;
-		sect_hdr->ish_rawdataaddr = sect_hdr->ish_vaddr;
-		offaccum += ROUND_UP(sect_hdr->ish_vaddr - oldraddr,
-		    opt_hdr.ioh_filealign);
-		offaccum +=
-		    ROUND_UP(sect_hdr->ish_misc.ish_vsize,
-			     opt_hdr.ioh_filealign) -
-		    ROUND_UP(sect_hdr->ish_rawdatasize,
-			     opt_hdr.ioh_filealign);
-		tmp = realloc(newimg, *imglen + offaccum);
-		if (tmp == NULL) {
-			free(newimg);
-			return(ENOMEM);
-		}
-		newimg = tmp;
-		SET_HDRS(newimg);
-		sect_hdr += i;
-		bzero(newimg + sect_hdr->ish_rawdataaddr,
-		    ROUND_UP(sect_hdr->ish_misc.ish_vsize,
-		    opt_hdr.ioh_filealign));
-		bcopy((uint8_t *)(*imgbase) + oldraddr,
-		    newimg + sect_hdr->ish_rawdataaddr, oldrlen);
-		sect_hdr++;
-	}
-
-	free(*imgbase);
-
-	*imgbase = newimg;
-	*imglen += offaccum;
-
-	return(0);
-}
-
-static void
-usage(void)
-{
-	fprintf(stderr, "Usage: %s [-O] [-i <inffile>] -s <sysfile> "
-	    "[-n devname] [-o outfile]\n", __progname);
-	fprintf(stderr, "       %s -f <firmfile>\n", __progname);
-
-	exit(1);
-}
-
-static void
-bincvt(char *sysfile, char *outfile, void *img, int fsize)
-{
-	char			*ptr;
-	char			tname[] = "/tmp/ndiscvt.XXXXXX";
-	char			sysbuf[1024];
-	FILE			*binfp;
-
-	mkstemp(tname);
-
-	binfp = fopen(tname, "a+");
-	if (binfp == NULL)
-		err(1, "opening %s failed", tname);
-
-	if (fwrite(img, fsize, 1, binfp) != 1)
-		err(1, "failed to output binary image");
-
-	fclose(binfp);
-
-	outfile = strdup(basename(outfile));
-	if (strchr(outfile, '.'))
-		*strchr(outfile, '.') = '\0';
-
-	snprintf(sysbuf, sizeof(sysbuf),
-#ifdef __i386__
-	    "objcopy -I binary -O elf32-i386-freebsd -B i386 %s %s.o\n",
-#endif
-#ifdef __amd64__
-	    "objcopy -I binary -O elf64-x86-64-freebsd -B i386 %s %s.o\n",
-#endif
-	    tname, outfile);
-	printf("%s", sysbuf);
-	system(sysbuf);
-	unlink(tname);
-
-	ptr = tname;
-	while (*ptr) {
-		if (*ptr == '/' || *ptr == '.')
-			*ptr = '_';
-		ptr++;
-	}
-
-	snprintf(sysbuf, sizeof(sysbuf),
-	    "objcopy --redefine-sym _binary_%s_start=ndis_%s_drv_data_start "
-	    "--strip-symbol _binary_%s_size "
-	    "--redefine-sym _binary_%s_end=ndis_%s_drv_data_end %s.o %s.o\n",
-	    tname, sysfile, tname, tname, sysfile, outfile, outfile);
-	printf("%s", sysbuf);
-	system(sysbuf);
-	free(outfile);
-
-	return;
-}
-   
-static void
-firmcvt(char *firmfile)
-{
-	char			*basefile, *outfile, *ptr;
-	char			sysbuf[1024];
-
-	outfile = strdup(basename(firmfile));
-	basefile = strdup(outfile);
-
-	snprintf(sysbuf, sizeof(sysbuf),
-#ifdef __i386__
-	    "objcopy -I binary -O elf32-i386-freebsd -B i386 %s %s.o\n",
-#endif
-#ifdef __amd64__
-	    "objcopy -I binary -O elf64-x86-64-freebsd -B i386 %s %s.o\n",
-#endif
-	    firmfile, outfile);
-	printf("%s", sysbuf);
-	system(sysbuf);
-
-	ptr = firmfile;
-	while (*ptr) {
-		if (*ptr == '/' || *ptr == '.')
-			*ptr = '_';
-		ptr++;
-	}
-	ptr = basefile;
-	while (*ptr) {
-		if (*ptr == '/' || *ptr == '.')
-			*ptr = '_';
-		else
-			*ptr = tolower(*ptr);
-		ptr++;
-	}
-
-	snprintf(sysbuf, sizeof(sysbuf),
-	    "objcopy --redefine-sym _binary_%s_start=%s_start "
-	    "--strip-symbol _binary_%s_size "
-	    "--redefine-sym _binary_%s_end=%s_end %s.o %s.o\n",
-	    firmfile, basefile, firmfile, firmfile,
-	    basefile, outfile, outfile);
-	ptr = sysbuf;
-	printf("%s", sysbuf);
-	system(sysbuf);
-
-	snprintf(sysbuf, sizeof(sysbuf),
-	    "ld -Bshareable -d -warn-common -o %s.ko %s.o\n",
-	    outfile, outfile);
-	printf("%s", sysbuf);
-	system(sysbuf);
-
-	free(basefile);
-
-	exit(0);
-}
-
-int
-main(int argc, char *argv[])
-{
-	FILE			*fp, *outfp;
-	int			i, bin = 0;
-	void			*img;
-	int			n, fsize, cnt;
-	unsigned char		*ptr;
-	char			*inffile = NULL, *sysfile = NULL;
-	char			*outfile = NULL, *firmfile = NULL;
-	char			*dname = NULL;
-	int			ch;
-
-	while((ch = getopt(argc, argv, "i:s:o:n:f:O")) != -1) {
-		switch(ch) {
-		case 'f':
-			firmfile = optarg;
-			break;
-		case 'i':
-			inffile = optarg;
-			break;
-		case 's':
-			sysfile = optarg;
-			break;
-		case 'o':
-			outfile = optarg;
-			break;
-		case 'n':
-			dname = optarg;
-			break;
-		case 'O':
-			bin = 1;
-			break;
-		default:
-			usage();
-			break;
-		}
-	}
-
-	if (firmfile != NULL)
-		firmcvt(firmfile);
-
-	if (sysfile == NULL)
-		usage();
-
-	/* Open the .SYS file and load it into memory */
-	fp = fopen(sysfile, "r");
-	if (fp == NULL)
-		err(1, "opening .SYS file '%s' failed", sysfile);
-	fseek (fp, 0L, SEEK_END);
-	fsize = ftell (fp);
-	rewind (fp);
-	img = calloc(fsize, 1);
-	n = fread (img, fsize, 1, fp);
-	if (n == 0)
-		err(1, "reading .SYS file '%s' failed", sysfile);
-
-	fclose(fp);
-
-	if (insert_padding(&img, &fsize)) {
-		fprintf(stderr, "section relocation failed\n");
-		exit(1);
-	}
-
-	if (outfile == NULL || strcmp(outfile, "-") == 0)
-		outfp = stdout;
-	else {
-		outfp = fopen(outfile, "w");
-		if (outfp == NULL)
-			err(1, "opening output file '%s' failed", outfile);
-	}
-
-	fprintf(outfp, "\n/*\n");
-	fprintf(outfp, " * Generated from %s and %s (%d bytes)\n",
-	    inffile == NULL ? "<notused>" : inffile, sysfile, fsize);
-	fprintf(outfp, " */\n\n");
-
-	if (dname != NULL) {
-		if (strlen(dname) > IFNAMSIZ)
-			err(1, "selected device name '%s' is "
-			    "too long (max chars: %d)", dname, IFNAMSIZ);
-		fprintf (outfp, "#define NDIS_DEVNAME \"%s\"\n", dname);
-		fprintf (outfp, "#define NDIS_MODNAME %s\n\n", dname);
-	}
-
-	if (inffile == NULL) {
-		fprintf (outfp, "#ifdef NDIS_REGVALS\n");
-		fprintf (outfp, "ndis_cfg ndis_regvals[] = {\n");
-        	fprintf (outfp, "\t{ NULL, NULL, { 0 }, 0 }\n");
-		fprintf (outfp, "#endif /* NDIS_REGVALS */\n");
-
-		fprintf (outfp, "};\n\n");
-	} else {
-		fp = fopen(inffile, "r");
-		if (fp == NULL)
-			err(1, "opening .INF file '%s' failed", inffile);
-
-
-		if (inf_parse(fp, outfp) != 0)
-			errx(1, "creating .INF file - no entries created, are you using the correct files?");
-		fclose(fp);
-	}
-
-	fprintf(outfp, "\n#ifdef NDIS_IMAGE\n");
-
-	if (bin) {
-		sysfile = strdup(basename(sysfile));
-		ptr = (unsigned char *)sysfile;
-		while (*ptr) {
-			if (*ptr == '.')
-				*ptr = '_';
-			ptr++;
-		}
-		fprintf(outfp,
-		    "\nextern unsigned char ndis_%s_drv_data_start[];\n",
-		    sysfile);
-		fprintf(outfp, "static unsigned char *drv_data = "
-		    "ndis_%s_drv_data_start;\n\n", sysfile);
-		bincvt(sysfile, outfile, img, fsize);
-		goto done;
-	}
-
-
-	fprintf(outfp, "\nextern unsigned char drv_data[];\n\n");
-
-	fprintf(outfp, "__asm__(\".data\");\n");
-	fprintf(outfp, "__asm__(\".globl  drv_data\");\n");
-	fprintf(outfp, "__asm__(\".type   drv_data, @object\");\n");
-	fprintf(outfp, "__asm__(\".size   drv_data, %d\");\n", fsize);
-	fprintf(outfp, "__asm__(\"drv_data:\");\n");
-
-	ptr = img;
-	cnt = 0;
-	while(cnt < fsize) {
-		fprintf (outfp, "__asm__(\".byte ");
-		for (i = 0; i < 10; i++) {
-			cnt++;
-			if (cnt == fsize) {
-				fprintf(outfp, "0x%.2X\");\n", ptr[i]);
-				goto done;
-			} else {
-				if (i == 9)
-					fprintf(outfp, "0x%.2X\");\n", ptr[i]);
-				else
-					fprintf(outfp, "0x%.2X, ", ptr[i]);
-			}
-		}
-		ptr += 10;
-	}
-
-done:
-
-	fprintf(outfp, "#endif /* NDIS_IMAGE */\n");
-
-	if (fp != NULL)
-		fclose(fp);
-	fclose(outfp);
-	free(img);
-	exit(0);
-}
diff --git a/usr.sbin/ndiscvt/ndisgen.8 b/usr.sbin/ndiscvt/ndisgen.8
deleted file mode 100644
index 2fb4f401596e..000000000000
--- a/usr.sbin/ndiscvt/ndisgen.8
+++ /dev/null
@@ -1,86 +0,0 @@
-.\" Copyright (c) 2005
-.\"	Bill Paul <wpaul@windriver.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.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by Bill Paul.
-.\" 4. Neither the name of the author nor the names of any co-contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"   without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
-.\" 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.
-.\"
-.\" $FreeBSD$
-.\"
-.Dd April 24, 2005
-.Dt NDISGEN 8
-.Os
-.Sh NAME
-.Nm ndisgen
-.Nd generate a FreeBSD driver module from a
-.Tn Windows\[rg]
-NDIS driver distribution
-.Sh SYNOPSIS
-.Nm
-.Op Ar /path/to/INF /path/to/SYS
-.Sh DESCRIPTION
-The
-.Nm
-script uses the
-.Xr ndiscvt 8
-utility and other tools to generate a
-.Fx
-loadable driver module
-and a static ELF object module from a
-.Tn Windows\[rg]
-NDIS driver, for use with the
-.Xr ndis 4
-compatibility module.
-.Pp
-The
-.Nm
-script is interactive and contains its own help section.
-Unless the paths to both files are supplied on the command line,
-the script will prompt the user for the
-.Pa .INF
-and
-.Pa .SYS
-files needed to generate the
-.Fx
-driver module.
-The script will also prompt for
-any firmware or other external files needed.
-.Sh SEE ALSO
-.Xr ld 1 ,
-.Xr objcopy 1 ,
-.Xr ndis 4 ,
-.Xr kldload 8 ,
-.Xr ndiscvt 8
-.Sh HISTORY
-The
-.Nm
-utility first appeared in
-.Fx 6.0 .
-.Sh AUTHORS
-The
-.Nm
-utility was written by
-.An Bill Paul Aq Mt wpaul@windriver.com .
diff --git a/usr.sbin/ndiscvt/ndisgen.sh b/usr.sbin/ndiscvt/ndisgen.sh
deleted file mode 100644
index c5a0dbd4fc46..000000000000
--- a/usr.sbin/ndiscvt/ndisgen.sh
+++ /dev/null
@@ -1,556 +0,0 @@
-#!/bin/sh
-#
-# SPDX-License-Identifier: BSD-4-Clause
-#
-# Copyright (c) 2005
-#	Bill Paul <wpaul@windriver.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.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#	This product includes software developed by Bill Paul.
-# 4. Neither the name of the author nor the names of any co-contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
-# 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.
-#
-# $FreeBSD$
-#
-
-header () {
-clear
-echo "	=================================================================="
-echo "	------------------ Windows(r) driver converter -------------------"
-echo "	=================================================================="
-echo ""
-}
-
-mainmenu() {
-header
-echo "	This script is designed to guide you through the process"
-echo "	of converting a Windows(r) binary driver module and .INF"
-echo "	specification file into a FreeBSD ELF kernel module for use"
-echo "	with the NDIS compatibility system."
-echo ""
-echo "	The following options are available:"
-echo ""
-echo "	1] Learn about the NDIS compatibility system"
-echo "	2] Convert individual firmware files"
-echo "	3] Convert driver"
-echo "	4] Exit"
-echo ""
-echo -n "	Enter your selection here and press return: "
-read KEYPRESS
-return
-}
-
-
-help1 () {
-header
-echo "				General information"
-echo ""
-echo "	The NDIS compatibility system is designed to let you use Windows(r)"
-echo "	binary drivers for networking devices with FreeBSD, in cases where"
-echo "	a native FreeBSD driver is not available due to hardware manufacturer"
-echo "	oversight or stupidity. NDIS stands for Network Driver Interface"
-echo "	Standard, and refers to the programming model used to write Windows(r)"
-echo "	network drivers. (These are often called \"NDIS miniport\" drivers.)"
-echo ""
-echo "	In order to use your network device in NDIS compatibility mode,"
-echo "	you need the Windows(r) driver that goes with it. Also, the driver"
-echo "	must be compiled for the same architecture as the release of FreeBSD"
-echo "	you have installed. At this time, the i386 and amd64 architectures"
-echo "	are both supported. Note that you cannot use a Windows/i386 driver"
-echo "	with FreeBSD/amd64: you must obtain a Windows/amd64 driver."
-echo ""
-echo -n "	Press return to continue... "
-read KEYPRESS
-return
-}
-
-help2() {
-header
-echo "				Where to get drivers"
-echo ""
-echo "	If you purchased your network card separately from your computer,"
-echo "	there should have been a driver distribution CD included with the"
-echo "	card which contains Windows(r) drivers. The NDIS compatibility"
-echo "	system is designed to emulate the NDIS API of a couple of different"
-echo "	Windows(r) releases, however it works best with drivers designed"
-echo "	for NDIS 5.0 or later. Drivers distributed for Windows 2000 should"
-echo "	work; however, for best results you should use a driver designed"
-echo "	for Windows XP or Windows Server 2003."
-echo ""
-echo "	If your card was supplied with your computer, or is a built-in device,"
-echo "	drivers may have been included on a special driver bundle CD shipped"
-echo "	with the computer."
-echo ""
-echo "	If you don't have a driver CD, you should be able to find a driver"
-echo "	kit on the card or computer vendor's web site."
-echo ""
-echo -n "	Press return to continue... "
-read KEYPRESS
-return
-}
-
-help3 () {
-header
-echo "				What files do I need?"
-echo ""
-echo "	In most cases, you will need only two files: a .INF file and a .SYS"
-echo "	file. The .INF file is a text file used by the Windows(r) installer to"
-echo "	perform the driver installation. It contains information that tells"
-echo "	the installer what devices the driver supports and what registry keys"
-echo "	should be created to control driver configuration. The .SYS file"
-echo "	is the actual driver executable code in Windows(r) Portable Executable"
-echo "	(PE) format. Note that sometimes the .INF file is supplied in Unicode"
-echo "	format. Unicode .INF files must be converted to ASCII form with the"
-echo "	iconv(1) utility before this installer script can use them."
-echo "	Occasionally, a driver may require firmware or register setup"
-echo "	files that are external to the main .SYS file. These are provided"
-echo "	on the same CD with the driver itself, and sometimes have a .BIN"
-echo "	extension, though they can be named almost anything. You will need"
-echo "	these additional files to make your device work with the NDIS"
-echo "	compatibility system as well."
-echo ""
-echo -n "	Press return to continue... "
-read KEYPRESS
-return
-}
-
-help4 () {
-header
-echo "				How does it all work?"
-echo ""
-echo "	The installer script uses the ndiscvt(1) utility to convert the .INF,"
-echo "	.SYS and optional firmware files into a FreeBSD kernel loadable module"
-echo "	(.ko) file. This module can be loaded via the kldload(8) utility or"
-echo "	loaded automatically via the /boot/loader.conf file. The ndiscvt(1)"
-echo "	utility extracts the device ID information and registry key data"
-echo "	from the .INF file and converts it into a C header file. It also uses"
-echo "	the objcopy(1) utility to convert the .SYS file and optional firmware"
-echo "	files into ELF objects. The header file is compiled into a small C"
-echo "	stub file which contains a small amount of code to interface with"
-echo "	the FreeBSD module system. This stub is linked together with the"
-echo "	converted ELF objects to form a FreeBSD kernel module. A static ELF"
-echo "	object (.o) file is also created. This file can be linked into a"
-echo "	static kernel image for those who want/need a fully linked kernel"
-echo "	image (possibly for embedded bootstrap purposes, or just plain old"
-echo "	experimentation)."
-echo ""
-echo -n "	Press return to continue... "
-read KEYPRESS
-return
-}
-
-help5 () {
-header
-echo "				Prerequisites"
-echo ""
-echo "	Converting a driver requires the following utilities:"
-echo ""
-echo "	- The FreeBSD C compiler, cc(1) (part of the base install)."
-echo "	- The FreeBSD linker, ld(1) (part of the base install)."
-echo "	- The objcopy(1) utility (part of the base install)."
-echo "	- The ndiscvt(1) utility (part of the base install)."
-echo ""
-echo "	If you happen to end up with a .INF file that's in Unicode format,"
-echo "	then you'll also need:"
-echo ""
-echo "	- The iconv(1) utility."
-echo ""
-echo "	If you have installed the X Window system or some sort of desktop"
-echo "	environment, then iconv(1) should already be present. If not, you"
-echo "	will need to install the libiconv package or port."
-echo ""
-echo -n "	Press return to continue... "
-read KEYPRESS
-return
-}
-
-infconv () {
-header
-echo "			INF file validation"
-
-if [ -z "$INFPATH" ]; then
-	echo ""
-	echo ""
-	echo "	A .INF file is most often provided as an ASCII file, however"
-	echo "	files with multilanguage support are provided in Unicode format."
-	echo "	Please type in the path to your .INF file now."
-	echo ""
-	echo -n "	> "
-	read INFPATH
-fi
-
-if [ ${INFPATH} ] && [ -e ${INFPATH} ]; then 
-	INFTYPE=`${EGREP} -i -c "Signature|.S.i.g.n.a.t.u.r.e" ${INFPATH}`
-	if [ ${INFTYPE} -le 0 ]; then
-		echo ""
-		echo "	I don't recognize this file format. It may not be a valid .INF file."
-		echo ""
-		echo -n "	Press enter to try again, or ^C to quit. "
-		read KEYPRESS
-		INFPATH=""
-		return
-	fi
-
-	INFTYPE=`${EGREP} -i -c "Class.*=.*Net" ${INFPATH}`
-	if [ ${INFTYPE} -gt 0 ]; then
-		echo ""
-		echo "	This .INF file appears to be ASCII."
-		echo ""
-		echo -n "	Press return to continue... "
-		read KEYPRESS
-		return
-	fi
-
-	INFTYPE=`${EGREP} -i -c ".C.l.a.s.s.*=.*N.e.t" ${INFPATH}`
-	if [ ${INFTYPE} -gt 0 ]; then
-		echo ""
-		echo "	This .INF file appears to be Unicode."
-		if [ -e ${ICONVPATH} ]; then
-			echo "	Trying to convert to ASCII..."
-			${ICONVPATH} -f utf-16 -t utf-8 ${INFPATH} > ${INFFILE}
-			INFPATH=${INFFILE}
-			echo "	Done."
-			echo ""
-			echo -n "	Press return to continue... "
-			read KEYPRESS
-		else
-			echo "	The iconv(1) utility does not appear to be installed."
-			echo "	Please install this utility or convert the .INF file"
-			echo "	to ASCII and run this utility again."
-			echo ""
-			exit
-		fi
-		return
-	fi
-
-	echo ""
-	echo "	I don't recognize this file format. It may not be a valid .INF file."
-	echo ""
-	echo -n "	Press enter to try again, or ^C to quit. "
-	read KEYPRESS
-	INFPATH=""
-else
-	echo ""
-	echo "	The file '${INFPATH}' was not found."
-	echo ""
-	echo -n "	Press enter to try again, or ^C to quit. "
-	read KEYPRESS
-	INFPATH=""
-fi
-return
-}
-
-sysconv() {
-header
-echo "			Driver file validation"
-
-if [ ! -r "$SYSPATH" ]; then
-	echo ""
-	echo ""
-	echo "	Now you need to specify the name of the Windows(r) driver .SYS"
-	echo "	file for your device. Note that if you are running FreeBSD/amd64,"
-	echo "	then you must provide a driver that has been compiled for the"
-	echo "	64-bit Windows(r) platform. If a 64-bit driver is not available"
-	echo "	for your device, you must install FreeBSD/i386 and use the"
-	echo "	32-bit driver instead."
-	echo ""
-	echo "	Please type in the path to the Windows(r) driver .SYS file now."
-	echo ""
-	echo -n "	> "
-	read SYSPATH
-fi
-
-if [ ${SYSPATH} ] && [ -e ${SYSPATH} ]; then
-	SYSTYPE=`${FILE} ${SYSPATH}`
-
-	case ${SYSTYPE} in
-	*Windows*)
-		echo ""
-		echo "	This .SYS file appears to be in Windows(r) PE format."
-		echo ""
-		echo -n "	Press return to continue... "
-		read KEYPRESS
-		SYSBASE=`${BASENAME} ${SYSPATH} | ${TR} '.' '_'`
-		;;
-	*)
-		echo ""
-		echo "	I don't recognize this file format. It may not be a valid .SYS file."
-		echo ""
-
-		echo -n "	Press enter to try again, or ^C to quit. "
-		read KEYPRESS
-		SYSPATH=""
-		;;
-	esac
-else
-	echo ""
-	echo "	The file '${SYSPATH}' was not found."
-	echo ""
-	echo -n "	Press enter to try again, or ^C to quit. "
-	read KEYPRESS
-	SYSPATH=""
-fi 
-return
-}
-
-ndiscvt() {
-header
-echo "			Driver file conversion"
-echo ""
-echo "	The script will now try to convert the .INF and .SYS files"
-echo "	using the ndiscvt(1) utility. This utility can handle most"
-echo "	.INF files; however, occasionally it can fail to parse some files"
-echo "	due to subtle syntax issues: the .INF syntax is very complex,"
-echo "	and the Windows(r) parser will sometimes allow files with small"
-echo "	syntax errors to be processed correctly which ndiscvt(1) will"
-echo "	not. If the conversion fails, you may have to edit the .INF"
-echo "	file by hand to remove the offending lines."
-echo ""
-echo -n "	Press enter to try converting the files now: "
-read KEYPRESS
-if ! ${NDISCVT} -i ${INFPATH} -s ${SYSPATH} -O -o ${DNAME}.h > /dev/null; then
-	echo "CONVERSION FAILED"
-	exit
-else
-	echo ""
-	echo "	Conversion was successful."
-	echo ""
-	echo -n "	Press enter to continue... "
-	read KEYPRESS
-fi
-return
-}
-
-firmcvt() {
-	while : ; do
-header
-echo "			Firmware file conversion"
-echo ""
-echo "	If your driver uses additional firmware files, please list them"
-echo "	below. When you're finished, just press enter to continue. (If your"
-echo "	driver doesn't need any extra firmware files, just press enter"
-echo "	to move to the next step.)"
-echo ""
-		echo -n "	> "
-		read FIRMPATH
-
-		if [ ${FIRMPATH} ]; then
-			if [ ! -e ${FIRMPATH} ]; then
-				echo ""
-				echo "	The file '${FIRMPATH}' was not found"
-				echo ""
-				echo -n "	Press enter to try again, or ^C to quit. "
-				read KEYPRESS
-				continue
-			fi
-			if ! ${NDISCVT} -f ${FIRMPATH} > /dev/null; then
-				echo ""
-				echo "CONVERSION FAILED"
-			else
-				echo ""
-				echo "	Conversion was successful."
-				echo ""
-				FRMBASE=`${BASENAME} ${FIRMPATH}`
-				FRMBASE="${FRMBASE}.o"
-				FRMLIST="${FRMLIST} ${FRMBASE}"
-			fi
-			echo -n "	Press enter to continue... "
-			read KEYPRESS
-		else
-			break
-		fi
-	done
-
-header
-echo ""
-echo "	List of files converted firmware files:"
-echo ""
-for i in ${FRMLIST}
-do
-	echo "	"$i
-done
-echo ""
-echo -n "	Press enter to continue... "
-read KEYPRESS
-return
-}
-
-drvgen () {
-header
-echo "			Kernel module generation"
-echo ""
-echo ""
-echo "	The script will now try to generate the kernel driver module."
-echo "	This is the last step. Once this module is generated, you should"
-echo "	be able to load it just like any other FreeBSD driver module."
-echo ""
-echo "	Press enter to compile the stub module and generate the driver"
-echo -n "	module now: "
-read KEYPRESS
-echo ""
-echo -n "	Generating Makefile... "
-echo ".PATH:  ${PWD} ${STUBPATH}"				>  ${MAKEFILE}
-echo "KMOD= ${SYSBASE}"						>> ${MAKEFILE}
-echo "SRCS+= ${STUBFILE} ${DNAME}.h bus_if.h device_if.h"	>> ${MAKEFILE}
-echo "OBJS+=${FRMLIST} ${DNAME}.o"				>> ${MAKEFILE}
-echo "CFLAGS+=	\\"						>> ${MAKEFILE}
-echo "	-DDRV_DATA_START=ndis_${SYSBASE}_drv_data_start \\"		>> ${MAKEFILE}
-echo "	-DDRV_NAME=ndis_${SYSBASE} \\"				>> ${MAKEFILE}
-echo "	-DDRV_DATA_END=ndis_${SYSBASE}_drv_data_end"			>> ${MAKEFILE}
-echo "CLEANFILES+=	\\"					>> ${MAKEFILE}
-echo "	${INFFILE} \\"						>> ${MAKEFILE}
-echo "	${DNAME}.h \\"						>> ${MAKEFILE}
-echo "	${DNAME}.o"						>> ${MAKEFILE}
-echo ".include <bsd.kmod.mk>"					>> ${MAKEFILE}
-if [ -f ${MAKEFILE} ]; then
-	echo "done."
-else
-	echo "generating Makefile failed. Exiting."
-	echo ""
-	exit
-fi
-echo -n "	Building kernel module... "
-echo "" > bus_if.h
-echo "" > device_if.h
-if ! ${MAKE} -f ${MAKEFILE} all > /dev/null; then
-	echo "build failed. Exiting."
-	echo ""
-	exit
-else
-	if [ -f ${SYSBASE}.ko ]; then
-		${MV} ${SYSBASE}.ko ${SYSBASE}.kmod
-		echo "done."
-	else
-		echo "build failed. Exiting."
-		echo ""
-		exit
-	fi
-fi
-echo -n "	Cleaning up... "
-if ! ${MAKE} -f ${MAKEFILE} clean cleandepend > /dev/null; then
-	echo "cleanup failed. Exiting."
-	echo ""
-	exit
-else
-	echo "done."
-fi
-${RM} ${MAKEFILE}
-${MV} ${SYSBASE}.kmod ${SYSBASE}.ko
-echo ""
-echo "	The file ${SYSBASE}.ko has been successfully generated."
-echo "	You can kldload this module to get started."
-echo ""
-echo -n "	Press return to exit. "
-read KEYPRESS
-echo ""
-echo ""
-return
-}
-
-convert_driver () {
-	while : ; do
-		infconv
-		if [ ${INFPATH} ]; then
-			break
-		fi
-	done
-
-	while : ; do
-		sysconv
-		if [ ${SYSPATH} ]; then
-			break
-		fi
-	done
-
-	ndiscvt
-	firmcvt
-	drvgen
-	return
-}
-
-ICONVPATH=/usr/bin/iconv
-NDISCVT=/usr/sbin/ndiscvt
-STUBPATH=/usr/share/misc
-STUBFILE=windrv_stub.c
-DNAME=windrv
-CP=/bin/cp
-MV=/bin/mv
-RM=/bin/rm
-TR=/usr/bin/tr
-FILE=/usr/bin/file
-EGREP=/usr/bin/egrep
-MAKE=/usr/bin/make
-BASENAME=/usr/bin/basename
-TOUCH=/usr/bin/touch
-MKTEMP=/usr/bin/mktemp
-
-MAKEFILE=`${MKTEMP} /tmp/Makefile.XXXXXX`
-INFFILE=`${MKTEMP} /tmp/ascii_inf.XXXXXX`
-
-INFPATH=""
-FRMLIST=""
-SYSPATH=""
-SYSBASE=""
-FRMBASE=""
-
-if [ -r "$1" -a -r "$2" ]; then
-	# Looks like the user supplied .INF and .SYS files on the command line
-	INFPATH=$1
-	SYSPATH=$2
-	convert_driver && exit 0
-fi
-
-while : ; do
-	mainmenu
-	case ${KEYPRESS} in
-	1)
-		help1
-		help2
-		help3
-		help4
-		help5
-		;;
-	2)
-		firmcvt
-		;;
-	3)
-		convert_driver
-		;;
-	4)
-		header
-		echo ""
-		echo "	Be seeing you!"
-		echo ""
-		exit
-		;;
-	*)
-		header
-		echo ""
-		echo -n "	Sorry, I didn't understand that. Press enter to try again: "
-		read KEYPRESS
-		;;
-	esac
-done
-exit
diff --git a/usr.sbin/ndiscvt/windrv_stub.c b/usr.sbin/ndiscvt/windrv_stub.c
deleted file mode 100644
index 8aaa23835cba..000000000000
--- a/usr.sbin/ndiscvt/windrv_stub.c
+++ /dev/null
@@ -1,268 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
- * Copyright (c) 2005
- *      Bill Paul <wpaul@windriver.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/module.h>
-#include <sys/conf.h>
-
-#include <machine/bus.h>
-#include <machine/resource.h>
-#include <sys/bus.h>
-
-#define NDIS_REGVALS
-
-struct ndis_cfg {
-	char			*nc_cfgkey;
-	char			*nc_cfgdesc;
-	char			nc_val[256];
-	int			nc_idx;
-};
-
-typedef struct ndis_cfg ndis_cfg;
-
-#include "windrv.h"
-
-struct ndis_pci_type {
-        uint16_t                ndis_vid;
-        uint16_t                ndis_did;
-        uint32_t                ndis_subsys;
-        char                    *ndis_name;
-};
-
-struct ndis_pccard_type {
-        const char              *ndis_vid;
-        const char              *ndis_did;
-        char                    *ndis_name;
-};
-
-struct ndis_usb_type {
-	uint16_t		ndis_vid;
-	uint16_t		ndis_did;
-	char			*ndis_name;
-};
-
-#ifdef NDIS_PCI_DEV_TABLE
-static struct ndis_pci_type ndis_devs_pci[] = {
-        NDIS_PCI_DEV_TABLE
-        { 0, 0, 0, NULL }
-};
-#endif
-
-#ifdef NDIS_PCMCIA_DEV_TABLE
-static struct ndis_pccard_type ndis_devs_pccard[] = {
-        NDIS_PCMCIA_DEV_TABLE
-        { NULL, NULL, NULL }
-};
-#endif
-
-#ifdef NDIS_USB_DEV_TABLE
-static struct ndis_usb_type ndis_devs_usb[] = {
-	NDIS_USB_DEV_TABLE
-	{ 0, 0, NULL }
-};
-#endif
-
-enum interface_type {
-	InterfaceTypeUndefined = -1,
-	Internal,
-	Isa,
-	Eisa,
-	MicroChannel,
-	TurboChannel,
-	PCIBus,
-	VMEBus,
-	NuBus,
-	PCMCIABus,
-	CBus,
-	MPIBus,
-	MPSABus,
-	ProcessorInternal,
-	InternalPowerBus,
-	PNPISABus,
-	PNPBus,
-	MaximumInterfaceType
-};
-
-typedef enum interface_type interface_type;
-
-/*
- * XXX
- * Ordinarily, device_probe_desc is defined in device_if.h, which
- * is created from device_if.m. The problem is, the latter file
- * is only available if you have the kernel source code installed,
- * and not all users choose to install it. I'd like to let people
- * load Windows driver modules with the minimal amount of hassle
- * and dependencies. <sys/bus.h> wants both device_if.h and bus_if.h
- * to be defined, but it turns out the only thing we really need
- * to get this module compiled is device_probe_desc, so we define
- * that here, and let the build script create empty copies of
- * device_if.h and bus_if.h to make the compiler happy.
- */
-
-extern struct kobjop_desc device_probe_desc;
-typedef int device_probe_t(device_t dev);
-
-extern int windrv_load(module_t, vm_offset_t, size_t,
-	interface_type, void *, void *);
-extern int windrv_unload(module_t, vm_offset_t, size_t);
-
-#ifndef DRV_DATA_START
-#define DRV_DATA_START UNDEF_START
-#endif
-
-#ifndef DRV_DATA_END
-#define DRV_DATA_END UNDEF_END
-#endif
-
-#ifndef DRV_NAME
-#define DRV_NAME UNDEF_NAME
-#endif
-
-extern uint8_t DRV_DATA_START;
-extern uint8_t DRV_DATA_END;
-
-/*
- * The following is stub code that makes it look as though we want
- * to be a child device of all the buses that our supported devices
- * might want to attach to. Our probe routine always fails. The
- * reason we need this code is so that loading an ELF-ified Windows
- * driver module will trigger a bus reprobe.
- */
-
-#define MODULE_DECL(x)				\
-	MODULE_DEPEND(x, ndisapi, 1, 1, 1);	\
-	MODULE_DEPEND(x, ndis, 1, 1, 1)
-
-MODULE_DECL(DRV_NAME);
-
-static int windrv_probe(device_t);
-static int windrv_modevent(module_t, int, void *);
-static int windrv_loaded = 0;
-
-static device_method_t windrv_methods[] = {
-	/* Device interface */
-	DEVMETHOD(device_probe,         windrv_probe),
-
-	{ 0, 0 }
-};
-
-static driver_t windrv_driver = {
-	"windrv_stub",
-	windrv_methods,
-	0
-};
-
-static devclass_t windrv_devclass;
-
-#define DRIVER_DECL(x)					\
-	DRIVER_MODULE(x, pci, windrv_driver,		\
-	    windrv_devclass, windrv_modevent, NULL);	\
-	DRIVER_MODULE(x, cardbus, windrv_driver,	\
-	    windrv_devclass, windrv_modevent, NULL);	\
-	DRIVER_MODULE(x, pccard, windrv_driver,		\
-	    windrv_devclass, windrv_modevent, NULL);	\
-	DRIVER_MODULE(x, uhub, windrv_driver,		\
-	    windrv_devclass, windrv_modevent, NULL);	\
-	MODULE_VERSION(x, 1)
-
-DRIVER_DECL(DRV_NAME);
-
-static int
-windrv_probe(dev)
-	device_t		dev;
-{
-	return (ENXIO);
-}
-
-static int
-windrv_modevent(mod, cmd, arg)
-	module_t		mod;
-	int			cmd;
-	void			*arg;
-{
-	int			drv_data_len;
-	int			error = 0;
-	vm_offset_t		drv_data_start;
-	vm_offset_t		drv_data_end;
-
-	drv_data_start = (vm_offset_t)&DRV_DATA_START;
-	drv_data_end = (vm_offset_t)&DRV_DATA_END;
-
-	drv_data_len = drv_data_end - drv_data_start;
-	switch (cmd) {
-	case MOD_LOAD:
-		windrv_loaded++;
-		if (windrv_loaded > 1)
-			break;
-#ifdef NDIS_PCI_DEV_TABLE
-		windrv_load(mod, drv_data_start, drv_data_len, PCIBus,
-		    ndis_devs_pci, &ndis_regvals);
-#endif
-#ifdef NDIS_PCMCIA_DEV_TABLE
-		windrv_load(mod, drv_data_start, drv_data_len, PCMCIABus,
-		    ndis_devs_pccard, &ndis_regvals);
-#endif
-#ifdef NDIS_USB_DEV_TABLE
-		windrv_load(mod, drv_data_start, drv_data_len, PNPBus,
-		   ndis_devs_usb, &ndis_regvals);
-#endif
-		break;
-	case MOD_UNLOAD:
-		windrv_loaded--;
-		if (windrv_loaded > 0)
-			break;
-#ifdef NDIS_PCI_DEV_TABLE
-		windrv_unload(mod, drv_data_start, drv_data_len);
-#endif
-#ifdef NDIS_PCMCIA_DEV_TABLE
-		windrv_unload(mod, drv_data_start, drv_data_len);
-#endif
-#ifdef NDIS_USB_DEV_TABLE
-		windrv_unload(mod, drv_data_start, drv_data_len);
-#endif
-		break;
-	case MOD_SHUTDOWN:
-		break;
-	default:
-		error = EINVAL;
-		break;
-	}
-
-	return (error);
-}
diff --git a/usr.sbin/wpa/Makefile b/usr.sbin/wpa/Makefile
index ae07ec04f001..451c4c3b17a6 100644
--- a/usr.sbin/wpa/Makefile
+++ b/usr.sbin/wpa/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 SUBDIR= wpa_supplicant wpa_cli wpa_passphrase
 SUBDIR+= hostapd hostapd_cli
-SUBDIR+= ndis_events
 SUBDIR_PARALLEL=
 
 .include <bsd.subdir.mk>
diff --git a/usr.sbin/wpa/ndis_events/Makefile b/usr.sbin/wpa/ndis_events/Makefile
deleted file mode 100644
index 07caf5a48465..000000000000
--- a/usr.sbin/wpa/ndis_events/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-PROG=	ndis_events
-SRCS+=	ndis_events.c
-
-MAN=	ndis_events.8
-
-.include <bsd.prog.mk>
diff --git a/usr.sbin/wpa/ndis_events/Makefile.depend b/usr.sbin/wpa/ndis_events/Makefile.depend
deleted file mode 100644
index d5ed563ecfc8..000000000000
--- a/usr.sbin/wpa/ndis_events/Makefile.depend
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	include \
-	include/arpa \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/libc \
-	lib/libcompiler_rt \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/usr.sbin/wpa/ndis_events/ndis_events.8 b/usr.sbin/wpa/ndis_events/ndis_events.8
deleted file mode 100644
index bf11c1943fec..000000000000
--- a/usr.sbin/wpa/ndis_events/ndis_events.8
+++ /dev/null
@@ -1,135 +0,0 @@
-.\" Copyright (c) 2005
-.\"	Bill Paul <wpaul@windriver.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.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by Bill Paul.
-.\" 4. Neither the name of the author nor the names of any co-contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"   without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
-.\" 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.
-.\"
-.\" $FreeBSD$
-.\"
-.Dd August 30, 2007
-.Dt NDIS_EVENTS 8
-.Os
-.Sh NAME
-.Nm ndis_events
-.Nd relay events from
-.Xr ndis 4
-drivers to
-.Xr wpa_supplicant 8
-.Sh SYNOPSIS
-.Nm
-.Op Fl a
-.Op Fl d
-.Op Fl v
-.Sh DESCRIPTION
-The
-.Nm
-utility listens for events generated by an
-.Xr ndis 4
-wireless network driver and relays them to
-.Xr wpa_supplicant 8
-for possible processing.
-The three event types that can occur
-are media connect and disconnect events, such as when a wireless
-interface joins or leaves a network, and media-specific events.
-In particular,
-.Xr ndis 4
-drivers that support WPA2 will generate media-specific events
-containing PMKID candidate information which
-.Xr wpa_supplicant 8
-needs in order to properly associate with WPA2-capable access points.
-.Pp
-The
-.Nm
-daemon works by listening for interface information events via
-a routing socket.
-When it detects an event that was generated by an
-.Xr ndis 4
-interface, it transmits it via UDP packet on the loopback interface,
-where
-.Xr wpa_supplicant 8
-is presumably listening.
-The standard
-.Xr wpa_supplicant 8
-distribution includes its own version of this utility for use with
-.Tn Windows\[rg] .
-The
-.Fx
-version performs the same functions as the
-.Tn Windows\[rg]
-one, except that it uses an
-.Xr ioctl 2
-and routing socket interface instead of WMI.
-.Pp
-Note that a single instance of
-.Nm
-is sufficient to scan for events for any number of
-.Xr ndis 4
-interfaces in a system.
-.Sh OPTIONS
-The
-.Nm
-daemon supports the following options:
-.Bl -tag -width indent
-.It Fl a
-Process all events.
-By default,
-.Nm
-will only process and forward media-specific events, which contain
-PMKID candidate information, and not bother forwarding connect and
-disconnect events, since
-.Xr wpa_supplicant 8
-normally can determine the current link state on its own.
-In some
-cases, the additional connect and disconnect events only confuse it
-and make the association and authentication process take longer.
-.It Fl d
-Run in debug mode.
-This causes
-.Nm
-to run in the foreground and generate any output to the standard
-error instead of using the
-.Xr syslog 3
-facility.
-.It Fl v
-Run in verbose mode.
-This causes
-.Nm
-to emit notifications when it receives events.
-.El
-.Sh SEE ALSO
-.Xr ndis 4 ,
-.Xr wpa_supplicant 8
-.Sh HISTORY
-The
-.Nm
-utility first appeared in
-.Fx 6.0 .
-.Sh AUTHORS
-The
-.Nm
-utility was written by
-.An Bill Paul Aq Mt wpaul@windriver.com .
diff --git a/usr.sbin/wpa/ndis_events/ndis_events.c b/usr.sbin/wpa/ndis_events/ndis_events.c
deleted file mode 100644
index cfd971af8ea1..000000000000
--- a/usr.sbin/wpa/ndis_events/ndis_events.c
+++ /dev/null
@@ -1,353 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
- * Copyright (c) 2005
- *      Bill Paul <wpaul@windriver.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-/*
- * This program simulates the behavior of the ndis_events utility
- * supplied with wpa_supplicant for Windows. The original utility
- * is designed to translate Windows WMI events. We don't have WMI,
- * but we need to supply certain event info to wpa_supplicant in
- * order to make WPA2 work correctly, so we fake up the interface.
- */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <sys/errno.h>
-#include <sys/sysctl.h>
-#include <net/if.h>
-#include <net/if_dl.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <net/route.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <err.h>
-#include <syslog.h>
-#include <stdarg.h>
-
-static int verbose = 0;
-static int debug = 0;
-static int all_events = 0;
-
-#define PROGNAME "ndis_events"
-
-#define WPA_SUPPLICANT_PORT	9876
-#define NDIS_INDICATION_LEN	2048
-
-#define EVENT_CONNECT		0
-#define EVENT_DISCONNECT	1
-#define EVENT_MEDIA_SPECIFIC	2
-
-#define NDIS_STATUS_MEDIA_CONNECT		0x4001000B
-#define NDIS_STATUS_MEDIA_DISCONNECT		0x4001000C
-#define NDIS_STATUS_MEDIA_SPECIFIC_INDICATION	0x40010012
-
-struct ndis_evt {
-	uint32_t		ne_sts;
-	uint32_t		ne_len;
-#ifdef notdef
-	char			ne_buf[1];
-#endif
-};
-
-static int find_ifname(int, char *);
-static int announce_event(char *, int, struct sockaddr_in *);
-static void usage(void);
-
-static void
-dbgmsg(const char *fmt, ...)
-{
-	va_list			ap;
-
-	va_start(ap, fmt);
-	if (debug)
-		vwarnx(fmt, ap);
-	else
-		vsyslog(LOG_ERR, fmt, ap);
-	va_end(ap);
-
-	return;
-}
-
-static int
-find_ifname(idx, name)
-	int			idx;
-	char			*name;
-{
-	int			mib[6];
-	size_t			needed;
-	struct if_msghdr	*ifm;
-	struct sockaddr_dl	*sdl;
-	char			*buf, *lim, *next;
-
-	needed = 0;
-	mib[0] = CTL_NET;
-	mib[1] = PF_ROUTE;
-	mib[2] = 0;             /* protocol */
-	mib[3] = 0;             /* wildcard address family */
-	mib[4] = NET_RT_IFLIST;
-	mib[5] = 0;             /* no flags */
-
-	if (sysctl (mib, 6, NULL, &needed, NULL, 0) < 0)
-		return(EIO);
-
-	buf = malloc (needed);
-	if (buf == NULL)
-		return(ENOMEM);
-
-	if (sysctl (mib, 6, buf, &needed, NULL, 0) < 0) {
-		free(buf);
-		return(EIO);
-	}
-
-	lim = buf + needed;
-
-	next = buf;
-	while (next < lim) {
-		ifm = (struct if_msghdr *)next;
-		if (ifm->ifm_type == RTM_IFINFO) {
-			sdl = (struct sockaddr_dl *)(ifm + 1);
-			if (ifm->ifm_index == idx) {
-				strncpy(name, sdl->sdl_data, sdl->sdl_nlen);
-				name[sdl->sdl_nlen] = '\0';
-				free (buf);
-				return (0);
-			}
-		}
-		next += ifm->ifm_msglen;
-	}
-
-	free (buf);
-
-	return(ENOENT);
-}
-
-static int 
-announce_event(ifname, sock, dst)
-	char			*ifname;
-	int			sock;
-	struct sockaddr_in	*dst;
-{
-	int			s;
-	char			indication[NDIS_INDICATION_LEN];
-        struct ifreq            ifr;
-	struct ndis_evt		*e;
-	char			buf[512], *pos, *end;
-	int			len, type, _type;
-
-	s = socket(PF_INET, SOCK_DGRAM, 0);
-
-	if (s < 0) {
-		dbgmsg("socket creation failed");
-                return(EINVAL);
-	}
-
-        bzero((char *)&ifr, sizeof(ifr));
-	e = (struct ndis_evt *)indication;
-	e->ne_len = NDIS_INDICATION_LEN - sizeof(struct ndis_evt);
-
-        strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
-        ifr.ifr_data = indication;
-
-	if (ioctl(s, SIOCGPRIVATE_0, &ifr) < 0) {
-		close(s);
-		if (verbose) {
-			if (errno == ENOENT)
-				dbgmsg("drained all events from %s",
-				    ifname, errno);
-			else
-				dbgmsg("failed to read event info from %s: %d",
-				    ifname, errno);
-		}
-		return(ENOENT);
-	}
-
-	if (e->ne_sts == NDIS_STATUS_MEDIA_CONNECT) {
-		type = EVENT_CONNECT;
-		if (verbose)
-			dbgmsg("Received a connect event for %s", ifname);
-		if (!all_events) {
-			close(s);
-			return(0);
-		}
-	}
-	if (e->ne_sts == NDIS_STATUS_MEDIA_DISCONNECT) {
-		type = EVENT_DISCONNECT;
-		if (verbose)
-			dbgmsg("Received a disconnect event for %s", ifname);
-		if (!all_events) {
-			close(s);
-			return(0);
-		}
-	}
-	if (e->ne_sts == NDIS_STATUS_MEDIA_SPECIFIC_INDICATION) {
-		type = EVENT_MEDIA_SPECIFIC;
-		if (verbose)
-			dbgmsg("Received a media-specific event for %s",
-			    ifname);
-	}
-
-	end = buf + sizeof(buf);
-	_type = (int) type;
-	memcpy(buf, &_type, sizeof(_type));
-	pos = buf + sizeof(_type);
-
-	len = snprintf(pos + 1, end - pos - 1, "%s", ifname);
-	if (len < 0) {
-		close(s);
-		return(ENOSPC);
-	}
-	if (len > 255)
-		len = 255;
-	*pos = (unsigned char) len;
-	pos += 1 + len;
-	if (e->ne_len) {
-		if (e->ne_len > 255 || 1 + e->ne_len > end - pos) {
-			dbgmsg("Not enough room for send_event data (%d)\n",
-			    e->ne_len);
-			close(s);
-			return(ENOSPC);
- 		}
-		*pos++ = (unsigned char) e->ne_len;
-		memcpy(pos, (indication) + sizeof(struct ndis_evt), e->ne_len);
-		pos += e->ne_len;
-	}
-
-	len = sendto(sock, buf, pos - buf, 0, (struct sockaddr *) dst,
-	    sizeof(struct sockaddr_in));
-
-	close(s);
-	return(0);
-}
-
-static void
-usage()
-{
-	fprintf(stderr, "Usage: ndis_events [-a] [-d] [-v]\n");
-	exit(1);
-}
-
-int
-main(argc, argv)
-	int			argc;
-	char			*argv[];
-{
-	int			s, r, n;
-	struct sockaddr_in	sin;
-	char			msg[NDIS_INDICATION_LEN];
-	struct rt_msghdr	*rtm;
-	struct if_msghdr	*ifm;
-	char			ifname[IFNAMSIZ];
-	int			ch;
-
-	while ((ch = getopt(argc, argv, "dva")) != -1) {
-		switch(ch) {
-		case 'd':
-			debug++;
-			break;
-		case 'v':
-			verbose++;
-			break;
-		case 'a':
-			all_events++;
-			break;
-		default:
-			usage();
-			break;
-		}
-	}
-
-	if (!debug && daemon(0, 0))
-		err(1, "failed to daemonize ourselves");
-
-	if (!debug)
-		openlog(PROGNAME, LOG_PID | LOG_CONS, LOG_DAEMON);
-
-	bzero((char *)&sin, sizeof(sin));
-
-	/* Create a datagram  socket. */
-
-	s = socket(PF_INET, SOCK_DGRAM, 0);
-	if (s < 0) {
-		dbgmsg("socket creation failed");
-		exit(1);
-	}
-
-	sin.sin_family = AF_INET;
-	sin.sin_addr.s_addr = inet_addr("127.0.0.1");
-	sin.sin_port = htons(WPA_SUPPLICANT_PORT);
-
-	/* Create a routing socket. */
-
-	r = socket (PF_ROUTE, SOCK_RAW, 0);
-	if (r < 0) {
-		dbgmsg("routing socket creation failed");
-		exit(1);
-	}
-
-	/* Now sit and spin, waiting for events. */
-
-	if (verbose)
-		dbgmsg("Listening for events");
-
-	while (1) {
-		n = read(r, msg, NDIS_INDICATION_LEN);
-		rtm = (struct rt_msghdr *)msg;
-		if (rtm->rtm_type != RTM_IFINFO)
-			continue;
-		ifm = (struct if_msghdr *)msg;
-		if (find_ifname(ifm->ifm_index, ifname))
-			continue;
-		if (strstr(ifname, "ndis")) {
-			while(announce_event(ifname, s, &sin) == 0)
-				;
-		} else {
-			if (verbose)
-				dbgmsg("Skipping ifinfo message from %s",
-				    ifname);
-		}
-	}
-
-	/* NOTREACHED */
-	exit(0);
-}
diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile
index dc8178ccf9b8..352e13e6bde6 100644
--- a/usr.sbin/wpa/wpa_supplicant/Makefile
+++ b/usr.sbin/wpa/wpa_supplicant/Makefile
@@ -1,164 +1,162 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 .include "../Makefile.inc"
 
 .PATH.c:${WPA_SUPPLICANT_DISTDIR} \
 	${WPA_DISTDIR}/src/eap_peer \
 	${WPA_DISTDIR}/src/drivers
 
 PACKAGE=	wpa
 PROG=	wpa_supplicant
 
 SRCS=	base64.c bitfield.c blacklist.c bss.c cli.c common.c \
 	config.c config_file.c \
 	ctrl_iface.c ctrl_iface_common.c ctrl_iface_unix.c \
 	driver_bsd.c driver_common.c \
-	driver_ndis.c driver_wired.c driver_wired_common.c drivers.c \
+	driver_wired.c driver_wired_common.c drivers.c \
 	eap_register.c eloop.c \
 	events.c gas.c gas_query.c \
 	http_client.c http_server.c \
 	httpread.c hw_features_common.c \
 	ieee802_11_common.c l2_packet_freebsd.c main.c \
 	notify.c offchannel.c op_classes.c os_unix.c pmksa_cache.c preauth.c \
 	rrm.c scan.c upnp_xml.c \
 	wmm_ac.c wpa.c wpa_common.c wpa_ctrl.c \
-	wpa_debug.c wpa_ft.c wpa_ie.c wpa_supplicant.c wpabuf.c wpas_glue.c \
-	Packet32.c
+	wpa_debug.c wpa_ft.c wpa_ie.c wpa_supplicant.c wpabuf.c wpas_glue.c
 
 MAN=	wpa_supplicant.8 wpa_supplicant.conf.5
 
 .if ${MK_EXAMPLES} != "no"
 FILESDIR= ${SHAREDIR}/examples/etc
 .PATH:	${WPA_SUPPLICANT_DISTDIR}
 FILES=	wpa_supplicant.conf
 .endif
 
 CFLAGS+=-DCONFIG_BACKEND_FILE \
 	-DCONFIG_DEBUG_SYSLOG \
 	-DCONFIG_DRIVER_BSD \
-	-DCONFIG_DRIVER_NDIS \
 	-DCONFIG_DRIVER_WIRED \
 	-DCONFIG_GAS \
 	-DCONFIG_IEEE80211R \
 	-DCONFIG_IEEE80211N \
 	-DCONFIG_IEEE80211W \
 	-DCONFIG_IEEE80211AC \
 	-DCONFIG_IEEE80211AX \
 	-DCONFIG_PEERKEY \
 	-DCONFIG_PRIVSEP \
 	-DCONFIG_SMARTCARD \
 	-DCONFIG_TERMINATE_ONLASTIF \
 	-DCONFIG_TLS=openssl \
 	-DCONFIG_WPS2 \
 	-DCONFIG_WPS_UPNP \
 	-DPKCS12_FUNCS \
 	-DCONFIG_MATCH_IFACE
 #CFLAGS+= -g
 LIBADD=	pcap util
 
 # User customizations to the wpa_supplicant build environment
 CFLAGS+=${WPA_SUPPLICANT_CFLAGS}
 #DPADD+=${WPA_SUPPLICANT_DPADD}
 LDADD+=${WPA_SUPPLICANT_LDADD}
 #LDFLAGS+=${WPA_SUPPLICANT_LDFLAGS}
 
 .if ${MK_WPA_SUPPLICANT_EAPOL} != "no"
 CFLAGS+=-DCONFIG_WPS \
 	-DCONFIG_HS20 \
 	-DCONFIG_INTERWORKING \
 	-DEAP_GTC \
 	-DEAP_LEAP \
 	-DEAP_MD5 \
 	-DEAP_MSCHAPv2 \
 	-DEAP_OTP \
 	-DEAP_PEAP \
 	-DEAP_PSK \
 	-DEAP_TLS \
 	-DEAP_TTLS \
 	-DEAP_WSC \
 	-DIEEE8021X_EAPOL
 SRCS+=	chap.c \
 	eap.c \
 	eap_common.c \
 	eap_gtc.c \
 	eap_leap.c \
 	eap_md5.c \
 	eap_methods.c \
 	eap_mschapv2.c \
 	eap_otp.c \
 	eap_peap.c \
 	eap_peap_common.c \
 	eap_psk.c \
 	eap_psk_common.c \
 	eap_tls.c \
 	eap_tls_common.c \
 	eap_ttls.c \
 	eap_wsc.c \
 	eapol_supp_sm.c \
 	eap_wsc_common.c \
 	hs20_supplicant.c \
 	interworking.c \
 	ms_funcs.c \
 	mschapv2.c \
 	uuid.c \
 	wps.c wps_attr_build.c wps_attr_parse.c wps_attr_process.c \
 	wps_common.c wps_dev_attr.c wps_enrollee.c wps_registrar.c \
 	wps_supplicant.c wps_upnp.c wps_upnp_ap.c wps_upnp_event.c \
 	wps_upnp_ssdp.c wps_upnp_web.c
 NEED_AES_EAX=y
 NEED_AES_ENCBLOCK=y
 NEED_AES_OMAC1=y
 .endif
 TLS_FUNCS=y
 
 .if !empty(CFLAGS:M*-DEAP_AKA)
 SRCS+=	eap_aka.c
 NEED_SIM_COMMON=y
 NEED_AES_CBC=y
 .endif
 
 .if !empty(CFLAGS:M*-DEAP_SIM)
 SRCS+=	eap_sim.c
 NEED_SIM_COMMON=y
 NEED_AES_CBC=y
 .endif
 
 .if defined(NEED_SIM_COMMON)
 SRCS+=	eap_sim_common.c
 NEED_FIPS186_2_PRF=y
 .endif
 
 # PC/SC interface for smartcards (USIM, GSM SIM)
 # GSM/UMTS authentication algorithm (for EAP-SIM/EAP-AKA)
 # NB: requires devel/pcsc-lite
 #
 # WPA_SUPPLICANT_CFLAGS=-DEAP_AKA -DPCSC_FUNCS -I/usr/local/include/PCSC
 # WPA_SUPPLICANT_LDADD=-L/usr/local/lib
 #
 .if !empty(CFLAGS:M*-DPCSC_FUNCS)
 SRCS+=	pcsc_funcs.c
 LIBADD+=	pcslite pthread
 .endif
 
 .if !empty(CFLAGS:M*-DEAP_GPSK)
 CFLAGS+=-DEAP_GPSK_SHA256
 SRCS+=	eap_gpsk.c \
 	eap_gpsk_common.c
 NEED_AES_OMAC1=y
 .endif
 
 .if !empty(CFLAGS:M*-DEAP_PAX)
 SRCS+=	eap_pax.c \
 	eap_pax_common.c
 .endif
 
 .if !empty(CFLAGS:M*-DEAP_SAKE)
 SRCS+=	eap_sake.c \
 	eap_sake_common.c
 .endif
 
 .include "../Makefile.crypto"
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/wpa/wpa_supplicant/Packet32.c b/usr.sbin/wpa/wpa_supplicant/Packet32.c
deleted file mode 100644
index 3f852b722080..000000000000
--- a/usr.sbin/wpa/wpa_supplicant/Packet32.c
+++ /dev/null
@@ -1,415 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
- * Copyright (c) 2005
- *      Bill Paul <wpaul@windriver.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-/*
- * This file implements a small portion of the Winpcap API for the
- * Windows NDIS interface in wpa_supplicant. It provides just enough
- * routines to fool wpa_supplicant into thinking it's really running
- * in a Windows environment.
- */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <sys/errno.h>
-#include <sys/sysctl.h>
-#include <sys/fcntl.h>
-#include <net/if.h>
-#include <net/if_dl.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <net/route.h>
-
-#include <net80211/ieee80211_ioctl.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <pcap.h>
-
-#include "Packet32.h"
-
-#define OID_802_11_ADD_KEY      0x0d01011D
-
-typedef ULONGLONG NDIS_802_11_KEY_RSC;
-typedef UCHAR NDIS_802_11_MAC_ADDRESS[6];
-
-typedef struct NDIS_802_11_KEY {
-	ULONG Length;
-	ULONG KeyIndex;
-	ULONG KeyLength;
-	NDIS_802_11_MAC_ADDRESS BSSID;
-	NDIS_802_11_KEY_RSC KeyRSC;
-	UCHAR KeyMaterial[1];
-} NDIS_802_11_KEY;
-
-typedef struct NDIS_802_11_KEY_COMPAT {
-	ULONG Length;
-	ULONG KeyIndex;
-	ULONG KeyLength;
-	NDIS_802_11_MAC_ADDRESS BSSID;
-	UCHAR Pad[6]; /* Make struct layout match Windows. */
-	NDIS_802_11_KEY_RSC KeyRSC;
-#ifdef notdef
-	UCHAR KeyMaterial[1];
-#endif
-} NDIS_802_11_KEY_COMPAT;
-
-#define TRUE 1
-#define FALSE 0
-
-struct adapter {
-	int			socket;
-	char			name[IFNAMSIZ];
-	int			prev_roaming;
-};
-
-PCHAR
-PacketGetVersion(void)
-{
-	return("FreeBSD WinPcap compatibility shim v1.0");
-}
-
-void *
-PacketOpenAdapter(CHAR *iface)
-{
-	struct adapter		*a;
-	int			s;
-	int			ifflags;
-	struct ifreq		ifr;
-	struct ieee80211req	ireq;
-
-	s = socket(PF_INET, SOCK_DGRAM, 0);
-
-	if (s == -1)
-		return(NULL);
-
-	a = malloc(sizeof(struct adapter));
-	if (a == NULL)
-		return(NULL);
-
-	a->socket = s;
-	if (strncmp(iface, "\\Device\\NPF_", 12) == 0)
-		iface += 12;
-	else if (strncmp(iface, "\\DEVICE\\", 8) == 0)
-		iface += 8;
-	snprintf(a->name, IFNAMSIZ, "%s", iface);
-
-	/* Turn off net80211 roaming */
-	bzero((char *)&ireq, sizeof(ireq));
-	strncpy(ireq.i_name, iface, sizeof (ifr.ifr_name));
-	ireq.i_type = IEEE80211_IOC_ROAMING;
-	if (ioctl(a->socket, SIOCG80211, &ireq) == 0) {
-		a->prev_roaming = ireq.i_val;
-		ireq.i_val = IEEE80211_ROAMING_MANUAL;
-		if (ioctl(a->socket, SIOCS80211, &ireq) < 0)
-			fprintf(stderr,
-			    "Could not set IEEE80211_ROAMING_MANUAL\n");
-	}
-
-	bzero((char *)&ifr, sizeof(ifr));
-        strncpy(ifr.ifr_name, iface, sizeof (ifr.ifr_name));
-        if (ioctl(a->socket, SIOCGIFFLAGS, (caddr_t)&ifr) < 0) {
-		free(a);
-		close(s);
-		return(NULL);
-        }
-        ifr.ifr_flags |= IFF_UP;
-        if (ioctl(a->socket, SIOCSIFFLAGS, (caddr_t)&ifr) < 0) {
-		free(a);
-		close(s);
-		return(NULL);
-        }
-
-	return(a);
-}
-
-int
-PacketRequest(void *iface, BOOLEAN set, PACKET_OID_DATA *oid)
-{
-	struct adapter		*a;
-	uint32_t		retval;
-	struct ifreq		ifr;
-	NDIS_802_11_KEY		*old;
-	NDIS_802_11_KEY_COMPAT	*new;
-	PACKET_OID_DATA		*o = NULL;
-
-	if (iface == NULL)
-		return(-1);
-
-	a = iface;
-	bzero((char *)&ifr, sizeof(ifr));
-
-	/*
-	 * This hack is necessary to work around a difference
-	 * betwee the GNU C and Microsoft C compilers. The NDIS_802_11_KEY
-	 * structure has a uint64_t in it, right after an array of
-	 * chars. The Microsoft compiler inserts padding right before
-	 * the 64-bit value to align it on a 64-bit boundary, but
-	 * GCC only aligns it on a 32-bit boundary. Trying to pass
-	 * the GCC-formatted structure to an NDIS binary driver
-	 * fails because some of the fields appear to be at the
-	 * wrong offsets.
-	 *
-	 * To get around this, if we detect someone is trying to do
-	 * a set operation on OID_802_11_ADD_KEY, we shuffle the data
-	 * into a properly padded structure and pass that into the
-	 * driver instead. This allows the driver_ndis.c code supplied
-	 * with wpa_supplicant to work unmodified.
-	 */
-
-	if (set == TRUE && oid->Oid == OID_802_11_ADD_KEY) {
-		old = (NDIS_802_11_KEY *)&oid->Data;
-		o = malloc(sizeof(PACKET_OID_DATA) +
-		    sizeof(NDIS_802_11_KEY_COMPAT) + old->KeyLength);
-		if (o == NULL)
-			return(0);
-		bzero((char *)o, sizeof(PACKET_OID_DATA) +
-		    sizeof(NDIS_802_11_KEY_COMPAT) + old->KeyLength);
-		o->Oid = oid->Oid;
-		o->Length = sizeof(NDIS_802_11_KEY_COMPAT) + old->KeyLength;
-		new = (NDIS_802_11_KEY_COMPAT *)&o->Data;
-		new->KeyRSC = old->KeyRSC;
-		new->Length = o->Length;
-		new->KeyIndex = old->KeyIndex;
-		new->KeyLength = old->KeyLength;
-		bcopy(old->BSSID, new->BSSID, sizeof(NDIS_802_11_MAC_ADDRESS));
-		bcopy(old->KeyMaterial, (char *)new +
-		    sizeof(NDIS_802_11_KEY_COMPAT), new->KeyLength);
-        	ifr.ifr_data = (caddr_t)o;
-	} else
-        	ifr.ifr_data = (caddr_t)oid;
-
-        strlcpy(ifr.ifr_name, a->name, sizeof(ifr.ifr_name));
-
-	if (set == TRUE)
-		retval = ioctl(a->socket, SIOCSDRVSPEC, &ifr);
-	else
-		retval = ioctl(a->socket, SIOCGDRVSPEC, &ifr);
-
-	if (o != NULL)
-		free(o);
-
-	if (retval)
-		return(0);
-
-	return(1);
-}
-
-int
-PacketGetAdapterNames(CHAR *namelist, ULONG *len)
-{
-	int			mib[6];
-	size_t			needed;
-	struct if_msghdr	*ifm;
-	struct sockaddr_dl	*sdl;
-	char			*buf, *lim, *next;
-	char			*plist;
-	int			spc;
-	int			i, ifcnt = 0;
-
-	plist = namelist;
-	spc = 0;
-
-	bzero(plist, *len);
-
-	needed = 0;
-	mib[0] = CTL_NET;
-	mib[1] = PF_ROUTE;
-	mib[2] = 0;             /* protocol */
-	mib[3] = 0;             /* wildcard address family */
-	mib[4] = NET_RT_IFLIST;
-	mib[5] = 0;             /* no flags */
-
-	if (sysctl (mib, 6, NULL, &needed, NULL, 0) < 0)
-		return(FALSE);
-
-	buf = malloc (needed);
-	if (buf == NULL)
-		return(FALSE);
-
-	if (sysctl (mib, 6, buf, &needed, NULL, 0) < 0) {
-		free(buf);
-		return(FALSE);
-	}
-
-	lim = buf + needed;
-
-	/* Generate interface name list. */
-
-	next = buf;
-	while (next < lim) {
-		ifm = (struct if_msghdr *)next;
-		if (ifm->ifm_type == RTM_IFINFO) {
-			sdl = (struct sockaddr_dl *)(ifm + 1);
-			if (strnstr(sdl->sdl_data, "wlan", sdl->sdl_nlen)) {
-				if ((spc + sdl->sdl_nlen) > *len) {
-					free(buf);
-					return(FALSE);
-				}
-				strncpy(plist, sdl->sdl_data, sdl->sdl_nlen);
-				plist += (sdl->sdl_nlen + 1);
-				spc += (sdl->sdl_nlen + 1);
-				ifcnt++;
-			}
-		}
-		next += ifm->ifm_msglen;
-	}
-
-
-	/* Insert an extra "" as a spacer */
-
-	plist++;
-	spc++;
-
-	/*
-	 * Now generate the interface description list. There
-	 * must be a unique description for each interface, and
-	 * they have to match what the ndis_events program will
-	 * feed in later. To keep this simple, we just repeat
-	 * the interface list over again.
-	 */
-
-	next = buf;
-	while (next < lim) {
-		ifm = (struct if_msghdr *)next;
-		if (ifm->ifm_type == RTM_IFINFO) {
-			sdl = (struct sockaddr_dl *)(ifm + 1);
-			if (strnstr(sdl->sdl_data, "wlan", sdl->sdl_nlen)) {
-				if ((spc + sdl->sdl_nlen) > *len) {
-					free(buf);
-					return(FALSE);
-				}
-				strncpy(plist, sdl->sdl_data, sdl->sdl_nlen);
-				plist += (sdl->sdl_nlen + 1);
-				spc += (sdl->sdl_nlen + 1);
-				ifcnt++;
-			}
-		}
-		next += ifm->ifm_msglen;
-	}
-
-	free (buf);
-
-	*len = spc + 1;
-
-	return(TRUE);
-}
-
-void
-PacketCloseAdapter(void *iface)
-{	
-	struct adapter		*a;
-	struct ifreq		ifr;
-	struct ieee80211req	ireq;
-
-	if (iface == NULL)
-		return;
-
-	a = iface;
-
-	/* Reset net80211 roaming */
-	bzero((char *)&ireq, sizeof(ireq));
-	strncpy(ireq.i_name, a->name, sizeof (ifr.ifr_name));
-	ireq.i_type = IEEE80211_IOC_ROAMING;
-	ireq.i_val = a->prev_roaming;
-	ioctl(a->socket, SIOCS80211, &ireq);
-
-	bzero((char *)&ifr, sizeof(ifr));
-        strncpy(ifr.ifr_name, a->name, sizeof (ifr.ifr_name));
-        ioctl(a->socket, SIOCGIFFLAGS, (caddr_t)&ifr);
-        ifr.ifr_flags &= ~IFF_UP;
-        ioctl(a->socket, SIOCSIFFLAGS, (caddr_t)&ifr);
-	close(a->socket);
-	free(a);
-
-	return;
-}
-
-#if __FreeBSD_version < 600000
-
-/*
- * The version of libpcap in FreeBSD 5.2.1 doesn't have these routines.
- * Call me insane if you will, but I still run 5.2.1 on my laptop, and
- * I'd like to use WPA there.
- */
-
-int
-pcap_get_selectable_fd(pcap_t *p)
-{
-	return(pcap_fileno(p));
-}
-
-/*
- * The old version of libpcap opens its BPF descriptor in read-only
- * mode. We need to temporarily create a new one we can write to.
- */
-
-int
-pcap_inject(pcap_t *p, const void *buf, size_t len)
-{
-	int			fd;
-	int			res, n = 0;
-	char			device[sizeof "/dev/bpf0000000000"];
-	struct ifreq		ifr;
-
-        /*
-         * Go through all the minors and find one that isn't in use.
-         */
-	do {
-		(void)snprintf(device, sizeof(device), "/dev/bpf%d", n++);
-		fd = open(device, O_RDWR);
-	} while (fd < 0 && errno == EBUSY);
-
-	if (fd == -1)
-		return(-1);
-
-	bzero((char *)&ifr, sizeof(ifr));
-	ioctl(pcap_fileno(p), BIOCGETIF, (caddr_t)&ifr);
-	ioctl(fd, BIOCSETIF, (caddr_t)&ifr);
-
-	res = write(fd, buf, len);
-
-	close(fd);
-
-	return(res);
-}
-#endif
diff --git a/usr.sbin/wpa/wpa_supplicant/Packet32.h b/usr.sbin/wpa/wpa_supplicant/Packet32.h
deleted file mode 100644
index c96553afc8a1..000000000000
--- a/usr.sbin/wpa/wpa_supplicant/Packet32.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
- * Copyright (c) 2005
- *      Bill Paul <wpaul@windriver.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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.
- *
- * $FreeBSD$
- */
-
-#ifndef _PACKET32_H_
-#define _PACKET32_H_
-
-#include <sys/types.h>
-#include <ntddndis.h>
-
-struct PACKET_OID_DATA {
-	uint32_t		Oid;
-	uint32_t		Length;
-	uint8_t			Data[1];
-};
-
-
-typedef struct PACKET_OID_DATA PACKET_OID_DATA;
-
-extern PCHAR PacketGetVersion(void);
-extern void *PacketOpenAdapter(CHAR *);
-extern int PacketRequest(void *, BOOLEAN, PACKET_OID_DATA *);
-extern int PacketGetAdapterNames(CHAR *, ULONG *);
-extern void PacketCloseAdapter(void *);
-
-/*
- * This is for backwards compatibility on FreeBSD 5.
- */
-
-#ifndef SIOCGDRVSPEC
-#define SIOCSDRVSPEC	_IOW('i', 123, struct ifreq)	/* set driver-specific
-								parameters */
-#define SIOCGDRVSPEC	_IOWR('i', 123, struct ifreq)	/* get driver-specific
-								parameters */
-#endif
-
-#endif /* _PACKET32_H_ */
diff --git a/usr.sbin/wpa/wpa_supplicant/ntddndis.h b/usr.sbin/wpa/wpa_supplicant/ntddndis.h
deleted file mode 100644
index 42e403d7bb12..000000000000
--- a/usr.sbin/wpa/wpa_supplicant/ntddndis.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef _NTDDNDIS_H_
-#define _NTDDNDIS_H_
-
-/*
- * $FreeBSD$
- */
-
-/*
- * Fake up some of the Windows type definitions so that the NDIS
- * interface module in wpa_supplicant will build.
- */
-
-#define ULONG uint32_t
-#define USHORT uint16_t
-#define UCHAR uint8_t
-#define LONG int32_t
-#define SHORT int16_t
-#define CHAR int8_t
-#define ULONGLONG uint64_t
-#define LONGLONG int64_t
-#define BOOLEAN uint8_t
-typedef void * LPADAPTER;
-typedef char * PTSTR;
-typedef char * PCHAR;
-
-#define TRUE 1
-#define FALSE 0
-
-#define OID_802_3_CURRENT_ADDRESS               0x01010102
-
-#endif /* _NTDDNDIS_H_ */